diff --git a/jeelowcode-admin/src/main/resources/application-office.yaml b/jeelowcode-admin/src/main/resources/application-office.yaml index e072050..cd5b839 100644 --- a/jeelowcode-admin/src/main/resources/application-office.yaml +++ b/jeelowcode-admin/src/main/resources/application-office.yaml @@ -15,6 +15,8 @@ spring: driver-class-name: dm.jdbc.driver.DmDriver username: opsdb password: cscn_ops@2025 + druid: + init-connection-sqls: SET SCHEMA LOWCODE_MASTER jeelowcode: # 从库,框架库 name: jeelowcode_pre_frame @@ -22,6 +24,9 @@ spring: driver-class-name: dm.jdbc.driver.DmDriver username: opsdb password: cscn_ops@2025 + druid: + init-connection-sqls: SET SCHEMA LOWCODE_FRAME + slave: # 日志库单独 name: dev_jeelowcode_log lazy: true # 开启懒加载,保证启动速度 @@ -29,6 +34,8 @@ spring: driver-class-name: dm.jdbc.driver.DmDriver username: opsdb password: cscn_ops@2025 + druid: + init-connection-sqls: SET SCHEMA LOWCODE_LOG # Redis 配置。Redisson 默认的配置足够使用,一般不需要进行调优 redis: diff --git a/jeelowcode-admin/src/main/resources/application-test.yaml b/jeelowcode-admin/src/main/resources/application-test.yaml index a18baf8..2566916 100644 --- a/jeelowcode-admin/src/main/resources/application-test.yaml +++ b/jeelowcode-admin/src/main/resources/application-test.yaml @@ -15,13 +15,16 @@ spring: driver-class-name: dm.jdbc.driver.DmDriver username: opsdb password: cscn_ops@2025 - + druid: + init-connection-sqls: SET SCHEMA LOWCODE_MASTER_TEST jeelowcode: # 从库,框架库 name: jeelowcode_pre_frame url: jdbc:dm://172.16.70.3:5236?schema=LOWCODE_FRAME_TEST&compatibleMode=oracle driver-class-name: dm.jdbc.driver.DmDriver username: opsdb password: cscn_ops@2025 + druid: + init-connection-sqls: SET SCHEMA LOWCODE_FRAME_TEST slave: # 日志库单独 name: dev_jeelowcode_log lazy: true # 开启懒加载,保证启动速度 @@ -29,6 +32,8 @@ spring: driver-class-name: dm.jdbc.driver.DmDriver username: opsdb password: cscn_ops@2025 + druid: + init-connection-sqls: SET SCHEMA LOWCODE_LOG_TEST # Redis 配置。Redisson 默认的配置足够使用,一般不需要进行调优 redis: diff --git a/jeelowcode-admin/src/main/resources/application.yaml b/jeelowcode-admin/src/main/resources/application.yaml index 706807b..c5dce50 100644 --- a/jeelowcode-admin/src/main/resources/application.yaml +++ b/jeelowcode-admin/src/main/resources/application.yaml @@ -129,7 +129,7 @@ spring: time-between-eviction-runs-millis: 60000 # 配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位:毫秒 min-evictable-idle-time-millis: 7200000 # 配置一个连接在池中最小生存的时间,单位:毫秒 max-evictable-idle-time-millis: 25200000 # 配置一个连接在池中最大生存的时间,单位:毫秒 - #validation-query: SELECT 1 FROM DUAL # 配置检测连接是否有效 + validation-query: SELECT 1 FROM DUAL # 配置检测连接是否有效 test-while-idle: true test-on-borrow: false test-on-return: false @@ -138,8 +138,6 @@ spring: query-timeout: 120 # SQL查询超时时间,单位:秒 transaction-query-timeout: 120 # 事务超时时间,单位:秒 - - --- #################### 定时任务相关配置 #################### # Quartz 配置项,对应 QuartzProperties 配置类 diff --git a/jeelowcode-service/jeelowcode-service-bpm-biz/src/main/java/com/jeelowcode/service/bpm/service/impl/BpmProcessInstanceCopyServiceImpl.java b/jeelowcode-service/jeelowcode-service-bpm-biz/src/main/java/com/jeelowcode/service/bpm/service/impl/BpmProcessInstanceCopyServiceImpl.java index 273e1d3..fb8b017 100644 --- a/jeelowcode-service/jeelowcode-service-bpm-biz/src/main/java/com/jeelowcode/service/bpm/service/impl/BpmProcessInstanceCopyServiceImpl.java +++ b/jeelowcode-service/jeelowcode-service-bpm-biz/src/main/java/com/jeelowcode/service/bpm/service/impl/BpmProcessInstanceCopyServiceImpl.java @@ -174,10 +174,10 @@ public class BpmProcessInstanceCopyServiceImpl implements IBpmProcessInstanceCop } ).forEach(request -> { PortalTodoResponseDTO response = portalRequest.receiveCCRequest(request); - log.info("[taskCompleted][推送待办成功 response({})]", toJsonString(response)); + log.info("[taskCompleted][推送抄送成功 response({})]", toJsonString(response)); }); } catch (Exception e) { - log.error("[createProcessInstanceCopy][推送待办失败]", e); + log.error("[createProcessInstanceCopy][推送抄送失败]", e); } }