登录身份增加role: system/custom

src/main/java/com/cmeeting/ad/config/CustomAuthenticationProvider.java

@@ -93,7 +93,8 @@ public class CustomAuthenticationProvider extends AbstractUserDetailsAuthenticat
         try {
             String uid = details.get("userId");
             String tenantId = details.get("tenantId");
-            UserDetails loadedUser = this.getCustomUserDetailsService().loadUser(uid, tenantId);
+            String role = details.get("role");
+            UserDetails loadedUser = this.getCustomUserDetailsService().loadUser(uid, tenantId, role);
             if (loadedUser == null) {
                 throw new InternalAuthenticationServiceException(
                         "customUserDetailsService returned null, which is an interface contract violation");

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

@@ -2,6 +2,7 @@ package com.cmeeting.ad.controller;
 
 import com.cmeeting.ad.service.UserService;
 import com.cmeeting.ad.vo.UserVo;
+import com.cmeeting.constant.RecordTemplateConstant;
 import com.cmeeting.util.IPUtils;
 import com.cmeeting.util.R;
 import com.cmeeting.ad.vo.ApplicationUserVO;
@@ -33,7 +34,7 @@ public class UserController {
 
     @PostMapping(value = "/auth")
     public R auth(@Validated @RequestBody UserVo.Auth vo) {
-        return R.ok(userService.auth(vo));
+        return R.ok(userService.auth(vo, RecordTemplateConstant.TEMPLATE_TYPE_SYSTEM));
     }
 
     @PostMapping(value = "/tokenAuth")

src/main/java/com/cmeeting/ad/entity/RobotSecurityUser.java

@@ -37,13 +37,16 @@ public class RobotSecurityUser implements UserDetails {
     private String password;
     private String tenantId;
     /**
+     * system  / custom
+     */
+    private String role;
+    /**
      *
      * 用户与租户区别字段
      */
     private Integer type;
     @JsonIgnore
     private Collection<? extends GrantedAuthority> authorities;
-    private RoleTree menus;
 
     private SysPlatformSetting sysPlatformSetting;
 

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

@@ -6,7 +6,7 @@ import org.springframework.security.core.userdetails.UserDetails;
  * 写这个方法的目的是为了让业务实现层能够根据类型执行对应的业务逻辑
  */
 public interface CustomUserDetailsService {
-    UserDetails loadUser(String uid, String tenantId);
+    UserDetails loadUser(String uid, String tenantId, String role);
 
 
 }

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(UserVo.Auth vo, String role);
 
     List<String> getRoleIdByUserId(String tenantId, String userId, String path);
 

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

@@ -31,7 +31,7 @@ public class DetailsServiceImpl implements CustomUserDetailsService {
      * @throws UsernameNotFoundException 用户不存在
      */
     @Override
-    public UserDetails loadUser(String uid, String tenantId) {
+    public UserDetails loadUser(String uid, String tenantId, String role) {
         RobotSecurityUser user = new RobotSecurityUser();
         user.setUserType(UserTypeConstant.SYNC);
         String url = userAdminConfig.getUserAdminDomain() + UserAdminRouteConstant.SyncUser.INFO + "?id=" + uid + "&tenantId=" + tenantId;
@@ -41,6 +41,7 @@ public class DetailsServiceImpl implements CustomUserDetailsService {
         user.setUsername(data.getString("name"));
         user.setNick(data.getString("nickName"));
         user.setTenantId(data.getString("tenantId"));
+        user.setRole(role);
         return user;
     }
 }

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

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.cmeeting.ad.entity.*;
 import com.cmeeting.ad.util.SecurityUtil;
 import com.cmeeting.ad.vo.UserVo;
+import com.cmeeting.constant.RecordTemplateConstant;
 import com.cmeeting.dto.UserDTO;
 import com.cmeeting.exception.RobotBaseException;
 import com.cmeeting.mapper.primary.AuthMapper;
@@ -88,13 +89,14 @@ public class UserServiceImpl implements UserService {
     }
 
     @Override
-    public String auth(UserVo.Auth vo) {
+    public String auth(UserVo.Auth vo, String role) {
         String userId = vo.getId();
         String nick = vo.getNick();
         HashMap<String, String> stringStringHashMap = new HashMap<>();
         SysTenant sysTenant = iTenantService.getById(permissionTenantId);
         stringStringHashMap.put("userId", userId);
         stringStringHashMap.put("tenantId", permissionTenantId);
+        stringStringHashMap.put("role", role);
         stringStringHashMap.put("language", sysTenant.getLanguage());
         stringStringHashMap.put("nick", nick);
         UsernamePasswordAuthenticationToken usernamePasswordAuthenticationToken = new UsernamePasswordAuthenticationToken(userId, permissionTenantId);
@@ -225,7 +227,7 @@ public class UserServiceImpl implements UserService {
         }
 
         UserVo.Auth authParams = UserVo.Auth.builder().id(userId).nick(robotSecurityUser.getNickName()).build();
-        String token = auth(authParams);
+        String token = auth(authParams, RecordTemplateConstant.TEMPLATE_TYPE_CUSTOM);
         return token;
     }