From 05008e62a8dcc4f64726bd1ccd6f28154356cc51 Mon Sep 17 00:00:00 2001 From: lyf66 Date: Fri, 15 Aug 2025 14:41:51 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=85=AC=E5=8F=B8?= =?UTF-8?q?=E6=9C=BA=E6=88=BF=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-gs.yml | 105 ++++++++++++++++++++++++++ 1 file changed, 105 insertions(+) create mode 100644 src/main/resources/application-gs.yml diff --git a/src/main/resources/application-gs.yml b/src/main/resources/application-gs.yml new file mode 100644 index 0000000..296e324 --- /dev/null +++ b/src/main/resources/application-gs.yml @@ -0,0 +1,105 @@ + +server: + port: 20020 + servlet: + context-path: /fxkhtxl + session: + # 配置会话超时 + timeout: 120s + encoding: + charset: UTF-8 + enabled: true + force: true +spring: + #数据库配置 + datasource: + type: com.alibaba.druid.pool.DruidDataSource + driver-class-name: dm.jdbc.driver.DmDriver +# url: jdbc:dm://local.gunshiiot.com:5236?schema=FXKH_TXL +# username: SYSDBA +# password: SYSDBA001 + url: jdbc:dm://10.0.41.113:5236?schema=FXKH_TXL + username: SYSDBA + password: SYSDBA001 + druid: + initialSize: 5 + minIdle: 5 + maxActive: 20 + maxWait: 60000 + timeBetweenEvictionRunsMillis: 60000 + minEvictableIdleTimeMillis: 300000 + validationQuery: SELECT1FROMDUAL + testWhileIdle: true + testOnBorrow: false + testOnReturn: false + filters: stat,wall,log4j #wall表示排除防火请 + logSlowSql: true + + + #jpa配置 + jpa: + properties: + hibernate: + dialect: org.hibernate.dialect.DmDialect + + # Redis + redis: + database: 5 + host: 10.42.6.75 + password: Whdc_890 +# host: 10.0.41.112 +# password: 1234567a +# host: 127.0.0.1 +# password: + port: 6379 + servlet: + multipart: + max-file-size: 1100MB + max-request-size: 1100MB + +knife4j: + enable: true + setting: + enableFooter: false + enableFooterCustom: true + footerCustomContent: Copyright 2018-[湖北纬皓端成科技有限公司](http://www.wavehorizon.cn) + + documents: # 文档配置，可配置多个分组 + - group: doc-knife4j-1.0.0 + name: MarkDown文档 + locations: classpath:markdown/* + - group: v1.0 + name: v1.0 + + +logging: + level.org.springframework.boot.autoconfigure: error #spring的自动装配日志只打error，否则debug输出的会打印很多自动装配的log信息到控制台 + config: classpath:logback-spring.xml + +mybatis-plus: + global-config: + db-config: + update-strategy: not_empty + insert-strategy: not_empty + +wx: + miniapp: + configs: + appid: wxb9b07668d1ba20fe + secret: 99a1b89ac30e28bcc9bba8be973027f4 + +#getGroupWarning: http://223.75.53.141:8000/shzh/met/zyqxfw/api/warning/getGroupWarning +getGroupWarning: http://127.0.0.1:20000/shzh/met/zyqxfw/api/warning/getGroupWarning + +autocall: + sysUserId: HBSL01 + processId: 1952550108058906626 +# processId: 1934801506242949122 +# callerGroup: 02160980358 + callerGroup: 02759325005 + secret: yxt@2024-1234567 +sms: + url: http://120.55.193.51:8098/smtp/http/submit + userName: hbfx15 + serviceCode: hbfx15 + userPassword: hbfx15 From b403c4b2fc573741a88d9673c61a8d70bef27be0 Mon Sep 17 00:00:00 2001 From: lyf66 Date: Fri, 15 Aug 2025 14:45:54 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=85=AC=E5=8F=B8?= =?UTF-8?q?=E6=9C=BA=E6=88=BF=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/whdc/component/AutoCallTaskScheduled.java | 2 +- src/main/resources/application-gs.yml | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/whdc/component/AutoCallTaskScheduled.java b/src/main/java/com/whdc/component/AutoCallTaskScheduled.java index c52435b..228919b 100644 --- a/src/main/java/com/whdc/component/AutoCallTaskScheduled.java +++ b/src/main/java/com/whdc/component/AutoCallTaskScheduled.java @@ -28,7 +28,7 @@ import java.util.concurrent.atomic.AtomicBoolean; */ @Component @Slf4j -@Profile({"default"}) +@Profile({"gs"}) public class AutoCallTaskScheduled { @Autowired diff --git a/src/main/resources/application-gs.yml b/src/main/resources/application-gs.yml index 296e324..72400b8 100644 --- a/src/main/resources/application-gs.yml +++ b/src/main/resources/application-gs.yml @@ -43,10 +43,12 @@ spring: dialect: org.hibernate.dialect.DmDialect # Redis - redis: - database: 5 - host: 10.42.6.75 - password: Whdc_890 + data: + redis: + host: 10.0.41.112 + port: 6379 + password: 1234567a + database: 4 # host: 10.0.41.112 # password: 1234567a # host: 127.0.0.1 From 67d637e797c450d8352379c8172ea679f6d46392 Mon Sep 17 00:00:00 2001 From: lyf66 Date: Thu, 21 Aug 2025 09:28:40 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../component/AutoCallTaskScheduledGS.java | 53 +++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 src/main/java/com/whdc/component/AutoCallTaskScheduledGS.java diff --git a/src/main/java/com/whdc/component/AutoCallTaskScheduledGS.java b/src/main/java/com/whdc/component/AutoCallTaskScheduledGS.java new file mode 100644 index 0000000..443cdf3 --- /dev/null +++ b/src/main/java/com/whdc/component/AutoCallTaskScheduledGS.java @@ -0,0 +1,53 @@ +package com.whdc.component; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.whdc.mapper.AutoCallConfigMapper; +import com.whdc.mapper.AutoCallPersonMapper; +import com.whdc.model.autocall.AutoCallPerson; +import com.whdc.model.autocall.AutoCallTask; +import com.whdc.service.autocall.AutoCallTaskService2; +import com.whdc.utils.AutoCallHelper; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.context.event.ApplicationReadyEvent; +import org.springframework.context.annotation.Profile; +import org.springframework.context.event.EventListener; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +import javax.annotation.PreDestroy; +import java.util.List; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.atomic.AtomicBoolean; + +/** + * @author lyf + * @since 2025-06-20 + */ +@Component +@Slf4j +@Profile({"gs"}) +public class AutoCallTaskScheduledGS { + + @Autowired + private AutoCallTaskService2 autoCallTaskService; + @Autowired + private AutoCallPersonMapper personMapper; + @Autowired + private AutoCallConfigMapper configMapper; + @Autowired + private AutoCallHelper autoCallHelper; + + private final AtomicBoolean initialized = new AtomicBoolean(false); + + + //早上10点后，晚上24点前，每隔15分钟执行一次 + @Scheduled(cron = "0 0/15 10-23 * * ?") + public void generateTaskLoop() { +// autoCallTaskService.generateFakeCallLyfOnly(); + } + + +} From 0f5da02353dd7a9a5d8766aa8d17854283725140 Mon Sep 17 00:00:00 2001 From: lyf66 Date: Thu, 25 Sep 2025 15:21:37 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E5=85=B3=E9=97=AD=E5=91=BC=E5=8F=AB=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/whdc/component/AutoCallTaskScheduled.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/whdc/component/AutoCallTaskScheduled.java b/src/main/java/com/whdc/component/AutoCallTaskScheduled.java index 228919b..2eaf9b4 100644 --- a/src/main/java/com/whdc/component/AutoCallTaskScheduled.java +++ b/src/main/java/com/whdc/component/AutoCallTaskScheduled.java @@ -43,7 +43,7 @@ public class AutoCallTaskScheduled { private final AtomicBoolean initialized = new AtomicBoolean(false); private final ExecutorService executorService = Executors.newCachedThreadPool(); - @EventListener(ApplicationReadyEvent.class) + // @EventListener(ApplicationReadyEvent.class) public void initialize() throws Exception { try { autoCallHelper.getToken(); From f81faf86ef9ed5bb9f8539403a845cb447cab913 Mon Sep 17 00:00:00 2001 From: lyf66 Date: Sun, 28 Sep 2025 16:57:15 +0800 Subject: [PATCH 5/5] =?UTF-8?q?chore(config):=20=E7=AE=80=E5=8C=96Redis?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 移除了多余的data层级嵌套 - 统一了Redis连接配置格式- 保留了必要的连接参数（host、port、password、database） - 清理了注释掉的重复配置项 --- src/main/resources/application-gs.yml | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/main/resources/application-gs.yml b/src/main/resources/application-gs.yml index 72400b8..558932e 100644 --- a/src/main/resources/application-gs.yml +++ b/src/main/resources/application-gs.yml @@ -43,17 +43,11 @@ spring: dialect: org.hibernate.dialect.DmDialect # Redis - data: - redis: - host: 10.0.41.112 - port: 6379 - password: 1234567a - database: 4 -# host: 10.0.41.112 -# password: 1234567a -# host: 127.0.0.1 -# password: + redis: + host: 10.0.41.112 port: 6379 + password: 1234567a + database: 4 servlet: multipart: max-file-size: 1100MB