moze
/
HZI-RIS-PXHD
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

modify:同步现场配置

master
luyie 5 days ago
parent
12f21d77b0
commit
6a72bab2a6
3 changed files with 63 additions and 62 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 55
      hnac-framework-boot/src/main/resources/application-dev.yml
  2. 16
      hnac-framework-boot/src/main/resources/application.yml
  3. 54
      hnac-framework-boot/src/main/resources/ehcache-local.xml

55
hnac-framework-boot/src/main/resources/application-dev.yml
Unescape View File

@ -7,21 +7,17 @@ spring:
strict: true #设置严格模式,默认false不启动. 启动后在未匹配到指定数据源时候会抛出异常,不启动则使用默认数据源.
datasource:
mysql:
#url: jdbc:mysql://175.6.40.67:10022/hzinfo_ris_pxhd?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
url: jdbc:mysql://127.0.0.1:3306/hzinfo_ris_pxhd?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
username: root
password: 123
slave:
url: jdbc:mysql://127.0.0.1:3306/hzinfo_ris_pxhd?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
#url: jdbc:mysql://127.0.0.1:3306/hzinfo_ris?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
username: root
password: 123
tdengine:
db-type: postgresql
driver-class-name: com.taosdata.jdbc.TSDBDriver
url: jdbc:TAOS://192.168.65.86:6030/hzinfo_data?timezone=UTC-8&charset=UTF-8&locale=en_US.UTF-8
# driver-class-name: com.taosdata.jdbc.rs.RestfulDriver
# url: jdbc:TAOS-RS://192.168.65.105:6041/hzinfo_data?timezone=UTC-8&charset=UTF-8&locale=en_US.UTF-8
driver-class-name: com.taosdata.jdbc.rs.RestfulDriver
url: jdbc:TAOS-RS://192.168.1.202:6041/hzinfo_data?timezone=UTC-8&charset=UTF-8&locale=en_US.UTF-8
username: root
password: taosdata
redis:
@ -56,7 +52,7 @@ blade:
data:
sdk:
enabled: true
url: http://127.0.0.1:8080/api/hzinfo-data-config #nignx后台代理端口
url: http://127.0.0.1:7502/api/hzinfo-data-config #nignx后台代理端口
appId: '1529342971768860673'
appSecret: 3b599c56a6c6c2d35dcfb7e63d04414f
backups: true
@ -78,10 +74,10 @@ blade:
password: ${spring.datasource.dynamic.datasource.tdengine.password}
mqtt:
enabled: true
userName: admin
password: 123456
urls: tcp://192.168.65.16:1883
# urls: tcp://192.168.65.86:1883
userName: hzinfo
password: hz123456
urls: tcp://192.168.1.202:1883
# urls: tcp://192.168.65.86:1883
clientId: hzinfo_boot_mqtt
topicNames: topic_device_model,topic_hzinfo_props,topic_hzinfo_yx,topic_hzinfo_heart_beat,topic_hzinfo_control_return,topic_hzinfo_events_alarm,topic_hzinfo_events
@ -93,6 +89,7 @@ file:
excelImage: D:\\upload\\excelResult\\excelImage
hzinfo:
task:
pdf:
@ -104,15 +101,17 @@ hzinfo:
file-path: D:/upload/hzinfo/file # windows
hzims:
inspect:
task:
templateCode:
#巡检任务开始前发送短信信息阿里云模板
taskBegin: aliyun-task-begin
#巡检任务结束前发送短信信息阿里云模板
taskEnd: aliyun-task-end
#巡检消息推送模板 - 极光
jgPushCode: hzinfo-inspect
inspect:
task:
templateCode:
#巡检任务开始前发送短信信息阿里云模板
taskBegin: aliyun-task-begin
#巡检任务结束前发送短信信息阿里云模板
taskEnd: aliyun-task-end
#巡检消息推送模板 - 极光
jgPushCode: hzinfo-inspect
duty:
file-path: "D:/upload/duty"
sms:
aliyun:
@ -134,7 +133,7 @@ emergency:
hz3000:
runtime:
setting: D:\\HZ3000\\runtime\\info\\factory.fac
setting: D:/HZ3000/runtime/info/factory.fac
network:
windows: D:/hz3000/runtime/info/network.xml
linux: /home/hz3000/info/network.xml
@ -154,6 +153,7 @@ hz3000:
name:
linux: libWriteData.so
soe:
wait:
interval: 500
@ -162,11 +162,12 @@ soe:
show:
number: 10
expire:
time: 15
time: 15
dynamic:
file:
path: D:/apache-tomcat-8.5.40/webapps/HZInfo/hz3000data/
path: D:\\nginx-1.18.0\\html\\HZInfo/hz3000data/
wd:
@ -175,9 +176,9 @@ wd:
areaCode: 430225000000
gisCodes: bigemap.bj8061hz
gisLevel: 2
stcd: '360301002'
stcd: 360301002
tencent:
push:
appId: 1580011926
secretKey: ae7e4b5fd20c3599113b6ebfbf82e7ea
push:
appId: 1580011926
secretKey: ae7e4b5fd20c3599113b6ebfbf82e7ea

