refactor(config):重构配置文件并优化认证异常处理

- 移除各模块中重复的 spring.config.import 配置
- 新增 bootstrap.yml 文件用于 wol-module-codegen 模块配置加载
- 在网关模块新增 codegen 路由规则
- 将通用依赖提升至父级 pom 统一管理
- 为 SaToken 认证失败添加详细日志记录- 优化认证异常处理逻辑，区分登录异常与其他认证异常
- 移除系统基础模块和代码生成模块中的冗余依赖声明

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,36 +0,0 @@
----
-name: Bug 报告
-about: 创建BUG报告以改进项目
-title: ''
-labels: ''
-assignees: ''
-
----
-
-**BUG描述**
-关于BUG清晰简洁的描述。
-
-**复现步骤**
-详细的复现步骤。
-
-
-**正确的行为**
-你认为这个修复这个BUG后，正确的行为应该是什么。
-
-
-**详细截图**
-如果可以的话，请添加截图以帮助调查BUG.
-
-**桌面端:**
- - 操作系统: [例如. iOS]
- - 浏览器及版本 [例如. chrome 11]
- - 项目版本 [例如. 1.6.0]
-
-**手机端:**
- - 设备: [例如. iPhone6]
- - 操作系统: [例如. iOS8.1]
- - 浏览器及版本 [例如.safari 8]
- - 项目版本 [例如. 1.6.0]
-
-**Additional context**
-任何其他你认为有助于排查错误的信息，或者你的猜测。

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,20 +0,0 @@
----
-name: 功能建议
-about: 关于该项目的建议
-title: ''
-labels: ''
-assignees: ''
-
----
-
-**您的功能请求是否与问题相关？ 请描述。**
-清楚简明地描述问题所在。 
-
-**描述您想要的解决方案**
-对您所设想的问题的清晰简洁的描述。
-
-**描述您考虑过的替代方案**
-对您考虑过的任何替代解决方案或功能的清晰简洁的描述。
-
-**附加上下文**
-在此处添加有关功能请求的任何其他上下文或屏幕截图。

.gitignore

@@ -45,6 +45,6 @@ nbdist/
 !*/build/*.java
 !*/build/*.html
 !*/build/*.xml
-/agileboot-admin/src/main/resources/application-dev.yml
-/agileboot-infrastructure/src/main/resources/application-prod.yml
-/agileboot-infrastructure/src/main/resources/logback-prod.xml
+
+/agileboot-admin/src/main/resources/application-prod.yml
+

Dockerfile

@@ -0,0 +1,8 @@
+FROM amazoncorretto:17
+ADD agileboot-admin/target/agileboot-admin-1.0.0.jar /agileboot-admin.jar
+
+EXPOSE 18080
+#ENV CONTEXT_PATH /
+# ENV NACOS_ENABLED true
+RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone
+ENTRYPOINT ["java", "-jar", "/agileboot-admin.jar"]

LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2022 valarchie
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

README.md

@@ -15,8 +15,7 @@
 
 <img alt="logo" height="200" src="https://oscimg.oschina.net/oscnet/up-eda2a402cc061f1f5f40d9ac4c084f4c98c.png">
 </p>
-<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">AgileBoot v1.8.0</h1>
-
+<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">AgileBoot v2.0.0 </h1>
 <h4 align="center">基于SpringBoot+Vue3前后端分离的Java快速开发脚手架</h4>
 <p align="center">
 </p>
@@ -27,7 +26,8 @@ AgileBoot是一套开源的全栈精简快速开发平台，毫无保留给个
 适合个人开发者的小型项目或者公司内部项目使用。也可作为供初学者学习使用的案例。
 
 
-* 前端采用Vue3、Element Plus。对应前端仓库 [AgileBoot-Front-End](https://github.com/valarchie/AgileBoot-Front-End) ，保持同步更新。
+* 前端是基于优秀的开源项目[Pure-Admin](https://github.com/pure-admin/vue-pure-admin)开发而成。在此感谢Pure-Admin作者。
+* 前端采用Vue3、Element Plus、TypeScript、Pinia。对应前端仓库 [AgileBoot-Front-End](https://github.com/valarchie/AgileBoot-Front-End) ，保持同步更新。
 * 后端采用Spring Boot、Spring Security & Jwt、Redis & MySql、Mybatis Plus、Hutool工具包。
 * 权限认证使用Jwt，支持多终端认证系统。
 * 支持注解式主从数据库切换，注解式请求限流，注解式重复请求拦截。
@@ -35,6 +35,9 @@ AgileBoot是一套开源的全栈精简快速开发平台，毫无保留给个
 * 支持加载动态权限菜单，实时权限控制。
 * ***有大量的单元测试，集成测试覆盖确保业务逻辑正确***。
 
+***V1.0.0版本使用JS开发，V2.0.0版本使用TS开发***。  
+***V1.0.0地址：[后端(AgileBoot-Back-End-Basic)](https://github.com/valarchie/AgileBoot-Back-End-Basic) -  [前端(AgileBoot-Front-End-Basic)](https://github.com/valarchie/AgileBoot-Front-End-Basic)***
+
 > 有任何问题或者建议，可以在 _Issues_ 中提给作者。  
 > 
 > 您的Issue比Star更重要
@@ -148,9 +151,9 @@ git clone https://github.com/valarchie/AgileBoot-Front-End
 #### 后端启动
 ```
 1. 生成所需的数据库表
-找到后端项目根目录下的sql目录中的agileboot_xxxxx.sql脚本文件。 导入到你新建的数据库中。
+找到后端项目根目录下的sql目录中的agileboot_xxxxx.sql脚本文件(取最新的sql文件)。 导入到你新建的数据库中。
 
-2. 在infrastructure模块底下，找到resource目录下的application-dev.yml文件
+2. 在admin模块底下，找到resource目录下的application-dev.yml文件
 配置数据库以及Redis的 地址、端口、账号密码
 
 3. 在根目录执行mvn install
@@ -168,16 +171,18 @@ git clone https://github.com/valarchie/AgileBoot-Front-End
 ```
 
 #### 前端启动
-```
-1. npm install
+详细步骤请查看对应前端部分
 
-2. npm run dev
+```
+1. pnpm install
+
+2. pnpm run dev
 
 3. 当出现以下字样时即为启动成功
 
 vite v2.6.14 dev server running at:
 
-> Local: http://127.0.0.1:3000/
+> Local: http://127.0.0.1:80/
 
 ready in 4376ms.
 
@@ -232,8 +237,6 @@ agileboot.embedded.redis: true
 |     | 连接池监视 | 监视当前系统数据库连接池状态，可进行分析SQL找出系统性能瓶颈 |
 
 
-目前版本是V1.8.0，将在2.0版本后陆续新增新功能。
-
 ## 🐯 工程结构 🐯
 
 ``` 
@@ -244,25 +247,20 @@ agileboot
 │
 ├── agileboot-common -- 精简基础工具模块
 │
-├── agileboot-infrastructure -- 基础设施模块（主要是配置和集成）
+├── agileboot-infrastructure -- 基础设施模块（主要是配置和集成，不包含业务逻辑）
 │
 ├── agileboot-domain -- 业务模块
 ├    ├── user -- 用户模块（举例）
 ├         ├── command -- 命令参数接收模型（命令）
 ├         ├── dto -- 返回数据类
+├         ├── db -- DB操作类
+├              ├── entity -- 实体类
+├              ├── service -- DB Service
+├              ├── mapper -- DB Dao
 ├         ├── model -- 领域模型类
 ├         ├── query -- 查询参数模型（查询）
 │         ├────── UserApplicationService -- 应用服务（事务层，操作领域模型类完成业务逻辑）
-│
-├── agileboot-integration-test -- 集成测试模块
-│
-├── agileboot-orm -- 数据映射模块（仅包含数据相关逻辑）
-├    ├── entiy -- 实体类
-├    ├── enums -- 数据相关枚举 
-├    ├── mapper -- DAO 
-├    ├── query -- 封装查询对象 
-├    ├── result -- 封装多表查询对象 
-└──  └── service -- 服务层
+
 ```
 
 ### 代码流转
@@ -286,11 +284,16 @@ agileboot
 │                ├── member -- 会员模块
 │
 ├── agileboot-domain -- 
-├                ├── member -- 会员模块
-│
-├── agileboot-orm -- 
-│              ├── member -- 会员模块
-│    
+├                ├── member -- 会员模块（举例）
+├                     ├── command -- 命令参数接收模型（命令）
+├                     ├── dto -- 返回数据类
+├                     ├── db -- DB操作类
+├                          ├── entity -- 实体类
+├                          ├── service -- DB Service
+├                          ├── mapper -- DB Dao
+├                     ├── model -- 领域模型类
+├                     ├── query -- 查询参数模型（查询）
+│                     ├────── MemberApplicationService -- 应用服务（事务层，操作领域模型类完成业务逻辑）
 └─
 ```
 
@@ -315,11 +318,12 @@ agileboot
 - 请导入统一的代码格式化模板（Google）: Settings > Editor > Code Style > Java > 设置按钮 > import schema > 选择项目根目录下的GoogleStyle.xml文件
 - 如需要生成新的表，请使用CodeGenerator类进行生成。
   - 填入数据库地址，账号密码，库名。然后填入所需的表名执行代码即可。（大概看一下代码就知道怎么填啦）
-  - 生成的类在orm模块下的target/classes目录下
+  - 生成的类在infrastructure模块下的target/classes目录下
   - 不同的数据库keywordsHandler方法请填入对应不同数据库handler。（搜索keywordsHandler关键字）
 - 项目基础环境搭建，请参考docker目录下的指南搭建。保姆级启动说明：
   - [AgileBoot - 手把手一步一步带你Run起全栈项目(SpringBoot+Vue3)](https://juejin.cn/post/7153812187834744845)
 - 注意：管理后台的后端启动类是AgileBoot**Admin**Application
+- Swagger的API地址为 http://localhost:8080/v3/api-docs
 
 ## 🎬 AgileBoot全栈交流群 🎬
 

agileboot-admin/src/main/java/com/agileboot/admin/AgileBootAdminApplication.java

@@ -1,32 +0,0 @@
-package com.agileboot.admin;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
-import org.springframework.context.annotation.ComponentScan;
-
-/**
- * 启动程序
- * 定制banner.txt的网站
- * http://patorjk.com/software/taag
- * http://www.network-science.de/ascii/
- * http://www.degraeve.com/img2txt.php
- * http://life.chacuo.net/convertfont2char
- * @author valarchie
- */
-@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
-@ComponentScan(basePackages = "com.agileboot.*")
-public class AgileBootAdminApplication {
-
-    public static void main(String[] args) {
-        SpringApplication.run(AgileBootAdminApplication.class, args);
-        String successMsg = "  ____   _                _                                                           __         _  _ \n"
-                          + " / ___| | |_  __ _  _ __ | |_   _   _  _ __    ___  _   _   ___  ___  ___  ___  ___  / _| _   _ | || |\n"
-                          + " \\___ \\ | __|/ _` || '__|| __| | | | || '_ \\  / __|| | | | / __|/ __|/ _ \\/ __|/ __|| |_ | | | || || |\n"
-                          + "  ___) || |_| (_| || |   | |_  | |_| || |_) | \\__ \\| |_| || (__| (__|  __/\\__ \\\\__ \\|  _|| |_| || ||_|\n"
-                          + " |____/  \\__|\\__,_||_|    \\__|  \\__,_|| .__/  |___/ \\__,_| \\___|\\___|\\___||___/|___/|_|   \\__,_||_|(_)\n"
-                          + "                                      |_|                                                             ";
-
-        System.out.println(successMsg);
-    }
-}

agileboot-admin/src/main/java/com/agileboot/admin/controller/common/FileController.java

@@ -1,129 +0,0 @@
-package com.agileboot.admin.controller.common;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.io.FileUtil;
-import cn.hutool.core.io.file.FileNameUtil;
-import com.agileboot.common.constant.Constants.UploadSubDir;
-import com.agileboot.common.core.dto.ResponseDTO;
-import com.agileboot.common.exception.ApiException;
-import com.agileboot.common.exception.error.ErrorCode;
-import com.agileboot.common.exception.error.ErrorCode.Business;
-import com.agileboot.common.utils.ServletHolderUtil;
-import com.agileboot.common.utils.file.FileUploadUtils;
-import com.agileboot.common.utils.jackson.JacksonUtil;
-import com.agileboot.domain.common.dto.UploadDTO;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import java.util.ArrayList;
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
-
-/**
- * 通用请求处理
- * TODO 需要重构
- * @author valarchie
- */
-@Tag(name = "上传API", description = "上传相关接口")
-@RestController
-@RequestMapping("/file")
-@Slf4j
-public class FileController {
-
-
-    /**
-     * 通用下载请求
-     * download接口  其实不是很有必要
-     * @param fileName 文件名称
-     */
-    @Operation(summary = "下载文件")
-    @GetMapping("/download")
-    public ResponseEntity<byte[]> fileDownload(String fileName, HttpServletResponse response) {
-        try {
-            if (!FileUploadUtils.isAllowDownload(fileName)) {
-                // 返回类型是ResponseEntity 不能捕获异常， 需要手动将错误填到 ResponseEntity
-                ResponseDTO<Object> fail = ResponseDTO.fail(
-                    new ApiException(Business.COMMON_FILE_NOT_ALLOWED_TO_DOWNLOAD, fileName));
-                return new ResponseEntity<>(JacksonUtil.to(fail).getBytes(), null, HttpStatus.OK);
-            }
-
-            String filePath = FileUploadUtils.getFileAbsolutePath(UploadSubDir.DOWNLOAD_PATH, fileName);
-
-            HttpHeaders downloadHeader = FileUploadUtils.getDownloadHeader(fileName);
-
-            response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
-            return new ResponseEntity<>(FileUtil.readBytes(filePath), downloadHeader, HttpStatus.OK);
-        } catch (Exception e) {
-            log.error("下载文件失败", e);
-            return null;
-        }
-    }
-
-    /**
-     * 通用上传请求（单个）
-     */
-    @Operation(summary = "单个上传文件")
-    @PostMapping("/upload")
-    public ResponseDTO<UploadDTO> uploadFile(MultipartFile file) {
-        if (file == null) {
-            throw new ApiException(ErrorCode.Business.UPLOAD_FILE_IS_EMPTY);
-        }
-
-        // 上传并返回新文件名称
-        String fileName = FileUploadUtils.upload(UploadSubDir.UPLOAD_PATH, file);
-
-        String url = ServletHolderUtil.getContextUrl() + fileName;
-
-        UploadDTO uploadDTO = UploadDTO.builder()
-            // 全路径
-            .url(url)
-            // 相对路径
-            .fileName(fileName)
-            // 新生成的文件名
-            .newFileName(FileNameUtil.getName(fileName))
-            // 原始的文件名
-            .originalFilename(file.getOriginalFilename()).build();
-
-        return ResponseDTO.ok(uploadDTO);
-    }
-
-    /**
-     * 通用上传请求（多个）
-     */
-    @Operation(summary = "多个上传文件")
-    @PostMapping("/uploads")
-    public ResponseDTO<List<UploadDTO>> uploadFiles(List<MultipartFile> files) {
-        if (CollUtil.isEmpty(files)) {
-            throw new ApiException(ErrorCode.Business.UPLOAD_FILE_IS_EMPTY);
-        }
-
-        List<UploadDTO> uploads = new ArrayList<>();
-
-        for (MultipartFile file : files) {
-            if (file != null) {
-                // 上传并返回新文件名称
-                String fileName = FileUploadUtils.upload(UploadSubDir.UPLOAD_PATH, file);
-                String url = ServletHolderUtil.getContextUrl() + fileName;
-                UploadDTO uploadDTO = UploadDTO.builder()
-                    .url(url)
-                    .fileName(fileName)
-                    .newFileName(FileNameUtil.getName(fileName))
-                    .originalFilename(file.getOriginalFilename()).build();
-
-                uploads.add(uploadDTO);
-
-            }
-        }
-        return ResponseDTO.ok(uploads);
-    }
-
-}

agileboot-admin/src/main/java/com/agileboot/admin/controller/common/LoginController.java

@@ -1,140 +0,0 @@
-package com.agileboot.admin.controller.common;
-
-import cn.hutool.core.util.StrUtil;
-import com.agileboot.common.config.AgileBootConfig;
-import com.agileboot.common.core.dto.ResponseDTO;
-import com.agileboot.common.exception.ApiException;
-import com.agileboot.common.exception.error.ErrorCode.Business;
-import com.agileboot.domain.common.dto.CurrentLoginUserDTO;
-import com.agileboot.domain.common.dto.TokenDTO;
-import com.agileboot.domain.system.menu.MenuApplicationService;
-import com.agileboot.domain.system.menu.dto.RouterDTO;
-import com.agileboot.domain.system.user.UserApplicationService;
-import com.agileboot.domain.system.user.command.AddUserCommand;
-import com.agileboot.infrastructure.annotations.ratelimit.RateLimit;
-import com.agileboot.infrastructure.annotations.ratelimit.RateLimit.CacheType;
-import com.agileboot.infrastructure.annotations.ratelimit.RateLimit.LimitType;
-import com.agileboot.infrastructure.user.AuthenticationUtils;
-import com.agileboot.admin.customize.service.login.dto.CaptchaDTO;
-import com.agileboot.admin.customize.service.login.dto.ConfigDTO;
-import com.agileboot.admin.customize.service.login.command.LoginCommand;
-import com.agileboot.infrastructure.user.web.SystemLoginUser;
-import com.agileboot.infrastructure.annotations.ratelimit.RateLimitKey;
-import com.agileboot.admin.customize.service.login.LoginService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import java.util.List;
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * 首页
- *
- * @author valarchie
- */
-@Tag(name = "登录API", description = "登录相关接口")
-@RestController
-@RequiredArgsConstructor
-public class LoginController {
-
-    private final LoginService loginService;
-
-    private final MenuApplicationService menuApplicationService;
-
-    private final UserApplicationService userApplicationService;
-
-    private final AgileBootConfig agileBootConfig;
-
-    /**
-     * 访问首页，提示语
-     */
-    @Operation(summary = "首页")
-    @GetMapping("/")
-    @RateLimit(key = RateLimitKey.TEST_KEY, time = 10, maxCount = 5, cacheType = CacheType.Map,
-        limitType = LimitType.GLOBAL)
-    public String index() {
-        return StrUtil.format("欢迎使用{}后台管理框架，当前版本：v{}，请通过前端地址访问。",
-            agileBootConfig.getName(), agileBootConfig.getVersion());
-    }
-
-
-    /**
-     * 获取系统的内置配置
-     *
-     * @return 配置信息
-     */
-    @GetMapping("/getConfig")
-    public ResponseDTO<ConfigDTO> getConfig() {
-        ConfigDTO configDTO = loginService.getConfig();
-        return ResponseDTO.ok(configDTO);
-    }
-
-    /**
-     * 生成验证码
-     */
-    @Operation(summary = "验证码")
-    @RateLimit(key = RateLimitKey.LOGIN_CAPTCHA_KEY, time = 10, maxCount = 10, cacheType = CacheType.REDIS,
-        limitType = LimitType.IP)
-    @GetMapping("/captchaImage")
-    public ResponseDTO<CaptchaDTO> getCaptchaImg() {
-        CaptchaDTO captchaImg = loginService.generateCaptchaImg();
-        return ResponseDTO.ok(captchaImg);
-    }
-
-    /**
-     * 登录方法
-     *
-     * @param loginCommand 登录信息
-     * @return 结果
-     */
-    @Operation(summary = "登录")
-    @PostMapping("/login")
-    public ResponseDTO<TokenDTO> login(@RequestBody LoginCommand loginCommand) {
-        // 生成令牌
-        String token = loginService.login(loginCommand);
-        SystemLoginUser loginUser = AuthenticationUtils.getSystemLoginUser();
-        CurrentLoginUserDTO currentUserDTO = userApplicationService.getLoginUserInfo(loginUser);
-
-        return ResponseDTO.ok(new TokenDTO(token, currentUserDTO));
-    }
-
-    /**
-     * 获取用户信息
-     *
-     * @return 用户信息
-     */
-    @Operation(summary = "获取当前登录用户信息")
-    @GetMapping("/getLoginUserInfo")
-    public ResponseDTO<CurrentLoginUserDTO> getLoginUserInfo() {
-        SystemLoginUser loginUser = AuthenticationUtils.getSystemLoginUser();
-
-        CurrentLoginUserDTO currentUserDTO = userApplicationService.getLoginUserInfo(loginUser);
-
-        return ResponseDTO.ok(currentUserDTO);
-    }
-
-    /**
-     * 获取路由信息
-     * TODO 如果要在前端开启路由缓存的话 需要在ServerConfig.json 中  设置CachingAsyncRoutes=true  避免一直重复请求路由接口
-     * @return 路由信息
-     */
-    @Operation(summary = "获取用户对应的菜单路由", description = "用于动态生成路由")
-    @GetMapping("/getRouters")
-    public ResponseDTO<List<RouterDTO>> getRouters() {
-        SystemLoginUser loginUser = AuthenticationUtils.getSystemLoginUser();
-        List<RouterDTO> routerTree = menuApplicationService.getRouterTree(loginUser);
-        return ResponseDTO.ok(routerTree);
-    }
-
-
-    @Operation(summary = "注册接口", description = "暂未实现")
-    @PostMapping("/register")
-    public ResponseDTO<Void> register(@RequestBody AddUserCommand command) {
-        return ResponseDTO.fail(new ApiException(Business.COMMON_UNSUPPORTED_OPERATION));
-    }
-
-}

agileboot-admin/src/main/java/com/agileboot/admin/controller/system/MonitorController.java

@@ -1,83 +0,0 @@
-package com.agileboot.admin.controller.system;
-
-import com.agileboot.common.core.base.BaseController;
-import com.agileboot.common.core.dto.ResponseDTO;
-import com.agileboot.common.core.page.PageDTO;
-import com.agileboot.domain.common.cache.CacheCenter;
-import com.agileboot.domain.system.monitor.MonitorApplicationService;
-import com.agileboot.domain.system.monitor.dto.OnlineUserDTO;
-import com.agileboot.domain.system.monitor.dto.RedisCacheInfoDTO;
-import com.agileboot.domain.system.monitor.dto.ServerInfo;
-import com.agileboot.admin.customize.aop.accessLog.AccessLog;
-import com.agileboot.common.enums.common.BusinessTypeEnum;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import java.util.List;
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * 缓存监控
- *
- * @author valarchie
- */
-@Tag(name = "监控API", description = "监控相关信息")
-@RestController
-@RequestMapping("/monitor")
-@RequiredArgsConstructor
-public class MonitorController extends BaseController {
-
-    private final MonitorApplicationService monitorApplicationService;
-
-    @Operation(summary = "Redis信息")
-    @PreAuthorize("@permission.has('monitor:cache:list')")
-    @GetMapping("/cacheInfo")
-    public ResponseDTO<RedisCacheInfoDTO> getRedisCacheInfo() {
-        RedisCacheInfoDTO redisCacheInfo = monitorApplicationService.getRedisCacheInfo();
-        return ResponseDTO.ok(redisCacheInfo);
-    }
-
-
-    @Operation(summary = "服务器信息")
-    @PreAuthorize("@permission.has('monitor:server:list')")
-    @GetMapping("/serverInfo")
-    public ResponseDTO<ServerInfo> getServerInfo() {
-        ServerInfo serverInfo = monitorApplicationService.getServerInfo();
-        return ResponseDTO.ok(serverInfo);
-    }
-
-    /**
-     * 获取在线用户列表
-     *
-     * @param ipAddress ip地址
-     * @param username 用户名
-     * @return 分页处理后的在线用户信息
-     */
-    @Operation(summary = "在线用户列表")
-    @PreAuthorize("@permission.has('monitor:online:list')")
-    @GetMapping("/onlineUsers")
-    public ResponseDTO<PageDTO<OnlineUserDTO>> onlineUsers(String ipAddress, String username) {
-        List<OnlineUserDTO> onlineUserList = monitorApplicationService.getOnlineUserList(username, ipAddress);
-        return ResponseDTO.ok(new PageDTO<>(onlineUserList));
-    }
-
-    /**
-     * 强退用户
-     */
-    @Operation(summary = "强退用户")
-    @PreAuthorize("@permission.has('monitor:online:forceLogout')")
-    @AccessLog(title = "在线用户", businessType = BusinessTypeEnum.FORCE_LOGOUT)
-    @DeleteMapping("/onlineUser/{tokenId}")
-    public ResponseDTO<Void> logoutOnlineUser(@PathVariable String tokenId) {
-        CacheCenter.loginUserCache.delete(tokenId);
-        return ResponseDTO.ok();
-    }
-
-
-}

agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysConfigController.java

@@ -1,89 +0,0 @@
-package com.agileboot.admin.controller.system;
-
-import com.agileboot.common.core.base.BaseController;
-import com.agileboot.common.core.dto.ResponseDTO;
-import com.agileboot.common.core.page.PageDTO;
-import com.agileboot.domain.common.cache.CacheCenter;
-import com.agileboot.domain.system.config.ConfigApplicationService;
-import com.agileboot.domain.system.config.command.ConfigUpdateCommand;
-import com.agileboot.domain.system.config.dto.ConfigDTO;
-import com.agileboot.domain.system.config.query.ConfigQuery;
-import com.agileboot.admin.customize.aop.accessLog.AccessLog;
-import com.agileboot.common.enums.common.BusinessTypeEnum;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Positive;
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * 参数配置 信息操作处理
- * @author valarchie
- */
-@RestController
-@RequestMapping("/system")
-@Validated
-@RequiredArgsConstructor
-@Tag(name = "配置API", description = "配置相关的增删查改")
-public class SysConfigController extends BaseController {
-
-    private final ConfigApplicationService configApplicationService;
-
-    /**
-     * 获取参数配置列表
-     */
-    @Operation(summary = "参数列表", description = "分页获取配置参数列表")
-    @PreAuthorize("@permission.has('system:config:list')")
-    @GetMapping("/configs")
-    public ResponseDTO<PageDTO<ConfigDTO>> list(ConfigQuery query) {
-        PageDTO<ConfigDTO> page = configApplicationService.getConfigList(query);
-        return ResponseDTO.ok(page);
-    }
-
-    /**
-     * 根据参数编号获取详细信息
-     */
-    @PreAuthorize("@permission.has('system:config:query')")
-    @GetMapping(value = "/config/{configId}")
-    @Operation(summary = "配置信息", description = "配置的详细信息")
-    public ResponseDTO<ConfigDTO> getInfo(@NotNull @Positive @PathVariable Long configId) {
-        ConfigDTO config = configApplicationService.getConfigInfo(configId);
-        return ResponseDTO.ok(config);
-    }
-
-
-    /**
-     * 修改参数配置
-     */
-    @PreAuthorize("@permission.has('system:config:edit')")
-    @AccessLog(title = "参数管理", businessType = BusinessTypeEnum.MODIFY)
-    @Operation(summary = "配置修改", description = "配置修改")
-    @PutMapping(value = "/config/{configId}")
-    public ResponseDTO<Void> edit(@NotNull @Positive @PathVariable Long configId, @RequestBody ConfigUpdateCommand config) {
-        config.setConfigId(configId);
-        configApplicationService.updateConfig(config);
-        return ResponseDTO.ok();
-    }
-
-    /**
-     * 刷新参数缓存
-     */
-    @Operation(summary = "刷新配置缓存")
-    @PreAuthorize("@permission.has('system:config:remove')")
-    @AccessLog(title = "参数管理", businessType = BusinessTypeEnum.CLEAN)
-    @DeleteMapping("/configs/cache")
-    public ResponseDTO<Void> refreshCache() {
-        CacheCenter.configCache.invalidateAll();
-        return ResponseDTO.ok();
-    }
-}

agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysDeptController.java

