From f5f8138f4f50eedd3598a9073956f0afa56e7139 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期五, 27 十二月 2024 15:53:27 +0800
Subject: [PATCH] 增加部署武威市民勤系统
---
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/resources/application.yml | 2
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/resources/application.yml | 2
pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/resources/application.yml | 2
pipIrr-platform/pipIrr-global/src/main/resources/application-global(test测试系统).yml | 11
pipIrr-platform/pipIrr-web/pipIrr-web-gis/src/main/resources/application.yml | 2
pipIrr-platform/pipIrr-global/src/main/resources/application-global(mq民勤系统).yml | 413 +++++++++++++++++++++++++++++
pipIrr-platform/pipIrr-global/src/main/resources/application-database-mq.yml | 69 ++++
pipIrr-platform/pipIrr-global/src/main/resources/application-global(sp沙盘系统).yml | 11
pipIrr-platform/pipIrr-global/src/main/resources/application-global(ym元谋系统).yml | 11
pipIrr-platform/文档/管灌系统增加一个客户系统.docx | 0
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config(mq民勤).xml | 157 +++++++++++
pipIrr-platform/pipIrr-web/pipIrr-web-file/src/main/resources/application.yml | 2
pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml | 63 ++++
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/application-database(mq民勤).yml | 17 +
pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/resources/application.yml | 2
pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/resources/application.yml | 2
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/resources/application.yml | 2
pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/resources/application.yml | 2
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/resources/application.yml | 2
pipIrr-platform/pipIrr-global/src/main/resources/application-database.yml | 2
pipIrr-platform/pipIrr-global/src/main/resources/application-global(mj梅江系统).yml | 11
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/resources/application.yml | 2
pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml | 11
pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/resources/application.yml | 2
pipIrr-platform/pipIrr-web/pipIrr-web-operation/src/main/resources/application.yml | 2
25 files changed, 788 insertions(+), 14 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/application-database-mq.yml b/pipIrr-platform/pipIrr-global/src/main/resources/application-database-mq.yml
new file mode 100644
index 0000000..1c5dd33
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/application-database-mq.yml
@@ -0,0 +1,69 @@
+# 鏁版嵁婧愰厤缃�
+spring:
+ datasource: #閰嶇疆鏁版嵁婧�
+ mq:
+ #name: ym
+ type: com.alibaba.druid.pool.DruidDataSource
+ driverClassName: com.mysql.cj.jdbc.Driver
+# url: jdbc:mysql://192.168.40.166:3306/pipIrr_mq?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
+# url: jdbc:mysql://8.130.130.233:3306/pipIrr_mq?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
+ url: jdbc:mysql://127.0.0.1:3306/pipIrr_mq?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
+ username: root
+ password: dysql,;.abc!@#
+ druid:
+ # 鏁版嵁婧愬悕绉帮細褰撳瓨鍦ㄥ涓暟鎹簮鏃讹紝璁剧疆鍚嶅瓧鍙互寰堟柟渚跨殑鏉ヨ繘琛屽尯鍒�,榛樿鑷姩鐢熸垚鍚嶇О锛屾牸寮忔槸锛�"DataSource-" + System.identityHashCode(this)
+ name: druid-mysql-mq
+ #閰嶇疆鍒濆鍖栧ぇ灏忋�佹渶灏忋�佹渶澶�
+ initialSize: 10
+ minIdle: 10
+ maxActive: 100
+ # 鑾峰彇杩炴帴鏃舵渶澶х瓑寰呮椂闂�,鍗曚綅姣銆傞厤缃簡maxWait涔嬪悗,缂虹渷鍚敤鍏钩閿�,骞跺彂鏁堢巼浼氭湁鎵�涓嬮檷,濡傛灉闇�瑕佸彲浠ラ�氳繃閰嶇疆useUnfairLock灞炴�т负true浣跨敤闈炲叕骞抽攣
+ maxWait: 60000
+ #閰嶇疆闂撮殧澶氫箙杩涜涓�娆℃娴嬶紝妫�娴嬮渶瑕佸叧闂殑绌洪棽杩炴帴锛屽崟浣嶆绉掋�� 榛樿鏄�60s锛屽お闀垮彲鑳戒細瀵艰嚧鏃犳硶鍙婃椂妫�娴嬪埌杩炴帴涓柇
+ timeBetweenEvictionRunsMillis: 60000
+ #閰嶇疆涓�涓繛鎺ュ湪杩炴帴姹犱腑鐨勬渶灏忕敓瀛樻椂闂淬�佹渶澶х敓瀛樻椂闂达紝瓒呰繃鏈�澶х敓瀛樻椂闂翠細琚Щ闄わ紝鍗曚綅姣銆�
+ minEvictableIdleTimeMillis: 300000
+ maxEvictableIdleTimeMillis: 900000
+ #鎺㈡椿銆侀獙璇侀摼鎺ユ湁鏁堟�х殑鏌ヨ锛屾柊鐗堟湰榛樿浣跨敤mysqlPing浠ｆ浛
+ #validation-query: select 1 #娉ㄩ噴鎺夛紝閲囩敤榛樿鐨刴ysqlPing
+ #閰嶇疆浠庤繛鎺ユ睜鑾峰彇杩炴帴鏃讹紝褰撹繛鎺ョ┖闂叉椂闂村ぇ浜巘imeBetweenEvictionRunsMillis鏃舵槸鍚︽鏌ヨ繛鎺ユ湁鏁堟�э紝true姣忔閮芥鏌ワ紱false涓嶆鏌ャ��
+ testWhileIdle: true
+ #閰嶇疆浠庤繛鎺ユ睜鑾峰彇杩炴帴鏃跺拰鍚戣繛鎺ユ睜褰掕繕杩炴帴鏃讹紝鏄惁妫�鏌ヨ繛鎺ユ湁鏁堟��
+ #姣忔鑾峰彇鎴栧綊杩樿繛鎺ラ兘妫�娴嬪お棰戠箒锛岄櫎闈炵壒鍒噸瑕佹垨缃戠粶鐗瑰埆涓嶅彲闈犵瓑鎯呭喌锛屽缓璁敤testWhileIdle + timeBetweenEvictionRunsMillis浠ｆ浛銆�-->
+ testOnBorrow: false
+ testOnReturn: false
+ #閰嶇疆鏄惁瀹氭湡鎺㈡椿銆佹帰娲婚棿闅�, 榛樿120s
+ keepAlive: true
+ #keepAliveBetweenTimeMillis must be greater than timeBetweenEvictionRunsMillis
+ keepAliveBetweenTimeMillis: 1200000
+ #閰嶇疆涓�涓繛鎺ユ渶澶т娇鐢ㄦ鏁帮紝閬垮厤闀挎椂闂翠娇鐢ㄧ浉鍚岃繛鎺ラ�犳垚鏈嶅姟鍣ㄧ璐熻浇涓嶅潎琛°��
+ phyMaxUseCount: 1000
+ #鏄惁缂撳瓨preparedStatement锛屼篃灏辨槸PSCache銆侾SCache瀵规敮鎸佹父鏍囩殑鏁版嵁搴撴�ц兘鎻愬崌宸ㄥぇ锛屾瘮濡傝oracle銆傚湪mysql涓嬪缓璁叧闂��
+ poolPreparedStatements: false
+ #瑕佸惎鐢≒SCache锛屽繀椤婚厤缃ぇ浜�0锛屽綋澶т簬0鏃讹紝poolPreparedStatements鑷姩瑙﹀彂淇敼涓簍rue銆傚湪Druid涓紝涓嶄細瀛樺湪Oracle涓婸SCache鍗犵敤鍐呭瓨杩囧鐨勯棶棰橈紝鍙互鎶婅繖涓暟鍊奸厤缃ぇ涓�浜涳紝姣斿璇�100
+ maxOpenPreparedStatements: -1
+ #鎸囧畾姣忎釜杩炴帴涓奝SCache鐨勫ぇ灏�
+ maxPoolPreparedStatementPerConnectionSize: 20
+ #灞炴�х被鍨嬫槸瀛楃涓诧紝閫氳繃鍒悕鐨勬柟寮忛厤缃墿灞曟彃浠讹紝甯哥敤鐨勬彃浠舵湁锛�
+ #鐩戞帶缁熻鐢ㄧ殑filter:stat锛屾棩蹇楃敤鐨刦ilter:log4j锛岄槻寰ql娉ㄥ叆鐨刦ilter:wall
+ #filters: stat,wall,config
+ filters: wall,config
+ webStatFilter:
+ # 娣诲姞杩囨护瑙勫垯
+ urlPattern: /*
+ # 蹇界暐杩囨护鏍煎紡
+ exclusions: "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*"
+ statViewServlet:
+ # 璁剧疆ip鐧藉悕鍗�
+ # allow: 127.0.0.1
+ # 璁剧疆ip榛戝悕鍗曪紝浼樺厛绾ч珮浜庣櫧鍚嶅崟
+ deny:
+ # 璁剧疆鎺у埗鍙扮鐞嗙敤鎴�
+ # loginUsername: root
+ # loginPassword: root
+ # 鏄惁鍙互閲嶇疆鏁版嵁
+ resetEnable: false
+ # 寮�鍚痙ruid鐩戞帶椤甸潰
+ #enabled: true
+ enabled: false
+
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/application-database.yml b/pipIrr-platform/pipIrr-global/src/main/resources/application-database.yml
index 6a12b8b..9445737 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/application-database.yml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/application-database.yml
@@ -5,4 +5,4 @@
allow-bean-definition-overriding: true #璁剧疆涓簍rue鏃讹紝鍚庡畾涔夌殑bean浼氳鐩栦箣鍓嶅畾涔夌殑鐩稿悓鍚嶇О鐨刡ean
datasource: #閰嶇疆鏁版嵁婧�
#澶氫釜鏁版嵁婧愬悕绉板湪姝ら厤缃紝瑕佹眰涓巗pring銆俤atasource銆俒ym][sp][test]涓殑涓�鑷�
- names: ym,mj,sp,test
+ names: ym,mj,sp,test,mq
diff --git "a/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050mj\346\242\205\346\261\237\347\263\273\347\273\237\051.yml" "b/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050mj\346\242\205\346\261\237\347\263\273\347\273\237\051.yml"
index 9ba1f7e..fb19525 100644
--- "a/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050mj\346\242\205\346\261\237\347\263\273\347\273\237\051.yml"
+++ "b/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050mj\346\242\205\346\261\237\347\263\273\347\273\237\051.yml"
@@ -324,6 +324,9 @@
mj:
url: "http://127.0.0.1:8071"
comSendUrl: "http://127.0.0.1:8071/rtuMw/com/send"
+ mq:
+ url: "http://127.0.0.1:8100"
+ comSendUrl: "http://127.0.0.1:8100/rtuMw/com/send"
sp:
url: "http://127.0.0.1:8073"
comSendUrl: "http://127.0.0.1:8073/rtuMw/com/send"
@@ -371,6 +374,14 @@
secret: SEC6042bc964d08899a5853eb321eb5a4d842a395982777f815bd07451c879228b7
at-all: true
mobile: 18602657034
+ mq:
+ enable: true #鏄惁鍚敤
+ robot:
+ url: https://oapi.dingtalk.com/robot/send
+ access-token: fecef8e7725998f8912af05419580861aafc73413c4920036c07c050fa33055f
+ secret: SEC6042bc964d08899a5853eb321eb5a4d842a395982777f815bd07451c879228b7
+ at-all: true
+ mobile: 18602657034
sp:
enable: true #鏄惁鍚敤
robot:
diff --git "a/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050mq\346\260\221\345\213\244\347\263\273\347\273\237\051.yml" "b/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050mq\346\260\221\345\213\244\347\263\273\347\273\237\051.yml"
new file mode 100644
index 0000000..3ad2ac9
--- /dev/null
+++ "b/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050mq\346\260\221\345\213\244\347\263\273\347\273\237\051.yml"
@@ -0,0 +1,413 @@
+spring:
+ servlet:
+ multipart:
+ # 鍓嶇涓婁紶鏂囦欢锛岄檺鍒跺崟涓枃浠剁殑澶у皬鍜岄檺鍒舵墍鏈夋枃浠剁殑澶у皬
+ max-file-size: 500MB
+ max-request-size: 5000MB
+logging:
+ charset:
+ console: UTF-8
+ config:
+ classpath: log4j2.yml
+#绂佺敤鐧芥爣閿欒椤甸潰
+server:
+ error:
+ whitelabel:
+ enabled: false
+ #servlet閰嶇疆
+ servlet:
+ encoding:
+ #鍙栨秷榛樿鐨勫瓧绗﹂泦缂栫爜
+ enabled: true
+ #璁剧疆寮哄埗浣跨敤鎸囧畾瀛楃缂栫爜闆�
+ force: true
+ #浣跨敤鐨勫瓧绗︾紪鐮�
+ charset: utf-8
+# actuator閰嶇疆锛屽厛include浜嗗叏閮紝鐒跺悗鍐峞xclude鎸囧畾鐨別ndpoint
+management:
+ endpoints:
+ web:
+ exposure:
+ include: '*'
+ #exclude: beans
+ .shutdown:
+ enabled: true #鏄惁寮�鍚�/actuator/shutdown
+
+# SpringDoc-OpenApi 閰嶇疆
+springdoc:
+ swagger-ui:
+ #搴旂敤actuator鏃讹紝璁块棶: http://[IP]:[port]/actuator/swagger-ui/index.html 渚嬪http://127.0.0.1:9080/actuator/swagger-ui/index.html
+ #鏈敤actuator鏃讹紝璁块棶: http://[IP]:[port]/[context]/swagger-ui/index.html 渚嬪http://127.0.0.1:8080/[瀛愮郴缁熶笂涓嬫枃锛坆ase锛塢/swagger-ui/index.html
+ path: /swagger-ui
+ operationsSorter: method # HTTP 鏂规硶鎺掑簭
+ tagsSorter: alpha # API 鎺掑簭
+ api-docs:
+ path: /v3/apiDocs
+ groups:
+ enabled: true
+ show-actuator: true #鍦╝ctuator閰嶇疆鐨勭鍙ｅ強涓婁笅鏂囦腑璁块棶 SpringDoc-OpenApi
+ use-management-port: true #搴旂敤actuator閰嶇疆鐨勭鍙ｏ紝浣嗕笂闈㈢殑swagger-ui:path鍙細閲囩敤榛樿鍊約wagger-ui
+ packages-to-scan: com.dy
+ #paths-to-match: /sys/**, /demo/**, /**
+ paths-to-match: /**
+ web:
+ title: 澶х鑺傛按绠＄亴鐩戞帶绯荤粺API
+ description: 澶х鑺傛按绠＄亴鐩戞帶绯荤粺鏈嶅姟绔� Restfull API
+ version: v1.0.0
+ license-name: 澶х鑺傛按鐮旂┒闄�
+
+#MybatisPlus 閰嶇疆鏃ュ織鏄剧ず鎵цSQL
+mybatis-plus:
+ #鍖归厤sql璇彞鐨勬槧灏勬枃浠剁殑浣嶇疆锛宑lasspath浠ｈ〃鍦╮esources涓�
+ mapper-locations: classpath:mapper/*.xml
+ #浠ヤ笅涓や釜閰嶇疆鍙互鐪佺暐锛屽湪mapper鏄犲皠鏂囦欢涓厤缃�淍Mapper鈥濅篃鏄彲浠ョ殑銆�
+ #浣跨敤type-aliases-package涓寚瀹歟ntity鎵弿鍖呰矾寰勶紝璁﹎ybatis鑷姩鎵弿鑷畾涔夌殑entity
+ #type-aliases-package: com.dy.pipIrrGlobal.daoBa
+ configuration:
+ #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #鏃惰�岃緭鍑烘棩蹇楋紝鏃惰�屼笉杈撳嚭鏃ュ織
+ #log-impl: org.apache.ibatis.logging.log4j2.Log4j2Impl 涓嶅啀搴旂敤锛屾敼涓篜rintSqlInterceptor鎷︽埅鍣ㄨ緭鍑簊ql鏃ュ織锛屼笅闈rint-sql椤归厤缃�
+ print-sql: true # 杈撳嚭sql鏃ュ織寮�鍏筹紝鎺у埗PrintSqlInterceptor鎷︽埅鍣ㄦ槸鍚﹀姞杞�
+ #寮�鍚┘宄皍Name鑷姩鏄犲皠鍒皍_name
+ #2023-10-24缁忓疄楠岋紝涓嬮潰閰嶇疆true鎴杅alse锛岄兘鑳戒粠u_name鏄犲皠鍒皍Name
+ #map-underscore-to-camel-case: true
+ lazyLoadingEnabled: true # 寮�鍚欢鏃跺姞杞藉紑鍏�
+ aggressiveLazyLoading: false # 灏嗙Н鏋佸姞杞芥敼涓烘秷鏋佸姞杞斤紙鍗虫寜闇�鍔犺浇锛夛紝榛樿鍊兼槸false
+ lazy-load-trigger-methods: "" # 闃绘尅涓嶇浉骞茬殑鎿嶄綔瑙﹀彂锛屽疄鐜版噿鍔犺浇
+ cache-enabled: true #鎵撳紑鍏ㄥ眬缂撳瓨寮�鍏筹紙浜岀骇鐜锛夛紝榛樿鍊兼槸true
+ default-enum-type-handler: com.dy.common.mybatis.envm.EnumCodeTypeHandler
+
+pipIrr:
+ global:
+ dev: false #鏄惁寮�鍙戦樁娈碉紝true鎴杅alse
+ dsName: ym #寮�鍙戦樁娈碉紝璁剧疆涓存椂鐨勬暟鎹簱鍚嶇О
+ nginx:
+ webPort: 54321
+ mw:
+ webPort: 8100 #閫氫俊涓棿浠朵腑搴旂敤锛屼笉鑳藉湪web妯″潡绯荤粺涓簲鐢�
+ actutorPort: 9100 #閫氫俊涓棿浠朵腑搴旂敤锛屼笉鑳藉湪web妯″潡绯荤粺涓簲鐢�
+ idSuffix: 0
+ sso:
+ cacheMaximumSize: 10000 #鐧诲綍鐢ㄦ埛缂撳瓨鍙紦瀛樼敤鎴风殑鏈�澶у��
+ cacheDuration: 720 #缂撳瓨鐧诲綍鐢ㄦ埛鍙戝憜鏈�澶ф椂闀匡紙鍒嗛挓锛�
+ checkUrl: http://127.0.0.1:8079/sso/sso/ssoCheck
+ webPort: 8079
+ actutorPort: 9079
+ idSuffix: 1
+ base:
+ webPort: 8080
+ actutorPort: 9080
+ idSuffix: 2
+ remote:
+ webPort: 8081
+ actutorPort: 9081
+ idSuffix: 3
+ statistics:
+ webPort: 8082
+ actutorPort: 9082
+ idSuffix: 4
+ gis:
+ webPort: 8083
+ actutorPort: 9083
+ idSuffix: 5
+ demo:
+ webPort: 8000
+ actutorPort: 9000
+ idSuffix: 99
+ sell:
+ webPort: 8084
+ actutorPort: 9084
+ idSuffix: 6
+ project:
+ webPort: 8085
+ actutorPort: 9085
+ idSuffix: 7
+ irrigate:
+ webPort: 8086
+ actutorPort: 9086
+ idSuffix: 8
+ wechat:
+ webPort: 8087
+ actutorPort: 9087
+ idSuffix: 9
+ app:
+ webPort: 8088
+ actutorPort: 9088
+ idSuffix: 10
+ operation:
+ webPort: 8089
+ actutorPort: 9089
+ idSuffix: 11
+ # 2023-10-24鏂板锛岀敤浜庢墽琛屼复鏃朵换鍔★紝渚嬪鍒犻櫎鏁版嵁搴撲腑涓婁簺鍑洪敊鐨勬暟鎹�
+ temp:
+ webPort: 8099
+ actutorPort: 9099
+ idSuffix: 98
+
+ # 鍒嗗竷寮弚eb鏂囦欢绯荤粺
+ file:
+ idSuffix: 99
+ file1:
+ webPort: 8180
+ actutorPort: 9180
+ file2:
+ webPort: 8180
+ actutorPort: 9180
+ file3:
+ webPort: 8180
+ actutorPort: 9180
+ file4:
+ webPort: 8180
+ actutorPort: 9180
+ file5:
+ webPort: 8180
+ actutorPort: 9180
+ file6:
+ webPort: 8180
+ actutorPort: 9180
+ file7:
+ webPort: 8180
+ actutorPort: 9180
+ file8:
+ webPort: 8180
+ actutorPort: 9180
+ file9:
+ webPort: 8180
+ actutorPort: 9180
+ file10:
+ webPort: 8180
+ actutorPort: 9180
+ file11:
+ webPort: 8180
+ actutorPort: 9180
+ file12:
+ webPort: 8180
+ actutorPort: 9180
+
+
+#web鍒嗗竷寮忔枃浠剁郴缁�
+dy:
+ photoZipWidth: 400 #缂╃暐鍥惧昂瀵�
+ webFile:
+ fmUrl: http://127.0.0.1:${pipIrr.file1.webPort}/file # fm鐨剋eb涓婁笅鏂� URL
+ supportedFileTypes: docx,xlsx,doc,xls,pdf #鏀寔鐨勬枃妗ｏ紙闈炲獟浣撴枃浠讹紝濡傜収鐗囥�佸綍闊炽�佸綍鍍忥級鏂囦欢绫诲瀷
+ sv1:
+ id: dyFile1
+ absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ relativePath: webFile1
+ hashStart: 0
+ hashEnd: 5461
+ restUrl: http://127.0.0.1:${pipIrr.file1.webPort}/file #file鏄笂涓嬫枃,ip涓哄眬鍩熺綉ip鎴栨湰鍦癐P
+ webUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
+ webDownloadPath: http://127.0.0.1:${pipIrr.file1.webPort}/file/download/down?id= #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
+ sv2:
+ id: dyFile2
+ absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ relativePath: webFile2
+ hashStart: 5462
+ hashEnd: 10923
+ restUrl: http://127.0.0.1:${pipIrr.file2.webPort}/file
+ webUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/webfiles/
+ webDownloadPath: http://127.0.0.1:${pipIrr.file2.webPort}/file/download/down?id=
+ sv3:
+ id: dyFile3
+ absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ relativePath: webFile3
+ hashStart: 10924
+ hashEnd: 16385
+ restUrl: http://127.0.0.1:${pipIrr.file3.webPort}/file
+ webUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/webfiles/
+ webDownloadPath: http://127.0.0.1:${pipIrr.file3.webPort}/file/download/down?id=
+ sv4:
+ id: dyFile4
+ absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ relativePath: webFile4
+ hashStart: 16386
+ hashEnd: 21847
+ restUrl: http://127.0.0.1:${pipIrr.file4.webPort}/file
+ webUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/webfiles/
+ webDownloadPath: http://127.0.0.1:${pipIrr.file4.webPort}/file/download/down?id=
+ sv5:
+ id: dyFile5
+ absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ relativePath: webFile5
+ hashStart: 21848
+ hashEnd: 27309
+ restUrl: http://127.0.0.1:${pipIrr.file5.webPort}/file
+ webUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/webfiles/
+ webDownloadPath: http://127.0.0.1:${pipIrr.file5.webPort}/file/download/down?id=
+ sv6:
+ id: dyFile6
+ absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ relativePath: webFile6
+ hashStart: 27310
+ hashEnd: 32767
+ restUrl: http://127.0.0.1:${pipIrr.file6.webPort}/file
+ webUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/webfiles/
+ webDownloadPath: http://127.0.0.1:${pipIrr.file6.webPort}/file/download/down?id=
+ sv7:
+ id: dyFile7
+ absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ relativePath: webFile7
+ hashStart: 32768
+ hashEnd: 38229
+ restUrl: http://127.0.0.1:${pipIrr.file7.webPort}/file
+ webUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/webfiles/
+ webDownloadPath: http://127.0.0.1:${pipIrr.file7.webPort}/file/download/down?id=
+ sv8:
+ id: dyFile8
+ absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ relativePath: webFile8
+ hashStart: 38230
+ hashEnd: 43691
+ restUrl: http://127.0.0.1:${pipIrr.file8.webPort}/file
+ webUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/webfiles/
+ webDownloadPath: http://127.0.0.1:${pipIrr.file8.webPort}/file/download/down?id=
+ sv9:
+ id: dyFile9
+ absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ relativePath: webFile9
+ hashStart: 43692
+ hashEnd: 49153
+ restUrl: http://127.0.0.1:${pipIrr.file9.webPort}/file
+ webUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/webfiles/
+ webDownloadPath: http://127.0.0.1:${pipIrr.file9.webPort}/file/download/down?id=
+ sv10:
+ id: dyFile10
+ absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ relativePath: webFile10
+ hashStart: 49154
+ hashEnd: 54615
+ restUrl: http://127.0.0.1:${pipIrr.file10.webPort}/file
+ webUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/webfiles/
+ webDownloadPath: http://127.0.0.1:${pipIrr.file10.webPort}/file/download/down?id=
+ sv11:
+ id: dyFile11
+ absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ relativePath: webFile11
+ hashStart: 54616
+ hashEnd: 60077
+ restUrl: http://127.0.0.1:${pipIrr.file11.webPort}/file
+ webUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/webfiles/
+ webDownloadPath: http://127.0.0.1:${pipIrr.file11.webPort}/file/download/down?id=
+ sv12:
+ id: dyFile12
+ absolutePath: E:/java/nginx-1.24.0/html/webfiles/
+ relativePath: webFile12
+ hashStart: 60078
+ hashEnd: 65535
+ restUrl: http://127.0.0.1:${pipIrr.file12.webPort}/file
+ webUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/webfiles/
+ webDownloadPath: http://127.0.0.1:${pipIrr.file12.webPort}/file/download/down?id=
+
+#椤圭洰缂栧彿
+#projectCode:
+# ym: 100
+# sp: 101
+
+#椤圭洰閰嶇疆
+project:
+ #椤圭洰缂栫爜
+ projectNo: 10
+ #鎺у埗鍣ㄧ被鍨�
+ controllerType: 57
+ #榛樿琛屾斂鍖哄垝缂栫爜锛堝ぉ娲�-澶╂触甯�-姝︽竻鍖�-浜花宸ヤ笟鍥�-澶х鑺傛按锛�
+ divisionCode: 120114403100
+
+
+#閫氳涓棿浠剁浉鍏抽厤缃�
+#protocol: DYJS_2023,DYJS_2024
+mw:
+ #鍛戒护鍙戦�侀�氫俊涓棿浠跺湴鍧�
+ ym:
+ url: "http://127.0.0.1:8070"
+ comSendUrl: "http://127.0.0.1:8070/rtuMw/com/send"
+ mj:
+ url: "http://127.0.0.1:8071"
+ comSendUrl: "http://127.0.0.1:8071/rtuMw/com/send"
+ mq:
+ url: "http://127.0.0.1:8100"
+ comSendUrl: "http://127.0.0.1:8100/rtuMw/com/send"
+ sp:
+ url: "http://127.0.0.1:8073"
+ comSendUrl: "http://127.0.0.1:8073/rtuMw/com/send"
+ test:
+ url: "http://127.0.0.1:8072"
+ comSendUrl: "http://127.0.0.1:8072/rtuMw/com/send"
+ #鐩戞祴鎺у埗妯″潡鍥炶皟鍦板潃
+ rtuCallbackUrl_rm: "http://127.0.0.1:8081/remote/comRes/receive"
+ #rtu杩滅▼鍗囩骇妯″潡鍥炶皟鍦板潃
+ ugCallbackUrl_rm: "http://127.0.0.1:8081/remote/rtuUpgradeStateReceiver/receive"
+ #寰俊灏忕▼搴忓洖璋冨湴鍧�
+ rtuCallbackUrl_wx: "http://127.0.0.1:8087/wx/comRes/receive"
+
+#涓嶈繘琛寀serToken杩囨护鐨刄RL锛孈ConfigurationProperties瑕佹眰tokennofilter涓墍鏈夊瓧姣嶉兘灏忓啓
+tokennofilter:
+ urls:
+ - /sso/sso
+ - /remote/comRes/receive
+ - /remote/rtuUpgradeStateReceiver/receive
+ - /wx/comRes/receive
+ - /app/captcha/get
+ - /file/file #web鍒嗗竷寮忔枃浠剁郴缁�
+ - /file/fm #web鍒嗗竷寮忔枃浠剁郴缁�
+
+#鑷姩缁熻閰嶇疆锛岃嚜鍔ㄧ粺璁″畾鏃朵换鍔′細姣忓ぉ瀹氭椂杩涜
+auto-statistics:
+ startHour: 0 #寮�濮嬪皬鏃讹紝蹇呴』鏄�0鐐规垨涔嬪悗锛屽彇鍊艰寖鍥存槸0~5锛屽惁StatisticsListener涓嚜鍔ㄨ缃垚0
+ startMinute: 5 #寮�濮嬪垎閽� 5
+
+#閽夐拤娑堟伅鎺ㄩ��
+dingtalk:
+ ym:
+ enable: true #鏄惁鍚敤
+ robot:
+ url: https://oapi.dingtalk.com/robot/send
+ access-token: fecef8e7725998f8912af05419580861aafc73413c4920036c07c050fa33055f
+ secret: SEC6042bc964d08899a5853eb321eb5a4d842a395982777f815bd07451c879228b7
+ at-all: true
+ mobile: 18602657034
+ mj:
+ enable: true #鏄惁鍚敤
+ robot:
+ url: https://oapi.dingtalk.com/robot/send
+ access-token: fecef8e7725998f8912af05419580861aafc73413c4920036c07c050fa33055f
+ secret: SEC6042bc964d08899a5853eb321eb5a4d842a395982777f815bd07451c879228b7
+ at-all: true
+ mobile: 18602657034
+ mq:
+ enable: true #鏄惁鍚敤
+ robot:
+ url: https://oapi.dingtalk.com/robot/send
+ access-token: fecef8e7725998f8912af05419580861aafc73413c4920036c07c050fa33055f
+ secret: SEC6042bc964d08899a5853eb321eb5a4d842a395982777f815bd07451c879228b7
+ at-all: true
+ mobile: 18602657034
+ sp:
+ enable: true #鏄惁鍚敤
+ robot:
+ url: https://oapi.dingtalk.com/robot/send
+ access-token: fecef8e7725998f8912af05419580861aafc73413c4920036c07c050fa33055f
+ secret: SEC6042bc964d08899a5853eb321eb5a4d842a395982777f815bd07451c879228b7
+ at-all: true
+ mobile: 18602657034
+ test:
+ enable: true #鏄惁鍚敤
+ robot:
+ url: https://oapi.dingtalk.com/robot/send
+ access-token: fecef8e7725998f8912af05419580861aafc73413c4920036c07c050fa33055f
+ secret: SEC6042bc964d08899a5853eb321eb5a4d842a395982777f815bd07451c879228b7
+ at-all: true
+ mobile: 18602657034
+
+#闃�鎺у櫒鍙傛暟
+rtu:
+ batteryVolt: 17
+ signalIntensity:
+ weak: 10
+ ordinary: 20
+# strong: 20
+
+#铏氭嫙鍗￠厤缃弬鏁�
+vc:
+ #铏氭嫙鍗℃渶浣庝綑棰濇姤璀﹀��
+ alarmValue: 10
\ No newline at end of file
diff --git "a/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050sp\346\262\231\347\233\230\347\263\273\347\273\237\051.yml" "b/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050sp\346\262\231\347\233\230\347\263\273\347\273\237\051.yml"
index 7ad9cdf..5c782bc 100644
--- "a/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050sp\346\262\231\347\233\230\347\263\273\347\273\237\051.yml"
+++ "b/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050sp\346\262\231\347\233\230\347\263\273\347\273\237\051.yml"
@@ -324,6 +324,9 @@
mj:
url: "http://127.0.0.1:8071"
comSendUrl: "http://127.0.0.1:8071/rtuMw/com/send"
+ mq:
+ url: "http://127.0.0.1:8100"
+ comSendUrl: "http://127.0.0.1:8100/rtuMw/com/send"
sp:
url: "http://127.0.0.1:8073"
comSendUrl: "http://127.0.0.1:8073/rtuMw/com/send"
@@ -371,6 +374,14 @@
secret: SEC6042bc964d08899a5853eb321eb5a4d842a395982777f815bd07451c879228b7
at-all: true
mobile: 18602657034
+ mq:
+ enable: true #鏄惁鍚敤
+ robot:
+ url: https://oapi.dingtalk.com/robot/send
+ access-token: fecef8e7725998f8912af05419580861aafc73413c4920036c07c050fa33055f
+ secret: SEC6042bc964d08899a5853eb321eb5a4d842a395982777f815bd07451c879228b7
+ at-all: true
+ mobile: 18602657034
sp:
enable: true #鏄惁鍚敤
robot:
diff --git "a/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050test\346\265\213\350\257\225\347\263\273\347\273\237\051.yml" "b/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050test\346\265\213\350\257\225\347\263\273\347\273\237\051.yml"
index 966c67a..6abf1aa 100644
--- "a/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050test\346\265\213\350\257\225\347\263\273\347\273\237\051.yml"
+++ "b/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050test\346\265\213\350\257\225\347\263\273\347\273\237\051.yml"
@@ -324,6 +324,9 @@
mj:
url: "http://127.0.0.1:8071"
comSendUrl: "http://127.0.0.1:8071/rtuMw/com/send"
+ mq:
+ url: "http://127.0.0.1:8100"
+ comSendUrl: "http://127.0.0.1:8100/rtuMw/com/send"
sp:
url: "http://127.0.0.1:8073"
comSendUrl: "http://127.0.0.1:8073/rtuMw/com/send"
@@ -371,6 +374,14 @@
secret: SEC6042bc964d08899a5853eb321eb5a4d842a395982777f815bd07451c879228b7
at-all: true
mobile: 18602657034
+ mq:
+ enable: true #鏄惁鍚敤
+ robot:
+ url: https://oapi.dingtalk.com/robot/send
+ access-token: fecef8e7725998f8912af05419580861aafc73413c4920036c07c050fa33055f
+ secret: SEC6042bc964d08899a5853eb321eb5a4d842a395982777f815bd07451c879228b7
+ at-all: true
+ mobile: 18602657034
sp:
enable: true #鏄惁鍚敤
robot:
diff --git "a/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050ym\345\205\203\350\260\213\347\263\273\347\273\237\051.yml" "b/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050ym\345\205\203\350\260\213\347\263\273\347\273\237\051.yml"
index 3256eea..7c7205b 100644
--- "a/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050ym\345\205\203\350\260\213\347\263\273\347\273\237\051.yml"
+++ "b/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050ym\345\205\203\350\260\213\347\263\273\347\273\237\051.yml"
@@ -324,6 +324,9 @@
mj:
url: "http://127.0.0.1:8071"
comSendUrl: "http://127.0.0.1:8071/rtuMw/com/send"
+ mq:
+ url: "http://127.0.0.1:8100"
+ comSendUrl: "http://127.0.0.1:8100/rtuMw/com/send"
sp:
url: "http://127.0.0.1:8073"
comSendUrl: "http://127.0.0.1:8073/rtuMw/com/send"
@@ -371,6 +374,14 @@
secret: SEC6042bc964d08899a5853eb321eb5a4d842a395982777f815bd07451c879228b7
at-all: true
mobile: 18602657034
+ mq:
+ enable: true #鏄惁鍚敤
+ robot:
+ url: https://oapi.dingtalk.com/robot/send
+ access-token: fecef8e7725998f8912af05419580861aafc73413c4920036c07c050fa33055f
+ secret: SEC6042bc964d08899a5853eb321eb5a4d842a395982777f815bd07451c879228b7
+ at-all: true
+ mobile: 18602657034
sp:
enable: true #鏄惁鍚敤
robot:
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml b/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
index 73625af..82253e8 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
@@ -324,6 +324,9 @@
mj:
url: "http://127.0.0.1:8071"
comSendUrl: "http://127.0.0.1:8071/rtuMw/com/send"
+ mq:
+ url: "http://127.0.0.1:8100"
+ comSendUrl: "http://127.0.0.1:8100/rtuMw/com/send"
sp:
url: "http://127.0.0.1:8073"
comSendUrl: "http://127.0.0.1:8073/rtuMw/com/send"
@@ -371,6 +374,14 @@
secret: SEC6042bc964d08899a5853eb321eb5a4d842a395982777f815bd07451c879228b7
at-all: true
mobile: 18602657034
+ mq:
+ enable: true #鏄惁鍚敤
+ robot:
+ url: https://oapi.dingtalk.com/robot/send
+ access-token: fecef8e7725998f8912af05419580861aafc73413c4920036c07c050fa33055f
+ secret: SEC6042bc964d08899a5853eb321eb5a4d842a395982777f815bd07451c879228b7
+ at-all: true
+ mobile: 18602657034
sp:
enable: true #鏄惁鍚敤
robot:
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml b/pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml
index 27cd315..93fa170 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml
@@ -254,5 +254,68 @@
<item3 typeName="璁惧淇濆吇"/>
</taskType>
</org4>
+ <org5 tag="mq" name="姘戝嫟" enable="true">
+ <districts>
+ <province name="鐢樿們鐪�" num="62" level="0">
+ <city name="姝﹀▉甯�" num="06" level="1">
+ <country name="姘戝嫟鍘�" num="21" level="2" />
+ </city>
+ </province>
+ </districts>
+ <dictionaries>
+ <dict code="icProtocol" title="IC鍗″崗璁�" valueType="2">
+ <dictItem>
+ <!-- 闈冲缓浼熺増鏈琁C鍗″崗璁� 鍗′腑缂栧彿宸茬粡鍔犻暱锛堜笌鐜嬫睙娴风増鏈竴鑷达級锛屼笌绾�佺増鏈崗璁笉鍚� -->
+ <item1 dictCode="icProtocol" value="icP202203" name="鑰佸崱鍗忚" status="1" sort="0" />
+ <!-- 鐜嬫睙娴风増鏈琁C鍗″崗璁� -->
+ <item2 dictCode="icProtocol" value="icP202404" name="鏂板崱鍗忚" status="0" sort="1" />
+ </dictItem>
+ </dict>
+ </dictionaries>
+ <user name="瓒呯骇绠＄悊鍛�" phone="admin" password="dyyjy" supperAdmin="1" />
+ <payments>
+ <item1 name="鐜伴噾"/>
+ <item2 name="POS鏈�"/>
+ <item3 name="閾惰杞处"/>
+ </payments>
+ <settings>
+ <item1 item_name="lng" item_value="103" remarks="缁忓害"/>
+ <item2 item_name="lat" item_value="38" remarks="绾害"/>
+ <item3 item_name="zoomMp" item_value="12" remarks="鎵嬫満鍦板浘缂╂斁绾у埆"/>
+ <item4 item_name="zoomPc" item_value="19" remarks="PC鏈哄湴鍥剧缉鏀剧骇鍒�"/>
+ <item5 item_name="projectName" item_value="楂樻晥鏅烘収绠＄亴寰亴浜戞湇鍔＄鐞嗗钩鍙�" remarks="椤圭洰鍚嶇О"/>
+ </settings>
+ <waterTypes>
+ <item1 typeName="鐏屾簤鐢ㄦ按"/>
+ <item2 typeName="宸ヤ笟鐢ㄦ按"/>
+ <item3 typeName="鐢熸椿鐢ㄦ按"/>
+ <item4 typeName="鍏绘畺鐢ㄦ按"/>
+ <item5 typeName="缁垮寲鐢ㄦ按"/>
+ </waterTypes>
+ <waterPrice price="0.90" />
+ <irrigateProfile>
+ <item1 defaultValue = "10" unit = "2" sort = "1" type = "1"/>
+ <item2 defaultValue = "20" unit = "2" sort = "2" type = "1" />
+ <item3 defaultValue = "1" unit = "1" sort = "3" type = "1"/>
+ <item4 defaultValue = "2" unit = "1" sort = "4" type = "1"/>
+ <item5 defaultValue = "20" unit = "3" sort = "1" type = "2"/>
+ <item6 defaultValue = "30" unit = "3" sort = "2" type = "2"/>
+ <item7 defaultValue = "50" unit = "3" sort = "3" type = "2"/>
+ <item8 defaultValue = "80" unit = "3" sort = "4" type = "2"/>
+ </irrigateProfile>
+ <rechargeProfile>
+ <item1 rechargeAmount = "50" sort = "1"/>
+ <item2 rechargeAmount = "100" sort = "2" />
+ <item3 rechargeAmount = "200" sort = "3"/>
+ <item4 rechargeAmount = "300" sort = "4"/>
+ <item5 rechargeAmount = "500" sort = "5"/>
+ <item6 rechargeAmount = "1000" sort = "6"/>
+ </rechargeProfile>
+ <taskType>
+ <item1 typeName="璁惧瀹夎"/>
+ <item2 typeName="璁惧缁翠慨"/>
+ <item3 typeName="璁惧淇濆吇"/>
+ </taskType>
+ </org5>
</orgs>
</config>
\ No newline at end of file
diff --git "a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/application-database\050mq\346\260\221\345\213\244\051.yml" "b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/application-database\050mq\346\260\221\345\213\244\051.yml"
new file mode 100644
index 0000000..f5a2a65
--- /dev/null
+++ "b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/application-database\050mq\346\260\221\345\213\244\051.yml"
@@ -0,0 +1,17 @@
+# 鏁版嵁婧愰厤缃�
+spring:
+ datasource: #閰嶇疆鏁版嵁婧�
+ type: com.alibaba.druid.pool.DruidDataSource
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ url: jdbc:mysql://127.0.0.1:3306/pipIrr_mq?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
+ username: root
+ password: dysql,;.abc!@#
+ druid:
+ #鏁版嵁婧愬悕绉帮細褰撳瓨鍦ㄥ涓暟鎹簮鏃讹紝璁剧疆鍚嶅瓧鍙互寰堟柟渚跨殑鏉ヨ繘琛屽尯鍒�,榛樿鑷姩鐢熸垚鍚嶇О锛屾牸寮忔槸锛�"DataSource-" + System.identityHashCode(this)
+ #name: name: druid-mysql-mw-rtu 鍗曟暟鎹簮涓嶈捣浣滅敤锛屾墍浠ユ敞閲婃帀
+ #閰嶇疆鍒濆鍖栧ぇ灏忋�佹渶灏忋�佹渶澶�
+ initialSize: 10
+ minIdle: 10
+ maxActive: 200
+ # 鑾峰彇杩炴帴鏃舵渶澶х瓑寰呮椂闂�,鍗曚綅姣銆傞厤缃簡maxWait涔嬪悗,缂虹渷鍚敤鍏钩閿�,骞跺彂鏁堢巼浼氭湁鎵�涓嬮檷,濡傛灉闇�瑕佸彲浠ラ�氳繃閰嶇疆useUnfairLock灞炴�т负true浣跨敤闈炲叕骞抽攣
+ maxWait: 60000
diff --git "a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config\050mq\346\260\221\345\213\244\051.xml" "b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config\050mq\346\260\221\345\213\244\051.xml"
new file mode 100644
index 0000000..8193111
--- /dev/null
+++ "b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config\050mq\346\260\221\345\213\244\051.xml"
@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<config>
+ <server name="閫氫俊涓棿浠�" showStartInfo="true" company="http://www.dyjs.com"/>
+ <!--
+ 鍩烘湰閰嶇疆
+ orgTag 鏈烘瀯tag(瀵瑰簲鏈烘瀯tag,鍜屾暟鎹簮鍚庣紑)
+ isLowPower: 鏄惁涓轰綆鍔熻��
+ onlyDealRtus:鍙鐞嗘寚瀹歊TU鍦板潃璁惧锛屽叾浠栬澶囨暟鎹涪寮冿紝澶氫釜RTU鍦板潃鐢ㄨ嫳鏂囬�楀彿闅斿紑锛�
+ onlyOneProtocol锛氬湪鏀寔澶氶�氫俊鍗忚鏃讹紝鍙湁RTU涓婄嚎浜嗭紝鎵嶈兘璇嗗埆鍑鸿RTU瀹為檯鐢ㄧ殑閫氫俊鍗忚锛岃繘鑰岀敤姝ゅ崗璁В鏋愪笂琛屾暟鎹強鏋勯�犱笅琛屽懡浠ゃ��
+ 濡傛灉RTU鏈浘涓婄嚎锛堥�氫俊涓棿浠跺惎鍔ㄥ悗璇TU鏈浘涓婄嚎锛夛紝閭ｄ箞鍦ㄥ悜瀹冨彂閫佷笅琛屽懡浠ゆ椂锛屼笉鑳藉垽鏂嚭鍏堕噰鐢ㄧ殑鍗忚锛屼篃涓嶈兘鏋勯�犲懡浠わ紝灏ゅ叾鏄綆鍔熻�楁儏鍐典笅锛屼笉涓婄嚎鏄甯哥幇璞°��
+ 褰撳彧鏈変竴涓崗璁儏鍐典笅锛屽湪RTU鏈浘涓婄嚎鏃讹紝涔熻兘鐢ㄦ鍗忚鏋勯�犲懡浠ゅ苟缂撳瓨涓嬫潵锛屽挨鍏堕�傚悎浣庡姛鑰楁儏鍐点��
+ onlyOneProtocol=true: 閫氫俊涓棿浠跺綋鍓嶅彧鏈変竴涓崗璁�
+ downComandMaxResendTimes: 涓嬭鍛戒护鍏佽鍙戦�佺殑鏈�澶ф鏁癤锛屽嵆鍏佽閲嶅彂X-1
+ commandSendInterval: 閽堝涓�涓猂TU锛屼笅鍙戝懡浠ょ殑鏃堕棿闂撮殧(绉�)
+ cachWaitResultTimeout: 鍛戒护宸茬粡鍙戦�佽揪鏈�澶ф鏁帮紝浠嶆湭鏀跺埌鍛戒护缁撴灉锛岄渶瑕佸湪缂撳瓨缁х画绛夊緟锛屽叾绛夊緟鏈�澶ф椂闀�(绉�)锛屾湰绯荤粺RTU锛屽浜庡紑鍏虫车鍛戒护锛屽叾鍏堟墽琛屽紑鍏虫车鎶ワ紝鐒跺悗鍐嶈繘琛屽懡浠ゅ簲绛旓紝鎵�浠ユ鍊� 瑕佸ぇ涓�浜�
+ offLineCachTimeout: 涓嶅湪绾跨紦瀛樼殑鍛戒护鏈�澶х紦瀛樻椂闀�(绉�)
+ lastUpDataTimeLive: TCP涓婅鏁版嵁鏃跺埢缂撳瓨鏃堕暱(姣)锛屽綋杈惧埌鏃堕暱鏃讹紝TCP涓婅鏁版嵁鏃跺埢琚竻绌猴紝閲囩敤TCP涓婅鏁版嵁鏃跺埢鐩殑鏄紝闃绘涓婅鏁版嵁鍚屾椂涓嬪彂鏁版嵁锛屽洜涓篟TU澶勭悊涓嶈繃鏉�(缁忓垵娆″疄楠岋紝1绉掕繕鏄湁闂锛�2绉掓棤闂)
+ dbDataIdSuffix锛氭暟鎹簱鏁版嵁id鐢熸垚鍣ㄧ殑id鍚庣紑锛�0鏄粯璁ょ殑鍚庣紑锛屼竴鑸瑆eb绯荤粺搴旂敤锛屾暟鎹腑闂翠欢id鍚庣紑澶т簬绛変簬1
+ cacheUpDownDataWarnCount锛氫笂涓嬭鏁版嵁缂撳瓨闃熷垪涓紦瀛樻暟鎹釜鏁扮殑鎶ヨ閲忥紝杩欎釜涓庣幇瀹為」鐩墍鎺ユ按琛ㄦ暟鐩稿叧
+ cacheUpDownDataMaxCount锛氫笂涓嬭鏁版嵁缂撳瓨闃熷垪涓紦瀛樻暟鎹釜鏁扮殑鏈�澶у�硷紝杩欎釜涓庣幇瀹為」鐩墍鎺ユ按琛ㄦ暟鐩稿叧
+ disconnectedByNoUpDataMinutes锛氭病鏈変笂琛屾暟鎹殑鍒嗛挓鏁帮紝杈惧埌杩欎釜鍒嗛挓鏁帮紝璁や负RTU鏂綉浜嗭紝鍙栧�艰寖鍥存槸2-100
+ workReportDealOneByTimes: 宸ヤ綔鎶ュお棰戠箒锛孨娆′笂鎶ュ鐞�1娆★紝鍙栧�艰寖鍥存槸1-100
+ intakeAlarmLossMinValue: 瑙﹀彂鍙戦�侀拤閽夋姤璀︽秷鎭殑鍙栨按鍙ｆ棩婕忔崯閲忕殑鏈�灏忓�硷紙鍖呮嫭浣嗛櫎0.0澶栵級锛堝皬鏁帮級
+ sendDingDingAlarmMsInterval: 鏈夋姤璀﹀彂鐢熸椂锛屽悜閽夐拤鍙戦�佹秷鎭殑闂撮殧鏃堕暱锛堝垎閽燂級
+ -->
+ <base
+ orgTag="mq"
+ isLowPower="false"
+ onlyDealRtus=""
+ onlyOneProtocol="false"
+ downComandMaxResendTimes="1"
+ commandSendInterval="3"
+ cachWaitResultTimeout="120"
+ offLineCachTimeout="86400"
+ lastUpDataTimeLive="500"
+ dbDataIdSuffix="0"
+ cacheUpDownDataWarnCount="100000"
+ cacheUpDownDataMaxCount="110000"
+ disconnectedByNoUpDataMinutes="3"
+ workReportDealOneByTimes="5"
+ intakeAlarmLossMinValue="1.0"
+ sendDingDingAlarmMsInterval="60"
+ />
+
+ <!--
+ 2024-08-22 姝ら厤缃殏鏃舵湭搴旂敤
+ centerAddr: 涓績鍦板潃锛屽綋鍓嶏紝centerAddr鏈敤鍒�
+ synchroRtuClock: 鏄惁瀵筊TU鏍℃椂
+ synchroRtuClockTimepieces锛氬綋RTU涓庢湇鍔″櫒鏃堕挓鐩稿樊涓�瀹氭绉掞紙閰嶇疆鏂囦欢鏄閽燂級鍚庯紝杩涜鏍℃椂
+ -->
+ <protocol
+ centerAddr="1"
+ synchroRtuClock="true"
+ synchroRtuClockTimepieces="300000"
+ />
+
+ <!-- RTU 杞欢鍗囩骇
+ enable: 妯″潡鏄惁鍚姩
+ openNoUpgrade: 闃�寮�锛堟车寮�锛変笉鎵ц鍗囩骇
+ lastOpenMaxGoOn: 闃�寮�锛堟车寮�锛夌姸鎬佽缃互鏉ユ寔缁渶闀挎椂闂达紙绉掗挓锛夛紝瓒呰繃杩欎釜鏃堕棿璁や负鐘舵�佹棤鏁堬紙杩欎釜鏃堕暱鍙栧喅浜庡伐浣滄姤闂撮殧锛�
+ noOneRtuUpgradeMaxDuration锛氬崌绾т换鍔¤缃悗锛屾棤涓�璁惧鍗囩骇鏈�澶ф椂闀匡紙绉掞級锛岃秴杩囪繖涓椂闀匡紝璁や负鍗囩骇浠诲姟瀹屾垚锛屽彇鍊艰寖鍥存槸5鍒嗛挓~60鍒嗛挓
+ runningAndIdleDuration锛歳tu鍗囩骇鍚姩鍚庤繘鍏ュ崌绾т腑鐘舵�侊紝浣嗘煇绉嶆儏鍐典笅RTU涓嶅啀閫氫俊浜嗭紝涓�鐩村浜庣瓑寰呯姸鎬侊紝绛夊緟杈惧埌涓�瀹氭椂闀匡紙绉掞紝涓�鑸笌noOneRtuUpgradeMaxDuration鐩哥瓑锛夎涓哄崌绾уけ璐ワ紙涓�鍖呮鎴栧鍖呮锛夛紝鍙栧�艰寖鍥存槸5鍒嗛挓~60鍒嗛挓
+ failTryTimes锛氬崌绾уけ璐ュ悗锛堥拡瀵圭殑鏄湪绾胯繘琛屼簡鍗囩骇涓嬪彂鍛戒护锛夛紝閲嶆柊鍋胯瘯鍗囩骇娆℃暟锛屽綋璁剧疆涓�0鏃惰〃绀轰笉閲嶆柊鍋胯瘯鍗囩骇
+ ugMaxRtuAtOnce锛氫负浜嗙紦瑙ｉ�氫俊涓棿浠剁殑鍘嬪姏锛屽悓鏃舵敮鎸佸崌绾х殑RTU鍙版暟锛屽綋璁剧疆涓�0鏃惰〃绀轰笉鍙楅檺鍒�
+ rtuOffLineWaitDuration: rtu绂荤嚎锛岀瓑寰呭叾鍗囩骇鐨勬椂闀匡紙绉掞級锛岃秴杩囪繖涓椂闂达紝璁剧疆鍏跺崌绾уけ璐ワ紝涓旇缃崌绾т换鍔″畬鎴�
+ notifyStateInterval: 鍗囩骇鐘舵�侀�氱煡闂撮殧锛堢锛�
+ notifyTimesAfterOver: 鍗囩骇缁撴潫鍚庯紝鍐嶅悜web鏈嶅姟绯荤粺閫氱煡鐘舵�佺殑娆℃暟
+ -->
+ <upgrade enable="true"
+ openNoUpgrade="true"
+ lastOpenMaxGoOn="1800"
+ noOneRtuUpgradeMaxDuration="1200"
+ runningAndIdleDuration="1200"
+ failTryTimes="2"
+ ugMaxRtuAtOnce="5000"
+ rtuOffLineWaitDuration="1800"
+ notifyStateInterval="2"
+ notifyTimesAfterOver="1"
+ />
+
+
+ <!--
+ 鏀寔妯″潡
+ 鐭伐浣滄椂闀跨嚎绋嬫睜锛岀嚎绋嬭礋璐ｇ敤鏃惰緝鐭殑宸ヤ綔浠诲姟
+ short_maxThread锛� 姹犱腑鏈�澶х嚎绋嬫暟涓烘墍鏈塁PU鏍告暟+1锛坰hort姹犱笌long姹犲悇鍒嗕竴鍗婏級锛岃嫢涓�-1锛屼笉鍙楅檺鍒� 锛岃缃负0锛岃〃绀轰笉鍚姩绾跨▼姹�
+ short_minThread锛� 姹犱腑鏈�灏忕嚎绋嬫暟锛岃嫢涓�-1锛屼笉鍙楅檺鍒讹紝璁剧疆涓�0锛岃〃绀轰笉鍚姩绾跨▼姹�
+ short_freeTimeout锛� 绾跨▼鏁扮┖闂叉椂闀匡紝鑻ユ睜涓嚎绋嬫暟閲忓ぇ浜巑inThread锛屼笖鏈夌殑绾跨▼绌洪棽鏃堕暱瓒呰繃freeTimeout锛屽垯娓呴櫎璇ョ嚎绋嬶紝涓轰簡涓嶆竻闄わ紝鎶妋inThread涓巑axThread璁剧疆鐩哥瓑
+ short_busyTimeout锛氱嚎绋嬩笉闂存柇宸ヤ綔鏃堕暱锛堝崟浣嶄负绉�)瓒呮椂闄愶紝璁や负绾跨▼宸茬粡浜嗗穿婧冿紝灏嗗己鍒舵竻闄わ紝鐭伐浣滄椂闀胯缃负5绉�
+ 闀垮伐浣滄椂闀跨嚎绋嬫睜锛岀嚎绋嬭礋璐ｇ敤鏃惰緝闀跨殑宸ヤ綔浠诲姟锛屼緥濡傛暟鎹簱瀛樺彇鎿嶄綔
+ long_maxThread锛� 姹犱腑鏈�澶х嚎绋嬫暟涓烘墍鏈塁PU鏍告暟+1锛坰hort姹犱笌long姹犲悇鍒嗕竴鍗婏級锛岃嫢涓�-1锛屼笉鍙楅檺鍒讹紝璁剧疆涓�0锛岃〃绀轰笉鍚姩绾跨▼姹�
+ long_minThread锛� 姹犱腑鏈�灏忕嚎绋嬫暟锛岃嫢涓�-1锛屼笉鍙楅檺鍒讹紝璁剧疆涓�0锛岃〃绀轰笉鍚姩绾跨▼姹�
+ long_freeTimeout锛� 绾跨▼鏁扮┖闂叉椂闀匡紝鑻ユ睜涓嚎绋嬫暟閲忓ぇ浜巑inThread锛屼笖鏈夌殑绾跨▼绌洪棽鏃堕暱瓒呰繃freeTimeout锛屽垯娓呴櫎璇ョ嚎绋�
+ long_busyTimeout锛氱嚎绋嬩笉闂存柇宸ヤ綔鏃堕暱锛堝崟浣嶄负绉�)瓒呮椂闄愶紝鑻ヤ负-1锛屼笉鍙楅檺鍒�
+ enableThreadPool锛氭槸鍚﹀惎鐢ㄧ嚎绋嬫睜
+ -->
+ <support
+ short_maxThread="6"
+ short_minThread="6"
+ short_freeTimeout="60"
+ short_busyTimeout="5"
+ long_maxThread="6"
+ long_minThread="6"
+ long_freeTimeout="60"
+ long_busyTimeout="-1"
+ enableThreadPool="true"
+ />
+
+ <!--
+ 璧勬簮妯″潡
+ rtuLogDir锛歊TU鏃ュ織鏂囦欢瀛樺偍鐩綍(鐩稿鐩綍)
+ rtuLogFileMaxSize锛歊TU鏃ュ織鏂囦欢鏈�澶у瓧鑺傛暟(B)
+ rtuLogFileMaxCount锛歊TU鏃ュ織鏂囦欢鏈�澶ф枃浠舵暟
+ monitorInterval锛歊tu鐘舵�佺洃瑙嗛棿闅�(鍒嗛挓)
+ saveDbInterval锛歊tu鐘舵�佸瓨鏁版嵁搴撻棿闅�(鍒嗛挓)
+ -->
+ <resource
+ rtuLogDir="rtuLogs/"
+ rtuLogFileMaxSize="100000"
+ rtuLogFileMaxCount="2"
+ monitorInterval="2"
+ saveDbInterval="10"
+ />
+
+
+ <!--
+ 2024-08-22 姝ら厤缃殏鏃舵湭搴旂敤
+ port锛歳mi鏈嶅姟绔彛鍙�
+ context锛歳mi鏈嶅姟涓婁笅鏂�
+ -->
+ <rmi enable="true"
+ port="65400"
+ context="rtuMw"
+ />
+
+ <!--
+ coreInterval锛氫富绾跨▼姣忔鎵ц闂撮殧鏃堕暱锛堟绉掞級
+ queueWarnSize: 缂撳瓨闃熷垪鑺傜偣鏁拌鍛婃暟閲�
+ queueMaxSize: 缂撳瓨闃熷垪鑺傜偣鏁版渶澶ф暟閲�
+ -->
+ <core
+ coreInterval="100"
+ queueWarnSize="100000"
+ queueMaxSize="300000"
+ />
+
+ <!--
+ port锛氱鍙�
+ processors锛� Mina IO 澶勭悊涓婁笅琛屾暟鎹殑绾跨▼鏁帮紝涓�鑸槸CPU鎬绘牳鏁�+1
+ idle: 鍙戝憜鏃堕暱锛堢锛�
+ -->
+ <tcp enable="true"
+ port="60100"
+ processors="3"
+ idle="10"
+ />
+
+</config>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/resources/application.yml b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/resources/application.yml
index e90fecc..228272e 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/resources/application.yml
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/resources/application.yml
@@ -1,6 +1,6 @@
spring:
profiles:
- include: global, database, database-ym, database-sp, database-test,database-mj
+ include: global, database, database-ym, database-sp, database-test,database-mj,database-mq
#actutor鐨剋eb绔彛
management:
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/resources/application.yml b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/resources/application.yml
index 1062d4e..eb80e19 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/resources/application.yml
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/resources/application.yml
@@ -1,6 +1,6 @@
spring:
profiles:
- include: global, database, database-ym, database-sp, database-test,database-mj
+ include: global, database, database-ym, database-sp, database-test,database-mj,database-mq
user:
defaultTrueRandomFalsePassword: true #true:閲囩敤榛樿瀵嗙爜锛宖alse:绯荤粺浜х敓闅忔満瀵嗙爜
defaultPassword: "abc_123"
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-file/src/main/resources/application.yml b/pipIrr-platform/pipIrr-web/pipIrr-web-file/src/main/resources/application.yml
index 750db47..76c7483 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-file/src/main/resources/application.yml
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-file/src/main/resources/application.yml
@@ -1,6 +1,6 @@
spring:
profiles:
- include: global, database, database-ym, database-sp, database-test,database-mj
+ include: global, database, database-ym, database-sp, database-test,database-mj,database-mq
#actutor鐨剋eb绔彛
management:
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-gis/src/main/resources/application.yml b/pipIrr-platform/pipIrr-web/pipIrr-web-gis/src/main/resources/application.yml
index 66179d0..51ff4d8 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-gis/src/main/resources/application.yml
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-gis/src/main/resources/application.yml
@@ -1,6 +1,6 @@
spring:
profiles:
- include: global, database, database-ym, database-sp, database-test,database-mj
+ include: global, database, database-ym, database-sp, database-test,database-mj,database-mq
#actutor鐨剋eb绔彛
management:
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/resources/application.yml b/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/resources/application.yml
index 2237c1c..cd8db20 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/resources/application.yml
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/resources/application.yml
@@ -1,6 +1,6 @@
spring:
profiles:
- include: global, database, database-ym, database-sp, database-test,database-mj
+ include: global, database, database-ym, database-sp, database-test,database-mj,database-mq
#actutor鐨剋eb绔彛
management:
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-operation/src/main/resources/application.yml b/pipIrr-platform/pipIrr-web/pipIrr-web-operation/src/main/resources/application.yml
index 10722d5..8f703ba 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-operation/src/main/resources/application.yml
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-operation/src/main/resources/application.yml
@@ -1,6 +1,6 @@
spring:
profiles:
- include: global, database, database-ym, database-sp, database-test,database-mj
+ include: global, database, database-ym, database-sp, database-test,database-mj,database-mq
#actutor鐨剋eb绔彛
management:
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/resources/application.yml b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/resources/application.yml
index ce19ae1..efbe063 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/resources/application.yml
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/resources/application.yml
@@ -1,6 +1,6 @@
spring:
profiles:
- include: global, database, database-ym, database-sp, database-test,database-mj
+ include: global, database, database-ym, database-sp, database-test,database-mj,database-mq
#actutor鐨剋eb绔彛
management:
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/resources/application.yml b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/resources/application.yml
index 46d7a1c..7782b62 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/resources/application.yml
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/resources/application.yml
@@ -1,6 +1,6 @@
spring:
profiles:
- include: global, database, database-ym, database-sp, database-test,database-mj
+ include: global, database, database-ym, database-sp, database-test,database-mj,database-mq
#actutor鐨剋eb绔彛
management:
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/resources/application.yml b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/resources/application.yml
index d54227d..1864041 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/resources/application.yml
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/resources/application.yml
@@ -1,6 +1,6 @@
spring:
profiles:
- include: global, database, database-ym, database-sp, database-test,database-mj
+ include: global, database, database-ym, database-sp, database-test,database-mj,database-mq
#actutor鐨剋eb绔彛
management:
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/resources/application.yml b/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/resources/application.yml
index 926db75..2eed3f4 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/resources/application.yml
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/resources/application.yml
@@ -1,6 +1,6 @@
spring:
profiles:
- include: global, database, database-ym, database-sp, database-test,database-mj
+ include: global, database, database-ym, database-sp, database-test,database-mj,database-mq
#actutor鐨剋eb绔彛
management:
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/resources/application.yml b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/resources/application.yml
index 9470d8b..8a22743 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/resources/application.yml
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/resources/application.yml
@@ -1,6 +1,6 @@
spring:
profiles:
- include: global, database, database-ym, database-sp, database-test,database-mj
+ include: global, database, database-ym, database-sp, database-test,database-mj,database-mq
#actutor鐨剋eb绔彛
management:
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/resources/application.yml b/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/resources/application.yml
index d6d9525..6f6ddc2 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/resources/application.yml
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/resources/application.yml
@@ -1,6 +1,6 @@
spring:
profiles:
- include: global, database, database-ym, database-sp, database-test,database-mj
+ include: global, database, database-ym, database-sp, database-test,database-mj,database-mq
user:
defaultTrueRandomFalsePassword: true #true:閲囩敤榛樿瀵嗙爜锛宖alse:绯荤粺浜х敓闅忔満瀵嗙爜
defaultPassword: "abc_123"
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/resources/application.yml b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/resources/application.yml
index 7645a66..c5cbd76 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/resources/application.yml
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/resources/application.yml
@@ -1,6 +1,6 @@
spring:
profiles:
- include: global, database, database-ym, database-sp, database-test,database-mj
+ include: global, database, database-ym, database-sp, database-test,database-mj,database-mq
jpa:
diff --git "a/pipIrr-platform/\346\226\207\346\241\243/\347\256\241\347\201\214\347\263\273\347\273\237\345\242\236\345\212\240\344\270\200\344\270\252\345\256\242\346\210\267\347\263\273\347\273\237.docx" "b/pipIrr-platform/\346\226\207\346\241\243/\347\256\241\347\201\214\347\263\273\347\273\237\345\242\236\345\212\240\344\270\200\344\270\252\345\256\242\346\210\267\347\263\273\347\273\237.docx"
index 8f06c9c..deb41b6 100644
--- "a/pipIrr-platform/\346\226\207\346\241\243/\347\256\241\347\201\214\347\263\273\347\273\237\345\242\236\345\212\240\344\270\200\344\270\252\345\256\242\346\210\267\347\263\273\347\273\237.docx"
+++ "b/pipIrr-platform/\346\226\207\346\241\243/\347\256\241\347\201\214\347\263\273\347\273\237\345\242\236\345\212\240\344\270\200\344\270\252\345\256\242\346\210\267\347\263\273\347\273\237.docx"
Binary files differ
--
Gitblit v1.8.0