Merge remote-tracking branch 'origin/master' into secondStage

# Conflicts: # laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java # laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/controller/EsInspectFlowController.java # laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/controller/ProcessEsInspectController.java # laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/entity/ProcessEsInspect.java # laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/mapper/xml/ProcessEsInspectMapper.xml # laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/EsInspectFlowServiceImpl.java # laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/ProcessEsInspectServiceImpl.java # laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/vo/ProcessEsInspectVO.java # laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/EsInspectPlanFlowServiceImpl.java # laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/ProcessEsInspectPlanServiceImpl.java # laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbInfoController.java # laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java # laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardInspectController.java # laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardInspectMapper.xml # laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardInspectServiceImpl.java
2023-11-30 17:46:16 +08:00
parent 8deefed5ab f6958adc1e
commit fc78c3c01f
15 changed files with 520 additions and 39 deletions
@@ -431,3 +431,26 @@ draftDepartName: 起草部门

 # 管理员权限roleCode,多填用英文逗号拼接
 adminRoleCode: admin
+
+# 文件下载加解密
+download:
+  enable: false
+  # 文件下载、预览拦截路径，多个以逗号分隔
+  download_url: /sys/common/download/
+  view_url: /sys/common/view/
+  # 管理员角色
+  admin_role_code: admin,BZGLY
+  # 加密参数
+  encrypt:
+    url: http://10.2.159.90/intekey/encrypteFile
+    app_code: SRMS
+    secret_key: SRMS1234..
+  # 解密参数
+  decrypt:
+    url: http://10.2.159.90/intekey/file
+    app_code: SRMS
+    secret_key: SRMS1234..
+  # 研发域
+  scope_dev: 51
+  # 办公域
+  scope_work: 52