Merge branch 'refs/heads/zt-test' into test

2. 延长 databus 默认的请求超时时间
3. 调整初始化脚本部分字段的长度

sql/dm/ruoyi-vue-pro-dm8.sql

@@ -25,7 +25,7 @@ CREATE TABLE infra_api_access_log (
                                       user_ip varchar(50)  NOT NULL,
                                       user_agent varchar(512)  NOT NULL,
                                       operate_module varchar(50) DEFAULT NULL NULL,
-                                      operate_name varchar(50) DEFAULT NULL NULL,
+                                      operate_name varchar(256) DEFAULT NULL NULL,
                                       operate_type smallint DEFAULT 0 NULL,
                                       begin_time datetime  NOT NULL,
                                       end_time datetime  NOT NULL,

zt-framework/zt-common/src/main/java/com/zt/plat/framework/common/exception/enums/GlobalErrorCodeConstants.java

@@ -25,6 +25,7 @@ public interface GlobalErrorCodeConstants {
     ErrorCode METHOD_NOT_ALLOWED = new ErrorCode(405, "请求方法不正确");
     ErrorCode LOCKED = new ErrorCode(423, "请求失败，请稍后重试"); // 并发请求，不允许
     ErrorCode TOO_MANY_REQUESTS = new ErrorCode(429, "请求过于频繁，请稍后重试");
+    ErrorCode NOT_NULL_REQUEST_ERROR = new ErrorCode(430, "请求参数不能为空");
 
     // ========== 服务端错误段 ==========
 

zt-framework/zt-spring-boot-starter-biz-data-permission/src/main/java/com/zt/plat/framework/datapermission/core/aop/CompanyDataPermissionIgnoreAspect.java

@@ -19,6 +19,10 @@ public class CompanyDataPermissionIgnoreAspect {
     public Object around(ProceedingJoinPoint joinPoint, CompanyDataPermissionIgnore companyDataPermissionIgnore) throws Throwable {
         boolean oldIgnore = CompanyContextHolder.isIgnore();
         try {
+            if (companyDataPermissionIgnore == null) {
+                Class<?> targetClass = joinPoint.getTarget().getClass();
+                companyDataPermissionIgnore = targetClass.getAnnotation(CompanyDataPermissionIgnore.class);
+            }
             Object enable = SpringExpressionUtils.parseExpression(companyDataPermissionIgnore.enable());
             if (Boolean.TRUE.equals(enable)) {
                 CompanyContextHolder.setIgnore(true);

zt-framework/zt-spring-boot-starter-biz-data-permission/src/main/java/com/zt/plat/framework/datapermission/core/aop/DeptDataPermissionIgnoreAspect.java

@@ -19,6 +19,10 @@ public class DeptDataPermissionIgnoreAspect {
     public Object around(ProceedingJoinPoint joinPoint, DeptDataPermissionIgnore deptDataPermissionIgnore) throws Throwable {
         boolean oldIgnore = DeptContextHolder.shouldIgnore();
         try {
+            if (deptDataPermissionIgnore == null) {
+                Class<?> targetClass = joinPoint.getTarget().getClass();
+                deptDataPermissionIgnore = targetClass.getAnnotation(DeptDataPermissionIgnore.class);
+            }
             Object enable = SpringExpressionUtils.parseExpression(deptDataPermissionIgnore.enable());
             if (Boolean.TRUE.equals(enable)) {
                 DeptContextHolder.setIgnore(true);

zt-module-databus/zt-module-databus-server/src/main/java/com/zt/plat/module/databus/controller/admin/gateway/vo/definition/ApiDefinitionStepSaveReqVO.java

@@ -36,7 +36,7 @@ public class ApiDefinitionStepSaveReqVO {
     @Schema(description = "响应映射表达式(JSON)")
     private String responseMappingExpr;
 
-    @Schema(description = "超时时间(毫秒)", example = "5000")
+    @Schema(description = "超时时间(毫秒)，缺省 20000(20s)", example = "20000")
     private Long timeout;
 
     @Schema(description = "降级策略(JSON)")

zt-module-databus/zt-module-databus-server/src/main/java/com/zt/plat/module/databus/framework/integration/gateway/step/impl/HttpStepHandler.java

@@ -48,6 +48,7 @@ public class HttpStepHandler implements ApiStepHandler {
 
     private static final Duration RETRY_DELAY = Duration.ofMillis(200);
     private static final int RETRY_ATTEMPTS = 3;
+    private static final Duration DEFAULT_TIMEOUT = Duration.ofSeconds(20);
 
     private static final Set<String> DEFAULT_FORWARDED_HEADERS = Set.of(
             "authorization",
@@ -229,7 +230,7 @@ public class HttpStepHandler implements ApiStepHandler {
     private Duration resolveTimeout(ApiStepDefinition stepDefinition) {
         Long timeout = stepDefinition.getStep().getTimeout();
         if (timeout == null || timeout <= 0) {
-            return Duration.ofSeconds(5);
+            return DEFAULT_TIMEOUT;
         }
         return Duration.ofMillis(timeout);
     }

zt-module-databus/zt-module-databus-server/src/main/resources/application-dev.yml

@@ -37,14 +37,20 @@ spring:
       primary: master
       datasource:
         master:
-          url: jdbc:dm://172.16.46.247:1050?schema=RUOYI-VUE-PRO
+          #url: jdbc:dm://172.16.46.247:1050?schema=RUOYI-VUE-PRO
+          #username: SYSDBA
+          #password: pgbsci6ddJ6Sqj@e
+          url: jdbc:dm://172.17.11.98:20870?schema=JYGK_TEST
           username: SYSDBA
-          password: pgbsci6ddJ6Sqj@e
+          password: P@ssword25
         slave: # 模拟从库，可根据自己需要修改 # 模拟从库，可根据自己需要修改
           lazy: true # 开启懒加载，保证启动速度
-          url: jdbc:dm://172.16.46.247:1050?schema=RUOYI-VUE-PRO
+          #url: jdbc:dm://172.16.46.247:1050?schema=RUOYI-VUE-PRO
+          #username: SYSDBA
+          #password: pgbsci6ddJ6Sqj@e
+          url: jdbc:dm://172.17.11.98:20870?schema=JYGK_TEST
           username: SYSDBA
-          password: pgbsci6ddJ6Sqj@e
+          password: P@ssword25
 
   # Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优
   data:
@@ -52,9 +58,8 @@ spring:
       host: 172.16.46.63 # 地址
       port: 30379 # 端口
       database: 0 # 数据库索引
-      username: zt-redis
+      username: zt-redis # 密码，建议生产环境开启
       password: P@ssword25
-#    password: 123456 # 密码，建议生产环境开启
 
 xxl:
   job:

zt-module-databus/zt-module-databus-server/src/main/resources/application-local.yml

@@ -39,14 +39,20 @@ spring:
       primary: master
       datasource:
         master:
-          url: jdbc:dm://172.16.46.247:1050?schema=RUOYI-VUE-PRO
+          #url: jdbc:dm://172.16.46.247:1050?schema=RUOYI-VUE-PRO
+          #username: SYSDBA
+          #password: pgbsci6ddJ6Sqj@e
+          url: jdbc:dm://172.17.11.98:20870?schema=JYGK_TEST
           username: SYSDBA
-          password: pgbsci6ddJ6Sqj@e
+          password: P@ssword25
         slave: # 模拟从库，可根据自己需要修改 # 模拟从库，可根据自己需要修改
           lazy: true # 开启懒加载，保证启动速度
-          url: jdbc:dm://172.16.46.247:1050?schema=RUOYI-VUE-PRO
+          #url: jdbc:dm://172.16.46.247:1050?schema=RUOYI-VUE-PRO
+          #username: SYSDBA
+          #password: pgbsci6ddJ6Sqj@e
+          url: jdbc:dm://172.17.11.98:20870?schema=JYGK_TEST
           username: SYSDBA
-          password: pgbsci6ddJ6Sqj@e
+          password: P@ssword25
 
   # Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优
   data:
@@ -54,7 +60,8 @@ spring:
       host: 172.16.46.63 # 地址
       port: 30379 # 端口
       database: 0 # 数据库索引
-#    password: 123456 # 密码，建议生产环境开启
+      username: zt-redis  # 密码，建议生产环境开启
+      password: P@ssword25
 
 xxl:
   job:

zt-module-databus/zt-module-databus-server/src/main/resources/application.yml

@@ -50,7 +50,7 @@ spring:
       time-to-live: 1h # 设置过期时间为 1 小时
 
 server:
-  port: 48100
+  port: 48108
 
 logging:
   file:

zt-module-infra/zt-module-infra-server/src/main/resources/application-dev.yaml

@@ -38,14 +38,20 @@ spring:
       primary: master
       datasource:
         master:
-          url: jdbc:dm://172.16.46.247:1050?schema=RUOYI-VUE-PRO
+          #url: jdbc:dm://172.16.46.247:1050?schema=RUOYI-VUE-PRO
+          #username: SYSDBA
+          #password: pgbsci6ddJ6Sqj@e
+          url: jdbc:dm://172.17.11.98:20870?schema=JYGK_TEST
           username: SYSDBA
-          password: pgbsci6ddJ6Sqj@e
+          password: P@ssword25
         slave: # 模拟从库，可根据自己需要修改 # 模拟从库，可根据自己需要修改
           lazy: true # 开启懒加载，保证启动速度
-          url: jdbc:dm://172.16.46.247:1050?schema=RUOYI-VUE-PRO
+          #url: jdbc:dm://172.16.46.247:1050?schema=RUOYI-VUE-PRO
+          #username: SYSDBA
+          #password: pgbsci6ddJ6Sqj@e
+          url: jdbc:dm://172.17.11.98:20870?schema=JYGK_TEST
           username: SYSDBA
-          password: pgbsci6ddJ6Sqj@e
+          password: P@ssword25
 
   # Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优
   data: