From 774aa133674b591865b7400ad5f5e098df99b239 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com> Date: Tue, 9 Sep 2025 17:35:53 +0800 Subject: [PATCH] =?UTF-8?q?refactor(file):=20=E7=A7=BB=E9=99=A4=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E4=B8=8A=E4=BC=A0=E8=B7=AF=E5=BE=84=E6=9C=AB=E5=B0=BE?= =?UTF-8?q?=E7=9A=84=E6=96=9C=E6=9D=A0-=20=E4=BF=AE=E6=94=B9=E4=BA=86?= =?UTF-8?q?=E5=A4=9A=E4=B8=AA=E6=96=87=E4=BB=B6=E4=B8=AD=E7=9A=84=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E4=B8=8A=E4=BC=A0=E8=B7=AF=E5=BE=84=EF=BC=8C=E7=A7=BB?= =?UTF-8?q?=E9=99=A4=E4=BA=86=E6=9C=AB=E5=B0=BE=E7=9A=84=E6=96=9C=E6=9D=A0?= =?UTF-8?q?=20-=20=E6=9B=B4=E6=96=B0=E4=BA=86=20MyQrCodeUtil=E3=80=81AliOs?= =?UTF-8?q?sController=E3=80=81FileController=20=E5=92=8C=20WxLoginControl?= =?UTF-8?q?ler=20=E4=B8=AD=E7=9A=84=E7=9B=B8=E5=85=B3=E6=96=B9=E6=B3=95=20?= =?UTF-8?q?-=20=E4=BF=AE=E6=94=B9=E4=BA=86=20application.yml=E3=80=81appli?= =?UTF-8?q?cation-prod.yml=20=E5=92=8C=20application-s209.yml=20=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E9=85=8D=E7=BD=AE=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/gxwebsoft/common/core/utils/MyQrCodeUtil.java | 2 +- .../gxwebsoft/common/system/controller/AliOssController.java | 2 +- .../gxwebsoft/common/system/controller/FileController.java | 4 ++-- .../gxwebsoft/common/system/controller/WxLoginController.java | 2 +- src/main/resources/application-prod.yml | 2 +- src/main/resources/application-s209.yml | 2 +- src/main/resources/application.yml | 4 ++-- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/gxwebsoft/common/core/utils/MyQrCodeUtil.java b/src/main/java/com/gxwebsoft/common/core/utils/MyQrCodeUtil.java index 37df93f..48bdca1 100644 --- a/src/main/java/com/gxwebsoft/common/core/utils/MyQrCodeUtil.java +++ b/src/main/java/com/gxwebsoft/common/core/utils/MyQrCodeUtil.java @@ -59,7 +59,7 @@ public class MyQrCodeUtil { * @return 二维码图片地址 */ public static String createQrCode(String type,Integer id, String content) throws IOException { - String filePath = "/www/wwwroot/file.ws/file/qrcode/".concat(type).concat("/"); + String filePath = "/www/wwwroot/file.ws/qrcode/".concat(type).concat("/"); String qrcodeUrl = "https://file.websoft.top/qrcode/".concat(type).concat("/"); // 将URL转为BufferedImage BufferedImage bufferedImage = ImageIO.read(new URL(logoUrl)); diff --git a/src/main/java/com/gxwebsoft/common/system/controller/AliOssController.java b/src/main/java/com/gxwebsoft/common/system/controller/AliOssController.java index 36b79ab..41f2110 100644 --- a/src/main/java/com/gxwebsoft/common/system/controller/AliOssController.java +++ b/src/main/java/com/gxwebsoft/common/system/controller/AliOssController.java @@ -289,6 +289,6 @@ public class AliOssController extends BaseController { * 文件上传位置(服务器) */ private String getUploadDir() { - return config.getUploadPath() + "file/"; + return config.getUploadPath() + "/"; } } diff --git a/src/main/java/com/gxwebsoft/common/system/controller/FileController.java b/src/main/java/com/gxwebsoft/common/system/controller/FileController.java index 490ec1d..8c856cb 100644 --- a/src/main/java/com/gxwebsoft/common/system/controller/FileController.java +++ b/src/main/java/com/gxwebsoft/common/system/controller/FileController.java @@ -293,14 +293,14 @@ public class FileController extends BaseController { * 文件上传基目录 */ private String getUploadBaseDir() { - return config.getUploadPath() + "file/"; + return config.getUploadPath() + "/"; } /** * 文件上传位置(服务器) */ private String getUploadDir() { - return config.getUploadPath() + "file/"; + return config.getUploadPath() + "/"; } /** diff --git a/src/main/java/com/gxwebsoft/common/system/controller/WxLoginController.java b/src/main/java/com/gxwebsoft/common/system/controller/WxLoginController.java index beb65d8..c79b84a 100644 --- a/src/main/java/com/gxwebsoft/common/system/controller/WxLoginController.java +++ b/src/main/java/com/gxwebsoft/common/system/controller/WxLoginController.java @@ -965,7 +965,7 @@ public class WxLoginController extends BaseController { * 文件上传位置(服务器) */ private String getUploadDir() { - return config.getUploadPath() + "file/"; + return config.getUploadPath() + "/"; } diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index c5518f7..f472de7 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -36,7 +36,7 @@ knife4j: config: # 生产环境接口 server-url: https://server.gxwebsoft.com/api - upload-path: /www/wwwroot/file.ws/ + upload-path: /www/wwwroot/file.ws # 阿里云OSS云存储 endpoint: https://oss-cn-shenzhen.aliyuncs.com diff --git a/src/main/resources/application-s209.yml b/src/main/resources/application-s209.yml index dfb29cb..b550f79 100644 --- a/src/main/resources/application-s209.yml +++ b/src/main/resources/application-s209.yml @@ -36,7 +36,7 @@ knife4j: config: # 生产环境接口 server-url: https://server.gxwebsoft.com/api - upload-path: /www/wwwroot/file.ws/ + upload-path: /www/wwwroot/file.ws # 阿里云OSS云存储 endpoint: https://oss-cn-shenzhen.aliyuncs.com diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index c10f9e9..d85d421 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -95,8 +95,8 @@ config: token-key: WLgNsWJ8rPjRtnjzX/Gx2RGS80Kwnm/ZeLbvIL+NrBs= server-url: https://server.websoft.top/api file-server: https://file.websoft.top - upload-path: /Users/gxwebsoft/Documents/uploads/ - local-upload-path: /Users/gxwebsoft/Documents/uploads/ + upload-path: /Users/gxwebsoft/Documents/uploads + local-upload-path: /Users/gxwebsoft/Documents/uploads # 阿里云OSS云存储 endpoint: https://oss-cn-shenzhen.aliyuncs.com