diff --git a/tashow-module/tashow-module-file/pom.xml b/tashow-module/tashow-module-file/pom.xml index 4b74f15..4b1fa36 100644 --- a/tashow-module/tashow-module-file/pom.xml +++ b/tashow-module/tashow-module-file/pom.xml @@ -13,8 +13,7 @@ ${project.artifactId} - member 模块,我们放会员业务。 - 例如说:会员中心等等 + 文件 模块 @@ -29,14 +28,8 @@ com.tashow.cloud - tashow-framework-web + tashow-framework-security - - - org.springframework.boot - spring-boot-starter-validation - - com.tashow.cloud @@ -84,8 +77,6 @@ com.amazonaws aws-java-sdk-s3 - - diff --git a/tashow-module/tashow-module-file/src/main/java/com/tashow/cloud/file/controller/admin/config/ConfigController.java b/tashow-module/tashow-module-file/src/main/java/com/tashow/cloud/file/controller/admin/config/ConfigController.java index 05e6885..2ea978c 100644 --- a/tashow-module/tashow-module-file/src/main/java/com/tashow/cloud/file/controller/admin/config/ConfigController.java +++ b/tashow-module/tashow-module-file/src/main/java/com/tashow/cloud/file/controller/admin/config/ConfigController.java @@ -22,7 +22,7 @@ import static com.tashow.cloud.common.pojo.CommonResult.success; * 管理后台 - 参数配置 */ @RestController -@RequestMapping("/infra/config") +@RequestMapping("/file/config") @Validated public class ConfigController { diff --git a/tashow-module/tashow-module-file/src/main/java/com/tashow/cloud/file/controller/admin/file/FileConfigController.java b/tashow-module/tashow-module-file/src/main/java/com/tashow/cloud/file/controller/admin/file/FileConfigController.java index f1cddfc..daa1eb8 100644 --- a/tashow-module/tashow-module-file/src/main/java/com/tashow/cloud/file/controller/admin/file/FileConfigController.java +++ b/tashow-module/tashow-module-file/src/main/java/com/tashow/cloud/file/controller/admin/file/FileConfigController.java @@ -17,7 +17,7 @@ import static com.tashow.cloud.common.pojo.CommonResult.success; /** 管理后台 - 文件配置 */ @RestController -@RequestMapping("/infra/file-config") +@RequestMapping("/file/file-config") @Validated public class FileConfigController { diff --git a/tashow-module/tashow-module-file/src/main/java/com/tashow/cloud/file/controller/admin/file/FileController.java b/tashow-module/tashow-module-file/src/main/java/com/tashow/cloud/file/controller/admin/file/FileController.java index eab83ad..4ee5dea 100644 --- a/tashow-module/tashow-module-file/src/main/java/com/tashow/cloud/file/controller/admin/file/FileController.java +++ b/tashow-module/tashow-module-file/src/main/java/com/tashow/cloud/file/controller/admin/file/FileController.java @@ -24,7 +24,7 @@ import static com.tashow.cloud.file.framework.file.core.utils.FileTypeUtils.writ /** 管理后台 - 文件存储 */ @RestController -@RequestMapping("/infra/file") +@RequestMapping("/file") @Validated @Slf4j public class FileController { diff --git a/tashow-module/tashow-module-file/src/main/java/com/tashow/cloud/file/controller/app/file/AppFileController.java b/tashow-module/tashow-module-file/src/main/java/com/tashow/cloud/file/controller/app/file/AppFileController.java index bdb3c48..4af8189 100644 --- a/tashow-module/tashow-module-file/src/main/java/com/tashow/cloud/file/controller/app/file/AppFileController.java +++ b/tashow-module/tashow-module-file/src/main/java/com/tashow/cloud/file/controller/app/file/AppFileController.java @@ -17,7 +17,7 @@ import static com.tashow.cloud.common.pojo.CommonResult.success; /** 用户 App - 文件存储 */ @RestController -@RequestMapping("/infra/file") +@RequestMapping("/file") @Validated @Slf4j public class AppFileController { diff --git a/tashow-module/tashow-module-file/src/main/java/com/tashow/cloud/file/framework/security/config/SecurityConfiguration.java b/tashow-module/tashow-module-file/src/main/java/com/tashow/cloud/file/framework/security/config/SecurityConfiguration.java new file mode 100644 index 0000000..9c23a4f --- /dev/null +++ b/tashow-module/tashow-module-file/src/main/java/com/tashow/cloud/file/framework/security/config/SecurityConfiguration.java @@ -0,0 +1,39 @@ +package com.tashow.cloud.file.framework.security.config; + +import com.tashow.cloud.fileapi.enums.ApiConstants; +import com.tashow.cloud.security.security.config.AuthorizeRequestsCustomizer; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.configurers.AuthorizeHttpRequestsConfigurer; + +/** + * Member 模块的 Security 配置 + */ +@Configuration("memberSecurityConfiguration") +public class SecurityConfiguration { + + @Bean("memberAuthorizeRequestsCustomizer") + public AuthorizeRequestsCustomizer authorizeRequestsCustomizer() { + return new AuthorizeRequestsCustomizer() { + + @Override + public void customize(AuthorizeHttpRequestsConfigurer.AuthorizationManagerRequestMatcherRegistry registry) { + // Swagger 接口文档 + registry.requestMatchers("/v3/api-docs/**").permitAll() + .requestMatchers("/webjars/**").permitAll() + .requestMatchers("/swagger-ui").permitAll() + .requestMatchers("/swagger-ui/**").permitAll(); + // Spring Boot Actuator 的安全配置 + registry.requestMatchers("/actuator").permitAll() + .requestMatchers("/actuator/**").permitAll(); + // Druid 监控 + registry.requestMatchers("/druid/**").permitAll(); + // RPC 服务的安全配置 + registry.requestMatchers(ApiConstants.PREFIX + "/**").permitAll(); + } + + }; + } + +} diff --git a/tashow-module/tashow-module-file/src/main/java/com/tashow/cloud/file/framework/security/core/package-info.java b/tashow-module/tashow-module-file/src/main/java/com/tashow/cloud/file/framework/security/core/package-info.java new file mode 100644 index 0000000..65f0ce8 --- /dev/null +++ b/tashow-module/tashow-module-file/src/main/java/com/tashow/cloud/file/framework/security/core/package-info.java @@ -0,0 +1,4 @@ +/** + * 占位 + */ +package com.tashow.cloud.file.framework.security.core; diff --git a/tashow-module/tashow-module-file/src/main/resources/application.yaml b/tashow-module/tashow-module-file/src/main/resources/application.yaml index a88bcc6..7de0466 100644 --- a/tashow-module/tashow-module-file/src/main/resources/application.yaml +++ b/tashow-module/tashow-module-file/src/main/resources/application.yaml @@ -7,10 +7,6 @@ spring: profiles: active: local - main: - allow-circular-references: true # 允许循环依赖,因为项目是三层架构,无法避免这个情况。 - allow-bean-definition-overriding: true # 允许 Bean 覆盖,例如说 Feign 等会存在重复定义的服务 - config: import: - optional:classpath:application-${spring.profiles.active}.yaml # 加载【本地】配置