From 224f4504d9ed06280eb30647b7288aec185db494 Mon Sep 17 00:00:00 2001
From: Charles7c <charles7c@126.com>
Date: Mon, 1 Jan 2024 00:17:16 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=9D=99=E6=80=81?=
 =?UTF-8?q?=E8=B5=84=E6=BA=90=E6=98=A0=E5=B0=84=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../continew/admin/system/service/impl/FileServiceImpl.java  | 5 +++--
 .../admin/system/service/impl/StorageServiceImpl.java        | 1 -
 .../resources/db/changelog/v2.2.0/continew-admin_data.sql    | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/FileServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/FileServiceImpl.java
index 3f09dd99..80f2ad1a 100644
--- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/FileServiceImpl.java
+++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/FileServiceImpl.java
@@ -42,6 +42,7 @@ import top.charles7c.continew.admin.system.model.resp.FileResp;
 import top.charles7c.continew.admin.system.model.resp.StorageDetailResp;
 import top.charles7c.continew.admin.system.service.FileService;
 import top.charles7c.continew.admin.system.service.StorageService;
+import top.charles7c.continew.starter.core.constant.StringConstants;
 import top.charles7c.continew.starter.core.util.URLUtils;
 import top.charles7c.continew.starter.core.util.validate.CheckUtils;
 import top.charles7c.continew.starter.extension.crud.base.BaseServiceImpl;
@@ -106,7 +107,7 @@ public class FileServiceImpl extends BaseServiceImpl<FileMapper, FileDO, FileRes
         // 处理本地存储文件 URL
         FileInfo fileInfo = uploadPretreatment.upload();
         fileInfo.setUrl(StorageTypeEnum.LOCAL.equals(storage.getType())
-            ? URLUtil.normalize(storage.getDomain() + fileInfo.getUrl()) : fileInfo.getUrl());
+            ? URLUtil.normalize(storage.getDomain() + StringConstants.SLASH + fileInfo.getUrl()) : fileInfo.getUrl());
         return fileInfo;
     }
 
@@ -119,7 +120,7 @@ public class FileServiceImpl extends BaseServiceImpl<FileMapper, FileDO, FileRes
     protected void fill(Object baseObj) {
         if (baseObj instanceof FileResp fileResp && !URLUtils.isHttpUrl(fileResp.getUrl())) {
             StorageDetailResp storage = storageService.get(fileResp.getStorageId());
-            fileResp.setUrl(URLUtil.normalize(storage.getDomain() + fileResp.getUrl()));
+            fileResp.setUrl(URLUtil.normalize(storage.getDomain() + StringConstants.SLASH + fileResp.getUrl()));
         }
         super.fill(baseObj);
     }
diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/StorageServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/StorageServiceImpl.java
index 794eae24..47b069e1 100644
--- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/StorageServiceImpl.java
+++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/StorageServiceImpl.java
@@ -138,7 +138,6 @@ public class StorageServiceImpl
                 ValidationUtils.throwIfBlank(bucketName, "存储路径不能为空");
                 ValidationUtils.throwIfBlank(domain, "自定义域名不能为空");
                 ValidationUtils.throwIf(!URLUtils.isHttpUrl(domain), "自定义域名格式错误");
-                req.setDomain(StrUtil.appendIfMissing(domain, StringConstants.SLASH));
                 req.setBucketName(StrUtil.appendIfMissing(
                     bucketName.replace(StringConstants.BACKSLASH, StringConstants.SLASH), StringConstants.SLASH));
                 FileStorageProperties.LocalPlusConfig config = new FileStorageProperties.LocalPlusConfig();
diff --git a/continew-admin-webapi/src/main/resources/db/changelog/v2.2.0/continew-admin_data.sql b/continew-admin-webapi/src/main/resources/db/changelog/v2.2.0/continew-admin_data.sql
index d49cbaf0..d4159437 100644
--- a/continew-admin-webapi/src/main/resources/db/changelog/v2.2.0/continew-admin_data.sql
+++ b/continew-admin-webapi/src/main/resources/db/changelog/v2.2.0/continew-admin_data.sql
@@ -20,5 +20,5 @@ VALUES
 INSERT IGNORE INTO `sys_storage`
 (`id`, `name`, `code`, `type`, `access_key`, `secret_key`, `endpoint`, `bucket_name`, `domain`, `description`, `is_default`, `sort`, `status`, `create_user`, `create_time`, `update_user`, `update_time`)
 VALUES
-(1, '开发环境', 'local_dev', 2, NULL, NULL, NULL, 'C:/continew-admin/data/file/', 'http://localhost:8000/file/', '本地存储', b'1', 1, 1, 1, NOW(), NULL, NULL),
-(2, '生产环境', 'local_prod', 2, NULL, NULL, NULL, '../data/file/', 'http://api.charles7c.top/file/', '本地存储', b'0', 2, 2, 1, NOW(), NULL, NULL);
\ No newline at end of file
+(1, '开发环境', 'local_dev', 2, NULL, NULL, NULL, 'C:/continew-admin/data/file/', 'http://localhost:8000/file', '本地存储', b'1', 1, 1, 1, NOW(), NULL, NULL),
+(2, '生产环境', 'local_prod', 2, NULL, NULL, NULL, '../data/file/', 'http://api.charles7c.top/file', '本地存储', b'0', 2, 2, 1, NOW(), NULL, NULL);
\ No newline at end of file