modify:同步现场配置

hnac-framework-boot/src/main/resources/application-dev.yml

@@ -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:
@@ -113,6 +110,8 @@ hzims:
         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
@@ -166,7 +166,8 @@ expire:
 
 dynamic:
   file:
-    path: D:/apache-tomcat-8.5.40/webapps/HZInfo/hz3000data/
+    path: D:\\nginx-1.18.0\\html\\HZInfo/hz3000data/
+
 
 
 wd:
@@ -175,7 +176,7 @@ wd:
   areaCode: 430225000000
   gisCodes: bigemap.bj8061hz
   gisLevel: 2
-  stcd: '360301002'
+  stcd: 360301002
 
 tencent:
   push:

hnac-framework-boot/src/main/resources/application.yml

@@ -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
+

hnac-framework-boot/src/main/resources/ehcache-local.xml

@@ -8,7 +8,7 @@
                   timeToIdleSeconds="300" timeToLiveSeconds="0" overflowToDisk="true"
                   maxEntriesLocalDisk="100000" />
 
-<!-- 系统缓存 -->
+    <!-- 系统缓存 -->
     <cache name="sysCache" maxEntriesLocalHeap="100" eternal="true"
            overflowToDisk="true" />