#服务默认配置整理

hzims-service/assets/src/main/resources/template/template.yml

@@ -1,22 +1,13 @@
-
 #服务器端口
 server:
   port: 8599
 
-
 #mybatis-plus配置
 mybatis-plus:
   mapper-locations: classpath:com/hnac/hzims/**/mapper/*Mapper.xml
   #实体扫描，多个package用逗号或者分号分隔
   typeAliasesPackage: com.hnac.hzims.**.entity
 
-#数据源配置
-#spring:
-#  datasource:
-#    url: ${blade.datasource.dev.url}
-#    username: ${blade.datasource.dev.username}
-#    password: ${blade.datasource.dev.password}
-
 spring:
   #排除DruidDataSourceAutoConfigure
   autoconfigure:
@@ -31,37 +22,18 @@ swagger:
 
 #oss配置
 oss:
-  endpoint: "${hzinfo.oss.endpoint}"
-  access-key: "${hzinfo.oss.access-key}"
-  secret-key: "${hzinfo.oss.secret-key}"
-
-
-
-
+  endpoint: ${hzinfo.oss.endpoint}
+  access-key: ${hzinfo.oss.access-key}
+  secret-key: ${hzinfo.oss.secret-key}
 
 blade:
   data-scope:
     enabled: false
   lock:
     enabled: true
-    address: redis://192.168.60.29:3577
-    password: 1qaz2WSX@redis
-    database: 2
+    address: redis://${hzinfo.redis.ip}:${hzinfo.redis.port}
+    password: ${hzinfo.redis.password}
+    database: 0
     ssl: false
 settings:
-  logImpl: org.apache.ibatis.logging.stdout.StdOutImpl
-
-
-
-#xxl:
-#  job:
-#    accessToken: ''
-#    admin:
-#      addresses: http://192.168.1.25:7009/xxl-job-admin
-#    executor:
-#      appname: hzims-equipment
-#      ip: 192.168.1.28
-#      logpath: /data/applogs/xxl-job/jobhandler
-#      logretentiondays: -1
-#      port: 28210
-
+  logImpl: org.apache.ibatis.logging.stdout.StdOutImpl

hzims-service/equipment/src/main/resources/template/template.yml

@@ -2,14 +2,6 @@
 server:
   port: 8300
 
-
-#数据源配置
-#spring:
-#  datasource:
-#    url: ${blade.datasource.dev.url}
-#    username: ${blade.datasource.dev.username}
-#    password: ${blade.datasource.dev.password}
-
 spring:
   #排除DruidDataSourceAutoConfigure
   autoconfigure:
@@ -42,11 +34,9 @@ spring:
 
 #oss配置
 oss:
-  endpoint: "${hzinfo.oss.endpoint}"
-  access-key: "${hzinfo.oss.access-key}"
-  secret-key: "${hzinfo.oss.secret-key}"
-
-
+  endpoint: ${hzinfo.oss.endpoint}
+  access-key: ${hzinfo.oss.access-key}
+  secret-key: ${hzinfo.oss.secret-key}
 
 
 #mybatis-plus配置
@@ -59,16 +49,14 @@ mybatis-plus:
 swagger:
   base-packages: com.hnac.hzims,org.springbalde,com.hnac
 
-
-
 xxl:
   job:
     accessToken: ''
     admin:
-      addresses: http://${hzims.server.ip}:7009/xxl-job-admin
+      addresses: http://${hzims.xxljob.ip}:${hzims.xxljob.port}/xxl-job-admin
     executor:
       appname: hzims-equipment
-      ip: "${hzims.server.ip}"
+      ip: ${hzims.xxljob.ip}
       logpath: /data/applogs/xxl-job/jobhandler
       logretentiondays: -1
       port: 28300
@@ -101,63 +89,63 @@ blade:
   data:
     sdk:
       enabled: true
-      url: http://192.168.60.29/api/hzinfo-data-config
-      appId: '1635888805125099521'
-      appSecret: f4b6a4dc696b36445d2e5d38bbab2417
+      url: http://${hzims.sdk.ip}/api/hzinfo-data-config
+      appId: ${hzims.sdk.appId}
+      appSecret: ${hzims.sdk.appSecret}
   data-scope:
     enabled: false
 
 url:
-  getAutoFault: http://175.6.40.69:9196/diagnose/getAutoFault
-  getMonitorFault: http://175.6.40.69:9196/diagnose/getMonitorFault
-  getFaultAndMonitor: http://175.6.40.69:9196/diagnose/getFaultAndMonitor
-  updateFaultState_Auto: http://175.6.40.69:9196/diagnose/updateFaultState_Auto
-  updateFaultState_All: http://175.6.40.69:9196/diagnose/updateFaultState_All
-  updateFaultState: http://175.6.40.69:9196/diagnose/updateFaultState_Manual
-  listAll: http://175.6.40.69:9196/api/listAll
-  searchFaultState: http://175.6.40.69:9196/diagnose/searchFaultState
-  getGraph: http://175.6.40.69:9196/diagnose/getGraph
-  nextstep: http://175.6.40.69:9196/diagnose/nextstep
-  searchFaultStateByFaults: http://175.6.40.69:9196/diagnose/searchFaultStateByFaults
-  getStations: http://175.6.40.69:9196/diagnose/getStations
-  getMonitorByFaultStatus: http://175.6.40.69:9196/diagnose/getMonitorByFaultStatus
-  getStatisticStatus: http://175.6.40.69:9196/diagnose/getStatisticStatus
-  getNextStepWithTree: http://175.6.40.69:9196/diagnose/nextstepwithtree
-  getFaultStatusTableData: http://175.6.40.69:9196/diagnose/GetFaultStatusTableData
-  getNeoFaultPropertyList: http://175.6.40.69:9196/diagnose/GetNeoFaultPropertyList
-  getNeoFaultTableData: http://175.6.40.69:9196/diagnose/GetNeoFaultTableData
-  setFaultStatusInfo: http://175.6.40.69:9196/diagnose/setFaultStatusInfo
+  getAutoFault: http://${hzims.fdp.url.ip}:${hzims.fdp.url.port}/diagnose/getAutoFault
+  getMonitorFault: http://${hzims.fdp.url.ip}:${hzims.fdp.url.port}/diagnose/getMonitorFault
+  getFaultAndMonitor: http://${hzims.fdp.url.ip}:${hzims.fdp.url.port}/diagnose/getFaultAndMonitor
+  updateFaultState_Auto: http://${hzims.fdp.url.ip}:${hzims.fdp.url.port}/diagnose/updateFaultState_Auto
+  updateFaultState_All: http://${hzims.fdp.url.ip}:${hzims.fdp.url.port}/diagnose/updateFaultState_All
+  updateFaultState: http://${hzims.fdp.url.ip}:${hzims.fdp.url.port}/diagnose/updateFaultState_Manual
+  listAll: http://${hzims.fdp.url.ip}:${hzims.fdp.url.port}/api/listAll
+  searchFaultState: http://${hzims.fdp.url.ip}:${hzims.fdp.url.port}/diagnose/searchFaultState
+  getGraph: http://${hzims.fdp.url.ip}:${hzims.fdp.url.port}/diagnose/getGraph
+  nextstep: http://${hzims.fdp.url.ip}:${hzims.fdp.url.port}/diagnose/nextstep
+  searchFaultStateByFaults: http://${hzims.fdp.url.ip}:${hzims.fdp.url.port}/diagnose/searchFaultStateByFaults
+  getStations: http://${hzims.fdp.url.ip}:${hzims.fdp.url.port}/diagnose/getStations
+  getMonitorByFaultStatus: http://${hzims.fdp.url.ip}:${hzims.fdp.url.port}/diagnose/getMonitorByFaultStatus
+  getStatisticStatus: http://${hzims.fdp.url.ip}:${hzims.fdp.url.port}/diagnose/getStatisticStatus
+  getNextStepWithTree: http://${hzims.fdp.url.ip}:${hzims.fdp.url.port}/diagnose/nextstepwithtree
+  getFaultStatusTableData: http://${hzims.fdp.url.ip}:${hzims.fdp.url.port}/diagnose/GetFaultStatusTableData
+  getNeoFaultPropertyList: http://${hzims.fdp.url.ip}:${hzims.fdp.url.port}/diagnose/GetNeoFaultPropertyList
+  getNeoFaultTableData: http://${hzims.fdp.url.ip}:${hzims.fdp.url.port}/diagnose/GetNeoFaultTableData
+  setFaultStatusInfo: http://${hzims.fdp.url.ip}:${hzims.fdp.url.port}/diagnose/setFaultStatusInfo
   # 获取需更新的预测模型
-  getOutdatePredictModel: http://175.6.40.69:9196/diagnose/getOutdatePredictModel
+  getOutdatePredictModel: http://${hzims.fdp.url.ip}:${hzims.fdp.url.port}/diagnose/getOutdatePredictModel
   # 训练预测模型
-  trainPredictModel: http://175.6.40.69:9196/diagnose/trainPredictModel
+  trainPredictModel: http://${hzims.fdp.url.ip}:${hzims.fdp.url.port}/diagnose/trainPredictModel
   # fdp监测点与数据平台监测点绑定关系推送
-  setDataLink: http://175.6.40.69:9196/diagnose/setDataLink
+  setDataLink: http://${hzims.fdp.url.ip}:${hzims.fdp.url.port}/diagnose/setDataLink
   #提交站点消息
-  submitStationInfo: http://175.6.40.69:9196/qa/submitStationInfo
+  submitStationInfo: http://${hzims.fdp.url.ip}:${hzims.fdp.url.port}/qa/submitStationInfo
   #删除站点信息
-  deleteStationInfo: http://175.6.40.69:9196/qa/deleteStationInfo
+  deleteStationInfo: http://${hzims.fdp.url.ip}:${hzims.fdp.url.port}/qa/deleteStationInfo
   #获取机组问题
-  getDevsetQuestion: http://175.6.40.69:9196/qa/getDevsetQuestion
+  getDevsetQuestion: http://${hzims.fdp.url.ip}:${hzims.fdp.url.port}/qa/getDevsetQuestion
   #获取站点问题
-  getStationQuestion: http://175.6.40.69:9196/qa/getStationQuestion
+  getStationQuestion: http://${hzims.fdp.url.ip}:${hzims.fdp.url.port}/qa/getStationQuestion
   #提交机组问题的答案
-  submitDevsetAnswer: http://175.6.40.69:9196/qa/submitDevsetAnswer
+  submitDevsetAnswer: http://${hzims.fdp.url.ip}:${hzims.fdp.url.port}/qa/submitDevsetAnswer
   #提交站点问题的答案
-  submitStationAnswer: http://175.6.40.69:9196/qa/submitStationAnswer
+  submitStationAnswer: http://${hzims.fdp.url.ip}:${hzims.fdp.url.port}/qa/submitStationAnswer
   #实例化站点图谱
-  generateGraphInstance: http://175.6.40.69:9196/qa/generateGraphInstance
+  generateGraphInstance: http://${hzims.fdp.url.ip}:${hzims.fdp.url.port}/qa/generateGraphInstance
   #按物模型实例编号获取问题答案
-  getInstanceAnswer: http://175.6.40.69:9196/qa/getInstanceAnswer
+  getInstanceAnswer: http://${hzims.fdp.url.ip}:${hzims.fdp.url.port}/qa/getInstanceAnswer
   #按物模型实例编号删除问题答案
-  deleteInstanceAnswer: http://175.6.40.69:9196/qa/deleteInstanceAnswer
+  deleteInstanceAnswer: http://${hzims.fdp.url.ip}:${hzims.fdp.url.port}/qa/deleteInstanceAnswer
   #删除站点问题的答案
-  deleteStationAnswer: http://175.6.40.69:9196/qa/deleteStationAnswer
+  deleteStationAnswer: http://${hzims.fdp.url.ip}:${hzims.fdp.url.port}/qa/deleteStationAnswer
   # 删除机组问题答案
-  deleteDevsetAnswer: http://175.6.40.69:9196/qa/deleteDevsetAnswer
+  deleteDevsetAnswer: http://${hzims.fdp.url.ip}:${hzims.fdp.url.port}/qa/deleteDevsetAnswer
   # 提交问题答案
-  submitResult: http://175.6.40.69:9196/diagnose/submitResult
+  submitResult: http://${hzims.fdp.url.ip}:${hzims.fdp.url.port}/diagnose/submitResult
   # 获取智能诊断历史趋势图
-  searchFaultHistoryState: http://175.6.40.69:9196/diagnose/searchFaultHistoryState
+  searchFaultHistoryState: http://${hzims.fdp.url.ip}:${hzims.fdp.url.port}/diagnose/searchFaultHistoryState
   # 获取故障相关的实时数据
-  getRealByFault: http://175.6.40.69:9196/diagnose/getRealByFault
+  getRealByFault: http://${hzims.fdp.url.ip}:${hzims.fdp.url.port}/diagnose/getRealByFault

hzims-service/hzims-alarm/src/main/resources/template/template.yml

@@ -15,17 +15,9 @@ spring:
 
 #oss配置
 oss:
-  endpoint: "${hzinfo.oss.endpoint}"
-  access-key: "${hzinfo.oss.access-key}"
-  secret-key: "${hzinfo.oss.secret-key}"
-
-
-#
-#  datasource:
-#    url: "jdbc:mysql://${hzinfo.db.busines.ip}:${hzinfo.db.busines.port}/hzims?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true"
-#    username: "${hzinfo.db.busines.username}"
-#    password: "${hzinfo.db.busines.password}"
-
+  endpoint: ${hzinfo.oss.endpoint}
+  access-key: ${hzinfo.oss.access-key}
+  secret-key: ${hzinfo.oss.secret-key}
 
 #mybatis-plus配置
 mybatis-plus:
@@ -38,18 +30,10 @@ swagger:
   base-packages: com.hnac.hzims.alarm
 hzims:
   mqtt:
-    url: tcp://${hzinfo.db.series.ip}:9036:1883
+    url: tcp://${hzinfo.mq.ip}:${hzinfo.mq.port}
     group: hzims-alarm
-    username: admin
-    password: hzims@emqx
-  system:
-    wss-url: ws://${hzinfo.db.series.ip}:9036/api/hzinfo-data-socket/websocket/soe
-  condition:
-    wss-url: wss://${hzinfo.db.series.ip}:9036/api/hzinfo-data-socket/websocket/soe
-  fdp:
-    alarm-url: wss://${hzinfo.db.series.ip}:9036/api/hzinfo-data-socket/websocket/soe
-  level:
-    wss-url: wss://${hzinfo.db.series.ip}:9036/api/hzinfo-data-socket/websocket/alarm
+    username: ${hzinfo.mq.username}
+    password: ${hzinfo.mq.password}
   msg:
     template: aliyun-alarm-sms
     enabled: false
@@ -66,11 +50,11 @@ blade:
   data:
     sdk:
       enabled: true
-      url: http://${hzinfo.db.series.ip}/api/hzinfo-data-config
-      ctrlUrl: http://${hzinfo.db.series.ip}/api/hzinfo-data-handler
-      appId: '1635888805125099521'
-      appSecret: f4b6a4dc696b36445d2e5d38bbab2417
-      redisIp: ${hzinfo.db.series.ip}
-      redisPort: 3577
-      password: L_MM&h=+Nm&p)U9sk.uH
+      url: http://${hzims.sdk.ip}/api/hzinfo-data-config
+      ctrlUrl: http://${hzims.sdk.ip}/api/hzinfo-data-handler
+      appId: ${hzims.sdk.appId}
+      appSecret: ${hzims.sdk.appSecret}
+      redisIp: ${hzims.sdk.redisIp}
+      redisPort: ${hzims.sdk.redisPort}
+      password: ${hzims.sdk.password}
       maxKeys: 1000

hzims-service/hzims-basic/src/main/resources/template/template.yml

@@ -2,12 +2,6 @@
 server:
   port: 8550
 
-#oss配置
-oss:
-  endpoint: "${hzinfo.oss.endpoint}"
-  access-key: "${hzinfo.oss.access-key}"
-  secret-key: "${hzinfo.oss.secret-key}"
-
 #数据源配置
 spring:
   #排除DruidDataSourceAutoConfigure
@@ -17,11 +11,12 @@ spring:
     url: jdbc:mysql://${hzinfo.db.busines.ip}:${hzinfo.db.busines.port}/hzims_basic?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true
     username: ${hzinfo.db.busines.username}
     password: ${hzinfo.db.busines.password}
-#
-#  datasource:
-#    url: "jdbc:mysql://${hzinfo.db.busines.ip}:${hzinfo.db.busines.port}/hzims?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true"
-#    username: "${hzinfo.db.busines.username}"
-#    password: "${hzinfo.db.busines.password}"
+
+#oss配置
+oss:
+  endpoint: ${hzinfo.oss.endpoint}
+  access-key: ${hzinfo.oss.access-key}
+  secret-key: ${hzinfo.oss.secret-key}
 
 
 #mybatis-plus配置
@@ -38,10 +33,10 @@ xxl:
   job:
     accessToken: ''
     admin:
-      addresses: "http://${hzims.server.ip}:7009/xxl-job-admin"
+      addresses: "http://${hzims.xxljob.ip}:${hzims.xxljob.port}/xxl-job-admin"
     executor:
       appname: hzims-safeproduct
-      ip: "${hzims.server.ip}"
+      ip: ${hzims.server.ip}
       logpath: /data/applogs/xxl-job/jobhandler
       logretentiondays: 7
       port: 28200
@@ -51,7 +46,7 @@ blade:
     enabled: false
   lock:
     enabled: true
-    address: redis://192.168.1.20:3577
-    password: 1qaz2WSX@redis
+    address: redis://${hzinfo.redis.ip}:${hzinfo.redis.port}
+    password: ${hzinfo.redis.password}
     database: 0
     ssl: false

hzims-service/hzims-big-model/src/main/resources/template/template.yml

@@ -2,12 +2,6 @@
 server:
   port: 8135
 
-#oss配置
-oss:
-  endpoint: "${hzinfo.oss.endpoint}"
-  access-key: "${hzinfo.oss.access-key}"
-  secret-key: "${hzinfo.oss.secret-key}"
-
 #数据源配置
 spring:
   #排除DruidDataSourceAutoConfigure
@@ -17,16 +11,12 @@ spring:
     url: jdbc:mysql://${hzinfo.db.busines.ip}:${hzinfo.db.busines.port}/prod_hzims_big_model?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
     username: ${hzinfo.db.busines.username}
     password: ${hzinfo.db.busines.password}
-  redis:
-    # redis数据库索引（默认为0），我们使用索引为0的数据库，避免和其他数据库冲突
-    database: 2
-    # redis服务器地址（默认为localhost）
-    host: 192.168.60.29
-    # redis端口（默认为6379）
-    port: 3577
-    # redis访问密码（默认为空）
-    password: 1qaz2WSX@redis
 
+#oss配置
+oss:
+  endpoint: ${hzinfo.oss.endpoint}
+  access-key: ${hzinfo.oss.access-key}
+  secret-key: ${hzinfo.oss.secret-key}
 
 fdp:
   host: http://192.168.60.16:9997
@@ -40,14 +30,15 @@ fdp:
     assistantSpecialAsk: /qa/assistant_special_ask
     assistantKnowledgeAsk: /qa/assistant_knowledge_ask
     hotQuestion: /qa/question_recommand
+
 xxl:
   job:
     accessToken: ''
     admin:
-      addresses: http://192.168.60.104:7009/xxl-job-admin
+      addresses: http://${hzims.xxljob.ip}:${hzims.xxljob.port}/xxl-job-admin
     executor:
       appname: hzims-big-model
-      ip: 172.31.0.174
+      ip: ${hzims.server.ip}
       logpath: /data/applogs/xxl-job/jobhandler
       logretentiondays: 7
       port: 28135
@@ -56,20 +47,20 @@ blade:
   data:
     sdk:
       enabled: true
-      url: http://192.168.60.29/api/hzinfo-data-config
-      ctrlUrl: http://192.168.60.29/api/hzinfo-data-handler
-      scadaUrl: http://192.168.60.29/api/hzinfo-data-scada
-      appId: '1635888805125099521'
-      appSecret: f4b6a4dc696b36445d2e5d38bbab2417
-      redisIp: 192.168.60.34
-      redisPort: 3577
-      password: L_MM&h=+Nm&p)U9sk.uH
+      url: http://${hzims.sdk.ip}/api/hzinfo-data-config
+      ctrlUrl: http://${hzims.sdk.ip}/api/hzinfo-data-handler
+      scadaUrl: http://${hzims.sdk.ip}/api/hzinfo-data-scada
+      appId: ${hzims.sdk.appId}
+      appSecret: ${hzims.sdk.appSecret}
+      redisIp: ${hzims.sdk.redisIp}
+      redisPort: ${hzims.sdk.redisPort}
+      password: ${hzims.sdk.password}
       maxKeys: 1000
   data-scope:
     enabled: false
   lock:
     enabled: true
-    address: redis://192.168.60.29:3577
-    password: 1qaz2WSX@redis
+    address: redis://${hzinfo.redis.ip}:${hzinfo.redis.port}
+    password: ${hzinfo.redis.password}
     database: 0
     ssl: false

hzims-service/hzims-middle/src/main/resources/template/template.yml

@@ -2,12 +2,6 @@
 server:
   port: 8400
 
-#oss配置
-oss:
-  endpoint: "${hzinfo.oss.endpoint}"
-  access-key: "${hzinfo.oss.access-key}"
-  secret-key: "${hzinfo.oss.secret-key}"
-
 #数据源配置
 spring:
   #排除DruidDataSourceAutoConfigure
@@ -17,12 +11,12 @@ spring:
     url: jdbc:mysql://${hzinfo.db.busines.ip}:${hzinfo.db.busines.port}/prod_hzims_middle?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
     username: ${hzinfo.db.busines.username}
     password: ${hzinfo.db.busines.password}
-#
-#  datasource:
-#    url: "jdbc:mysql://${hzinfo.db.busines.ip}:${hzinfo.db.busines.port}/hzims?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true"
-#    username: "${hzinfo.db.busines.username}"
-#    password: "${hzinfo.db.busines.password}"
 
+#oss配置
+oss:
+  endpoint: ${hzinfo.oss.endpoint}
+  access-key: ${hzinfo.oss.access-key}
+  secret-key: ${hzinfo.oss.secret-key}
 
 #mybatis-plus配置
 mybatis-plus:
@@ -41,7 +35,7 @@ blade:
     enabled: false
   lock:
     enabled: true
-    address: redis://192.168.60.34:3577
-    password: L_MM&h=+Nm&p)U9sk.uH
-    database: 2
+    address: redis://${hzinfo.redis.ip}:${hzinfo.redis.port}
+    password: ${hzinfo.redis.password}
+    database: 0
     ssl: false

hzims-service/hzims-scheduled/src/main/resources/template/template.yml

@@ -41,11 +41,6 @@ spring:
           url: jdbc:mysql://${hzinfo.db.busines.ip}:${hzinfo.db.busines.port}/prod_hzims_alarm?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
           username: ${hzinfo.db.busines.username}
           password: ${hzinfo.db.busines.password}
-#
-#  datasource:
-#    url: "jdbc:mysql://${${hzinfo.db.busines.username}.db.busines.ip}:${hzinfo.db.busines.port}/hzims?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true"
-#    username: "${hzinfo.db.busines.username}"
-#    password: "${hzinfo.db.busines.password}"
 
 
 #mybatis-plus配置
@@ -62,10 +57,10 @@ xxl:
   job:
     accessToken: ''
     admin:
-      addresses: "http://${hzims.server.ip}:7009/xxl-job-admin"
+      addresses: "http://${hzims.xxljob.ip}:${hzims.xxljob.port}/xxl-job-admin"
     executor:
       appname: hzims-scheduled
-      ip: 172.31.0.12
+      ip: ${hzinfo.db.series.ip}
       logpath: /data/applogs/xxl-job/jobhandler
       logretentiondays: 7
       port: 28101
@@ -99,18 +94,18 @@ hzims:
       report: hzims.operation.energy.report
 blade:
   mqtt:
-    url: tcp://192.168.60.29:1883
+    url: tcp://${hzinfo.mq.ip}:${hzinfo.mq.port}
     group: hzims-alarm
-    username: admin
-    password: hzims@emqx
+    username: ${hzinfo.mq.username}
+    password: ${hzinfo.mq.password}
   data:
     sdk:
       enabled: true
-      url: http://192.168.60.29/api/hzinfo-data-config
-      ctrlUrl: http://192.168.60.29/api/hzinfo-data-handler
-      appId: '1635888805125099521'
-      appSecret: f4b6a4dc696b36445d2e5d38bbab2417
-      redisIp: 192.168.60.34
-      redisPort: 3577
-      password: L_MM&h=+Nm&p)U9sk.uH
+      url: http://${hzims.sdk.ip}/api/hzinfo-data-config
+      ctrlUrl: http://${hzims.sdk.ip}/api/hzinfo-data-handler
+      appId: ${hzims.sdk.appId}
+      appSecret: ${hzims.sdk.appSecret}
+      redisIp: ${hzims.sdk.redisIp}
+      redisPort: ${hzims.sdk.redisPort}
+      password: ${hzims.sdk.password}
       maxKeys: 1000

hzims-service/inspect/src/main/resources/template/template.yml

@@ -8,18 +8,9 @@ oss:
   name: minio
   tenant-mode: false
   bucket-name: prd200000
-  endpoint: "${hzinfo.oss.endpoint}"
-  access-key: "${hzinfo.oss.access-key}"
-  secret-key: "${hzinfo.oss.secret-key}"
-#oss配置
-#oss:
-#  enabled: true
-#  name: minio
-#  tenant-mode: false
-#  bucket-name: prd200000
-#  endpoint: https://ops.hnaccloud.com:8000
-#  access-key: hzinfo
-#  secret-key: JKyro3z#yqChgkKtFuq
+  endpoint: ${hzinfo.oss.endpoint}
+  access-key: ${hzinfo.oss.access-key}
+  secret-key: ${hzinfo.oss.secret-key}
 
 #数据源配置
 spring:
@@ -30,11 +21,6 @@ spring:
     url: jdbc:mysql://${hzinfo.db.busines.ip}:${hzinfo.db.busines.port}/prod_hzims_inspect?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true
     username: ${hzinfo.db.busines.username}
     password: ${hzinfo.db.busines.password}
-#
-#  datasource:
-#    url: "jdbc:mysql://${hzinfo.db.busines.ip}:${hzinfo.db.busines.port}/hzims?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true"
-#    username: "${hzinfo.db.busines.username}"
-#    password: "${hzinfo.db.busines.password}"
 
 
 #mybatis-plus配置
@@ -51,10 +37,10 @@ xxl:
   job:
     accessToken: ''
     admin:
-      addresses: "http://${hzims.server.ip}:7009/xxl-job-admin"
+      addresses: http://${hzims.xxljob.ip}:${hzims.xxljob.port}/xxl-job-admin
     executor:
       appname: hzinfo-inspect
-      ip: "${hzims.server.ip}"
+      ip: ${hzims.server.ip}
       logpath: /data/applogs/xxl-job/jobhandler
       logretentiondays: 7
       port: 28132
@@ -68,13 +54,8 @@ hzinfo:
     pdf:
       # pdf模板路径 ，请配置绝对路径
       module-path: /data/inspect/pdf/templet/inspectObj.html
-      # module-path: D:\data\hzinfo\templet\inspectObj.html # windows
       # pdf文件存储路径，请配置绝对路径
       file-path: /data/inspect/pdf/file
-      # file-path: D:/data/hzinfo/file # windows
-
-
-
 
 hzims:
   tasks:
@@ -115,20 +96,8 @@ offline:
     sync: /data/hzims/temp/offline/sync
     max-size: 1073741824
 
-#sms:
-#  aliyun:
-#    connectTimeout: 10000
-#    readTimeout: 10000
-#    proxyDomain: 175.6.40.67:37880
-#    accessKeyId: 7262257e6dd16e85ddfee09d3e8eedaa
-#    accessKeySecret: 7dba15f64eba724521d0ecd4c02a8a3e49f3ffa95ff75d63a3c4a88a1679282b173e5c13ddbba3eb2699a65a1be1b32b
-#    profilePoint: cn-changsha
-#    endPoint: cn-changsha
-#    signName: 华自科技
-
 logging:
   level:
-    # org.springblade.resource.feign.OssClient: DEBUG
     com.hnac.hzinfo.inspect: DEBUG
 feign:
   client:
@@ -137,26 +106,24 @@ feign:
       default:
         loggerLevel: FULL
 
-
-
 blade:
   data-scope:
     enabled: false
   mqtt:
     enabled: true
-    userName: emqx
-    password: hzims@emqx
-    urls: tcp://192.168.60.29:1883
+    userName: ${hzinfo.mq.username}
+    password: ${hzinfo.mq.password}
+    urls: tcp://${hzinfo.mq.ip}:${hzinfo.mq.port}
     clientId: hzinfo_inspect
     topicNames: topic_ai_events
   data:
     sdk:
       enabled: true
-      url: http://192.168.60.29/api/hzinfo-data-config
-      ctrlUrl: http://192.168.60.29/api/hzinfo-data-handler
-      appId: '1706919441406693378'
-      appSecret: 4bf4fa0d713921ed4e1b22bfac4993ac
-      redisIp: 192.168.60.29
-      redisPort: 3577
-      password: L_MM&h=+Nm&p)U9sk.uH
+      url: http://${hzims.sdk.ip}/api/hzinfo-data-config
+      ctrlUrl: http://${hzims.sdk.ip}/api/hzinfo-data-handler
+      appId: ${hzims.sdk.appId}
+      appSecret: ${hzims.sdk.appSecret}
+      redisIp: ${hzims.sdk.redisIp}
+      redisPort: ${hzims.sdk.redisPort}
+      password: ${hzims.sdk.password}
       maxKeys: 1000

hzims-service/operational/src/main/resources/template/template.yml

@@ -2,12 +2,6 @@
 server:
   port: 8501
 
-#oss配置
-oss:
-  endpoint: "${hzinfo.oss.endpoint}"
-  access-key: "${hzinfo.oss.access-key}"
-  secret-key: "${hzinfo.oss.secret-key}"
-
 #数据源配置
 spring:
   #排除DruidDataSourceAutoConfigure
@@ -17,12 +11,12 @@ spring:
      url: jdbc:mysql://${hzinfo.db.busines.ip}:${hzinfo.db.busines.port}/prod_hzims_operation?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true
      username: ${hzinfo.db.busines.username}
      password: ${hzinfo.db.busines.password}
-#
-#  datasource:
-#    url: "jdbc:mysql://${hzinfo.db.busines.ip}:${hzinfo.db.busines.port}/hzims?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true"
-#    username: "${hzinfo.db.busines.username}"
-#    password: "${hzinfo.db.busines.password}"
 
+#oss配置
+oss:
+  endpoint: ${hzinfo.oss.endpoint}
+  access-key: ${hzinfo.oss.access-key}
+  secret-key: ${hzinfo.oss.secret-key}
 
 #mybatis-plus配置
 mybatis-plus:
@@ -38,10 +32,10 @@ xxl:
   job:
     accessToken: ''
     admin:
-      addresses: "http://${hzims.server.ip}:7009/xxl-job-admin"
+      addresses: "http://${hzims.xxljob.ip}:${hzims.xxljob.port}/xxl-job-admin"
     executor:
       appname: hzims-operational
-      ip: "${hzims.server.ip}"
+      ip: ${hzims.server.ip}
       logpath: /data/applogs/xxl-job/jobhandler
       logretentiondays: 7
       port: 28501
@@ -64,14 +58,6 @@ hzims:
       greaterThan: 0.3
       lessThan: 0.9
       beEqualOrGreaterThan: 0.9
-  alert:
-    # 接收告警的websocket url
-    ws-url: wss://175.6.40.67:9036/api/hzinfo-data-socket/websocket/soe
-  config:
-    #接收遥测或遥信实时数据的websocket url
-    ws-url: wss://175.6.40.67:9036/api/hzinfo-data-socket/websocket/data
-  level:
-    ws-url: wss://175.6.40.67:9036/api/hzinfo-data-socket/websocket/alarm
   pdf:
     # pdf文件存储路径，请配置绝对路径
     #file-path: /data/inspect/pdf/file
@@ -163,22 +149,23 @@ blade:
   data:
     sdk:
       enabled: true
-      url: http://192.168.60.29/api/hzinfo-data-config
-      ctrlUrl: http://192.168.60.29/api/hzinfo-data-handler
-      appId: '1635888805125099521'
-      appSecret: f4b6a4dc696b36445d2e5d38bbab2417
-      redisIp: 192.168.60.34
-      redisPort: 3577
-      password: L_MM&h=+Nm&p)U9sk.uH
+      url: http://${hzims.sdk.ip}/api/hzinfo-data-config
+      ctrlUrl: http://${hzims.sdk.ip}/api/hzinfo-data-handler
+      appId: ${hzims.sdk.appId}
+      appSecret: ${hzims.sdk.appSecret}
+      redisIp: ${hzims.sdk.redisIp}
+      redisPort: ${hzims.sdk.redisPort}
+      password: ${hzims.sdk.password}
       maxKeys: 1000
   data-scope:
     enabled: false
   lock:
     enabled: true
-    address: redis://192.168.60.34:3577
+    address: redis://${hzinfo.redis.ip}:${hzinfo.redis.hzinfo.redis.port}
     password:
     database: 0
     ssl: false
+
 logging:
   level:
     com.hnac.hzinfo.inspect.task.feign.IInspectTaskClient: NONE

hzims-service/safeproduct/src/main/resources/template/template.yml

@@ -2,11 +2,6 @@
 server:
   port: 8200
 
-#oss配置
-oss:
-  endpoint: "${hzinfo.oss.endpoint}"
-  access-key: "${hzinfo.oss.access-key}"
-  secret-key: "${hzinfo.oss.secret-key}"
 
 #数据源配置
 spring:
@@ -26,12 +21,12 @@ spring:
           url: jdbc:mysql://${hzinfo.db.busines.ip}:${hzinfo.db.busines.port}/prod_hzims?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
           username: ${hzinfo.db.busines.username}
           password: ${hzinfo.db.busines.password}
-#
-#  datasource:
-#    url: "jdbc:mysql://${hzinfo.db.busines.ip}:${hzinfo.db.busines.port}/hzims?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true"
-#    username: "${hzinfo.db.busines.username}"
-#    password: "${hzinfo.db.busines.password}"
 
+#oss配置
+oss:
+  endpoint: ${hzinfo.oss.endpoint}
+  access-key: ${hzinfo.oss.access-key}
+  secret-key: ${hzinfo.oss.secret-key}
 
 #mybatis-plus配置
 mybatis-plus:
@@ -47,10 +42,10 @@ xxl:
   job:
     accessToken: ''
     admin:
-      addresses: "http://${hzims.server.ip}:7009/xxl-job-admin"
+      addresses: "http://${hzims.xxljob.ip}:${hzims.xxljob.port}/xxl-job-admin"
     executor:
       appname: hzims-safeproduct
-      ip: "${hzims.server.ip}"
+      ip: ${hzims.server.ip}
       logpath: /data/applogs/xxl-job/jobhandler
       logretentiondays: 7
       port: 28200

hzims-service/ticket/src/main/resources/template/template.yml

@@ -2,15 +2,6 @@
 server:
   port: 8216
 
-#oss配置
-oss:
-  enable: true
-  name: minio
-  tenant-mode: true
-  endpoint: "${hzinfo.oss.endpoint}"
-  access-key: "${hzinfo.oss.access-key}"
-  secret-key: "${hzinfo.oss.secret-key}"
-  bucket-name: dev200000
 #数据源配置
 spring:
   #排除DruidDataSourceAutoConfigure
@@ -20,12 +11,16 @@ spring:
     url: jdbc:mysql://${hzinfo.db.busines.ip}:${hzinfo.db.busines.port}/prod_hzims_ticket?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true
     username: ${hzinfo.db.busines.username}
     password: ${hzinfo.db.busines.password}
-#
-#  datasource:
-#    url: "jdbc:mysql://${hzinfo.db.busines.ip}:${hzinfo.db.busines.port}/hzims?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true"
-#    username: "${hzinfo.db.busines.username}"
-#    password: "${hzinfo.db.busines.password}"
 
+#oss配置
+oss:
+  enable: true
+  name: minio
+  tenant-mode: true
+  endpoint: ${hzinfo.oss.endpoint}
+  access-key: ${hzinfo.oss.access-key}
+  secret-key: ${hzinfo.oss.secret-key}
+  bucket-name: dev200000
 
 #mybatis-plus配置
 mybatis-plus:
@@ -41,15 +36,14 @@ xxl:
   job:
     accessToken: ''
     admin:
-      addresses: "http://${hzims.server.ip}:7009/xxl-job-admin"
+      addresses: "http://${hzims.xxljob.ip}:${hzims.xxljob.port}/xxl-job-admin"
     executor:
       appname: hzims-ticket
-      ip: "${hzims.server.ip}"
+      ip: ${hzims.server.ip}
       logpath: /data/applogs/xxl-job/jobhandler
       logretentiondays: 7
       port: 28601
 
-
 hzims:
   tenantId: 200000
   url:

hzims-service/weather/src/main/resources/template/template.yml

@@ -8,9 +8,18 @@ spring:
   autoconfigure:
     exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
   datasource:
-    url: "jdbc:mysql://${hzinfo.db.busines.ip}:${hzinfo.db.busines.port}/test_hzims_weather?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true"
-    username: "${hzinfo.db.busines.username}"
-    password: "${hzinfo.db.busines.password}"
+    url: jdbc:mysql://${hzinfo.db.busines.ip}:${hzinfo.db.busines.port}/test_hzims_weather?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true
+    username: ${hzinfo.db.busines.username}
+    password: ${hzinfo.db.busines.password}
+
+#oss配置
+oss:
+  enable: true
+  name: minio
+  tenant-mode: true
+  endpoint: ${hzinfo.oss.endpoint}
+  access-key: ${hzinfo.oss.access-key}
+  secret-key: ${hzinfo.oss.secret-key}
 
 #mybatis-plus配置
 mybatis-plus:
@@ -22,10 +31,10 @@ xxl:
   job:
     accessToken: ''
     admin:
-      addresses: "http://${hzims.server.ip}:7009/xxl-job-admin"
+      addresses: "http://${hzims.xxljob.ip}:${hzims.xxljob.port}/xxl-job-admin"
     executor:
       appname: hzims-weather
-      ip: 172.31.0.12
+      ip: ${hzims.server.ip}
       logpath: /data/applogs/xxl-job/jobhandler
       logretentiondays: 7
       port: 28300
@@ -41,4 +50,4 @@ hzims:
     private-key: e283b41e3dc64fe094d3d1ad20ffb8b5
     # 备用
     # public-id: HE2206221832121153
-    # private-key: bc3059aff68f49f0ba57970973405a1b
+    # private-key: bc3059aff68f49f0ba57970973405a1b