From 0941e5e4b815081edce568000030990e3fb04491 Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期三, 18 九月 2024 10:39:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pms-parent/pms-global/src/main/resources/application-global.yml | 35 ++++++++++++++++++++---------------
1 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/pms-parent/pms-global/src/main/resources/application-global.yml b/pms-parent/pms-global/src/main/resources/application-global.yml
index f9f3ba4..79deadf 100644
--- a/pms-parent/pms-global/src/main/resources/application-global.yml
+++ b/pms-parent/pms-global/src/main/resources/application-global.yml
@@ -43,7 +43,12 @@
cache-enabled: true #鎵撳紑鍏ㄥ眬缂撳瓨寮�鍏筹紙浜岀骇鐜锛夛紝榛樿鍊兼槸true
#default-enum-type-handler: com.dy.common.mybatis.envm.EnumCodeTypeHandler
-
+dingtalk:
+ robot:
+ url: https://oapi.dingtalk.com/robot/send
+ access-token: 5004482dce6b24d0e1e655b8e4376a6418cfcebce17ff792d0e68cbb63d6eb5b
+ secret: SEC985ad412f35ece68bb239cad88b6fba59b19461dd8d067e80fafa1270d6ab465
+ at-all: true
#涓嶈繘琛寀serToken杩囨护鐨刄RL锛孈ConfigurationProperties瑕佹眰tokennofilter涓墍鏈夊瓧姣嶉兘灏忓啓
tokennofilter:
urls:
@@ -118,9 +123,9 @@
relativePath: webFile1
hashStart: 0
hashEnd: 5461
- restUrl: http://127.0.0.1:${pms.file1.webPort}/file #file鏄笂涓嬫枃
- webUrl: http://127.0.0.1:${pms.nginx.webPort}/webfiles/ #nginx鏈嶅姟璺緞
- webDownloadPath: /download/down?id= #瀹為檯涓嬭浇webUrl= restUrl + webDownloadPath
+ restUrl: http://127.0.0.1:${pms.file1.webPort}/file #file鏄笂涓嬫枃,ip涓哄眬鍩熺綉ip鎴栨湰鍦癐P
+ webUrl: http://127.0.0.1:${pms.nginx.webPort}/webfiles/ #nginx鏈嶅姟璺緞,瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
+ webDownloadPath: http://127.0.0.1:${pms.file1.webPort}/file/download/down?id= #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉IP鎴栧煙鍚�
sv2:
id: dyFile2
absolutePath: E:/java/nginx-1.24.0/html/webfiles/
@@ -129,7 +134,7 @@
hashEnd: 10923
restUrl: http://127.0.0.1:${pms.file2.webPort}/file
webUrl: http://127.0.0.1:${pms.nginx.webPort}/webfiles/
- webDownloadPath: /download/down?id=
+ webDownloadPath: http://127.0.0.1:${pms.file2.webPort}/file/download/down?id=
sv3:
id: dyFile3
absolutePath: E:/java/nginx-1.24.0/html/webfiles/
@@ -138,7 +143,7 @@
hashEnd: 16385
restUrl: http://127.0.0.1:${pms.file3.webPort}/file
webUrl: http://127.0.0.1:${pms.nginx.webPort}/webfiles/
- webDownloadPath: /download/down?id=
+ webDownloadPath: http://127.0.0.1:${pms.file3.webPort}/file/download/down?id=
sv4:
id: dyFile4
absolutePath: E:/java/nginx-1.24.0/html/webfiles/
@@ -147,7 +152,7 @@
hashEnd: 21847
restUrl: http://127.0.0.1:${pms.file4.webPort}/file
webUrl: http://127.0.0.1:${pms.nginx.webPort}/webfiles/
- webDownloadPath: /download/down?id=
+ webDownloadPath: http://127.0.0.1:${pms.file4.webPort}/file/download/down?id=
sv5:
id: dyFile5
absolutePath: E:/java/nginx-1.24.0/html/webfiles/
@@ -156,7 +161,7 @@
hashEnd: 27309
restUrl: http://127.0.0.1:${pms.file5.webPort}/file
webUrl: http://127.0.0.1:${pms.nginx.webPort}/webfiles/
- webDownloadPath: /download/down?id=
+ webDownloadPath: http://127.0.0.1:${pms.file5.webPort}/file/download/down?id=
sv6:
id: dyFile6
absolutePath: E:/java/nginx-1.24.0/html/webfiles/
@@ -165,7 +170,7 @@
hashEnd: 32767
restUrl: http://127.0.0.1:${pms.file6.webPort}/file
webUrl: http://127.0.0.1:${pms.nginx.webPort}/webfiles/
- webDownloadPath: /download/down?id=
+ webDownloadPath: http://127.0.0.1:${pms.file6.webPort}/file/download/down?id=
sv7:
id: dyFile7
absolutePath: E:/java/nginx-1.24.0/html/webfiles/
@@ -174,7 +179,7 @@
hashEnd: 38229
restUrl: http://127.0.0.1:${pms.file7.webPort}/file
webUrl: http://127.0.0.1:${pms.nginx.webPort}/webfiles/
- webDownloadPath: /download/down?id=
+ webDownloadPath: http://127.0.0.1:${pms.file7.webPort}/file/download/down?id=
sv8:
id: dyFile8
absolutePath: E:/java/nginx-1.24.0/html/webfiles/
@@ -183,7 +188,7 @@
hashEnd: 43691
restUrl: http://127.0.0.1:${pms.file8.webPort}/file
webUrl: http://127.0.0.1:${pms.nginx.webPort}/webfiles/
- webDownloadPath: /download/down?id=
+ webDownloadPath: http://127.0.0.1:${pms.file8.webPort}/file/download/down?id=
sv9:
id: dyFile9
absolutePath: E:/java/nginx-1.24.0/html/webfiles/
@@ -192,7 +197,7 @@
hashEnd: 49153
restUrl: http://127.0.0.1:${pms.file9.webPort}/file
webUrl: http://127.0.0.1:${pms.nginx.webPort}/webfiles/
- webDownloadPath: /download/down?id=
+ webDownloadPath: http://127.0.0.1:${pms.file9.webPort}/file/download/down?id=
sv10:
id: dyFile10
absolutePath: E:/java/nginx-1.24.0/html/webfiles/
@@ -201,7 +206,7 @@
hashEnd: 54615
restUrl: http://127.0.0.1:${pms.file10.webPort}/file
webUrl: http://127.0.0.1:${pms.nginx.webPort}/webfiles/
- webDownloadPath: /download/down?id=
+ webDownloadPath: http://127.0.0.1:${pms.file10.webPort}/file/download/down?id=
sv11:
id: dyFile11
absolutePath: E:/java/nginx-1.24.0/html/webfiles/
@@ -210,7 +215,7 @@
hashEnd: 60077
restUrl: http://127.0.0.1:${pms.file11.webPort}/file
webUrl: http://127.0.0.1:${pms.nginx.webPort}/webfiles/
- webDownloadPath: /download/down?id=
+ webDownloadPath: http://127.0.0.1:${pms.file11.webPort}/file/download/down?id=
sv12:
id: dyFile12
absolutePath: E:/java/nginx-1.24.0/html/webfiles/
@@ -219,4 +224,4 @@
hashEnd: 65535
restUrl: http://127.0.0.1:${pms.file12.webPort}/file
webUrl: http://127.0.0.1:${pms.nginx.webPort}/webfiles/
- webDownloadPath: /download/down?id=
+ webDownloadPath: http://127.0.0.1:${pms.file12.webPort}/file/download/down?id=
--
Gitblit v1.8.0