Quellcode durchsuchen

优化:
admin工程redis分区修改
缓存方法指定数据源(嵌套调用)
系统日志修改

skyline vor 2 Jahren
Ursprung
Commit
0b6686f237

+ 6 - 2
admin/src/main/java/com/kym/admin/aspect/SysLogAspect.java

@@ -74,8 +74,12 @@ public class SysLogAspect {
         systemLog.setMethod(className + "." + methodName + "()");
         //请求的参数
         Object[] args = joinPoint.getArgs();
-        String params = JSON.toJSON(args).toString();
-        systemLog.setRequestParam(params);
+
+        if (!syslog.ignoreParams()) {
+            String params = JSON.toJSON(args).toString();
+            systemLog.setRequestParam(params);
+        }
+
         //获取request
         HttpServletRequest request = HttpContextUtils.getHttpServletRequest();
         //设置IP地址

+ 1 - 1
admin/src/main/resources/application-dev.yml

@@ -77,7 +77,7 @@ spring:
       port: 6380
       host: 121.40.98.15
       password: 123456
-      database: 10
+      database: 0
       lettuce:
         pool:
           min-idle: 1

+ 1 - 0
admin/src/main/resources/application-prod.yml

@@ -78,6 +78,7 @@ spring:
       host: 127.0.0.1
       password: OPYCJ3mJpaU4IsP7ZeIyaus6FtHjLYmhNDGteuRc1gIFCAm7wi
       database: 10
+      database: 0
       lettuce:
         pool:
           min-idle: 1

+ 7 - 0
common/src/main/java/com/kym/common/annotation/SysLog.java

@@ -12,4 +12,11 @@ import java.lang.annotation.*;
 @Documented
 public @interface SysLog {
     String value() default "";
+
+    /**
+     * 忽略参数
+     *
+     * @return
+     */
+    boolean ignoreParams() default false;
 }

+ 11 - 1
service/src/main/java/com/kym/service/utils/KymCache.java

@@ -1,5 +1,6 @@
 package com.kym.service.utils;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.kym.entity.admin.AdminUserStation;
 import com.kym.entity.admin.EquipmentRelation;
 import com.kym.entity.admin.Station;
@@ -41,6 +42,7 @@ public class KymCache {
         ADMIN_USER_STATION.putAll(adminUserStationService.list().stream().collect(Collectors.toMap(AdminUserStation::getAdminUserId, AdminUserStation::getStationId)));
     }
 
+    @DS("db-admin")
     public String getShortId(String equipmentId) {
         if (equipmentId.length() == 17) {
             equipmentId = equipmentId.substring(0, 16);
@@ -56,6 +58,12 @@ public class KymCache {
         return res;
     }
 
+    /**
+     * 转化成17为的connectorId
+     *
+     * @param equipmentId
+     * @return
+     */
     public String getConnectorId(String equipmentId) {
         return switch (equipmentId.length()) {
             case 17 -> equipmentId;
@@ -66,7 +74,7 @@ public class KymCache {
         };
     }
 
-
+    @DS("db-admin")
     public String getStationId(String connectorId) {
         var res = CONNECTOR_STATION_MAPPING.get(connectorId);
         if (res == null) {
@@ -84,6 +92,7 @@ public class KymCache {
         return getStationName(stationId);
     }
 
+    @DS("db-admin")
     public String getStationName(String stationId) {
         var res = STATION_MAPPING.get(stationId);
         if (res == null) {
@@ -96,6 +105,7 @@ public class KymCache {
         return res;
     }
 
+    @DS("db-admin")
     public String getAdminUserStationId(Long adminUserId) {
         var res = ADMIN_USER_STATION.get(adminUserId);
         if (res == null) {