认证相关

cms-common/cms-common-model/src/main/java/com/mmc/iuav/user/model/dto/LoginSuccessDTO.java

@@ -21,5 +21,8 @@ public class LoginSuccessDTO implements Serializable {
 	private String token;
 	private Integer userAccountId;
 	private String accountNo;
+	private String uid;
+	private String phoneNum;
+	private String userName;
 //	private RoleInfoDTO roleInfo;
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/impl/AuthServiceImpl.java

@@ -104,8 +104,8 @@ public class AuthServiceImpl implements AuthService {
         map.put(JwtConstant.TOKEN_TYPE, JwtConstant.IUAV_TOKEN);
         String token = JwtUtil.createJwt(map);
 
-
-        LoginSuccessDTO loginSuccessDTO = LoginSuccessDTO.builder().token(token).userAccountId(userAccountVO.getId()).accountNo(userAccountVO.getAccountNo()).build();
+        LoginSuccessDTO loginSuccessDTO = LoginSuccessDTO.builder().token(token).userAccountId(userAccountVO.getId()).accountNo(userAccountVO.getAccountNo()).uid(userAccountVO.getUid())
+                .userName(userAccountVO.getUserName()).phoneNum(userAccountVO.getPhoneNum()).build();
 
         stringRedisTemplate.opsForValue().set(
                 token, JSONObject.toJSONString(loginSuccessDTO),
@@ -140,9 +140,8 @@ public class AuthServiceImpl implements AuthService {
         //map.put(JwtConstant.ROLE_ID, 0);
         map.put(JwtConstant.TOKEN_TYPE, JwtConstant.M_TOKEN);
         String token = JwtUtil.createJwt(map);
-
-        LoginSuccessDTO loginSuccessDTO = LoginSuccessDTO.builder().token(token).userAccountId(user.getId()).accountNo(user.getAccountNo()).build();
-
+        LoginSuccessDTO loginSuccessDTO = LoginSuccessDTO.builder().token(token).userAccountId(user.getId()).accountNo(user.getAccountNo()).uid(user.getUid())
+                .userName(user.getUserName()).phoneNum(user.getPhoneNum()).build();
         stringRedisTemplate.opsForValue().set(
                 token, JSONObject.toJSONString(loginSuccessDTO),
                 JwtConstant.EXPIRATION, TimeUnit.MILLISECONDS);
@@ -158,8 +157,8 @@ public class AuthServiceImpl implements AuthService {
             map.put(JwtConstant.USER_ACCOUNT_ID, userAccountVO.getId());
             map.put(JwtConstant.TOKEN_TYPE, JwtConstant.IUAV_TOKEN);
             String token = JwtUtil.createJwt(map);
-
-            LoginSuccessDTO loginSuccessDTO = LoginSuccessDTO.builder().token(token).userAccountId(userAccountVO.getId()).accountNo(userAccountVO.getAccountNo()).build();
+            LoginSuccessDTO loginSuccessDTO = LoginSuccessDTO.builder().token(token).userAccountId(userAccountVO.getId()).accountNo(userAccountVO.getAccountNo()).uid(userAccountVO.getUid())
+                    .userName(userAccountVO.getUserName()).phoneNum(userAccountVO.getPhoneNum()).build();
             stringRedisTemplate.opsForValue().set(
                     token, JSONObject.toJSONString(loginSuccessDTO),
                     JwtConstant.EXPIRATION, TimeUnit.MILLISECONDS);
@@ -167,6 +166,6 @@ public class AuthServiceImpl implements AuthService {
             return ResultBody.success(AppUserSucVO.builder().token(token).uid(userAccountVO.getUid()).phoneNum(userAccountVO.getPhoneNum())
                     .nickName(userAccountVO.getNickName()).userAccountId(userAccountVO.getId()).build());
         }
-        return null;
+        return ResultBody.error(ResultEnum.APPLET_LOGIN_ERROR);
     }
 }