@@ -1,112 +0,0 @@
-package com.agileboot.admin.controller.system;
-
-import cn.hutool.core.lang.tree.Tree;
-import com.agileboot.common.core.base.BaseController;
-import com.agileboot.common.core.dto.ResponseDTO;
-import com.agileboot.domain.system.dept.DeptApplicationService;
-import com.agileboot.domain.system.dept.command.AddDeptCommand;
-import com.agileboot.domain.system.dept.command.UpdateDeptCommand;
-import com.agileboot.domain.system.dept.dto.DeptDTO;
-import com.agileboot.domain.system.dept.query.DeptQuery;
-import com.agileboot.admin.customize.aop.accessLog.AccessLog;
-import com.agileboot.common.enums.common.BusinessTypeEnum;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import java.util.List;
-import javax.validation.constraints.NotNull;
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * 部门信息
- *
- * @author valarchie
- */
-@RestController
-@RequestMapping("/system")
-@Validated
-@RequiredArgsConstructor
-@Tag(name = "部门API", description = "部门相关的增删查改")
-public class SysDeptController extends BaseController {
-
-    private final DeptApplicationService deptApplicationService;
-
-    /**
-     * 获取部门列表
-     */
-    @Operation(summary = "部门列表")
-    @PreAuthorize("@permission.has('system:dept:list')")
-    @GetMapping("/depts")
-    public ResponseDTO<List<DeptDTO>> list(DeptQuery query) {
-        List<DeptDTO> deptList = deptApplicationService.getDeptList(query);
-        return ResponseDTO.ok(deptList);
-    }
-
-    /**
-     * 根据部门编号获取详细信息
-     */
-    @Operation(summary = "部门详情")
-    @PreAuthorize("@permission.has('system:dept:query')")
-    @GetMapping(value = "/dept/{deptId}")
-    public ResponseDTO<DeptDTO> getInfo(@PathVariable Long deptId) {
-        DeptDTO dept = deptApplicationService.getDeptInfo(deptId);
-        return ResponseDTO.ok(dept);
-    }
-
-    /**
-     * 获取部门下拉树列表
-     */
-    @Operation(summary = "获取部门树级结构")
-    @GetMapping("/depts/dropdown")
-    public ResponseDTO<List<Tree<Long>>> dropdownList() {
-        List<Tree<Long>> deptTree = deptApplicationService.getDeptTree();
-        return ResponseDTO.ok(deptTree);
-    }
-
-    /**
-     * 新增部门
-     */
-    @Operation(summary = "新增部门")
-    @PreAuthorize("@permission.has('system:dept:add')")
-    @AccessLog(title = "部门管理", businessType = BusinessTypeEnum.ADD)
-    @PostMapping("/dept")
-    public ResponseDTO<Void> add(@RequestBody AddDeptCommand addCommand) {
-        deptApplicationService.addDept(addCommand);
-        return ResponseDTO.ok();
-    }
-
-    /**
-     * 修改部门
-     */
-    @Operation(summary = "修改部门")
-    @PreAuthorize("@permission.has('system:dept:edit') AND @dataScope.checkDeptId(#updateCommand.deptId)")
-    @AccessLog(title = "部门管理", businessType = BusinessTypeEnum.MODIFY)
-    @PutMapping("/dept/{deptId}")
-    public ResponseDTO<Void> edit(@PathVariable("deptId")Long deptId, @RequestBody UpdateDeptCommand updateCommand) {
-        updateCommand.setDeptId(deptId);
-        deptApplicationService.updateDept(updateCommand);
-        return ResponseDTO.ok();
-    }
-
-    /**
-     * 删除部门
-     */
-    @Operation(summary = "删除部门")
-    @PreAuthorize("@permission.has('system:dept:remove') AND @dataScope.checkDeptId(#deptId)")
-    @AccessLog(title = "部门管理", businessType = BusinessTypeEnum.DELETE)
-    @DeleteMapping("/dept/{deptId}")
-    public ResponseDTO<Void> remove(@PathVariable @NotNull Long deptId) {
-        deptApplicationService.removeDept(deptId);
-        return ResponseDTO.ok();
-    }
-}

agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysLogsController.java

@@ -1,120 +0,0 @@
-package com.agileboot.admin.controller.system;
-
-
-import com.agileboot.common.core.base.BaseController;
-import com.agileboot.common.core.dto.ResponseDTO;
-import com.agileboot.common.core.page.PageDTO;
-import com.agileboot.common.utils.poi.CustomExcelUtil;
-import com.agileboot.domain.common.command.BulkOperationCommand;
-import com.agileboot.domain.system.log.LogApplicationService;
-import com.agileboot.domain.system.log.dto.LoginLogDTO;
-import com.agileboot.domain.system.log.query.LoginLogQuery;
-import com.agileboot.domain.system.log.dto.OperationLogDTO;
-import com.agileboot.domain.system.log.dto.OperationLogQuery;
-import com.agileboot.admin.customize.aop.accessLog.AccessLog;
-import com.agileboot.common.enums.common.BusinessTypeEnum;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-import lombok.RequiredArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * 系统访问记录
- *
- * @author valarchie
- */
-@Tag(name = "日志API", description = "日志相关API")
-@RestController
-@RequestMapping("/logs")
-@Validated
-@RequiredArgsConstructor
-public class SysLogsController extends BaseController {
-
-    private final LogApplicationService logApplicationService;
-
-    @Operation(summary = "登录日志列表")
-    @PreAuthorize("@permission.has('monitor:logininfor:list')")
-    @GetMapping("/loginLogs")
-    public ResponseDTO<PageDTO<LoginLogDTO>> loginInfoList(LoginLogQuery query) {
-        PageDTO<LoginLogDTO> pageDTO = logApplicationService.getLoginInfoList(query);
-        return ResponseDTO.ok(pageDTO);
-    }
-
-    @Operation(summary = "登录日志导出", description = "将登录日志导出到excel")
-    @AccessLog(title = "登录日志", businessType = BusinessTypeEnum.EXPORT)
-    @PreAuthorize("@permission.has('monitor:logininfor:export')")
-    @GetMapping("/loginLogs/excel")
-    public void loginInfosExcel(HttpServletResponse response, LoginLogQuery query) {
-        PageDTO<LoginLogDTO> pageDTO = logApplicationService.getLoginInfoList(query);
-        CustomExcelUtil.writeToResponse(pageDTO.getRows(), LoginLogDTO.class, response);
-    }
-
-    @Operation(summary = "删除登录日志")
-    @PreAuthorize("@permission.has('monitor:logininfor:remove')")
-    @AccessLog(title = "登录日志", businessType = BusinessTypeEnum.DELETE)
-    @DeleteMapping("/loginLogs")
-    public ResponseDTO<Void> removeLoginInfos(@RequestParam @NotNull @NotEmpty List<Long> ids) {
-        logApplicationService.deleteLoginInfo(new BulkOperationCommand<>(ids));
-        return ResponseDTO.ok();
-    }
-
-    @Operation(summary = "操作日志列表")
-    @PreAuthorize("@permission.has('monitor:operlog:list')")
-    @GetMapping("/operationLogs")
-    public ResponseDTO<PageDTO<OperationLogDTO>> operationLogs(OperationLogQuery query) {
-        PageDTO<OperationLogDTO> pageDTO = logApplicationService.getOperationLogList(query);
-        return ResponseDTO.ok(pageDTO);
-    }
-
-//    @GetMapping("/download")
-//    public ResponseEntity<InputStreamResource> downloadFile() throws IOException {
-//        // 从文件系统或其他位置获取文件输入流
-//        File file = new File("path/to/file");
-//        InputStream inputStream = new FileInputStream(file);
-//        CustomExcelUtil.wri
-//
-//        // 创建一个 InputStreamResource 对象，将文件输入流包装在其中
-//        InputStreamResource resource = new InputStreamResource(inputStream);
-//
-//        // 返回 ResponseEntity 对象，其中包含 InputStreamResource 对象和文件名
-//        return ResponseEntity.ok()
-//                .header(HttpHeaders.CONTENT_DISPOSITION, "attachment;filename=" + file.getName())
-//                .contentType(MediaType.APPLICATION_OCTET_STREAM)
-//                .contentLength(file.length())
-//                .body(resource);
-//    }
-    /**
-     * 可否改成以上的形式 TODO
-     * @param response
-     * @param query
-     */
-    @Operation(summary = "操作日志导出")
-    @AccessLog(title = "操作日志", businessType = BusinessTypeEnum.EXPORT)
-    @PreAuthorize("@permission.has('monitor:operlog:export')")
-    @GetMapping("/operationLogs/excel")
-    public void operationLogsExcel(HttpServletResponse response, OperationLogQuery query) {
-        PageDTO<OperationLogDTO> pageDTO = logApplicationService.getOperationLogList(query);
-        CustomExcelUtil.writeToResponse(pageDTO.getRows(), OperationLogDTO.class, response);
-    }
-
-    @Operation(summary = "删除操作日志")
-    @AccessLog(title = "操作日志", businessType = BusinessTypeEnum.DELETE)
-    @PreAuthorize("@permission.has('monitor:operlog:remove')")
-    @DeleteMapping("/operationLogs")
-    public ResponseDTO<Void> removeOperationLogs(@RequestParam List<Long> operationIds) {
-        logApplicationService.deleteOperationLog(new BulkOperationCommand<>(operationIds));
-        return ResponseDTO.ok();
-    }
-
-
-}

agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysMenuController.java

@@ -1,121 +0,0 @@
-package com.agileboot.admin.controller.system;
-
-import cn.hutool.core.lang.tree.Tree;
-import com.agileboot.common.core.base.BaseController;
-import com.agileboot.common.core.dto.ResponseDTO;
-import com.agileboot.domain.system.menu.MenuApplicationService;
-import com.agileboot.domain.system.menu.command.AddMenuCommand;
-import com.agileboot.domain.system.menu.command.UpdateMenuCommand;
-import com.agileboot.domain.system.menu.dto.MenuDTO;
-import com.agileboot.domain.system.menu.dto.MenuDetailDTO;
-import com.agileboot.domain.system.menu.query.MenuQuery;
-import com.agileboot.admin.customize.aop.accessLog.AccessLog;
-import com.agileboot.infrastructure.user.AuthenticationUtils;
-import com.agileboot.infrastructure.user.web.SystemLoginUser;
-import com.agileboot.common.enums.common.BusinessTypeEnum;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import java.util.List;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.PositiveOrZero;
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * 菜单信息
- *
- * @author valarchie
- */
-@Tag(name = "菜单API", description = "菜单相关的增删查改")
-@RestController
-@RequestMapping("/system/menus")
-@Validated
-@RequiredArgsConstructor
-public class SysMenuController extends BaseController {
-
-    private final MenuApplicationService menuApplicationService;
-
-    /**
-     * 获取菜单列表
-     */
-    @Operation(summary = "菜单列表")
-    @PreAuthorize("@permission.has('system:menu:list')")
-    @GetMapping
-    public ResponseDTO<List<MenuDTO>> menuList(MenuQuery menuQuery) {
-        List<MenuDTO> menuList = menuApplicationService.getMenuList(menuQuery);
-        return ResponseDTO.ok(menuList);
-    }
-
-    /**
-     * 根据菜单编号获取详细信息
-     */
-    @Operation(summary = "菜单详情")
-    @PreAuthorize("@permission.has('system:menu:query')")
-    @GetMapping(value = "/{menuId}")
-    public ResponseDTO<MenuDetailDTO> menuInfo(@PathVariable @NotNull @PositiveOrZero Long menuId) {
-        MenuDetailDTO menu = menuApplicationService.getMenuInfo(menuId);
-        return ResponseDTO.ok(menu);
-    }
-
-    /**
-     * 获取菜单下拉树列表
-     */
-    @Operation(summary = "菜单列表（树级）", description = "菜单树级下拉框")
-    @GetMapping("/dropdown")
-    public ResponseDTO<List<Tree<Long>>> dropdownList() {
-        SystemLoginUser loginUser = AuthenticationUtils.getSystemLoginUser();
-        List<Tree<Long>> dropdownList = menuApplicationService.getDropdownList(loginUser);
-        return ResponseDTO.ok(dropdownList);
-    }
-
-    /**
-     * 新增菜单
-     * 需支持一级菜单以及 多级菜单 子菜单为一个 或者 多个的情况
-     * 隐藏菜单不显示  以及rank排序
-     * 内链 和 外链
-     */
-    @Operation(summary = "添加菜单")
-    @PreAuthorize("@permission.has('system:menu:add')")
-    @AccessLog(title = "菜单管理", businessType = BusinessTypeEnum.ADD)
-    @PostMapping
-    public ResponseDTO<Void> add(@RequestBody AddMenuCommand addCommand) {
-        menuApplicationService.addMenu(addCommand);
-        return ResponseDTO.ok();
-    }
-
-    /**
-     * 修改菜单
-     */
-    @Operation(summary = "编辑菜单")
-    @PreAuthorize("@permission.has('system:menu:edit')")
-    @AccessLog(title = "菜单管理", businessType = BusinessTypeEnum.MODIFY)
-    @PutMapping("/{menuId}")
-    public ResponseDTO<Void> edit(@PathVariable("menuId") Long menuId, @RequestBody UpdateMenuCommand updateCommand) {
-        updateCommand.setMenuId(menuId);
-        menuApplicationService.updateMenu(updateCommand);
-        return ResponseDTO.ok();
-    }
-
-    /**
-     * 删除菜单
-     */
-    @Operation(summary = "删除菜单")
-    @PreAuthorize("@permission.has('system:menu:remove')")
-    @AccessLog(title = "菜单管理", businessType = BusinessTypeEnum.DELETE)
-    @DeleteMapping("/{menuId}")
-    public ResponseDTO<Void> remove(@PathVariable("menuId") Long menuId) {
-        menuApplicationService.remove(menuId);
-        return ResponseDTO.ok();
-    }
-
-}

agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysNoticeController.java

@@ -1,123 +0,0 @@
-package com.agileboot.admin.controller.system;
-
-import com.agileboot.common.core.base.BaseController;
-import com.agileboot.common.core.dto.ResponseDTO;
-import com.agileboot.common.core.page.PageDTO;
-import com.agileboot.domain.common.command.BulkOperationCommand;
-import com.agileboot.domain.system.notice.NoticeApplicationService;
-import com.agileboot.domain.system.notice.command.NoticeAddCommand;
-import com.agileboot.domain.system.notice.command.NoticeUpdateCommand;
-import com.agileboot.domain.system.notice.dto.NoticeDTO;
-import com.agileboot.domain.system.notice.query.NoticeQuery;
-import com.agileboot.admin.customize.aop.accessLog.AccessLog;
-import com.agileboot.infrastructure.annotations.unrepeatable.Unrepeatable;
-import com.agileboot.infrastructure.annotations.unrepeatable.Unrepeatable.CheckType;
-import com.agileboot.common.enums.common.BusinessTypeEnum;
-import com.baomidou.dynamic.datasource.annotation.DS;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import java.util.List;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Positive;
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * 公告 信息操作处理
- *
- * @author valarchie
- */
-@Tag(name = "公告API", description = "公告相关的增删查改")
-@RestController
-@RequestMapping("/system/notices")
-@Validated
-@RequiredArgsConstructor
-public class SysNoticeController extends BaseController {
-
-    private final NoticeApplicationService noticeApplicationService;
-
-    /**
-     * 获取通知公告列表
-     */
-    @Operation(summary = "公告列表")
-    @PreAuthorize("@permission.has('system:notice:list')")
-    @GetMapping
-    public ResponseDTO<PageDTO<NoticeDTO>> list(NoticeQuery query) {
-        PageDTO<NoticeDTO> pageDTO = noticeApplicationService.getNoticeList(query);
-        return ResponseDTO.ok(pageDTO);
-    }
-
-    /**
-     * 获取通知公告列表
-     * 从从库获取数据 例子 仅供参考
-     */
-    @Operation(summary = "公告列表（从数据库从库获取）", description = "演示主从库的例子")
-    @DS("slave")
-    @PreAuthorize("@permission.has('system:notice:list')")
-    @GetMapping("/database/slave")
-    public ResponseDTO<PageDTO<NoticeDTO>> listFromSlave(NoticeQuery query) {
-        PageDTO<NoticeDTO> pageDTO = noticeApplicationService.getNoticeList(query);
-        return ResponseDTO.ok(pageDTO);
-    }
-
-    /**
-     * 根据通知公告编号获取详细信息
-     */
-    @Operation(summary = "公告详情")
-    @PreAuthorize("@permission.has('system:notice:query')")
-    @GetMapping(value = "/{noticeId}")
-    public ResponseDTO<NoticeDTO> getInfo(@PathVariable @NotNull @Positive Long noticeId) {
-        return ResponseDTO.ok(noticeApplicationService.getNoticeInfo(noticeId));
-    }
-
-    /**
-     * 新增通知公告
-     */
-    @Operation(summary = "添加公告")
-    @Unrepeatable(interval = 60, checkType = CheckType.SYSTEM_USER)
-    @PreAuthorize("@permission.has('system:notice:add')")
-    @AccessLog(title = "通知公告", businessType = BusinessTypeEnum.ADD)
-    @PostMapping
-    public ResponseDTO<Void> add(@RequestBody NoticeAddCommand addCommand) {
-        noticeApplicationService.addNotice(addCommand);
-        return ResponseDTO.ok();
-    }
-
-    /**
-     * 修改通知公告
-     */
-    @Operation(summary = "修改公告")
-    @PreAuthorize("@permission.has('system:notice:edit')")
-    @AccessLog(title = "通知公告", businessType = BusinessTypeEnum.MODIFY)
-    @PutMapping("/{noticeId}")
-    public ResponseDTO<Void> edit(@PathVariable Long noticeId, @RequestBody NoticeUpdateCommand updateCommand) {
-        updateCommand.setNoticeId(noticeId);
-        noticeApplicationService.updateNotice(updateCommand);
-        return ResponseDTO.ok();
-    }
-
-    /**
-     * 删除通知公告
-     */
-    @Operation(summary = "删除公告")
-    @PreAuthorize("@permission.has('system:notice:remove')")
-    @AccessLog(title = "通知公告", businessType = BusinessTypeEnum.DELETE)
-    @DeleteMapping
-    public ResponseDTO<Void> remove(@RequestParam List<Integer> noticeIds) {
-        noticeApplicationService.deleteNotice(new BulkOperationCommand<>(noticeIds));
-        return ResponseDTO.ok();
-    }
-
-
-}

agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysPostController.java

@@ -1,113 +0,0 @@
-package com.agileboot.admin.controller.system;
-
-import com.agileboot.common.core.base.BaseController;
-import com.agileboot.common.core.dto.ResponseDTO;
-import com.agileboot.common.core.page.PageDTO;
-import com.agileboot.common.utils.poi.CustomExcelUtil;
-import com.agileboot.domain.common.command.BulkOperationCommand;
-import com.agileboot.domain.system.post.PostApplicationService;
-import com.agileboot.domain.system.post.command.AddPostCommand;
-import com.agileboot.domain.system.post.command.UpdatePostCommand;
-import com.agileboot.domain.system.post.dto.PostDTO;
-import com.agileboot.domain.system.post.query.PostQuery;
-import com.agileboot.admin.customize.aop.accessLog.AccessLog;
-import com.agileboot.common.enums.common.BusinessTypeEnum;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * 岗位信息操作处理
- *
- * @author ruoyi
- */
-@Tag(name = "职位API", description = "职位相关的增删查改")
-@RestController
-@RequestMapping("/system/post")
-@Validated
-@RequiredArgsConstructor
-public class SysPostController extends BaseController {
-
-    private final PostApplicationService postApplicationService;
-
-    /**
-     * 获取岗位列表
-     */
-    @Operation(summary = "职位列表")
-    @PreAuthorize("@permission.has('system:post:list')")
-    @GetMapping("/list")
-    public ResponseDTO<PageDTO<PostDTO>> list(PostQuery query) {
-        PageDTO<PostDTO> pageDTO = postApplicationService.getPostList(query);
-        return ResponseDTO.ok(pageDTO);
-    }
-
-    @Operation(summary = "职位列表导出")
-    @AccessLog(title = "岗位管理", businessType = BusinessTypeEnum.EXPORT)
-    @PreAuthorize("@permission.has('system:post:export')")
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, PostQuery query) {
-        PageDTO<PostDTO> pageDTO = postApplicationService.getPostList(query);
-        CustomExcelUtil.writeToResponse(pageDTO.getRows(), PostDTO.class, response);
-    }
-
-    /**
-     * 根据岗位编号获取详细信息
-     */
-    @Operation(summary = "职位详情")
-    @PreAuthorize("@permission.has('system:post:query')")
-    @GetMapping(value = "/{postId}")
-    public ResponseDTO<PostDTO> getInfo(@PathVariable Long postId) {
-        PostDTO post = postApplicationService.getPostInfo(postId);
-        return ResponseDTO.ok(post);
-    }
-
-    /**
-     * 新增岗位
-     */
-    @Operation(summary = "添加职位")
-    @PreAuthorize("@permission.has('system:post:add')")
-    @AccessLog(title = "岗位管理", businessType = BusinessTypeEnum.ADD)
-    @PostMapping
-    public ResponseDTO<Void> add(@RequestBody AddPostCommand addCommand) {
-        postApplicationService.addPost(addCommand);
-        return ResponseDTO.ok();
-    }
-
-    /**
-     * 修改岗位
-     */
-    @Operation(summary = "修改职位")
-    @PreAuthorize("@permission.has('system:post:edit')")
-    @AccessLog(title = "岗位管理", businessType = BusinessTypeEnum.MODIFY)
-    @PutMapping
-    public ResponseDTO<Void> edit(@RequestBody UpdatePostCommand updateCommand) {
-        postApplicationService.updatePost(updateCommand);
-        return ResponseDTO.ok();
-    }
-
-    /**
-     * 删除岗位
-     */
-    @Operation(summary = "删除职位")
-    @PreAuthorize("@permission.has('system:post:remove')")
-    @AccessLog(title = "岗位管理", businessType = BusinessTypeEnum.DELETE)
-    @DeleteMapping("/{postIds}")
-    public ResponseDTO<Void> remove(@PathVariable List<Long> postIds) {
-        postApplicationService.deletePost(new BulkOperationCommand<>(postIds));
-        return ResponseDTO.ok();
-    }
-
-}

agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysProfileController.java

@@ -1,98 +0,0 @@
-package com.agileboot.admin.controller.system;
-
-import com.agileboot.common.constant.Constants.UploadSubDir;
-import com.agileboot.common.core.base.BaseController;
-import com.agileboot.common.core.dto.ResponseDTO;
-import com.agileboot.common.exception.ApiException;
-import com.agileboot.common.exception.error.ErrorCode;
-import com.agileboot.common.utils.file.FileUploadUtils;
-import com.agileboot.domain.common.dto.UploadFileDTO;
-import com.agileboot.domain.system.user.UserApplicationService;
-import com.agileboot.domain.system.user.command.UpdateProfileCommand;
-import com.agileboot.domain.system.user.command.UpdateUserAvatarCommand;
-import com.agileboot.domain.system.user.command.UpdateUserPasswordCommand;
-import com.agileboot.domain.system.user.dto.UserProfileDTO;
-import com.agileboot.admin.customize.aop.accessLog.AccessLog;
-import com.agileboot.infrastructure.user.AuthenticationUtils;
-import com.agileboot.infrastructure.user.web.SystemLoginUser;
-import com.agileboot.common.enums.common.BusinessTypeEnum;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
-
-/**
- * 个人信息 业务处理
- *
- * @author ruoyi
- */
-@Tag(name = "个人信息API", description = "个人信息相关接口")
-@RestController
-@RequestMapping("/system/user/profile")
-@RequiredArgsConstructor
-public class SysProfileController extends BaseController {
-
-    private final UserApplicationService userApplicationService;
-
-    /**
-     * 个人信息
-     */
-    @Operation(summary = "获取个人信息")
-    @GetMapping
-    public ResponseDTO<UserProfileDTO> profile() {
-        SystemLoginUser user = AuthenticationUtils.getSystemLoginUser();
-        UserProfileDTO userProfile = userApplicationService.getUserProfile(user.getUserId());
-        return ResponseDTO.ok(userProfile);
-    }
-
-    /**
-     * 修改用户
-     */
-    @Operation(summary = "修改个人信息")
-    @AccessLog(title = "个人信息", businessType = BusinessTypeEnum.MODIFY)
-    @PutMapping
-    public ResponseDTO<Void> updateProfile(@RequestBody UpdateProfileCommand command) {
-        SystemLoginUser loginUser = AuthenticationUtils.getSystemLoginUser();
-        command.setUserId(loginUser.getUserId());
-        userApplicationService.updateUserProfile(command);
-        return ResponseDTO.ok();
-    }
-
-    /**
-     * 重置密码
-     */
-    @Operation(summary = "重置个人密码")
-    @AccessLog(title = "个人信息", businessType = BusinessTypeEnum.MODIFY)
-    @PutMapping("/password")
-    public ResponseDTO<Void> updatePassword(@RequestBody UpdateUserPasswordCommand command) {
-        SystemLoginUser loginUser = AuthenticationUtils.getSystemLoginUser();
-        command.setUserId(loginUser.getUserId());
-        userApplicationService.updatePasswordBySelf(loginUser, command);
-        return ResponseDTO.ok();
-    }
-
-    /**
-     * 头像上传
-     */
-    @Operation(summary = "修改个人头像")
-    @AccessLog(title = "用户头像", businessType = BusinessTypeEnum.MODIFY)
-    @PostMapping("/avatar")
-    public ResponseDTO<UploadFileDTO> avatar(@RequestParam("avatarfile") MultipartFile file) {
-        if (file.isEmpty()) {
-            throw new ApiException(ErrorCode.Business.USER_UPLOAD_FILE_FAILED);
-        }
-        SystemLoginUser loginUser = AuthenticationUtils.getSystemLoginUser();
-        String avatarUrl = FileUploadUtils.upload(UploadSubDir.AVATAR_PATH, file);
-
-        userApplicationService.updateUserAvatar(new UpdateUserAvatarCommand(loginUser.getUserId(), avatarUrl));
-        return ResponseDTO.ok(new UploadFileDTO(avatarUrl));
-    }
-}

agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysRoleController.java

