From 46aabbda5201c70947fcbd31ac16cc193406542f Mon Sep 17 00:00:00 2001 From: bunny <1319900154@qq.com> Date: Sat, 17 May 2025 16:08:31 +0800 Subject: [PATCH 1/2] =?UTF-8?q?:poop:=20feat:=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- {auh-api => auth-api}/Dockerfile | 0 {auh-api => auth-api}/pom.xml | 2 +- .../cn/bunny/services/AuthServiceApplication.java | 0 .../src/main/java/cn/bunny/services/ReadMe.md | 0 .../bunny/services/controller/IndexController.java | 2 +- .../configuration/ConfigurationController.java | 0 .../configuration/EmailTemplateController.java | 0 .../configuration/EmailUsersController.java | 0 .../controller/configuration/I18nController.java | 0 .../configuration/I18nTypeController.java | 0 .../configuration/MenuIconController.java | 0 .../services/controller/file/FilesController.java | 0 .../controller/file/FilesParDetailController.java | 0 .../log/ScheduleExecuteLogController.java | 0 .../controller/log/UserLoginLogController.java | 0 .../controller/message/MessageController.java | 0 .../message/MessageReceivedController.java | 0 .../controller/message/MessageTypeController.java | 0 .../controller/schedule/SchedulersController.java | 0 .../schedule/SchedulersGroupController.java | 0 .../services/controller/system/DeptController.java | 0 .../controller/system/PermissionController.java | 0 .../services/controller/system/RoleController.java | 0 .../controller/system/RolePermissionController.java | 0 .../controller/system/RouterController.java | 0 .../controller/system/RouterRoleController.java | 0 .../services/controller/system/UserController.java | 0 .../controller/system/UserLoginController.java | 0 .../controller/system/UserRoleController.java | 0 .../src/main/resources/application-dev.yml | 0 .../src/main/resources/application-test.yml | 0 .../src/main/resources/application.yml | 0 {auh-api => auth-api}/src/main/resources/banner.txt | 0 .../src/main/resources/logback.xml | 0 .../src/main/resources/static/backup.sh | 0 .../src/main/resources/static/error/400.html | 0 .../src/main/resources/static/error/403.html | 0 .../src/main/resources/static/error/404.html | 0 .../src/main/resources/static/error/500.html | 0 .../src/main/resources/static/error/501.html | 0 .../src/main/resources/static/error/502.html | 0 .../src/main/resources/static/error/503.html | 0 .../src/main/resources/static/error/504.html | 0 .../src/main/resources/static/error/505.html | 0 .../src/main/resources/static/error/506.html | 0 .../src/main/resources/static/error/507.html | 0 .../src/main/resources/static/error/509.html | 0 .../src/main/resources/static/error/510.html | 0 .../src/main/resources/static/favicon.ico | Bin .../src/main/resources/static/platform-config.json | 0 .../src/main/resources/templates/index.html | 2 +- .../src/test/java/impl/BuildPermissionApiTest.java | 0 .../src/test/java/impl/ControllerScannerTest.java | 0 pom.xml | 2 +- .../services/core/strategy/login/LoginContext.java | 1 + .../security/config/MethodSecurityConfig.java | 2 +- .../services/security/config/WebSecurityConfig.java | 6 +++++- 57 files changed, 11 insertions(+), 6 deletions(-) rename {auh-api => auth-api}/Dockerfile (100%) rename {auh-api => auth-api}/pom.xml (97%) rename {auh-api => auth-api}/src/main/java/cn/bunny/services/AuthServiceApplication.java (100%) rename {auh-api => auth-api}/src/main/java/cn/bunny/services/ReadMe.md (100%) rename {auh-api => auth-api}/src/main/java/cn/bunny/services/controller/IndexController.java (96%) rename {auh-api => auth-api}/src/main/java/cn/bunny/services/controller/configuration/ConfigurationController.java (100%) rename {auh-api => auth-api}/src/main/java/cn/bunny/services/controller/configuration/EmailTemplateController.java (100%) rename {auh-api => auth-api}/src/main/java/cn/bunny/services/controller/configuration/EmailUsersController.java (100%) rename {auh-api => auth-api}/src/main/java/cn/bunny/services/controller/configuration/I18nController.java (100%) rename {auh-api => auth-api}/src/main/java/cn/bunny/services/controller/configuration/I18nTypeController.java (100%) rename {auh-api => auth-api}/src/main/java/cn/bunny/services/controller/configuration/MenuIconController.java (100%) rename {auh-api => auth-api}/src/main/java/cn/bunny/services/controller/file/FilesController.java (100%) rename {auh-api => auth-api}/src/main/java/cn/bunny/services/controller/file/FilesParDetailController.java (100%) rename {auh-api => auth-api}/src/main/java/cn/bunny/services/controller/log/ScheduleExecuteLogController.java (100%) rename {auh-api => auth-api}/src/main/java/cn/bunny/services/controller/log/UserLoginLogController.java (100%) rename {auh-api => auth-api}/src/main/java/cn/bunny/services/controller/message/MessageController.java (100%) rename {auh-api => auth-api}/src/main/java/cn/bunny/services/controller/message/MessageReceivedController.java (100%) rename {auh-api => auth-api}/src/main/java/cn/bunny/services/controller/message/MessageTypeController.java (100%) rename {auh-api => auth-api}/src/main/java/cn/bunny/services/controller/schedule/SchedulersController.java (100%) rename {auh-api => auth-api}/src/main/java/cn/bunny/services/controller/schedule/SchedulersGroupController.java (100%) rename {auh-api => auth-api}/src/main/java/cn/bunny/services/controller/system/DeptController.java (100%) rename {auh-api => auth-api}/src/main/java/cn/bunny/services/controller/system/PermissionController.java (100%) rename {auh-api => auth-api}/src/main/java/cn/bunny/services/controller/system/RoleController.java (100%) rename {auh-api => auth-api}/src/main/java/cn/bunny/services/controller/system/RolePermissionController.java (100%) rename {auh-api => auth-api}/src/main/java/cn/bunny/services/controller/system/RouterController.java (100%) rename {auh-api => auth-api}/src/main/java/cn/bunny/services/controller/system/RouterRoleController.java (100%) rename {auh-api => auth-api}/src/main/java/cn/bunny/services/controller/system/UserController.java (100%) rename {auh-api => auth-api}/src/main/java/cn/bunny/services/controller/system/UserLoginController.java (100%) rename {auh-api => auth-api}/src/main/java/cn/bunny/services/controller/system/UserRoleController.java (100%) rename {auh-api => auth-api}/src/main/resources/application-dev.yml (100%) rename {auh-api => auth-api}/src/main/resources/application-test.yml (100%) rename {auh-api => auth-api}/src/main/resources/application.yml (100%) rename {auh-api => auth-api}/src/main/resources/banner.txt (100%) rename {auh-api => auth-api}/src/main/resources/logback.xml (100%) rename {auh-api => auth-api}/src/main/resources/static/backup.sh (100%) rename {auh-api => auth-api}/src/main/resources/static/error/400.html (100%) rename {auh-api => auth-api}/src/main/resources/static/error/403.html (100%) rename {auh-api => auth-api}/src/main/resources/static/error/404.html (100%) rename {auh-api => auth-api}/src/main/resources/static/error/500.html (100%) rename {auh-api => auth-api}/src/main/resources/static/error/501.html (100%) rename {auh-api => auth-api}/src/main/resources/static/error/502.html (100%) rename {auh-api => auth-api}/src/main/resources/static/error/503.html (100%) rename {auh-api => auth-api}/src/main/resources/static/error/504.html (100%) rename {auh-api => auth-api}/src/main/resources/static/error/505.html (100%) rename {auh-api => auth-api}/src/main/resources/static/error/506.html (100%) rename {auh-api => auth-api}/src/main/resources/static/error/507.html (100%) rename {auh-api => auth-api}/src/main/resources/static/error/509.html (100%) rename {auh-api => auth-api}/src/main/resources/static/error/510.html (100%) rename {auh-api => auth-api}/src/main/resources/static/favicon.ico (100%) rename {auh-api => auth-api}/src/main/resources/static/platform-config.json (100%) rename {auh-api => auth-api}/src/main/resources/templates/index.html (98%) rename {auh-api => auth-api}/src/test/java/impl/BuildPermissionApiTest.java (100%) rename {auh-api => auth-api}/src/test/java/impl/ControllerScannerTest.java (100%) 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 From 47199347b47a8ab5e62a5b7bd9a0102f3eb7822d Mon Sep 17 00:00:00 2001 From: bunny <1319900154@qq.com> Date: Sat, 17 May 2025 20:17:32 +0800 Subject: [PATCH 2/2] =?UTF-8?q?:green=5Fheart:=20feat:=20=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0gitlab=E6=9E=84=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab-ci.yml | 49 ++++++ auth-api/Dockerfile => Dockerfile | 0 Gitlab安装.md | 256 ++++++++++++++++++++++++++++++ 3 files changed, 305 insertions(+) create mode 100644 .gitlab-ci.yml rename auth-api/Dockerfile => Dockerfile (100%) create mode 100644 Gitlab安装.md diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..ade5a0d --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,49 @@ +# 定义CI/CD流水线的阶段 +stages: + - build # 第一阶段：构建应用程序 + - build-docker # 第二阶段：构建Docker镜像 + - deploy # 第三阶段：部署应用程序 + +# 定义全局变量 +variables: + CONTAINER_NAME: "bunny-auth-server" # Docker容器名称 + DOCKER_TAG: "4.0.0" # Docker镜像标签版本 + +# 构建任务 +build-job: + stage: build # 指定此任务属于build阶段 + script: + # 打印编译开始信息 + - echo "Compiling the code..." + # 使用Maven编译Java项目，跳过测试 + - mvn clean package -DskipTests + # 打印编译完成信息 + - echo "Compile complete." + # 从Docker Hub拉取OpenJDK基础镜像 + - docker pull openjdk:24-ea-17-jdk-oraclelinux9 + # 打印拉取完成信息 + - echo "docker pull complete." + # 使用Dockerfile构建Docker镜像，并打上标签 + - docker build -f Dockerfile -t $CONTAINER_NAME:$DOCKER_TAG . + # 打印构建成功信息 + - echo "Application successfully deployed." + +# 部署任务 +deploy-job: + stage: deploy # 指定此任务属于deploy阶段 + environment: production # 指定部署环境为production + script: + # 打印部署开始信息 + - echo "Deploying application..." + # 停止正在运行的容器（如果存在），|| true确保命令失败不会中断脚本 + - docker stop $CONTAINER_NAME || true + # 删除容器（如果存在） + - docker rm $CONTAINER_NAME || true + # 运行新的Docker容器 + # -d: 后台运行 + # -p: 端口映射（7070和8000） + # --name: 容器名称 + # --restart always: 总是自动重启 + - docker run -d -p 7070:7070 -p 8000:8000 --name $CONTAINER_NAME --restart always $CONTAINER_NAME:$DOCKER_TAG + # 打印部署成功信息 + - echo "Application successfully deployed." \ No newline at end of file diff --git a/auth-api/Dockerfile b/Dockerfile similarity index 100% rename from auth-api/Dockerfile rename to Dockerfile diff --git a/Gitlab安装.md b/Gitlab安装.md new file mode 100644 index 0000000..aafa181 --- /dev/null +++ b/Gitlab安装.md @@ -0,0 +1,256 @@ +# Gitlab安装 + +完全笔记《安装GitLabel》 ：https://www.yuque.com/bunny-6ixda/bgxtva/wtw4x4r8kbvxwgac?singleDoc# + +## Docker安装 + +- docker镜像： + +- https://hub.docker.com/r/gitlab/gitlab-ee/tags?name=17.9.6 +- https://hub.docker.com/r/gitlab/gitlab-runner/tags?name=17.11.0 + +```bash +sudo apt-get remove docker docker-engine docker.io containerd runc +sudo apt update +sudo apt upgrade +sudo apt-get install ca-certificates curl gnupg lsb-release +# 添加Docker官方GPG密钥 +sudo curl -fsSL http://mirrors.aliyun.com/docker-ce/linux/ubuntu/gpg | sudo apt-key add - +sudo add-apt-repository "deb [arch=amd64] http://mirrors.aliyun.com/docker-ce/linux/ubuntu $(lsb_release -cs) stable" +# 安装docker +sudo apt-get install docker-ce docker-ce-cli containerd.io +# 默认情况下，只有root用户和docker组的用户才能运行Docker命令。我们可以将当前用户添加到docker组，以避免每次使用Docker时都需要使用sudo，设置完成后退出当前用户之后再进入既可 +sudo usermod -aG docker $USER +# 运行docker +sudo systemctl start docker +# 安装工具 +sudo apt-get -y install apt-transport-https ca-certificates curl software-properties-common +# 重启docker +sudo service docker restart +# 重启终端生效 +exit +``` + +配置镜像源 + +```bash +# 创建目录 +sudo mkdir -p /etc/docker +# 写入配置文件 +sudo tee /etc/docker/daemon.json <<-'EOF' +{ + "registry-mirrors": [ + "https://docker-0.unsee.tech", + "https://docker-cf.registry.cyou", + "https://docker.1panel.live" + ] +} +EOF + +# 重启docker服务 +sudo systemctl daemon-reload && sudo systemctl restart docker +``` + +## 环境搭建 + +### 安装JDK21 + +```bash +# 安装JDK21 +wget https://download.oracle.com/java/21/latest/jdk-21_linux-x64_bin.deb +sudo dpkg -i jdk-21_linux-x64_bin.deb +java --version +``` + +### Maven 3.8.8安装 + +#### 安装 + +```bash +# 安装maven +wget https://archive.apache.org/dist/maven/maven-3/3.8.8/binaries/apache-maven-3.8.8-bin.tar.gz +sudo mkdir -p /opt/maven +sudo tar -xzf apache-maven-3.8.8-bin.tar.gz -C /opt/maven +sudo mv /opt/maven/apache-maven-3.8.8 /opt/maven/maven-3.8.8 + +# 修改镜像配置 +cd /opt/maven/maven-3.8.8/conf +# 赋予权限修改 +sudo chmod 666 settings.xml + +# 编写配置 +sudo vim /etc/profile + +# 添加以下内容 +# export PATH=$PATH:/opt/maven/maven-3.8.8/bin + +# 刷新配置 +source /etc/profile +mvn -V +``` + +#### maven的镜像 + +```xml + + aliyun + Aliyun Maven Mirror + https://maven.aliyun.com/repository/public + central + +``` + +## 安装Gitlab + +```bash +# Ubuntu +wget https://mirrors.tuna.tsinghua.edu.cn/gitlab-ce/ubuntu/pool/focal/main/g/gitlab-ce/gitlab-ce_18.0.0-ce.0_amd64.deb + +# dpkg +sudo dpkg -i gitlab-ce_18.0.0-ce.0_amd64.deb +``` + +### 编辑配置 + +```bash +# 编辑站点 +sudo vim /etc/gitlab/gitlab.rb +``` + +修改下面内容 + +```bash +external_url 'http://192.168.95.134:3001' +``` + +应用配置 + +```bash +# 应用配置 +sudo gitlab-ctl reconfigure +``` + +### 常用命令 + +```bash +# 服务控制 +sudo gitlab-ctl start +sudo gitlab-ctl status +sudo gitlab-ctl stop + +# 应用配置 +sudo gitlab-ctl reconfigure + +# 重启 +sudo gitlab-ctl restart +``` + +### 查看密码 + +```bash +# 24 小时后自动删除 +sudo cat /etc/gitlab/initial_root_password +``` + +## 安装Gitlab-Runner + +```bash +# 需要 gitlab-runner-helper-images +wget https://mirrors.tuna.tsinghua.edu.cn/gitlab-runner/ubuntu/pool/focal/main/g/gitlab-runner-helper-images/gitlab-runner-helper-images_18.0.1-1_all.deb +sudo dpkg -i gitlab-runner-helper-images_18.0.1-1_all.deb + +# 之后安装 gitlab-runner +wget https://mirrors.tuna.tsinghua.edu.cn/gitlab-runner/ubuntu/pool/focal/main/g/gitlab-runner/gitlab-runner_18.0.1-1_amd64.deb +sudo dpkg -i gitlab-runner_18.0.1-1_amd64.deb +``` + +### 先下载后安装 + +```bash +# Ubuntu +wget https://mirrors.tuna.tsinghua.edu.cn/gitlab-runner/ubuntu/pool/focal/main/g/gitlab-runner-helper-images/gitlab-runner-helper-images_18.0.1-1_all.deb +wget https://mirrors.tuna.tsinghua.edu.cn/gitlab-runner/ubuntu/pool/focal/main/g/gitlab-runner/gitlab-runner_18.0.1-1_amd64.deb + +# dpkg +sudo dpkg -i gitlab-runner-helper-images_18.0.1-1_all.deb +sudo dpkg -i gitlab-runner_18.0.1-1_amd64.deb +``` + +### 配置Gitlab-Runner用户 + +> [!NOTE] +> +> 如果有需要清理缓存：`sudo rm -rf /opt/maven/maven-3.8.8/conf/builds/**`** +> +> gitlab-ce：https://mirrors.tuna.tsinghua.edu.cn/gitlab-ce/ubuntu/pool/focal/main/g/gitlab-ce/ +> +> gitlab-runner-helper-images：https://mirrors.tuna.tsinghua.edu.cn/gitlab-runner/ubuntu/pool/focal/main/g/gitlab-runner-helper-images/ +> +> gitlab-runner：https://mirrors.tuna.tsinghua.edu.cn/gitlab-runner/ubuntu/pool/focal/main/g/gitlab-runner/ + +```bash +sudo gitlab-runner uninstall +sudo gitlab-runner install --working-directory /home/gitlab-runner --user root +sudo systemctl restart gitlab-runner +``` + +### 检查 GitLab Runner 配置 + +```bash +sudo vim /etc/gitlab-runner/config.toml +``` + +修改文件 + +```bash +[[runners]] + name = "my-runner" + executor = "shell" + shell = "bash" + user = "gitlab-runner" # 确保用户有权限 + working_directory = "/home/gitlab-runner" +``` + +### 检查 Maven 安装目录权限 + +```bash +sudo chmod 777 -R /opt/maven/maven-3.8.8 +sudo chmod 777 -R /opt/maven/maven-3.8.8/ +sudo chown -R gitlab-runner:gitlab-runner /opt/maven/maven-3.8.8/ +``` + +## CI/CD脚本示例 + +如果构建出现`pending`情况大部分情况下，是文件写错了，要么是`Gitlab-Runner`标签没写对 + +```yml +stages: + - build + - build-docker + - deploy + +variables: + CONTAINER_NAME: "bunny-auth-server" + DOCKER_TAG: "4.0.0" + +build-job: + stage: build + script: + - echo "Compiling the code..." + - mvn clean package -DskipTests + - echo "Compile complete." + - docker pull openjdk:24-ea-17-jdk-oraclelinux9 + - echo "docker pull complete." + - docker build -f Dockerfile -t $CONTAINER_NAME:$DOCKER_TAG . + - echo "Application successfully deployed." + +deploy-job: + stage: deploy + environment: production + script: + - echo "Deploying application..." + - docker stop $CONTAINER_NAME || true + - docker rm $CONTAINER_NAME || true + - docker run -d -p 7070:7070 -p 8000:8000 --name $CONTAINER_NAME --restart always $CONTAINER_NAME:$DOCKER_TAG + - echo "Application successfully deployed." +``` \ No newline at end of file