修改客户测试环境配置文件

laws-single-startup/src/main/resources/application-test.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8080
+  port: 8188
   tomcat:
     max-swallow-size: -1
   error:
@@ -7,7 +7,7 @@ server:
     include-stacktrace: ALWAYS
     include-message: ALWAYS
   servlet:
-    context-path: /laws-sinotruk
+    context-path: /laws-chery
   compression:
     enabled: true
     min-response-size: 1024
@@ -17,9 +17,12 @@ management:
   server:
     port: -1
   endpoints:
+    #关闭actuator监控
     enabled-by-default: false
 
 spring:
+  main:
+    lazy-initialization: false
   servlet:
     multipart:
       max-file-size: 500MB
@@ -70,11 +73,20 @@ spring:
   jpa:
     open-in-view: false
   activiti:
+    # 检测身份信息表是否存在
+    db-identity-used: false
+    database-schema-update: false
+    # 自动部署验证设置:true-开启（默认）、false-关闭
+    # 关闭activiti自动部署（使用流程设计器部署，不使用具体文件访问方式）
     check-process-definitions: false
-    #启用作业执行器
+    #    none：不保存任何的历史数据，因此，在流程执行过程中，这是最高效的。
+    #    activity：级别高于none，保存流程实例与流程行为，其他数据不保存。
+    #    audit：除activity级别会保存的数据外，还会保存全部的流程任务及其属性。audit为history的默认值。
+    #    full：保存历史数据的最高级别，除了会保存audit级别的数据外，还会保存其他全部流程相关的细节数据，包括一些流程参数等。
+    history-level: full
+    #添加这个配置就不会一直调用了
+    #在流程引擎启动就激活AsyncExecutor,异步 true false 关闭（切记关闭）
     async-executor-activate: false
-    #启用异步执行器
-    job-executor-activate: false
   aop:
     proxy-target-class: true
   #配置freemarker
@@ -129,29 +141,21 @@ spring:
         maxPoolPreparedStatementPerConnectionSize: 20
         # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
         filters: stat,slf4j
-
         # 通过connectProperties属性来打开mergeSql功能；慢SQL记录
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000;druid.stat.logSlowSql\=true
       datasource:
         master:
-          url: jdbc:p6spy:mysql://10.186.40.44:8921/laws_sinotrunk_grp?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&autoReconnect=true
+          url: jdbc:p6spy:mysql://10.2.16.11:3306/rsm_dev?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
-          username: law_dev
+          username: cgrsm
-          password: Lawdev!@#1234
+          password: ULfDEhef7gkQuT
           driver-class-name: com.p6spy.engine.spy.P6SpyDriver
-          #          url: jdbc:mysql://127.0.0.1:3306/jero-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+          #          url: jdbc:p6spy:mysql://lijiarao.cn:3306/laws_chery_dev?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
           #          username: root
-          #          password: 123456
+          #          password: 704670af746903fa
-          #          driver-class-name: com.mysql.cj.jdbc.Driver
+          #          driver-class-name: com.p6spy.engine.spy.P6SpyDriver
-          # 多数据源配置
-          #multi-datasource1:
-          #url: jdbc:mysql://localhost:3306/jero-boot2?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
-          #username: root
-          #password: root
-          #driver-class-name: com.mysql.cj.jdbc.Driver
-  #redis 配置
   redis:
-    database: 8
+    database: 1
-    host: 10.186.40.105
+    host: 10.2.16.11
     lettuce:
       pool:
         max-active: 8   #最大连接数据库连接数,设 0 为没有限制
@@ -159,8 +163,9 @@ spring:
         max-wait: -1ms  #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。
         min-idle: 0     #最小等待连接中的数量,设 0 为没有限制
       shutdown-timeout: 100ms
-    password: 'nb!ydy%cGm82'
+    password: y2w4jw5nYK
-    port: 20260
+    port: 6379
+
   #rabbitmq 配置
   rabbitmq:
     host: 121.36.69.172
@@ -191,6 +196,9 @@ mybatis-plus:
       id-type: ASSIGN_ID
       # 默认数据库表下划线命名
       table-underline: true
