Merge branch 'hotfix/wjx202209160658'

打包
Merge branch 'hotfix/wjx202209160657'
2026-06-20 01:07:46 +08:00 · 2022-09-16 18:59:59 +08:00 · 2022-09-16 18:59:46 +08:00 · 2022-09-16 18:58:25 +08:00 · 2022-09-16 18:58:10 +08:00 · 2022-09-16 18:54:43 +08:00
8 changed files with 14 additions and 13 deletions
--- a/app/src/App.vue
+++ b/app/src/App.vue
@@ -18,5 +18,5 @@ onLaunch(async () => {
 })
 </script>
 <style lang="scss">
-/* 注意要写在第一行，同时给style标签加入lang="scss"属性 */
+//
 </style>
--- a/h5/assets/uni.a9022e9f.css
+++ b/h5/assets/uni.a9022e9f.css
--- a/h5/index.html
+++ b/h5/index.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
  <head>
-    <link rel="stylesheet" href="/assets/uni.fb5f5659.css">
+    <link rel="stylesheet" href="/assets/uni.a9022e9f.css">

    <meta charset="UTF-8" />
    <script>
--- a/server/like-admin/src/main/resources/static/default_avatar.png
+++ b/server/like-admin/src/main/resources/static/default_avatar.png
--- a/server/like-front/src/main/java/com/mdd/front/controller/UserController.java
+++ b/server/like-front/src/main/java/com/mdd/front/controller/UserController.java
@@ -113,8 +113,8 @@ public class UserController {
    @PostMapping("/mnpMobile")
    public Object mnpMobile(@RequestBody Map<String, String> params) {
        Assert.notNull(params.get("code"), "code参数缺失");
-        Map<String, Object> map = iUserService.mnpMobile(params.get("code").trim());
-        return AjaxResult.success(map);
+        iUserService.mnpMobile(params.get("code").trim());
+        return AjaxResult.success();
    }

 }
--- a/server/like-front/src/main/java/com/mdd/front/service/IUserService.java
+++ b/server/like-front/src/main/java/com/mdd/front/service/IUserService.java
@@ -61,8 +61,7 @@ public interface IUserService {
     *
     * @author fzr
     * @param code 获取手机号的Code
-     * @return Map<String, Object>
     */
-    Map<String, Object> mnpMobile(String code);
+    void mnpMobile(String code);

 }
--- a/server/like-front/src/main/java/com/mdd/front/service/impl/UserServiceImpl.java
+++ b/server/like-front/src/main/java/com/mdd/front/service/impl/UserServiceImpl.java
@@ -17,6 +17,7 @@ import com.mdd.common.mapper.system.SystemConfigMapper;
 import com.mdd.common.mapper.user.UserAuthMapper;
 import com.mdd.common.mapper.user.UserMapper;
 import com.mdd.common.utils.*;
+import com.mdd.front.LikeFrontThreadLocal;
 import com.mdd.front.service.IUserService;
 import com.mdd.front.vo.user.UserCenterVo;
 import com.mdd.front.vo.user.UserInfoVo;
@@ -243,10 +244,9 @@ public class UserServiceImpl implements IUserService {
     *
     * @author fzr
     * @param code 获取手机号的Code
-     * @return Map<String, Object>
     */
    @Override
-    public Map<String, Object> mnpMobile(String code) {
+    public void mnpMobile(String code) {
        Map<String, String> config = ConfigUtil.get("mp_channel");
        WxMaService wxMaService = new WxMaServiceImpl();
        WxMaDefaultConfigImpl wxConfig = new WxMaDefaultConfigImpl();
@@ -257,10 +257,12 @@ public class UserServiceImpl implements IUserService {
        try {
            WxMaPhoneNumberInfo wxMaPhoneNumberInfo = wxMaService.getUserService().getNewPhoneNoInfo(code);

-            Map<String, Object> response = new LinkedHashMap<>();
-            response.put("countryCode", wxMaPhoneNumberInfo.getCountryCode());
-            response.put("phoneNumber", wxMaPhoneNumberInfo.getPhoneNumber());
-            return response;
+            Integer userId = LikeFrontThreadLocal.getUserId();
+            User user = new User();
+            user.setId(userId);
+            user.setMobile(wxMaPhoneNumberInfo.getPhoneNumber());
+            user.setCreateTime(System.currentTimeMillis() / 1000);
+            userMapper.updateById(user);
        } catch (WxErrorException e) {
            throw new OperateException(e.getError().getErrorCode() + ", " + e.getError().getErrorMsg());
        }
--- a/server/like-front/src/main/resources/static/default_avatar.png
+++ b/server/like-front/src/main/resources/static/default_avatar.png
Author	SHA1	Message	Date
Jason	8167380abe	Merge branch 'hotfix/wjx202209160658'	2022-09-16 18:59:59 +08:00
Jason	c69c104cd6	打包	2022-09-16 18:59:46 +08:00
Jason	5ae19337d9	Merge branch 'hotfix/wjx202209160657'	2022-09-16 18:58:25 +08:00
Jason	387b38a009	删除h5打包	2022-09-16 18:58:10 +08:00
Jason	915b989e7b	Merge branch 'hotfix/wjx202209160652'	2022-09-16 18:54:43 +08:00
Jason	a2e1541538	h5-打包	2022-09-16 18:54:32 +08:00
TinyAnts	849335def9	Merge branch 'master' of https://gitee.com/likeadmin/likeadmin_java	2022-09-16 18:49:39 +08:00
Jason	2f8194e93b	Merge branch 'hotfix/wjx202209160644'	2022-09-16 18:46:33 +08:00
Jason	c6dd43762f	打包	2022-09-16 18:46:22 +08:00
TinyAnts	7a0b4259c2	Merge branch 'hotfix/default'	2022-09-16 18:39:48 +08:00
TinyAnts	43da5265ff	调整获取微信手机号接口	2022-09-16 18:39:16 +08:00
TinyAnts	7cfb55124c	调整默认头像	2022-09-16 18:39:02 +08:00