From 33af27ee7a189b538452fc9adb63e0784324e009 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 24 七月 2024 10:49:37 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

---
 pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml |   95 +++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 82 insertions(+), 13 deletions(-)

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 1af34b2..48c3eb0 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
@@ -68,27 +68,96 @@
         lazy-load-trigger-methods: ""  # 闃绘尅涓嶇浉骞茬殑鎿嶄綔瑙﹀彂锛屽疄鐜版噿鍔犺浇
         cache-enabled: true  #鎵撳紑鍏ㄥ眬缂撳瓨寮�鍏筹紙浜岀骇鐜锛夛紝榛樿鍊兼槸true
         default-enum-type-handler: com.dy.common.mybatis.envm.EnumCodeTypeHandler
+    type-handlers-package: com.dy.pipIrrGlobal.pojoBa.MySqlJsonHandler
 
 pipIrr:
     global:
-        dev: true   #鏄惁寮�鍙戦樁娈碉紝true鎴杅alse
+        dev: false   #鏄惁寮�鍙戦樁娈碉紝true鎴杅alse
         dsName: ym  #寮�鍙戦樁娈碉紝璁剧疆涓存椂鐨勬暟鎹簱鍚嶇О
-    demo:
-        webPort: 8000
-        actutorPort: 9000
+    mw:
+        webPort: 8070
+        actutorPort: 9070
+        idSuffix: 0
     sso:
-        checkUrl: http://127.0.0.1:8888/sso/sso/ssoCheck
-        webPort: 8080
-        actutorPort: 9080
+        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: 8080
-        actutorPort: 9080
+        webPort: 8081
+        actutorPort: 9081
+        idSuffix: 3
     statistics:
-        webPort: 8080
-        actutorPort: 9080
+        webPort: 8082
+        actutorPort: 9082
+        idSuffix: 4
     gis:
-        webPort: 8080
-        actutorPort: 9080
\ No newline at end of file
+        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
+#椤圭洰缂栧彿
+#projectCode:
+#    ym: 100
+#    pj: 101
+
+#椤圭洰閰嶇疆
+project:
+    #椤圭洰缂栫爜
+    projectNo: 10
+    #鎺у埗鍣ㄧ被鍨�
+    controllerType: 57
+
+
+#閫氳鍗忚
+#protocol: DYJS_2023,DYJS_2024
+mw:
+    #鍛戒护鍙戦�佸湴鍧�(涓紑鏄満鏋則ag锛屽叾涔熸槸鏁版嵁婧愬悗缂�鍚嶇О)
+    ym:
+        comSendUrl: "http://127.0.0.1:8070/rtuMw/com/send"
+    sp:
+        comSendUrl: "http://127.0.0.1:8071/rtuMw/com/send"
+    #鐩戞祴鎺у埗妯″潡鍥炶皟鍦板潃
+    rtuCallbackUrl_rm: "http://127.0.0.1:8081/remote/comRes/receive"
+    #寰俊灏忕▼搴忓洖璋冨湴鍧�
+    rtuCallbackUrl_wx: "http://127.0.0.1:8087/wx/comRes/receive"
+
+#涓嶈繘琛寀serToken杩囨护鐨刄RL锛孈ConfigurationProperties瑕佹眰tokennofilter涓墍鏈夊瓧姣嶉兘灏忓啓
+tokennofilter:
+    urls:
+        - /sso/sso
+        - /remote/comRes/receive
+        - /wx/comRes/receive
+#鑷姩缁熻閰嶇疆锛岃嚜鍔ㄧ粺璁″畾鏃朵换鍔′細姣忓ぉ瀹氭椂杩涜
+auto-statistics:
+    startHour: 9 #寮�濮嬪皬鏃� 0
+    startMinute: 51 #寮�濮嬪垎閽� 5

--
Gitblit v1.8.0