From 7d0b26ceec85b293708a742c773058f211246993 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 20 六月 2025 10:53:09 +0800
Subject: [PATCH] 增加增加嘉峪关机构，相应调整配置及文档补充
---
pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/resources/application(121服务器).yml | 2
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/resources/application(121服务器).yml | 2
pipIrr-platform/pipIrr-global/src/main/resources/application-common-web.yml | 2
pipIrr-platform/pipIrr-global/src/main/resources/init-config(121服务器).xml | 63 +++++++++++++++
pipIrr-platform/文档/SaaS/增加一个单位（orgTag）.docx | 0
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/resources/application(121服务器).yml | 2
pipIrr-platform/文档/SaaS/端口、IP、标签配置.docx | 0
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config.properties | 5 +
pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/resources/application(121服务器).yml | 2
pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/resources/application(121服务器).yml | 2
pipIrr-platform/pipIrr-global/src/main/resources/application-common-web(121服务器).yml | 4
pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/resources/application(121服务器).yml | 2
pipIrr-platform/pipIrr-web/pipIrr-web-gis/src/main/resources/application(121服务器).yml | 2
pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/resources/application(121服务器).yml | 2
pipIrr-platform/pipIrr-web/pipIrr-web-operation/src/main/resources/application(121服务器).yml | 2
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/resources/application(121服务器).yml | 2
pipIrr-platform/pipIrr-web/pipIrr-web-file/src/main/resources/application(121服务器).yml | 2
pipIrr-platform/pipIrr-web/pipIrr-web-terminal/src/main/resources/application(121服务器).yml | 2
pipIrr-platform/pipIrr-global/src/main/resources/application-database-jyg.yml | 69 +++++++++++++++++
pipIrr-platform/pipIrr-mw/pipIrr-param-set/src/main/resources/application-params.yml | 9 ++
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/resources/application(121服务器).yml | 2
pipIrr-platform/pipIrr-global/src/main/resources/application-common-mw.yml | 2
pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml | 11 ++
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/resources/application(121服务器).yml | 2
24 files changed, 175 insertions(+), 18 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/application-common-mw.yml b/pipIrr-platform/pipIrr-global/src/main/resources/application-common-mw.yml
index 2e29db9..8ae873a 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/application-common-mw.yml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/application-common-mw.yml
@@ -11,6 +11,7 @@
# gz: 8103 9103
# lz: 8104 9104
# jc: 8105 9105
+ # jyg: 8106 9106
pipIrr_mw_webPort: 8070 #閫氫俊涓棿浠朵腑搴旂敤锛屼笉鑳藉湪web妯″潡绯荤粺涓簲鐢�
pipIrr_mw_actutorPort: 9070 #閫氫俊涓棿浠朵腑搴旂敤锛屼笉鑳藉湪web妯″潡绯荤粺涓簲鐢�
@@ -26,4 +27,5 @@
# gz: pipIrr_gz
# lz: pipIrr_lz
# jc: pipIrr_jc
+ # jyg: pipIrr_jyg
spring_datasource_url_dbname: pipIrr_ym #鏁版嵁搴撳悕绉�
diff --git "a/pipIrr-platform/pipIrr-global/src/main/resources/application-common-web\050121\346\234\215\345\212\241\345\231\250\051.yml" "b/pipIrr-platform/pipIrr-global/src/main/resources/application-common-web\050121\346\234\215\345\212\241\345\231\250\051.yml"
index 1fa5dc0..abcb38c 100644
--- "a/pipIrr-platform/pipIrr-global/src/main/resources/application-common-web\050121\346\234\215\345\212\241\345\231\250\051.yml"
+++ "b/pipIrr-platform/pipIrr-global/src/main/resources/application-common-web\050121\346\234\215\345\212\241\345\231\250\051.yml"
@@ -1,7 +1,7 @@
common:
# 233鏈嶅姟鍣細ym,mj,sp,test
- # 121鏈嶅姟鍣細mq,yq,hlj,gz,lz,jc
- spring_main_datasource_names: mq,yq,hlj,gz,lz,jc
+ # 121鏈嶅姟鍣細mq,yq,hlj,gz,lz,jc,jyg
+ spring_main_datasource_names: mq,yq,hlj,gz,lz,jc,jyg
# 铏氭嫙鍗¤〃:
# 瀛楁in_use鎰忎负鍗犵敤鐘舵�侊紝褰撲负true鏃剁粺涓�璁剧疆鍊间负0
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/application-common-web.yml b/pipIrr-platform/pipIrr-global/src/main/resources/application-common-web.yml
index df7a262..d059806 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/application-common-web.yml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/application-common-web.yml
@@ -1,6 +1,6 @@
common:
# 233鏈嶅姟鍣細ym,mj,sp,test
- # 121鏈嶅姟鍣細mq,yq,hlj,gz,lz,jc
+ # 121鏈嶅姟鍣細mq,yq,hlj,gz,lz,jc,jyg
spring_main_datasource_names: ym,mj,sp,test
# 铏氭嫙鍗¤〃:
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/application-database-jyg.yml b/pipIrr-platform/pipIrr-global/src/main/resources/application-database-jyg.yml
new file mode 100644
index 0000000..61218aa
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/application-database-jyg.yml
@@ -0,0 +1,69 @@
+# 鏁版嵁婧愰厤缃�
+spring:
+ datasource: #閰嶇疆鏁版嵁婧�
+ jyg:
+ #name: ym
+ type: com.alibaba.druid.pool.DruidDataSource
+ driverClassName: com.mysql.cj.jdbc.Driver
+# url: jdbc:mysql://192.168.40.166:3306/pipIrr_jyg?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
+# url: jdbc:mysql://8.130.130.233:3306/pipIrr_jyg?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
+ url: jdbc:mysql://127.0.0.1:3306/pipIrr_jyg?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-jyg
+ #閰嶇疆鍒濆鍖栧ぇ灏忋�佹渶灏忋�佹渶澶�
+ 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-global.yml b/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
index cd1e11e..c86ef8a 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
@@ -361,6 +361,9 @@
jc:
url: "http://127.0.0.1:8105"
comSendUrl: "http://127.0.0.1:8105/rtuMw/com/send"
+ jyg:
+ url: "http://127.0.0.1:8106"
+ comSendUrl: "http://127.0.0.1:8106/rtuMw/com/send"
#Rtu杩滅▼鍛戒护缁撴灉鍥炶皟鍦板潃
rtuCallbackUrl_rm: "http://127.0.0.1:8081/remote/comRes/receive"
#鎺ユ敹閫氫俊涓棿浠舵秷鎭腑蹇冩秷鎭殑鍦板潃
@@ -471,6 +474,14 @@
secret: SEC6042bc964d08899a5853eb321eb5a4d842a395982777f815bd07451c879228b7
at-all: true
mobile: 18602657034
+ jyg:
+ enable: false #鏄惁鍚敤
+ robot:
+ url: https://oapi.dingtalk.com/robot/send
+ access-token: fecef8e7725998f8912af05419580861aafc73413c4920036c07c050fa33055f
+ secret: SEC6042bc964d08899a5853eb321eb5a4d842a395982777f815bd07451c879228b7
+ at-all: true
+ mobile: 18602657034
#瑙嗛鐩戞帶鐩稿叧
video:
diff --git "a/pipIrr-platform/pipIrr-global/src/main/resources/init-config\050121\346\234\215\345\212\241\345\231\250\051.xml" "b/pipIrr-platform/pipIrr-global/src/main/resources/init-config\050121\346\234\215\345\212\241\345\231\250\051.xml"
index 9cca4e1..3e7a3c6 100644
--- "a/pipIrr-platform/pipIrr-global/src/main/resources/init-config\050121\346\234\215\345\212\241\345\231\250\051.xml"
+++ "b/pipIrr-platform/pipIrr-global/src/main/resources/init-config\050121\346\234\215\345\212\241\345\231\250\051.xml"
@@ -380,5 +380,68 @@
<item3 typeName="璁惧淇濆吇"/>
</taskType>
</org6>
+ <org7 tag="jyg" name="鍢夊唱鍏�" enable="true">
+ <districts>
+ <province name="鐢樿們鐪�" num="62" level="0">
+ <city name="鍢夊唱鍏冲競" num="02" level="1">
+ <country name="鏂板煄闀�" num="01" 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="98.28875541687012" remarks="缁忓害"/>
+ <item2 item_name="lat" item_value="39.77140971937612" 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>
+ </org7>
</orgs>
</config>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config.properties b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config.properties
index fdad0be..6e32a03 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config.properties
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config.properties
@@ -10,6 +10,7 @@
# 鐢樺窞锛� gz
# 鍑夊窞锛� lz
# 閲戝窛锛� jc
+# 鍢夊唱鍏筹細 jyg
base.orgTag=ym
# 233鏈嶅姟鍣細
@@ -24,6 +25,7 @@
# 鐢樺窞锛� 60103
# 鍑夊窞锛� 60104
# 閲戝窛锛� 60105
+# 鍢夊唱鍏筹細 60106
tcp.port=60000
#RTU涓婅鏁版嵁鏈�灏忛棿闅旓紝澶т簬杩欎釜闂撮殧璁や负璁惧绂荤嚎浜嗭紝娴嬫帶涓�浣撻榾鏄�3锛岃〃闃�涓�浣撴満鏄�6锛岄粯璁ら噰鐢ㄦ椂闂存渶闀跨殑6
@@ -45,8 +47,9 @@
# 鐢樺窞锛� mqtt.enable=false mqtt.protocolAndDeviceIds= mqtt.topicAndQos=
# 鍑夊窞锛� mqtt.enable=false mqtt.protocolAndDeviceIds= mqtt.topicAndQos=
# 閲戝窛锛� mqtt.enable=true mqtt.protocolAndDeviceIds=? mqtt.topicAndQos=weather/1,1;soil/1,1;manure/1,1;state/1,1
+# 鍢夊唱鍏筹細 mqtt.enable=true mqtt.protocolAndDeviceIds=? mqtt.topicAndQos=weather/1,1;soil/1,1;manure/1,1;state/1,1
mqtt.enable=false
mqtt.protocolAndDeviceIds=sd1/338220031439,sd1/338220031440
-mqtt.subTopicAndQos=weather/1,1;soil/1,1;manure/1,1;state/1,1
+mqtt.subTopicAndQos=weather/1,1;soil/1,1;manure/1,1
#MQtt璁惧鍦ㄤ竴瀹氭椂闂达紙鍒嗛挓锛夊悗鏈彂甯冩秷鎭紝璁や负璁惧绂荤嚎
mqtt.noSubThenOff=10
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-param-set/src/main/resources/application-params.yml b/pipIrr-platform/pipIrr-mw/pipIrr-param-set/src/main/resources/application-params.yml
index de19a1c..94e0052 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-param-set/src/main/resources/application-params.yml
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-param-set/src/main/resources/application-params.yml
@@ -91,3 +91,12 @@
webPort: 8105
actutorPort: 9105
dbName: pipIrr_jc
+ jyg:
+ orgTag: jyg
+ tcpPort: 60106
+ upDataMinInterval: 6
+ mqttEnable: true
+ noSubThenOff: 10
+ webPort: 8106
+ actutorPort: 9106
+ dbName: pipIrr_jyg
diff --git "a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml" "b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml"
index 0369073..20fc4d0 100644
--- "a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml"
+++ "b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml"
@@ -1,3 +1,3 @@
spring:
profiles:
- include: common-web, global, database, database-mq, database-yq, database-hlj, database-gz, database-lz, database-jc, self
+ include: common-web, global, database, database-mq, database-yq, database-hlj, database-gz, database-lz, database-jc, database-jyg, self
diff --git "a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml" "b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml"
index 0369073..20fc4d0 100644
--- "a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml"
+++ "b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml"
@@ -1,3 +1,3 @@
spring:
profiles:
- include: common-web, global, database, database-mq, database-yq, database-hlj, database-gz, database-lz, database-jc, self
+ include: common-web, global, database, database-mq, database-yq, database-hlj, database-gz, database-lz, database-jc, database-jyg, self
diff --git "a/pipIrr-platform/pipIrr-web/pipIrr-web-file/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml" "b/pipIrr-platform/pipIrr-web/pipIrr-web-file/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml"
index 0369073..20fc4d0 100644
--- "a/pipIrr-platform/pipIrr-web/pipIrr-web-file/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml"
+++ "b/pipIrr-platform/pipIrr-web/pipIrr-web-file/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml"
@@ -1,3 +1,3 @@
spring:
profiles:
- include: common-web, global, database, database-mq, database-yq, database-hlj, database-gz, database-lz, database-jc, self
+ include: common-web, global, database, database-mq, database-yq, database-hlj, database-gz, database-lz, database-jc, database-jyg, self
diff --git "a/pipIrr-platform/pipIrr-web/pipIrr-web-gis/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml" "b/pipIrr-platform/pipIrr-web/pipIrr-web-gis/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml"
index 0369073..20fc4d0 100644
--- "a/pipIrr-platform/pipIrr-web/pipIrr-web-gis/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml"
+++ "b/pipIrr-platform/pipIrr-web/pipIrr-web-gis/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml"
@@ -1,3 +1,3 @@
spring:
profiles:
- include: common-web, global, database, database-mq, database-yq, database-hlj, database-gz, database-lz, database-jc, self
+ include: common-web, global, database, database-mq, database-yq, database-hlj, database-gz, database-lz, database-jc, database-jyg, self
diff --git "a/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml" "b/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml"
index 0369073..20fc4d0 100644
--- "a/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml"
+++ "b/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml"
@@ -1,3 +1,3 @@
spring:
profiles:
- include: common-web, global, database, database-mq, database-yq, database-hlj, database-gz, database-lz, database-jc, self
+ include: common-web, global, database, database-mq, database-yq, database-hlj, database-gz, database-lz, database-jc, database-jyg, self
diff --git "a/pipIrr-platform/pipIrr-web/pipIrr-web-operation/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml" "b/pipIrr-platform/pipIrr-web/pipIrr-web-operation/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml"
index 0369073..20fc4d0 100644
--- "a/pipIrr-platform/pipIrr-web/pipIrr-web-operation/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml"
+++ "b/pipIrr-platform/pipIrr-web/pipIrr-web-operation/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml"
@@ -1,3 +1,3 @@
spring:
profiles:
- include: common-web, global, database, database-mq, database-yq, database-hlj, database-gz, database-lz, database-jc, self
+ include: common-web, global, database, database-mq, database-yq, database-hlj, database-gz, database-lz, database-jc, database-jyg, self
diff --git "a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml" "b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml"
index 0369073..20fc4d0 100644
--- "a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml"
+++ "b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml"
@@ -1,3 +1,3 @@
spring:
profiles:
- include: common-web, global, database, database-mq, database-yq, database-hlj, database-gz, database-lz, database-jc, self
+ include: common-web, global, database, database-mq, database-yq, database-hlj, database-gz, database-lz, database-jc, database-jyg, self
diff --git "a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml" "b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml"
index 0369073..20fc4d0 100644
--- "a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml"
+++ "b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml"
@@ -1,3 +1,3 @@
spring:
profiles:
- include: common-web, global, database, database-mq, database-yq, database-hlj, database-gz, database-lz, database-jc, self
+ include: common-web, global, database, database-mq, database-yq, database-hlj, database-gz, database-lz, database-jc, database-jyg, self
diff --git "a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml" "b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml"
index 0369073..20fc4d0 100644
--- "a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml"
+++ "b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml"
@@ -1,3 +1,3 @@
spring:
profiles:
- include: common-web, global, database, database-mq, database-yq, database-hlj, database-gz, database-lz, database-jc, self
+ include: common-web, global, database, database-mq, database-yq, database-hlj, database-gz, database-lz, database-jc, database-jyg, self
diff --git "a/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml" "b/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml"
index 0369073..20fc4d0 100644
--- "a/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml"
+++ "b/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml"
@@ -1,3 +1,3 @@
spring:
profiles:
- include: common-web, global, database, database-mq, database-yq, database-hlj, database-gz, database-lz, database-jc, self
+ include: common-web, global, database, database-mq, database-yq, database-hlj, database-gz, database-lz, database-jc, database-jyg, self
diff --git "a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml" "b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml"
index 0369073..20fc4d0 100644
--- "a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml"
+++ "b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml"
@@ -1,3 +1,3 @@
spring:
profiles:
- include: common-web, global, database, database-mq, database-yq, database-hlj, database-gz, database-lz, database-jc, self
+ include: common-web, global, database, database-mq, database-yq, database-hlj, database-gz, database-lz, database-jc, database-jyg, self
diff --git "a/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml" "b/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml"
index 0369073..20fc4d0 100644
--- "a/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml"
+++ "b/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml"
@@ -1,3 +1,3 @@
spring:
profiles:
- include: common-web, global, database, database-mq, database-yq, database-hlj, database-gz, database-lz, database-jc, self
+ include: common-web, global, database, database-mq, database-yq, database-hlj, database-gz, database-lz, database-jc, database-jyg, self
diff --git "a/pipIrr-platform/pipIrr-web/pipIrr-web-terminal/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml" "b/pipIrr-platform/pipIrr-web/pipIrr-web-terminal/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml"
index 0369073..20fc4d0 100644
--- "a/pipIrr-platform/pipIrr-web/pipIrr-web-terminal/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml"
+++ "b/pipIrr-platform/pipIrr-web/pipIrr-web-terminal/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml"
@@ -1,3 +1,3 @@
spring:
profiles:
- include: common-web, global, database, database-mq, database-yq, database-hlj, database-gz, database-lz, database-jc, self
+ include: common-web, global, database, database-mq, database-yq, database-hlj, database-gz, database-lz, database-jc, database-jyg, self
diff --git "a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml" "b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml"
index 0369073..20fc4d0 100644
--- "a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml"
+++ "b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/resources/application\050121\346\234\215\345\212\241\345\231\250\051.yml"
@@ -1,3 +1,3 @@
spring:
profiles:
- include: common-web, global, database, database-mq, database-yq, database-hlj, database-gz, database-lz, database-jc, self
+ include: common-web, global, database, database-mq, database-yq, database-hlj, database-gz, database-lz, database-jc, database-jyg, self
diff --git "a/pipIrr-platform/\346\226\207\346\241\243/SaaS/\345\242\236\345\212\240\344\270\200\344\270\252\345\215\225\344\275\215\357\274\210orgTag\357\274\211.docx" "b/pipIrr-platform/\346\226\207\346\241\243/SaaS/\345\242\236\345\212\240\344\270\200\344\270\252\345\215\225\344\275\215\357\274\210orgTag\357\274\211.docx"
index 225d9f1..bae8174 100644
--- "a/pipIrr-platform/\346\226\207\346\241\243/SaaS/\345\242\236\345\212\240\344\270\200\344\270\252\345\215\225\344\275\215\357\274\210orgTag\357\274\211.docx"
+++ "b/pipIrr-platform/\346\226\207\346\241\243/SaaS/\345\242\236\345\212\240\344\270\200\344\270\252\345\215\225\344\275\215\357\274\210orgTag\357\274\211.docx"
Binary files differ
diff --git "a/pipIrr-platform/\346\226\207\346\241\243/SaaS/\347\253\257\345\217\243\343\200\201IP\343\200\201\346\240\207\347\255\276\351\205\215\347\275\256.docx" "b/pipIrr-platform/\346\226\207\346\241\243/SaaS/\347\253\257\345\217\243\343\200\201IP\343\200\201\346\240\207\347\255\276\351\205\215\347\275\256.docx"
index 2af0c4b..0ab2d81 100644
--- "a/pipIrr-platform/\346\226\207\346\241\243/SaaS/\347\253\257\345\217\243\343\200\201IP\343\200\201\346\240\207\347\255\276\351\205\215\347\275\256.docx"
+++ "b/pipIrr-platform/\346\226\207\346\241\243/SaaS/\347\253\257\345\217\243\343\200\201IP\343\200\201\346\240\207\347\255\276\351\205\215\347\275\256.docx"
Binary files differ
--
Gitblit v1.8.0