From cfcea32f2af158fd56d901548a4fbe52f30f375f Mon Sep 17 00:00:00 2001 From: zhubaomin <zhubaomin> Date: 星期三, 18 九月 2024 17:04:31 +0800 Subject: [PATCH] 2024-09-18 朱宝民 增加新的组织test使用test数据库 --- pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/application-database.yml | 2 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-web/pipIrr-web-irrigate/src/main/resources/application.yml | 2 pipIrr-platform/pipIrr-global/src/main/resources/application-database-test.yml | 69 +++++++++++++++++++++++ pipIrr-platform/pipIrr-web/pipIrr-web-gis/src/main/resources/application.yml | 2 pipIrr-platform/文档/~$一个应用机构.docx | 0 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-web/pipIrr-web-wechat/src/main/resources/application.yml | 2 pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml | 4 + pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/resources/application.yml | 2 pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml | 46 +++++++++++++++ pipIrr-platform/pipIrr-web/pipIrr-web-operation/src/main/resources/application.yml | 2 17 files changed, 132 insertions(+), 13 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/application-database-test.yml b/pipIrr-platform/pipIrr-global/src/main/resources/application-database-test.yml new file mode 100644 index 0000000..4e972d0 --- /dev/null +++ b/pipIrr-platform/pipIrr-global/src/main/resources/application-database-test.yml @@ -0,0 +1,69 @@ +# 鏁版嵁婧愰厤缃� +spring: + datasource: #閰嶇疆鏁版嵁婧� + test: + #name: test + type: com.alibaba.druid.pool.DruidDataSource + driverClassName: com.mysql.cj.jdbc.Driver +# url: jdbc:mysql://192.168.40.166:3306/pipIrr_test?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull +# url: jdbc:mysql://8.130.130.233:3306/pipIrr_test?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull + url: jdbc:mysql://127.0.0.1:3306/pipIrr_test?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-test + #閰嶇疆鍒濆鍖栧ぇ灏忋�佹渶灏忋�佹渶澶� + initialSize: 10 + minIdle: 10 + maxActive: 100 + # 鑾峰彇杩炴帴鏃舵渶澶х瓑寰呮椂闂�,鍗曚綅姣銆傞厤缃簡maxWait涔嬪悗,缂虹渷鍚敤鍏钩閿�,骞跺彂鏁堢巼浼氭湁鎵�涓嬮檷,濡傛灉闇�瑕佸彲浠ラ�氳繃閰嶇疆useUnfairLock灞炴�т负true浣跨敤闈炲叕骞抽攣 + maxWait: 60000 + #閰嶇疆闂撮殧澶氫箙杩涜涓�娆℃娴嬶紝妫�娴嬮渶瑕佸叧闂殑绌洪棽杩炴帴锛屽崟浣嶆绉掋�� 榛樿鏄�60s锛屽お闀垮彲鑳戒細瀵艰嚧鏃犳硶鍙婃椂妫�娴嬪埌杩炴帴涓柇 + timeBetweenEvictionRunsMillis: 60000 + #閰嶇疆涓�涓繛鎺ュ湪杩炴帴姹犱腑鐨勬渶灏忕敓瀛樻椂闂淬�佹渶澶х敓瀛樻椂闂达紝瓒呰繃鏈�澶х敓瀛樻椂闂翠細琚Щ闄わ紝鍗曚綅姣銆� + minEvictableIdleTimeMillis: 300000 + maxEvictableIdleTimeMillis: 900000 + #鎺㈡椿銆侀獙璇侀摼鎺ユ湁鏁堟�х殑鏌ヨ锛屾柊鐗堟湰榛樿浣跨敤mysqlPing浠f浛 + #validation-query: select 1 #娉ㄩ噴鎺夛紝閲囩敤榛樿鐨刴ysqlPing + #閰嶇疆浠庤繛鎺ユ睜鑾峰彇杩炴帴鏃讹紝褰撹繛鎺ョ┖闂叉椂闂村ぇ浜巘imeBetweenEvictionRunsMillis鏃舵槸鍚︽鏌ヨ繛鎺ユ湁鏁堟�э紝true姣忔閮芥鏌ワ紱false涓嶆鏌ャ�� + testWhileIdle: true + #閰嶇疆浠庤繛鎺ユ睜鑾峰彇杩炴帴鏃跺拰鍚戣繛鎺ユ睜褰掕繕杩炴帴鏃讹紝鏄惁妫�鏌ヨ繛鎺ユ湁鏁堟�� + #姣忔鑾峰彇鎴栧綊杩樿繛鎺ラ兘妫�娴嬪お棰戠箒锛岄櫎闈炵壒鍒噸瑕佹垨缃戠粶鐗瑰埆涓嶅彲闈犵瓑鎯呭喌锛屽缓璁敤testWhileIdle + timeBetweenEvictionRunsMillis浠f浛銆�--> + 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 f368ac3..4771d1f 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][pj]涓殑涓�鑷� - names: ym, pj + names: ym, pj, test 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 54ca603..610b648 100644 --- a/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml +++ b/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml @@ -155,6 +155,10 @@ 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" + test: + comSendUrl: "http://127.0.0.1:8072/rtuMw/com/send" + rtuLogFileUrl: "http://127.0.0.1:8072/rtuMw/com/rtuLogFile" + rtuLogTextUrl: "http://127.0.0.1:8072/rtuMw/com/rtuLogText" #鐩戞祴鎺у埗妯″潡鍥炶皟鍦板潃 rtuCallbackUrl_rm: "http://127.0.0.1:8081/remote/comRes/receive" #寰俊灏忕▼搴忓洖璋冨湴鍧� 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 b28eb79..5e36442 100644 --- a/pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml +++ b/pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml @@ -94,5 +94,51 @@ <item8 defaultValue = "80" unit = "3" sort = "4" type = "2"/> </irrigateProfile> </org2> + <org3 tag="test" name="娴嬭瘯" enable="true"> + <districts> + <province name="澶╂触甯�" num="12" level="0"> + <city name="甯傝緰鍖�" num="01" level="1"> + <country name="姝︽竻鍖�" num="14" level="2" /> + </city> + </province> + </districts> + <dictionaries> + <dict code="protocol" title="鍗忚" valueType="2"> + <dictItem> + <item1 dictCode="protocol" value="p206V1_0_1" name="鑰佸崗璁�" status="1" sort="0" /> + <item2 dictCode="protocol" value="p206V202404" name="鏂板崗璁�" status="0" sort="1" /> + </dictItem> + </dict> + </dictionaries> + <user name="瓒呯骇绠$悊鍛�" phone="admin" password="admin" supperAdmin="1" /> + <payments> + <item1 name="鐜伴噾"/> + <item2 name="寰俊鏀粯"/> + <item3 name="鏀粯瀹濇敮浠�"/> + <item4 name="閾惰杞处"/> + </payments> + <settings> + <item1 item_name="lng" item_value="101.87345" remarks="缁忓害"/> + <item2 item_name="lat" item_value="25.70424" 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> + </org3> </orgs> </config> \ No newline at end of file diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/application-database.yml b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/application-database.yml index 1b486e8..69f62c6 100644 --- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/application-database.yml +++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/application-database.yml @@ -5,8 +5,8 @@ driver-class-name: com.mysql.cj.jdbc.Driver # url: jdbc:mysql://192.168.40.166:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull # url: jdbc:mysql://8.130.130.233:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull - #url: jdbc:mysql://8.140.179.55:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull url: jdbc:mysql://127.0.0.1:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull +# url: jdbc:mysql://127.0.0.1:3306/pipIrr_test?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull username: root password: dysql,;.abc!@# druid: 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 f3f6e15..315b008 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 + include: global, database, database-ym, database-pj, 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 7369e38..adc3762 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 + include: global, database, database-ym, database-pj, database-test user: defaultTrueRandomFalsePassword: true #true:閲囩敤榛樿瀵嗙爜锛宖alse:绯荤粺浜х敓闅忔満瀵嗙爜 defaultPassword: "abc_123" 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 b81536f..54c9d83 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 + include: global, database, database-ym, database-pj, 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 fb79576..719aa5a 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 + include: global, database, database-ym, database-pj, 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 eb766c7..2eec135 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 + include: global, database, database-ym, database-pj, 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 5dea5be..a1e4627 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 + include: global, database, database-ym, database-pj, 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 ab59316..5cd4f0b 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 + include: global, database, database-ym, database-pj, 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 97fc494..bc46e5a 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 + include: global, database, database-ym, database-pj, 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 1cb57e0..456aaa4 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 + include: global, database, database-ym, database-pj, 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 4b6f2e7..295521c 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 + include: global, database, database-ym, database-pj, 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 a2178fa..8c10de6 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 + include: global, database, database-ym, database-pj, database-test #actutor鐨剋eb绔彛 management: diff --git "a/pipIrr-platform/\346\226\207\346\241\243/~$\344\270\200\344\270\252\345\272\224\347\224\250\346\234\272\346\236\204.docx" "b/pipIrr-platform/\346\226\207\346\241\243/~$\344\270\200\344\270\252\345\272\224\347\224\250\346\234\272\346\236\204.docx" new file mode 100644 index 0000000..381e87f --- /dev/null +++ "b/pipIrr-platform/\346\226\207\346\241\243/~$\344\270\200\344\270\252\345\272\224\347\224\250\346\234\272\346\236\204.docx" Binary files differ -- Gitblit v1.8.0