16
hnac-framework-boot/src/main/resources/application.yml
Unescape View File

@ -19,7 +19,7 @@ spring:
name: hnac-framework-boot
servlet:
multipart:
location: d:/upload
location: D:/upload
maxFileSize: 500MB
maxRequestSize: 500MB
jmx:
@ -75,7 +75,7 @@ blade:
- bbMapper
- ccMapper
- PointMapper
# enabled: false
# enabled: false
#token配置
token:
#是否有状态
@ -109,26 +109,28 @@ blade:
secure:
#接口放行
skip-url:
- /
- /webjars/**
- /toLogin
- /favicon.ico
- /js/**
- /plugins/**
- /adminlte/**
- /static/**
- /templates/**
- /js/**
- /swagger-resources/**
- /doc.html
- /blade-system/tenant/info
- /blade-auth/oauth/token
- /blade-auth/oauth/captcha
- /test/simulationMultiple
- /excelwd/downloadFile
- /websocket/**
- /yk/websocket
- /fileInfo/**
- /inspectInfo/**
- /emergencyPlan/downloadFile
- /waterRain/stStbprpB/pageList/**
- /waterRain/stStbprpBData/getRealData/**
#授权认证配置
auth:
- method: ALL
@ -185,7 +187,7 @@ remoteControl:
scada:
resource:
path: D:/nginx-1.18.0-ris/html/subapp/resources/hzinfo-realmonitor
path: D:/nginx-1.18.0/html/subapp/resources/hzinfo-realmonitor
get:
realdata:
@ -203,6 +205,4 @@ golden:
username: sa
password: golden
upload:
file:
path: D:/nginx-1.18.0-ris/html/subapp/resources/upload

54
hnac-framework-boot/src/main/resources/ehcache-local.xml
Unescape View File

@ -1,41 +1,41 @@
<?xml version="1.0" encoding="UTF-8"?>
<ehcache updateCheck="false" name="defaultCache">
<diskStore path="../temp/hzinfo/ehcache" />
<diskStore path="../temp/hzinfo/ehcache" />
<!-- 默认缓存配置. -->
<defaultCache maxEntriesLocalHeap="100" eternal="false"
timeToIdleSeconds="300" timeToLiveSeconds="0" overflowToDisk="true"
maxEntriesLocalDisk="100000" />
<!-- 默认缓存配置. -->
<defaultCache maxEntriesLocalHeap="100" eternal="false"
timeToIdleSeconds="300" timeToLiveSeconds="0" overflowToDisk="true"
maxEntriesLocalDisk="100000" />
<!-- 系统缓存 -->
<cache name="sysCache" maxEntriesLocalHeap="100" eternal="true"
overflowToDisk="true" />
<!-- 系统缓存 -->
<cache name="sysCache" maxEntriesLocalHeap="100" eternal="true"
overflowToDisk="true" />
<!-- 用户缓存 -->
<cache name="userCache" maxEntriesLocalHeap="100" eternal="true"
overflowToDisk="true" />
<!-- 用户缓存 -->
<cache name="userCache" maxEntriesLocalHeap="100" eternal="true"
overflowToDisk="true" />
<!-- 数据配置缓存 -->
<cache name="dataCache" maxEntriesLocalHeap="100" eternal="true"
overflowToDisk="true" />
<!-- 数据配置缓存 -->
<cache name="dataCache" maxEntriesLocalHeap="100" eternal="true"
overflowToDisk="true" />
<!-- 简单页面缓存 -->
<cache name="SimplePageCachingFilter" maxEntriesLocalHeap="100"
eternal="false" overflowToDisk="true" timeToIdleSeconds="120"
timeToLiveSeconds="120" memoryStoreEvictionPolicy="LFU" />
<!-- 简单页面缓存 -->
<cache name="SimplePageCachingFilter" maxEntriesLocalHeap="100"
eternal="false" overflowToDisk="true" timeToIdleSeconds="120"
timeToLiveSeconds="120" memoryStoreEvictionPolicy="LFU" />
<!--接线方式缓存 -->
<cache name="LineType" maxEntriesLocalHeap="100" eternal="true"
overflowToDisk="true" />
<!--接线方式缓存 -->
<cache name="LineType" maxEntriesLocalHeap="100" eternal="true"
overflowToDisk="true" />
<!--行业类型缓存-->
<cache name="IndustryType" maxEntriesLocalHeap="100" eternal="true"
overflowToDisk="true" />
<!--行业类型缓存-->
<cache name="IndustryType" maxEntriesLocalHeap="100" eternal="true"
overflowToDisk="true" />
<!-- 设备数缓存 -->
<cache name="DeviceTreeCache" maxEntriesLocalHeap="100" eternal="true"
overflowToDisk="true" />
<!-- 设备数缓存 -->
<cache name="DeviceTreeCache" maxEntriesLocalHeap="100" eternal="true"
overflowToDisk="true" />
</ehcache>
Write Preview
Loading…
Cancel
Save