From 08aa08550589876a821a37d56a5fae8867292978 Mon Sep 17 00:00:00 2001
From: kils <yjskils@gmail.com>
Date: Wed, 22 May 2024 16:24:19 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E6=8C=89=E6=97=A5=E6=9C=9F=E6=8B=86=E5=88=86=E7=9B=AE=E5=BD=95?=
 =?UTF-8?q?=20&=20=E4=BA=8B=E5=8A=A1=E6=A3=80=E6=9F=A5=20(#68)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../continew/admin/auth/service/impl/LoginServiceImpl.java | 2 ++
 .../admin/system/service/impl/FileServiceImpl.java         | 7 ++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/continew-admin-system/src/main/java/top/continew/admin/auth/service/impl/LoginServiceImpl.java b/continew-admin-system/src/main/java/top/continew/admin/auth/service/impl/LoginServiceImpl.java
index 220a6ac9..3d4fa592 100644
--- a/continew-admin-system/src/main/java/top/continew/admin/auth/service/impl/LoginServiceImpl.java
+++ b/continew-admin-system/src/main/java/top/continew/admin/auth/service/impl/LoginServiceImpl.java
@@ -28,6 +28,7 @@ import lombok.RequiredArgsConstructor;
 import me.zhyd.oauth.model.AuthUser;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import top.continew.admin.auth.model.resp.RouteResp;
 import top.continew.admin.auth.service.LoginService;
 import top.continew.admin.auth.service.PermissionService;
@@ -108,6 +109,7 @@ public class LoginServiceImpl implements LoginService {
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public String socialLogin(AuthUser authUser) {
         String source = authUser.getSource();
         String openId = authUser.getUuid();
diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/FileServiceImpl.java b/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/FileServiceImpl.java
index 9122c11f..c7798266 100644
--- a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/FileServiceImpl.java
+++ b/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/FileServiceImpl.java
@@ -47,6 +47,7 @@ import top.continew.starter.core.util.URLUtils;
 import top.continew.starter.core.util.validate.CheckUtils;
 import top.continew.starter.extension.crud.service.impl.BaseServiceImpl;
 
+import java.time.LocalDate;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -89,9 +90,13 @@ public class FileServiceImpl extends BaseServiceImpl<FileMapper, FileDO, FileRes
             storage = storageService.getByCode(storageCode);
             CheckUtils.throwIfNotExists(storage, "StorageDO", "Code", storageCode);
         }
+        LocalDate today = LocalDate.now();
+        String path = today.getYear() + StringConstants.SLASH + today.getMonthValue() + StringConstants.SLASH + today
+            .getDayOfMonth() + StringConstants.SLASH;
         UploadPretreatment uploadPretreatment = fileStorageService.of(file)
             .setPlatform(storage.getCode())
-            .putAttr(ClassUtil.getClassName(StorageDO.class, false), storage);
+            .putAttr(ClassUtil.getClassName(StorageDO.class, false), storage)
+            .setPath(path);
         // 图片文件生成缩略图
         if (FileTypeEnum.IMAGE.getExtensions().contains(FileNameUtil.extName(file.getOriginalFilename()))) {
             uploadPretreatment.thumbnail(img -> img.size(100, 100));