+      logic-delete-field: del_flag  #全局逻辑删除字段值 3.3.0开始支持
+      logic-delete-value: 1 # 逻辑已删除值(默认为 1)
+      logic-not-delete-value: 0 # 逻辑未删除值(默认为 0)
     #  configuration:
     # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用
     #    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
@@ -200,26 +208,27 @@ mybatis-plus:
 jero:
   # 签名密钥串(前后端要一致，正式发布请自行修改)
   signatureSecret: dd05f1c54d63749eda95f9fa6d49v442a
-  # 本地：local\Minio：minio\阿里云：alioss
+  # 本地：local\Minio：minio\阿里云：alioss \ 华为云 hwobs
-  uploadType: minio
+  uploadType: hwobs
   backUrl: http://localhost:3000
   backUrlPhone: http://localhost:3000
   #拆分图片展示地址
-  splitUrl: http://srms-test.sinotruk.com/laws-sinotruk/sys/split/file/getImage?fileName=
+  splitUrl: http://localhost:8188/laws-chery/sys/split/file/getImage?fileName=
   #公式转换图片url
-  mathToImgUrl: http://mathtoimg-gk8cg.yf-grp:8080/mathToImg
+  mathToImgUrl: http://localhost:9998/mathToImg
   path:
     #文件上传根目录 设置
-    upload: /app/opt/upFiles
+    upload: //opt//upFiles
+    img: /upFiles/
     #webapp文件路径
-    webapp: /app/opt/webapp
+    webapp: //opt//webapp
     uploadCos: 1
     #导出pdf临时文件路径 设置
-    exportPdfTempPath: D://opt//exportTemp/
+    exportPdfTempPath: //opt//exportTemp/
     #导出excel临时文件路径 设置
-    exportExcelTempPath: D://opt//exportExcelTemp
+    exportExcelTempPath: //opt//exportExcelTemp
     #仿宋体字体文件路径 设置
-    simfangFontFilePath: D://opt//simfangFontFilePath//simfang.ttf
+    simfangFontFilePath: //opt//simfangFontFilePath//simfang.ttf
   shiro:
     excludeUrls: /test/jeroDemo/demo3,/test/jeroDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**
   #阿里云oss存储配置
@@ -229,12 +238,18 @@ jero:
     secretKey: ??
     bucketName: jeroos
     staticDomain: jerodev
+  #华为云obs存储配置
+  obs:
+    endPoint: https://obsv3.wh-yd-01.mychery.com
+    accessKey: 1NENLYHKWGCHNTKCBTWJ
+    secretKey: wnLuaLGfyIw2HQGCNGepyA3Oob0TwUhIN15Vodlu
+    bucketName: obs-ccos-dev
   # ElasticSearch 6设置
   elasticsearch:
-    username: grp
+    username:
-    password: Grp2023.08
+    password:
     cluster-name: jero-ES
-    cluster-nodes: 10.186.43.11:9200
+    cluster-nodes: 10.2.16.11:9200
     check-enabled: false
   # 表单设计器配置
   desform:
@@ -246,10 +261,10 @@ jero:
   file-view-domain: 127.0.0.1:8012
   # minio文件上传
   minio:
-    minio_url: http://grp-minio.yf-grp:9000
+    minio_url:
-    minio_name: root
+    minio_name:
-    minio_pass: bpm@2023
+    minio_pass:
-    bucketName: laws-sinotruk
+    bucketName:
   #大屏报表参数设置
   jmreport:
     mode: dev
@@ -290,13 +305,12 @@ jero:
   # 文件限制后缀黑名单
   fileSuffixLimits : 0x00,%00,\\00,.jsp,.exe,.php,.asp,.aspx,.jspx,.xml,.html,.js,.sh,.bin,$DATA
   # 跨站白名单
-  whiteUrls: localhost:3000,localhost:8080,localhost:62345,srms-test.sinotruk.com,10.10.121.21,10.50.50.69,10.10.121.5,10.100.108.2,222.175.158.140:8120
+  whiteUrls: localhost:62345,localhost:8188,localhost:3344,localhost:3435,localhost:3408,10.2.16.10:8188,10.2.16.10:3344
-  # xss白名单
   xssExcludedPages: /login,/updatePassword
   # cors白名单
   notFilter:
   # origin地址
