From 2f8ecdf0b151349cc4377b0d3f36359079824a97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Thu, 22 Aug 2024 16:00:33 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9F=9F=E5=90=8D?= =?UTF-8?q?=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-test.yml | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/laws-single-startup/src/main/resources/application-test.yml b/laws-single-startup/src/main/resources/application-test.yml index db8ea6fd..e5b7498f 100644 --- a/laws-single-startup/src/main/resources/application-test.yml +++ b/laws-single-startup/src/main/resources/application-test.yml @@ -215,9 +215,9 @@ jero: backUrl: http://localhost:3000 backUrlPhone: http://localhost:3000 #拆分图片展示地址 - splitUrl: http://10.2.16.10:8188/laws-chery/sys/split/file/getImage?fileName= + splitUrl: https://cgrsmuat.mychery.com:8188/laws-chery/sys/split/file/getImage?fileName= #公式转换图片url - mathToImgUrl: http://10.2.16.10:9998/mathToImg + mathToImgUrl: https://cgrsmuat.mychery.com:9998/mathToImg # 拆分标准类型 splitStandardClass: UN,EU path: @@ -262,7 +262,7 @@ jero: # 文件、图片上传方式，可选项：qiniu（七牛云）、system（跟随系统配置） upload-type: system # 在线预览文件服务器地址配置 - file-view-domain: 10.2.16.10:8012 + file-view-domain: cgrsmuat.mychery.com:8012 # minio文件上传 minio: minio_url: @@ -309,12 +309,12 @@ jero: # 文件限制后缀黑名单 fileSuffixLimits : 0x00,%00,\\00,.jsp,.exe,.php,.asp,.aspx,.jspx,.xml,.html,.js,.sh,.bin,$DATA # 跨站白名单 - whiteUrls: localhost:62345,localhost:8188,localhost:3344,localhost:3435,localhost:3408,10.2.16.10:8188,10.2.16.10:3344,10.2.16.10:8012 + whiteUrls: localhost:62345,localhost:8188,localhost:3344,localhost:3435,localhost:3408,10.2.16.10:8188,10.2.16.10:3344,10.2.16.10:8012,cgrsmuat.mychery.com:8188,cgrsmuat.mychery.com:3344,cgrsmuat.mychery.com:8012 xssExcludedPages: /login,/updatePassword # cors白名单 notFilter: # origin地址 - originIp: http://localhost:62345,http://localhost:8188,http://localhost:3344,http://localhost:3435,http://localhost:3408,http://10.2.16.10:8188,http://10.2.16.10:3344,http://10.2.16.10:8012 + originIp: http://localhost:62345,http://localhost:8188,http://localhost:3344,http://localhost:3435,http://localhost:3408,http://10.2.16.10:8188,http://10.2.16.10:3344,http://10.2.16.10:8012,https://cgrsmuat.mychery.com:8188,https://cgrsmuat.mychery.com:3344,https://cgrsmuat.mychery.com:8012 # 加密默认值 password: pbe: @@ -407,8 +407,8 @@ hiwork: isWorkflow: true # 前端调用地址 url: https://iamuat.mychery.com:5443/idp/oauth2/authorize?state=123&client_id=CGRSM&redirect_uri= - fontUrl: http://10.2.16.10:3344{url}?projectId={projectId}&taskName={taskName}&taskId={taskId}&processInstanceId={processInstanceId}&nodeId={nodeId} - fontAppUrl: http://10.2.16.10:3344/mobile{url}?projectId={projectId}&taskName={taskName}&taskId={taskId}&processInstanceId={processInstanceId}&nodeId={nodeId} + fontUrl: https://cgrsmuat.mychery.com:3344{url}?projectId={projectId}&taskName={taskName}&taskId={taskId}&processInstanceId={processInstanceId}&nodeId={nodeId} + fontAppUrl: https://cgrsmuat.mychery.com:3344/mobile{url}?projectId={projectId}&taskName={taskName}&taskId={taskId}&processInstanceId={processInstanceId}&nodeId={nodeId} #hiwork单点登录 appkey: dingshfclphtivrd0r7k appsecret: dqhom_17n6BC8pmLeaf5wNp4aV_4XSt_aYn-dNBo8z__-79NjVvZhDJ_M2REdxRc @@ -504,13 +504,13 @@ watermark: # srms 接口对接 srms: # pdf预览 前端url http://ip:port 替换前端地址 - font_url_pdf: http://10.2.16.10:3344/pdfjs/web/viewer.html?file={back_url_pdf}&.pdf + font_url_pdf: https://cgrsmuat.mychery.com:3344/pdfjs/web/viewer.html?file={back_url_pdf}&.pdf # pdf预览 后端url back_url_pdf: /laws-chery/sys/common/view/{id}?type=view&at={token} # 其他文件预览 替换kkfileviewurl - font_url_other: http://10.2.16.10:8012/onlinePreview?url={back_url_other}&watermarkTxt={mark}&watermarkSign={mark_md5} + font_url_other: https://cgrsmuat.mychery.com:8012/onlinePreview?url={back_url_other}&watermarkTxt={mark}&watermarkSign={mark_md5} # 其他文件预览 后端url 替换后端地址 - back_url_other: http://10.2.16.10:8188/${srms.back_url_pdf}&fullfilename={file_name} + back_url_other: https://cgrsmuat.mychery.com:8188/${srms.back_url_pdf}&fullfilename={file_name} # 其他文件水印标识 other_md5_mark: cnhtc # E彩通标识 @@ -577,7 +577,7 @@ feishu: # 是否推送飞书 isSendStatus: true # 重定向到前端的地址前缀 - redirect_prefix: http://10.2.16.10:3344/transferRedirectPage?finalRedirectPage= + redirect_prefix: https://cgrsmuat.mychery.com:3344/transferRedirectPage?finalRedirectPage= # app的id app_id : cli_a62184527ef5100c # app秘钥 From e7a43d084633e30d15ac4e2f7de58fa0c027d614 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Fri, 23 Aug 2024 10:36:46 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9uat=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E5=9F=9F=E5=90=8D=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- laws-single-startup/src/main/resources/application-test.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/laws-single-startup/src/main/resources/application-test.yml b/laws-single-startup/src/main/resources/application-test.yml index e5b7498f..819af057 100644 --- a/laws-single-startup/src/main/resources/application-test.yml +++ b/laws-single-startup/src/main/resources/application-test.yml @@ -215,9 +215,9 @@ jero: backUrl: http://localhost:3000 backUrlPhone: http://localhost:3000 #拆分图片展示地址 - splitUrl: https://cgrsmuat.mychery.com:8188/laws-chery/sys/split/file/getImage?fileName= + splitUrl: http://10.2.16.10:8188/laws-chery/sys/split/file/getImage?fileName= #公式转换图片url - mathToImgUrl: https://cgrsmuat.mychery.com:9998/mathToImg + mathToImgUrl: http://10.2.16.10:9998/mathToImg # 拆分标准类型 splitStandardClass: UN,EU path: @@ -510,7 +510,7 @@ srms: # 其他文件预览 替换kkfileviewurl font_url_other: https://cgrsmuat.mychery.com:8012/onlinePreview?url={back_url_other}&watermarkTxt={mark}&watermarkSign={mark_md5} # 其他文件预览 后端url 替换后端地址 - back_url_other: https://cgrsmuat.mychery.com:8188/${srms.back_url_pdf}&fullfilename={file_name} + back_url_other: http://10.2.16.10:8188/${srms.back_url_pdf}&fullfilename={file_name} # 其他文件水印标识 other_md5_mark: cnhtc # E彩通标识