From dd0164de8f1a7f6fa795541752d5656ee63c3163 Mon Sep 17 00:00:00 2001 From: liwenxuan <1298531568@qq.com> Date: Fri, 13 Mar 2026 13:42:07 +0800 Subject: [PATCH] 2 --- dlp/task-unpeek/src/main/resources/bootstrap.yml | 8 ++++++++ dlp/task-unpeeks/src/main/resources/bootstrap-dev.yml | 6 +++--- dlp/task-unpeeks/src/main/resources/bootstrap.yml | 7 ++++++- .../com/lnsoft/sdhxgk/job/alarm/JobAlarmApplication.java | 6 ++++++ job/job-alarm/src/main/resources/bootstrap.yml | 8 ++++---- job/pom.xml | 3 ++- 6 files changed, 29 insertions(+), 9 deletions(-) diff --git a/dlp/task-unpeek/src/main/resources/bootstrap.yml b/dlp/task-unpeek/src/main/resources/bootstrap.yml index abfd381..1bee756 100644 --- a/dlp/task-unpeek/src/main/resources/bootstrap.yml +++ b/dlp/task-unpeek/src/main/resources/bootstrap.yml @@ -45,3 +45,11 @@ mybatis-plus: #生产时打开 local-url: +time: + flag: + cron: 0 0 0/2 * * ? +login: + userName: admin,300010,300043,204750,300736,303106,301502,303122,202289,302518,303005,302510,300214,302854 +chose: + #当前所属公司的设备根节点 + factory: HXJT \ No newline at end of file diff --git a/dlp/task-unpeeks/src/main/resources/bootstrap-dev.yml b/dlp/task-unpeeks/src/main/resources/bootstrap-dev.yml index 107667e..bb57836 100644 --- a/dlp/task-unpeeks/src/main/resources/bootstrap-dev.yml +++ b/dlp/task-unpeeks/src/main/resources/bootstrap-dev.yml @@ -1,5 +1,5 @@ server: - port: 29935 + port: 29936 spring: application: # 应用名称 @@ -13,10 +13,10 @@ spring: password: nacos discovery: # 服务注册地址（开发环境） - server-addr: ${NACOS_DISCOVERY_SERVER_ADDR:22.40.215.194:16481} + server-addr: ${NACOS_DISCOVERY_SERVER_ADDR:172.20.2.57:8848} namespace: dlp config: - server-addr: ${NACOS_DISCOVERY_SERVER_ADDR:22.40.215.194:16481} + server-addr: ${NACOS_DISCOVERY_SERVER_ADDR:172.20.2.57:8848} file-extension: yml namespace: dlp mybatis-plus: diff --git a/dlp/task-unpeeks/src/main/resources/bootstrap.yml b/dlp/task-unpeeks/src/main/resources/bootstrap.yml index 8d7dc2f..e88883f 100644 --- a/dlp/task-unpeeks/src/main/resources/bootstrap.yml +++ b/dlp/task-unpeeks/src/main/resources/bootstrap.yml @@ -1,6 +1,6 @@ spring: profiles: - active: prod + active: dev #server: # port: 29917 #spring: @@ -44,3 +44,8 @@ spring: # ##生产时打开 #local-url: +chose: + factory: HXGK + +login: + userName: admin,300010,300043,204750,300736,303106,301502,303122,202289,302518,303005,302510,300214,302854 \ No newline at end of file diff --git a/job/job-alarm/src/main/java/com/lnsoft/sdhxgk/job/alarm/JobAlarmApplication.java b/job/job-alarm/src/main/java/com/lnsoft/sdhxgk/job/alarm/JobAlarmApplication.java index dc90576..f8e4953 100644 --- a/job/job-alarm/src/main/java/com/lnsoft/sdhxgk/job/alarm/JobAlarmApplication.java +++ b/job/job-alarm/src/main/java/com/lnsoft/sdhxgk/job/alarm/JobAlarmApplication.java @@ -9,13 +9,19 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.web.servlet.ServletComponentScan; import org.springframework.context.ConfigurableApplicationContext; +import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.FilterType; @ServletComponentScan @SpringBootApplication(scanBasePackages = {"com.lnsoft"}) @Configuration @EnableSwaggerBootstrapUI @MapperScan("com.lnsoft.sdhxgk.**.mapper") +@ComponentScan(excludeFilters = { + @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, + classes = com.lnsoft.sdhxgk.rtd.RtdClients.class) +}) public class JobAlarmApplication { private static final Logger LOGGER = LoggerFactory diff --git a/job/job-alarm/src/main/resources/bootstrap.yml b/job/job-alarm/src/main/resources/bootstrap.yml index 0a407cb..dd5f2f5 100644 --- a/job/job-alarm/src/main/resources/bootstrap.yml +++ b/job/job-alarm/src/main/resources/bootstrap.yml @@ -17,20 +17,20 @@ spring: nacos: discovery: # 服务注册地址（开发环境） - server-addr: ${NACOS_DISCOVERY_SERVER_ADDR:172.20.5.121:8848} + server-addr: ${NACOS_DISCOVERY_SERVER_ADDR:172.20.2.57:8848} # server-addr: ${NACOS_DISCOVERY_SERVER_ADDR:22.40.215.149:8888} #本地此时打开 - namespace: test + namespace: dlp config: # 配置中心地址（开发环境） - server-addr: ${NACOS_DISCOVERY_SERVER_ADDR:172.20.5.121:8848} + server-addr: ${NACOS_DISCOVERY_SERVER_ADDR:172.20.2.57:8848} # server-addr: ${NACOS_DISCOVERY_SERVER_ADDR:22.40.215.149:8888} # 配置文件格式 file-extension: yml # 共享配置 shared-dataids: application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} #本地此时打开 - namespace: test + namespace: dlp username: nacos password: nacos diff --git a/job/pom.xml b/job/pom.xml index 96c62a7..72f0f70 100644 --- a/job/pom.xml +++ b/job/pom.xml @@ -13,9 +13,10 @@ pom + job-service job-alarm