From 27c0c61e48bfb3e870d44b3b53a820568fcce5d5 Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期三, 31 七月 2024 11:11:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pms-parent/pms-global/src/main/resources/application-global.yml | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 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 168697e..18aa106 100644
--- a/pms-parent/pms-global/src/main/resources/application-global.yml
+++ b/pms-parent/pms-global/src/main/resources/application-global.yml
@@ -52,7 +52,8 @@
nginx:
webPort: 8000
sso:
- checkUrl: http://127.0.0.1:12344/sso/sso/ssoCheck
+# checkUrl: http://127.0.0.1:12344/sso/sso/ssoCheck
+ checkUrl: http://127.0.0.1:12344/sso/sso/ssoPowerCheck
curUserUrl: http://127.0.0.1:12344/sso/sso/ssoCurUser
webPort: 12344
idSuffix: 1
@@ -62,12 +63,18 @@
platform:
webPort: 12346
idSuffix: 3
- product:
+ production:
webPort: 12347
idSuffix: 4
other:
webPort: 12348
idSuffix: 5
+ station:
+ webPort: 12349
+ idSuffix: 6
+ report:
+ webPort: 12350
+ idSuffix: 7
file:
idSuffix: 99
file1:
@@ -100,6 +107,7 @@
photoZipWidth: 400 #缂╃暐鍥惧昂瀵�
webFile:
fmUrl: http://127.0.0.1:${pms.other.webPort}/other # fm鐨剋eb涓婁笅鏂� URL
+ supportedFileTypes: docx,xlsx,pdf
sv1:
id: dyFile1
absolutePath: E:/java/nginx-1.24.0/html/webfiles/
--
Gitblit v1.8.0