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; } /**