-  originIp: http://localhost:3000,http://localhost:62345,http://srms-test.sinotruk.com,http://222.175.158.140:8120
+  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
   # 加密默认值
   password:
     pbe:
@@ -313,13 +327,11 @@ logging:
   level:
     com.jero.modules.system.mapper : info
 #swagger
-swagger:
-  enabled: false
 knife4j:
   #开启增强配置
   enable: true
   #开启生产环境屏蔽，为true，则knife4j无法访问
-  production: true
+  production: false
   basic:
     enable: false
     username: jero
@@ -352,17 +364,17 @@ justauth:
 
 file:
   # 在线编辑文件下载映射地址
-  downloadUrl: http://localhost:8184/laws-sinotruk/file/
+  downloadUrl: http://localhost:8188/laws-chery/file/
   split:
-    path: /opt/onlyoffice/file/splitImage/
+    path: //opt//onlyOffice//file//splitImage//
   # 在线编辑空白docx地址
-  sourceFilePath: /app/onlyoffice/DOCX.docx
+  sourceFilePath: //opt//onlyOffice//DOCX.docx
   # 在线编辑本地存储地址
-  path: /app/onlyoffice/file/
+  path: /opt/onlyOffice/file/
 
 iam:
-  bimRemoteUser: srmsIam
+  bimRemoteUser: cgrsmsIam
-  bimRemotePwd: srmsIam2023
+  bimRemotePwd: cgrsmsIam2024
   #  bimRemoteUser: bbcadmin
   #  bimRemotePwd: P@ssw0rd
   bpmcAppkey: test
@@ -371,26 +383,26 @@ iam:
 
 # Hiwork集成
 hiwork:
-  ip: http://task-test.sinotruk.com/
+  ip: https://newoatest.mychery.com:8088/
   # 异构系统标识
-  sysCode: SRMS
+  sysCode: CGRSM
   # 服务号
-  serviceCode: SRMSSERVICE
+  serviceCode: SRMSService
   # 统一待办集成
-  todoUrl: taskapi/task.mq/v2/integrationCall/workflowIntegration
+  todoUrl: rest/ofs/batchReceiveRequestInfoByJson
   # 统一消息集成
-  messageUrl: taskapi/task.mq/v2/notice/noticeCalls/send
+  messageUrl: taskapi/task.basedata/notice/noticeCalls/send
   # 是否发送消息
   isSend: true
   # 是否推送统一待办
   isWorkflow: true
   # 前端调用地址
-  url: https://iam-uat-new.sinotruk.com/idp/oauth2/authorize?&state=123&client_id=SRMS&response_type=code&redirect_uri=
+  url: https://iamuat.mychery.com:5443/idp/oauth2/authorize?state=123&client_id=CGRSM&redirect_uri=
-  fontUrl: http://srms-test.sinotruk.com{url}?projectId={projectId}&taskName={taskName}&taskId={taskId}&processInstanceId={processInstanceId}&nodeId={nodeId}
+  fontUrl: http://10.2.16.10:3344{url}?projectId={projectId}&taskName={taskName}&taskId={taskId}&processInstanceId={processInstanceId}&nodeId={nodeId}
-  fontAppUrl: http://222.175.158.140:8120/mobile{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}
   #hiwork单点登录
-  appkey: dingxtdcqk6daoay4ran
+  appkey: dingshfclphtivrd0r7k
-  appsecret: DcNB4Ho9k40aPIu_TXBWYC8jlw8GMRhmnAtV9fN-MqswrG5gVa9wYED8f0Q4Stuf
+  appsecret: dqhom_17n6BC8pmLeaf5wNp4aV_4XSt_aYn-dNBo8z__-79NjVvZhDJ_M2REdxRc
   #hiwork消息跳转前缀
   hiworkUrlPrefix: "http://srms-test.sinotruk.com"
 