@@ -1,198 +0,0 @@
-package com.agileboot.admin.controller.system;
-
-import com.agileboot.common.core.base.BaseController;
-import com.agileboot.common.core.dto.ResponseDTO;
-import com.agileboot.common.core.page.PageDTO;
-import com.agileboot.common.utils.poi.CustomExcelUtil;
-import com.agileboot.domain.system.role.RoleApplicationService;
-import com.agileboot.domain.system.role.command.AddRoleCommand;
-import com.agileboot.domain.system.role.command.UpdateDataScopeCommand;
-import com.agileboot.domain.system.role.command.UpdateRoleCommand;
-import com.agileboot.domain.system.role.command.UpdateStatusCommand;
-import com.agileboot.domain.system.role.dto.RoleDTO;
-import com.agileboot.domain.system.role.query.AllocatedRoleQuery;
-import com.agileboot.domain.system.role.query.RoleQuery;
-import com.agileboot.domain.system.role.query.UnallocatedRoleQuery;
-import com.agileboot.domain.system.user.dto.UserDTO;
-import com.agileboot.admin.customize.aop.accessLog.AccessLog;
-import com.agileboot.common.enums.common.BusinessTypeEnum;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.constraints.NotNull;
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * 角色信息
- *
- * @author valarchie
- */
-@Tag(name = "角色API", description = "角色相关的增删查改")
-@RestController
-@RequestMapping("/system/role")
-@Validated
-@RequiredArgsConstructor
-public class SysRoleController extends BaseController {
-
-    private final RoleApplicationService roleApplicationService;
-
-    @Operation(summary = "角色列表")
-    @PreAuthorize("@permission.has('system:role:list')")
-    @GetMapping("/list")
-    public ResponseDTO<PageDTO<RoleDTO>> list(RoleQuery query) {
-        PageDTO<RoleDTO> pageDTO = roleApplicationService.getRoleList(query);
-        return ResponseDTO.ok(pageDTO);
-    }
-
-    @Operation(summary = "角色列表导出")
-    @AccessLog(title = "角色管理", businessType = BusinessTypeEnum.EXPORT)
-    @PreAuthorize("@permission.has('system:role:export')")
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, RoleQuery query) {
-        PageDTO<RoleDTO> pageDTO = roleApplicationService.getRoleList(query);
-        CustomExcelUtil.writeToResponse(pageDTO.getRows(), RoleDTO.class, response);
-    }
-
-    /**
-     * 根据角色编号获取详细信息
-     */
-    @Operation(summary = "角色详情")
-    @PreAuthorize("@permission.has('system:role:query')")
-    @GetMapping(value = "/{roleId}")
-    public ResponseDTO<RoleDTO> getInfo(@PathVariable @NotNull Long roleId) {
-        RoleDTO roleInfo = roleApplicationService.getRoleInfo(roleId);
-        return ResponseDTO.ok(roleInfo);
-    }
-
-    /**
-     * 新增角色
-     */
-    @Operation(summary = "添加角色")
-    @PreAuthorize("@permission.has('system:role:add')")
-    @AccessLog(title = "角色管理", businessType = BusinessTypeEnum.ADD)
-    @PostMapping
-    public ResponseDTO<Void> add(@RequestBody AddRoleCommand addCommand) {
-        roleApplicationService.addRole(addCommand);
-        return ResponseDTO.ok();
-    }
-
-    /**
-     * 移除角色
-     */
-    @Operation(summary = "删除角色")
-    @PreAuthorize("@permission.has('system:role:remove')")
-    @AccessLog(title = "角色管理", businessType = BusinessTypeEnum.ADD)
-    @DeleteMapping(value = "/{roleId}")
-    public ResponseDTO<Void> remove(@PathVariable("roleId") List<Long> roleIds) {
-        roleApplicationService.deleteRoleByBulk(roleIds);
-        return ResponseDTO.ok();
-    }
-
-    /**
-     * 修改保存角色
-     */
-    @Operation(summary = "修改角色")
-    @PreAuthorize("@permission.has('system:role:edit')")
-    @AccessLog(title = "角色管理", businessType = BusinessTypeEnum.MODIFY)
-    @PutMapping
-    public ResponseDTO<Void> edit(@Validated @RequestBody UpdateRoleCommand updateCommand) {
-        roleApplicationService.updateRole(updateCommand);
-        return ResponseDTO.ok();
-    }
-
-    /**
-     * 修改保存数据权限
-     */
-    @Operation(summary = "修改角色数据权限")
-    @PreAuthorize("@permission.has('system:role:edit')")
-    @AccessLog(title = "角色管理", businessType = BusinessTypeEnum.MODIFY)
-    @PutMapping("/{roleId}/dataScope")
-    public ResponseDTO<Void> dataScope(@PathVariable("roleId") Long roleId,
-        @RequestBody UpdateDataScopeCommand command) {
-        command.setRoleId(roleId);
-
-        roleApplicationService.updateDataScope(command);
-        return ResponseDTO.ok();
-    }
-
-    /**
-     * 角色状态修改
-     */
-    @Operation(summary = "修改角色状态")
-    @PreAuthorize("@permission.has('system:role:edit')")
-    @AccessLog(title = "角色管理", businessType = BusinessTypeEnum.MODIFY)
-    @PutMapping("/{roleId}/status")
-    public ResponseDTO<Void> changeStatus(@PathVariable("roleId") Long roleId,
-        @RequestBody UpdateStatusCommand command) {
-        command.setRoleId(roleId);
-
-        roleApplicationService.updateStatus(command);
-        return ResponseDTO.ok();
-    }
-
-
-    /**
-     * 查询已分配用户角色列表
-     */
-    @Operation(summary = "已关联该角色的用户列表")
-    @PreAuthorize("@permission.has('system:role:list')")
-    @GetMapping("/{roleId}/allocated/list")
-    public ResponseDTO<PageDTO<UserDTO>> allocatedUserList(@PathVariable("roleId") Long roleId,
-        AllocatedRoleQuery query) {
-        query.setRoleId(roleId);
-        PageDTO<UserDTO> page = roleApplicationService.getAllocatedUserList(query);
-        return ResponseDTO.ok(page);
-    }
-
-    /**
-     * 查询未分配用户角色列表
-     */
-    @Operation(summary = "未关联该角色的用户列表")
-    @PreAuthorize("@permission.has('system:role:list')")
-    @GetMapping("/{roleId}/unallocated/list")
-    public ResponseDTO<PageDTO<UserDTO>> unallocatedUserList(@PathVariable("roleId") Long roleId,
-        UnallocatedRoleQuery query) {
-        query.setRoleId(roleId);
-        PageDTO<UserDTO> page = roleApplicationService.getUnallocatedUserList(query);
-        return ResponseDTO.ok(page);
-    }
-
-
-    /**
-     * 批量取消授权用户
-     */
-    @Operation(summary = "批量解除角色和用户的关联")
-    @PreAuthorize("@permission.has('system:role:edit')")
-    @AccessLog(title = "角色管理", businessType = BusinessTypeEnum.GRANT)
-    @DeleteMapping("/users/{userIds}/grant/bulk")
-    public ResponseDTO<Void> deleteRoleOfUserByBulk(@PathVariable("userIds") List<Long> userIds) {
-        roleApplicationService.deleteRoleOfUserByBulk(userIds);
-        return ResponseDTO.ok();
-    }
-
-    /**
-     * 批量选择用户授权
-     */
-    @Operation(summary = "批量添加用户和角色关联")
-    @PreAuthorize("@permission.has('system:role:edit')")
-    @AccessLog(title = "角色管理", businessType = BusinessTypeEnum.GRANT)
-    @PostMapping("/{roleId}/users/{userIds}/grant/bulk")
-    public ResponseDTO<Void> addRoleForUserByBulk(@PathVariable("roleId") Long roleId,
-        @PathVariable("userIds") List<Long> userIds) {
-        roleApplicationService.addRoleOfUserByBulk(roleId, userIds);
-        return ResponseDTO.ok();
-    }
-
-}

agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysUserController.java

@@ -1,170 +0,0 @@
-package com.agileboot.admin.controller.system;
-
-import cn.hutool.core.collection.ListUtil;
-import com.agileboot.common.core.base.BaseController;
-import com.agileboot.common.core.dto.ResponseDTO;
-import com.agileboot.common.core.page.PageDTO;
-import com.agileboot.common.utils.poi.CustomExcelUtil;
-import com.agileboot.domain.common.command.BulkOperationCommand;
-import com.agileboot.domain.system.user.UserApplicationService;
-import com.agileboot.domain.system.user.command.AddUserCommand;
-import com.agileboot.domain.system.user.command.ChangeStatusCommand;
-import com.agileboot.domain.system.user.command.ResetPasswordCommand;
-import com.agileboot.domain.system.user.command.UpdateUserCommand;
-import com.agileboot.domain.system.user.dto.UserDTO;
-import com.agileboot.domain.system.user.dto.UserDetailDTO;
-import com.agileboot.domain.system.user.query.SearchUserQuery;
-import com.agileboot.admin.customize.aop.accessLog.AccessLog;
-import com.agileboot.infrastructure.user.AuthenticationUtils;
-import com.agileboot.infrastructure.user.web.SystemLoginUser;
-import com.agileboot.common.enums.common.BusinessTypeEnum;
-import com.agileboot.domain.system.user.db.SearchUserDO;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
-
-/**
- * 用户信息
- * @author valarchie
- */
-@Tag(name = "用户API", description = "用户相关的增删查改")
-@RestController
-@RequestMapping("/system/users")
-@RequiredArgsConstructor
-public class SysUserController extends BaseController {
-
-    private final UserApplicationService userApplicationService;
-
-    /**
-     * 获取用户列表
-     */
-    @Operation(summary = "用户列表")
-    @PreAuthorize("@permission.has('system:user:list') AND @dataScope.checkDeptId(#query.deptId)")
-    @GetMapping
-    public ResponseDTO<PageDTO<UserDTO>> userList(SearchUserQuery<SearchUserDO> query) {
-        PageDTO<UserDTO> page = userApplicationService.getUserList(query);
-        return ResponseDTO.ok(page);
-    }
-
-    @Operation(summary = "用户列表导出")
-    @AccessLog(title = "用户管理", businessType = BusinessTypeEnum.EXPORT)
-    @PreAuthorize("@permission.has('system:user:export')")
-    @GetMapping("/excel")
-    public void exportUserByExcel(HttpServletResponse response, SearchUserQuery<SearchUserDO> query) {
-        PageDTO<UserDTO> userList = userApplicationService.getUserList(query);
-        CustomExcelUtil.writeToResponse(userList.getRows(), UserDTO.class, response);
-    }
-
-    @Operation(summary = "用户列表导入")
-    @AccessLog(title = "用户管理", businessType = BusinessTypeEnum.IMPORT)
-    @PreAuthorize("@permission.has('system:user:import')")
-    @PostMapping("/excel")
-    public ResponseDTO<Void> importUserByExcel(MultipartFile file) {
-        List<AddUserCommand> commands = CustomExcelUtil.readFromRequest(AddUserCommand.class, file);
-
-        for (AddUserCommand command : commands) {
-            userApplicationService.addUser(command);
-        }
-        return ResponseDTO.ok();
-    }
-
-    /**
-     * 下载批量导入模板
-     */
-    @Operation(summary = "用户导入excel下载")
-    @GetMapping("/excelTemplate")
-    public void downloadExcelTemplate(HttpServletResponse response) {
-        CustomExcelUtil.writeToResponse(ListUtil.toList(new AddUserCommand()), AddUserCommand.class, response);
-    }
-
-    /**
-     * 根据用户编号获取详细信息
-     */
-    @Operation(summary = "用户详情")
-    @PreAuthorize("@permission.has('system:user:query')")
-    @GetMapping("/{userId}")
-    public ResponseDTO<UserDetailDTO> getUserDetailInfo(@PathVariable(value = "userId", required = false) Long userId) {
-        UserDetailDTO userDetailInfo = userApplicationService.getUserDetailInfo(userId);
-        return ResponseDTO.ok(userDetailInfo);
-    }
-
-    /**
-     * 新增用户
-     */
-    @Operation(summary = "新增用户")
-    @PreAuthorize("@permission.has('system:user:add') AND @dataScope.checkDeptId(#command.deptId)")
-    @AccessLog(title = "用户管理", businessType = BusinessTypeEnum.ADD)
-    @PostMapping
-    public ResponseDTO<Void> add(@Validated @RequestBody AddUserCommand command) {
-        userApplicationService.addUser(command);
-        return ResponseDTO.ok();
-    }
-
-    /**
-     * 修改用户
-     */
-    @Operation(summary = "修改用户")
-    @PreAuthorize("@permission.has('system:user:edit') AND @dataScope.checkUserId(#command.userId)")
-    @AccessLog(title = "用户管理", businessType = BusinessTypeEnum.MODIFY)
-    @PutMapping("/{userId}")
-    public ResponseDTO<Void> edit(@Validated @RequestBody UpdateUserCommand command) {
-        userApplicationService.updateUser(command);
-        return ResponseDTO.ok();
-    }
-
-    /**
-     * 删除用户
-     */
-    @Operation(summary = "删除用户")
-    @PreAuthorize("@permission.has('system:user:remove') AND @dataScope.checkUserIds(#userIds)")
-    @AccessLog(title = "用户管理", businessType = BusinessTypeEnum.DELETE)
-    @DeleteMapping("/{userIds}")
-    public ResponseDTO<Void> remove(@PathVariable List<Long> userIds) {
-        BulkOperationCommand<Long> bulkDeleteCommand = new BulkOperationCommand<>(userIds);
-        SystemLoginUser loginUser = AuthenticationUtils.getSystemLoginUser();
-        userApplicationService.deleteUsers(loginUser, bulkDeleteCommand);
-        return ResponseDTO.ok();
-    }
-
-    /**
-     * 重置密码
-     */
-    @Operation(summary = "重置用户密码")
-    @PreAuthorize("@permission.has('system:user:resetPwd') AND @dataScope.checkUserId(#userId)")
-    @AccessLog(title = "用户管理", businessType = BusinessTypeEnum.MODIFY)
-    @PutMapping("/{userId}/password")
-    public ResponseDTO<Void> resetPassword(@PathVariable Long userId, @RequestBody ResetPasswordCommand command) {
-        command.setUserId(userId);
-        userApplicationService.resetUserPassword(command);
-        return ResponseDTO.ok();
-    }
-
-    /**
-     * 状态修改
-     */
-    @Operation(summary = "修改用户状态")
-    @PreAuthorize("@permission.has('system:user:edit') AND @dataScope.checkUserId(#command.userId)")
-    @AccessLog(title = "用户管理", businessType = BusinessTypeEnum.MODIFY)
-    @PutMapping("/{userId}/status")
-    public ResponseDTO<Void> changeStatus(@PathVariable Long userId, @RequestBody ChangeStatusCommand command) {
-        command.setUserId(userId);
-        userApplicationService.changeUserStatus(command);
-        return ResponseDTO.ok();
-    }
-
-
-}

agileboot-admin/src/main/java/com/agileboot/admin/customize/aop/accessLog/AccessLog.java

@@ -1,45 +0,0 @@
-package com.agileboot.admin.customize.aop.accessLog;
-
-import com.agileboot.common.enums.common.BusinessTypeEnum;
-import com.agileboot.common.enums.common.OperatorTypeEnum;
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * 自定义操作日志记录注解
- *
- * @author ruoyi
- */
-@Target({ElementType.PARAMETER, ElementType.METHOD})
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-public @interface AccessLog {
-
-    /**
-     * 模块
-     */
-    String title() default "";
-
-    /**
-     * 功能
-     */
-    BusinessTypeEnum businessType() default BusinessTypeEnum.OTHER;
-
-    /**
-     * 操作人类别
-     */
-    OperatorTypeEnum operatorType() default OperatorTypeEnum.WEB;
-
-    /**
-     * 是否保存请求的参数
-     */
-    boolean isSaveRequestData() default true;
-
-    /**
-     * 是否保存响应的参数
-     */
-    boolean isSaveResponseData() default false;
-}

agileboot-admin/src/main/java/com/agileboot/admin/customize/aop/accessLog/AccessLogAspect.java

@@ -1,59 +0,0 @@
-package com.agileboot.admin.customize.aop.accessLog;
-
-import com.agileboot.admin.customize.async.AsyncTaskFactory;
-import com.agileboot.infrastructure.thread.ThreadPoolManager;
-import lombok.extern.slf4j.Slf4j;
-import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.annotation.AfterReturning;
-import org.aspectj.lang.annotation.AfterThrowing;
-import org.aspectj.lang.annotation.Aspect;
-import org.springframework.stereotype.Component;
-
-/**
- * 操作日志记录处理
- *
- * @author valarchie
- */
-@Aspect
-@Component
-@Slf4j
-public class AccessLogAspect {
-
-    /**
-     * 处理完请求后执行
-     *
-     * @param joinPoint 切点
-     */
-    @AfterReturning(pointcut = "@annotation(controllerLog)", returning = "jsonResult")
-    public void doAfterReturning(JoinPoint joinPoint, AccessLog controllerLog, Object jsonResult) {
-        handleLog(joinPoint, controllerLog, null, jsonResult);
-    }
-
-    /**
-     * 拦截异常操作
-     *
-     * @param joinPoint 切点
-     * @param e 异常
-     */
-    @AfterThrowing(value = "@annotation(controllerLog)", throwing = "e")
-    public void doAfterThrowing(JoinPoint joinPoint, AccessLog controllerLog, Exception e) {
-        handleLog(joinPoint, controllerLog, e, null);
-    }
-
-    protected void handleLog(final JoinPoint joinPoint, AccessLog accessLog, final Exception e, Object jsonResult) {
-        try {
-            OperationLogModel operationLog = new OperationLogModel();
-            operationLog.fillOperatorInfo();
-            operationLog.fillRequestInfo(joinPoint, accessLog, jsonResult);
-            operationLog.fillStatus(e);
-            operationLog.fillAccessLogInfo(accessLog);
-
-            // 保存数据库
-            ThreadPoolManager.execute(AsyncTaskFactory.recordOperationLog(operationLog));
-        } catch (Exception exp) {
-            log.error("写入操作日式失败", exp);
-        }
-    }
-
-
-}

agileboot-admin/src/main/java/com/agileboot/admin/customize/aop/accessLog/OperationLogModel.java

@@ -1,160 +0,0 @@
-package com.agileboot.admin.customize.aop.accessLog;
-
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.EnumUtil;
-import cn.hutool.core.util.StrUtil;
-import cn.hutool.extra.servlet.ServletUtil;
-import cn.hutool.json.JSONUtil;
-import com.agileboot.common.utils.ServletHolderUtil;
-import com.agileboot.infrastructure.user.AuthenticationUtils;
-import com.agileboot.infrastructure.user.web.SystemLoginUser;
-import com.agileboot.common.enums.common.OperationStatusEnum;
-import com.agileboot.common.enums.common.RequestMethodEnum;
-import com.agileboot.common.enums.BasicEnumUtil;
-import com.agileboot.domain.system.log.db.SysOperationLogEntity;
-import lombok.extern.slf4j.Slf4j;
-import org.aspectj.lang.JoinPoint;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.servlet.HandlerMapping;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.Collection;
-import java.util.Map;
-
-/**
- * @author valarchie
- */
-@Slf4j
-public class OperationLogModel extends SysOperationLogEntity {
-
-    public static final int MAX_DATA_LENGTH = 512;
-
-    HttpServletRequest request = ServletHolderUtil.getRequest();
-
-    public void fillOperatorInfo() {
-        // 获取当前的用户
-        String ip = ServletUtil.getClientIP(request);
-        setOperatorIp(ip);
-        SystemLoginUser loginUser = AuthenticationUtils.getSystemLoginUser();
-        if (loginUser != null) {
-            this.setUsername(loginUser.getUsername());
-        }
-
-        this.setOperationTime(DateUtil.date());
-    }
-
-
-    public void fillRequestInfo(final JoinPoint joinPoint, AccessLog accessLog, Object jsonResult) {
-        this.setRequestUrl(request.getRequestURI());
-        // 设置方法名称
-        String className = joinPoint.getTarget().getClass().getName();
-        String methodName = joinPoint.getSignature().getName();
-        String methodFormat = StrUtil.format("{}.{}()", className, methodName);
-        this.setCalledMethod(methodFormat);
-        // 设置请求方式
-        RequestMethodEnum requestMethodEnum = EnumUtil.fromString(RequestMethodEnum.class,
-                request.getMethod());
-        this.setRequestMethod(requestMethodEnum != null ? requestMethodEnum.getValue() : RequestMethodEnum.UNKNOWN.getValue());
-
-
-        // 是否需要保存request，参数和值
-        if (accessLog.isSaveRequestData()) {
-            // 获取参数的信息，传入到数据库中。
-            recordRequestData(joinPoint);
-        }
-        // 是否需要保存response，参数和值
-        if (accessLog.isSaveResponseData() && jsonResult != null) {
-            this.setOperationResult(StrUtil.sub(JSONUtil.toJsonStr(jsonResult), 0, MAX_DATA_LENGTH));
-        }
-    }
-
-
-    public void fillAccessLogInfo(AccessLog log) {
-        // 设置action动作
-        this.setBusinessType(log.businessType().ordinal());
-        // 设置标题
-        this.setRequestModule(log.title());
-        // 设置操作人类别
-        this.setOperatorType(log.operatorType().ordinal());
-    }
-
-
-    public void fillStatus(Exception e) {
-        if (e != null) {
-            this.setStatus(OperationStatusEnum.FAIL.getValue());
-            this.setErrorStack(StrUtil.sub(e.getMessage(), 0, MAX_DATA_LENGTH));
-        } else {
-            this.setStatus(OperationStatusEnum.SUCCESS.getValue());
-        }
-    }
-
-
-    /**
-     * 获取请求的参数，放到log中
-     *
-     * @param joinPoint 方法切面
-     */
-    private void recordRequestData(JoinPoint joinPoint) {
-        RequestMethodEnum requestMethodEnum = BasicEnumUtil.fromValue(RequestMethodEnum.class,
-            this.getRequestMethod());
-
-        if (requestMethodEnum == RequestMethodEnum.GET || requestMethodEnum == RequestMethodEnum.POST) {
-            String params = argsArrayToString(joinPoint.getArgs());
-            this.setOperationParam(StrUtil.sub(params, 0, MAX_DATA_LENGTH));
-        } else {
-            Map<?, ?> paramsMap = (Map<?, ?>) request
-                    .getAttribute(HandlerMapping.URI_TEMPLATE_VARIABLES_ATTRIBUTE);
-            this.setOperationParam(StrUtil.sub(paramsMap.toString(), 0, MAX_DATA_LENGTH));
-        }
-    }
-
-    /**
-     * 参数拼装
-     */
-    private String argsArrayToString(Object[] paramsArray) {
-        StringBuilder params = new StringBuilder();
-        if (paramsArray != null) {
-            for (Object o : paramsArray) {
-                if (o != null && !isCanNotBeParseToJson(o)) {
-                    try {
-                        Object jsonObj = JSONUtil.parseObj(o);
-                        params.append(jsonObj).append(",");
-                    } catch (Exception e) {
-                        log.info("参数拼接错误", e);
-                    }
-                }
-            }
-        }
-        return params.toString().trim();
-    }
-
-    /**
-     * 判断是否需要过滤的对象。
-     *
-     * @param o 对象信息。
-     * @return 如果是需要过滤的对象，则返回true；否则返回false。
-     */
-    @SuppressWarnings("rawtypes")
-    public boolean isCanNotBeParseToJson(final Object o) {
-        Class<?> clazz = o.getClass();
-        if (clazz.isArray()) {
-            return clazz.getComponentType().isAssignableFrom(MultipartFile.class);
-        } else if (Collection.class.isAssignableFrom(clazz)) {
-            Collection collection = (Collection) o;
-            for (Object value : collection) {
-                return value instanceof MultipartFile;
-            }
-        } else if (Map.class.isAssignableFrom(clazz)) {
-            Map map = (Map) o;
-            for (Object value : map.entrySet()) {
-                Map.Entry entry = (Map.Entry) value;
-                return entry.getValue() instanceof MultipartFile;
-            }
-        }
-        return o instanceof MultipartFile || o instanceof HttpServletRequest || o instanceof HttpServletResponse
-            || o instanceof BindingResult;
-    }
-
-}

agileboot-admin/src/main/java/com/agileboot/admin/customize/async/AsyncTaskFactory.java

@@ -1,78 +0,0 @@
-package com.agileboot.admin.customize.async;
-
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.extra.servlet.ServletUtil;
-import cn.hutool.extra.spring.SpringUtil;
-import com.agileboot.common.utils.ServletHolderUtil;
-import com.agileboot.common.utils.ip.IpRegionUtil;
-import com.agileboot.common.enums.common.LoginStatusEnum;
-import com.agileboot.domain.system.log.db.SysLoginInfoEntity;
-import com.agileboot.domain.system.log.db.SysOperationLogEntity;
-import com.agileboot.domain.system.log.db.SysLoginInfoService;
-import com.agileboot.domain.system.log.db.SysOperationLogService;
-import eu.bitwalker.useragentutils.UserAgent;
-import lombok.extern.slf4j.Slf4j;
-
-/**
- * 异步工厂（产生任务用）
- *
- * @author ruoyi
- */
-@Slf4j
-public class AsyncTaskFactory {
-
-    private AsyncTaskFactory() {
-    }
-
-    /**
-     * 记录登录信息
-     *
-     * @param username        用户名
-     * @param loginStatusEnum 状态
-     * @param message         消息
-     * @return 任务task
-     */
-    public static Runnable loginInfoTask(final String username, final LoginStatusEnum loginStatusEnum, final String message) {
-        // 优化一下这个类
-        final UserAgent userAgent = UserAgent.parseUserAgentString(
-            ServletHolderUtil.getRequest().getHeader("User-Agent"));
-        // 获取客户端浏览器
-        final String browser = userAgent.getBrowser() != null ? userAgent.getBrowser().getName() : "";
-        final String ip = ServletUtil.getClientIP(ServletHolderUtil.getRequest());
-        final String address = IpRegionUtil.getBriefLocationByIp(ip);
-        // 获取客户端操作系统
-        final String os = userAgent.getOperatingSystem() != null ? userAgent.getOperatingSystem().getName() : "";
-
-        log.info("ip: {}, address: {}, username: {}, loginStatusEnum: {}, message: {}", ip, address, username,
-            loginStatusEnum, message);
-        return () -> {
-            // 封装对象
-            SysLoginInfoEntity loginInfo = new SysLoginInfoEntity();
-            loginInfo.setUsername(username);
-            loginInfo.setIpAddress(ip);
-            loginInfo.setLoginLocation(address);
-            loginInfo.setBrowser(browser);
-            loginInfo.setOperationSystem(os);
-            loginInfo.setMsg(message);
-            loginInfo.setLoginTime(DateUtil.date());
-            loginInfo.setStatus(loginStatusEnum.getValue());
-            // 插入数据
-            SpringUtil.getBean(SysLoginInfoService.class).save(loginInfo);
-        };
-    }
-
-    /**
-     * 操作日志记录
-     *
-     * @param operationLog 操作日志信息
-     * @return 任务task
-     */
-    public static Runnable recordOperationLog(final SysOperationLogEntity operationLog) {
-        return () -> {
-            // 远程查询操作地点
-            operationLog.setOperatorLocation(IpRegionUtil.getBriefLocationByIp(operationLog.getOperatorIp()));
-            SpringUtil.getBean(SysOperationLogService.class).save(operationLog);
-        };
-    }
-
-}

agileboot-admin/src/main/java/com/agileboot/admin/customize/config/JwtAuthenticationTokenFilter.java

@@ -1,54 +0,0 @@
-package com.agileboot.admin.customize.config;
-
-import com.agileboot.infrastructure.user.AuthenticationUtils;
-import com.agileboot.infrastructure.user.web.SystemLoginUser;
-import com.agileboot.admin.customize.service.login.TokenService;
-import java.io.IOException;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.web.authentication.WebAuthenticationDetailsSource;
-import org.springframework.stereotype.Component;
-import org.springframework.web.filter.OncePerRequestFilter;
-
-/**
- * token过滤器 验证token有效性
- * 继承OncePerRequestFilter类的话  可以确保只执行filter一次， 避免执行多次
- * @author valarchie
- */
-@Component
-@Slf4j
-@RequiredArgsConstructor
-public class JwtAuthenticationTokenFilter extends OncePerRequestFilter {
-
-    private final TokenService tokenService;
-
-    @Override
-    protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain chain)
-        throws ServletException, IOException {
-        SystemLoginUser loginUser = tokenService.getLoginUser(request);
-        if (loginUser != null && AuthenticationUtils.getAuthentication() == null) {
-            tokenService.refreshToken(loginUser);
-            // 如果没有将当前登录用户放入到上下文中的话，会认定用户未授权，返回用户未登陆的错误
-            putCurrentLoginUserIntoContext(request, loginUser);
-
-            log.debug("request process in jwt token filter. get login user id: {}", loginUser.getUserId());
-        }
-        chain.doFilter(request, response);
-    }
-
-
-    private void putCurrentLoginUserIntoContext(HttpServletRequest request, SystemLoginUser loginUser) {
-        UsernamePasswordAuthenticationToken authToken = new UsernamePasswordAuthenticationToken(loginUser,
-            null, loginUser.getAuthorities());
-        authToken.setDetails(new WebAuthenticationDetailsSource().buildDetails(request));
-        SecurityContextHolder.getContext().setAuthentication(authToken);
-    }
-
-}

