登录修改-login接口直接返回token

src/main/java/com/cmeeting/ad/controller/UserController.java

@@ -31,10 +31,10 @@ public class UserController {
         return userService.login(vo.getAgentId(), vo.getData(), ipAddr);
     }
 
-    @PostMapping(value = "/auth")
-    public R auth(@Validated @RequestBody UserVo.Auth vo) {
-        return R.ok(userService.auth(vo));
-    }
+//    @PostMapping(value = "/auth")
+//    public R auth(@Validated @RequestBody UserVo.Auth vo) {
+//        return R.ok(userService.auth(vo.getId(), vo.getNick()));
+//    }
 
     @PostMapping(value = "/tokenAuth")
     public R tokenAuth(@Validated @RequestBody ApplicationUserVO.LoginDecrypt vo) {

src/main/java/com/cmeeting/ad/service/UserService.java

@@ -13,7 +13,7 @@ import java.util.List;
 public interface UserService {
     R login(String agentId, String data, String ip);
 
-    String auth(UserVo.Auth vo);
+    String auth(String userId, String nick);
 
     List<String> getRoleIdByUserId(String tenantId, String userId, String path);
 

src/main/java/com/cmeeting/ad/service/impl/UserServiceImpl.java

@@ -88,9 +88,7 @@ public class UserServiceImpl implements UserService {
     }
 
     @Override
-    public String auth(UserVo.Auth vo) {
-        String userId = vo.getId();
-        String nick = vo.getNick();
+    public String auth(String userId, String nick) {
         HashMap<String, String> stringStringHashMap = new HashMap<>();
         SysTenant sysTenant = iTenantService.getById(permissionTenantId);
         stringStringHashMap.put("userId", userId);
@@ -274,9 +272,7 @@ public class UserServiceImpl implements UserService {
             }
         }
 
-        UserVo.Auth authParams = UserVo.Auth.builder().id(userId).nick(robotSecurityUser.getNickName()).build();
-        String token = auth(authParams);
-        return token;
+        return auth(userId, robotSecurityUser.getNickName());
     }
 
     @Override
@@ -320,21 +316,7 @@ public class UserServiceImpl implements UserService {
             if(StringUtils.isEmpty(adminWhiteUsers) || !Arrays.asList(adminWhiteUsers.split(",")).contains(username)){
                 throw new RobotBaseException("尊敬的用户 ["+sysUserSync.getName()+"]，您的账户"+username+"未被授权访问此系统，请联系系统管理员。");
             }
-//            if (code != 0) {
-//                throw new RuntimeException("用户系统异常！");
-//            }
-//            if (data != null && data.size() > 0) {
-//                JSONArray array = filterData(data, application);
-//                if (array != null && array.size() > 0) {
-//                    return R.ok(array);
-//                } else {
-//                    array = filterData(data, null);
-//                    return R.ok(array);
-//                }
-//            } else {
-//                throw new RuntimeException("用户未授权！");
-//            }
-            return R.ok(sysUserSync);
+            return R.ok(auth(sysUserSync.getUserId(), sysUserSync.getName()));
         } else {
             return R.error("账号/密码错误！");
         }