sx_yjb
/
sx_yjb_scheduled
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(config): 更新数据源配置及任务调度地址- 统一配置文件中的键值对分隔符为等号 

-修正MySQL和PostgreSQL驱动类名配置格式- 更新XXL-JOB管理端地址至新服务器
- 调整Druid连接池参数配置格式
- 新增除尘器锁气卸灰故障信号标签描述
dev
wangyan 2025-11-15 17:27:01 +08:00
parent 9c8df20545
commit cca4956573
4 changed files with 60 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/zcloud/scheduled/dataDocking/TagDescription.java
View File

@ -27,6 +27,12 @@ public enum TagDescription {
TAG338("2#除尘器出风口压力"), TAG338("2#除尘器出风口压力"),
TAG347("3#除尘器进风口压力"), TAG347("3#除尘器进风口压力"),
TAG348("3#除尘器出风口压力"), TAG348("3#除尘器出风口压力"),
TAG355("1#除尘器锁气卸灰故障信号南"),
TAG356("1#除尘器锁气卸灰故障信号北"),
TAG357("2#除尘器锁气卸灰故障信号南"),
TAG358("2#除尘器锁气卸灰故障信号北"),
TAG359("3#除尘器锁气卸灰故障信号南"),
TAG360("3#除尘器锁气卸灰故障信号北"),
TAG339("1#除尘器灰斗温度1#东南温度"), TAG339("1#除尘器灰斗温度1#东南温度"),
TAG340("1#除尘器灰斗温度1#东北温度"), TAG340("1#除尘器灰斗温度1#东北温度"),
TAG341("1#除尘器灰斗温度1#西南温度"), TAG341("1#除尘器灰斗温度1#西南温度"),

60
src/main/resources/application-dev.properties
View File

@ -1,9 +1,9 @@
datasource.no1.driver-class-name: com.mysql.cj.jdbc.Driver datasource.no1.driver-class-name=com.mysql.cj.jdbc.Driver
datasource.no1.url=jdbc:mysql://192.168.20.230:33080/integrated_yjb?allowPublicKeyRetrieval=true&serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 datasource.no1.url=jdbc:mysql://192.168.20.230:33080/integrated_yjb?allowPublicKeyRetrieval=true&serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8
datasource.no1.username=root datasource.no1.username=root
datasource.no1.password=Mysql@zcloud33080 datasource.no1.password=Mysql@zcloud33080
# #
datasource.no2.driver-class-name:org.postgresql.Driver datasource.no2.driver-class-name=org.postgresql.Driver
datasource.no2.url=jdbc:postgresql://39.100.115.58:15431/postgres?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=UTC datasource.no2.url=jdbc:postgresql://39.100.115.58:15431/postgres?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=UTC
datasource.no2.username=postgres datasource.no2.username=postgres
datasource.no2.password=DjIGYM8k0h datasource.no2.password=DjIGYM8k0h
@ -13,44 +13,44 @@ spring.redis.password=5.5pYdZqHxpR#9%W.
spring.redis.database=4 spring.redis.database=4
spring.redis.port=16379 spring.redis.port=16379
#druid连接池 #druid连接池
spring.datasource.type:com.alibaba.druid.pool.DruidDataSource spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
#最大活跃数 #最大活动数
spring.datasource.maxActive:20 spring.datasource.maxActive=20
#初始化数量 #初始化数量
spring.datasource.initialSize:1 spring.datasource.initialSize=1
#最大连接等待超时时间 #最大连接等待超时时间
spring.datasource.maxWait:60000 spring.datasource.maxWait=60000
#打开PSCache，并且指定每个连接PSCache的大小 #打开PSCache，并且指定每个连接PSCache的大小
spring.datasource.poolPreparedStatements:true spring.datasource.poolPreparedStatements=true
spring.datasource.maxPoolPreparedStatementPerConnectionSize:20 spring.datasource.maxPoolPreparedStatementPerConnectionSize=20
#通过connectionProperties属性来打开mergeSql功能；慢SQL记录 #通过connectionProperties属性来打开mergeSql功能；慢SQL记录
#connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000 #connectionProperties= druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
spring.datasource.minIdle:1 spring.datasource.minIdle=1
spring.datasource.timeBetweenEvictionRunsMillis:60000 spring.datasource.timeBetweenEvictionRunsMillis=60000
spring.datasource.minEvictableIdleTimeMillis:300000 spring.datasource.minEvictableIdleTimeMillis=300000
spring.datasource.validationQuery:select 1 from dual spring.datasource.validationQuery=select 1 from dual
spring.datasource.testWhileIdle:true spring.datasource.testWhileIdle=true
spring.datasource.testOnBorrow:false spring.datasource.testOnBorrow=false
spring.datasource.testOnReturn:false spring.datasource.testOnReturn=false
#配置监控统计拦截的filters，去掉后监控界面sql将无法统计,'wall'用于防火墙 #配置监控统计拦截的filters，去掉后监控界面sql将无法统计,'wall'用于防火墙
filters:stat, wall, log4j filters=stat, wall, log4j
#缓存配置文件位置 #缓存配置文件位置
spring.cache.ehcache.cofnig=ehcache.xml spring.cache.ehcache.cofnig=ehcache.xml
#配置这句话,控制台输出sql语句 #配置这句话,控制台输出sql语句
logging.level.com.zcloud.mapper=debug logging.level.com.zcloud.mapper=debug
#上传文件大小限制 #上传文件大小限制
spring.servlet.multipart.max-file-size=500MB spring.servlet.multipart.max-file-size=500MB
spring.servlet.multipart.max-request-size=500MB spring.servlet.multipart.max-request-size=500MB
#activiti模型检测 #activiti模型检测
spring.activiti.check-process-definitions=false spring.activiti.check-process-definitions=false
#字符 #字符
server.servlet.encoding.charset=UTF-8 server.servlet.encoding.charset=UTF-8
server.servlet.encoding.force=true server.servlet.encoding.force=true
server.servlet.encoding.enabled=true server.servlet.encoding.enabled=true
spring.main.banner-mode=off spring.main.banner-mode=off
xxl.job.admin.addresses=http://192.168.20.230:28080/xxl-job-admin xxl.job.admin.addresses=http://172.16.70.226:8084/xxl-job-admin
xxl.job.accessToken=yjb.prod xxl.job.accessToken=yjb.prod
xxl.job.port=1211 xxl.job.port=1211
xxl.job.executor.appname=yjb-job-normal-task xxl.job.executor.appname=yjb-job-normal-task

42
src/main/resources/application-local.properties
View File

@ -1,13 +1,13 @@
datasource.no1.driver-class-name: com.mysql.cj.jdbc.Driver datasource.no1.driver-class-name=com.mysql.cj.jdbc.Driver
datasource.no1.url=jdbc:mysql://172.16.70.228:33080/sx_yjb?allowPublicKeyRetrieval=true&serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 datasource.no1.url=jdbc:mysql://172.16.70.228:33080/sx_yjb?allowPublicKeyRetrieval=true&serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8
datasource.no1.username=root datasource.no1.username=root
datasource.no1.password=Mysql@zcloud33080 datasource.no1.password=Mysql@zcloud33080
# #
datasource.no2.driver-class-name:org.postgresql.Driver datasource.no2.driver-class-name=org.postgresql.Driver
datasource.no2.url=jdbc:postgresql://172.16.70.228:15431/postgres?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=UTC datasource.no2.url=jdbc:postgresql://172.16.70.228:15431/postgres?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=UTC
datasource.no2.username=postgres datasource.no2.username=postgres
datasource.no2.password=Mysql@zcloud15431 datasource.no2.password=Mysql@zcloud15431
#MES系统数据库配置 #MES系统数据库配置
datasource.mes.driver-class-name=oracle.jdbc.driver.OracleDriver datasource.mes.driver-class-name=oracle.jdbc.driver.OracleDriver
datasource.mes.url=jdbc:oracle:thin:@172.16.90.252:1521/jymes datasource.mes.url=jdbc:oracle:thin:@172.16.90.252:1521/jymes
datasource.mes.username=drzf datasource.mes.username=drzf
@ -23,27 +23,27 @@ spring.redis.database=10
spring.redis.port=16379 spring.redis.port=16379
#druid连接池 #druid连接池
spring.datasource.type:com.alibaba.druid.pool.DruidDataSource spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
#最大活跃数 #最大活动数
spring.datasource.maxActive:20 spring.datasource.maxActive=20
#初始化数量 #初始化数量
spring.datasource.initialSize:1 spring.datasource.initialSize=1
#最大连接等待超时时间 #最大连接等待超时时间
spring.datasource.maxWait:60000 spring.datasource.maxWait=60000
#打开PSCache，并且指定每个连接PSCache的大小 #打开PSCache，并且指定每个连接PSCache的大小
spring.datasource.poolPreparedStatements:true spring.datasource.poolPreparedStatements=true
spring.datasource.maxPoolPreparedStatementPerConnectionSize:20 spring.datasource.maxPoolPreparedStatementPerConnectionSize=20
#通过connectionProperties属性来打开mergeSql功能；慢SQL记录 #通过connectionProperties属性来打开mergeSql功能；慢SQL记录
#connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000 #connectionProperties= druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
spring.datasource.minIdle:1 spring.datasource.minIdle=1
spring.datasource.timeBetweenEvictionRunsMillis:60000 spring.datasource.timeBetweenEvictionRunsMillis=60000
spring.datasource.minEvictableIdleTimeMillis:300000 spring.datasource.minEvictableIdleTimeMillis=300000
spring.datasource.validationQuery:select 1 from dual spring.datasource.validationQuery=select 1 from dual
spring.datasource.testWhileIdle:true spring.datasource.testWhileIdle=true
spring.datasource.testOnBorrow:false spring.datasource.testOnBorrow=false
spring.datasource.testOnReturn:false spring.datasource.testOnReturn=false
#配置监控统计拦截的filters，去掉后监控界面sql将无法统计,'wall'用于防火墙 #配置监控统计拦截的filters，去掉后监控界面sql将无法统计,'wall'用于防火墙
filters:stat, wall, log4j filters=stat, wall, log4j
#缓存配置文件位置 #缓存配置文件位置
spring.cache.ehcache.cofnig=ehcache.xml spring.cache.ehcache.cofnig=ehcache.xml
#配置这句话,控制台输出sql语句 #配置这句话,控制台输出sql语句
@ -59,10 +59,8 @@ server.servlet.encoding.force=true
server.servlet.encoding.enabled=true server.servlet.encoding.enabled=true
spring.main.banner-mode=off spring.main.banner-mode=off
xxl.job.admin.addresses=http://192.168.20.230:28080/xxl-job-admin xxl.job.admin.addresses=http://172.16.70.226:8084/xxl-job-admin
xxl.job.accessToken=yjb.prod xxl.job.accessToken=yjb.prod
xxl.job.port=1211 xxl.job.port=1211
xxl.job.executor.appname=yjb-job-normal-task xxl.job.executor.appname=yjb-job-normal-task
xxl.job.executor.logretentiondays=30 xxl.job.executor.logretentiondays=30

4
src/main/resources/application-master.properties
View File

@ -50,8 +50,8 @@ server.servlet.encoding.enabled=true
spring.main.banner-mode=off spring.main.banner-mode=off
xxl.job.admin.addresses=http://10.199.64.30:9001/xxl-job-admin/ xxl.job.admin.addresses=http://172.16.70.226:8084/xxl-job-admin
xxl.job.accessToken=yjb.prod xxl.job.accessToken=yjb.prod
xxl.job.port=10000 xxl.job.port=1211
xxl.job.executor.appname=yjb-job-normal-task xxl.job.executor.appname=yjb-job-normal-task
xxl.job.executor.logretentiondays=30 xxl.job.executor.logretentiondays=30