1

PAS/src/main/java/cn/cslg/pas/common/model/PersonnelVO.java

@@ -123,6 +123,10 @@ public class PersonnelVO {
      * 角色类型(是否为管理角色)
      */
     private Integer roleType;
+    /**
+     * 租户类型
+     */
+    private String tenantType;
 
     /**
      * 部门职位绑定关系

PAS/src/main/java/cn/cslg/pas/service/OAuth2Service.java

@@ -143,7 +143,15 @@ public class OAuth2Service {
         String token = jsonObject.get("data").toString();
         PersonnelVO personnelVO = com.alibaba.fastjson2.JSONObject.parseObject(token, PersonnelVO.class);
 
-        return Response.success(personnelVO.getToken());
+        token = personnelVO.getToken();
+        String q = "token:login:token:" + token;
+        String IdS = redisUtil.get(q);
+        PersonnelVO personnelVO2 = cacheUtils.getLoginUser(IdS);
+        String tenantType = personnelVO2.getTenantType();
+        HashMap<Object, Object> loginMap = new HashMap<>();
+        loginMap.put("token", token);
+        loginMap.put("tenantType", tenantType);
+        return Response.success(loginMap);
     }
 
     public String changePwd(String oldPassword, String newPassword) {

PAS/src/main/resources/application-prod2.yml

@@ -10,9 +10,9 @@ spring:
         max-idle: 20
         min-idle: 0
         max-wait: -1ms
-      timeout: 2000ms
+    timeout: 2000ms
   datasource:
-    url: jdbc:mysql://47.101.137.223:3306/pas-history?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
+    url: jdbc:mysql://47.101.137.223:3306/pas-prod?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
     username: root
     password: TU5x6IeBi7rl
     driver-class-name: com.mysql.cj.jdbc.Driver