diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/config/AsyncConfig.java b/backend/ruoyi-admin/src/main/java/org/dromara/config/AsyncConfig.java index df0e2d5c..b2eb5889 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/config/AsyncConfig.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/config/AsyncConfig.java @@ -24,38 +24,40 @@ public class AsyncConfig { /** * 审批流程异步任务执行器 */ - @Bean("approvalTaskExecutor") - public TaskExecutor approvalTaskExecutor() { - ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor(); - - // 核心线程数 - executor.setCorePoolSize(5); - - // 最大线程数 - executor.setMaxPoolSize(10); - - // 队列容量 - executor.setQueueCapacity(50); - - // 线程名前缀 - executor.setThreadNamePrefix("approval-async-"); - - // 线程空闲存活时间(秒) - executor.setKeepAliveSeconds(60); - - // 拒绝策略:调用线程执行 - executor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy()); - - // 等待任务完成后再关闭线程池 - executor.setWaitForTasksToCompleteOnShutdown(true); - - // 等待时间(秒) - executor.setAwaitTerminationSeconds(30); - - // 初始化 - executor.initialize(); - - log.info("✅ 审批流程异步任务执行器初始化完成"); - return executor; - } -} \ No newline at end of file + // 吴自龙注释了,跟震哥确定为不需要的代码 + // @Bean("approvalTaskExecutor") + // public TaskExecutor approvalTaskExecutor() { + // ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor(); + + // // 核心线程数 + // executor.setCorePoolSize(5); + + // // 最大线程数 + // executor.setMaxPoolSize(10); + + // // 队列容量 + // executor.setQueueCapacity(50); + + // // 线程名前缀 + // executor.setThreadNamePrefix("approval-async-"); + + // // 线程空闲存活时间(秒) + // executor.setKeepAliveSeconds(60); + + // // 拒绝策略:调用线程执行 + // executor.setRejectedExecutionHandler(new + // ThreadPoolExecutor.CallerRunsPolicy()); + + // // 等待任务完成后再关闭线程池 + // executor.setWaitForTasksToCompleteOnShutdown(true); + + // // 等待时间(秒) + // executor.setAwaitTerminationSeconds(30); + + // // 初始化 + // executor.initialize(); + + // log.info("✅ 审批流程异步任务执行器初始化完成"); + // return executor; + // } +} diff --git a/backend/ruoyi-admin/src/main/resources/application-dev.yml b/backend/ruoyi-admin/src/main/resources/application-dev.yml index 70220258..e246ed56 100644 --- a/backend/ruoyi-admin/src/main/resources/application-dev.yml +++ b/backend/ruoyi-admin/src/main/resources/application-dev.yml @@ -104,21 +104,21 @@ spring: # password: root hikari: # 最大连接池数量(增加以减少连接竞争) - maxPoolSize: 30 - # 最小空闲线程数量 - minIdle: 15 + maxPoolSize: 20 + # 最小空闲线程数量(减少空闲连接数) + minIdle: 5 # 配置获取连接等待超时的时间(减少等待时间) connectionTimeout: 30000 # 校验超时时间 validationTimeout: 5000 # 空闲连接存活最大时间,默认10分钟(减少空闲超时) - idleTimeout: 180000 + idleTimeout: 300000 # 此属性控制池中连接的最长生命周期,值0表示无限生命周期,默认30分钟(减少生命周期) - maxLifetime: 600000 - # 多久检查一次连接的活性 - keepaliveTime: 30000 + maxLifetime: 900000 + # 多久检查一次连接的活性(增加间隔,减少检测频率) + keepaliveTime: 60000 # 连接测试查询(验证连接有效性) - connectionTestQuery: SELECT 1 + # connectionTestQuery: SELECT 11 --- # redis 单机配置(单机与集群只能开启一个另一个需要注释掉) spring.data: @@ -340,4 +340,4 @@ system: # - 对于内存充足的环境,可以适当增加 max-cache-size-bytes # - 对于频繁访问的小文件,可以增加 max-cache-size # - 对于大文件较多的环境,可以调整 max-single-file-size -# - 对于访问频率较低的环境,可以适当减少 expire-time-ms \ No newline at end of file +# - 对于访问频率较低的环境,可以适当减少 expire-time-ms diff --git a/backend/ruoyi-admin/src/main/resources/application.yml b/backend/ruoyi-admin/src/main/resources/application.yml index 56e7b705..a4624da3 100644 --- a/backend/ruoyi-admin/src/main/resources/application.yml +++ b/backend/ruoyi-admin/src/main/resources/application.yml @@ -41,10 +41,10 @@ logging: org.springframework: warn org.mybatis.spring.mapper: error org.apache.fury: warn - # 临时启用SQL日志调试 - org.dromara.cw.mapper.CwApprovalRecordMapper: debug - org.dromara.cw.service.impl.CwApprovalRecordServiceImpl: debug - org.dromara.cw.listener.ApprovalProcessEventListener: debug + # 关闭SQL日志调试,减少SELECT 1心跳检测日志 + # org.dromara.cw.mapper.CwApprovalRecordMapper: info + # org.dromara.cw.service.impl.CwApprovalRecordServiceImpl: info + # org.dromara.cw.listener.ApprovalProcessEventListener: info config: classpath:logback-plus.xml # 用户配置 diff --git a/backend/ruoyi-admin/src/main/resources/logback-plus.xml b/backend/ruoyi-admin/src/main/resources/logback-plus.xml index 17fba871..d6322759 100644 --- a/backend/ruoyi-admin/src/main/resources/logback-plus.xml +++ b/backend/ruoyi-admin/src/main/resources/logback-plus.xml @@ -1,8 +1,7 @@ - + @@ -113,24 +112,24 @@ - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + @@ -138,10 +137,10 @@ - + - + diff --git a/backend/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/config/MybatisPlusConfig.java b/backend/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/config/MybatisPlusConfig.java index 41034412..00c26912 100644 --- a/backend/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/config/MybatisPlusConfig.java +++ b/backend/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/config/MybatisPlusConfig.java @@ -28,7 +28,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement; * @author Lion Li */ @EnableTransactionManagement(proxyTargetClass = true) -@MapperScan("org.dromara.**.mapper") +@MapperScan("${mybatis-plus.mapperPackage}") @PropertySource(value = "classpath:common-mybatis.yml", factory = YmlPropertySourceFactory.class) public class MybatisPlusConfig { @@ -54,7 +54,7 @@ public class MybatisPlusConfig { * 数据权限拦截器 */ public PlusDataPermissionInterceptor dataPermissionInterceptor() { - return new PlusDataPermissionInterceptor("org.dromara.**.mapper"); + return new PlusDataPermissionInterceptor(SpringUtils.getProperty("mybatis-plus.mapperPackage")); } /** diff --git a/backend/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/listener/WorkflowGlobalListener.java b/backend/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/listener/WorkflowGlobalListener.java index 01a9194c..454b08f4 100644 --- a/backend/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/listener/WorkflowGlobalListener.java +++ b/backend/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/listener/WorkflowGlobalListener.java @@ -180,6 +180,9 @@ public class WorkflowGlobalListener implements GlobalListener { String status = BusinessStatusEnum.FINISH.getStatus(); // 更新流程状态为已完成 instanceService.updateStatus(instanceId, status); + // 同时更新内存中的实例状态,避免后续insService.updateById时状态被覆盖 + // 修复人:吴自龙 - 解决流程结束时状态不一致问题 + instance.setFlowStatus(status); log.info("流程已结束,状态更新为: {}", status); return status; }