feat(config): 更新数据源配置及任务调度地址- 统一配置文件中的键值对分隔符为等号
-修正MySQL和PostgreSQL驱动类名配置格式- 更新XXL-JOB管理端地址至新服务器 - 调整Druid连接池参数配置格式 - 新增除尘器锁气卸灰故障信号标签描述dev
wangyan
parent
9c8df20545
commit
cca4956573
|
|
@ -27,6 +27,12 @@ public enum TagDescription {
|
|||
TAG338("2#除尘器出风口压力"),
|
||||
TAG347("3#除尘器进风口压力"),
|
||||
TAG348("3#除尘器出风口压力"),
|
||||
TAG355("1#除尘器锁气卸灰故障信号南"),
|
||||
TAG356("1#除尘器锁气卸灰故障信号北"),
|
||||
TAG357("2#除尘器锁气卸灰故障信号南"),
|
||||
TAG358("2#除尘器锁气卸灰故障信号北"),
|
||||
TAG359("3#除尘器锁气卸灰故障信号南"),
|
||||
TAG360("3#除尘器锁气卸灰故障信号北"),
|
||||
TAG339("1#除尘器灰斗温度1#东南温度"),
|
||||
TAG340("1#除尘器灰斗温度1#东北温度"),
|
||||
TAG341("1#除尘器灰斗温度1#西南温度"),
|
||||
|
|
|
|||
|
|
@ -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.username=root
|
||||
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.username=postgres
|
||||
datasource.no2.password=DjIGYM8k0h
|
||||
|
|
@ -13,45 +13,45 @@ spring.redis.password=5.5pYdZqHxpR#9%W.
|
|||
spring.redis.database=4
|
||||
spring.redis.port=16379
|
||||
|
||||
#druidè¿æ¥æ±
|
||||
spring.datasource.type:com.alibaba.druid.pool.DruidDataSource
|
||||
#æ大活è·æ°
|
||||
spring.datasource.maxActive:20
|
||||
#åå§åæ°é
|
||||
spring.datasource.initialSize:1
|
||||
#æ大è¿æ¥çå¾
è¶
æ¶æ¶é´
|
||||
spring.datasource.maxWait:60000
|
||||
#æå¼PSCacheï¼å¹¶ä¸æå®æ¯ä¸ªè¿æ¥PSCacheç大å°
|
||||
spring.datasource.poolPreparedStatements:true
|
||||
spring.datasource.maxPoolPreparedStatementPerConnectionSize:20
|
||||
#éè¿connectionPropertieså±æ§æ¥æå¼mergeSqlåè½ï¼æ
¢SQLè®°å½
|
||||
#connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
|
||||
spring.datasource.minIdle:1
|
||||
spring.datasource.timeBetweenEvictionRunsMillis:60000
|
||||
spring.datasource.minEvictableIdleTimeMillis:300000
|
||||
spring.datasource.validationQuery:select 1 from dual
|
||||
spring.datasource.testWhileIdle:true
|
||||
spring.datasource.testOnBorrow:false
|
||||
spring.datasource.testOnReturn:false
|
||||
#é
ç½®çæ§ç»è®¡æ¦æªçfiltersï¼å»æåçæ§çé¢sqlå°æ æ³ç»è®¡,'wall'ç¨äºé²ç«å¢
|
||||
filters:stat, wall, log4j
|
||||
#ç¼åé
ç½®æ件ä½ç½®
|
||||
#druid连接池
|
||||
spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
|
||||
#最大活动数
|
||||
spring.datasource.maxActive=20
|
||||
#初始化数量
|
||||
spring.datasource.initialSize=1
|
||||
#最大连接等待超时时间
|
||||
spring.datasource.maxWait=60000
|
||||
#打开PSCache，并且指定每个连接PSCache的大小
|
||||
spring.datasource.poolPreparedStatements=true
|
||||
spring.datasource.maxPoolPreparedStatementPerConnectionSize=20
|
||||
#通过connectionProperties属性来打开mergeSql功能；慢SQL记录
|
||||
#connectionProperties= druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
|
||||
spring.datasource.minIdle=1
|
||||
spring.datasource.timeBetweenEvictionRunsMillis=60000
|
||||
spring.datasource.minEvictableIdleTimeMillis=300000
|
||||
spring.datasource.validationQuery=select 1 from dual
|
||||
spring.datasource.testWhileIdle=true
|
||||
spring.datasource.testOnBorrow=false
|
||||
spring.datasource.testOnReturn=false
|
||||
#配置监控统计拦截的filters，去掉后监控界面sql将无法统计,'wall'用于防火墙
|
||||
filters=stat, wall, log4j
|
||||
#缓存配置文件位置
|
||||
spring.cache.ehcache.cofnig=ehcache.xml
|
||||
#é
ç½®è¿å¥è¯,æ§å¶å°è¾åºsqlè¯å¥
|
||||
#配置这句话,控制台输出sql语句
|
||||
logging.level.com.zcloud.mapper=debug
|
||||
#ä¸ä¼ æ件大å°éå¶
|
||||
#上传文件大小限制
|
||||
spring.servlet.multipart.max-file-size=500MB
|
||||
spring.servlet.multipart.max-request-size=500MB
|
||||
#activiti模åæ£æµ
|
||||
#activiti模型检测
|
||||
spring.activiti.check-process-definitions=false
|
||||
#å符
|
||||
#字符
|
||||
server.servlet.encoding.charset=UTF-8
|
||||
server.servlet.encoding.force=true
|
||||
server.servlet.encoding.enabled=true
|
||||
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.port=1211
|
||||
xxl.job.executor.appname=yjb-job-normal-task
|
||||
xxl.job.executor.logretentiondays=30
|
||||
xxl.job.executor.logretentiondays=30
|
||||
|
|
@ -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.username=root
|
||||
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.username=postgres
|
||||
datasource.no2.password=Mysql@zcloud15431
|
||||
#MES系统数据库配置
|
||||
#MESç³»ç»æ°æ®åºé
ç½®
|
||||
datasource.mes.driver-class-name=oracle.jdbc.driver.OracleDriver
|
||||
datasource.mes.url=jdbc:oracle:thin:@172.16.90.252:1521/jymes
|
||||
datasource.mes.username=drzf
|
||||
|
|
@ -23,27 +23,27 @@ spring.redis.database=10
|
|||
spring.redis.port=16379
|
||||
|
||||
#druidè¿æ¥æ±
|
||||
spring.datasource.type:com.alibaba.druid.pool.DruidDataSource
|
||||
#æ大活è·æ°
|
||||
spring.datasource.maxActive:20
|
||||
spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
|
||||
#æ大活å¨æ°
|
||||
spring.datasource.maxActive=20
|
||||
#åå§åæ°é
|
||||
spring.datasource.initialSize:1
|
||||
spring.datasource.initialSize=1
|
||||
#æ大è¿æ¥çå¾
è¶
æ¶æ¶é´
|
||||
spring.datasource.maxWait:60000
|
||||
spring.datasource.maxWait=60000
|
||||
#æå¼PSCacheï¼å¹¶ä¸æå®æ¯ä¸ªè¿æ¥PSCacheç大å°
|
||||
spring.datasource.poolPreparedStatements:true
|
||||
spring.datasource.maxPoolPreparedStatementPerConnectionSize:20
|
||||
spring.datasource.poolPreparedStatements=true
|
||||
spring.datasource.maxPoolPreparedStatementPerConnectionSize=20
|
||||
#éè¿connectionPropertieså±æ§æ¥æå¼mergeSqlåè½ï¼æ
¢SQLè®°å½
|
||||
#connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
|
||||
spring.datasource.minIdle:1
|
||||
spring.datasource.timeBetweenEvictionRunsMillis:60000
|
||||
spring.datasource.minEvictableIdleTimeMillis:300000
|
||||
spring.datasource.validationQuery:select 1 from dual
|
||||
spring.datasource.testWhileIdle:true
|
||||
spring.datasource.testOnBorrow:false
|
||||
spring.datasource.testOnReturn:false
|
||||
#connectionProperties= druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
|
||||
spring.datasource.minIdle=1
|
||||
spring.datasource.timeBetweenEvictionRunsMillis=60000
|
||||
spring.datasource.minEvictableIdleTimeMillis=300000
|
||||
spring.datasource.validationQuery=select 1 from dual
|
||||
spring.datasource.testWhileIdle=true
|
||||
spring.datasource.testOnBorrow=false
|
||||
spring.datasource.testOnReturn=false
|
||||
#é
ç½®çæ§ç»è®¡æ¦æªçfiltersï¼å»æåçæ§çé¢sqlå°æ æ³ç»è®¡,'wall'ç¨äºé²ç«å¢
|
||||
filters:stat, wall, log4j
|
||||
filters=stat, wall, log4j
|
||||
#ç¼åé
ç½®æ件ä½ç½®
|
||||
spring.cache.ehcache.cofnig=ehcache.xml
|
||||
#é
ç½®è¿å¥è¯,æ§å¶å°è¾åºsqlè¯å¥
|
||||
|
|
@ -59,10 +59,8 @@ server.servlet.encoding.force=true
|
|||
server.servlet.encoding.enabled=true
|
||||
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.port=1211
|
||||
xxl.job.executor.appname=yjb-job-normal-task
|
||||
xxl.job.executor.logretentiondays=30
|
||||
|
||||
|
||||
xxl.job.executor.logretentiondays=30
|
||||
|
|
@ -50,8 +50,8 @@ server.servlet.encoding.enabled=true
|
|||
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.port=10000
|
||||
xxl.job.port=1211
|
||||
xxl.job.executor.appname=yjb-job-normal-task
|
||||
xxl.job.executor.logretentiondays=30
|
||||
|
|
|
|||
Loading…
Reference in New Issue