Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

liurunyu

2025-01-06 d259c24f0a17bd6238b89b9e0afdd67833572ed9

Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV


 Conflicts:

	pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml

 pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml

@@ -190,115 +190,115 @@
dy:
    photoZipWidth: 400 #缩略图尺寸
    webFile:
        fmUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file # fm的web上下文 URL
        fmUrl: http://127.0.0.1:${pipIrr.file1.webPort}/file # fm的web上下文 URL
        supportedFileTypes: docx,xlsx,doc,xls,pdf #支持的文档（非媒体文件，如照片、录音、录像）文件类型
        sv1:
            id: dyFile1
            absolutePath: ${pipIrr.nginx.root}/html/webfiles/ #所有sv*的安装路径最好一样，这样就可以统一配置了
            absolutePath: E:/apps/pipIrr/nginx-1.27.0/html/webfiles/
            relativePath: webFile1
            hashStart: 0
            hashEnd: 5461
            restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file #file是上下文,ip为局域网ip或本地IP
            webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webFilePort}/webfiles/ #nginx服务路径,安装部署时IP改成外网IP或域名
            webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/file/download/down?id=  #安装部署时IP改成外网IP或域名
            restUrl: http://127.0.0.1:${pipIrr.file1.webPort}/file #file是上下文,ip为局域网ip或本地IP
            webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/webfiles/ #nginx服务路径,安装部署时IP改成外网IP或域名
            webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.file1.webPort}/file/download/down?id=  #安装部署时IP改成外网IP或域名
        sv2:
            id: dyFile2
            absolutePath: ${pipIrr.nginx.root}/html/webfiles/ #所有sv*的安装路径最好一样，这样就可以统一配置了
            absolutePath: E:/apps/pipIrr/nginx-1.27.0/html/webfiles/
            relativePath: webFile2
            hashStart: 5462
            hashEnd: 10923
            restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
            webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webFilePort}/webfiles/
            webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/file/download/down?id=
            restUrl: http://127.0.0.1:${pipIrr.file2.webPort}/file
            webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/webfiles/
            webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.file2.webPort}/file/download/down?id=
        sv3:
            id: dyFile3
            absolutePath: ${pipIrr.nginx.root}/html/webfiles/
            absolutePath: E:/apps/pipIrr/nginx-1.27.0/html/webfiles/
            relativePath: webFile3
            hashStart: 10924
            hashEnd: 16385
            restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
            webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webFilePort}/webfiles/
            webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/file/download/down?id=
            restUrl: http://127.0.0.1:${pipIrr.file3.webPort}/file
            webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/webfiles/
            webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.file3.webPort}/file/download/down?id=
        sv4:
            id: dyFile4
            absolutePath: ${pipIrr.nginx.root}/html/webfiles/
            absolutePath: E:/apps/pipIrr/nginx-1.27.0/html/webfiles/
            relativePath: webFile4
            hashStart: 16386
            hashEnd: 21847
            restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
            webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webFilePort}/webfiles/
            webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/file/download/down?id=
            restUrl: http://127.0.0.1:${pipIrr.file4.webPort}/file
            webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/webfiles/
            webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.file4.webPort}/file/download/down?id=
        sv5:
            id: dyFile5
            absolutePath: ${pipIrr.nginx.root}/html/webfiles/
            absolutePath: E:/apps/pipIrr/nginx-1.27.0/html/webfiles/
            relativePath: webFile5
            hashStart: 21848
            hashEnd: 27309
            restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
            webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webFilePort}/webfiles/
            webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/file/download/down?id=
            restUrl: http://127.0.0.1:${pipIrr.file5.webPort}/file
            webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/webfiles/
            webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.file5.webPort}/file/download/down?id=
        sv6:
            id: dyFile6
            absolutePath: ${pipIrr.nginx.root}/html/webfiles/
            absolutePath: E:/apps/pipIrr/nginx-1.27.0/html/webfiles/
            relativePath: webFile6
            hashStart: 27310
            hashEnd: 32767
            restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
            webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webFilePort}/webfiles/
            webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/file/download/down?id=
            restUrl: http://127.0.0.1:${pipIrr.file6.webPort}/file
            webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/webfiles/
            webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.file6.webPort}/file/download/down?id=
        sv7:
            id: dyFile7
            absolutePath: ${pipIrr.nginx.root}/html/webfiles/
            absolutePath: E:/apps/pipIrr/nginx-1.27.0/html/webfiles/
            relativePath: webFile7
            hashStart: 32768
            hashEnd: 38229
            restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
            webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webFilePort}/webfiles/
            webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/file/download/down?id=
            restUrl: http://127.0.0.1:${pipIrr.file7.webPort}/file
            webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/webfiles/
            webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.file7.webPort}/file/download/down?id=
        sv8:
            id: dyFile8
            absolutePath: ${pipIrr.nginx.root}/html/webfiles/
            absolutePath: E:/apps/pipIrr/nginx-1.27.0/html/webfiles/
            relativePath: webFile8
            hashStart: 38230
            hashEnd: 43691
            restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
            webUrl: http://no253541tf71.vicp.fun${pipIrr.nginx.webFilePort}/webfiles/
            webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/file/download/down?id=
            restUrl: http://127.0.0.1:${pipIrr.file8.webPort}/file
            webUrl: http://no253541tf71.vicp.fun${pipIrr.nginx.webPort}/webfiles/
            webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.file8.webPort}/file/download/down?id=
        sv9:
            id: dyFile9
            absolutePath: ${pipIrr.nginx.root}/html/webfiles/
            absolutePath: E:/apps/pipIrr/nginx-1.27.0/html/webfiles/
            relativePath: webFile9
            hashStart: 43692
            hashEnd: 49153
            restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
            webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webFilePort}/webfiles/
            webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/file/download/down?id=
            restUrl: http://127.0.0.1:${pipIrr.file9.webPort}/file
            webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/webfiles/
            webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.file9.webPort}/file/download/down?id=
        sv10:
            id: dyFile10
            absolutePath: ${pipIrr.nginx.root}/html/webfiles/
            absolutePath: E:/apps/pipIrr/nginx-1.27.0/html/webfiles/
            relativePath: webFile10
            hashStart: 49154
            hashEnd: 54615
            restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
            webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webFilePort}/webfiles/
            webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/file/download/down?id=
            restUrl: http://127.0.0.1:${pipIrr.file10.webPort}/file
            webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/webfiles/
            webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.file10.webPort}/file/download/down?id=
        sv11:
            id: dyFile11
            absolutePath: ${pipIrr.nginx.root}/html/webfiles/
            absolutePath: E:/apps/pipIrr/nginx-1.27.0/html/webfiles/
            relativePath: webFile11
            hashStart: 54616
            hashEnd: 60077
            restUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/file
            webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webFilePort}/webfiles/
            webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/file/download/down?id=
            restUrl: http://127.0.0.1:${pipIrr.file11.webPort}/file
            webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/webfiles/
            webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.file11.webPort}/file/download/down?id=
        sv12:
            id: dyFile12
            absolutePath: ${pipIrr.nginx.root}/html/webfiles/
            absolutePath: E:/apps/pipIrr/nginx-1.27.0/html/webfiles/
            relativePath: webFile12
            hashStart: 60078
            hashEnd: 65535
            restUrl: http://127.0.0.1:${pipIrr.file12.webPort}/file
            webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webFilePort}/webfiles/
            webUrl: http://no253541tf71.vicp.fun:${pipIrr.nginx.webPort}/webfiles/
            webDownloadPath: http://no253541tf71.vicp.fun:${pipIrr.file12.webPort}/file/download/down?id=

#项目编号