From 954604a8e73818fd3f8ce5ba8669a35085f416dc Mon Sep 17 00:00:00 2001 From: fengchenchen Date: Fri, 12 Apr 2024 14:29:25 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90update=E3=80=91=20=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=8E=AF=E5=A2=83=E7=9A=84=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-prod.yml | 30 ++++++++++--------- .../src/main/resources/application-test.yml | 14 +++++++-- 2 files changed, 28 insertions(+), 16 deletions(-) diff --git a/laws-single-startup/src/main/resources/application-prod.yml b/laws-single-startup/src/main/resources/application-prod.yml index 15ba4d8a..74b80327 100644 --- a/laws-single-startup/src/main/resources/application-prod.yml +++ b/laws-single-startup/src/main/resources/application-prod.yml @@ -207,7 +207,7 @@ jero: #拆分图片展示地址 splitUrl: http://srms.sinotruk.com/laws-sinotruk/sys/split/file/getImage?fileName= #公式转换图片url - mathToImgUrl: http://mathtoimg-gk8cg.yf-grp:8080/mathToImg + mathToImgUrl: http://mathtoimg-o3lth.yf-grp:8080/mathToImg path: #文件上传根目录 设置 upload: /app/opt/upFiles @@ -352,7 +352,7 @@ justauth: file: # 在线编辑文件下载映射地址 - downloadUrl: http://localhost:8184/laws-sinotruk/file/ + downloadUrl: http://srms.sinotruk.com/laws-sinotruk/file/ split: path: /opt/onlyoffice/file/splitImage/ # 在线编辑空白docx地址 @@ -385,15 +385,14 @@ hiwork: # 是否推送统一待办 isWorkflow: true # 前端调用地址 - url: https://iam.sinotruk.com:7011/idp/oauth2/authorize?&state=123&client_id=SRMS&response_type=code&redirect_uri= - fontUrl: http://srms.sinotruk.com{url}?projectId={projectId}&taskName={taskName}&taskId={taskId}&processInstanceId={processInstanceId}&nodeId={nodeId} - fontAppUrl: http://222.175.158.138:8120/mobile{url}?projectId={projectId}&taskName={taskName}&taskId={taskId}&processInstanceId={processInstanceId}&nodeId={nodeId} + url: https://iam.sinotruk.com:7012/idp/oauth2/authorize?&state=123&client_id=SRMS&response_type=code&redirect_uri= + fontUrl: {url}?projectId={projectId}&taskName={taskName}&taskId={taskId}&processInstanceId={processInstanceId}&nodeId={nodeId} + fontAppUrl: /mobile{url}?projectId={projectId}&taskName={taskName}&taskId={taskId}&processInstanceId={processInstanceId}&nodeId={nodeId} #hiwork单点登录 appkey: ding1mzykb7qv4ampvsw appsecret: 8N-qPEf3oLdUAsqsyAEMb_HNKfuuHZdFq3sRuyUvx5XMiVEKfsvMkZqi32RPeyme #hiwork消息跳转前缀 - hiworkUrlPrefix: "http://srms-test.sinotruk.com" - + hiworkUrlPrefix: "http://srms.sinotruk.com" # 汽车标准数字化平台ASMS asms: host: http://standard.catarc.org.cn/ @@ -421,7 +420,7 @@ oauth: oa: - url: http://oatest.sinotruk.com:8080 + url: http://oa.sinotruk.com:8080 getAccessTokenUrl: ${oa.url}/getAccessToken getTicketInfoUrl: ${oa.url}/getTicketInfo appId: SRMS @@ -432,13 +431,16 @@ draftDepartName: 起草部门 # 管理员权限roleCode,多填用英文逗号拼接 adminRoleCode: admin,BZGLY +# 企标详情全查看roleCode +enterpriseDetailRoleCode: JTGLBZCXJS + # 文件下载加解密 download: enable: true # 文件下载、预览拦截路径，多个以逗号分隔 - download_url: /sys/common/download/ - view_url: /sys/common/view/ - white_url: /lawsSpecialProjectLibrary/exportXls,/noEncryptDownload,/overseas/exportData,/overseas/exportDataWithFile,/overseas/templateDownload,/domestic/exportData,/domestic/exportDataWithFile,/domestic/templateDownload,/onlyOffice,/enterprise/templateDownload,/exportDataWithFile,/exportSplitInfoZip,/lawsCustomCompareInfo/exportExcel,/documentSplit/downloadImportTemplate,/split/file/getImage + download_url: /sys/common/download/,/laws/standard/common/downloadWithWaterMark + view_url: /sys/common/view/,/onlyOffice/downLoadFile + white_url: /lawsSpecialProjectLibrary/exportXls,/noEncryptDownload,/overseas/exportData,/overseas/exportDataWithFile,/overseas/templateDownload,/domestic/exportData,/domestic/exportDataWithFile,/domestic/templateDownload,/onlyOffice,/enterprise/templateDownload,/exportDataWithFile,/exportSplitInfoZip,/lawsCustomCompareInfo/exportExcel,/home/search/download,/documentSplit/downloadImportTemplate,/split/file/getImage dev_encrypt_url: /devEncryptDownload,/enterprise/exportData # 管理员角色 admin_role_code: admin,BZGLY @@ -484,7 +486,7 @@ srms: # pdf预览 后端url back_url_pdf: /laws-sinotruk/sys/common/view/{id}?type=view&at={token} # 其他文件预览 替换kkfileviewurl - font_url_other: http://fileviewdev.sinotruk.com/onlinePreview?url={back_url_other}&watermarkTxt={mark}&watermarkSign={mark_md5} + font_url_other: http://srms.sinotruk.com/kkfileview/onlinePreview?url={back_url_other}&watermarkTxt={mark}&watermarkSign={mark_md5} # 其他文件预览 后端url 替换后端地址 back_url_other: http://srms.sinotruk.com/${srms.back_url_pdf}&fullfilename={file_name} # 其他文件水印标识 @@ -503,5 +505,5 @@ standardProperty: #onlyoffice保存时回调url替换 onlyoffice: - replaceUrl: srms.sinotruk.com,srms-onlyoffice.sinotruk.com - toUrl: onlyoffice-j3qlv.yf-grp:8080 + replaceUrl: srms-test.sinotruk.com,srmstest-onlyoffice.sinotruk.com + toUrl: onlyoffice-sa2of.yf-grp:8080 diff --git a/laws-single-startup/src/main/resources/application-test.yml b/laws-single-startup/src/main/resources/application-test.yml index dff0e470..870a48de 100644 --- a/laws-single-startup/src/main/resources/application-test.yml +++ b/laws-single-startup/src/main/resources/application-test.yml @@ -419,18 +419,28 @@ oauth: # 防止跨站请求伪造（CSRF）标识（暂时不用） state: zhongQi +oa: + url: http://oatest.sinotruk.com:8080 + getAccessTokenUrl: ${oa.url}/getAccessToken + getTicketInfoUrl: ${oa.url}/getTicketInfo + appId: SRMS + appSecret: 196b2e1f-127f-47d5-8e33-746fb8ad0387 + # 起草部门部门名称 draftDepartName: 起草部门 # 管理员权限roleCode,多填用英文逗号拼接 adminRoleCode: admin,BZGLY +# 企标详情全查看roleCode +enterpriseDetailRoleCode: JTGLBZCXJS + # 文件下载加解密 download: enable: true # 文件下载、预览拦截路径，多个以逗号分隔 download_url: /sys/common/download/,/laws/standard/common/downloadWithWaterMark view_url: /sys/common/view/,/onlyOffice/downLoadFile - white_url: /lawsSpecialProjectLibrary/exportXls,/noEncryptDownload,/overseas/exportData,/overseas/exportDataWithFile,/overseas/templateDownload,/domestic/exportData,/domestic/exportDataWithFile,/domestic/templateDownload,/onlyOffice,/enterprise/templateDownload,/exportDataWithFile,/exportSplitInfoZip,/lawsCustomCompareInfo/exportExcel,/documentSplit/downloadImportTemplate,/split/file/getImage + white_url: /noEncryptDownload,/overseas/exportData,/overseas/exportDataWithFile,/overseas/templateDownload,/domestic/exportData,/domestic/exportDataWithFile,/domestic/templateDownload,/onlyOffice,/enterprise/templateDownload,/exportDataWithFile,/exportSplitInfoZip,/lawsCustomCompareInfo/exportExcel,/lawsSpecialProjectLibrary/exportXls,/home/search/download,/documentSplit/downloadImportTemplate,/split/file/getImage dev_encrypt_url: /devEncryptDownload,/enterprise/exportData # 管理员角色 admin_role_code: admin,BZGLY @@ -496,4 +506,4 @@ standardProperty: #onlyoffice保存时回调url替换 onlyoffice: replaceUrl: srms-test.sinotruk.com,srmstest-onlyoffice.sinotruk.com - toUrl: onlyoffice-j3qlv.yf-grp:8080 + toUrl: onlyoffice-sa2of.yf-grp:8080