From 3a04a32fe3f07558728936d280728a7f0c9f2591 Mon Sep 17 00:00:00 2001 From: besscroft Date: Thu, 14 Sep 2023 23:03:42 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E4=B8=80=E4=BA=9B?= =?UTF-8?q?=E9=97=AE=E9=A2=98=20-=20=E5=8D=87=E7=BA=A7=E9=83=A8=E5=88=86?= =?UTF-8?q?=E4=BE=9D=E8=B5=96=E7=89=88=E6=9C=AC=20-=20=E6=B3=A8=E8=A7=A3?= =?UTF-8?q?=E8=B0=83=E6=95=B4=20-=20=E5=93=8D=E5=BA=94=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../diyfile/doc/config/OpenApiConfiguration.java | 2 +- .../com/besscroft/diyfile/controller/SyncController.java | 3 ++- .../com/besscroft/diyfile/controller/UserController.java | 4 ++-- .../diyfile/service/impl/StorageServiceImpl.java | 2 ++ .../diyfile/service/impl/SystemConfigServiceImpl.java | 1 - .../besscroft/diyfile/service/impl/UserServiceImpl.java | 2 +- pom.xml | 8 ++++---- 7 files changed, 12 insertions(+), 10 deletions(-) diff --git a/diyfile-doc/src/main/java/com/besscroft/diyfile/doc/config/OpenApiConfiguration.java b/diyfile-doc/src/main/java/com/besscroft/diyfile/doc/config/OpenApiConfiguration.java index df2dad9..d3a3eb4 100644 --- a/diyfile-doc/src/main/java/com/besscroft/diyfile/doc/config/OpenApiConfiguration.java +++ b/diyfile-doc/src/main/java/com/besscroft/diyfile/doc/config/OpenApiConfiguration.java @@ -20,7 +20,7 @@ public class OpenApiConfiguration { return new OpenAPI() .info(new Info().title("DiyFile") .description("一款好看的在线文件列表程序") - .version("v0.8.1") + .version("v0.8.2") .license(new License().name("MIT license").url("https://github.com/besscroft/diyfile/blob/main/LICENSE"))) .externalDocs(new ExternalDocumentation() .description("DiyFile 文档") diff --git a/diyfile-system/src/main/java/com/besscroft/diyfile/controller/SyncController.java b/diyfile-system/src/main/java/com/besscroft/diyfile/controller/SyncController.java index f07fccd..1a6c162 100644 --- a/diyfile-system/src/main/java/com/besscroft/diyfile/controller/SyncController.java +++ b/diyfile-system/src/main/java/com/besscroft/diyfile/controller/SyncController.java @@ -1,5 +1,6 @@ package com.besscroft.diyfile.controller; +import com.besscroft.diyfile.common.constant.MessageConstants; import com.besscroft.diyfile.common.param.sync.SyncTaskParam; import com.besscroft.diyfile.common.result.CommonResult; import com.besscroft.diyfile.common.util.PathUtils; @@ -34,7 +35,7 @@ public class SyncController { PathUtils.decode(param.getBeforePath()), param.getAfterStorageKey(), PathUtils.decode(param.getAfterPath())); - return CommonResult.success(); + return CommonResult.success(MessageConstants.ADD_SUCCESS); } } diff --git a/diyfile-system/src/main/java/com/besscroft/diyfile/controller/UserController.java b/diyfile-system/src/main/java/com/besscroft/diyfile/controller/UserController.java index 9a688c2..b5837ab 100644 --- a/diyfile-system/src/main/java/com/besscroft/diyfile/controller/UserController.java +++ b/diyfile-system/src/main/java/com/besscroft/diyfile/controller/UserController.java @@ -98,7 +98,7 @@ public class UserController { @PostMapping("/add") public CommonResult add(@RequestBody @Valid UserAddParam param) { userService.addUser(param); - return CommonResult.success(); + return CommonResult.success(MessageConstants.ADD_SUCCESS); } @Operation(summary = "用户更新接口") @@ -106,7 +106,7 @@ public class UserController { @PutMapping("/update") public CommonResult update(@RequestBody @Valid UserUpdateParam param) { userService.updateUser(param); - return CommonResult.success(); + return CommonResult.success(MessageConstants.UPDATE_SUCCESS); } @Operation(summary = "用户查询接口") diff --git a/diyfile-system/src/main/java/com/besscroft/diyfile/service/impl/StorageServiceImpl.java b/diyfile-system/src/main/java/com/besscroft/diyfile/service/impl/StorageServiceImpl.java index dfc7012..1e0d95d 100644 --- a/diyfile-system/src/main/java/com/besscroft/diyfile/service/impl/StorageServiceImpl.java +++ b/diyfile-system/src/main/java/com/besscroft/diyfile/service/impl/StorageServiceImpl.java @@ -62,6 +62,7 @@ public class StorageServiceImpl extends ServiceImpl impl CacheConstants.ENABLE_STORAGE, CacheConstants.STATISTICS }, allEntries = true) + @Transactional(rollbackFor = Exception.class) public void deleteStorage(Long storageId) { Assert.isTrue(this.baseMapper.deleteById(storageId) > 0, "存储删除失败！"); Assert.isTrue(storageConfigMapper.deleteByStorageId(storageId) > 0, "存储删除失败！"); @@ -154,6 +155,7 @@ public class StorageServiceImpl extends ServiceImpl impl CacheConstants.ENABLE_STORAGE, CacheConstants.STATISTICS }, allEntries = true) + @Transactional(rollbackFor = Exception.class) public void updateStatus(Long storageId, Integer status) { Storage storage = this.baseMapper.selectById(storageId); Assert.notNull(storage, "存储不存在！"); diff --git a/diyfile-system/src/main/java/com/besscroft/diyfile/service/impl/SystemConfigServiceImpl.java b/diyfile-system/src/main/java/com/besscroft/diyfile/service/impl/SystemConfigServiceImpl.java index d0df2ae..f99aad8 100644 --- a/diyfile-system/src/main/java/com/besscroft/diyfile/service/impl/SystemConfigServiceImpl.java +++ b/diyfile-system/src/main/java/com/besscroft/diyfile/service/impl/SystemConfigServiceImpl.java @@ -73,7 +73,6 @@ public class SystemConfigServiceImpl extends ServiceImpl implements Us } @Override - @Transactional(rollbackFor = Exception.class) public void addUser(UserAddParam param) { User user = UserConverterMapper.INSTANCE.AddParamToUser(param); if (Objects.equals(user.getRole(), RoleConstants.PLATFORM_SUPER_ADMIN)) { @@ -154,6 +153,7 @@ public class UserServiceImpl extends ServiceImpl implements Us CacheConstants.USER, CacheConstants.STATISTICS }, allEntries = true) + @Transactional(rollbackFor = Exception.class) public void updateStatus(Long id, Integer status) { User user = this.baseMapper.selectById(id); Assert.notNull(user, "用户不存在！"); diff --git a/pom.xml b/pom.xml index c990f1b..1b04faf 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.2 + 3.1.3 @@ -17,14 +17,14 @@ pom - 0.8.1 + 0.8.2 17 17 ${java.version} ${java.version} UTF-8 UTF-8 - 3.1.2 + 3.1.3 1.5.5.Final 0.2.0 3.5.3.2 @@ -34,7 +34,7 @@ 1.4.7 6.4.4 3.5.3 - 3.1.7 + 3.1.8 3.17.1 2.3.1 1.1.1