From 3a925497a3f6a776fb2e28b6280822fcaca5430c Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 29 十月 2024 09:53:47 +0800
Subject: [PATCH] 把原来的pj(片角)配置改为sp(沙盘)配置
---
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/resources/application.yml | 2
pipIrr-platform/pipIrr-global/src/main/resources/application-database(开发测试---单数据库).yml | 2
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/resources/application.yml | 2
pipIrr-platform/pipIrr-global/src/main/resources/application-database-sp.yml | 12 +++---
pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/resources/application.yml | 2
pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/resources/application.yml | 2
pipIrr-platform/pipIrr-global/src/main/resources/application-global(test测试系统).yml | 6 +-
pipIrr-platform/pipIrr-web/pipIrr-web-gis/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(ym元谋系统).yml | 6 +-
pipIrr-platform/pipIrr-global/src/main/resources/application-global(开发测试---166PC机).yml | 6 +-
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/resources/application.yml | 2
pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml | 6 +-
pipIrr-platform/pipIrr-web/pipIrr-web-file/src/main/resources/application.yml | 2
pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/resources/application.yml | 2
pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml | 8 ++--
pipIrr-platform/pipIrr-web/pipIrr-web-operation/src/main/resources/application.yml | 2
20 files changed, 36 insertions(+), 36 deletions(-)
diff --git "a/pipIrr-platform/pipIrr-global/src/main/resources/application-database\050\345\274\200\345\217\221\346\265\213\350\257\225---\345\215\225\346\225\260\346\215\256\345\272\223\051.yml" "b/pipIrr-platform/pipIrr-global/src/main/resources/application-database\050\345\274\200\345\217\221\346\265\213\350\257\225---\345\215\225\346\225\260\346\215\256\345\272\223\051.yml"
index a291bd2..6debbc7 100644
--- "a/pipIrr-platform/pipIrr-global/src/main/resources/application-database\050\345\274\200\345\217\221\346\265\213\350\257\225---\345\215\225\346\225\260\346\215\256\345\272\223\051.yml"
+++ "b/pipIrr-platform/pipIrr-global/src/main/resources/application-database\050\345\274\200\345\217\221\346\265\213\350\257\225---\345\215\225\346\225\260\346\215\256\345\272\223\051.yml"
@@ -4,5 +4,5 @@
main:
allow-bean-definition-overriding: true #璁剧疆涓簍rue鏃讹紝鍚庡畾涔夌殑bean浼氳鐩栦箣鍓嶅畾涔夌殑鐩稿悓鍚嶇О鐨刡ean
datasource: #閰嶇疆鏁版嵁婧�
- #澶氫釜鏁版嵁婧愬悕绉板湪姝ら厤缃紝瑕佹眰涓巗pring銆俤atasource銆俒ym][pj]涓殑涓�鑷�
+ #澶氫釜鏁版嵁婧愬悕绉板湪姝ら厤缃紝瑕佹眰涓巗pring銆俤atasource銆俒ym][sp][test]涓殑涓�鑷�
names: ym
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/application-database-pj.yml b/pipIrr-platform/pipIrr-global/src/main/resources/application-database-sp.yml
similarity index 94%
rename from pipIrr-platform/pipIrr-global/src/main/resources/application-database-pj.yml
rename to pipIrr-platform/pipIrr-global/src/main/resources/application-database-sp.yml
index 7eb4d18..190348e 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/application-database-pj.yml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/application-database-sp.yml
@@ -1,18 +1,18 @@
# 鏁版嵁婧愰厤缃�
spring:
datasource: #閰嶇疆鏁版嵁婧�
- pj:
- #name: pj
+ sp:
+ #name: sp
type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.cj.jdbc.Driver
-# url: jdbc:mysql://192.168.40.166:3306/pipIrr_pj?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
-# url: jdbc:mysql://8.130.130.233:3306/pipIrr_pj?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
- url: jdbc:mysql://127.0.0.1:3306/pipIrr_pj?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
+# url: jdbc:mysql://192.168.40.166:3306/pipIrr_sp?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
+# url: jdbc:mysql://8.130.130.233:3306/pipIrr_sp?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
+ url: jdbc:mysql://127.0.0.1:3306/pipIrr_sp?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-pj
+ name: druid-mysql-sp
#閰嶇疆鍒濆鍖栧ぇ灏忋�佹渶灏忋�佹渶澶�
initialSize: 10
minIdle: 10
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 b4dbdab..ca1c69c 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/application-database.yml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/application-database.yml
@@ -4,5 +4,5 @@
main:
allow-bean-definition-overriding: true #璁剧疆涓簍rue鏃讹紝鍚庡畾涔夌殑bean浼氳鐩栦箣鍓嶅畾涔夌殑鐩稿悓鍚嶇О鐨刡ean
datasource: #閰嶇疆鏁版嵁婧�
- #澶氫釜鏁版嵁婧愬悕绉板湪姝ら厤缃紝瑕佹眰涓巗pring銆俤atasource銆俒ym][pj]涓殑涓�鑷�
+ #澶氫釜鏁版嵁婧愬悕绉板湪姝ら厤缃紝瑕佹眰涓巗pring銆俤atasource銆俒ym][sp]涓殑涓�鑷�
names: ym
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 bb275f8..38a1991 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"
@@ -289,7 +289,7 @@
#椤圭洰缂栧彿
#projectCode:
# ym: 100
-# pj: 101
+# sp: 101
#椤圭洰閰嶇疆
project:
@@ -309,7 +309,7 @@
comSendUrl: "http://127.0.0.1:8070/rtuMw/com/send"
rtuLogFileUrl: "http://127.0.0.1:8070/rtuMw/com/rtuLogFile"
rtuLogTextUrl: "http://127.0.0.1:8070/rtuMw/com/rtuLogText"
- pj:
+ sp:
comSendUrl: "http://127.0.0.1:8071/rtuMw/com/send"
rtuLogFileUrl: "http://127.0.0.1:8071/rtuMw/com/rtuLogFile"
rtuLogTextUrl: "http://127.0.0.1:8071/rtuMw/com/rtuLogText"
@@ -346,7 +346,7 @@
secret: SEC6042bc964d08899a5853eb321eb5a4d842a395982777f815bd07451c879228b7
at-all: true
mobile: 18602657034
- pj:
+ sp:
enable: true #鏄惁鍚敤
robot:
url: https://oapi.dingtalk.com/robot/send
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 46e2aab..ad1c636 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"
@@ -289,7 +289,7 @@
#椤圭洰缂栧彿
#projectCode:
# ym: 100
-# pj: 101
+# sp: 101
#椤圭洰閰嶇疆
project:
@@ -309,7 +309,7 @@
comSendUrl: "http://127.0.0.1:8070/rtuMw/com/send"
rtuLogFileUrl: "http://127.0.0.1:8070/rtuMw/com/rtuLogFile"
rtuLogTextUrl: "http://127.0.0.1:8070/rtuMw/com/rtuLogText"
- pj:
+ sp:
comSendUrl: "http://127.0.0.1:8071/rtuMw/com/send"
rtuLogFileUrl: "http://127.0.0.1:8071/rtuMw/com/rtuLogFile"
rtuLogTextUrl: "http://127.0.0.1:8071/rtuMw/com/rtuLogText"
@@ -346,7 +346,7 @@
secret: SEC6042bc964d08899a5853eb321eb5a4d842a395982777f815bd07451c879228b7
at-all: true
mobile: 18602657034
- pj:
+ sp:
enable: true #鏄惁鍚敤
robot:
url: https://oapi.dingtalk.com/robot/send
diff --git "a/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050\345\274\200\345\217\221\346\265\213\350\257\225---166PC\346\234\272\051.yml" "b/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050\345\274\200\345\217\221\346\265\213\350\257\225---166PC\346\234\272\051.yml"
index 399f1c8..8576d98 100644
--- "a/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050\345\274\200\345\217\221\346\265\213\350\257\225---166PC\346\234\272\051.yml"
+++ "b/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050\345\274\200\345\217\221\346\265\213\350\257\225---166PC\346\234\272\051.yml"
@@ -291,7 +291,7 @@
#椤圭洰缂栧彿
#projectCode:
# ym: 100
-# pj: 101
+# sp: 101
#椤圭洰閰嶇疆
project:
@@ -311,7 +311,7 @@
comSendUrl: "http://192.168.40.166:8070/rtuMw/com/send"
rtuLogFileUrl: "http://127.0.0.1:8070/rtuMw/com/rtuLogFile"
rtuLogTextUrl: "http://127.0.0.1:8070/rtuMw/com/rtuLogText"
- pj:
+ sp:
comSendUrl: "http://127.0.0.1:8071/rtuMw/com/send"
rtuLogFileUrl: "http://127.0.0.1:8071/rtuMw/com/rtuLogFile"
rtuLogTextUrl: "http://127.0.0.1:8071/rtuMw/com/rtuLogText"
@@ -348,7 +348,7 @@
secret: SEC6042bc964d08899a5853eb321eb5a4d842a395982777f815bd07451c879228b7
at-all: true
mobile: 18602657034
- pj:
+ sp:
enable: true #鏄惁鍚敤
robot:
url: https://oapi.dingtalk.com/robot/send
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 4f4e784..0401ce4 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
@@ -295,7 +295,7 @@
#椤圭洰缂栧彿
#projectCode:
# ym: 100
-# pj: 101
+# sp: 101
#椤圭洰閰嶇疆
project:
@@ -315,7 +315,7 @@
comSendUrl: "http://127.0.0.1:8070/rtuMw/com/send"
rtuLogFileUrl: "http://127.0.0.1:8070/rtuMw/com/rtuLogFile"
rtuLogTextUrl: "http://127.0.0.1:8070/rtuMw/com/rtuLogText"
- pj:
+ sp:
comSendUrl: "http://127.0.0.1:8071/rtuMw/com/send"
rtuLogFileUrl: "http://127.0.0.1:8071/rtuMw/com/rtuLogFile"
rtuLogTextUrl: "http://127.0.0.1:8071/rtuMw/com/rtuLogText"
@@ -352,7 +352,7 @@
secret: SEC6042bc964d08899a5853eb321eb5a4d842a395982777f815bd07451c879228b7
at-all: true
mobile: 18602657034
- pj:
+ sp:
enable: true #鏄惁鍚敤
robot:
url: https://oapi.dingtalk.com/robot/send
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 eecab7f..4dfa85b 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml
@@ -50,11 +50,11 @@
<item8 defaultValue = "80" unit = "3" sort = "4" type = "2"/>
</irrigateProfile>
</org1>
- <org2 tag="pj" name="鐗囪" enable="false">
+ <org2 tag="sp" name="娌欑洏" enable="false">
<districts>
- <province name="浜戝崡鐪�" num="53" level="0">
- <city name="涓芥睙甯�" num="23" level="1">
- <country name="姘歌儨鍘�" num="28" level="2" />
+ <province name="鐢樿們鐪�" num="53" level="0">
+ <city name="閰掓硥甯�" num="23" level="1">
+ <country name="澶х闆嗗洟" num="28" level="2" />
</city>
</province>
</districts>
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 315b008..7a0fb67 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-pj, database-test
+ include: global, database, database-ym, database-sp, database-test
#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 addc58c..fd4f5f3 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-pj, database-test
+ include: global, database, database-ym, database-sp, database-test
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 047c937..c3580c0 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-pj, database-test
+ include: global, database, database-ym, database-sp, database-test
#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 54c9d83..c691881 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-pj, database-test
+ include: global, database, database-ym, database-sp, database-test
#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 719aa5a..212528b 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-pj, database-test
+ include: global, database, database-ym, database-sp, database-test
#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 2eec135..c7ff062 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-pj, database-test
+ include: global, database, database-ym, database-sp, database-test
#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 a1e4627..be4c40b 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-pj, database-test
+ include: global, database, database-ym, database-sp, database-test
#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 5cd4f0b..59774f0 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-pj, database-test
+ include: global, database, database-ym, database-sp, database-test
#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 bc46e5a..6c23e28 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-pj, database-test
+ include: global, database, database-ym, database-sp, database-test
#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 456aaa4..be56532 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-pj, database-test
+ include: global, database, database-ym, database-sp, database-test
#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 295521c..ff93637 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-pj, database-test
+ include: global, database, database-ym, database-sp, database-test
#actutor鐨剋eb绔彛
management:
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 8c10de6..4af6dd3 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-pj, database-test
+ include: global, database, database-ym, database-sp, database-test
#actutor鐨剋eb绔彛
management:
--
Gitblit v1.8.0