From aa95092cda8e69169bd690f4e45b13e56e73257e Mon Sep 17 00:00:00 2001
From: haotian <2421912570@qq.com>
Date: Thu, 20 Mar 2025 15:33:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9--=E4=BF=AE=E6=94=B9=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E4=B8=8A=E4=BC=A0=E7=9A=84=E5=91=BD=E5=90=8D=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-admin/src/main/resources/application.yml      |  4 +++-
 .../java/com/ruoyi/common/config/RuoYiConfig.java   | 11 +++++++++++
 .../ruoyi/common/utils/file/FileUploadUtils.java    | 13 +++++++++----
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index c888c7f6..06517556 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -11,11 +11,13 @@ ruoyi:
   # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
   profile: D:/ruoyi/uploadPath
 
-  # 保存身份证文件地址
+   # 保存身份证文件地址
   idCardPath: D:/ruoyi/IdCard
 
   domain: http://10.0.0.17:8081
 
+#  domain: http://82.156.153.112:8081
+
 
 
 #  idCardPath: /home/IdCard
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java b/ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java
index e9787a35..382f10d1 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java
@@ -36,6 +36,17 @@ public class RuoYiConfig
     /** 身份证图片保存路径*/
     private static String idCardPath;
 
+    /** 服务器ip+端口*/
+    private static String domain;
+
+    public static String getDomain() {
+		return domain;
+	}
+
+    public  void setDomain(String domain) {
+		RuoYiConfig.domain = domain;
+	}
+
     public  static String getIdCardPath() {
 		return idCardPath;
 	}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
index baf04fd2..2475c214 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
@@ -142,12 +142,13 @@ public class FileUploadUtils
 
         String[] stringList = fileName.split("\\.");
         fileName = stringList[0] + "_"+ userId + "_" + uuid + "_" + timestampString + "." + stringList[1];
-//        System.out.println("fileName = " + fileName);
-
 
         String absPath = getAbsoluteFile(baseDir, fileName).getAbsolutePath();
 
+//        System.out.println("absPath"+absPath);
+
         file.transferTo(Paths.get(absPath));
+
         return getPathFileName(baseDir, fileName);
     }
 
@@ -179,12 +180,16 @@ public class FileUploadUtils
         int dirLastIndex = RuoYiConfig.getProfile().length() + 1;
         String currentDir = StringUtils.substring(uploadDir, dirLastIndex);
 
+        String domain = RuoYiConfig.getDomain();
+        System.out.println("domain"+domain+Constants.RESOURCE_PREFIX  + "/" + fileName);
+        System.out.println("domain"+domain+Constants.RESOURCE_PREFIX + "/" + currentDir + "/" + fileName);
+
         // currentDir若是为空，就会有 // 两根斜杠
         if (StringUtils.isNotBlank(currentDir))
         {
-            return Constants.RESOURCE_PREFIX + "/" + currentDir + "/" + fileName;
+            return domain+Constants.RESOURCE_PREFIX + "/" + currentDir + "/" + fileName;
         }
-        return Constants.RESOURCE_PREFIX  + "/" + fileName;
+        return domain+Constants.RESOURCE_PREFIX  + "/" + fileName;
     }
 
     /**