fix：修复流程文件导出 bug，导出文件名称乱码

zkqy-admin/src/main/resources/application.yml

@@ -9,13 +9,13 @@ zkqy:
   # 实例演示开关
   demoEnabled: true
   # 文件路径 示例（ Windows配置D:/zkqy/uploadPath，Linux配置 /home/zkqy/uploadPath）
-  profile: D:/ruoyi/uploadPath
+  profile: C:/log
   # 获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数组计算 char 字符验证
   captchaType: math
   # 流程文件存储地址
-  bpmnPath: D:/ruoyi/uploadPath
+  bpmnPath: C:/log/bpm
 
 
 # 开发环境配置
@@ -79,11 +79,6 @@ spring:
     restart:
       # 热部署开关
       enabled: true
-
-
-
-
-
   # redis 配置
   redis:
     # 地址
@@ -91,7 +86,7 @@ spring:
     # 端口，默认为6379
     port: 6379
     # 数据库索引
-    database: 0
+    database: 5
     # 密码
     password:
     # 连接超时时间
@@ -114,7 +109,7 @@ token:
   # 令牌密钥
   secret: abcdefghijklmnopqrstuvwxyz
   # 令牌有效期（默认30分钟）
-  expireTime: 30
+  expireTime: 300
 
 # MyBatis配置
 mybatis:
@@ -153,28 +148,28 @@ xss:
 parameter:
   ip:
     # 用户下对应的所有角色key
-    MAIN_ROLESKEY_IP: http://localhost:8080/system/user/roleKeyByUserId
+    MAIN_ROLESKEY_IP: http://192.168.110.59:8080/system/user/roleKeyByUserId
     # CRM项目根据scriptKey获取节点脚本详情地址
-    GET_NODESCRIPT_IP: http://localhost:8080/system/script/selectSysBpmNodeScriptByScriptKey/{scriptKey}
+    GET_NODESCRIPT_IP: http://192.168.110.59:8080/system/script/selectSysBpmNodeScriptByScriptKey/{scriptKey}
     # crm项目查看角色下是否存在真实用户
-    QUERY_USER_EXISTS_BY_ROLEKEY_IP: http://localhost:8080/system/role/selectUserByRoleKey/{roleKeys}
+    QUERY_USER_EXISTS_BY_ROLEKEY_IP: http://192.168.110.59:8080/system/role/selectUserByRoleKey/{roleKeys}
     # crm项目查看一组用户是否存在真实用户
-    QUERY_USER_EXISTS_BY_USERIDS_IP: http://localhost:8080/system/user/selectUserByUserIds/{userIds}
+    QUERY_USER_EXISTS_BY_USERIDS_IP: http://192.168.110.59:8080/system/user/selectUserByUserIds/{userIds}
     # form项目共通修改接口
-    FORM_COMMON_UPDATE_IP: http://localhost:8088/dragform/common/batchEdit
+    FORM_COMMON_UPDATE_IP: http://192.168.110.59:8088/dragform/common/batchEdit
     #from项目共通获取详情接口
-    FORM_COMMON_GETINFO_IP: http://localhost:8088/dragform/common/getInfo
+    FORM_COMMON_GETINFO_IP: http://192.168.110.59:8088/dragform/common/getInfo
     # form项目共通新增接口
-    FORM_COMMON_BATCHINSERT_IP: http://localhost:8088/dragform/common/batchInsert
+    FORM_COMMON_BATCHINSERT_IP: http://192.168.110.59:8088/dragform/common/batchInsert
     # CRM项目根据scriptKeys获取节点脚本详情地址
-    GET_NODESCRIPTS_IP: http://localhost:8080/system/script/selectSysBpmNodeScriptByScriptKeys
+    GET_NODESCRIPTS_IP: http://192.168.110.59:8080/system/script/selectSysBpmNodeScriptByScriptKeys
     # 租户字典：根据字典类型得到当前字典下的所有的数据
-    GET_TENANT_DICT_IP: http://localhost:8088/system/dict/data/list
+    GET_TENANT_DICT_IP: http://192.168.110.59:8088/system/dict/data/list
     # form项目共通新增接口
-    FORM_COMMON_INSERT_IP: http://localhost:8088/dragform/common/batchInsert
+    FORM_COMMON_INSERT_IP: http://192.168.110.59:8088/dragform/common/batchInsert
     # form项目根据表单Fid查询详情接口
-    FORM_GET_FORM_INFO_IP: http://localhost:8088/dragform/form/{fId}
+    FORM_GET_FORM_INFO_IP: http://192.168.110.59:8088/dragform/form/{fId}
     # from项目根据groupKey查询表格组信息
