Merge remote-tracking branch 'origin/master'

刘小明

2024-07-17 75fab7170e1f26b83b0f31d65d4e164ca3bba107

 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,13 +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:
@@ -101,6 +107,7 @@
    photoZipWidth: 400 #缩略图尺寸
    webFile:
        fmUrl: http://127.0.0.1:${pms.other.webPort}/other # fm的web上下文 URL
        supportedFileTypes: docx,xlsx,pdf
        sv1:
            id: dyFile1
            absolutePath: E:/java/nginx-1.24.0/html/webfiles/
@@ -109,7 +116,7 @@
            hashEnd: 5461
            restUrl: http://127.0.0.1:${pms.file1.webPort}/file #file是上下文
            webUrl: http://127.0.0.1:${pms.nginx.webPort}/webfiles/ #nginx服务路径
            webDownloadUrl: http://127.0.0.1:${pms.file1.webPort}/file/download/down?id=
            webDownloadPath: /download/down?id=  #实际下载webUrl= restUrl + webDownloadPath
        sv2:
            id: dyFile2
            absolutePath: E:/java/nginx-1.24.0/html/webfiles/
@@ -118,7 +125,7 @@
            hashEnd: 10923
            restUrl: http://127.0.0.1:${pms.file2.webPort}/file
            webUrl: http://127.0.0.1:${pms.nginx.webPort}/webfiles/
            webDownloadUrl: http://127.0.0.1:${pms.file2.webPort}/file/download/down?id=
            webDownloadPath: /download/down?id=
        sv3:
            id: dyFile3
            absolutePath: E:/java/nginx-1.24.0/html/webfiles/
@@ -127,7 +134,7 @@
            hashEnd: 16385
            restUrl: http://127.0.0.1:${pms.file3.webPort}/file
            webUrl: http://127.0.0.1:${pms.nginx.webPort}/webfiles/
            webDownloadUrl: http://127.0.0.1:${pms.file3.webPort}/file/download/down?id=
            webDownloadPath: /download/down?id=
        sv4:
            id: dyFile4
            absolutePath: E:/java/nginx-1.24.0/html/webfiles/
@@ -136,7 +143,7 @@
            hashEnd: 21847
            restUrl: http://127.0.0.1:${pms.file4.webPort}/file
            webUrl: http://127.0.0.1:${pms.nginx.webPort}/webfiles/
            webDownloadUrl: http://127.0.0.1:${pms.file4.webPort}/file/download/down?id=
            webDownloadPath: /download/down?id=
        sv5:
            id: dyFile5
            absolutePath: E:/java/nginx-1.24.0/html/webfiles/
@@ -145,7 +152,7 @@
            hashEnd: 27309
            restUrl: http://127.0.0.1:${pms.file5.webPort}/file
            webUrl: http://127.0.0.1:${pms.nginx.webPort}/webfiles/
            webDownloadUrl: http://127.0.0.1:${pms.file5.webPort}/file/download/down?id=
            webDownloadPath: /download/down?id=
        sv6:
            id: dyFile6
            absolutePath: E:/java/nginx-1.24.0/html/webfiles/
@@ -154,7 +161,7 @@
            hashEnd: 32767
            restUrl: http://127.0.0.1:${pms.file6.webPort}/file
            webUrl: http://127.0.0.1:${pms.nginx.webPort}/webfiles/
            webDownloadUrl: http://127.0.0.1:${pms.file6.webPort}/file/download/down?id=
            webDownloadPath: /download/down?id=
        sv7:
            id: dyFile7
            absolutePath: E:/java/nginx-1.24.0/html/webfiles/
@@ -163,7 +170,7 @@
            hashEnd: 38229
            restUrl: http://127.0.0.1:${pms.file7.webPort}/file
            webUrl: http://127.0.0.1:${pms.nginx.webPort}/webfiles/
            webDownloadUrl: http://127.0.0.1:${pms.file7.webPort}/file/download/down?id=
            webDownloadPath: /download/down?id=
        sv8:
            id: dyFile8
            absolutePath: E:/java/nginx-1.24.0/html/webfiles/
@@ -172,7 +179,7 @@
            hashEnd: 43691
            restUrl: http://127.0.0.1:${pms.file8.webPort}/file
            webUrl: http://127.0.0.1:${pms.nginx.webPort}/webfiles/
            webDownloadUrl: http://127.0.0.1:${pms.file8.webPort}/file/download/down?id=
            webDownloadPath: /download/down?id=
        sv9:
            id: dyFile9
            absolutePath: E:/java/nginx-1.24.0/html/webfiles/
@@ -181,7 +188,7 @@
            hashEnd: 49153
            restUrl: http://127.0.0.1:${pms.file9.webPort}/file
            webUrl: http://127.0.0.1:${pms.nginx.webPort}/webfiles/
            webDownloadUrl: http://127.0.0.1:${pms.file9.webPort}/file/download/down?id=
            webDownloadPath: /download/down?id=
        sv10:
            id: dyFile10
            absolutePath: E:/java/nginx-1.24.0/html/webfiles/
@@ -190,7 +197,7 @@
            hashEnd: 54615
            restUrl: http://127.0.0.1:${pms.file10.webPort}/file
            webUrl: http://127.0.0.1:${pms.nginx.webPort}/webfiles/
            webDownloadUrl: http://127.0.0.1:${pms.file10.webPort}/file/download/down?id=
            webDownloadPath: /download/down?id=
        sv11:
            id: dyFile11
            absolutePath: E:/java/nginx-1.24.0/html/webfiles/
@@ -199,7 +206,7 @@
            hashEnd: 60077
            restUrl: http://127.0.0.1:${pms.file11.webPort}/file
            webUrl: http://127.0.0.1:${pms.nginx.webPort}/webfiles/
            webDownloadUrl: http://127.0.0.1:${pms.file11.webPort}/file/download/down?id=
            webDownloadPath: /download/down?id=
        sv12:
            id: dyFile12
            absolutePath: E:/java/nginx-1.24.0/html/webfiles/
@@ -208,4 +215,4 @@
            hashEnd: 65535
            restUrl: http://127.0.0.1:${pms.file12.webPort}/file
            webUrl: http://127.0.0.1:${pms.nginx.webPort}/webfiles/
            webDownloadUrl: http://127.0.0.1:${pms.file12.webPort}/file/download/down?id=
            webDownloadPath: /download/down?id=