From c3d51f9ba3300b60261d13a5b0b4f7402bba0ee0 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期三, 02 四月 2025 08:30:00 +0800
Subject: [PATCH] 修改轮灌组接口、分页获取轮灌组接口、获取全部轮灌组接口、获取轮灌组详情接口

---
 pipIrr-platform/pipIrr-global/src/main/resources/application-database.yml |  124 ----------------------------------------
 1 files changed, 2 insertions(+), 122 deletions(-)

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 ba485ec..640e5a8 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/application-database.yml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/application-database.yml
@@ -1,126 +1,6 @@
 # 鏁版嵁婧愰厤缃�
 spring:
     #澶氭暟鎹簮闇�瑕侀厤缃�
-    main:
-        allow-bean-definition-overriding: true #璁剧疆涓簍rue鏃讹紝鍚庡畾涔夌殑bean浼氳鐩栦箣鍓嶅畾涔夌殑鐩稿悓鍚嶇О鐨刡ean
     datasource: #閰嶇疆鏁版嵁婧�
-        #澶氫釜鏁版嵁婧愬悕绉板湪姝ら厤缃紝瑕佹眰涓巗pring銆俤atasource銆俒ym][pj]涓殑涓�鑷�
-        names: ym, pj
-        ym:
-            #name: ym
-            type: com.alibaba.druid.pool.DruidDataSource
-            driverClassName: com.mysql.cj.jdbc.Driver
-            url: jdbc:mysql://192.168.91.73:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
-            username: root
-            password: dysql,;.abc!@#
-            druid:
-                #閰嶇疆鍒濆鍖栧ぇ灏忋�佹渶灏忋�佹渶澶�
-                initialSize: 1
-                minIdle: 1
-                maxActive: 100
-                #閰嶇疆鑾峰彇杩炴帴绛夊緟瓒呮椂鐨勬椂闂达紝鍗曚綅鏄绉�
-                maxWait: 6000
-                #閰嶇疆闂撮殧澶氫箙杩涜涓�娆℃娴嬶紝妫�娴嬮渶瑕佸叧闂殑绌洪棽杩炴帴锛屽崟浣嶆绉掋�� 榛樿鏄�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
-                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
-        pj:
-            #name: pj
-            type: com.alibaba.druid.pool.DruidDataSource
-            driverClassName: com.mysql.cj.jdbc.Driver
-            url: jdbc:mysql://192.168.91.73:3306/pipIrr_pj?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
-            username: root
-            password: dysql,;.abc!@#
-            druid:
-                #閰嶇疆鍒濆鍖栧ぇ灏忋�佹渶灏忋�佹渶澶�
-                initialSize: 1
-                minIdle: 1
-                maxActive: 100
-                #閰嶇疆鑾峰彇杩炴帴绛夊緟瓒呮椂鐨勬椂闂达紝鍗曚綅鏄绉�
-                maxWait: 6000
-                #閰嶇疆闂撮殧澶氫箙杩涜涓�娆℃娴嬶紝妫�娴嬮渶瑕佸叧闂殑绌洪棽杩炴帴锛屽崟浣嶆绉掋�� 榛樿鏄�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
-                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
+        #澶氫釜鏁版嵁婧愬悕绉板湪姝ら厤缃紝瑕佹眰涓巗pring銆俤atasource銆俒ym][sp][test]涓殑涓�鑷�
+        names: ${common.spring_main_datasource_names}

--
Gitblit v1.8.0