Merge pull request #47 from besscroft/dev

doc: add image

README.md

@@ -2,7 +2,7 @@
 
 <p align="center">
 
-![DiyFile](https://besscroft.com/uploads/diyfile.png)
+![DiyFile](doc/images/diyfile.png)
 
 </p>
 
@@ -12,7 +12,7 @@
 
 ### 预览
 
-![DiyFile](https://besscroft.com/uploads/diyfile-demo.png)
+![DiyFile](doc/images/diyfile-demo.png)
 
 [Demo](https://demo.besscroft.com/)
 

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.3")
                         .license(new License().name("MIT license").url("https://github.com/besscroft/diyfile/blob/main/LICENSE")))
                 .externalDocs(new ExternalDocumentation()
                         .description("DiyFile 文档")

diyfile-system/pom.xml

@@ -71,6 +71,10 @@
             <groupId>org.flywaydb</groupId>
             <artifactId>flyway-core</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.flywaydb</groupId>
+            <artifactId>flyway-mysql</artifactId>
+        </dependency>
         <!-- aws-java-sdk-s3 -->
         <dependency>
             <groupId>software.amazon.awssdk</groupId>

diyfile-system/src/main/java/com/besscroft/diyfile/config/FlywayConfigure.java

@@ -11,6 +11,7 @@ import org.flywaydb.core.api.FlywayException;
 import org.flywaydb.core.internal.database.DatabaseType;
 import org.flywaydb.core.internal.exception.FlywaySqlException;
 import org.flywaydb.core.internal.plugin.PluginRegister;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Configuration;
 
@@ -37,6 +38,9 @@ public class FlywayConfigure {
     private static final List<DatabaseType> SORTED_DATABASE_TYPES = new PluginRegister().getPlugins(DatabaseType.class).stream().sorted().collect(Collectors.toList());
     private final ApplicationContext applicationContext;
 
+    @Value("${spring.flyway.enabled}")
+    private Boolean enabled;
+
     @PostConstruct
     public void flywayMigrate() {
         String datasourceDriveClassName = applicationContext.getEnvironment().getProperty("spring.datasource.driver-class-name");
@@ -54,6 +58,10 @@ public class FlywayConfigure {
                 log.info("sqlite 数据库文件已存在，路径：{}", folderPath);
             }
         }
+        if (!enabled) {
+            log.info("flyway 已关闭，跳过初始化...");
+            return;
+        }
         try {
             String databaseProductName = dataSource.getConnection().getMetaData().getDatabaseProductName();
             String dbType = databaseProductName.toLowerCase(Locale.ROOT);

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);
     }
 
 }

diyfile-system/src/main/java/com/besscroft/diyfile/controller/UserController.java

@@ -98,7 +98,7 @@ public class UserController {
     @PostMapping("/add")
     public CommonResult<Void> 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<Void> update(@RequestBody @Valid UserUpdateParam param) {
         userService.updateUser(param);
-        return CommonResult.success();
+        return CommonResult.success(MessageConstants.UPDATE_SUCCESS);
     }
 
     @Operation(summary = "用户查询接口")

diyfile-system/src/main/java/com/besscroft/diyfile/service/impl/StorageServiceImpl.java

@@ -62,6 +62,7 @@ public class StorageServiceImpl extends ServiceImpl<StorageMapper, Storage> 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<StorageMapper, Storage> 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, "存储不存在！");

diyfile-system/src/main/java/com/besscroft/diyfile/service/impl/SystemConfigServiceImpl.java

@@ -73,7 +73,6 @@ public class SystemConfigServiceImpl extends ServiceImpl<SystemConfigMapper, Sys
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     @CacheEvict(value = {
             CacheConstants.SYSTEM_CONFIG,
             CacheConstants.SITE_TITLE,

diyfile-system/src/main/java/com/besscroft/diyfile/service/impl/UserServiceImpl.java

@@ -116,7 +116,6 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> 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<UserMapper, User> 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, "用户不存在！");

pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.1.2</version>
+        <version>3.1.4</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 
@@ -17,24 +17,24 @@
     <packaging>pom</packaging>
 
     <properties>
-        <revision>0.8.1</revision>
+        <revision>0.8.3</revision>
         <java.version>17</java.version>
         <maven.compiler.release>17</maven.compiler.release>
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <spring-boot.version>3.1.2</spring-boot.version>
+        <spring-boot.version>3.1.4</spring-boot.version>
         <mapstruct.version>1.5.5.Final</mapstruct.version>
         <lombok-mapstruct-binding.version>0.2.0</lombok-mapstruct-binding.version>
         <mybatis-plus.version>3.5.3.2</mybatis-plus.version>
         <springdoc.version>2.2.0</springdoc.version>
-        <sa-token.version>1.34.0</sa-token.version>
+        <sa-token.version>1.36.0</sa-token.version>
         <hutool-all.version>5.8.20</hutool-all.version>
         <pagehelper.version>1.4.7</pagehelper.version>
         <oshi.version>6.4.4</oshi.version>
         <okhttps.version>3.5.3</okhttps.version>
-        <caffeine.version>3.1.7</caffeine.version>
+        <caffeine.version>3.1.8</caffeine.version>
         <aliyun-sdk-oss.version>3.17.1</aliyun-sdk-oss.version>
         <jaxb-api.version>2.3.1</jaxb-api.version>
         <activation.version>1.1.1</activation.version>
@@ -73,6 +73,10 @@
             <artifactId>spring-boot-configuration-processor</artifactId>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>