소스 검색

优化代码

RuoYi 3 년 전
부모
커밋
0b21d15f26

+ 2 - 1
ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/service/AsyncLogService.java

@@ -22,7 +22,8 @@ public class AsyncLogService
22
      * 保存系统日志记录
22
      * 保存系统日志记录
23
      */
23
      */
24
     @Async
24
     @Async
25
-    public void saveSysLog(SysOperLog sysOperLog) throws Exception {
25
+    public void saveSysLog(SysOperLog sysOperLog) throws Exception
26
+    {
26
         remoteLogService.saveLog(sysOperLog, SecurityConstants.INNER);
27
         remoteLogService.saveLog(sysOperLog, SecurityConstants.INNER);
27
     }
28
     }
28
 }
29
 }

+ 2 - 2
ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerAutoConfiguration.java

@@ -4,11 +4,11 @@ import java.util.ArrayList;
4
 import java.util.Arrays;
4
 import java.util.Arrays;
5
 import java.util.List;
5
 import java.util.List;
6
 import java.util.function.Predicate;
6
 import java.util.function.Predicate;
7
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
8
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
9
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
7
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
8
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
10
 import org.springframework.context.annotation.Bean;
9
 import org.springframework.context.annotation.Bean;
11
 import org.springframework.context.annotation.Configuration;
10
 import org.springframework.context.annotation.Configuration;
11
+import org.springframework.context.annotation.Import;
12
 import springfox.documentation.builders.ApiInfoBuilder;
12
 import springfox.documentation.builders.ApiInfoBuilder;
13
 import springfox.documentation.builders.PathSelectors;
13
 import springfox.documentation.builders.PathSelectors;
14
 import springfox.documentation.builders.RequestHandlerSelectors;
14
 import springfox.documentation.builders.RequestHandlerSelectors;

+ 0 - 1
ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerBeanPostProcessor.java

@@ -2,7 +2,6 @@ package com.ruoyi.common.swagger.config;
2
 
2
 
3
 import org.springframework.beans.BeansException;
3
 import org.springframework.beans.BeansException;
4
 import org.springframework.beans.factory.config.BeanPostProcessor;
4
 import org.springframework.beans.factory.config.BeanPostProcessor;
5
-import org.springframework.stereotype.Component;
6
 import org.springframework.util.ReflectionUtils;
5
 import org.springframework.util.ReflectionUtils;
7
 import org.springframework.web.servlet.mvc.method.RequestMappingInfoHandlerMapping;
6
 import org.springframework.web.servlet.mvc.method.RequestMappingInfoHandlerMapping;
8
 import springfox.documentation.spring.web.plugins.WebFluxRequestHandlerProvider;
7
 import springfox.documentation.spring.web.plugins.WebFluxRequestHandlerProvider;

+ 0 - 1
ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerProperties.java

@@ -3,7 +3,6 @@ package com.ruoyi.common.swagger.config;
3
 import java.util.ArrayList;
3
 import java.util.ArrayList;
4
 import java.util.List;
4
 import java.util.List;
5
 import org.springframework.boot.context.properties.ConfigurationProperties;
5
 import org.springframework.boot.context.properties.ConfigurationProperties;
6
-import org.springframework.stereotype.Component;
7
 
6
 
8
 @ConfigurationProperties("swagger")
7
 @ConfigurationProperties("swagger")
9
 public class SwaggerProperties
8
 public class SwaggerProperties

+ 0 - 1
ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerWebConfiguration.java

@@ -1,6 +1,5 @@
1
 package com.ruoyi.common.swagger.config;
1
 package com.ruoyi.common.swagger.config;
2
 
2
 
3
-import org.springframework.context.annotation.Configuration;
4
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
3
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
5
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
4
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
6
 
5
 

+ 1 - 2
ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/FastDfsSysFileServiceImpl.java

@@ -1,5 +1,6 @@
1
 package com.ruoyi.file.service;
