diff --git a/auh-api/Dockerfile b/auth-api/Dockerfile similarity index 100% rename from auh-api/Dockerfile rename to auth-api/Dockerfile diff --git a/auh-api/pom.xml b/auth-api/pom.xml similarity index 97% rename from auh-api/pom.xml rename to auth-api/pom.xml index fe3bf83..512295e 100644 --- a/auh-api/pom.xml +++ b/auth-api/pom.xml @@ -7,7 +7,7 @@ 0.0.1-SNAPSHOT - auh-api + auth-api jar auh-api diff --git a/auh-api/src/main/java/cn/bunny/services/AuthServiceApplication.java b/auth-api/src/main/java/cn/bunny/services/AuthServiceApplication.java similarity index 100% rename from auh-api/src/main/java/cn/bunny/services/AuthServiceApplication.java rename to auth-api/src/main/java/cn/bunny/services/AuthServiceApplication.java diff --git a/auh-api/src/main/java/cn/bunny/services/ReadMe.md b/auth-api/src/main/java/cn/bunny/services/ReadMe.md similarity index 100% rename from auh-api/src/main/java/cn/bunny/services/ReadMe.md rename to auth-api/src/main/java/cn/bunny/services/ReadMe.md diff --git a/auh-api/src/main/java/cn/bunny/services/controller/IndexController.java b/auth-api/src/main/java/cn/bunny/services/controller/IndexController.java similarity index 96% rename from auh-api/src/main/java/cn/bunny/services/controller/IndexController.java rename to auth-api/src/main/java/cn/bunny/services/controller/IndexController.java index 9327088..e9b4372 100644 --- a/auh-api/src/main/java/cn/bunny/services/controller/IndexController.java +++ b/auth-api/src/main/java/cn/bunny/services/controller/IndexController.java @@ -24,7 +24,7 @@ public class IndexController { } @Operation(summary = "生成验证码", description = "生成验证码") - @GetMapping("public/check-code") + @GetMapping("/api/image/public/check-code") public ResponseEntity checkCode() { HttpHeaders headers = new HttpHeaders(); headers.setContentType(MediaType.IMAGE_JPEG); diff --git a/auh-api/src/main/java/cn/bunny/services/controller/configuration/ConfigurationController.java b/auth-api/src/main/java/cn/bunny/services/controller/configuration/ConfigurationController.java similarity index 100% rename from auh-api/src/main/java/cn/bunny/services/controller/configuration/ConfigurationController.java rename to auth-api/src/main/java/cn/bunny/services/controller/configuration/ConfigurationController.java diff --git a/auh-api/src/main/java/cn/bunny/services/controller/configuration/EmailTemplateController.java b/auth-api/src/main/java/cn/bunny/services/controller/configuration/EmailTemplateController.java similarity index 100% rename from auh-api/src/main/java/cn/bunny/services/controller/configuration/EmailTemplateController.java rename to auth-api/src/main/java/cn/bunny/services/controller/configuration/EmailTemplateController.java diff --git a/auh-api/src/main/java/cn/bunny/services/controller/configuration/EmailUsersController.java b/auth-api/src/main/java/cn/bunny/services/controller/configuration/EmailUsersController.java similarity index 100% rename from auh-api/src/main/java/cn/bunny/services/controller/configuration/EmailUsersController.java rename to auth-api/src/main/java/cn/bunny/services/controller/configuration/EmailUsersController.java diff --git a/auh-api/src/main/java/cn/bunny/services/controller/configuration/I18nController.java b/auth-api/src/main/java/cn/bunny/services/controller/configuration/I18nController.java similarity index 100% rename from auh-api/src/main/java/cn/bunny/services/controller/configuration/I18nController.java rename to auth-api/src/main/java/cn/bunny/services/controller/configuration/I18nController.java diff --git a/auh-api/src/main/java/cn/bunny/services/controller/configuration/I18nTypeController.java b/auth-api/src/main/java/cn/bunny/services/controller/configuration/I18nTypeController.java similarity index 100% rename from auh-api/src/main/java/cn/bunny/services/controller/configuration/I18nTypeController.java rename to auth-api/src/main/java/cn/bunny/services/controller/configuration/I18nTypeController.java diff --git a/auh-api/src/main/java/cn/bunny/services/controller/configuration/MenuIconController.java b/auth-api/src/main/java/cn/bunny/services/controller/configuration/MenuIconController.java similarity index 100% rename from auh-api/src/main/java/cn/bunny/services/controller/configuration/MenuIconController.java rename to auth-api/src/main/java/cn/bunny/services/controller/configuration/MenuIconController.java diff --git a/auh-api/src/main/java/cn/bunny/services/controller/file/FilesController.java b/auth-api/src/main/java/cn/bunny/services/controller/file/FilesController.java similarity index 100% rename from auh-api/src/main/java/cn/bunny/services/controller/file/FilesController.java rename to auth-api/src/main/java/cn/bunny/services/controller/file/FilesController.java diff --git a/auh-api/src/main/java/cn/bunny/services/controller/file/FilesParDetailController.java b/auth-api/src/main/java/cn/bunny/services/controller/file/FilesParDetailController.java similarity index 100% rename from auh-api/src/main/java/cn/bunny/services/controller/file/FilesParDetailController.java rename to auth-api/src/main/java/cn/bunny/services/controller/file/FilesParDetailController.java diff --git a/auh-api/src/main/java/cn/bunny/services/controller/log/ScheduleExecuteLogController.java b/auth-api/src/main/java/cn/bunny/services/controller/log/ScheduleExecuteLogController.java similarity index 100% rename from auh-api/src/main/java/cn/bunny/services/controller/log/ScheduleExecuteLogController.java rename to auth-api/src/main/java/cn/bunny/services/controller/log/ScheduleExecuteLogController.java diff --git a/auh-api/src/main/java/cn/bunny/services/controller/log/UserLoginLogController.java b/auth-api/src/main/java/cn/bunny/services/controller/log/UserLoginLogController.java similarity index 100% rename from auh-api/src/main/java/cn/bunny/services/controller/log/UserLoginLogController.java rename to auth-api/src/main/java/cn/bunny/services/controller/log/UserLoginLogController.java diff --git a/auh-api/src/main/java/cn/bunny/services/controller/message/MessageController.java b/auth-api/src/main/java/cn/bunny/services/controller/message/MessageController.java similarity index 100% rename from auh-api/src/main/java/cn/bunny/services/controller/message/MessageController.java rename to auth-api/src/main/java/cn/bunny/services/controller/message/MessageController.java diff --git a/auh-api/src/main/java/cn/bunny/services/controller/message/MessageReceivedController.java b/auth-api/src/main/java/cn/bunny/services/controller/message/MessageReceivedController.java similarity index 100% rename from auh-api/src/main/java/cn/bunny/services/controller/message/MessageReceivedController.java rename to auth-api/src/main/java/cn/bunny/services/controller/message/MessageReceivedController.java diff --git a/auh-api/src/main/java/cn/bunny/services/controller/message/MessageTypeController.java b/auth-api/src/main/java/cn/bunny/services/controller/message/MessageTypeController.java similarity index 100% rename from auh-api/src/main/java/cn/bunny/services/controller/message/MessageTypeController.java rename to auth-api/src/main/java/cn/bunny/services/controller/message/MessageTypeController.java diff --git a/auh-api/src/main/java/cn/bunny/services/controller/schedule/SchedulersController.java b/auth-api/src/main/java/cn/bunny/services/controller/schedule/SchedulersController.java similarity index 100% rename from auh-api/src/main/java/cn/bunny/services/controller/schedule/SchedulersController.java rename to auth-api/src/main/java/cn/bunny/services/controller/schedule/SchedulersController.java diff --git a/auh-api/src/main/java/cn/bunny/services/controller/schedule/SchedulersGroupController.java b/auth-api/src/main/java/cn/bunny/services/controller/schedule/SchedulersGroupController.java similarity index 100% rename from auh-api/src/main/java/cn/bunny/services/controller/schedule/SchedulersGroupController.java rename to auth-api/src/main/java/cn/bunny/services/controller/schedule/SchedulersGroupController.java diff --git a/auh-api/src/main/java/cn/bunny/services/controller/system/DeptController.java b/auth-api/src/main/java/cn/bunny/services/controller/system/DeptController.java similarity index 100% rename from auh-api/src/main/java/cn/bunny/services/controller/system/DeptController.java rename to auth-api/src/main/java/cn/bunny/services/controller/system/DeptController.java diff --git a/auh-api/src/main/java/cn/bunny/services/controller/system/PermissionController.java b/auth-api/src/main/java/cn/bunny/services/controller/system/PermissionController.java similarity index 100% rename from auh-api/src/main/java/cn/bunny/services/controller/system/PermissionController.java rename to auth-api/src/main/java/cn/bunny/services/controller/system/PermissionController.java diff --git a/auh-api/src/main/java/cn/bunny/services/controller/system/RoleController.java b/auth-api/src/main/java/cn/bunny/services/controller/system/RoleController.java similarity index 100% rename from auh-api/src/main/java/cn/bunny/services/controller/system/RoleController.java rename to auth-api/src/main/java/cn/bunny/services/controller/system/RoleController.java diff --git a/auh-api/src/main/java/cn/bunny/services/controller/system/RolePermissionController.java b/auth-api/src/main/java/cn/bunny/services/controller/system/RolePermissionController.java similarity index 100% rename from auh-api/src/main/java/cn/bunny/services/controller/system/RolePermissionController.java rename to auth-api/src/main/java/cn/bunny/services/controller/system/RolePermissionController.java diff --git a/auh-api/src/main/java/cn/bunny/services/controller/system/RouterController.java b/auth-api/src/main/java/cn/bunny/services/controller/system/RouterController.java similarity index 100% rename from auh-api/src/main/java/cn/bunny/services/controller/system/RouterController.java rename to auth-api/src/main/java/cn/bunny/services/controller/system/RouterController.java diff --git a/auh-api/src/main/java/cn/bunny/services/controller/system/RouterRoleController.java b/auth-api/src/main/java/cn/bunny/services/controller/system/RouterRoleController.java similarity index 100% rename from auh-api/src/main/java/cn/bunny/services/controller/system/RouterRoleController.java rename to auth-api/src/main/java/cn/bunny/services/controller/system/RouterRoleController.java diff --git a/auh-api/src/main/java/cn/bunny/services/controller/system/UserController.java b/auth-api/src/main/java/cn/bunny/services/controller/system/UserController.java similarity index 100% rename from auh-api/src/main/java/cn/bunny/services/controller/system/UserController.java rename to auth-api/src/main/java/cn/bunny/services/controller/system/UserController.java diff --git a/auh-api/src/main/java/cn/bunny/services/controller/system/UserLoginController.java b/auth-api/src/main/java/cn/bunny/services/controller/system/UserLoginController.java similarity index 100% rename from auh-api/src/main/java/cn/bunny/services/controller/system/UserLoginController.java rename to auth-api/src/main/java/cn/bunny/services/controller/system/UserLoginController.java diff --git a/auh-api/src/main/java/cn/bunny/services/controller/system/UserRoleController.java b/auth-api/src/main/java/cn/bunny/services/controller/system/UserRoleController.java similarity index 100% rename from auh-api/src/main/java/cn/bunny/services/controller/system/UserRoleController.java rename to auth-api/src/main/java/cn/bunny/services/controller/system/UserRoleController.java diff --git a/auh-api/src/main/resources/application-dev.yml b/auth-api/src/main/resources/application-dev.yml similarity index 100% rename from auh-api/src/main/resources/application-dev.yml rename to auth-api/src/main/resources/application-dev.yml diff --git a/auh-api/src/main/resources/application-test.yml b/auth-api/src/main/resources/application-test.yml similarity index 100% rename from auh-api/src/main/resources/application-test.yml rename to auth-api/src/main/resources/application-test.yml diff --git a/auh-api/src/main/resources/application.yml b/auth-api/src/main/resources/application.yml similarity index 100% rename from auh-api/src/main/resources/application.yml rename to auth-api/src/main/resources/application.yml diff --git a/auh-api/src/main/resources/banner.txt b/auth-api/src/main/resources/banner.txt similarity index 100% rename from auh-api/src/main/resources/banner.txt rename to auth-api/src/main/resources/banner.txt diff --git a/auh-api/src/main/resources/logback.xml b/auth-api/src/main/resources/logback.xml similarity index 100% rename from auh-api/src/main/resources/logback.xml rename to auth-api/src/main/resources/logback.xml diff --git a/auh-api/src/main/resources/static/backup.sh b/auth-api/src/main/resources/static/backup.sh similarity index 100% rename from auh-api/src/main/resources/static/backup.sh rename to auth-api/src/main/resources/static/backup.sh diff --git a/auh-api/src/main/resources/static/error/400.html b/auth-api/src/main/resources/static/error/400.html similarity index 100% rename from auh-api/src/main/resources/static/error/400.html rename to auth-api/src/main/resources/static/error/400.html diff --git a/auh-api/src/main/resources/static/error/403.html b/auth-api/src/main/resources/static/error/403.html similarity index 100% rename from auh-api/src/main/resources/static/error/403.html rename to auth-api/src/main/resources/static/error/403.html diff --git a/auh-api/src/main/resources/static/error/404.html b/auth-api/src/main/resources/static/error/404.html similarity index 100% rename from auh-api/src/main/resources/static/error/404.html rename to auth-api/src/main/resources/static/error/404.html diff --git a/auh-api/src/main/resources/static/error/500.html b/auth-api/src/main/resources/static/error/500.html similarity index 100% rename from auh-api/src/main/resources/static/error/500.html rename to auth-api/src/main/resources/static/error/500.html diff --git a/auh-api/src/main/resources/static/error/501.html b/auth-api/src/main/resources/static/error/501.html similarity index 100% rename from auh-api/src/main/resources/static/error/501.html rename to auth-api/src/main/resources/static/error/501.html diff --git a/auh-api/src/main/resources/static/error/502.html b/auth-api/src/main/resources/static/error/502.html similarity index 100% rename from auh-api/src/main/resources/static/error/502.html rename to auth-api/src/main/resources/static/error/502.html diff --git a/auh-api/src/main/resources/static/error/503.html b/auth-api/src/main/resources/static/error/503.html similarity index 100% rename from auh-api/src/main/resources/static/error/503.html rename to auth-api/src/main/resources/static/error/503.html diff --git a/auh-api/src/main/resources/static/error/504.html b/auth-api/src/main/resources/static/error/504.html similarity index 100% rename from auh-api/src/main/resources/static/error/504.html rename to auth-api/src/main/resources/static/error/504.html diff --git a/auh-api/src/main/resources/static/error/505.html b/auth-api/src/main/resources/static/error/505.html similarity index 100% rename from auh-api/src/main/resources/static/error/505.html rename to auth-api/src/main/resources/static/error/505.html diff --git a/auh-api/src/main/resources/static/error/506.html b/auth-api/src/main/resources/static/error/506.html similarity index 100% rename from auh-api/src/main/resources/static/error/506.html rename to auth-api/src/main/resources/static/error/506.html diff --git a/auh-api/src/main/resources/static/error/507.html b/auth-api/src/main/resources/static/error/507.html similarity index 100% rename from auh-api/src/main/resources/static/error/507.html rename to auth-api/src/main/resources/static/error/507.html diff --git a/auh-api/src/main/resources/static/error/509.html b/auth-api/src/main/resources/static/error/509.html similarity index 100% rename from auh-api/src/main/resources/static/error/509.html rename to auth-api/src/main/resources/static/error/509.html diff --git a/auh-api/src/main/resources/static/error/510.html b/auth-api/src/main/resources/static/error/510.html similarity index 100% rename from auh-api/src/main/resources/static/error/510.html rename to auth-api/src/main/resources/static/error/510.html diff --git a/auh-api/src/main/resources/static/favicon.ico b/auth-api/src/main/resources/static/favicon.ico similarity index 100% rename from auh-api/src/main/resources/static/favicon.ico rename to auth-api/src/main/resources/static/favicon.ico diff --git a/auh-api/src/main/resources/static/platform-config.json b/auth-api/src/main/resources/static/platform-config.json similarity index 100% rename from auh-api/src/main/resources/static/platform-config.json rename to auth-api/src/main/resources/static/platform-config.json diff --git a/auh-api/src/main/resources/templates/index.html b/auth-api/src/main/resources/templates/index.html similarity index 98% rename from auh-api/src/main/resources/templates/index.html rename to auth-api/src/main/resources/templates/index.html index 3a1b59f..1b0427f 100644 --- a/auh-api/src/main/resources/templates/index.html +++ b/auth-api/src/main/resources/templates/index.html @@ -88,7 +88,7 @@ diff --git a/auh-api/src/test/java/impl/BuildPermissionApiTest.java b/auth-api/src/test/java/impl/BuildPermissionApiTest.java similarity index 100% rename from auh-api/src/test/java/impl/BuildPermissionApiTest.java rename to auth-api/src/test/java/impl/BuildPermissionApiTest.java diff --git a/auh-api/src/test/java/impl/ControllerScannerTest.java b/auth-api/src/test/java/impl/ControllerScannerTest.java similarity index 100% rename from auh-api/src/test/java/impl/ControllerScannerTest.java rename to auth-api/src/test/java/impl/ControllerScannerTest.java diff --git a/pom.xml b/pom.xml index 8c42bb2..0c35bd4 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ service dao auth-core - auh-api + auth-api diff --git a/service/src/main/java/cn/bunny/services/core/strategy/login/LoginContext.java b/service/src/main/java/cn/bunny/services/core/strategy/login/LoginContext.java index ad99251..1b81486 100644 --- a/service/src/main/java/cn/bunny/services/core/strategy/login/LoginContext.java +++ b/service/src/main/java/cn/bunny/services/core/strategy/login/LoginContext.java @@ -17,6 +17,7 @@ public class LoginContext { this.strategies = strategies; } + /** * 执行登录策略 * 根据情况判断 type 是否为空 diff --git a/service/src/main/java/cn/bunny/services/security/config/MethodSecurityConfig.java b/service/src/main/java/cn/bunny/services/security/config/MethodSecurityConfig.java index 3ba401e..355e494 100644 --- a/service/src/main/java/cn/bunny/services/security/config/MethodSecurityConfig.java +++ b/service/src/main/java/cn/bunny/services/security/config/MethodSecurityConfig.java @@ -13,7 +13,7 @@ import org.springframework.security.crypto.password.PasswordEncoder; @Configuration public class MethodSecurityConfig { - + /** * 设置密码校验器 * diff --git a/service/src/main/java/cn/bunny/services/security/config/WebSecurityConfig.java b/service/src/main/java/cn/bunny/services/security/config/WebSecurityConfig.java index 254585c..606ab72 100644 --- a/service/src/main/java/cn/bunny/services/security/config/WebSecurityConfig.java +++ b/service/src/main/java/cn/bunny/services/security/config/WebSecurityConfig.java @@ -10,6 +10,7 @@ import org.springframework.security.config.annotation.method.configuration.Enabl import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer; +import org.springframework.security.config.http.SessionCreationPolicy; import org.springframework.security.web.SecurityFilterChain; import org.springframework.security.web.util.matcher.RegexRequestMatcher; @@ -46,7 +47,10 @@ public class WebSecurityConfig { // 跨域访问权限，如果需要可以关闭后自己配置跨域访问 .cors(AbstractHttpConfigurer::disable) // 前后端分离不需要---因为是无状态的 - .sessionManagement(AbstractHttpConfigurer::disable) + // .sessionManagement(AbstractHttpConfigurer::disable) + .sessionManagement(session -> + session.sessionCreationPolicy(SessionCreationPolicy.STATELESS) + ) // 前后端分离不需要---记住我 .rememberMe(AbstractHttpConfigurer::disable) .authorizeHttpRequests(authorize -> authorize