From 21cb23e9f2d5833cf642b0f15a60611c44b37a12 Mon Sep 17 00:00:00 2001
From: 刘小明 <liuxm_a@163.com>
Date: 星期四, 25 七月 2024 15:13:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pms-parent/pms-global/src/main/resources/application-global.yml | 7 +++++++
1 files changed, 7 insertions(+), 0 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 423c456..18aa106 100644
--- a/pms-parent/pms-global/src/main/resources/application-global.yml
+++ b/pms-parent/pms-global/src/main/resources/application-global.yml
@@ -69,6 +69,12 @@
other:
webPort: 12348
idSuffix: 5
+ station:
+ webPort: 12349
+ idSuffix: 6
+ report:
+ webPort: 12350
+ idSuffix: 7
file:
idSuffix: 99
file1:
@@ -101,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