From 92caef1c7aaa76c143bf607077f1cc4984aea678 Mon Sep 17 00:00:00 2001 From: zzs Date: Thu, 26 Sep 2024 16:27:35 +0800 Subject: [PATCH] chore:use remote db --- .../ensign-module-crm-biz/pom.xml | 8 ++++++ .../crm/controller/crm/ProxyController.java | 2 +- .../module/crm/job/UserSyncKingdeeTask.java | 25 +++++++++++++++++++ .../src/main/resources/application-local.yaml | 19 +++++--------- 4 files changed, 40 insertions(+), 14 deletions(-) create mode 100644 ensign-module-crm/ensign-module-crm-biz/src/main/java/com/ensign/crm/module/crm/job/UserSyncKingdeeTask.java diff --git a/ensign-module-crm/ensign-module-crm-biz/pom.xml b/ensign-module-crm/ensign-module-crm-biz/pom.xml index 5d565f3..cba004a 100644 --- a/ensign-module-crm/ensign-module-crm-biz/pom.xml +++ b/ensign-module-crm/ensign-module-crm-biz/pom.xml @@ -65,5 +65,13 @@ httpclient + + com.ensign + ensign-spring-boot-starter-job + + + com.ensign + ensign-spring-boot-starter-biz-tenant + diff --git a/ensign-module-crm/ensign-module-crm-biz/src/main/java/com/ensign/crm/module/crm/controller/crm/ProxyController.java b/ensign-module-crm/ensign-module-crm-biz/src/main/java/com/ensign/crm/module/crm/controller/crm/ProxyController.java index e1c073f..952a4d0 100644 --- a/ensign-module-crm/ensign-module-crm-biz/src/main/java/com/ensign/crm/module/crm/controller/crm/ProxyController.java +++ b/ensign-module-crm/ensign-module-crm-biz/src/main/java/com/ensign/crm/module/crm/controller/crm/ProxyController.java @@ -220,7 +220,7 @@ public class ProxyController { if (accessToken != null && !accessToken.isEmpty()) { Long expireTime = (Long) data.get("expire_time"); - redisTemplate.opsForValue().set(redisKingdeeKey, accessToken, expireTime - 3000, TimeUnit.MICROSECONDS); + redisTemplate.opsForValue().set(redisKingdeeKey, accessToken, expireTime / 1000 - 3000, TimeUnit.MICROSECONDS); return accessToken; } } diff --git a/ensign-module-crm/ensign-module-crm-biz/src/main/java/com/ensign/crm/module/crm/job/UserSyncKingdeeTask.java b/ensign-module-crm/ensign-module-crm-biz/src/main/java/com/ensign/crm/module/crm/job/UserSyncKingdeeTask.java new file mode 100644 index 0000000..cf663fe --- /dev/null +++ b/ensign-module-crm/ensign-module-crm-biz/src/main/java/com/ensign/crm/module/crm/job/UserSyncKingdeeTask.java @@ -0,0 +1,25 @@ +package com.ensign.crm.module.crm.job; + +import com.ensign.crm.framework.quartz.core.handler.JobHandler; +import com.ensign.crm.framework.tenant.core.aop.TenantIgnore; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +/** + * @Description: TODO + * @Date: 2024/9/26 14:06 + * @Created: by ZZSLL + */ + +@Slf4j +@Component +public class UserSyncKingdeeTask implements JobHandler { + + + + @Override + @TenantIgnore + public String execute(String param) throws Exception { + return ""; + } +} diff --git a/ensign-server/src/main/resources/application-local.yaml b/ensign-server/src/main/resources/application-local.yaml index c3dceda..7264794 100644 --- a/ensign-server/src/main/resources/application-local.yaml +++ b/ensign-server/src/main/resources/application-local.yaml @@ -46,16 +46,9 @@ spring: primary: master datasource: master: - url: jdbc:mysql://127.0.0.1:3306/ruoyi-vue-pro?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 - # url: jdbc:mysql://127.0.0.1:3306/ruoyi-vue-pro?useSSL=true&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai # MySQL Connector/J 5.X 连接的示例 - # url: jdbc:postgresql://127.0.0.1:5432/ruoyi-vue-pro # PostgreSQL 连接的示例 - # url: jdbc:oracle:thin:@127.0.0.1:1521:xe # Oracle 连接的示例 - # url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=ruoyi-vue-pro;SelectMethod=cursor;encrypt=false;rewriteBatchedStatements=true;useUnicode=true;characterEncoding=utf-8 # SQLServer 连接的示例 - # url: jdbc:dm://127.0.0.1:5236?schema=RUOYI_VUE_PRO # DM 连接的示例 - # url: jdbc:kingbase8://127.0.0.1:54321/test # 人大金仓 KingbaseES 连接的示例 - # url: jdbc:postgresql://127.0.0.1:5432/postgres # OpenGauss 连接的示例 - username: root - password: root + url: jdbc:mysql://10.64.111.141:3306/ensign-crm-test?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 + username: crmuser + password: yx.CRM.user@240920 # username: sa # SQL Server 连接的示例 # password: Ensign@2024 # SQL Server 连接的示例 # username: SYSDBA # DM 连接的示例 @@ -64,9 +57,9 @@ spring: # password: Ensign@2024 # OpenGauss 连接的示例 slave: # 模拟从库，可根据自己需要修改 lazy: true # 开启懒加载，保证启动速度 - url: jdbc:mysql://127.0.0.1:3306/ruoyi-vue-pro?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true - username: root - password: root + url: jdbc:mysql://10.64.111.141:3306/ensign-crm-test?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 + username: crmuser + password: yx.CRM.user@240920 # Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优 redis: