From 80d7f57e66233b1ef7dc893b7c2276a36fe90912 Mon Sep 17 00:00:00 2001
From: pengjie <17373303529@163.com>
Date: Tue, 21 May 2024 18:51:03 +0800
Subject: [PATCH] =?UTF-8?q?=E9=AA=8C=E6=94=B6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/zhgd/xmgl/async/AsyncAttendance.java   |  3 ++-
 .../basicdata/controller/admin/FileController.java  | 13 +++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/zhgd/xmgl/async/AsyncAttendance.java b/src/main/java/com/zhgd/xmgl/async/AsyncAttendance.java
index 6720ed1..6f4ba08 100644
--- a/src/main/java/com/zhgd/xmgl/async/AsyncAttendance.java
+++ b/src/main/java/com/zhgd/xmgl/async/AsyncAttendance.java
@@ -15,6 +15,7 @@ import com.zhgd.xmgl.modules.wisdom.mapper.AttendanceDevMapper;
 import com.zhgd.xmgl.modules.wisdom.mapper.WorkerInfoMapper;
 import com.zhgd.xmgl.modules.wisdom.service.IAttendanceDevSyncService;
 import com.zhgd.xmgl.util.HttpUtil;
+import com.zhgd.xmgl.util.HttpsUtils;
 import com.zhgd.xmgl.util.ParamEnum;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
@@ -155,7 +156,7 @@ public class AsyncAttendance {
             JSONObject jsonObject = JSONObject.parseObject(JSON.toJSONString(systemUserSyncVo));
             log.info("开始数据同步====" + jsonObject);
             // 推送同步信息
-            String result = HttpUtil.doPost(requestUrl, jsonObject.toString());
+            String result = HttpsUtils.doPost(requestUrl, jsonObject.toString());
             return result;
         }catch (Exception e){
             e.printStackTrace();
diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/FileController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/FileController.java
index 1cb7664..54d78b3 100644
--- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/FileController.java
+++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/FileController.java
@@ -126,6 +126,19 @@ public class FileController {
 //        fileStorageService.download(fileInfo).outputStream(response.getOutputStream());
 //    }
 
+    /**
+     * 下载文件
+     */
+    @OperLog(operModul = "文件管理", operType = "文件下载", operDesc = "文件下载")
+    @ApiOperation(value = "文件下载", notes = "文件下载",  httpMethod="POST")
+    @ApiImplicitParam(name = "fileUrl", value = "文件路径", paramType = "body", dataType = "String")
+    @PostMapping("/download")
+    public void download(@ApiIgnore @RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
+        // 获取文件信息
+        String fileUrl = MapUtils.getString(map, "fileUrl");
+        fileDetailService.download(fileUrl, response);
+    }
+
     /**
      * 获取预览文件流
      */