From e8a677f615bdbe701662840cead2c8746e96f54f Mon Sep 17 00:00:00 2001
From: haozq <1611483981@qq.com>
Date: Mon, 8 Sep 2025 12:40:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6=E9=A2=84?=
 =?UTF-8?q?=E8=A7=88=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/bonus/file/config/MinioConfig.java    |  5 +++++
 .../file/service/impl/FileUtilsServiceImpl.java    | 14 +++++++++-----
 .../java/com/bonus/urk/handle/DeviceHandle.java    |  3 +++
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/bonus-modules/bonus-file/src/main/java/com/bonus/file/config/MinioConfig.java b/bonus-modules/bonus-file/src/main/java/com/bonus/file/config/MinioConfig.java
index 0c80e92..8c1850e 100644
--- a/bonus-modules/bonus-file/src/main/java/com/bonus/file/config/MinioConfig.java
+++ b/bonus-modules/bonus-file/src/main/java/com/bonus/file/config/MinioConfig.java
@@ -18,6 +18,11 @@ import io.minio.MinioClient;
 @Data
 public class MinioConfig
 {
+
+    /**
+     * 服务地址
+     */
+    private String url;
     /**
      * 服务地址
      */
diff --git a/bonus-modules/bonus-file/src/main/java/com/bonus/file/service/impl/FileUtilsServiceImpl.java b/bonus-modules/bonus-file/src/main/java/com/bonus/file/service/impl/FileUtilsServiceImpl.java
index 9e191db..7fb4a73 100644
--- a/bonus-modules/bonus-file/src/main/java/com/bonus/file/service/impl/FileUtilsServiceImpl.java
+++ b/bonus-modules/bonus-file/src/main/java/com/bonus/file/service/impl/FileUtilsServiceImpl.java
@@ -74,7 +74,7 @@ public class FileUtilsServiceImpl {
         vo.setBucketName(bucketName);
         String path="/"+bucketName+"/"+filePath;
         vo.setPath(path);
-        vo.setUrl(minioConfig.getEndpoint());
+        vo.setUrl(minioConfig.getUrl());
         int num=mapper.insertUploadFile(vo);
         if(num>0){
             return  vo;
@@ -126,7 +126,7 @@ public class FileUtilsServiceImpl {
             vo.setBucketName(bucketName);
             String path="/"+bucketName+"/"+filePath;
             vo.setPath(path);
-            vo.setUrl(minioConfig.getEndpoint());
+            vo.setUrl(minioConfig.getUrl());
           int num=mapper.insertUploadFile(vo);
           if(num>0){
               return  vo;
@@ -176,7 +176,7 @@ public class FileUtilsServiceImpl {
             vo.setBucketName(bucketName);
             String path="/"+bucketName+"/"+filePath;
             vo.setPath(path);
-            vo.setUrl(minioConfig.getEndpoint());
+            vo.setUrl(minioConfig.getUrl());
             list.add(vo);
         }
         int num=mapper.insertUploadFileList(list);
@@ -232,7 +232,7 @@ public class FileUtilsServiceImpl {
             vo.setBucketName(bucketName);
             String path="/"+bucketName+"/"+filePath;
             vo.setPath(path);
-            vo.setUrl(minioConfig.getEndpoint());
+            vo.setUrl(minioConfig.getUrl());
             list.add(vo);
         }
         int num=mapper.insertUploadFileList(list);
@@ -255,11 +255,15 @@ public class FileUtilsServiceImpl {
         List<UploadFileVo> list=mapper.getFileList(id,sourceId,sourceTable,sourceType);
         for (UploadFileVo vo:list){
             String url=minioUtils.getFileUrl(vo.getBucketName(),vo.getFilePath(),60*60*12);
-            vo.setLsUrl(url);
+            String  lsUrl=url.replace(minioConfig.getEndpoint(),minioConfig.getUrl());
+            vo.setUrl(minioConfig.getUrl()+vo.getPath());
+            vo.setLsUrl(lsUrl);
         }
          return  list;
     }
 
+
+
     /**
      * 文件批量删除
      * @param id
diff --git a/bonus-modules/bonus-urk/src/main/java/com/bonus/urk/handle/DeviceHandle.java b/bonus-modules/bonus-urk/src/main/java/com/bonus/urk/handle/DeviceHandle.java
index ed228f3..83aaaba 100644
--- a/bonus-modules/bonus-urk/src/main/java/com/bonus/urk/handle/DeviceHandle.java
+++ b/bonus-modules/bonus-urk/src/main/java/com/bonus/urk/handle/DeviceHandle.java
@@ -26,10 +26,13 @@ public class DeviceHandle {
     public DeviceVo  handel(HttpServletRequest req, HttpServletResponse resp){
         // 任务号
         String transId = req.getHeader(Constant.DEVICE_HEADER_TRANS_ID);
+        System.err.println("transId===>"+transId);
         //设备id
         String devId = req.getHeader(Constant.DEVICE_HEADER_DEV_ID);
+        System.err.println("devId===>"+devId);
         //设备型号
         String devModel = req.getHeader(Constant.DEVICE_HEADER_DEV_MODEL);
+        System.err.println("devModel===>"+devModel);
         if(StringUtils.isEmpty(devId)) {
             log.error("请求头不含设备编号，不能处理数据");
             return null;