agileboot-admin/src/main/java/com/agileboot/admin/customize/config/SecurityConfig.java

@@ -1,165 +0,0 @@
-package com.agileboot.admin.customize.config;
-
-import cn.hutool.json.JSONUtil;
-import com.agileboot.admin.customize.service.login.LoginService;
-import com.agileboot.common.core.dto.ResponseDTO;
-import com.agileboot.common.exception.ApiException;
-import com.agileboot.common.exception.error.ErrorCode.Client;
-import com.agileboot.common.utils.ServletHolderUtil;
-import com.agileboot.domain.common.cache.RedisCacheService;
-import com.agileboot.admin.customize.async.AsyncTaskFactory;
-import com.agileboot.infrastructure.thread.ThreadPoolManager;
-import com.agileboot.infrastructure.user.web.SystemLoginUser;
-import com.agileboot.admin.customize.service.login.TokenService;
-import com.agileboot.common.enums.common.LoginStatusEnum;
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.http.HttpMethod;
-import org.springframework.security.authentication.AuthenticationManager;
-import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
-import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.http.SessionCreationPolicy;
-import org.springframework.security.core.userdetails.UserDetailsService;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import org.springframework.security.web.AuthenticationEntryPoint;
-import org.springframework.security.web.SecurityFilterChain;
-import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
-import org.springframework.security.web.authentication.logout.LogoutFilter;
-import org.springframework.security.web.authentication.logout.LogoutSuccessHandler;
-import org.springframework.web.filter.CorsFilter;
-
-/**
- * 主要配置登录流程逻辑涉及以下几个类
- * @see UserDetailsServiceImpl#loadUserByUsername  用于登录流程通过用户名加载用户
- * @see this#unauthorizedHandler()  用于用户未授权或登录失败处理
- * @see this#logOutSuccessHandler 用于退出登录成功后的逻辑
- * @see JwtAuthenticationTokenFilter#doFilter token的校验和刷新
- * @see LoginService#login 登录逻辑
- * @author valarchie
- */
-@Configuration
-@EnableWebSecurity
-@EnableGlobalMethodSecurity(prePostEnabled = true)
-@RequiredArgsConstructor
-public class SecurityConfig {
-
-    private final TokenService tokenService;
-
-    private final RedisCacheService redisCache;
-
-    /**
-     * token认证过滤器
-     */
-    private final JwtAuthenticationTokenFilter jwtTokenFilter;
-
-    private final UserDetailsService userDetailsService;
-
-    /**
-     * 跨域过滤器
-     */
-    private final CorsFilter corsFilter;
-
-
-    /**
-     * 登录异常处理类
-     * 用户未登陆的话  在这个Bean中处理
-     */
-    @Bean
-    public AuthenticationEntryPoint unauthorizedHandler() {
-        return (request, response, exception) -> {
-            ResponseDTO<Object> responseDTO = ResponseDTO.fail(
-                new ApiException(Client.COMMON_NO_AUTHORIZATION, request.getRequestURI())
-            );
-            ServletHolderUtil.renderString(response, JSONUtil.toJsonStr(responseDTO));
-        };
-    }
-
-
-    /**
-     *  退出成功处理类 返回成功
-     *  在SecurityConfig类当中 定义了/logout 路径对应处理逻辑
-     */
-    @Bean
-    public LogoutSuccessHandler logOutSuccessHandler() {
-        return (request, response, authentication) -> {
-            SystemLoginUser loginUser = tokenService.getLoginUser(request);
-            if (loginUser != null) {
-                String userName = loginUser.getUsername();
-                // 删除用户缓存记录
-                redisCache.loginUserCache.delete(loginUser.getCachedKey());
-                // 记录用户退出日志
-                ThreadPoolManager.execute(AsyncTaskFactory.loginInfoTask(
-                    userName, LoginStatusEnum.LOGOUT, LoginStatusEnum.LOGOUT.description()));
-            }
-            ServletHolderUtil.renderString(response, JSONUtil.toJsonStr(ResponseDTO.ok()));
-        };
-    }
-
-    /**
-     * 强散列哈希加密实现
-     */
-    @Bean
-    public BCryptPasswordEncoder bCryptPasswordEncoder() {
-        return new BCryptPasswordEncoder();
-    }
-
-
-    /**
-     * 鉴权管理类
-     * @see UserDetailsServiceImpl#loadUserByUsername
-     */
-    @Bean
-    public AuthenticationManager authManager(HttpSecurity http) throws Exception {
-        return http.getSharedObject(AuthenticationManagerBuilder.class)
-            .userDetailsService(userDetailsService)
-            .passwordEncoder(bCryptPasswordEncoder())
-            .and()
-            .build();
-    }
-
-
-    @Bean
-    public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Exception {
-        httpSecurity
-            // CSRF禁用，因为不使用session
-            .csrf().disable()
-            // 认证失败处理类
-            .exceptionHandling().authenticationEntryPoint(unauthorizedHandler()).and()
-            // 基于token，所以不需要session
-            .sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS).and()
-            // 过滤请求
-            .authorizeRequests()
-            // 对于登录login 注册register 验证码captchaImage 以及公共Api的请求允许匿名访问
-            // 注意： 当携带token请求以下这几个接口时 会返回403的错误
-            .antMatchers("/login", "/register", "/getConfig", "/captchaImage", "/api/**").anonymous()
-            .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js",
-                "/profile/**").permitAll()
-            // TODO this is danger.
-            .antMatchers("/swagger-ui.html").anonymous()
-            .antMatchers("/swagger-resources/**").anonymous()
-            .antMatchers("/webjars/**").anonymous()
-            .antMatchers("/*/api-docs","/*/api-docs/swagger-config").anonymous()
-            .antMatchers("/**/api-docs.yaml" ).anonymous()
-            .antMatchers("/druid/**").anonymous()
-            // 除上面外的所有请求全部需要鉴权认证
-            .anyRequest().authenticated()
-            .and()
-            // 禁用 X-Frame-Options 响应头。下面是具体解释：
-            // X-Frame-Options 是一个 HTTP 响应头，用于防止网页被嵌入到其他网页的 <frame>、<iframe> 或 <object> 标签中，从而可以减少点击劫持攻击的风险
-            .headers().frameOptions().disable();
-        httpSecurity.logout().logoutUrl("/logout").logoutSuccessHandler(logOutSuccessHandler());
-        // 添加JWT filter   需要一开始就通过token识别出登录用户 并放到上下文中   所以jwtFilter需要放前面
-        httpSecurity.addFilterBefore(jwtTokenFilter, UsernamePasswordAuthenticationFilter.class);
-        // 添加CORS filter
-        httpSecurity.addFilterBefore(corsFilter, JwtAuthenticationTokenFilter.class);
-        httpSecurity.addFilterBefore(corsFilter, LogoutFilter.class);
-
-        return httpSecurity.build();
-    }
-
-
-}

agileboot-admin/src/main/java/com/agileboot/admin/customize/service/login/LoginService.java

@@ -1,223 +0,0 @@
-package com.agileboot.admin.customize.service.login;
-
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.convert.Convert;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.img.ImgUtil;
-import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.core.util.IdUtil;
-import cn.hutool.core.util.StrUtil;
-import cn.hutool.crypto.SecureUtil;
-import cn.hutool.crypto.asymmetric.KeyType;
-import cn.hutool.extra.servlet.ServletUtil;
-import com.agileboot.common.config.AgileBootConfig;
-import com.agileboot.common.constant.Constants.Captcha;
-import com.agileboot.common.exception.ApiException;
-import com.agileboot.common.exception.error.ErrorCode;
-import com.agileboot.common.exception.error.ErrorCode.Business;
-import com.agileboot.common.utils.ServletHolderUtil;
-import com.agileboot.common.utils.i18n.MessageUtils;
-import com.agileboot.domain.common.cache.GuavaCacheService;
-import com.agileboot.domain.common.cache.MapCache;
-import com.agileboot.domain.common.cache.RedisCacheService;
-import com.agileboot.admin.customize.async.AsyncTaskFactory;
-import com.agileboot.infrastructure.thread.ThreadPoolManager;
-import com.agileboot.admin.customize.service.login.dto.CaptchaDTO;
-import com.agileboot.admin.customize.service.login.dto.ConfigDTO;
-import com.agileboot.admin.customize.service.login.command.LoginCommand;
-import com.agileboot.infrastructure.user.web.SystemLoginUser;
-import com.agileboot.common.enums.common.ConfigKeyEnum;
-import com.agileboot.common.enums.common.LoginStatusEnum;
-import com.agileboot.domain.system.user.db.SysUserEntity;
-import com.google.code.kaptcha.Producer;
-import java.awt.image.BufferedImage;
-import javax.annotation.Resource;
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.authentication.AuthenticationManager;
-import org.springframework.security.authentication.BadCredentialsException;
-import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.AuthenticationException;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.stereotype.Component;
-import org.springframework.util.FastByteArrayOutputStream;
-
-/**
- * 登录校验方法
- *
- * @author ruoyi
- */
-@Component
-@Slf4j
-@RequiredArgsConstructor
-public class LoginService {
-
-    private final TokenService tokenService;
-
-    private final RedisCacheService redisCache;
-
-    private final GuavaCacheService guavaCache;
-
-    private final AuthenticationManager authenticationManager;
-
-    @Resource(name = "captchaProducer")
-    private Producer captchaProducer;
-
-    @Resource(name = "captchaProducerMath")
-    private Producer captchaProducerMath;
-
-    /**
-     * 登录验证
-     *
-     * @param loginCommand 登录参数
-     * @return 结果
-     */
-    public String login(LoginCommand loginCommand) {
-        // 验证码开关
-        if (isCaptchaOn()) {
-            validateCaptcha(loginCommand.getUsername(), loginCommand.getCaptchaCode(), loginCommand.getCaptchaCodeKey());
-        }
-        // 用户验证
-        Authentication authentication;
-        String decryptPassword = decryptPassword(loginCommand.getPassword());
-        try {
-            // 该方法会去调用UserDetailsServiceImpl#loadUserByUsername  校验用户名和密码  认证鉴权
-            authentication = authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(
-                loginCommand.getUsername(), decryptPassword));
-        } catch (BadCredentialsException e) {
-            ThreadPoolManager.execute(AsyncTaskFactory.loginInfoTask(loginCommand.getUsername(), LoginStatusEnum.LOGIN_FAIL,
-                MessageUtils.message("Business.LOGIN_WRONG_USER_PASSWORD")));
-            throw new ApiException(e, ErrorCode.Business.LOGIN_WRONG_USER_PASSWORD);
-        } catch (AuthenticationException e) {
-            ThreadPoolManager.execute(AsyncTaskFactory.loginInfoTask(loginCommand.getUsername(), LoginStatusEnum.LOGIN_FAIL, e.getMessage()));
-            throw new ApiException(e, ErrorCode.Business.LOGIN_ERROR, e.getMessage());
-        } catch (Exception e) {
-            ThreadPoolManager.execute(AsyncTaskFactory.loginInfoTask(loginCommand.getUsername(), LoginStatusEnum.LOGIN_FAIL, e.getMessage()));
-            throw new ApiException(e, Business.LOGIN_ERROR, e.getMessage());
-        }
-        // 把当前登录用户 放入上下文中
-        SecurityContextHolder.getContext().setAuthentication(authentication);
-        // 这里获取的loginUser是UserDetailsServiceImpl#loadUserByUsername方法返回的LoginUser
-        SystemLoginUser loginUser = (SystemLoginUser) authentication.getPrincipal();
-        recordLoginInfo(loginUser);
-        // 生成token
-        return tokenService.createTokenAndPutUserInCache(loginUser);
-    }
-
-    /**
-     * 获取验证码 data
-     *
-     * @return {@link ConfigDTO}
-     */
-    public ConfigDTO getConfig() {
-        ConfigDTO configDTO = new ConfigDTO();
-
-        boolean isCaptchaOn = isCaptchaOn();
-        configDTO.setIsCaptchaOn(isCaptchaOn);
-        configDTO.setDictionary(MapCache.dictionaryCache());
-        return configDTO;
-    }
-
-    /**
-     * 获取验证码 data
-     *
-     * @return 验证码
-     */
-    public CaptchaDTO generateCaptchaImg() {
-        CaptchaDTO captchaDTO = new CaptchaDTO();
-
-        boolean isCaptchaOn = isCaptchaOn();
-        captchaDTO.setIsCaptchaOn(isCaptchaOn);
-
-        if (isCaptchaOn) {
-            String expression;
-            String answer = null;
-            BufferedImage image = null;
-
-            // 生成验证码
-            String captchaType = AgileBootConfig.getCaptchaType();
-            if (Captcha.MATH_TYPE.equals(captchaType)) {
-                String capText = captchaProducerMath.createText();
-                String[] expressionAndAnswer = capText.split("@");
-                expression = expressionAndAnswer[0];
-                answer = expressionAndAnswer[1];
-                image = captchaProducerMath.createImage(expression);
-            }
-
-            if (Captcha.CHAR_TYPE.equals(captchaType)) {
-                expression = answer = captchaProducer.createText();
-                image = captchaProducer.createImage(expression);
-            }
-
-            if (image == null) {
-                throw new ApiException(ErrorCode.Internal.LOGIN_CAPTCHA_GENERATE_FAIL);
-            }
-
-            // 保存验证码信息
-            String imgKey = IdUtil.simpleUUID();
-
-            redisCache.captchaCache.set(imgKey, answer);
-            // 转换流信息写出
-            FastByteArrayOutputStream os = new FastByteArrayOutputStream();
-            ImgUtil.writeJpg(image, os);
-
-            captchaDTO.setCaptchaCodeKey(imgKey);
-            captchaDTO.setCaptchaCodeImg(Base64.encode(os.toByteArray()));
-
-        }
-
-        return captchaDTO;
-    }
-
-
-    /**
-     * 校验验证码
-     *
-     * @param username 用户名
-     * @param captchaCode 验证码
-     * @param captchaCodeKey 验证码对应的缓存key
-     */
-    public void validateCaptcha(String username, String captchaCode, String captchaCodeKey) {
-        String captcha = redisCache.captchaCache.getObjectById(captchaCodeKey);
-        redisCache.captchaCache.delete(captchaCodeKey);
-        if (captcha == null) {
-            ThreadPoolManager.execute(AsyncTaskFactory.loginInfoTask(username, LoginStatusEnum.LOGIN_FAIL,
-                ErrorCode.Business.LOGIN_CAPTCHA_CODE_EXPIRE.message()));
-            throw new ApiException(ErrorCode.Business.LOGIN_CAPTCHA_CODE_EXPIRE);
-        }
-        if (!captchaCode.equalsIgnoreCase(captcha)) {
-            ThreadPoolManager.execute(AsyncTaskFactory.loginInfoTask(username, LoginStatusEnum.LOGIN_FAIL,
-                ErrorCode.Business.LOGIN_CAPTCHA_CODE_WRONG.message()));
-            throw new ApiException(ErrorCode.Business.LOGIN_CAPTCHA_CODE_WRONG);
-        }
-    }
-
-    /**
-     * 记录登录信息
-     * @param loginUser 登录用户
-     */
-    public void recordLoginInfo(SystemLoginUser loginUser) {
-        ThreadPoolManager.execute(AsyncTaskFactory.loginInfoTask(loginUser.getUsername(), LoginStatusEnum.LOGIN_SUCCESS,
-            LoginStatusEnum.LOGIN_SUCCESS.description()));
-
-        SysUserEntity entity = redisCache.userCache.getObjectById(loginUser.getUserId());
-
-        entity.setLoginIp(ServletUtil.getClientIP(ServletHolderUtil.getRequest()));
-        entity.setLoginDate(DateUtil.date());
-        entity.updateById();
-    }
-
-    public String decryptPassword(String originalPassword) {
-        byte[] decryptBytes = SecureUtil.rsa(AgileBootConfig.getRsaPrivateKey(), null)
-            .decrypt(Base64.decode(originalPassword), KeyType.PrivateKey);
-
-        return StrUtil.str(decryptBytes, CharsetUtil.CHARSET_UTF_8);
-    }
-
-    private boolean isCaptchaOn() {
-        return Convert.toBool(guavaCache.configCache.get(ConfigKeyEnum.CAPTCHA.getValue()));
-    }
-
-}

agileboot-admin/src/main/java/com/agileboot/admin/customize/service/login/TokenService.java

@@ -1,164 +0,0 @@
-package com.agileboot.admin.customize.service.login;
-
-import cn.hutool.core.map.MapUtil;
-import cn.hutool.core.util.IdUtil;
-import cn.hutool.core.util.StrUtil;
-import com.agileboot.common.constant.Constants.Token;
-import com.agileboot.common.exception.ApiException;
-import com.agileboot.common.exception.error.ErrorCode;
-import com.agileboot.domain.common.cache.RedisCacheService;
-import com.agileboot.infrastructure.user.web.SystemLoginUser;
-import io.jsonwebtoken.Claims;
-import io.jsonwebtoken.Jwts;
-import io.jsonwebtoken.MalformedJwtException;
-import io.jsonwebtoken.SignatureAlgorithm;
-import io.jsonwebtoken.SignatureException;
-import io.jsonwebtoken.UnsupportedJwtException;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-import javax.servlet.http.HttpServletRequest;
-import lombok.Data;
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-
-/**
- * token验证处理
- *
- * @author valarchie
- */
-@Component
-@Slf4j
-@Data
-@RequiredArgsConstructor
-public class TokenService {
-
-    /**
-     * 自定义令牌标识
-     */
-    @Value("${token.header}")
-    private String header;
-
-    /**
-     * 令牌秘钥
-     */
-    @Value("${token.secret}")
-    private String secret;
-
-    /**
-     * 自动刷新token的时间，当过期时间不足autoRefreshTime的值的时候，会触发刷新用户登录缓存的时间
-     * 比如这个值是20,   用户是8点登录的， 8点半缓存会过期， 当过8.10分的时候，就少于20分钟了，便触发
-     * 刷新登录用户的缓存时间
-     */
-    @Value("${token.autoRefreshTime}")
-    private long autoRefreshTime;
-
-    private final RedisCacheService redisCache;
-
-    /**
-     * 获取用户身份信息
-     *
-     * @return 用户信息
-     */
-    public SystemLoginUser getLoginUser(HttpServletRequest request) {
-        // 获取请求携带的令牌
-        String token = getTokenFromRequest(request);
-        if (StrUtil.isNotEmpty(token)) {
-            try {
-                Claims claims = parseToken(token);
-                // 解析对应的权限以及用户信息
-                String uuid = (String) claims.get(Token.LOGIN_USER_KEY);
-
-                return redisCache.loginUserCache.getObjectOnlyInCacheById(uuid);
-            } catch (SignatureException | MalformedJwtException | UnsupportedJwtException | IllegalArgumentException jwtException) {
-                log.error("parse token failed.", jwtException);
-                throw new ApiException(jwtException, ErrorCode.Client.INVALID_TOKEN);
-            } catch (Exception e) {
-                log.error("fail to get cached user from redis", e);
-                throw new ApiException(e, ErrorCode.Client.TOKEN_PROCESS_FAILED, e.getMessage());
-            }
-
-        }
-        return null;
-    }
-
-    /**
-     * 创建令牌
-     *
-     * @param loginUser 用户信息
-     * @return 令牌
-     */
-    public String createTokenAndPutUserInCache(SystemLoginUser loginUser) {
-        loginUser.setCachedKey(IdUtil.fastUUID());
-
-        redisCache.loginUserCache.set(loginUser.getCachedKey(), loginUser);
-
-        return generateToken(MapUtil.of(Token.LOGIN_USER_KEY, loginUser.getCachedKey()));
-    }
-
-    /**
-     * 当超过20分钟，自动刷新token
-     * @param loginUser 登录用户
-     */
-    public void refreshToken(SystemLoginUser loginUser) {
-        long currentTime = System.currentTimeMillis();
-        if (currentTime > loginUser.getAutoRefreshCacheTime()) {
-            loginUser.setAutoRefreshCacheTime(currentTime + TimeUnit.MINUTES.toMillis(autoRefreshTime));
-            // 根据uuid将loginUser存入缓存
-            redisCache.loginUserCache.set(loginUser.getCachedKey(), loginUser);
-        }
-    }
-
-
-    /**
-     * 从数据声明生成令牌
-     *
-     * @param claims 数据声明
-     * @return 令牌
-     */
-    private String generateToken(Map<String, Object> claims) {
-        return Jwts.builder()
-            .setClaims(claims)
-            .signWith(SignatureAlgorithm.HS512, secret).compact();
-    }
-
-    /**
-     * 从令牌中获取数据声明
-     *
-     * @param token 令牌
-     * @return 数据声明
-     */
-    private Claims parseToken(String token) {
-        return Jwts.parser()
-            .setSigningKey(secret)
-            .parseClaimsJws(token)
-            .getBody();
-    }
-
-    /**
-     * 从令牌中获取用户名
-     *
-     * @param token 令牌
-     * @return 用户名
-     */
-    private String getUsernameFromToken(String token) {
-        Claims claims = parseToken(token);
-        return claims.getSubject();
-    }
-
-    /**
-     * 获取请求token
-     *
-     * @return token
-     */
-    private String getTokenFromRequest(HttpServletRequest request) {
-        String token = request.getHeader(header);
-        if (StrUtil.isNotEmpty(token) && token.startsWith(Token.PREFIX)) {
-            token = StrUtil.stripIgnoreCase(token, Token.PREFIX, null);
-        }
-        return token;
-    }
-
-}

agileboot-admin/src/main/java/com/agileboot/admin/customize/service/login/UserDetailsServiceImpl.java

@@ -1,118 +0,0 @@
-package com.agileboot.admin.customize.service.login;
-
-import cn.hutool.core.convert.Convert;
-import cn.hutool.core.util.StrUtil;
-import com.agileboot.common.exception.ApiException;
-import com.agileboot.common.exception.error.ErrorCode;
-import com.agileboot.infrastructure.user.web.SystemLoginUser;
-import com.agileboot.infrastructure.user.web.RoleInfo;
-import com.agileboot.infrastructure.user.web.DataScopeEnum;
-import com.agileboot.common.enums.common.UserStatusEnum;
-import com.agileboot.common.enums.BasicEnumUtil;
-import com.agileboot.domain.system.menu.db.SysMenuEntity;
-import com.agileboot.domain.system.role.db.SysRoleEntity;
-import com.agileboot.domain.system.user.db.SysUserEntity;
-import com.agileboot.domain.system.menu.db.SysMenuService;
-import com.agileboot.domain.system.role.db.SysRoleService;
-import com.agileboot.domain.system.user.db.SysUserService;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.SetUtils;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.security.core.userdetails.UserDetailsService;
-import org.springframework.security.core.userdetails.UsernameNotFoundException;
-import org.springframework.stereotype.Service;
-
-/**
- * 自定义加载用户信息通过用户名
- * 用于SpringSecurity 登录流程
- * 没有办法把这个类 放进loginService中  会在SecurityConfig中造成循环依赖
- * @see com.agileboot.infrastructure.config.SecurityConfig#filterChain(HttpSecurity)
- * @author valarchie
- */
-@Service
-@Slf4j
-@RequiredArgsConstructor
-public class UserDetailsServiceImpl implements UserDetailsService {
-
-    private final SysUserService userService;
-
-    private final SysMenuService menuService;
-
-    private final SysRoleService roleService;
-
-    private final TokenService tokenService;
-
-
-    @Override
-    public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
-        SysUserEntity userEntity = userService.getUserByUserName(username);
-        if (userEntity == null) {
-            log.info("登录用户：{} 不存在.", username);
-            throw new ApiException(ErrorCode.Business.USER_NON_EXIST, username);
-        }
-        if (!Objects.equals(UserStatusEnum.NORMAL.getValue(), userEntity.getStatus())) {
-            log.info("登录用户：{} 已被停用.", username);
-            throw new ApiException(ErrorCode.Business.USER_IS_DISABLE, username);
-        }
-
-        RoleInfo roleInfo = getRoleInfo(userEntity.getRoleId(), userEntity.getIsAdmin());
-
-        SystemLoginUser loginUser = new SystemLoginUser(userEntity.getUserId(), userEntity.getIsAdmin(), userEntity.getUsername(),
-            userEntity.getPassword(), roleInfo, userEntity.getDeptId());
-        loginUser.fillLoginInfo();
-        loginUser.setAutoRefreshCacheTime(loginUser.getLoginInfo().getLoginTime()
-            + TimeUnit.MINUTES.toMillis(tokenService.getAutoRefreshTime()));
-        return loginUser;
-    }
-
-    public RoleInfo getRoleInfo(Long roleId, boolean isAdmin) {
-        if (roleId == null) {
-            return RoleInfo.EMPTY_ROLE;
-        }
-
-        if (isAdmin) {
-            LambdaQueryWrapper<SysMenuEntity> menuQuery = Wrappers.lambdaQuery();
-            menuQuery.select(SysMenuEntity::getMenuId);
-            List<SysMenuEntity> allMenus = menuService.list(menuQuery);
-
-            Set<Long> allMenuIds = allMenus.stream().map(SysMenuEntity::getMenuId).collect(Collectors.toSet());
-
-            return new RoleInfo(RoleInfo.ADMIN_ROLE_ID, RoleInfo.ADMIN_ROLE_KEY, DataScopeEnum.ALL, SetUtils.emptySet(),
-                RoleInfo.ADMIN_PERMISSIONS, allMenuIds);
-
-        }
-
-        SysRoleEntity roleEntity = roleService.getById(roleId);
-
-        if (roleEntity == null) {
-            return RoleInfo.EMPTY_ROLE;
-        }
-
-        List<SysMenuEntity> menuList = roleService.getMenuListByRoleId(roleId);
-
-        Set<Long> menuIds = menuList.stream().map(SysMenuEntity::getMenuId).collect(Collectors.toSet());
-        Set<String> permissions = menuList.stream().map(SysMenuEntity::getPermission).collect(Collectors.toSet());
-
-        DataScopeEnum dataScopeEnum = BasicEnumUtil.fromValue(DataScopeEnum.class, roleEntity.getDataScope());
-
-        Set<Long> deptIdSet = SetUtils.emptySet();
-        if (StrUtil.isNotEmpty(roleEntity.getDeptIdSet())) {
-            deptIdSet = StrUtil.split(roleEntity.getDeptIdSet(), ",").stream()
-                .map(Convert::toLong).collect(Collectors.toSet());
-        }
-
-        return new RoleInfo(roleId, roleEntity.getRoleKey(), dataScopeEnum, deptIdSet, permissions, menuIds);
-    }
-
-
-}

agileboot-admin/src/main/java/com/agileboot/admin/customize/service/login/command/LoginCommand.java

@@ -1,33 +0,0 @@
-package com.agileboot.admin.customize.service.login.command;
-
-import lombok.Data;
-
-/**
- * 用户登录对象
- *
- * @author valarchie
- */
-@Data
-public class LoginCommand {
-
-    /**
-     * 用户名
-     */
-    private String username;
-
-    /**
-     * 用户密码
-     */
-    private String password;
-
-    /**
-     * 验证码
-     */
-    private String captchaCode;
-
-    /**
-     * 唯一标识
-     */
-    private String captchaCodeKey;
-
-}

agileboot-admin/src/main/java/com/agileboot/admin/customize/service/login/dto/CaptchaDTO.java

@@ -1,15 +0,0 @@
-package com.agileboot.admin.customize.service.login.dto;
-
-import lombok.Data;
-
-/**
- * @author valarchie
- */
-@Data
-public class CaptchaDTO {
-
-    private Boolean isCaptchaOn;
-    private String captchaCodeKey;
-    private String captchaCodeImg;
-
-}

agileboot-admin/src/main/java/com/agileboot/admin/customize/service/login/dto/ConfigDTO.java

