Merge remote-tracking branch 'origin/master'

刘小明

2024-08-10 0d50faa5cc0e06887bf78f2609d8222d11c11e20

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	pms-parent/pms-global/src/main/resources/application-global.yml

 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("未得到上传文件的扩展名");

 pms-parent/pms-global/src/main/resources/application-global.yml

@@ -50,12 +50,12 @@
        - /sso/sso
pms:
    global:
        dev: false   #是否开发阶段，true或false，开发阶段不进行登录验证及权限验证
        dev: true   #是否开发阶段，true或false，开发阶段不进行登录验证及权限验证
        ssoUserExpireAfterAccess: 60  #sso登录后，用户在一定时间（ssoUserExpireAfterAccess）（分钟）内未访问系统，系统清除缓存信息，使其重新登录系统
        ssoCacheSizeInit: 10  #sso缓存初始容量
        ssoCacheSizeMax: 10000  #sso缓存最大容量，即支持ssoCacheSizeMax个用户同时登录
    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