QR/laws_chery_serve
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into SecondStage

Browse Source 
# Conflicts:
#	db/update/测试阶段.sql
This commit is contained in:
fengchenchen
2024-10-08 09:31:07 +08:00
parent d4c0f18c38 07a97c838a
commit fc8aa97318
22 changed files with 590 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-single-startup/src/main/resources/application-dev-chery.yml
+1 -1
View File
@@ -609,7 +609,7 @@ feishu:
# 飞书单点登录地址
sign_login_in: ${feishu.base_url}/authen/v1/index?redirect_uri={REDIRECT_URI}&app_id=${feishu.app_id}&state=feishu
# 飞书PC端待办地址
promoter_pc_link: ${feishu.redirect_prefix}?projectId={projectId}&taskName={taskName}&taskId={taskId}&processInstanceId={processInstanceId}&nodeId={nodeId}
promoter_pc_link: ${feishu.redirect_prefix}{url}?projectId={projectId}&taskName={taskName}&taskId={taskId}&processInstanceId={processInstanceId}&nodeId={nodeId}
# 飞书PC端发起流程地址
review_pc_link: ${feishu.redirect_prefix}{url}?projectId={projectId}&taskName={taskName}&taskId={taskId}&processInstanceId={processInstanceId}&nodeId={nodeId}
laws-single-startup/src/main/resources/application-prod.yml
+5 -5
View File
@@ -310,7 +310,7 @@ 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.33:8188,10.2.16.33:3344,10.2.16.37:3344,10.2.16.34:8188,10.2.16.34:3344,10.2.16.33:8012,cgrsm.mychery.com:8188,cgrsm.mychery.com:3344,cgrsm.mychery.com:8012
xssExcludedPages: /login,/updatePassword
xssExcludedPages: /login,/updatePassword,/uploadModelFile,/standardComplianceCheck/start
# cors白名单
notFilter:
# origin地址 域名
@@ -392,7 +392,7 @@ iam:
# Hiwork集成
hiwork:
ip: https://newoatest.mychery.com:8088/
ip: https://www.mychery.com/
# 异构系统标识
sysCode: CGRSM
# 服务号
@@ -408,8 +408,8 @@ hiwork:
# 前端调用地址
url: https://iam.mychery.com:6443/idp/oauth2/authorize?state=123&client_id=CGRSM&redirect_uri=
# 域名
fontUrl: https://cgrsm.mychery.com:3344/{url}?projectId={projectId}&taskName={taskName}&taskId={taskId}&processInstanceId={processInstanceId}&nodeId={nodeId}
fontAppUrl: https://cgrsm.mychery.com:3344//mobile{url}?projectId={projectId}&taskName={taskName}&taskId={taskId}&processInstanceId={processInstanceId}&nodeId={nodeId}
fontUrl: https://cgrsm.mychery.com:3344{url}?projectId={projectId}&taskName={taskName}&taskId={taskId}&processInstanceId={processInstanceId}&nodeId={nodeId}
fontAppUrl: https://cgrsm.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
@@ -578,7 +578,7 @@ feishu:
# 是否推送飞书
isSendStatus: true
# 重定向到前端的地址前缀
redirect_prefix: http://10.2.16.37:3344/transferRedirectPage?finalRedirectPage=
redirect_prefix: https://cgrsm.mychery.com:3344/transferRedirectPage?finalRedirectPage=
# app的id
app_id : cli_a6541d37d6359013
# app秘钥
laws-single-startup/src/main/resources/application-test.yml
+2 -2
View File
@@ -310,7 +310,7 @@ 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,cgrsmuat.mychery.com:8188,cgrsmuat.mychery.com:3344,cgrsmuat.mychery.com:8012
xssExcludedPages: /login,/updatePassword
xssExcludedPages: /login,/updatePassword,/uploadModelFile,/standardComplianceCheck/start
# cors白名单
notFilter:
# origin地址
@@ -607,7 +607,7 @@ feishu:
# 飞书单点登录地址
sign_login_in: ${feishu.base_url}/authen/v1/index?redirect_uri={REDIRECT_URI}&app_id=${feishu.app_id}&state=feishu
# 飞书PC端待办地址
promoter_pc_link: ${feishu.redirect_prefix}?projectId={projectId}&taskName={taskName}&taskId={taskId}&processInstanceId={processInstanceId}&nodeId={nodeId}
promoter_pc_link: ${feishu.redirect_prefix}{url}?projectId={projectId}&taskName={taskName}&taskId={taskId}&processInstanceId={processInstanceId}&nodeId={nodeId}
# 飞书PC端发起流程地址
review_pc_link: ${feishu.redirect_prefix}{url}?projectId={projectId}&taskName={taskName}&taskId={taskId}&processInstanceId={processInstanceId}&nodeId={nodeId}