@@ -1,18 +0,0 @@
-package com.agileboot.admin.customize.service.login.dto;
-
-import com.agileboot.common.enums.dictionary.DictionaryData;
-import java.util.List;
-import java.util.Map;
-import lombok.Data;
-
-/**
- * @author valarchie
- */
-@Data
-public class ConfigDTO {
-
-    private Boolean isCaptchaOn;
-
-    private Map<String, List<DictionaryData>> dictionary;
-
-}

agileboot-admin/src/main/java/com/agileboot/admin/customize/service/permission/DataPermissionCheckerFactory.java

@@ -1,66 +0,0 @@
-package com.agileboot.admin.customize.service.permission;
-
-import cn.hutool.extra.spring.SpringUtil;
-import com.agileboot.admin.customize.service.permission.model.AbstractDataPermissionChecker;
-import com.agileboot.infrastructure.user.web.SystemLoginUser;
-import com.agileboot.admin.customize.service.permission.model.checker.AllDataPermissionChecker;
-import com.agileboot.admin.customize.service.permission.model.checker.CustomDataPermissionChecker;
-import com.agileboot.admin.customize.service.permission.model.checker.DefaultDataPermissionChecker;
-import com.agileboot.admin.customize.service.permission.model.checker.DeptTreeDataPermissionChecker;
-import com.agileboot.admin.customize.service.permission.model.checker.OnlySelfDataPermissionChecker;
-import com.agileboot.admin.customize.service.permission.model.checker.SingleDeptDataPermissionChecker;
-import com.agileboot.infrastructure.user.web.DataScopeEnum;
-import com.agileboot.domain.system.dept.db.SysDeptService;
-import javax.annotation.PostConstruct;
-import org.springframework.stereotype.Component;
-
-/**
- * 数据权限检测器工厂
- * @author valarchie
- */
-@Component
-public class DataPermissionCheckerFactory {
-    private static AbstractDataPermissionChecker allChecker;
-    private static AbstractDataPermissionChecker customChecker;
-    private static AbstractDataPermissionChecker singleDeptChecker;
-    private static AbstractDataPermissionChecker deptTreeChecker;
-    private static AbstractDataPermissionChecker onlySelfChecker;
-    private static AbstractDataPermissionChecker defaultSelfChecker;
-
-
-    @PostConstruct
-    public void initAllChecker() {
-        SysDeptService deptService = SpringUtil.getBean(SysDeptService.class);
-
-        allChecker = new AllDataPermissionChecker();
-        customChecker = new CustomDataPermissionChecker(deptService);
-        singleDeptChecker = new SingleDeptDataPermissionChecker(deptService);
-        deptTreeChecker = new DeptTreeDataPermissionChecker(deptService);
-        onlySelfChecker = new OnlySelfDataPermissionChecker(deptService);
-        defaultSelfChecker = new DefaultDataPermissionChecker();
-    }
-
-
-    public static AbstractDataPermissionChecker getChecker(SystemLoginUser loginUser) {
-        if (loginUser == null) {
-            return deptTreeChecker;
-        }
-
-        DataScopeEnum dataScope = loginUser.getRoleInfo().getDataScope();
-        switch (dataScope) {
-            case ALL:
-                return allChecker;
-            case CUSTOM_DEFINE:
-                return customChecker;
-            case SINGLE_DEPT:
-                return singleDeptChecker;
-            case DEPT_TREE:
-                return deptTreeChecker;
-            case ONLY_SELF:
-                return onlySelfChecker;
-            default:
-                return defaultSelfChecker;
-        }
-    }
-
-}

agileboot-admin/src/main/java/com/agileboot/admin/customize/service/permission/DataPermissionService.java

@@ -1,71 +0,0 @@
-package com.agileboot.admin.customize.service.permission;
-
-import cn.hutool.core.collection.CollUtil;
-import com.agileboot.admin.customize.service.permission.model.AbstractDataPermissionChecker;
-import com.agileboot.admin.customize.service.permission.model.DataCondition;
-import com.agileboot.infrastructure.user.AuthenticationUtils;
-import com.agileboot.infrastructure.user.web.SystemLoginUser;
-import com.agileboot.domain.system.user.db.SysUserEntity;
-import com.agileboot.domain.system.user.db.SysUserService;
-import java.util.List;
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-
-/**
- * 数据权限校验服务
- * @author valarchie
- */
-@Service("dataScope")
-@RequiredArgsConstructor
-public class DataPermissionService {
-
-    private final SysUserService userService;
-
-    /**
-     * 通过userId 校验当前用户 对 目标用户是否有操作权限
-     *
-     * @param userId 用户id
-     * @return 检验结果
-     */
-    public boolean checkUserId(Long userId) {
-        SystemLoginUser loginUser = AuthenticationUtils.getSystemLoginUser();
-        SysUserEntity targetUser = userService.getById(userId);
-        if (targetUser == null) {
-            return true;
-        }
-        return checkDataScope(loginUser, targetUser.getDeptId(), userId);
-    }
-
-    /**
-     * 通过userId 校验当前用户 对 目标用户是否有操作权限
-     * @param userIds 用户id列表
-     * @return 校验结果
-     */
-    public boolean checkUserIds(List<Long> userIds) {
-        if (CollUtil.isNotEmpty(userIds)) {
-            for (Long userId : userIds) {
-                boolean checkResult = checkUserId(userId);
-                if (!checkResult) {
-                    return false;
-                }
-            }
-        }
-        return true;
-    }
-
-    public boolean checkDeptId(Long deptId) {
-        SystemLoginUser loginUser = AuthenticationUtils.getSystemLoginUser();
-        return checkDataScope(loginUser, deptId, null);
-    }
-
-
-    public boolean checkDataScope(SystemLoginUser loginUser, Long targetDeptId, Long targetUserId) {
-        DataCondition dataCondition = DataCondition.builder().targetDeptId(targetDeptId).targetUserId(targetUserId).build();
-        AbstractDataPermissionChecker checker = DataPermissionCheckerFactory.getChecker(loginUser);
-        return checker.check(loginUser, dataCondition);
-    }
-
-
-
-}

agileboot-admin/src/main/java/com/agileboot/admin/customize/service/permission/MenuPermissionService.java

@@ -1,48 +0,0 @@
-package com.agileboot.admin.customize.service.permission;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.StrUtil;
-import com.agileboot.infrastructure.user.AuthenticationUtils;
-import com.agileboot.infrastructure.user.web.SystemLoginUser;
-import com.agileboot.infrastructure.user.web.RoleInfo;
-import java.util.Set;
-import org.springframework.stereotype.Service;
-
-/**
- *
- * @author valarchie
- */
-@Service("permission")
-public class MenuPermissionService {
-
-
-    /**
-     * 验证用户是否具备某权限
-     *
-     * @param permission 权限字符串
-     * @return 用户是否具备某权限
-     */
-    public boolean has(String permission) {
-        if (StrUtil.isEmpty(permission)) {
-            return false;
-        }
-        SystemLoginUser loginUser = AuthenticationUtils.getSystemLoginUser();
-        if (loginUser == null || CollUtil.isEmpty(loginUser.getRoleInfo().getMenuPermissions())) {
-            return false;
-        }
-        return has(loginUser.getRoleInfo().getMenuPermissions(), permission);
-    }
-
-
-    /**
-     * 判断是否包含权限
-     *
-     * @param permissions 权限列表
-     * @param permission 权限字符串
-     * @return 用户是否具备某权限
-     */
-    private boolean has(Set<String> permissions, String permission) {
-        return permissions.contains(RoleInfo.ALL_PERMISSIONS) || permissions.contains(StrUtil.trim(permission));
-    }
-
-}

agileboot-admin/src/main/java/com/agileboot/admin/customize/service/permission/model/AbstractDataPermissionChecker.java

@@ -1,25 +0,0 @@
-package com.agileboot.admin.customize.service.permission.model;
-
-import com.agileboot.infrastructure.user.web.SystemLoginUser;
-import com.agileboot.domain.system.dept.db.SysDeptService;
-import lombok.Data;
-
-/**
- * 数据权限测试接口
- * @author valarchie
- */
-@Data
-public abstract class AbstractDataPermissionChecker {
-
-    private SysDeptService deptService;
-
-    /**
-     * 检测当前用户对于 给定条件的数据 是否有权限
-     *
-     * @param loginUser 登录用户
-     * @param condition 条件
-     * @return 校验结果
-     */
-    public abstract boolean check(SystemLoginUser loginUser, DataCondition condition);
-
-}

agileboot-admin/src/main/java/com/agileboot/admin/customize/service/permission/model/DataCondition.java

@@ -1,21 +0,0 @@
-package com.agileboot.admin.customize.service.permission.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * @author valarchie
- * 供 DataPermissionChecker使用的 数据条件
- */
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class DataCondition {
-
-    private Long targetDeptId;
-    private Long targetUserId;
-
-}

agileboot-admin/src/main/java/com/agileboot/admin/customize/service/permission/model/checker/AllDataPermissionChecker.java

@@ -1,25 +0,0 @@
-package com.agileboot.admin.customize.service.permission.model.checker;
-
-import com.agileboot.infrastructure.user.web.SystemLoginUser;
-import com.agileboot.admin.customize.service.permission.model.AbstractDataPermissionChecker;
-import com.agileboot.admin.customize.service.permission.model.DataCondition;
-import com.agileboot.domain.system.dept.db.SysDeptService;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 数据权限测试接口
- * @author valarchie
- */
-@EqualsAndHashCode(callSuper = true)
-@Data
-public class AllDataPermissionChecker extends AbstractDataPermissionChecker {
-
-    private SysDeptService deptService;
-
-
-    @Override
-    public boolean check(SystemLoginUser loginUser, DataCondition condition) {
-        return true;
-    }
-}

agileboot-admin/src/main/java/com/agileboot/admin/customize/service/permission/model/checker/CustomDataPermissionChecker.java

@@ -1,42 +0,0 @@
-package com.agileboot.admin.customize.service.permission.model.checker;
-
-import cn.hutool.core.collection.CollUtil;
-import com.agileboot.infrastructure.user.web.SystemLoginUser;
-import com.agileboot.admin.customize.service.permission.model.AbstractDataPermissionChecker;
-import com.agileboot.admin.customize.service.permission.model.DataCondition;
-import com.agileboot.domain.system.dept.db.SysDeptService;
-import java.util.Set;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-
-/**
- * 数据权限测试接口
- * @author valarchie
- */
-@EqualsAndHashCode(callSuper = true)
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class CustomDataPermissionChecker extends AbstractDataPermissionChecker {
-
-    private SysDeptService deptService;
-
-
-    @Override
-    public boolean check(SystemLoginUser loginUser, DataCondition condition) {
-        if (condition == null || loginUser == null) {
-            return false;
-        }
-
-        if (loginUser.getRoleInfo() == null) {
-            return false;
-        }
-
-        Set<Long> deptIdSet = loginUser.getRoleInfo().getDeptIdSet();
-        Long targetDeptId = condition.getTargetDeptId();
-
-        return condition.getTargetDeptId() != null && CollUtil.safeContains(deptIdSet, targetDeptId);
-    }
-}

agileboot-admin/src/main/java/com/agileboot/admin/customize/service/permission/model/checker/DefaultDataPermissionChecker.java

@@ -1,25 +0,0 @@
-package com.agileboot.admin.customize.service.permission.model.checker;
-
-import com.agileboot.infrastructure.user.web.SystemLoginUser;
-import com.agileboot.admin.customize.service.permission.model.AbstractDataPermissionChecker;
-import com.agileboot.admin.customize.service.permission.model.DataCondition;
-import com.agileboot.domain.system.dept.db.SysDeptService;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 数据权限测试接口
- * @author valarchie
- */
-@EqualsAndHashCode(callSuper = true)
-@Data
-public class DefaultDataPermissionChecker extends AbstractDataPermissionChecker {
-
-    private SysDeptService deptService;
-
-    @Override
-    public boolean check(SystemLoginUser loginUser, DataCondition condition) {
-        return false;
-    }
-
-}

agileboot-admin/src/main/java/com/agileboot/admin/customize/service/permission/model/checker/DeptTreeDataPermissionChecker.java

@@ -1,44 +0,0 @@
-package com.agileboot.admin.customize.service.permission.model.checker;
-
-import com.agileboot.infrastructure.user.web.SystemLoginUser;
-import com.agileboot.admin.customize.service.permission.model.AbstractDataPermissionChecker;
-import com.agileboot.admin.customize.service.permission.model.DataCondition;
-import com.agileboot.domain.system.dept.db.SysDeptService;
-import java.util.Objects;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-
-/**
- * 数据权限测试接口
- * @author valarchie
- */
-@EqualsAndHashCode(callSuper = true)
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class DeptTreeDataPermissionChecker extends AbstractDataPermissionChecker {
-
-    private SysDeptService deptService;
-
-    @Override
-    public boolean check(SystemLoginUser loginUser, DataCondition condition) {
-        if (condition == null || loginUser == null) {
-            return false;
-        }
-
-        if (loginUser.getDeptId() == null || condition.getTargetDeptId() == null) {
-            return false;
-        }
-
-        Long currentDeptId = loginUser.getDeptId();
-        Long targetDeptId = condition.getTargetDeptId();
-
-        boolean isContainsTargetDept = deptService.isChildOfTheDept(loginUser.getDeptId(), targetDeptId);
-        boolean isSameDept = Objects.equals(currentDeptId, targetDeptId);
-
-        return isContainsTargetDept || isSameDept;
-    }
-
-}

agileboot-admin/src/main/java/com/agileboot/admin/customize/service/permission/model/checker/OnlySelfDataPermissionChecker.java

@@ -1,40 +0,0 @@
-package com.agileboot.admin.customize.service.permission.model.checker;
-
-import com.agileboot.infrastructure.user.web.SystemLoginUser;
-import com.agileboot.admin.customize.service.permission.model.AbstractDataPermissionChecker;
-import com.agileboot.admin.customize.service.permission.model.DataCondition;
-import com.agileboot.domain.system.dept.db.SysDeptService;
-import java.util.Objects;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-
-/**
- * 数据权限测试接口
- * @author valarchie
- */
-@EqualsAndHashCode(callSuper = true)
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class OnlySelfDataPermissionChecker extends AbstractDataPermissionChecker {
-
-    private SysDeptService deptService;
-
-    @Override
-    public boolean check(SystemLoginUser loginUser, DataCondition condition) {
-        if (condition == null || loginUser == null) {
-            return false;
-        }
-
-        if (loginUser.getUserId() == null || condition.getTargetUserId() == null) {
-            return false;
-        }
-
-        Long currentUserId = loginUser.getUserId();
-        Long targetUserId = condition.getTargetUserId();
-        return Objects.equals(currentUserId, targetUserId);
-    }
-
-}

agileboot-admin/src/main/java/com/agileboot/admin/customize/service/permission/model/checker/SingleDeptDataPermissionChecker.java

@@ -1,42 +0,0 @@
-package com.agileboot.admin.customize.service.permission.model.checker;
-
-import com.agileboot.infrastructure.user.web.SystemLoginUser;
-import com.agileboot.admin.customize.service.permission.model.AbstractDataPermissionChecker;
-import com.agileboot.admin.customize.service.permission.model.DataCondition;
-import com.agileboot.domain.system.dept.db.SysDeptService;
-import java.util.Objects;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-
-/**
- * 数据权限测试接口
- * @author valarchie
- */
-@EqualsAndHashCode(callSuper = true)
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class SingleDeptDataPermissionChecker extends AbstractDataPermissionChecker {
-
-    private SysDeptService deptService;
-
-    @Override
-    public boolean check(SystemLoginUser loginUser, DataCondition condition) {
-        if (condition == null || loginUser == null) {
-            return false;
-        }
-
-        if (loginUser.getDeptId() == null || condition.getTargetDeptId() == null) {
-            return false;
-        }
-
-        Long currentDeptId = loginUser.getDeptId();
-        Long targetDeptId = condition.getTargetDeptId();
-
-        return Objects.equals(currentDeptId, targetDeptId);
-    }
-
-
-}

agileboot-admin/src/main/resources/application-dev.yml

@@ -1,105 +0,0 @@
-# 数据源配置
-spring:
-    datasource:
-        type: com.alibaba.druid.pool.DruidDataSource
-        driverClassName: com.mysql.cj.jdbc.Driver
-        druid:
-            webStatFilter:
-                enabled: true
-            statViewServlet:
-                enabled: true
-                # 设置白名单，不填则允许所有访问
-                allow:
-                url-pattern: /druid/*
-                # 控制台管理用户名和密码
-                login-username: agileboot
-                login-password: 123456
-            filter:
-                stat:
-                    enabled: true
-                    # 慢SQL记录
-                    log-slow-sql: true
-                    slow-sql-millis: 1000
-                    merge-sql: true
-                wall:
-                    config:
-                        multi-statement-allow: true
-        dynamic:
-            primary: master
-            strict: false
-            druid:
-                # 初始连接数
-                initialSize: 5
-                # 最小连接池数量
-                minIdle: 10
-                # 最大连接池数量
-                maxActive: 20
-                # 配置获取连接等待超时的时间
-                maxWait: 60000
-                # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
-                timeBetweenEvictionRunsMillis: 60000
-                # 配置一个连接在池中最小生存的时间，单位是毫秒
-                minEvictableIdleTimeMillis: 300000
-                # 配置一个连接在池中最大生存的时间，单位是毫秒
-                maxEvictableIdleTimeMillis: 900000
-                # 配置检测连接是否有效
-                validationQuery: SELECT 1 FROM DUAL
-                testWhileIdle: true
-                testOnBorrow: false
-                testOnReturn: false
-            datasource:
-                # 主库数据源
-                master:
-                    url: jdbc:mysql://localhost:33067/agileboot-pure?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-                    username: root
-                    password: 12345
-                # 从库数据源
-#                slave:
-#                    url: jdbc:mysql://localhost:33067/agileboot2?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-#                    username: root
-#                    password: 12345
-
-    # redis 配置
-    redis:
-        # 地址
-        host: localhost
-        # 端口，默认为6379
-        port: 36379
-        # 数据库索引
-        database: 0
-        # 密码
-        password: 12345
-        # 连接超时时间
-        timeout: 10s
-        lettuce:
-            pool:
-                # 连接池中的最小空闲连接
-                min-idle: 0
-                # 连接池中的最大空闲连接
-                max-idle: 8
-                # 连接池的最大数据库连接数
-                max-active: 8
-                # #连接池最大阻塞等待时间（使用负值表示没有限制）
-                max-wait: -1ms
-
-logging:
-    file:
-        path: D:/logs/agileboot-dev
-
-
-springdoc:
-    swagger-ui:
-        # ***注意*** 开启Swagger UI界面  **安全考虑的话生产环境需要关掉**
-        # 因为knife4j的一些配置不灵活 所以重新改回springdoc+swagger的组合  真实开发的时候 使用apifox这种工具效率更高
-        enabled: true
-        url: ${agileboot.api-prefix}/v3/api-docs
-        config-url: ${agileboot.api-prefix}/v3/api-docs/swagger-config
-
-
-# 项目相关配置
-agileboot:
-    # 文件基路径 示例（ Windows配置D:\agileboot，Linux配置 /home/agileboot）
-    file-base-dir: D:\agileboot
-    # 前端url请求转发前缀
-    api-prefix: /dev-api
-    demo-enabled: false

agileboot-admin/src/main/resources/application-test.yml

@@ -1,53 +0,0 @@
-
-# 数据源配置
-spring:
-    datasource:
-        #  驱动
-        driver-class-name: org.h2.Driver
-        dynamic:
-            primary: master
-            strict: false
-            datasource:
-                master:
-                    # h2 内存数据库 内存模式连接配置 库名: agileboot
-                    url: jdbc:h2:mem:agileboot;DB_CLOSE_DELAY=-1
-                    h2:
-                        # 开启console 访问 默认false
-                        console:
-                            enabled: true
-                            settings:
-                                #  开启h2 console 跟踪 方便调试  默认 false
-                                trace: true
-                                #  允许console 远程访问 默认false
-                                web-allow-others: true
-                            #  h2 访问路径上下文
-                            path: /h2-console
-
-    sql:
-        init:
-            platform: mysql
-            # 初始化数据
-            schema-locations: classpath:h2sql/agileboot_schema.sql
-            data-locations: classpath:h2sql/agileboot_data.sql
-
-    # redis 配置
-    redis:
-        # 地址
-        host: localhost
-        # 端口，默认为6379
-        port: 36379
-        # 数据库索引
-        database: 0
-        # 连接超时时间
-        timeout: 10s
-        lettuce:
-            pool:
-                # 连接池中的最小空闲连接
-                min-idle: 0
-                # 连接池中的最大空闲连接
-                max-idle: 8
-                # 连接池的最大数据库连接数
-                max-active: 8
-                # #连接池最大阻塞等待时间（使用负值表示没有限制）
-                max-wait: -1ms
-

agileboot-admin/src/main/resources/application.yml

@@ -1,46 +0,0 @@
-# 开发环境配置
-server:
-  # 服务器的HTTP端口，默认为8080
-  port: 8080
-  servlet:
-    # 应用的访问路径
-    context-path: /
-  tomcat:
-    # tomcat的URI编码
-    uri-encoding: UTF-8
-    # 连接数满后的排队数，默认为100
-    accept-count: 1000
-    threads:
-      # tomcat最大线程数，默认为200
-      max: 800
-      # Tomcat启动初始化的线程数，默认值10
-      min-spare: 100
-
-
-# Spring配置 如果需要无Mysql  无Redis直接启动的话  dev改为test
-# 生产环境把dev改为prod
-spring:
-  profiles:
-    active: basic,dev
-
-# 如果需要无Mysql  无Redis直接启动的话  可以将这两个参数置为true, 并且spring.profile.active: dev换成test
-# redis的端口可能会被占用，如果被占用请自己修改一下端口号
-agileboot:
-  embedded:
-    mysql: false
-    redis: false
-
-
-
-springdoc:
-  api-docs:
-    enabled: true
-    groups:
-      enabled: true
-  group-configs:
-    - group: '公共API'
-      packages-to-scan: com.agileboot.admin.controller.common
-    - group: '内置系统API'
-      packages-to-scan: com.agileboot.admin.controller.system
-
-

agileboot-admin/src/test/java/com/agileboot/admin/config/AgileBootConfigTest.java

@@ -1,44 +0,0 @@
-package com.agileboot.admin.config;
-
-
-import com.agileboot.admin.AgileBootAdminApplication;
-import com.agileboot.common.config.AgileBootConfig;
-import com.agileboot.common.constant.Constants.UploadSubDir;
-import java.io.File;
-import javax.annotation.Resource;
-import org.junit.Test;
-import org.junit.jupiter.api.Assertions;
-import org.junit.runner.RunWith;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-@SpringBootTest(classes = AgileBootAdminApplication.class)
-@RunWith(SpringRunner.class)
-public class AgileBootConfigTest {
-
-    @Resource
-    private AgileBootConfig config;
-
-    @Test
-    public void testConfig() {
-        String fileBaseDir = "D:\\agileboot\\profile";
-
-        Assertions.assertEquals("AgileBoot", config.getName());
-        Assertions.assertEquals("1.0.0", config.getVersion());
-        Assertions.assertEquals("2022", config.getCopyrightYear());
-        Assertions.assertTrue(config.isDemoEnabled());
-        Assertions.assertEquals(fileBaseDir, AgileBootConfig.getFileBaseDir());
-        Assertions.assertFalse(AgileBootConfig.isAddressEnabled());
-        Assertions.assertEquals("math", AgileBootConfig.getCaptchaType());
-        Assertions.assertEquals("math", AgileBootConfig.getCaptchaType());
-        Assertions.assertEquals(fileBaseDir + "\\import",
-            AgileBootConfig.getFileBaseDir() + File.separator + UploadSubDir.IMPORT_PATH);
-        Assertions.assertEquals(fileBaseDir + "\\avatar",
-            AgileBootConfig.getFileBaseDir() + File.separator + UploadSubDir.AVATAR_PATH);
-        Assertions.assertEquals(fileBaseDir + "\\download",
-            AgileBootConfig.getFileBaseDir() + File.separator + UploadSubDir.DOWNLOAD_PATH);
-        Assertions.assertEquals(fileBaseDir + "\\upload",
-            AgileBootConfig.getFileBaseDir() + File.separator + UploadSubDir.UPLOAD_PATH);
-    }
-
-}

agileboot-admin/src/test/java/com/agileboot/admin/customize/service/permission/CustomDataPermissionCheckerTest.java

@@ -1,83 +0,0 @@
-package com.agileboot.admin.customize.service.permission;
-
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import com.agileboot.admin.customize.service.permission.model.checker.CustomDataPermissionChecker;
-import com.agileboot.infrastructure.user.web.SystemLoginUser;
-import com.agileboot.infrastructure.user.web.RoleInfo;
-import com.agileboot.admin.customize.service.permission.model.DataCondition;
-import com.agileboot.domain.system.dept.db.SysDeptService;
-import org.apache.commons.collections4.SetUtils;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-class CustomDataPermissionCheckerTest {
-
-    private final SysDeptService deptService = mock(SysDeptService.class);
-    public SystemLoginUser loginUser = mock(SystemLoginUser.class);
-
-    @BeforeEach
-    public void mockBefore() {
-        when(loginUser.getRoleInfo()).thenReturn(RoleInfo.EMPTY_ROLE);
-    }
-
-    @Test
-    void testCheckWhenParameterNull() {
-            CustomDataPermissionChecker customChecker = new CustomDataPermissionChecker(deptService);
-
-            boolean check1 = customChecker.check(null, null);
-            boolean check2 = customChecker.check(loginUser, null);
-            boolean check3 = customChecker.check(null, new DataCondition());
-
-            assertFalse(check1);
-            assertFalse(check2);
-            assertFalse(check3);
-    }
-
-    @Test
-    void testCheckWhenTargetDeptIdNull() {
-        CustomDataPermissionChecker customChecker = new CustomDataPermissionChecker(deptService);
-
-        boolean check = customChecker.check(loginUser, new DataCondition(null, 1L));
-
-        assertFalse(check);
-    }
-
-
-    @Test
-    void testCheckWhenRoleIsNull() {
-        CustomDataPermissionChecker customChecker = new CustomDataPermissionChecker(deptService);
-
-        when(loginUser.getRoleInfo()).thenReturn(null);
-        boolean check = customChecker.check(loginUser, new DataCondition(1L, 1L));
-
-        assertFalse(check);
-    }
-
-
-    @Test
-    void testCheckWhenNotContainTargetDeptId() {
-        CustomDataPermissionChecker customChecker = new CustomDataPermissionChecker(deptService);
-
-        loginUser.getRoleInfo().setDeptIdSet(SetUtils.hashSet(2L));
-        boolean check = customChecker.check(loginUser, new DataCondition(1L, 1L));
-
-        assertFalse(check);
-    }
-
-
-    @Test
-    void testCheckWhenContainTargetDeptId() {
-        CustomDataPermissionChecker customChecker = new CustomDataPermissionChecker(deptService);
-
-        loginUser.getRoleInfo().setDeptIdSet(SetUtils.hashSet(1L));
-        boolean check = customChecker.check(loginUser, new DataCondition(1L, 1L));
-
-        assertTrue(check);
-    }
-
-
-}

agileboot-admin/src/test/java/com/agileboot/admin/customize/service/permission/DeptTreeDataPermissionCheckerTest.java

@@ -1,92 +0,0 @@
-package com.agileboot.admin.customize.service.permission;
-
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import com.agileboot.admin.customize.service.permission.model.checker.DeptTreeDataPermissionChecker;
-import com.agileboot.infrastructure.user.web.SystemLoginUser;
-import com.agileboot.infrastructure.user.web.RoleInfo;
-import com.agileboot.admin.customize.service.permission.model.DataCondition;
-import com.agileboot.domain.system.dept.db.SysDeptService;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-class DeptTreeDataPermissionCheckerTest {
-
-    private final SysDeptService deptService = mock(SysDeptService.class);
-
-    public SystemLoginUser loginUser = mock(SystemLoginUser.class);
-
-    @BeforeEach
-    public void mockBefore() {
-        when(loginUser.getRoleInfo()).thenReturn(RoleInfo.EMPTY_ROLE);
-    }
-
-    @Test
-    void testCheckWhenParameterNull() {
-        DeptTreeDataPermissionChecker checker = new DeptTreeDataPermissionChecker(deptService);
-
-        boolean check1 = checker.check(null, null);
-        boolean check2 = checker.check(new SystemLoginUser(), null);
-        boolean check3 = checker.check(null, new DataCondition());
-        boolean check4 = checker.check(loginUser, new DataCondition());
-
-        assertFalse(check1);
-        assertFalse(check2);
-        assertFalse(check3);
-        assertFalse(check4);
-    }
-
-
-    @Test
-    void testCheckWhenIsChildOfDept() {
-        DeptTreeDataPermissionChecker checker = new DeptTreeDataPermissionChecker(deptService);
-
-        when(deptService.isChildOfTheDept(any(), any())).thenReturn(true);
-        when(loginUser.getDeptId()).thenReturn(1L);
-
-        DataCondition dataCondition = new DataCondition();
-        dataCondition.setTargetDeptId(2L);
-
-        boolean check = checker.check(loginUser, dataCondition);
-
-        assertTrue(check);
-    }
-
-
-    @Test
-    void testCheckWhenIsSameDept() {
-        DeptTreeDataPermissionChecker checker = new DeptTreeDataPermissionChecker(deptService);
-
-        when(deptService.isChildOfTheDept(any(), any())).thenReturn(false);
-        when(loginUser.getDeptId()).thenReturn(1L);
-        DataCondition dataCondition = new DataCondition();
-        dataCondition.setTargetDeptId(1L);
-
-        boolean check = checker.check(loginUser, dataCondition);
-
-        assertTrue(check);
-    }
-
-
-    @Test
-    void testCheckWhenFailed() {
-        DeptTreeDataPermissionChecker checker = new DeptTreeDataPermissionChecker(deptService);
-
-        when(deptService.isChildOfTheDept(any(), any())).thenReturn(false);
-        when(loginUser.getDeptId()).thenReturn(1L);
-        DataCondition dataCondition = new DataCondition();
-        dataCondition.setTargetDeptId(2L);
-
-        boolean check = checker.check(loginUser, dataCondition);
-
-        assertFalse(check);
-    }
-
-
-
-
-}

agileboot-admin/src/test/java/com/agileboot/admin/customize/service/permission/OnlySelfDataPermissionCheckerTest.java

@@ -1,59 +0,0 @@
-package com.agileboot.admin.customize.service.permission;
-
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.mock;
-
-import com.agileboot.admin.customize.service.permission.model.checker.OnlySelfDataPermissionChecker;
-import com.agileboot.infrastructure.user.web.SystemLoginUser;
-import com.agileboot.admin.customize.service.permission.model.DataCondition;
-import com.agileboot.domain.system.dept.db.SysDeptService;
-import org.junit.jupiter.api.Test;
-
-class OnlySelfDataPermissionCheckerTest {
-
-    private final SysDeptService deptService = mock(SysDeptService.class);
-
-    @Test
-    void testCheckWhenParameterNull() {
-        OnlySelfDataPermissionChecker checker = new OnlySelfDataPermissionChecker(deptService);
-
-        boolean check1 = checker.check(null, null);
-        boolean check2 = checker.check(new SystemLoginUser(), null);
-        boolean check3 = checker.check(null, new DataCondition());
-        boolean check4 = checker.check(new SystemLoginUser(), new DataCondition());
-
-        assertFalse(check1);
-        assertFalse(check2);
-        assertFalse(check3);
-        assertFalse(check4);
-    }
-
-    @Test
-    void testCheckWhenSameUserId() {
-        OnlySelfDataPermissionChecker checker = new OnlySelfDataPermissionChecker(deptService);
-        SystemLoginUser loginUser = new SystemLoginUser();
-        loginUser.setUserId(1L);
-        DataCondition dataCondition = new DataCondition();
-        dataCondition.setTargetUserId(1L);
-
-        boolean check = checker.check(loginUser, dataCondition);
-
-        assertTrue(check);
-    }
-
-
-    @Test
-    void testCheckWhenDifferentUserId() {
-        OnlySelfDataPermissionChecker checker = new OnlySelfDataPermissionChecker(deptService);
-        SystemLoginUser loginUser = new SystemLoginUser();
-        loginUser.setUserId(1L);
-        DataCondition dataCondition = new DataCondition();
-        dataCondition.setTargetDeptId(2L);
-
-        boolean check = checker.check(loginUser, dataCondition);
-
-        assertFalse(check);
-    }
-
-}

agileboot-admin/src/test/java/com/agileboot/admin/customize/service/permission/SingleDeptDataPermissionCheckerTest.java

@@ -1,72 +0,0 @@
-package com.agileboot.admin.customize.service.permission;
-
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import com.agileboot.admin.customize.service.permission.model.checker.SingleDeptDataPermissionChecker;
-import com.agileboot.infrastructure.user.web.SystemLoginUser;
-import com.agileboot.infrastructure.user.web.RoleInfo;
-import com.agileboot.admin.customize.service.permission.model.DataCondition;
-import com.agileboot.domain.system.dept.db.SysDeptService;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-class SingleDeptDataPermissionCheckerTest {
-
-    private final SysDeptService deptService = mock(SysDeptService.class);
-
-    public SystemLoginUser loginUser = mock(SystemLoginUser.class);
-
-    @BeforeEach
-    public void mockBefore() {
-        when(loginUser.getRoleInfo()).thenReturn(RoleInfo.EMPTY_ROLE);
-    }
-
-
-    @Test
-    void testCheckWhenParameterNull() {
-        SingleDeptDataPermissionChecker checker = new SingleDeptDataPermissionChecker(deptService);
-
-        boolean check1 = checker.check(null, null);
-        boolean check2 = checker.check(new SystemLoginUser(), null);
-        boolean check3 = checker.check(null, new DataCondition());
-        boolean check4 = checker.check(loginUser, new DataCondition());
-
-        assertFalse(check1);
-        assertFalse(check2);
-        assertFalse(check3);
-        assertFalse(check4);
-    }
-
-    @Test
-    void testCheckWhenSameDeptId() {
-        SingleDeptDataPermissionChecker checker = new SingleDeptDataPermissionChecker(deptService);
-        when(loginUser.getDeptId()).thenReturn(1L);
-        DataCondition dataCondition = new DataCondition();
-        dataCondition.setTargetDeptId(1L);
-
-        boolean check = checker.check(loginUser, dataCondition);
-
-        assertTrue(check);
-    }
-
-
-    @Test
-    void testCheckWhenDifferentDeptId() {
-        SingleDeptDataPermissionChecker checker = new SingleDeptDataPermissionChecker(deptService);
-        when(loginUser.getDeptId()).thenReturn(1L);
-        DataCondition dataCondition = new DataCondition();
-        dataCondition.setTargetUserId(2L);
-
-        boolean check = checker.check(loginUser, dataCondition);
-
-        assertFalse(check);
-    }
-
-
-
-
-
-}

agileboot-api/pom.xml

@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>agileboot</artifactId>
-        <groupId>com.agileboot</groupId>
-        <version>1.0.0</version>
-    </parent>
-    <packaging>jar</packaging>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>agileboot-api</artifactId>
-
-    <description>
-        外部API
-    </description>
-
-    <dependencies>
-
-        <!-- 核心模块-->
-        <dependency>
-            <groupId>com.agileboot</groupId>
-            <artifactId>agileboot-infrastructure</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.springframework.boot</groupId>
-                    <artifactId>spring-boot-starter-tomcat</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <!--使用undertow依赖-->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-undertow</artifactId>
-        </dependency>
-
-        <!-- 业务领域 -->
-        <dependency>
-            <groupId>com.agileboot</groupId>
-            <artifactId>agileboot-domain</artifactId>
-        </dependency>
-
-    </dependencies>
-
-</project>

agileboot-api/src/main/java/com/agileboot/api/AgileBooApiApplication.java

@@ -1,32 +0,0 @@
-package com.agileboot.api;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
-import org.springframework.context.annotation.ComponentScan;
-
-/**
- * 启动程序 定制banner.txt的网站
- * <a href="http://patorjk.com/software/taag">http://patorjk.com/software/taag</a>
- * <a href="http://www.network-science.de/ascii/">http://www.network-science.de/ascii/</a>
- * <a href="http://www.degraeve.com/img2txt.php">http://www.degraeve.com/img2txt.php</a>
- * <a href="http://life.chacuo.net/convertfont2char">http://life.chacuo.net/convertfont2char</a>
- *
- * @author valarchie
- */
-@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
-@ComponentScan(basePackages = "com.agileboot.*")
-public class AgileBooApiApplication {
-
-    public static void main(String[] args) {
-        SpringApplication.run(AgileBooApiApplication.class, args);
-        String successMsg = "  ____   _                _                                                           __         _  _ \n"
-                          + " / ___| | |_  __ _  _ __ | |_   _   _  _ __    ___  _   _   ___  ___  ___  ___  ___  / _| _   _ | || |\n"
-                          + " \\___ \\ | __|/ _` || '__|| __| | | | || '_ \\  / __|| | | | / __|/ __|/ _ \\/ __|/ __|| |_ | | | || || |\n"
-                          + "  ___) || |_| (_| || |   | |_  | |_| || |_) | \\__ \\| |_| || (__| (__|  __/\\__ \\\\__ \\|  _|| |_| || ||_|\n"
-                          + " |____/  \\__|\\__,_||_|    \\__|  \\__,_|| .__/  |___/ \\__,_| \\___|\\___|\\___||___/|___/|_|   \\__,_||_|(_)\n"
-                          + "                                      |_|                                                             ";
-
-        System.out.println(successMsg);
-    }
-}

