修改登录注册

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rpc/service/AppPermissionService.java

@@ -7,6 +7,7 @@ import com.github.wxiaoqi.security.admin.biz.AppUserLoginBiz;
 import com.github.wxiaoqi.security.admin.biz.ElementBiz;
 import com.github.wxiaoqi.security.admin.constant.RedisKey;
 import com.github.wxiaoqi.security.admin.entity.*;
+import com.github.wxiaoqi.security.admin.vo.AppUserVo;
 import com.github.wxiaoqi.security.api.vo.authority.PermissionInfo;
 import com.github.wxiaoqi.security.api.vo.user.AppUserInfo;
 import com.github.wxiaoqi.security.common.msg.BaseResponse;
@@ -258,13 +259,13 @@ public class AppPermissionService {
         if (userLoign != null) {
             data.put("nickname", nickname);
             data.put("headerurl", headimgurl);
-            AppUserDetail appUserDetail = appUserDetailBiz.getUserByUserid(userid);
-            if (appUserDetail != null) {
-                if (StringUtils.isNotBlank(appUserDetail.getNickname())) {
-                    data.put("nickname", appUserDetail.getNickname());
+            AppUserVo userVo = appUserDetailBiz.getUserInfoById(userid);
+            if (userVo != null) {
+                if (StringUtils.isNotBlank(userVo.getNickname())) {
+                    data.put("nickname", userVo.getNickname());
                 }
-                if (StringUtils.isNotBlank(appUserDetail.getHeadimgurl())) {
-                    data.put("headerurl", appUserDetail.getHeadimgurl());
+                if (StringUtils.isNotBlank(userVo.getHeadimgurl())) {
+                    data.put("headerurl", userVo.getHeadimgurl());
                 }
             }
             // 缓存操作
@@ -336,9 +337,9 @@ public class AppPermissionService {
                     }
                     userLogin.setUpdatetime(now);
                     appUserLoginBiz.updateSelectiveById(userLogin);
-                    AppUserDetail userDetail = appUserDetailBiz.getUserByUserid(userid);
-                    if (userDetail == null) {
-                        userDetail = new AppUserDetail();
+                    AppUserVo userVo = appUserDetailBiz.getUserInfoById(userid);
+                    AppUserDetail  userDetail = new AppUserDetail();
+                    if (userVo == null) {
                         userDetail.setUserid(userid);
                         userDetail.setHeadimgurl(headimgurl);
                         userDetail.setNickname(nickname);
@@ -346,11 +347,12 @@ public class AppPermissionService {
                         userDetail.setUpdatetime(now);
                         userDetail.setIsdel(0);
                         appUserDetailBiz.insertSelective(userDetail);
-                    } else {
+                    } /*else {
+                        userDetail.setId(userVo.getId());
                         userDetail.setHeadimgurl(headimgurl);
                         userDetail.setNickname(nickname);
                         appUserDetailBiz.updateSelectiveById(userDetail);
-                    }
+                    }*/
                     // 登录结果要做做统一处理
                     JSONObject data = autoLogin(userid, username, headimgurl, nickname);
                     // 到im注册，获取返回结果
@@ -432,12 +434,12 @@ public class AppPermissionService {
             return JsonResultUtil.createFailedResult(ResultCode.EXIST_CODE, "用户已被禁用");
         }
         Integer userid = userLogin.getId();
-        AppUserDetail userDetail = appUserDetailBiz.getUserByUserid(userid);
+        AppUserVo userVo = appUserDetailBiz.getUserInfoById(userid);
         String headimgurl = "";
         String nickname = "";
-        if (userDetail != null) {
-            headimgurl = userDetail.getHeadimgurl();
-            nickname = userDetail.getNickname();
+        if (userVo != null) {
+            headimgurl = userVo.getHeadimgurl();
+            nickname = userVo.getNickname();
         }
         JSONObject data = autoLogin(userid, userLogin.getUsername(), headimgurl, nickname);
         // 到im注册，获取返回结果