-    FORM_GET_GROUP_INFO_IP: http://localhost:8088/system/group/getInfoBySqlKey/{groupKey}
+    FORM_GET_GROUP_INFO_IP: http://192.168.110.59:8088/system/group/getInfoBySqlKey/{groupKey}
     # CRM项目获取所有模板库数据表
-    CRM_QUERY_TEMPLATEBASE_TABLE: http://localhost:8080/system/templateBase/queryTemplateBaseTable
+    CRM_QUERY_TEMPLATEBASE_TABLE: http://192.168.110.59:8080/system/templateBase/queryTemplateBaseTable

zkqy-admin/src/main/resources/logback.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
     <!-- 日志存放路径 -->
-	<property name="log.path" value="/Users/zrwj/Desktop/ZKQY_LJJ/log" />
+	<property name="log.path" value="C:/log" />
     <!-- 日志输出格式 -->
 	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
 

zkqy-system/src/main/java/com/zkqy/system/service/impl/BpmProcessServiceImpl.java

@@ -84,10 +84,7 @@ public class BpmProcessServiceImpl implements IBpmProcessService {
             try {
                 // 解析得到当前文件中的内容
                 byte[] bytes = fileXML.getBytes();
-                String xmlContent = new String(bytes, "UTF-8");  // 使用UTF-8编码处理文件内容
-                System.err.println("流程文件内容！！！！！！！！！！！！！！！！！！！！！！！");
-                System.err.println(xmlContent);
-                System.err.println("流程文件内容！！！！！！！！！！！！！！！！！！！！！！！");
+                String xmlContent = new String(bytes, StandardCharsets.UTF_8);  // 使用UTF-8编码处理文件内容
                 // 存储标签内容
                 bpmProcess.setProcessXmlContent(xmlContent);
                 // 指定文件路径上传
@@ -103,7 +100,8 @@ public class BpmProcessServiceImpl implements IBpmProcessService {
         bpmProcess.setProcessVersion(0L);
         bpmProcess.setProcessType(0L);
         bpmProcess.setStartEventType(0L);
-        return bpmProcessMapper.insertBpmProcess(bpmProcess);    }
+        return bpmProcessMapper.insertBpmProcess(bpmProcess);
+    }
 
     /**
      * 修改流程定义
@@ -120,10 +118,7 @@ public class BpmProcessServiceImpl implements IBpmProcessService {
             try {
                 // 解析得到当前文件中的内容
                 byte[] bytes = fileXML.getBytes();
-                String xmlContent = new String(bytes, "UTF-8");  // 使用UTF-8编码处理文件内容
-                System.err.println("流程文件内容！！！！！！！！！！！！！！！！！！！！！！！");
-                System.err.println(xmlContent);
-                System.err.println("流程文件内容！！！！！！！！！！！！！！！！！！！！！！！");
+                String xmlContent = new String(bytes, StandardCharsets.UTF_8);  // 使用UTF-8编码处理文件内容
                 // 存储标签内容
                 bpmProcess.setProcessXmlContent(xmlContent);
                 // 指定文件路径上传
@@ -200,6 +195,8 @@ public class BpmProcessServiceImpl implements IBpmProcessService {
         bpmProcessList.forEach(item -> {
             list.add(localPath + StringUtils.substringAfter(item.getProcessXmlPath(), Constants.RESOURCE_PREFIX));
         });
+
+
         if (CollectionUtils.isEmpty(list)) {
             throw new Exception("请选择要下载文件/图片");
         }
@@ -225,14 +222,14 @@ public class BpmProcessServiceImpl implements IBpmProcessService {
             log.error("系统异常", e);
         }
 
-        if (list.size() > 1) {
-            //多文件/图压缩下载
-            batchFileDownLoad(list, downloadName, response);
-        } else {
-            //单文件/图直接下载
-            singleFileDownLoad(list, bpmProcessList.get(0).getProcessName(), response);
-
-        }
+//        if (list.size() > 1) {
+        //多文件/图压缩下载
+        batchFileDownLoad(list, downloadName, response);
+//        } else {
+//            //单文件/图直接下载
+//            singleFileDownLoad(list, bpmProcessList.get(0).getProcessName(), response);
+//
+//        }
 
     }
 
@@ -277,8 +274,9 @@ public class BpmProcessServiceImpl implements IBpmProcessService {
                     }
                     FileInputStream fs = null;
                     try {
+                        String[] filename = name.split("/");
                         //添加ZipEntry，并将ZipEntry中写入文件流
-                        zipOs.putNextEntry(new ZipEntry(URLEncoder.encode(name, StandardCharsets.UTF_8.toString()) + ".bpmn"));
+                        zipOs.putNextEntry(new ZipEntry(URLEncoder.encode(filename[filename.length - 1], StandardCharsets.UTF_8.toString())));
                         os = new DataOutputStream(zipOs);
                         fs = new FileInputStream(file);
                         byte[] b = new byte[100];