agileboot-api/src/main/java/com/agileboot/api/controller/OrderController.java

@@ -1,25 +0,0 @@
-package com.agileboot.api.controller;
-
-import com.agileboot.common.core.base.BaseController;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * 调度日志操作处理
- *
- * @author valarchie
- */
-@RestController
-@RequestMapping("/api/order")
-public class OrderController extends BaseController {
-
-    /**
-     * 访问首页，提示语
-     */
-    @RequestMapping("/")
-    public String index() {
-        return "暂无订单";
-    }
-
-
-}

agileboot-api/src/main/java/com/agileboot/api/controller/app/AppController.java

@@ -1,39 +0,0 @@
-package com.agileboot.api.controller.app;
-
-import com.agileboot.api.customize.service.JwtTokenService;
-import com.agileboot.common.core.base.BaseController;
-import com.agileboot.common.core.dto.ResponseDTO;
-import lombok.AllArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * 调度日志操作处理
- *
- * @author ruoyi
- */
-@RestController
-@RequestMapping("/app")
-@AllArgsConstructor
-public class AppController extends BaseController {
-
-    private final JwtTokenService jwtTokenService;
-
-    /**
-     * 访问首页，提示语
-     */
-    @PreAuthorize("hasAuthority('annie')")
-    @GetMapping("/list")
-    public ResponseDTO<?> appLogin() {
-        return ResponseDTO.ok();
-    }
-
-
-
-
-
-
-
-}

agileboot-api/src/main/java/com/agileboot/api/controller/common/LoginController.java

@@ -1,38 +0,0 @@
-package com.agileboot.api.controller.common;
-
-import cn.hutool.core.map.MapUtil;
-import com.agileboot.api.customize.service.JwtTokenService;
-import com.agileboot.common.core.base.BaseController;
-import com.agileboot.common.core.dto.ResponseDTO;
-import java.util.Map;
-import lombok.AllArgsConstructor;
-import org.springframework.security.access.AccessDeniedException;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * 调度日志操作处理
- *
- * @author ruoyi
- */
-@RestController
-@RequestMapping("/common")
-@AllArgsConstructor
-public class LoginController extends BaseController {
-
-    private final JwtTokenService jwtTokenService;
-
-    /**
-     * 访问首页，提示语
-     */
-    @PostMapping("/app/{appId}/login")
-    public ResponseDTO<String> appLogin() {
-        String token = jwtTokenService.generateToken(MapUtil.of("token", "user1"));
-        return ResponseDTO.ok(token);
-    }
-
-
-
-
-}

agileboot-api/src/main/java/com/agileboot/api/customize/config/JwtAuthenticationFilter.java

@@ -1,52 +0,0 @@
-package com.agileboot.api.customize.config;
-
-import com.agileboot.api.customize.service.JwtTokenService;
-import com.agileboot.infrastructure.user.app.AppLoginUser;
-import io.jsonwebtoken.Claims;
-import java.io.IOException;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.stereotype.Component;
-import org.springframework.web.filter.OncePerRequestFilter;
-
-/**
- * token过滤器 验证token有效性
- * 继承OncePerRequestFilter类的话  可以确保只执行filter一次， 避免执行多次
- * @author valarchie
- */
-@Component
-@Slf4j
-@RequiredArgsConstructor
-public class JwtAuthenticationFilter extends OncePerRequestFilter {
-
-    @Autowired
-    private JwtTokenService jwtTokenService;
-
-    @Override
-    protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException {
-        String tokenFromRequest = jwtTokenService.getTokenFromRequest(request);
-
-        if (tokenFromRequest != null) {
-            Claims claims = jwtTokenService.parseToken(tokenFromRequest);
-            String token = (String) claims.get("token");
-            // 根据token去查缓存里面 有没有对应的App用户
-            // 没有的话  再去数据库中查询
-            if (token != null && token.equals("user1")) {
-                AppLoginUser loginUser = new AppLoginUser(23232323L, false, "dasdsadsds");
-                loginUser.grantAppPermission("annie");
-                UsernamePasswordAuthenticationToken suer1 = new UsernamePasswordAuthenticationToken(loginUser, null,
-                    loginUser.getAuthorities());
-                SecurityContextHolder.getContext().setAuthentication(suer1);
-            }
-        }
-
-        filterChain.doFilter(request, response);
-    }
-}

agileboot-api/src/main/java/com/agileboot/api/customize/config/SecurityConfig.java

@@ -1,86 +0,0 @@
-package com.agileboot.api.customize.config;
-
-import com.agileboot.common.core.dto.ResponseDTO;
-import com.agileboot.common.exception.ApiException;
-import com.agileboot.common.exception.error.ErrorCode.Client;
-import com.agileboot.common.utils.ServletHolderUtil;
-import com.agileboot.common.utils.jackson.JacksonUtil;
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.http.SessionCreationPolicy;
-import org.springframework.security.web.AuthenticationEntryPoint;
-import org.springframework.security.web.SecurityFilterChain;
-import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
-import org.springframework.web.filter.CorsFilter;
-
-/**
- * 主要配置登录流程逻辑涉及以下几个类
-
- * @author valarchie
- */
-@Configuration
-@EnableWebSecurity
-@EnableGlobalMethodSecurity(prePostEnabled = true)
-@RequiredArgsConstructor
-public class SecurityConfig {
-    /**
-     * token认证过滤器
-     */
-    private final JwtAuthenticationFilter jwtTokenFilter;
-
-
-    /**
-     * 跨域过滤器
-     */
-    private final CorsFilter corsFilter;
-
-
-    /**
-     * 登录异常处理类
-     * 用户未登陆的话  在这个Bean中处理
-     */
-    @Bean
-    public AuthenticationEntryPoint customAuthenticationEntryPoint() {
-        return (request, response, exception) -> {
-            ResponseDTO<Void> responseDTO = ResponseDTO.fail(
-                new ApiException(Client.COMMON_NO_AUTHORIZATION, request.getRequestURI())
-            );
-            ServletHolderUtil.renderString(response, JacksonUtil.to(responseDTO));
-        };
-    }
-
-
-
-    @Bean
-    public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Exception {
-        httpSecurity.csrf().disable()
-            // 不配这个错误处理的话 会直接返回403
-            .exceptionHandling().authenticationEntryPoint(customAuthenticationEntryPoint())
-            .and()
-            .sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS) // 禁用 session
-            .and()
-            .authorizeRequests()
-            .antMatchers("/common/**").permitAll()
-            .anyRequest().authenticated()
-            .and()
-            // 禁用 X-Frame-Options 响应头。下面是具体解释：
-            // X-Frame-Options 是一个 HTTP 响应头，用于防止网页被嵌入到其他网页的 <frame>、<iframe> 或 <object> 标签中，从而可以减少点击劫持攻击的风险
-            .headers().frameOptions().disable()
-            .and()
-            .formLogin().disable();
-
-        httpSecurity.addFilterBefore(jwtTokenFilter, UsernamePasswordAuthenticationFilter.class);
-        // 添加CORS filter
-        httpSecurity.addFilterBefore(corsFilter, JwtAuthenticationFilter.class);
-
-
-        return httpSecurity.build();
-    }
-
-
-}

agileboot-api/src/main/java/com/agileboot/api/customize/service/JwtTokenService.java

@@ -1,128 +0,0 @@
-package com.agileboot.api.customize.service;
-
-import cn.hutool.core.util.StrUtil;
-import com.agileboot.common.constant.Constants.Token;
-import com.agileboot.common.exception.ApiException;
-import com.agileboot.common.exception.error.ErrorCode;
-import com.agileboot.domain.common.cache.RedisCacheService;
-import com.agileboot.infrastructure.user.web.SystemLoginUser;
-import io.jsonwebtoken.Claims;
-import io.jsonwebtoken.Jwts;
-import io.jsonwebtoken.MalformedJwtException;
-import io.jsonwebtoken.SignatureAlgorithm;
-import io.jsonwebtoken.SignatureException;
-import io.jsonwebtoken.UnsupportedJwtException;
-import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-import lombok.Data;
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-
-/**
- * token验证处理
- *
- * @author valarchie
- */
-@Component
-@Slf4j
-@Data
-@RequiredArgsConstructor
-public class JwtTokenService {
-
-    /**
-     * 自定义令牌标识
-     */
-    @Value("${token.header}")
-    private String header;
-
-    /**
-     * 令牌秘钥
-     */
-    @Value("${token.secret}")
-    private String secret;
-
-    private final RedisCacheService redisCache;
-
-    /**
-     * 获取用户身份信息
-     *
-     * @return 用户信息
-     */
-    public SystemLoginUser getLoginUser(HttpServletRequest request) {
-        // 获取请求携带的令牌
-        String token = getTokenFromRequest(request);
-        if (StrUtil.isNotEmpty(token)) {
-            try {
-                Claims claims = parseToken(token);
-                // 解析对应的权限以及用户信息
-                String uuid = (String) claims.get(Token.LOGIN_USER_KEY);
-
-                return redisCache.loginUserCache.getObjectOnlyInCacheById(uuid);
-            } catch (SignatureException | MalformedJwtException | UnsupportedJwtException | IllegalArgumentException jwtException) {
-                log.error("parse token failed.", jwtException);
-                throw new ApiException(jwtException, ErrorCode.Client.INVALID_TOKEN);
-            } catch (Exception e) {
-                log.error("fail to get cached user from redis", e);
-                throw new ApiException(e, ErrorCode.Client.TOKEN_PROCESS_FAILED, e.getMessage());
-            }
-
-        }
-        return null;
-    }
-
-
-
-
-    /**
-     * 从数据声明生成令牌
-     *
-     * @param claims 数据声明
-     * @return 令牌
-     */
-    public String generateToken(Map<String, Object> claims) {
-        return Jwts.builder()
-            .setClaims(claims)
-            .signWith(SignatureAlgorithm.HS512, secret).compact();
-    }
-
-    /**
-     * 从令牌中获取数据声明
-     *
-     * @param token 令牌
-     * @return 数据声明
-     */
-    public Claims parseToken(String token) {
-        return Jwts.parser()
-            .setSigningKey(secret)
-            .parseClaimsJws(token)
-            .getBody();
-    }
-
-    /**
-     * 从令牌中获取用户名
-     *
-     * @param token 令牌
-     * @return 用户名
-     */
-    private String getUsernameFromToken(String token) {
-        Claims claims = parseToken(token);
-        return claims.getSubject();
-    }
-
-    /**
-     * 获取请求token
-     *
-     * @return token
-     */
-    public String getTokenFromRequest(HttpServletRequest request) {
-        String token = request.getHeader(header);
-        if (StrUtil.isNotEmpty(token) && token.startsWith(Token.PREFIX)) {
-            token = StrUtil.stripIgnoreCase(token, Token.PREFIX, null);
-        }
-        return token;
-    }
-
-}

agileboot-api/src/main/java/com/agileboot/api/customize/util/ApiEncryptor.java

@@ -1,12 +0,0 @@
-package com.agileboot.api.customize.util;
-
-public class ApiEncryptor {
-
-    public static void main(String[] args) {
-
-
-
-
-    }
-
-}

agileboot-api/src/main/resources/application.yml

@@ -1,28 +0,0 @@
-# 开发环境配置
-server:
-  # 服务器的HTTP端口，默认为8080
-  port: 8090
-  servlet:
-    # 应用的访问路径
-    context-path: /
-  tomcat:
-    # tomcat的URI编码
-    uri-encoding: UTF-8
-    # 连接数满后的排队数，默认为100
-    accept-count: 1000
-    threads:
-      # tomcat最大线程数，默认为200
-      max: 800
-      # Tomcat启动初始化的线程数，默认值10
-      min-spare: 100
-
-
-# Spring配置
-spring:
-  profiles:
-    active: basic,dev
-
-
-
-
-

agileboot-common/pom.xml

@@ -9,6 +9,19 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
+    <modules>
+        <module>wol-common-box</module>
+        <module>wol-common-core</module>
+        <module>wol-common-doc</module>
+        <module>wol-common-web</module>
+        <module>wol-common-mybatis</module>
+        <module>wol-common-redis</module>
+        <module>wol-common-json</module>
+        <module>wol-common-satoken</module>
+        <module>wol-common-nacos</module>
+    </modules>
+    <packaging>pom</packaging>
+
     <artifactId>agileboot-common</artifactId>
 
     <description>
@@ -17,176 +30,78 @@
 
     <dependencies>
 
-        <!-- Spring框架基本的核心工具 -->
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context-support</artifactId>
-        </dependency>
-
-        <!-- SpringWeb模块 -->
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-        </dependency>
-
         <!-- spring security 安全认证 -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-security</artifactId>
-        </dependency>
-
-        <!-- 自定义验证注解 -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-validation</artifactId>
-        </dependency>
-
-        <!--常用工具类 -->
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-        </dependency>
-
-        <!-- JSON工具类 -->
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-        </dependency>
-
-
-        <!-- io常用工具类 -->
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.springframework.boot</groupId>-->
+<!--            <artifactId>spring-boot-starter-security</artifactId>-->
+<!--        </dependency>-->
 
         <!-- 文件上传工具类 -->
-        <dependency>
-            <groupId>commons-fileupload</groupId>
-            <artifactId>commons-fileupload</artifactId>
-        </dependency>
-
-        <!-- excel工具 -->
-        <dependency>
-            <groupId>org.apache.poi</groupId>
-            <artifactId>poi-ooxml</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>commons-fileupload</groupId>-->
+<!--            <artifactId>commons-fileupload</artifactId>-->
+<!--        </dependency>-->
 
         <!-- yml解析器 -->
-        <dependency>
-            <groupId>org.yaml</groupId>
-            <artifactId>snakeyaml</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.yaml</groupId>-->
+<!--            <artifactId>snakeyaml</artifactId>-->
+<!--        </dependency>-->
 
         <!-- Token生成与解析-->
-        <dependency>
-            <groupId>io.jsonwebtoken</groupId>
-            <artifactId>jjwt</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>io.jsonwebtoken</groupId>-->
+<!--            <artifactId>jjwt</artifactId>-->
+<!--        </dependency>-->
 
         <!-- Jaxb -->
-        <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>javax.xml.bind</groupId>-->
+<!--            <artifactId>jaxb-api</artifactId>-->
+<!--        </dependency>-->
 
         <!-- redis 缓存操作 -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-redis</artifactId>
-        </dependency>
-
-        <!-- pool 对象池 -->
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-pool2</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.springframework.boot</groupId>-->
+<!--            <artifactId>spring-boot-starter-data-redis</artifactId>-->
+<!--        </dependency>-->
 
         <!-- 解析客户端操作系统、浏览器等 -->
-        <dependency>
-            <groupId>eu.bitwalker</groupId>
-            <artifactId>UserAgentUtils</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>eu.bitwalker</groupId>-->
+<!--            <artifactId>UserAgentUtils</artifactId>-->
+<!--        </dependency>-->
 
-        <!-- servlet包 -->
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>it.ozimov</groupId>-->
+<!--            <artifactId>embedded-redis</artifactId>-->
+<!--            &lt;!&ndash; 不排除掉slf4j的话 会冲突&ndash;&gt;-->
+<!--            <exclusions>-->
+<!--                <exclusion>-->
+<!--                    <groupId>org.slf4j</groupId>-->
+<!--                    <artifactId>slf4j-simple</artifactId>-->
+<!--                </exclusion>-->
+<!--                &lt;!&ndash;  排除掉guava依赖，以本项目的guava依赖为准 &ndash;&gt;-->
+<!--                <exclusion>-->
+<!--                    <groupId>com.google.guava</groupId>-->
+<!--                    <artifactId>guava</artifactId>-->
+<!--                </exclusion>-->
+<!--            </exclusions>-->
+<!--        </dependency>-->
 
 
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.module</groupId>
-            <artifactId>jackson-module-parameter-names</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.datatype</groupId>
-            <artifactId>jackson-datatype-jdk8</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.datatype</groupId>
-            <artifactId>jackson-datatype-jsr310</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.lionsoul</groupId>
-            <artifactId>ip2region</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>it.ozimov</groupId>
-            <artifactId>embedded-redis</artifactId>
-            <!-- 不排除掉slf4j的话 会冲突-->
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-simple</artifactId>
-                </exclusion>
-                <!--  排除掉guava依赖，以本项目的guava依赖为准 -->
-                <exclusion>
-                    <groupId>com.google.guava</groupId>
-                    <artifactId>guava</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.junit.vintage</groupId>
-                    <artifactId>junit-vintage-engine</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
         <!-- 多数据源 -->
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.baomidou</groupId>-->
+<!--            <artifactId>dynamic-datasource-spring-boot-starter</artifactId>-->
+<!--        </dependency>-->
 
-        <!--  swagger注解  -->
-        <dependency>
-            <groupId>io.swagger</groupId>
-            <artifactId>swagger-annotations</artifactId>
-        </dependency>
+        <!--ENC加密-->
+<!--        <dependency>-->
+<!--            <groupId>com.github.ulisesbocchio</groupId>-->
+<!--            <artifactId>jasypt-spring-boot-starter</artifactId>-->
+<!--            <version>2.1.1</version>-->
+<!--        </dependency>-->
 
 
     </dependencies>

agileboot-common/src/main/java/com/agileboot/common/constant/Constants.java

@@ -1,86 +0,0 @@
-package com.agileboot.common.constant;
-
-
-/**
- * 通用常量信息
- *
- * @author valarchie
- */
-public class Constants {
-    private Constants() {
-    }
-
-    public static final int KB = 1024;
-
-    public static final int MB = KB * 1024;
-
-    public static final int GB = MB * 1024;
-
-    /**
-     * http请求
-     */
-    public static final String HTTP = "http://";
-
-    /**
-     * https请求
-     */
-    public static final String HTTPS = "https://";
-
-
-    public static class Token {
-
-        private Token() {
-        }
-
-        /**
-         * 令牌前缀
-         */
-        public static final String PREFIX = "Bearer ";
-
-        /**
-         * 令牌前缀
-         */
-        public static final String LOGIN_USER_KEY = "login_user_key";
-
-    }
-
-    public static class Captcha {
-
-        private Captcha() {
-        }
-
-        /**
-         * 令牌
-         */
-        public static final String MATH_TYPE = "math";
-
-        /**
-         * 令牌前缀
-         */
-        public static final String CHAR_TYPE = "char";
-
-    }
-
-    /**
-     * 资源映射路径 前缀
-     */
-    public static final String RESOURCE_PREFIX = "profile";
-
-    public static class UploadSubDir {
-
-        private UploadSubDir() {
-        }
-
-        public static final String IMPORT_PATH = "import";
-
-        public static final String AVATAR_PATH = "avatar";
-
-        public static final String DOWNLOAD_PATH = "download";
-
-        public static final String UPLOAD_PATH = "upload";
-
-    }
-
-
-
-}

