1

PCS/src/main/java/cn/cslg/permission/service/LoginService.java

@@ -125,7 +125,7 @@ public class LoginService extends ServiceImpl<PersonnelMapper, Personnel> {
 
         //部门职位绑定信息
         List<PersonnelVO.DP> dpList = perDpService.getDPBaseMessageByPersonnelId(personnel.getId());
-        List<Integer> dutyDeparts =systemService.getDutyDeparts(personnel.getId());
+        List<Integer> dutyDeparts = systemService.getDutyDeparts(personnel.getId());
         //填充数据
         PersonnelVO personnelVO = new PersonnelVO();
         personnelVO
@@ -141,10 +141,11 @@ public class LoginService extends ServiceImpl<PersonnelMapper, Personnel> {
                 .setUsername(personnel.getPersonnelUserName())
                 .setTenantName(tenant.getTenantName())
                 .setTenantId(tenant.getId())
+                .setTenantType(tenant.getTenantType())
                 .setToken(StpUtil.getTokenValue())
                 .setRList(roleList)
                 .setDpList(dpList)
-                 .setDutyDeparts(dutyDeparts);
+                .setDutyDeparts(dutyDeparts);
 
         if (flag == 1) {
             personnelVO.setRoleType(1);

PCS/src/main/resources/application-prod.yml

@@ -1,18 +1,18 @@
 spring:
   redis:
-    host: 172.27.247.174
+    host: 47.101.137.223
     port: 6379
     database: 3
     password: Xx0GWxdWQJxx6Swe
-  lettuce:
-    pool:
-      max-active: 20
-      max-idle: 20
-      min-idle: 0
-      max-wait: -1ms
+    lettuce:
+      pool:
+        max-active: 20
+        max-idle: 20
+        min-idle: 0
+        max-wait: -1ms
     timeout: 2000ms
   datasource:
-    url: jdbc:mysql://172.27.247.174:3306/pas-prod?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
+    url: jdbc:mysql://47.101.137.223:3306/PCS_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
@@ -25,4 +25,5 @@ spring:
         exclusions: "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*"
 springdoc:
   api-docs:
-    enabled: false
+    enabled: false
+queueName: mail.queue

PCS/src/main/resources/application.yml

@@ -1,7 +1,7 @@
 server:
   servlet:
     context-path: /
-  port: 8880
+  port: 8871
 sa-token:
   activity-timeout: 18000
   token-name: token
@@ -40,7 +40,7 @@ spring:
       max-file-size: 1000MB
       max-request-size: 1000MB
   profiles:
-    active: dev
+    active: prod
   jackson:
     default-property-inclusion: non_null
     serialization: