diff --git a/youlai-admin/admin-boot/src/main/java/com/youlai/admin/component/cache/InitPermissionRolesCache.java b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/component/InitPermissionRolesCache.java similarity index 92% rename from youlai-admin/admin-boot/src/main/java/com/youlai/admin/component/cache/InitPermissionRolesCache.java rename to youlai-admin/admin-boot/src/main/java/com/youlai/admin/component/InitPermissionRolesCache.java index 7e671327f914fc22f660450c28da96f0ef18f518..ee9163f6da8228bf4410ee4659b0197d4f6f65d5 100644 --- a/youlai-admin/admin-boot/src/main/java/com/youlai/admin/component/cache/InitPermissionRolesCache.java +++ b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/component/InitPermissionRolesCache.java @@ -1,4 +1,4 @@ -package com.youlai.admin.component.cache; +package com.youlai.admin.component; import com.youlai.admin.service.ISysPermissionService; import lombok.AllArgsConstructor; diff --git a/youlai-admin/admin-boot/src/main/java/com/youlai/admin/config/MinioProperties.java b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/config/MinioProperties.java deleted file mode 100644 index 30baa5147f143e853c947d2eb7bd1ddd89b940df..0000000000000000000000000000000000000000 --- a/youlai-admin/admin-boot/src/main/java/com/youlai/admin/config/MinioProperties.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.youlai.admin.config; - -import lombok.Data; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.context.annotation.Configuration; - -@Data -@Configuration -@ConfigurationProperties(prefix = "minio") -public class MinioProperties { - - private String endpoint; - - private String accessKey; - - private String secretKey; - -} diff --git a/youlai-admin/admin-boot/src/main/java/com/youlai/admin/controller/FileController.java b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/controller/FileController.java index bfab7cee67c98f70e5b722663c9cfc21ffe7e1e6..4b976546bf81fb999ccad85f0e6586126be44304 100644 --- a/youlai-admin/admin-boot/src/main/java/com/youlai/admin/controller/FileController.java +++ b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/controller/FileController.java @@ -8,20 +8,18 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import lombok.AllArgsConstructor; +import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; -import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @Api(tags = "文件接口") @RestController @RequestMapping("/api/v1/files") -@Slf4j -@AllArgsConstructor +@RequiredArgsConstructor public class FileController { - private MinioService minIOService; + private final MinioService minIOService; @PostMapping @ApiOperation(value = "文件上传") diff --git a/youlai-admin/admin-boot/src/main/java/com/youlai/admin/component/sentinel/DefaultBlockExceptionHandler.java b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/handler/DefaultBlockExceptionHandler.java similarity index 97% rename from youlai-admin/admin-boot/src/main/java/com/youlai/admin/component/sentinel/DefaultBlockExceptionHandler.java rename to youlai-admin/admin-boot/src/main/java/com/youlai/admin/handler/DefaultBlockExceptionHandler.java index 1b054b1e78143008a71734976fbcf26da7286346..494b240196dde8fdc98907f4ff535351bb8c4562 100644 --- a/youlai-admin/admin-boot/src/main/java/com/youlai/admin/component/sentinel/DefaultBlockExceptionHandler.java +++ b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/handler/DefaultBlockExceptionHandler.java @@ -1,4 +1,4 @@ -package com.youlai.admin.component.sentinel; +package com.youlai.admin.handler; import com.alibaba.csp.sentinel.adapter.spring.webmvc.callback.BlockExceptionHandler; import com.alibaba.csp.sentinel.slots.block.BlockException; diff --git a/youlai-admin/admin-boot/src/main/java/com/youlai/admin/component/sentinel/UserBlockHandler.java b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/handler/UserBlockHandler.java similarity index 94% rename from youlai-admin/admin-boot/src/main/java/com/youlai/admin/component/sentinel/UserBlockHandler.java rename to youlai-admin/admin-boot/src/main/java/com/youlai/admin/handler/UserBlockHandler.java index 4b5940a160722db0d8df94b41133ec5e5c6e29d7..8fe514d753564822d1dcfc0b91c4c08b39c9bfa6 100644 --- a/youlai-admin/admin-boot/src/main/java/com/youlai/admin/component/sentinel/UserBlockHandler.java +++ b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/handler/UserBlockHandler.java @@ -1,4 +1,4 @@ -package com.youlai.admin.component.sentinel; +package com.youlai.admin.handler; import com.alibaba.csp.sentinel.slots.block.BlockException; import com.youlai.admin.pojo.vo.UserVO; diff --git a/youlai-admin/admin-boot/src/main/java/com/youlai/admin/service/impl/MinioService.java b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/service/impl/MinioService.java index d6b288bf26313bc0c189f803b839b4ad7e121260..5c2bfd972016a823803f5262ba9e25a4d575bb0f 100644 --- a/youlai-admin/admin-boot/src/main/java/com/youlai/admin/service/impl/MinioService.java +++ b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/service/impl/MinioService.java @@ -1,38 +1,40 @@ package com.youlai.admin.service.impl; import cn.hutool.core.lang.Assert; -import com.youlai.admin.config.MinioProperties; import io.minio.*; +import lombok.Setter; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.InitializingBean; -import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.http.MediaType; import org.springframework.stereotype.Component; import java.io.InputStream; -@Slf4j @Component -@EnableConfigurationProperties({MinioProperties.class}) +@ConfigurationProperties(prefix = "minio") public class MinioService implements InitializingBean { - private MinioProperties minioProperties; + @Setter + private String endpoint; - public MinioService(MinioProperties minioProperties){ - this.minioProperties=minioProperties; - } + @Setter + private String accessKey; + + @Setter + private String secretKey; private MinioClient client; @Override public void afterPropertiesSet() { - Assert.notBlank(minioProperties.getEndpoint(), "MinIO URL 为空"); - Assert.notBlank(minioProperties.getAccessKey(), "MinIO accessKey为空"); - Assert.notBlank(minioProperties.getSecretKey(), "MinIO secretKey为空"); + Assert.notBlank(endpoint, "MinIO URL 为空"); + Assert.notBlank(accessKey, "MinIO accessKey为空"); + Assert.notBlank(secretKey, "MinIO secretKey为空"); this.client = new MinioClient.Builder() - .endpoint(minioProperties.getEndpoint()) - .credentials(minioProperties.getAccessKey(), minioProperties.getSecretKey()) + .endpoint(endpoint) + .credentials(accessKey, secretKey) .build(); }