agileboot-common/src/main/java/com/agileboot/common/core/base/BaseEntity.java

@@ -1,46 +0,0 @@
-package com.agileboot.common.core.base;
-
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.FieldStrategy;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.Date;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * Entity基类
- *
- * @author valarchie
- */
-@EqualsAndHashCode(callSuper = true)
-@Data
-public class BaseEntity<T extends Model<?>> extends Model<T> {
-
-    @ApiModelProperty("创建者ID")
-    @TableField(value = "creator_id", fill = FieldFill.INSERT)
-    private Long creatorId;
-
-    @ApiModelProperty("创建时间")
-    @TableField(value = "create_time", fill = FieldFill.INSERT)
-    private Date createTime;
-
-    @ApiModelProperty("更新者ID")
-    @TableField(value = "updater_id", fill = FieldFill.UPDATE, updateStrategy = FieldStrategy.NOT_NULL)
-    private Long updaterId;
-
-    @ApiModelProperty("更新时间")
-    @TableField(value = "update_time", fill = FieldFill.UPDATE)
-    private Date updateTime;
-
-    /**
-     * deleted字段请在数据库中 设置为tinyInt   并且非null   默认值为0
-     */
-    @ApiModelProperty("删除标志（0代表存在 1代表删除）")
-    @TableField("deleted")
-    @TableLogic
-    private Boolean deleted;
-
-}

agileboot-common/src/main/java/com/agileboot/common/core/dto/ResponseDTO.java

@@ -1,59 +0,0 @@
-package com.agileboot.common.core.dto;
-
-import com.agileboot.common.exception.ApiException;
-import com.agileboot.common.exception.error.ErrorCode;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-
-/**
- * 响应信息主体
- *
- * @author valarchie
- */
-@Data
-@AllArgsConstructor
-public class ResponseDTO<T> {
-
-    private Integer code;
-
-    private String msg;
-
-    @JsonInclude
-    private T data;
-
-    public static <T> ResponseDTO<T> ok() {
-        return build(null, ErrorCode.SUCCESS.code(), ErrorCode.SUCCESS.message());
-    }
-
-    public static <T> ResponseDTO<T> ok(T data) {
-        return build(data, ErrorCode.SUCCESS.code(), ErrorCode.SUCCESS.message());
-    }
-
-    public static <T> ResponseDTO<T> fail() {
-        return build(null, ErrorCode.FAILED.code(), ErrorCode.FAILED.message());
-    }
-
-    public static <T> ResponseDTO<T> fail(T data) {
-        return build(data, ErrorCode.FAILED.code(), ErrorCode.FAILED.message());
-    }
-
-    public static <T> ResponseDTO<T> fail(ApiException exception) {
-        return build(null, exception.getErrorCode().code(), exception.getMessage());
-    }
-
-    public static <T> ResponseDTO<T> fail(ApiException exception, T data) {
-        return build(data, exception.getErrorCode().code(), exception.getMessage());
-    }
-
-    public static <T> ResponseDTO<T> build(T data, Integer code, String msg) {
-        return new ResponseDTO<>(code, msg, data);
-    }
-
-    // 去掉直接填充错误码的方式， 这种方式不能拿到i18n的错误消息  统一通过ApiException来构造错误消息
-//    public static <T> ResponseDTO<T> fail(ErrorCodeInterface code, Object... args) {
-//        return build(null, code, args);
-//    }
-
-}
-

agileboot-common/src/main/java/com/agileboot/common/core/page/AbstractPageQuery.java

@@ -1,28 +0,0 @@
-package com.agileboot.common.core.page;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import javax.validation.constraints.Max;
-
-/**
- * @author valarchie
- */
-@EqualsAndHashCode(callSuper = true)
-@Data
-public abstract class AbstractPageQuery<T> extends AbstractQuery<T> {
-
-    public static final int MAX_PAGE_NUM = 200;
-    public static final int MAX_PAGE_SIZE = 500;
-
-    @Max(MAX_PAGE_NUM)
-    protected Integer pageNum = 1;
-    @Max(MAX_PAGE_SIZE)
-    protected Integer pageSize = 10;
-
-    public Page<T> toPage() {
-        return new Page<>(pageNum, pageSize);
-    }
-
-}

agileboot-common/src/main/java/com/agileboot/common/core/page/AbstractQuery.java

@@ -1,90 +0,0 @@
-package com.agileboot.common.core.page;
-
-import cn.hutool.core.util.StrUtil;
-import com.agileboot.common.utils.time.DatePickUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonFormat.Shape;
-import java.util.Date;
-import lombok.Data;
-
-/**
- * 如果是简单的排序 和 时间范围筛选  可以使用内置的这几个字段
- * @author valarchie
- */
-@Data
-public abstract class AbstractQuery<T> {
-
-    protected String orderColumn;
-
-    protected String orderDirection;
-
-    protected String timeRangeColumn;
-
-    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd")
-    private Date beginTime;
-
-    @JsonFormat(shape = Shape.STRING, pattern = "yyyy-MM-dd")
-    private Date endTime;
-
-    private static final String ASC = "ascending";
-    private static final String DESC = "descending";
-
-    /**
-     * 生成query conditions
-     *
-     * @return 添加条件后的QueryWrapper
-     */
-    public QueryWrapper<T> toQueryWrapper() {
-        QueryWrapper<T> queryWrapper = addQueryCondition();
-        addSortCondition(queryWrapper);
-        addTimeCondition(queryWrapper);
-
-        return queryWrapper;
-    }
-
-    public abstract QueryWrapper<T> addQueryCondition();
-
-    public void addSortCondition(QueryWrapper<T> queryWrapper) {
-        if (queryWrapper == null || StrUtil.isEmpty(orderColumn)) {
-            return;
-        }
-
-        Boolean sortDirection = convertSortDirection();
-        if (sortDirection != null) {
-            queryWrapper.orderBy(StrUtil.isNotEmpty(orderColumn), sortDirection,
-                StrUtil.toUnderlineCase(orderColumn));
-        }
-    }
-
-    public void addTimeCondition(QueryWrapper<T> queryWrapper) {
-        if (queryWrapper != null
-            && StrUtil.isNotEmpty(this.timeRangeColumn)) {
-            queryWrapper
-                .ge(beginTime != null, StrUtil.toUnderlineCase(timeRangeColumn),
-                    DatePickUtil.getBeginOfTheDay(beginTime))
-                .le(endTime != null, StrUtil.toUnderlineCase(timeRangeColumn), DatePickUtil.getEndOfTheDay(endTime));
-        }
-    }
-
-    /**
-     * 获取前端传来的排序方向  转换成MyBatisPlus所需的排序参数 boolean=isAsc
-     * @return 排序顺序， null为无排序
-     */
-    public Boolean convertSortDirection() {
-        Boolean isAsc = null;
-        if (StrUtil.isEmpty(this.orderDirection)) {
-            return isAsc;
-        }
-
-        if (ASC.equals(this.orderDirection)) {
-            isAsc = true;
-        }
-        if (DESC.equals(this.orderDirection)) {
-            isAsc = false;
-        }
-
-        return isAsc;
-    }
-
-}

agileboot-common/src/main/java/com/agileboot/common/core/page/PageDTO.java

@@ -1,38 +0,0 @@
-package com.agileboot.common.core.page;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import java.util.List;
-import lombok.Data;
-
-/**
- * 分页模型类
- * @author valarchie
- */
-@Data
-public class PageDTO<T> {
-    /**
-     * 总记录数
-     */
-    private Long total;
-
-    /**
-     * 列表数据
-     */
-    private List<T> rows;
-
-    public PageDTO(List<T> list) {
-        this.rows = list;
-        this.total = (long) list.size();
-    }
-
-    public PageDTO(Page<T> page) {
-        this.rows = page.getRecords();
-        this.total = page.getTotal();
-    }
-
-    public PageDTO(List<T> list, Long count) {
-        this.rows = list;
-        this.total = count;
-    }
-
-}

agileboot-common/src/main/java/com/agileboot/common/enums/common/BusinessTypeEnum.java

@@ -1,54 +0,0 @@
-package com.agileboot.common.enums.common;
-
-import com.agileboot.common.enums.dictionary.CssTag;
-import com.agileboot.common.enums.dictionary.Dictionary;
-import com.agileboot.common.enums.DictionaryEnum;
-
-/**
- * 对应sys_operation_log的business_type
- *
- * @author valarchie
- */
-@Dictionary(name = "sysOperationLog.businessType")
-public enum BusinessTypeEnum implements DictionaryEnum<Integer> {
-
-    /**
-     * 操作类型
-     */
-    OTHER(0, "其他操作", CssTag.INFO),
-    ADD(1, "添加", CssTag.PRIMARY),
-    MODIFY(2, "修改", CssTag.PRIMARY),
-    DELETE(3, "删除", CssTag.DANGER),
-    GRANT(4, "授权", CssTag.PRIMARY),
-    EXPORT(5, "导出", CssTag.WARNING),
-    IMPORT(6, "导入", CssTag.WARNING),
-    FORCE_LOGOUT(7, "强退", CssTag.DANGER),
-    CLEAN(8, "清空", CssTag.DANGER),
-    ;
-
-    private final int value;
-    private final String description;
-    private final String cssTag;
-
-    BusinessTypeEnum(int value, String description, String cssTag) {
-        this.value = value;
-        this.description = description;
-        this.cssTag = cssTag;
-    }
-
-    @Override
-    public Integer getValue() {
-        return value;
-    }
-
-    @Override
-    public String description() {
-        return description;
-    }
-
-    @Override
-    public String cssTag() {
-        return cssTag;
-    }
-
-}

agileboot-common/src/main/java/com/agileboot/common/enums/common/GenderEnum.java

@@ -1,47 +0,0 @@
-package com.agileboot.common.enums.common;
-
-import com.agileboot.common.enums.dictionary.CssTag;
-import com.agileboot.common.enums.dictionary.Dictionary;
-import com.agileboot.common.enums.DictionaryEnum;
-
-/**
- * 对应sys_user的sex字段
- *
- * @author valarchie
- */
-@Dictionary(name = "sysUser.sex")
-public enum GenderEnum implements DictionaryEnum<Integer> {
-
-    /**
-     * 用户性别
-     */
-    MALE(1, "男", CssTag.PRIMARY),
-    FEMALE(2, "女", CssTag.PRIMARY),
-    UNKNOWN(0, "未知", CssTag.PRIMARY);
-
-    private final int value;
-    private final String description;
-    private final String cssTag;
-
-    GenderEnum(int value, String description, String cssTag) {
-        this.value = value;
-        this.description = description;
-        this.cssTag = cssTag;
-    }
-
-    @Override
-    public Integer getValue() {
-        return value;
-    }
-
-    @Override
-    public String description() {
-        return description;
-    }
-
-    @Override
-    public String cssTag() {
-        return cssTag;
-    }
-
-}

agileboot-common/src/main/java/com/agileboot/common/enums/common/LoginStatusEnum.java

@@ -1,46 +0,0 @@
-package com.agileboot.common.enums.common;
-
-import com.agileboot.common.enums.dictionary.CssTag;
-import com.agileboot.common.enums.dictionary.Dictionary;
-import com.agileboot.common.enums.DictionaryEnum;
-
-/**
- * 用户状态
- * @author valarchie
- */
-// TODO 表记得改成LoginLog
-@Dictionary(name = "sysLoginLog.status")
-public enum LoginStatusEnum implements DictionaryEnum<Integer> {
-    /**
-     * status of user
-     */
-    LOGIN_SUCCESS(1, "登录成功", CssTag.SUCCESS),
-    LOGOUT(2, "退出成功", CssTag.INFO),
-    REGISTER(3, "注册", CssTag.PRIMARY),
-    LOGIN_FAIL(0, "登录失败", CssTag.DANGER);
-
-    private final int value;
-    private final String msg;
-    private final String cssTag;
-
-    LoginStatusEnum(int status, String msg, String cssTag) {
-        this.value = status;
-        this.msg = msg;
-        this.cssTag = cssTag;
-    }
-
-    @Override
-    public Integer getValue() {
-        return value;
-    }
-
-    @Override
-    public String description() {
-        return msg;
-    }
-
-    @Override
-    public String cssTag() {
-        return cssTag;
-    }
-}

agileboot-common/src/main/java/com/agileboot/common/enums/common/MenuComponentEnum.java

@@ -1,36 +0,0 @@
-package com.agileboot.common.enums.common;
-
-import com.agileboot.common.enums.BasicEnum;
-
-/**
- *
- * @author valarchie
- */
-@Deprecated
-public enum MenuComponentEnum implements BasicEnum<Integer> {
-
-    /**
-     * 菜单组件类型
-     */
-    LAYOUT(1,"Layout"),
-    PARENT_VIEW(2,"ParentView"),
-    INNER_LINK(3,"InnerLink");
-
-    private final int value;
-    private final String description;
-
-    MenuComponentEnum(int value, String description) {
-        this.value = value;
-        this.description = description;
-    }
-
-    @Override
-    public Integer getValue() {
-        return value;
-    }
-
-    @Override
-    public String description() {
-        return description;
-    }
-}

agileboot-common/src/main/java/com/agileboot/common/enums/common/MenuTypeEnum.java

@@ -1,38 +0,0 @@
-package com.agileboot.common.enums.common;
-
-import com.agileboot.common.enums.BasicEnum;
-
-/**
- * @author valarchie
- * 对应 sys_menu表的menu_type字段
- */
-public enum MenuTypeEnum implements BasicEnum<Integer> {
-
-    /**
-     * 菜单类型
-     */
-    MENU(1, "页面"),
-    CATALOG(2, "目录"),
-    IFRAME(3, "内嵌Iframe"),
-    OUTSIDE_LINK_REDIRECT(4, "外链跳转");
-
-    private final int value;
-    private final String description;
-
-    MenuTypeEnum(int value, String description) {
-        this.value = value;
-        this.description = description;
-    }
-
-    @Override
-    public Integer getValue() {
-        return value;
-    }
-
-    @Override
-    public String description() {
-        return description;
-    }
-
-
-}

agileboot-common/src/main/java/com/agileboot/common/enums/common/NoticeStatusEnum.java

@@ -1,45 +0,0 @@
-package com.agileboot.common.enums.common;
-
-import com.agileboot.common.enums.dictionary.CssTag;
-import com.agileboot.common.enums.dictionary.Dictionary;
-import com.agileboot.common.enums.DictionaryEnum;
-
-/**
- * 对应sys_notice的 status字段
- * @author valarchie
- */
-@Dictionary(name = "sysNotice.status")
-public enum NoticeStatusEnum implements DictionaryEnum<Integer> {
-
-    /**
-     * 通知状态
-     */
-    OPEN(1, "正常", CssTag.PRIMARY),
-    CLOSE(0, "关闭", CssTag.DANGER);
-
-    private final int value;
-    private final String description;
-    private final String cssTag;
-
-    NoticeStatusEnum(int value, String description, String cssTag) {
-        this.value = value;
-        this.description = description;
-        this.cssTag = cssTag;
-    }
-
-    @Override
-    public Integer getValue() {
-        return value;
-    }
-
-    @Override
-    public String description() {
-        return description;
-    }
-
-    @Override
-    public String cssTag() {
-        return cssTag;
-    }
-
-}

agileboot-common/src/main/java/com/agileboot/common/enums/common/NoticeTypeEnum.java

@@ -1,47 +0,0 @@
-package com.agileboot.common.enums.common;
-
-import com.agileboot.common.enums.dictionary.CssTag;
-import com.agileboot.common.enums.dictionary.Dictionary;
-import com.agileboot.common.enums.DictionaryEnum;
-
-/**
- * 对应sys_notice的 notice_type字段
- * 名称一般由对应的表名.字段构成
- * 全局的话使用common作为表名
- * @author valarchie
- */
-@Dictionary(name = "sysNotice.noticeType")
-public enum NoticeTypeEnum implements DictionaryEnum<Integer> {
-
-    /**
-     * 通知类型
-     */
-    NOTIFICATION(1, "通知", CssTag.WARNING),
-    ANNOUNCEMENT(2, "公告", CssTag.SUCCESS);
-
-    private final int value;
-    private final String description;
-    private final String cssTag;
-
-    NoticeTypeEnum(int value, String description, String cssTag) {
-        this.value = value;
-        this.description = description;
-        this.cssTag = cssTag;
-    }
-
-    @Override
-    public Integer getValue() {
-        return value;
-    }
-
-    @Override
-    public String description() {
-        return description;
-    }
-
-    @Override
-    public String cssTag() {
-        return cssTag;
-    }
-
-}

agileboot-common/src/main/java/com/agileboot/common/enums/common/OperationStatusEnum.java

@@ -1,45 +0,0 @@
-package com.agileboot.common.enums.common;
-
-import com.agileboot.common.enums.dictionary.CssTag;
-import com.agileboot.common.enums.dictionary.Dictionary;
-import com.agileboot.common.enums.DictionaryEnum;
-
-/**
- * 对应sys_operation_log的status字段
- * @author valarchie
- */
-@Dictionary(name = "sysOperationLog.status")
-public enum OperationStatusEnum implements DictionaryEnum<Integer> {
-
-    /**
-     * 操作状态
-     */
-    SUCCESS(1, "成功", CssTag.PRIMARY),
-    FAIL(0, "失败", CssTag.DANGER);
-
-    private final int value;
-    private final String description;
-    private final String cssTag;
-
-    OperationStatusEnum(int value, String description, String cssTag) {
-        this.value = value;
-        this.description = description;
-        this.cssTag = cssTag;
-    }
-
-    @Override
-    public Integer getValue() {
-        return value;
-    }
-
-    @Override
-    public String description() {
-        return description;
-    }
-
-    @Override
-    public String cssTag() {
-        return cssTag;
-    }
-
-}

agileboot-common/src/main/java/com/agileboot/common/enums/common/OperatorTypeEnum.java

@@ -1,39 +0,0 @@
-package com.agileboot.common.enums.common;
-
-import com.agileboot.common.enums.dictionary.Dictionary;
-import com.agileboot.common.enums.BasicEnum;
-
-/**
- * 操作者类型
- * @author valarchie
- */
-@Dictionary(name = "sysOperationLog.operatorType")
-public enum OperatorTypeEnum implements BasicEnum<Integer> {
-
-    /**
-     * 菜单类型
-     */
-    OTHER(1, "其他"),
-    WEB(2, "Web用户"),
-    MOBILE(3, "手机端用户");
-
-    private final int value;
-    private final String description;
-
-    OperatorTypeEnum(int value, String description) {
-        this.value = value;
-        this.description = description;
-    }
-
-    @Override
-    public Integer getValue() {
-        return value;
-    }
-
-    @Override
-    public String description() {
-        return description;
-    }
-
-
-}

agileboot-common/src/main/java/com/agileboot/common/enums/common/RequestMethodEnum.java

@@ -1,39 +0,0 @@
-package com.agileboot.common.enums.common;
-
-import com.agileboot.common.enums.BasicEnum;
-
-/**
- * Http Method
- * @author valarchie
- */
-public enum RequestMethodEnum implements BasicEnum<Integer> {
-
-    /**
-     * 菜单类型
-     */
-    GET(1, "GET"),
-    POST(2, "POST"),
-    PUT(3, "PUT"),
-    DELETE(4, "DELETE"),
-    UNKNOWN(-1, "UNKNOWN");
-
-    private final int value;
-    private final String description;
-
-    RequestMethodEnum(int value, String description) {
-        this.value = value;
-        this.description = description;
-    }
-
-    @Override
-    public Integer getValue() {
-        return value;
-    }
-
-    @Override
-    public String description() {
-        return description;
-    }
-
-
-}

agileboot-common/src/main/java/com/agileboot/common/enums/common/StatusEnum.java

@@ -1,44 +0,0 @@
-package com.agileboot.common.enums.common;
-
-import com.agileboot.common.enums.dictionary.CssTag;
-import com.agileboot.common.enums.dictionary.Dictionary;
-import com.agileboot.common.enums.DictionaryEnum;
-
-/**
- * 除非表有特殊指明的话，一般用这个枚举代表 status字段
- * @author valarchie
- */
-@Dictionary(name = "common.status")
-public enum StatusEnum implements DictionaryEnum<Integer> {
-    /**
-     * 开关状态
-     */
-    ENABLE(1, "正常", CssTag.PRIMARY),
-    DISABLE(0, "停用", CssTag.DANGER);
-
-    private final int value;
-    private final String description;
-    private final String cssTag;
-
-    StatusEnum(int value, String description, String cssTag) {
-        this.value = value;
-        this.description = description;
-        this.cssTag = cssTag;
-    }
-
-    @Override
-    public Integer getValue() {
-        return value;
-    }
-
-    @Override
-    public String description() {
-        return description;
-    }
-
-    @Override
-    public String cssTag() {
-        return cssTag;
-    }
-
-}

agileboot-common/src/main/java/com/agileboot/common/enums/common/UserStatusEnum.java