@@ -406,28 +418,29 @@ asms:
 
 # 单点登录配置(所有配置信息需要协调注册，现在都为假)
 oauth:
-  # 客户端应用注册ID--客户申请的：SRMS
+  # 客户端应用注册ID--客户申请的：CGRSM
-  clientId: SRMS
+  clientId: CGRSM
   # 客户端应用注册密钥  客户申请的：58a1001438de462193bec307826463c2
-  clientSecret: 58a1001438de462193bec307826463c2
+  clientSecret: a0792bc797794ff89e5628498cce0912
   # 授权码验证
   grantType: authorization_code
-  # 通过授权码获取accessToken请求地址 https://iam-uat.sinotruk.com:7011 --> https://iam-uat-new.sinotruk.com
+  # 通过授权码获取accessToken请求地址
-  accessTokenUrl: https://iam-uat-new.sinotruk.com/idp/oauth2/getToken
+  accessTokenUrl: https://iamuat.mychery.com:5443/idp/oauth2/getToken
-  # 通过accessToken获取账号信息请求地址 https://iam-uat.sinotruk.com:7011 --> https://iam-uat-new.sinotruk.com
+  # 通过accessToken获取账号信息请求地址
-  userInfoUrl: https://iam-uat-new.sinotruk.com/idp/oauth2/getUserInfo
+  userInfoUrl: https://iamuat.mychery.com:5443/idp/oauth2/getUserInfo
   # 防止跨站请求伪造（CSRF）标识（暂时不用）
   state: zhongQi
 
 oa:
-  url: http://oatest.sinotruk.com:8080
+  url: http://oa
   getAccessTokenUrl: ${oa.url}/getAccessToken
   getTicketInfoUrl: ${oa.url}/getTicketInfo
-  appId: SRMS
+  appId: CGRSM
   appSecret: 196b2e1f-127f-47d5-8e33-746fb8ad0387
 
 # 起草部门部门名称
 draftDepartName: 起草部门
+
 # 管理员权限roleCode,多填用英文逗号拼接
 adminRoleCode: admin,BZGLY
 
@@ -436,11 +449,11 @@ enterpriseDetailRoleCode: JTGLBZCXJS
 
 # 文件下载加解密
 download:
-  enable: true
+  enable: false
   # 文件下载、预览拦截路径，多个以逗号分隔
-  download_url: /sys/common/download/,/laws/standard/common/downloadWithWaterMark
+  download_url: /sys/common/download/
-  view_url: /sys/common/view/,/onlyOffice/downLoadFile
+  view_url: /sys/common/view/
-  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
+  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
@@ -476,19 +489,19 @@ watermark:
     a: 1
   # 页边距
   margin:
-    top: 0
+    top: 100
-    left: 0
+    left: 60
 
 # srms 接口对接
 srms:
   # pdf预览 前端url http://ip:port 替换前端地址
-  font_url_pdf: http://srms-test.sinotruk.com/pdfjs/web/viewer.html?file={back_url_pdf}&.pdf
+  font_url_pdf: http://localhost:3344/pdfjs/web/viewer.html?file={back_url_pdf}&.pdf
   # pdf预览 后端url
-  back_url_pdf: /laws-sinotruk/sys/common/view/{id}?type=view&at={token}
+  back_url_pdf: /laws-chery/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://127.0.0.1:8012/onlinePreview?url={back_url_other}&watermarkTxt={mark}&watermarkSign={mark_md5}
   # 其他文件预览 后端url 替换后端地址
-  back_url_other: http://srms-test.sinotruk.com/${srms.back_url_pdf}&fullfilename={file_name}
+  back_url_other: http://localhost:8188/${srms.back_url_pdf}&fullfilename={file_name}
   # 其他文件水印标识
   other_md5_mark: cnhtc
   # E彩通标识
@@ -507,14 +520,15 @@ standardProperty:
 
 #onlyoffice保存时回调url替换
 onlyoffice:
