From 17fc5266ffb0bc9e25b260284b8ecc0e1e4c9a79 Mon Sep 17 00:00:00 2001 From: Charles7c Date: Wed, 21 Feb 2024 22:34:11 +0800 Subject: [PATCH] chore: continew-starter 1.4.1-SNAPSHOT => 1.5.0-SNAPSHOT MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1.适配 ContiNew Starter IService 包结构优化 2.解决部分冲突 --- README.md | 7 +++++-- .../admin/auth/service/impl/LoginServiceImpl.java | 2 +- .../admin/system/model/query/MenuQuery.java | 6 ++++++ .../admin/system/service/AnnouncementService.java | 2 +- .../continew/admin/system/service/DeptService.java | 2 +- .../admin/system/service/DictItemService.java | 2 +- .../continew/admin/system/service/DictService.java | 2 +- .../continew/admin/system/service/FileService.java | 2 +- .../continew/admin/system/service/MenuService.java | 9 ++++++++- .../continew/admin/system/service/RoleService.java | 2 +- .../admin/system/service/StorageService.java | 2 +- .../continew/admin/system/service/UserService.java | 2 +- .../admin/system/service/impl/MenuServiceImpl.java | 14 ++++++-------- .../admin/system/service/impl/RoleServiceImpl.java | 2 +- .../src/main/resources/banner.txt | 2 +- pom.xml | 2 +- 16 files changed, 37 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index e11c9187..334733cd 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ Sonar Status -ContiNew Starter +ContiNew Starter Spring Boot @@ -231,7 +231,7 @@ git clone https://github.com/Charles7c/continew-admin.git | 名称 | 版本 | 简介 | | :----------------------------------------------------------- |:-------------| :----------------------------------------------------------- | -| [ContiNew Starter](https://github.com/Charles7c/continew-starter) | 1.4.1-SNAPSHOT | ContiNew Starter 包含了一系列经过企业实践优化的依赖包（如 MyBatis-Plus、SaToken），可轻松集成到应用中，为开发人员减少手动引入依赖及配置的麻烦，为 Spring Boot Web 项目的灵活快速构建提供支持。 | +| [ContiNew Starter](https://github.com/Charles7c/continew-starter) | 1.5.0-SNAPSHOT | ContiNew Starter 包含了一系列经过企业实践优化的依赖包（如 MyBatis-Plus、SaToken），可轻松集成到应用中，为开发人员减少手动引入依赖及配置的麻烦，为 Spring Boot Web 项目的灵活快速构建提供支持。 | | Spring Boot | 3.1.8 | 简化 Spring 应用的初始搭建和开发过程，基于“约定优于配置”的理念，使开发人员不再需要定义样板化的配置。（Spring Boot 3.0 开始，要求 Java 17 作为最低版本） | | Undertow | 2.3.10.Final | 采用 Java 开发的灵活的高性能 Web 服务器，提供包括阻塞和基于 NIO 的非堵塞机制。 | | Sa-Token + JWT | 1.37.0 | 轻量级 Java 权限认证框架，让鉴权变得简单、优雅。 | @@ -280,6 +280,9 @@ continew-admin │ │ │ │ ├─ application-prod.yml（生产环境配置文件） │ │ │ │ └─ application.yml（通用配置文件） │ │ │ ├─ db/changelog（Liquibase 数据脚本配置目录） +│ │ │ │ ├─ mysql（MySQL 数据库初始 SQL 脚本目录） +│ │ │ │ ├─ postgresql（PostgreSQL 数据库初始 SQL 脚本目录） +│ │ │ │ └─ db.changelog-master.yaml（Liquibase 变更记录文件） │ │ │ ├─ templates（模板配置目录，例如：邮件模板） │ │ │ ├─ banner.txt（Banner 配置文件） │ │ │ └─ logback-spring.xml（日志配置文件） diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/service/impl/LoginServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/service/impl/LoginServiceImpl.java index 8d92fbee..bc4ca79e 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/service/impl/LoginServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/service/impl/LoginServiceImpl.java @@ -153,7 +153,7 @@ public class LoginServiceImpl implements LoginService { // 查询菜单列表 Set menuSet = new LinkedHashSet<>(); if (roleCodeSet.contains(SysConstants.ADMIN_ROLE_CODE)) { - menuSet.addAll(menuService.list()); + menuSet.addAll(menuService.listAll()); } else { roleCodeSet.forEach(roleCode -> menuSet.addAll(menuService.listByRoleCode(roleCode))); } diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/MenuQuery.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/MenuQuery.java index c7537c20..e09aeabc 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/MenuQuery.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/MenuQuery.java @@ -18,6 +18,7 @@ package top.charles7c.continew.admin.system.model.query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import lombok.NoArgsConstructor; import top.charles7c.continew.starter.data.core.annotation.Query; import top.charles7c.continew.starter.data.core.enums.QueryType; @@ -31,6 +32,7 @@ import java.io.Serializable; * @since 2023/2/15 20:21 */ @Data +@NoArgsConstructor @Schema(description = "菜单查询条件") public class MenuQuery implements Serializable { @@ -49,4 +51,8 @@ public class MenuQuery implements Serializable { */ @Schema(description = "状态（1：启用；2：禁用）", example = "1") private Integer status; + + public MenuQuery(Integer status) { + this.status = status; + } } diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/AnnouncementService.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/AnnouncementService.java index fd3592e0..18afae29 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/AnnouncementService.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/AnnouncementService.java @@ -23,7 +23,7 @@ import top.charles7c.continew.admin.system.model.resp.AnnouncementDetailResp; import top.charles7c.continew.admin.system.model.resp.AnnouncementResp; import top.charles7c.continew.admin.system.model.resp.DashboardAnnouncementResp; import top.charles7c.continew.starter.extension.crud.service.BaseService; -import top.charles7c.continew.starter.extension.crud.service.IService; +import top.charles7c.continew.starter.data.mybatis.plus.service.IService; import java.util.List; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/DeptService.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/DeptService.java index 15c2afee..0bfc41f1 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/DeptService.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/DeptService.java @@ -22,7 +22,7 @@ import top.charles7c.continew.admin.system.model.req.DeptReq; import top.charles7c.continew.admin.system.model.resp.DeptDetailResp; import top.charles7c.continew.admin.system.model.resp.DeptResp; import top.charles7c.continew.starter.extension.crud.service.BaseService; -import top.charles7c.continew.starter.extension.crud.service.IService; +import top.charles7c.continew.starter.data.mybatis.plus.service.IService; /** * 部门业务接口 diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/DictItemService.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/DictItemService.java index 536a3a98..4b9b2eb6 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/DictItemService.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/DictItemService.java @@ -23,7 +23,7 @@ import top.charles7c.continew.admin.system.model.req.DictItemReq; import top.charles7c.continew.admin.system.model.resp.DictItemDetailResp; import top.charles7c.continew.admin.system.model.resp.DictItemResp; import top.charles7c.continew.starter.extension.crud.service.BaseService; -import top.charles7c.continew.starter.extension.crud.service.IService; +import top.charles7c.continew.starter.data.mybatis.plus.service.IService; import java.io.Serializable; import java.util.List; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/DictService.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/DictService.java index 81b37c9b..76c6770d 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/DictService.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/DictService.java @@ -22,7 +22,7 @@ import top.charles7c.continew.admin.system.model.req.DictReq; import top.charles7c.continew.admin.system.model.resp.DictDetailResp; import top.charles7c.continew.admin.system.model.resp.DictResp; import top.charles7c.continew.starter.extension.crud.service.BaseService; -import top.charles7c.continew.starter.extension.crud.service.IService; +import top.charles7c.continew.starter.data.mybatis.plus.service.IService; /** * 字典业务接口 diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/FileService.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/FileService.java index 3d6ebfd6..10b1c06c 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/FileService.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/FileService.java @@ -22,8 +22,8 @@ import top.charles7c.continew.admin.system.model.entity.FileDO; import top.charles7c.continew.admin.system.model.query.FileQuery; import top.charles7c.continew.admin.system.model.req.FileReq; import top.charles7c.continew.admin.system.model.resp.FileResp; +import top.charles7c.continew.starter.data.mybatis.plus.service.IService; import top.charles7c.continew.starter.extension.crud.service.BaseService; -import top.charles7c.continew.starter.extension.crud.service.IService; import java.util.List; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/MenuService.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/MenuService.java index a54f36d5..8f54c2fc 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/MenuService.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/MenuService.java @@ -21,7 +21,7 @@ import top.charles7c.continew.admin.system.model.query.MenuQuery; import top.charles7c.continew.admin.system.model.req.MenuReq; import top.charles7c.continew.admin.system.model.resp.MenuResp; import top.charles7c.continew.starter.extension.crud.service.BaseService; -import top.charles7c.continew.starter.extension.crud.service.IService; +import top.charles7c.continew.starter.data.mybatis.plus.service.IService; import java.util.List; import java.util.Set; @@ -34,6 +34,13 @@ import java.util.Set; */ public interface MenuService extends BaseService, IService { + /** + * 查询全部菜单 + * + * @return 菜单列表 + */ + List listAll(); + /** * 根据用户 ID 查询 * diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/RoleService.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/RoleService.java index c8e69bcf..69ece577 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/RoleService.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/RoleService.java @@ -24,7 +24,7 @@ import top.charles7c.continew.admin.system.model.req.RoleReq; import top.charles7c.continew.admin.system.model.resp.RoleDetailResp; import top.charles7c.continew.admin.system.model.resp.RoleResp; import top.charles7c.continew.starter.extension.crud.service.BaseService; -import top.charles7c.continew.starter.extension.crud.service.IService; +import top.charles7c.continew.starter.data.mybatis.plus.service.IService; import java.util.List; import java.util.Set; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/StorageService.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/StorageService.java index 4b33fd82..ce531882 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/StorageService.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/StorageService.java @@ -22,7 +22,7 @@ import top.charles7c.continew.admin.system.model.req.StorageReq; import top.charles7c.continew.admin.system.model.resp.StorageDetailResp; import top.charles7c.continew.admin.system.model.resp.StorageResp; import top.charles7c.continew.starter.extension.crud.service.BaseService; -import top.charles7c.continew.starter.extension.crud.service.IService; +import top.charles7c.continew.starter.data.mybatis.plus.service.IService; /** * 存储库业务接口 diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/UserService.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/UserService.java index cf90ef3f..32441812 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/UserService.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/UserService.java @@ -26,7 +26,7 @@ import top.charles7c.continew.admin.system.model.req.UserRoleUpdateReq; import top.charles7c.continew.admin.system.model.resp.UserDetailResp; import top.charles7c.continew.admin.system.model.resp.UserResp; import top.charles7c.continew.starter.extension.crud.service.BaseService; -import top.charles7c.continew.starter.extension.crud.service.IService; +import top.charles7c.continew.starter.data.mybatis.plus.service.IService; import java.util.List; diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/MenuServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/MenuServiceImpl.java index c6461962..19b20f40 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/MenuServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/MenuServiceImpl.java @@ -71,6 +71,12 @@ public class MenuServiceImpl extends BaseServiceImpl listAll() { + return super.list(new MenuQuery(DisEnableStatusEnum.ENABLE.getValue()), null); + } + @Override public Set listPermissionByUserId(Long userId) { return baseMapper.selectPermissionByUserId(userId); @@ -85,14 +91,6 @@ public class MenuServiceImpl extends BaseServiceImpl list() { - MenuQuery menuQuery = new MenuQuery(); - menuQuery.setStatus(DisEnableStatusEnum.ENABLE.getValue()); - return super.list(menuQuery, null); - } - /** * 名称是否存在 * diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/RoleServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/RoleServiceImpl.java index 65dbadb7..4d277b66 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/RoleServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/RoleServiceImpl.java @@ -132,7 +132,7 @@ public class RoleServiceImpl extends BaseServiceImpl list = menuService.list(null, null); + List list = menuService.listAll(); List menuIds = list.stream().map(MenuResp::getId).toList(); detail.setMenuIds(menuIds); } else { diff --git a/continew-admin-webapi/src/main/resources/banner.txt b/continew-admin-webapi/src/main/resources/banner.txt index 67fe6565..92e1b105 100644 --- a/continew-admin-webapi/src/main/resources/banner.txt +++ b/continew-admin-webapi/src/main/resources/banner.txt @@ -5,5 +5,5 @@ \____|\___/ |_| |_| \__||_||_| \_| \___| \_/\_/ /_/ \_\\__,_||_| |_| |_||_||_| |_| :: ${project.name} :: v${project.version} - :: ContiNew Starter :: v1.4.1-SNAPSHOT + :: ContiNew Starter :: v1.5.0-SNAPSHOT :: Spring Boot :: v${spring-boot.version} diff --git a/pom.xml b/pom.xml index 121bbb7f..e94156e2 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ top.charles7c.continew continew-starter - 1.4.1-SNAPSHOT + 1.5.0-SNAPSHOT top.charles7c.continew