@@ -1,49 +0,0 @@
-package com.agileboot.common.enums.common;
-
-import com.agileboot.common.enums.dictionary.CssTag;
-import com.agileboot.common.enums.dictionary.Dictionary;
-import com.agileboot.common.enums.DictionaryEnum;
-
-/**
- * 对应sys_user的status字段
- * @author valarchie
- */
-@Dictionary(name = "sysUser.status")
-public enum UserStatusEnum implements DictionaryEnum<Integer> {
-
-    /**
-     * 用户账户状态
-     */
-    NORMAL(1, "正常", CssTag.PRIMARY),
-    DISABLED(2, "禁用", CssTag.DANGER),
-    FROZEN(3, "冻结", CssTag.WARNING);
-
-    private final int value;
-    private final String description;
-
-    private final String cssTag;
-
-    UserStatusEnum(int value, String description, String cssTag) {
-        this.value = value;
-        this.description = description;
-        this.cssTag = cssTag;
-    }
-
-    public Integer getValue() {
-        return value;
-    }
-
-    @Override
-    public String description() {
-        return this.description;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    @Override
-    public String cssTag() {
-        return null;
-    }
-}

agileboot-common/src/main/java/com/agileboot/common/enums/common/VisibleStatusEnum.java

@@ -1,46 +0,0 @@
-package com.agileboot.common.enums.common;
-
-import com.agileboot.common.enums.dictionary.CssTag;
-import com.agileboot.common.enums.dictionary.Dictionary;
-import com.agileboot.common.enums.DictionaryEnum;
-
-/**
- * 对应sys_menu表的is_visible字段
- * @author valarchie
- */
-@Deprecated
-@Dictionary(name = "sysMenu.isVisible")
-public enum VisibleStatusEnum implements DictionaryEnum<Integer> {
-
-    /**
-     * 显示与否
-     */
-    SHOW(1, "显示", CssTag.PRIMARY),
-    HIDE(0, "隐藏", CssTag.DANGER);
-
-    private final int value;
-    private final String description;
-    private final String cssTag;
-
-    VisibleStatusEnum(int value, String description, String cssTag) {
-        this.value = value;
-        this.description = description;
-        this.cssTag = cssTag;
-    }
-
-    @Override
-    public Integer getValue() {
-        return value;
-    }
-
-    @Override
-    public String description() {
-        return description;
-    }
-
-    @Override
-    public String cssTag() {
-        return cssTag;
-    }
-
-}

agileboot-common/src/main/java/com/agileboot/common/enums/common/YesOrNoEnum.java

@@ -1,46 +0,0 @@
-package com.agileboot.common.enums.common;
-
-import com.agileboot.common.enums.DictionaryEnum;
-import com.agileboot.common.enums.dictionary.CssTag;
-import com.agileboot.common.enums.dictionary.Dictionary;
-
-/**
- * 系统内代表是与否的枚举
- * @author valarchie
- */
-@Dictionary(name = "common.yesOrNo")
-public enum YesOrNoEnum implements DictionaryEnum<Integer> {
-    /**
-     * 是与否
-     */
-    YES(1, "是", CssTag.PRIMARY),
-    NO(0, "否", CssTag.DANGER);
-
-    private final int value;
-    private final String description;
-    private final String cssTag;
-
-    YesOrNoEnum(int value, String description, String cssTag) {
-        this.value = value;
-        this.description = description;
-        this.cssTag = cssTag;
-    }
-
-
-    @Override
-    public Integer getValue() {
-        return value;
-    }
-
-    @Override
-    public String description() {
-        return description;
-    }
-
-
-    @Override
-    public String cssTag() {
-        return cssTag;
-    }
-
-}

agileboot-common/src/test/java/com/agileboot/common/core/exception/ApiExceptionTest.java

@@ -1,29 +0,0 @@
-package com.agileboot.common.core.exception;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-public class ApiExceptionTest {
-
-
-    @Test
-    public void testVarargsWithArrayArgs() {
-        String errorMsg = "these parameters are null: %s, %s, %s.";
-        Object[] array = new Object[] { "param1" , "param2" , "param3"};
-
-        String formatWithArray = String.format(errorMsg, array);
-        String formatWithVarargs = String.format(errorMsg, "param1", "param2", "param3");
-
-        Assert.assertEquals(formatWithVarargs, formatWithArray);
-    }
-
-    @Test
-    public void testVarargsWithNullArgs() {
-        String errorMsg = "these parameters are null: %s, %s, %s.";
-
-        String format = String.format(errorMsg, "param1", null, null);
-
-        Assert.assertEquals("these parameters are null: param1, null, null.", format);
-    }
-
-}

agileboot-common/src/test/java/com/agileboot/common/enums/BasicEnumUtilTest.java

@@ -1,20 +0,0 @@
-package com.agileboot.common.enums;
-
-
-import com.agileboot.common.enums.common.YesOrNoEnum;
-import org.junit.Assert;
-import org.junit.Test;
-
-public class BasicEnumUtilTest {
-
-    @Test
-    public void testFromValue() {
-
-        YesOrNoEnum yes = BasicEnumUtil.fromValue(YesOrNoEnum.class, 1);
-        YesOrNoEnum no = BasicEnumUtil.fromValue(YesOrNoEnum.class, 0);
-
-        Assert.assertEquals(yes.description(), "是");
-        Assert.assertEquals(no.description(), "否");
-
-    }
-}

agileboot-common/src/test/java/com/agileboot/common/exception/error/ErrorCodeInterfaceTest.java

@@ -1,14 +0,0 @@
-package com.agileboot.common.exception.error;
-
-import com.agileboot.common.exception.error.ErrorCode.Client;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-
-class ErrorCodeInterfaceTest {
-
-    @Test
-    void testI18nKey() {
-        String i18nKey = Client.COMMON_FORBIDDEN_TO_CALL.i18nKey();
-        Assertions.assertEquals("20001_COMMON_FORBIDDEN_TO_CALL", i18nKey);
-    }
-}

agileboot-common/src/test/java/com/agileboot/common/query/AbstractQueryTest.java

@@ -1,80 +0,0 @@
-package com.agileboot.common.query;
-
-
-import com.agileboot.common.core.page.AbstractQuery;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import java.util.Date;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-class AbstractQueryTest {
-
-    private AbstractQuery query;
-
-    @BeforeEach
-    public void getNewQuery() {
-        query = new AbstractQuery<Object>() {
-            @Override
-            public QueryWrapper addQueryCondition() {
-                return new QueryWrapper();
-            }
-        };
-    }
-
-
-    @Test
-    void addTimeConditionWithNull() {
-        query.setTimeRangeColumn("loginTime");
-        QueryWrapper<Object> queryWrapper = query.toQueryWrapper();
-
-        String targetSql = queryWrapper.getTargetSql();
-        Assertions.assertEquals("", targetSql);
-    }
-
-
-    @Test
-    void addTimeConditionWithBothValue() {
-        query.setBeginTime(new Date());
-        query.setEndTime(new Date());
-        query.setTimeRangeColumn("loginTime");
-
-        QueryWrapper<Object> queryWrapper = query.toQueryWrapper();
-
-        String targetSql = queryWrapper.getTargetSql();
-        Assertions.assertEquals("(login_time >= ? AND login_time <= ?)", targetSql);
-    }
-
-
-    @Test
-    void addTimeConditionWithBeginValueOnly() {
-        query.setBeginTime(new Date());
-        query.setTimeRangeColumn("loginTime");
-
-        QueryWrapper<Object> queryWrapper = query.toQueryWrapper();
-
-        String targetSql = queryWrapper.getTargetSql();
-        Assertions.assertEquals("(login_time >= ?)", targetSql);
-    }
-
-
-
-    @Test
-    void testConvertSortDirection() {
-        query.setOrderDirection("ascending");
-        Assertions.assertTrue(query.convertSortDirection());
-
-        query.setOrderDirection("descending");
-        Assertions.assertFalse(query.convertSortDirection());
-
-        query.setOrderDirection("");
-        Assertions.assertNull(query.convertSortDirection());
-
-        query.setOrderDirection(null);
-        Assertions.assertNull(query.convertSortDirection());
-    }
-
-
-
-
-}

agileboot-common/src/test/java/com/agileboot/common/utils/file/FileUploadUtilsTest.java

@@ -1,119 +0,0 @@
-package com.agileboot.common.utils.file;
-
-import cn.hutool.core.util.StrUtil;
-import com.agileboot.common.config.AgileBootConfig;
-import com.agileboot.common.constant.Constants.UploadSubDir;
-import com.agileboot.common.exception.ApiException;
-import com.agileboot.common.exception.error.ErrorCode.Business;
-import com.agileboot.common.exception.error.ErrorCode.Internal;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-import org.mockito.Mockito;
-import org.springframework.web.multipart.MultipartFile;
-
-class FileUploadUtilsTest {
-
-    @Test
-    void testIsAllowedExtension() {
-        String[] imageTypes = new String[]{"img", "gif"};
-
-        boolean isAllow = FileUploadUtils.isExtensionAllowed("img", imageTypes);
-        boolean isNotAllow = FileUploadUtils.isExtensionAllowed("png", imageTypes);
-
-        Assertions.assertTrue(isAllow);
-        Assertions.assertFalse(isNotAllow);
-    }
-
-    @Test
-    void testIsAllowedExtensionWhenNull() {
-        String[] imageTypes = null;
-
-        boolean isAllow = FileUploadUtils.isExtensionAllowed("img", imageTypes);
-
-        Assertions.assertTrue(isAllow);
-    }
-
-    @Test
-    void testGetRelativeFileUrl() {
-        String relativeFilePath = FileUploadUtils.getRelativeFileUrl(UploadSubDir.UPLOAD_PATH, "test.jpg");
-
-        Assertions.assertEquals("/profile/upload/test.jpg", relativeFilePath);
-    }
-
-    @Test
-    void testSaveFileToLocal() {
-        MultipartFile fileMock = Mockito.mock(MultipartFile.class);
-
-        ApiException exceptionWithNullSubDir = Assertions.assertThrows(ApiException.class,
-            () -> FileUploadUtils.saveFileToLocal(fileMock, "", ""));
-        ApiException exceptionWitEmptyFileName = Assertions.assertThrows(ApiException.class,
-            () -> FileUploadUtils.saveFileToLocal(fileMock, "", ""));
-
-        Assertions.assertEquals(Internal.INVALID_PARAMETER, exceptionWithNullSubDir.getErrorCode());
-        Assertions.assertEquals(Internal.INVALID_PARAMETER, exceptionWitEmptyFileName.getErrorCode());
-    }
-
-    @Test
-    void testIsAllowedUploadWhenFileNameTooLong() {
-        MultipartFile fileMock = Mockito.mock(MultipartFile.class);
-        String longFileName = "this is a very very long sentence, this is a very very long sentence, "
-            + "this is a very very long sentence, this is a very very long sentence, ";
-
-        Mockito.when(fileMock.getOriginalFilename()).thenReturn(longFileName);
-
-        ApiException exception = Assertions.assertThrows(ApiException.class,
-            () -> FileUploadUtils.isAllowedUpload(fileMock, null));
-        Assertions.assertEquals(Business.UPLOAD_FILE_NAME_EXCEED_MAX_LENGTH, exception.getErrorCode());
-    }
-
-    @Test
-    void testIsAllowedUploadWhenFileTooBig() {
-        MultipartFile fileMock = Mockito.mock(MultipartFile.class);
-        Mockito.when(fileMock.getOriginalFilename()).thenReturn("test.jpg");
-        Mockito.when(fileMock.getSize()).thenReturn(FileUploadUtils.MAX_FILE_SIZE + 1);
-
-        ApiException exception = Assertions.assertThrows(ApiException.class,
-            () -> FileUploadUtils.isAllowedUpload(fileMock, null));
-        Assertions.assertEquals(Business.UPLOAD_FILE_SIZE_EXCEED_MAX_SIZE, exception.getErrorCode());
-    }
-
-    @Test
-    void testisAllowDownload() {
-        Assertions.assertFalse(FileUploadUtils.isAllowDownload("../test.jpg"));
-        Assertions.assertFalse(FileUploadUtils.isAllowDownload("../test.exe"));
-    }
-
-    @Test
-    void testGetFileExtension() {
-        MultipartFile fileMock = Mockito.mock(MultipartFile.class);
-        Mockito.when(fileMock.getOriginalFilename()).thenReturn("test.jpg");
-
-        String fileExtension = FileUploadUtils.getFileExtension(fileMock);
-
-        Assertions.assertEquals("jpg", fileExtension);
-    }
-
-    @Test
-    void testGenerateFilename() {
-        String fileName = "test.jpg";
-        MultipartFile fileMock = Mockito.mock(MultipartFile.class);
-        Mockito.when(fileMock.getOriginalFilename()).thenReturn(fileName);
-
-        String randomFileName = FileUploadUtils.generateFilename(fileMock);
-
-        String[] nameParts = randomFileName.split("_");
-        Assertions.assertEquals("test", nameParts[1]);
-        Assertions.assertTrue(StrUtil.endWith(nameParts[2], ".jpg"));
-    }
-
-
-    @Test
-    void getFileAbsolutePath() {
-        AgileBootConfig agileBootConfig = new AgileBootConfig();
-        agileBootConfig.setFileBaseDir("D:\\agileboot");
-
-        String fileAbsolutePath = FileUploadUtils.getFileAbsolutePath(UploadSubDir.AVATAR_PATH, "test.jpg");
-
-        Assertions.assertEquals("D:\\agileboot\\profile\\avatar\\test.jpg", fileAbsolutePath);
-    }
-}

agileboot-common/src/test/java/com/agileboot/common/utils/ip/IpRegionUtilTest.java

@@ -1,65 +0,0 @@
-package com.agileboot.common.utils.ip;
-
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-
-class IpRegionUtilTest {
-
-    @Test
-    void testGetIpRegion() {
-        IpRegion ipRegion = IpRegionUtil.getIpRegion("110.81.189.80");
-
-        Assertions.assertEquals("中国", ipRegion.getCountry());
-        Assertions.assertEquals("福建省", ipRegion.getProvince());
-        Assertions.assertEquals("泉州市", ipRegion.getCity());
-    }
-
-    @Test
-    void testGetIpRegionWhenLocalHost() {
-        IpRegion ipRegion = IpRegionUtil.getIpRegion("127.0.0.1");
-        Assertions.assertEquals("内网IP", ipRegion.briefLocation());
-    }
-
-    @Test
-    void testGetIpRegionWithIpv6() {
-        IpRegion ipRegion = IpRegionUtil.getIpRegion("2001:0DB8:0000:0023:0008:0800:200C:417A");
-
-        Assertions.assertNotNull(ipRegion);
-        Assertions.assertNull(ipRegion.getCountry());
-        Assertions.assertEquals("未知 未知", ipRegion.briefLocation());
-    }
-
-    @Test
-    void testGetIpRegionWithEmpty() {
-        IpRegion ipRegion = IpRegionUtil.getIpRegion("");
-
-        Assertions.assertNotNull(ipRegion);
-        Assertions.assertNull(ipRegion.getCountry());
-        Assertions.assertEquals("未知 未知", ipRegion.briefLocation());
-    }
-
-    @Test
-    void testGetIpRegionWithNull() {
-        IpRegion ipRegion = IpRegionUtil.getIpRegion(null);
-
-        Assertions.assertNotNull(ipRegion);
-        Assertions.assertNull(ipRegion.getCountry());
-        Assertions.assertEquals("未知 未知", ipRegion.briefLocation());
-    }
-
-    @Test
-    void testGetIpRegionWithWrongIpString() {
-        IpRegion ipRegion = IpRegionUtil.getIpRegion("xsdfwefsfsd");
-
-        Assertions.assertNotNull(ipRegion);
-        Assertions.assertNull(ipRegion.getCountry());
-        Assertions.assertEquals("未知 未知", ipRegion.briefLocation());
-    }
-
-    @Test
-    void getBriefLocationByIp() {
-        String briefLocationByIp = IpRegionUtil.getBriefLocationByIp("110.81.189.80");
-
-        Assertions.assertEquals("福建省 泉州市", briefLocationByIp);
-    }
-}

agileboot-common/src/test/java/com/agileboot/common/utils/ip/IpUtilTest.java

@@ -1,41 +0,0 @@
-package com.agileboot.common.utils.ip;
-
-
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-
-class IpUtilTest {
-
-    @Test
-    void isInnerIp() {
-        boolean innerIp1 = IpUtil.isLocalHost("127.0.0.1");
-        boolean innerIp2 = IpUtil.isLocalHost("0:0:0:0:0:0:0:1");
-        boolean innerIp3 = IpUtil.isLocalHost("localhost");
-        boolean innerIp4 = IpUtil.isLocalHost("192.168.1.1");
-        boolean innerIp5 = IpUtil.isLocalHost("10.32.1.1");
-        boolean innerIp6 = IpUtil.isLocalHost("172.16.1.1");
-        boolean notInnerIP = IpUtil.isLocalHost("110.81.189.80");
-
-        Assertions.assertTrue(innerIp1);
-        Assertions.assertTrue(innerIp2);
-        Assertions.assertTrue(innerIp3);
-        Assertions.assertTrue(innerIp4);
-        Assertions.assertTrue(innerIp5);
-        Assertions.assertTrue(innerIp6);
-        Assertions.assertFalse(notInnerIP);
-    }
-
-    @Test
-    void isLocalHost() {
-        boolean localHost1 = IpUtil.isLocalHost("127.0.0.1");
-        boolean localHost2 = IpUtil.isLocalHost("0:0:0:0:0:0:0:1");
-        boolean localHost4 = IpUtil.isLocalHost("localhost");
-        boolean notLocalHost = IpUtil.isLocalHost("110.81.189.80");
-
-        Assertions.assertTrue(localHost1);
-        Assertions.assertTrue(localHost2);
-        Assertions.assertTrue(localHost4);
-        Assertions.assertFalse(notLocalHost);
-    }
-
-}

agileboot-common/src/test/java/com/agileboot/common/utils/ip/OfflineIpRegionUtilTest.java

@@ -1,52 +0,0 @@
-package com.agileboot.common.utils.ip;
-
-
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-
- class OfflineIpRegionUtilTest {
-
-     @Test
-     void testGetIpRegionWhenIpv4() {
-         IpRegion ipRegion = OfflineIpRegionUtil.getIpRegion("110.81.189.80");
-
-         Assertions.assertEquals("中国", ipRegion.getCountry());
-         Assertions.assertEquals("福建省", ipRegion.getProvince());
-         Assertions.assertEquals("泉州市", ipRegion.getCity());
-     }
-
-     @Test
-     void testGetIpRegionWithIpv6() {
-         IpRegion region = Assertions.assertDoesNotThrow(() ->
-                 OfflineIpRegionUtil.getIpRegion("2001:0DB8:0000:0023:0008:0800:200C:417A")
-         );
-
-         Assertions.assertNull(region);
-     }
-
-     @Test
-     void testGetIpRegionWithEmpty() {
-         IpRegion region = Assertions.assertDoesNotThrow(() ->
-                 OfflineIpRegionUtil.getIpRegion("")
-         );
-
-         Assertions.assertNull(region);
-     }
-
-     @Test
-     void testGetIpRegionWithNull() {
-         IpRegion region = Assertions.assertDoesNotThrow(() ->
-                 OfflineIpRegionUtil.getIpRegion(null)
-         );
-
-         Assertions.assertNull(region);
-     }
-
-     @Test
-     void testGetIpRegionWithWrongIpString() {
-         IpRegion region = Assertions.assertDoesNotThrow(() ->
-                 OfflineIpRegionUtil.getIpRegion("asfdsfdsff")
-         );
-         Assertions.assertNull(region);
-     }
- }

agileboot-common/src/test/java/com/agileboot/common/utils/ip/OnlineIpRegionUtilTest.java

@@ -1,63 +0,0 @@
-package com.agileboot.common.utils.ip;
-
-import com.agileboot.common.config.AgileBootConfig;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-class OnlineIpRegionUtilTest {
-
-    @BeforeEach
-    public void enableOnlineAddressQuery() {
-        AgileBootConfig agileBootConfig = new AgileBootConfig();
-        agileBootConfig.setAddressEnabled(true);
-    }
-
-
-    @Test
-    void getIpRegionWithIpv6() {
-        IpRegion region = Assertions.assertDoesNotThrow(() ->
-                OnlineIpRegionUtil.getIpRegion("ABCD:EF01:2345:6789:ABCD:EF01:2345:6789")
-        );
-        Assertions.assertNull(region);
-    }
-
-    @Test
-    void getIpRegionWithIpv4() {
-        IpRegion ipRegion = OnlineIpRegionUtil.getIpRegion("120.42.247.130");
-
-        Assertions.assertEquals("福建省", ipRegion.getProvince());
-        Assertions.assertEquals("泉州市", ipRegion.getCity());
-    }
-
-    @Test
-    void getIpRegionWithEmpty() {
-        IpRegion region = Assertions.assertDoesNotThrow(() ->
-                OnlineIpRegionUtil.getIpRegion("")
-        );
-
-        Assertions.assertNull(region);
-    }
-
-
-    @Test
-    void getIpRegionWithNull() {
-        IpRegion region = Assertions.assertDoesNotThrow(() ->
-                OnlineIpRegionUtil.getIpRegion(null)
-        );
-
-        Assertions.assertNull(region);
-    }
-
-    @Test
-    void getIpRegionWithWrongIpString() {
-        IpRegion region = Assertions.assertDoesNotThrow(() ->
-                OnlineIpRegionUtil.getIpRegion("seffsdfsdf")
-        );
-
-        Assertions.assertNull(region);
-    }
-
-
-}
-

agileboot-common/src/test/java/com/agileboot/common/utils/jackson/JacksonUtilTest.java

@@ -1,61 +0,0 @@
-package com.agileboot.common.utils.jackson;
-
-import cn.hutool.core.date.DateUtil;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import org.junit.Assert;
-import org.junit.Test;
-
-/**
- * @author duanxinyuan 2019/1/21 18:17
- */
-public class JacksonUtilTest {
-
-    @Test
-    public void testObjectToJson() {
-        Person person = Person.newPerson();
-
-        String jacksonStr = JacksonUtil.to(person);
-        Assert.assertEquals(DateUtil.formatDateTime(person.getDate()), JacksonUtil.getAsString(jacksonStr, "date"));
-        Assert.assertEquals(DateUtil.formatLocalDateTime(person.getLocalDateTime()),
-            JacksonUtil.getAsString(jacksonStr, "localDateTime"));
-        Assert.assertEquals(person.getName(), JacksonUtil.getAsString(jacksonStr, "name"));
-        Assert.assertEquals(person.getAge(), JacksonUtil.getAsInt(jacksonStr, "age"));
-        Assert.assertEquals(person.isMan(), JacksonUtil.getAsBoolean(jacksonStr, "man"));
-        Assert.assertEquals(person.getMoney(), JacksonUtil.getAsBigDecimal(jacksonStr, "money"));
-        Assert.assertEquals(person.getTrait(), JacksonUtil.getAsList(jacksonStr, "trait", String.class));
-
-        Assert.assertNotNull(JacksonUtil.getAsString(jacksonStr, "name"));
-    }
-
-    /**
-     * 测试兼容情况
-     */
-    @Test
-    public void testAllPrimitiveTypeToJson() {
-        String json = "{\n"
-            + "\"code\": \"200\",\n"
-            + "\"id\": \"2001215464647687987\",\n"
-            + "\"message\": \"success\",\n"
-            + "\"amount\": \"1.12345\",\n"
-            + "\"amount1\": \"0.12345\",\n"
-            + "\"isSuccess\": \"true\",\n"
-            + "\"isSuccess1\": \"1\",\n"
-            + "\"key\": \"8209167202090377654857374178856064487200234961995543450245362822537162918731039965956758726661669012305745755921310000297396309887550627402157318910581311\"\n"
-            + "}";
-        Assert.assertEquals(200, JacksonUtil.getAsInt(json, "code"));
-        Assert.assertEquals(2001215464647687987L,JacksonUtil.getAsLong(json, "id"));
-        Assert.assertEquals("success", JacksonUtil.getAsString(json, "message"));
-        Assert.assertEquals(new BigDecimal("1.12345"), JacksonUtil.getAsBigDecimal(json, "amount"));
-        Assert.assertEquals(new BigDecimal("0.12345"), JacksonUtil.getAsBigDecimal(json, "amount1"));
-        Assert.assertEquals(1.12345d, JacksonUtil.getAsDouble(json, "amount"), 0.00001);
-        Assert.assertEquals(0.12345d, JacksonUtil.getAsDouble(json, "amount1"), 0.00001);
-        Assert.assertTrue(JacksonUtil.getAsBoolean(json, "isSuccess"));
-        Assert.assertTrue(JacksonUtil.getAsBoolean(json, "isSuccess1"));
-        Assert.assertEquals(new BigInteger(
-            "8209167202090377654857374178856064487200234961995543450245362822537162918731039965956758726661669012305745755921310000297396309887550627402157318910581311"),
-            JacksonUtil.getAsBigInteger(json, "key"));
-        Assert.assertEquals("1", JacksonUtil.getAsString(json, "isSuccess1"));
-    }
-
-}

agileboot-common/src/test/java/com/agileboot/common/utils/jackson/Person.java

@@ -1,42 +0,0 @@
-package com.agileboot.common.utils.jackson;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import lombok.Data;
-
-/**
- * @author duanxinyuan
- * 2018/6/29 14:17
- */
-@Data
-public class Person {
-    public String name;
-    public Date date;
-    public LocalDateTime localDateTime;
-    public int age;
-    public BigDecimal money;
-    public boolean man;
-    public ArrayList<String> trait;
-    public HashMap<String, String> cards;
-
-    public static Person newPerson() {
-        Person person = new Person();
-        person.name = "张三";
-        person.date = new Date();
-        person.localDateTime = LocalDateTime.now();
-        person.age = 100;
-        person.money = BigDecimal.valueOf(500.21);
-        person.man = true;
-        person.trait = new ArrayList<>();
-        person.trait.add("淡然");
-        person.trait.add("温和");
-        person.cards = new HashMap<>();
-        person.cards.put("身份证", "4a6d456as");
-        person.cards.put("建行卡", "649874545");
-        return person;
-    }
-
-}

agileboot-common/src/test/java/com/agileboot/common/utils/poi/CustomExcelUtilTest.java

@@ -1,40 +0,0 @@
-package com.agileboot.common.utils.poi;
-
-import cn.hutool.core.io.FileUtil;
-import cn.hutool.http.HtmlUtil;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-
-class CustomExcelUtilTest {
-
-    @Test
-    void testImportAndExport() {
-        PostDTO post1 = new PostDTO(1L, "admin1", "管理员1", "1", "无备注", "1", "正常");
-        PostDTO post2 = new PostDTO(2L, "admin2", "管理员2<script>alert(1)</script>", "2", "无备注", "1", "正常");
-
-        List<PostDTO> postDTOList = new ArrayList<>();
-        postDTOList.add(post1);
-        postDTOList.add(post2);
-
-        File file = FileUtil.createTempFile();
-
-        CustomExcelUtil.writeToOutputStream(postDTOList, PostDTO.class, FileUtil.getOutputStream(file));
-
-        List<PostDTO> postListFromExcel = CustomExcelUtil.readFromInputStream(PostDTO.class, FileUtil.getInputStream(file));
-
-        PostDTO post1fromExcel = postListFromExcel.get(0);
-        PostDTO post2fromExcel = postListFromExcel.get(1);
-
-        Assertions.assertEquals(post1.getPostId(), post1fromExcel.getPostId());
-        Assertions.assertEquals(post1.getPostCode(), post1fromExcel.getPostCode());
-        Assertions.assertEquals(post2.getPostId(), post2fromExcel.getPostId());
-        Assertions.assertEquals(post2.getPostCode(), post2fromExcel.getPostCode());
-        // 检查脚本注入的字符串是否被去除
-        Assertions.assertNotEquals(post2.getPostName(), post2fromExcel.getPostName());
-        Assertions.assertEquals(HtmlUtil.cleanHtmlTag(post2.getPostName()), post2fromExcel.getPostName());
-    }
-
-}

agileboot-common/src/test/java/com/agileboot/common/utils/poi/PostDTO.java

@@ -1,37 +0,0 @@
-package com.agileboot.common.utils.poi;
-
-import com.agileboot.common.annotation.ExcelColumn;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-
-@AllArgsConstructor
-@NoArgsConstructor
-@Data
-@EqualsAndHashCode
-public class PostDTO {
-
-    @ExcelColumn(name = "岗位ID")
-    private Long postId;
-
-
-    @ExcelColumn(name = "岗位编码")
-    private String postCode;
-
-    @ExcelColumn(name = "岗位名称")
-    private String postName;
-
-
-    @ExcelColumn(name = "岗位排序")
-    private String postSort;
-
-    @ExcelColumn(name = "备注")
-    private String remark;
-
-    private String status;
-
-    @ExcelColumn(name = "状态")
-    private String statusStr;
-
-}

agileboot-common/src/test/java/com/agileboot/common/utils/time/DatePickUtilTest.java

@@ -1,46 +0,0 @@
-package com.agileboot.common.utils.time;
-
-import java.util.Calendar;
-import java.util.Date;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-
-class DatePickUtilTest {
-
-    @Test
-    void testGetBeginOfTheDay() {
-        Date beginOfTheDay = DatePickUtil.getBeginOfTheDay(new Date());
-
-        Calendar instance = Calendar.getInstance();
-        instance.setTime(beginOfTheDay);
-
-        Assertions.assertEquals(0, instance.get(Calendar.HOUR));
-        Assertions.assertEquals(0, instance.get(Calendar.MINUTE));
-        Assertions.assertEquals(0, instance.get(Calendar.SECOND));
-    }
-
-    @Test
-    void testGetBeginOfTheDayWhenNull() {
-        Assertions.assertDoesNotThrow(() -> DatePickUtil.getBeginOfTheDay(null)
-        );
-    }
-
-    @Test
-    void testGetEndOfTheDay() {
-        Date endOfTheDay = DatePickUtil.getEndOfTheDay(new Date());
-
-        Calendar instance = Calendar.getInstance();
-        instance.setTime(endOfTheDay);
-
-        Assertions.assertEquals(23, instance.get(Calendar.HOUR_OF_DAY));
-        Assertions.assertEquals(59, instance.get(Calendar.MINUTE));
-        Assertions.assertEquals(59, instance.get(Calendar.SECOND));
-    }
-
-    @Test
-    void testGetEndOfTheDayWhenNull() {
-        Assertions.assertDoesNotThrow(() -> DatePickUtil.getEndOfTheDay(null)
-        );
-    }
-
-}

agileboot-common/wol-common-box/pom.xml

@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.agileboot</groupId>
+    <artifactId>wol-common-box</artifactId>
+    <version>${revision}</version>
+    <packaging>pom</packaging>
+
+    <properties>
+        <revision>1.0.0</revision>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+
+            <!-- 核心模块 -->
+            <dependency>
+                <groupId>com.agileboot</groupId>
+                <artifactId>wol-common-core</artifactId>
+                <version>${revision}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.agileboot</groupId>
+                <artifactId>wol-common-doc</artifactId>
+                <version>${revision}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.agileboot</groupId>
+                <artifactId>wol-common-mybatis</artifactId>
+                <version>${revision}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.agileboot</groupId>
+                <artifactId>wol-common-redis</artifactId>
+                <version>${revision}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.agileboot</groupId>
+                <artifactId>wol-common-web</artifactId>
+                <version>${revision}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.agileboot</groupId>
+                <artifactId>wol-common-json</artifactId>
+                <version>${revision}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.agileboot</groupId>
+                <artifactId>wol-common-satoken</artifactId>
+                <version>${revision}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.agileboot</groupId>
+                <artifactId>wol-common-nacos</artifactId>
+                <version>${revision}</version>
+            </dependency>
+
+        </dependencies>
+    </dependencyManagement>
+
+</project>

agileboot-common/wol-common-core/pom.xml

@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.agileboot</groupId>
+        <artifactId>agileboot-common</artifactId>
+        <version>1.0.0</version>
+    </parent>
+
+    <artifactId>wol-common-core</artifactId>
+
+    <dependencies>
+        <!-- Spring框架基本的核心工具 -->
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context-support</artifactId>
+        </dependency>
+        <!-- servlet包 -->
+        <dependency>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+        </dependency>
+        <!-- SpringWeb模块 -->
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+        </dependency>
+        <!-- pool 对象池 -->
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-pool2</artifactId>
+        </dependency>
+        <!-- 自定义验证注解 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-aop</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.lionsoul</groupId>
+            <artifactId>ip2region</artifactId>
+        </dependency>
+        <!-- excel工具 -->
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml</artifactId>
+        </dependency>
+        <!-- io常用工具类 -->
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+        </dependency>
+        <!--常用工具类 -->
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.module</groupId>
+            <artifactId>jackson-module-parameter-names</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jdk8</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jsr310</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba.fastjson2</groupId>
+            <artifactId>fastjson2</artifactId>
+        </dependency>
+        <!--ENC加密-->
+        <dependency>
+            <groupId>com.github.ulisesbocchio</groupId>
+            <artifactId>jasypt-spring-boot-starter</artifactId>
+            <version>2.1.1</version>
+        </dependency>
+
+        <!--  swagger注解  -->
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-annotations</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>

agileboot-common/wol-common-core/src/main/java/com/agileboot/common/core/annotation/ExcelColumn.java

@@ -1,4 +1,4 @@
-package com.agileboot.common.annotation;
+package com.agileboot.common.core.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

agileboot-common/wol-common-core/src/main/java/com/agileboot/common/core/annotation/ExcelSheet.java

@@ -1,4 +1,4 @@
-package com.agileboot.common.annotation;
+package com.agileboot.common.core.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

agileboot-common/wol-common-core/src/main/java/com/agileboot/common/core/config/AgileBootConfig.java

@@ -1,6 +1,6 @@
-package com.agileboot.common.config;
+package com.agileboot.common.core.config;
 
-import com.agileboot.common.constant.Constants;
+import com.agileboot.common.core.constant.Constants;
 import java.io.File;
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;