-  replaceUrl: srms-test.sinotruk.com,srmstest-onlyoffice.sinotruk.com
+  replaceUrl: srms.sinotruk.com,srms-onlyoffice.sinotruk.com
-  toUrl: onlyoffice-sa2of.yf-grp:8080
+  toUrl: http://10.2.16.11:8103
   transferPDfUrl: /7.5.1-23/ConvertService.ashx
+#  toUrl: onlyoffice-j3qlv.yf-grp:8080
 
 #bindPart 绑定零部件相关
 bindPart:
   #PDM IP地址
-  pdm_Ip: http://cnhtcesbqas.cnhtcerp.com:50000/
+  pdm_Ip: http://cnhtcesbdev.cnhtcerp.com:50000/
   #验证零部件号是否可修改url
   edit_valid_url: RESTAdapter/PSRMS/PO1000495/VerifyModifiable
   #校验某个零部件是否所属于某个零部件分类
@@ -523,3 +537,70 @@ bindPart:
   auth_username: CNHTC_PO_PSRMS
   #Authorization
   auth_password: Cnhtcpsrms2024
+
+# 云端OCR识别集成配置参数
+OCR:
+  #OCR请求识别URL地址
+  handleFileUrl: http://61.136.1.103:8091/WebService.asmx/FileConversion
+  # OCR回调接口地址 配置客户本地的IP及端口号
+  callBackUrl: https://srms.foton.com.cn/laws/ocr/OCRRestful/OcrHandleResult
+  userId: dayuzhou1234
+  authCode: 123456
+  publicKey: EC4KKA6ZDTCPAOCRBC5M
+  # OCR文件存储路径
+  ocrPath: /data/slrs/ocrResultFile/
+  # OCR文件请求下载或在线预览时URL
+  ocrDownPath: /data/slrs/ocrResultFile/
+  times: 20
+  convertType: BOTH
+
+# 系统内置角色
+sys_role:
+  # 法规管理员
+  laws_admin: regulationAdmin
+  # 超级管理员
+  super_admin: superAdmin
+  # 其他管理员
+  other_admin: KFGLY,admin
+
+# 飞书对接:
+feishu:
+  # 是否推送飞书
+  isSendStatus: true
+  # 重定向到前端的地址前缀
+  redirect_prefix: http://10.2.16.10:3344/transferRedirectPage?finalRedirectPage=
+  # app的id
+  app_id : cli_a62184527ef5100c
+  # app秘钥
+  app_secret: xs3La3uovscP1USBfJqKQepWF0H3Xsgv
+  # 审批定义的流程管理员的user_id:
+  managersIds: aacb77d4
+  # 基础地址:
+  base_url: https://open.feishu.cn/open-apis
+  # 获取token的地址
+  get_token: ${feishu.base_url}/auth/v3/tenant_access_token/internal
+  # 获取用户id
+  get_user_id: ${feishu.base_url}/contact/v3/users/batch_get_id
+  # 创建三方审批定义
+  create_approval_definition: ${feishu.base_url}/approval/v4/external_approvals
+  # 查看指定三方审批定义
+  get_approval_definition: ${feishu.base_url}/approval/v4/external_approvals
+  # 同步三方审批实例
+  synchronize_approval_instance: ${feishu.base_url}/approval/v4/external_instances
+  # 使用Bot发送消息
+  bot_send_message: ${feishu.base_url}/im/v1/messages
+  # 飞书根据预登录code获取用户信息
+  get_userinfo_by_code: ${feishu.base_url}/authen/v1/access_token
+  # 飞书发送审批 Bot消息
+  bot_send_approval_message: ${feishu.base_url}/approval/v1/message/send
+  # 飞书更新审批 Bot消息
+  update_send_approval_message: ${feishu.base_url}/approval/v1/message/update
+  # 使用Bot发送卡片消息
+  bot_send_card_message: ${feishu.base_url}/im/v1/messages?receive_id_type=user_id
+  # 飞书单点登录地址
+  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}
+  # 飞书PC端发起流程地址
+  review_pc_link: ${feishu.redirect_prefix}{url}?projectId={projectId}&taskName={taskName}&taskId={taskId}&processInstanceId={processInstanceId}&nodeId={nodeId}
+