修改中文文档为英文

laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardDetailServiceImpl.java

@@ -373,7 +373,7 @@ public class LawsMarketStandardDetailServiceImpl extends ServiceImpl<LawsMarketS
     @Override
     public void downloadTemplate(HttpServletResponse response) {
         // 模板存放地址
-        ClassPathResource resource = new ClassPathResource("excelTemplate/导入模板-市场法规清单.xls");
+        ClassPathResource resource = new ClassPathResource("excelTemplate/marketStandard.xls");
         try (InputStream inputStream = resource.getInputStream();
              OutputStream outputStream = response.getOutputStream()
         ) {

laws-modules/src/main/java/com/jero/modules/laws/standardmasterplan/servicce/impl/LawsStandardMasterPlanServiceImpl.java

@@ -336,7 +336,7 @@ public class LawsStandardMasterPlanServiceImpl
 
     @Override
     public ModelAndView exportExcel(HttpServletRequest request, LawsStandardMasterPlanVO lawsStandardMasterPlanVO) {
-        String templateUrl = exportExcelTempPath + File.separator + "主计划导出.xlsx";
+        String templateUrl = exportExcelTempPath + File.separator + "mainPlanExport.xlsx";
         TemplateExportParams params = new TemplateExportParams(templateUrl);
         Map<String, Object> map = new HashMap<>();
         List<Map<String, String>> listMap = new ArrayList<>();

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

@@ -145,13 +145,13 @@ spring:
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000;druid.stat.logSlowSql\=true
       datasource:
         master:
-          url: jdbc:p6spy:mysql://10.10.10.44:3306/laws_chery_dev?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
+          url: jdbc:p6spy:mysql://10.10.10.44:3306/laws_chery_dev_rsm_uat?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
           username: root
           password: hzwlsoft.com
           driver-class-name: com.p6spy.engine.spy.P6SpyDriver
   redis:
     database: 12
-    host: middleware.hzwlsoft.com
+    host: localhost
     lettuce:
       pool:
         max-active: 8   #最大连接数据库连接数,设 0 为没有限制
@@ -159,8 +159,8 @@ spring:
         max-wait: -1ms  #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。
         min-idle: 0     #最小等待连接中的数量,设 0 为没有限制
       shutdown-timeout: 100ms
-    password: hzwlsoft.com
-    port: 4780
+    password:
+    port: 6379
 
   #rabbitmq 配置
   rabbitmq:
@@ -254,7 +254,7 @@ jero:
     # 文件、图片上传方式，可选项：qiniu（七牛云）、system（跟随系统配置）
     upload-type: system
   # 在线预览文件服务器地址配置
-  file-view-domain: 127.0.0.1:8012
+  file-view-domain: 127.0.0.10:8012
   # minio文件上传
   minio:
     minio_url:
@@ -395,7 +395,7 @@ hiwork:
   # 是否发送消息
   isSend: true
   # 是否推送统一待办
-  isWorkflow: false
+  isWorkflow: true
   # 前端调用地址
   url: https://iamuat.mychery.com:5443/idp/oauth2/authorize?state=123456&client_id=CGRSM&redirect_uri=
   fontUrl: http://localhost:3344{url}?projectId={projectId}&taskName={taskName}&taskId={taskId}&processInstanceId={processInstanceId}&nodeId={nodeId}
@@ -499,7 +499,7 @@ srms:
   # pdf预览 后端url
   back_url_pdf: /laws-chery/sys/common/view/{id}?type=view&at={token}
   # 其他文件预览  替换kkfileviewurl
-  font_url_other: http://127.0.0.1:8012/onlinePreview?url={back_url_other}&watermarkTxt={mark}&watermarkSign={mark_md5}
+  font_url_other: http://127.0.0.10:8012/onlinePreview?url={back_url_other}&watermarkTxt={mark}&watermarkSign={mark_md5}
   # 其他文件预览 后端url 替换后端地址
   back_url_other: http://localhost:8188/${srms.back_url_pdf}&fullfilename={file_name}
   # 其他文件水印标识
@@ -566,7 +566,7 @@ sys_role:
 # 飞书对接:
 feishu:
   # 是否推送飞书
-  isSendStatus: false
+  isSendStatus: true
   # 重定向到前端的地址前缀
   redirect_prefix: http://localhost:3344/transferRedirectPage?finalRedirectPage=
   # app的id