From 0d50faa5cc0e06887bf78f2609d8222d11c11e20 Mon Sep 17 00:00:00 2001
From: 刘小明 <liuxm_a@163.com>
Date: 星期六, 10 八月 2024 10:13:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pms-parent/pms-global/src/main/resources/application-global.yml | 4 ++--
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/global/WebFileCtrl.java | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/global/WebFileCtrl.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/global/WebFileCtrl.java
index 6392086..3228be2 100644
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/global/WebFileCtrl.java
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/global/WebFileCtrl.java
@@ -68,7 +68,7 @@
fileNameGrp[1],
(frVo.getFileWebUrl() + frVo.getFileWebPath()),
fileOp.getImgFileZipPath(frVo.getFileWebUrl() + frVo.getFileWebPath()),
- frVo.fileSysRestUrl + frVo.fileWebDownloadPath + id) ;
+ frVo.fileWebDownloadPath + id) ;
return BaseResponseUtils.buildSuccess(fvo) ;
}else {
return BaseResponseUtils.buildError("鏈緱鍒颁笂浼犳枃浠剁殑鎵╁睍鍚�");
@@ -113,7 +113,7 @@
fileNameGrp[1],
frVo.getFileWebUrl() + frVo.getFileWebPath(),
null,
- frVo.fileSysRestUrl + frVo.fileWebDownloadPath + id) ;
+ frVo.fileWebDownloadPath + id) ;
return BaseResponseUtils.buildSuccess(fvo) ;
}else {
return BaseResponseUtils.buildError("鏈緱鍒颁笂浼犳枃浠剁殑鎵╁睍鍚�");
@@ -159,7 +159,7 @@
fileNameGrp[1],
frVo.getFileWebUrl() + frVo.getFileWebPath(),
null,
- frVo.fileSysRestUrl + frVo.fileWebDownloadPath + id) ;
+ frVo.fileWebDownloadPath + id) ;
return BaseResponseUtils.buildSuccess(fvo) ;
}else {
return BaseResponseUtils.buildError("鏈緱鍒颁笂浼犳枃浠剁殑鎵╁睍鍚�");
@@ -208,7 +208,7 @@
fileNameGrp[0], fileNameGrp[1],
frVo.getFileWebUrl() + frVo.getFileWebPath(),
null,
- frVo.fileSysRestUrl + frVo.fileWebDownloadPath + id) ;
+ frVo.fileWebDownloadPath + id) ;
return BaseResponseUtils.buildSuccess(fvo) ;
}else {
return BaseResponseUtils.buildError("鏈緱鍒颁笂浼犳枃浠剁殑鎵╁睍鍚�");
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 0cefc56..8d3e2f0 100644
--- a/pms-parent/pms-global/src/main/resources/application-global.yml
+++ b/pms-parent/pms-global/src/main/resources/application-global.yml
@@ -50,12 +50,12 @@
- /sso/sso
pms:
global:
- dev: false #鏄惁寮�鍙戦樁娈碉紝true鎴杅alse锛屽紑鍙戦樁娈典笉杩涜鐧诲綍楠岃瘉鍙婃潈闄愰獙璇�
+ dev: true #鏄惁寮�鍙戦樁娈碉紝true鎴杅alse锛屽紑鍙戦樁娈典笉杩涜鐧诲綍楠岃瘉鍙婃潈闄愰獙璇�
ssoUserExpireAfterAccess: 60 #sso鐧诲綍鍚庯紝鐢ㄦ埛鍦ㄤ竴瀹氭椂闂达紙ssoUserExpireAfterAccess锛夛紙鍒嗛挓锛夊唴鏈闂郴缁燂紝绯荤粺娓呴櫎缂撳瓨淇℃伅锛屼娇鍏堕噸鏂扮櫥褰曠郴缁�
ssoCacheSizeInit: 10 #sso缂撳瓨鍒濆瀹归噺
ssoCacheSizeMax: 10000 #sso缂撳瓨鏈�澶у閲忥紝鍗虫敮鎸乻soCacheSizeMax涓敤鎴峰悓鏃剁櫥褰�
nginx:
- webPort: 54321
+ webPort: 8000
sso:
checkUrl: http://127.0.0.1:12344/sso/sso/ssoPowerCheck
curUserUrl: http://127.0.0.1:12344/sso/sso/ssoCurUser
--
Gitblit v1.8.0