diff --git a/pom.xml b/pom.xml index 1d8f7b92..4d73df58 100644 --- a/pom.xml +++ b/pom.xml @@ -25,6 +25,7 @@ zt-module-databus + ${project.artifactId} @@ -32,7 +33,7 @@ https://github.com/YunaiV/ruoyi-vue-pro - 3.0.46 + 3.0.47-SNAPSHOT 17 ${java.version} diff --git a/zt-dependencies/pom.xml b/zt-dependencies/pom.xml index e3e5f972..a2b15ac5 100644 --- a/zt-dependencies/pom.xml +++ b/zt-dependencies/pom.xml @@ -26,7 +26,7 @@ https://github.com/YunaiV/ruoyi-vue-pro - 3.0.46 + 3.0.47-SNAPSHOT 1.6.0 3.4.5 diff --git a/zt-framework/zt-common/src/main/java/com/zt/plat/framework/common/util/asyncTask/AsyncLatchUtils.java b/zt-framework/zt-common/src/main/java/com/zt/plat/framework/common/util/asyncTask/AsyncLatchUtils.java index 30837df7..25d4f235 100644 --- a/zt-framework/zt-common/src/main/java/com/zt/plat/framework/common/util/asyncTask/AsyncLatchUtils.java +++ b/zt-framework/zt-common/src/main/java/com/zt/plat/framework/common/util/asyncTask/AsyncLatchUtils.java @@ -9,7 +9,7 @@ import java.util.concurrent.*; * 多次提交,一次等待 */ public class AsyncLatchUtils { - private static final ThreadLocal> THREADLOCAL = ThreadLocal.withInitial(LinkedList::new); + private static final ThreadLocal> THREAD_LOCAL = ThreadLocal.withInitial(LinkedList::new); /** * 提交一个异步任务 @@ -17,7 +17,7 @@ public class AsyncLatchUtils { * @param runnable 需要异步执行的具体业务逻辑 */ public static void submitTask(Executor executor, Runnable runnable) { - THREADLOCAL.get().add(new TaskInfo(executor, runnable)); + THREAD_LOCAL.get().add(new TaskInfo(executor, runnable)); } /** @@ -25,8 +25,8 @@ public class AsyncLatchUtils { * @return */ private static List popTask() { - List taskInfos = THREADLOCAL.get(); - THREADLOCAL.remove(); + List taskInfos = THREAD_LOCAL.get(); + THREAD_LOCAL.remove(); return taskInfos; } @@ -39,7 +39,7 @@ public class AsyncLatchUtils { */ public static boolean waitFor(long timeout, TimeUnit timeUnit) { List taskInfos = popTask(); - if (taskInfos.isEmpty()) { + if (taskInfos.isEmpty()) { return true; } CountDownLatch latch = new CountDownLatch(taskInfos.size()); @@ -57,8 +57,11 @@ public class AsyncLatchUtils { boolean await = false; try { await = latch.await(timeout, timeUnit); - } catch (Exception ignored) {} - return await; + } catch (Exception ignored) { + // 恢复中断状态 + Thread.currentThread().interrupt(); + } + return await; } private static final class TaskInfo { diff --git a/zt-framework/zt-spring-boot-starter-biz-business/src/main/java/com/zt/plat/framework/business/framework/BusinessDataPermissionEntityScanner.java b/zt-framework/zt-spring-boot-starter-biz-business/src/main/java/com/zt/plat/framework/business/framework/BusinessDataPermissionEntityScanner.java index 2c195fed..f6d89183 100644 --- a/zt-framework/zt-spring-boot-starter-biz-business/src/main/java/com/zt/plat/framework/business/framework/BusinessDataPermissionEntityScanner.java +++ b/zt-framework/zt-spring-boot-starter-biz-business/src/main/java/com/zt/plat/framework/business/framework/BusinessDataPermissionEntityScanner.java @@ -33,7 +33,7 @@ public class BusinessDataPermissionEntityScanner { */ private static final Set EXCLUDED_PACKAGE_PREFIXES = Set.of( "com.zt.plat.module.backendlogistics", - "com.zt.plat.module.erp", +// "com.zt.plat.module.erp", "com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO"); private final Set basePackages; diff --git a/zt-server/pom.xml b/zt-server/pom.xml index fb6ac7b2..e7afb362 100644 --- a/zt-server/pom.xml +++ b/zt-server/pom.xml @@ -43,11 +43,11 @@ - - com.zt.plat - zt-module-template-server - ${revision} - + + + + + diff --git a/zt-server/src/main/resources/application-dev.yaml b/zt-server/src/main/resources/application-dev.yaml index e6c2caea..2a3d7761 100644 --- a/zt-server/src/main/resources/application-dev.yaml +++ b/zt-server/src/main/resources/application-dev.yaml @@ -62,7 +62,8 @@ spring: host: 172.16.46.63 # 地址 port: 30379 # 端口 database: 0 # 数据库索引 -# password: 123456 # 密码,建议生产环境开启 + password: P@ssword25 + username: zt-redis --- #################### 定时任务相关配置 #################### @@ -76,7 +77,7 @@ xxl: # rocketmq 配置项,对应 RocketMQProperties 配置类 rocketmq: - name-server: 127.0.0.1:9876 # RocketMQ Namesrv + name-server: 172.16.46.63:30876 # RocketMQ Namesrv spring: # RabbitMQ 配置项,对应 RabbitProperties 配置类