1
 package com.ruoyi.file.service;
2
 
2
 
3
+import java.io.InputStream;
3
 import org.springframework.beans.factory.annotation.Autowired;
4
 import org.springframework.beans.factory.annotation.Autowired;
4
 import org.springframework.beans.factory.annotation.Value;
5
 import org.springframework.beans.factory.annotation.Value;
5
 import org.springframework.stereotype.Service;
6
 import org.springframework.stereotype.Service;
@@ -8,8 +9,6 @@ import com.github.tobato.fastdfs.domain.fdfs.StorePath;
8
 import com.github.tobato.fastdfs.service.FastFileStorageClient;
9
 import com.github.tobato.fastdfs.service.FastFileStorageClient;
9
 import com.ruoyi.common.core.utils.file.FileTypeUtils;
10
 import com.ruoyi.common.core.utils.file.FileTypeUtils;
10
 
11
 
11
-import java.io.InputStream;
12
-
13
 /**
12
 /**
14
  * FastDFS 文件存储
13
  * FastDFS 文件存储
15
  *
14
  *

+ 1 - 2
ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/MinioSysFileServiceImpl.java

@@ -1,5 +1,6 @@
1
 package com.ruoyi.file.service;
1
 package com.ruoyi.file.service;
2
 
2
 
3
+import java.io.InputStream;
3
 import org.springframework.beans.factory.annotation.Autowired;
4
 import org.springframework.beans.factory.annotation.Autowired;
4
 import org.springframework.stereotype.Service;
5
 import org.springframework.stereotype.Service;
5
 import org.springframework.web.multipart.MultipartFile;
6
 import org.springframework.web.multipart.MultipartFile;
@@ -8,8 +9,6 @@ import com.ruoyi.file.utils.FileUploadUtils;
8
 import io.minio.MinioClient;
9
 import io.minio.MinioClient;
9
 import io.minio.PutObjectArgs;
10
 import io.minio.PutObjectArgs;
10
 
11
 
11
-import java.io.InputStream;
12
-
13
 /**
12
 /**
14
  * Minio 文件存储
13
  * Minio 文件存储
15
  *
14
  *

+ 3 - 3
ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/FileUploadUtils.java

@@ -4,10 +4,9 @@ import java.io.File;
4
 import java.io.IOException;
4
 import java.io.IOException;
5
 import java.nio.file.Paths;
5
 import java.nio.file.Paths;
6
 import java.util.Objects;
6
 import java.util.Objects;
7
-
8
-import com.ruoyi.common.core.exception.file.FileException;
9
 import org.apache.commons.io.FilenameUtils;
7
 import org.apache.commons.io.FilenameUtils;
10
 import org.springframework.web.multipart.MultipartFile;
8
 import org.springframework.web.multipart.MultipartFile;
9
+import com.ruoyi.common.core.exception.file.FileException;
11
 import com.ruoyi.common.core.exception.file.FileNameLengthLimitExceededException;
10
 import com.ruoyi.common.core.exception.file.FileNameLengthLimitExceededException;
12
 import com.ruoyi.common.core.exception.file.FileSizeLimitExceededException;
11
 import com.ruoyi.common.core.exception.file.FileSizeLimitExceededException;
13
 import com.ruoyi.common.core.exception.file.InvalidExtensionException;
12
 import com.ruoyi.common.core.exception.file.InvalidExtensionException;
@@ -48,7 +47,8 @@ public class FileUploadUtils
48
         {
47
         {
49
             return upload(baseDir, file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION);
48
             return upload(baseDir, file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION);
50
         }
49
         }
51
-        catch (FileException fe){
50
+        catch (FileException fe)
51
+        {
52
             throw new IOException(fe.getDefaultMessage(), fe);
52
             throw new IOException(fe.getDefaultMessage(), fe);
53
         }
53
         }
54
         catch (Exception e)
54
         catch (Exception e)