diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/mybatis/DataPermissionHandlerImpl.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/mybatis/DataPermissionHandlerImpl.java index 21c43137..658a72f7 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/mybatis/DataPermissionHandlerImpl.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/mybatis/DataPermissionHandlerImpl.java @@ -32,7 +32,10 @@ import top.charles7c.cnadmin.common.model.dto.LoginUser; import top.charles7c.cnadmin.common.model.dto.RoleDTO; import top.charles7c.cnadmin.common.util.helper.LoginHelper; -import net.sf.jsqlparser.expression.*; +import net.sf.jsqlparser.expression.Expression; +import net.sf.jsqlparser.expression.Function; +import net.sf.jsqlparser.expression.LongValue; +import net.sf.jsqlparser.expression.Parenthesis; import net.sf.jsqlparser.expression.operators.conditional.AndExpression; import net.sf.jsqlparser.expression.operators.conditional.OrExpression; import net.sf.jsqlparser.expression.operators.relational.EqualsTo; @@ -45,7 +48,7 @@ import net.sf.jsqlparser.statement.select.SelectExpressionItem; import net.sf.jsqlparser.statement.select.SubSelect; /** - * 数据权限处理器实现类 + * 数据权限处理器实现 *
diff --git a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/service/impl/LogServiceImpl.java b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/service/impl/LogServiceImpl.java index 17f21b57..468d822a 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/service/impl/LogServiceImpl.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/service/impl/LogServiceImpl.java @@ -49,7 +49,7 @@ import top.charles7c.cnadmin.monitor.model.vo.*; import top.charles7c.cnadmin.monitor.service.LogService; /** - * 系统日志业务实现类 + * 系统日志业务实现 * * @author Charles7c * @since 2022/12/23 20:12 diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/service/impl/LoginServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/service/impl/LoginServiceImpl.java index ff7ddf25..170b51ee 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/service/impl/LoginServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/service/impl/LoginServiceImpl.java @@ -53,7 +53,7 @@ import top.charles7c.cnadmin.system.service.RoleService; import top.charles7c.cnadmin.system.service.UserService; /** - * 登录业务实现类 + * 登录业务实现 * * @author Charles7c * @since 2022/12/21 21:49 diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/service/impl/OnlineUserServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/service/impl/OnlineUserServiceImpl.java index 81fb068a..a9baf00b 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/service/impl/OnlineUserServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/service/impl/OnlineUserServiceImpl.java @@ -41,7 +41,7 @@ import top.charles7c.cnadmin.common.model.vo.PageDataVO; import top.charles7c.cnadmin.common.util.helper.LoginHelper; /** - * 在线用户业务实现类 + * 在线用户业务实现 * * @author Charles7c * @author Lion Li(RuoYi-Vue-Plus) diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/service/impl/PermissionServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/service/impl/PermissionServiceImpl.java index daafa551..18d14041 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/service/impl/PermissionServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/service/impl/PermissionServiceImpl.java @@ -30,7 +30,7 @@ import top.charles7c.cnadmin.system.service.MenuService; import top.charles7c.cnadmin.system.service.RoleService; /** - * 权限业务实现类 + * 权限业务实现 * * @author Charles7c * @since 2023/3/2 20:40 diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/DeptServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/DeptServiceImpl.java index 5dd381f7..f2635abe 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/DeptServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/DeptServiceImpl.java @@ -48,7 +48,7 @@ import top.charles7c.cnadmin.system.service.RoleDeptService; import top.charles7c.cnadmin.system.service.UserService; /** - * 部门业务实现类 + * 部门业务实现 * * @author Charles7c * @since 2023/1/22 17:55 diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/MenuServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/MenuServiceImpl.java index f42788cf..49e8eacf 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/MenuServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/MenuServiceImpl.java @@ -36,7 +36,7 @@ import top.charles7c.cnadmin.system.model.vo.MenuVO; import top.charles7c.cnadmin.system.service.MenuService; /** - * 菜单业务实现类 + * 菜单业务实现 * * @author Charles7c * @since 2023/2/15 20:30 diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/RoleDeptServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/RoleDeptServiceImpl.java index ca4ad4c9..31ff3b8b 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/RoleDeptServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/RoleDeptServiceImpl.java @@ -31,7 +31,7 @@ import top.charles7c.cnadmin.system.model.entity.RoleDeptDO; import top.charles7c.cnadmin.system.service.RoleDeptService; /** - * 角色和部门业务实现类 + * 角色和部门业务实现 * * @author Charles7c * @since 2023/2/19 10:47 diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/RoleMenuServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/RoleMenuServiceImpl.java index 6fabaf6c..afaabb89 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/RoleMenuServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/RoleMenuServiceImpl.java @@ -32,7 +32,7 @@ import top.charles7c.cnadmin.system.model.entity.RoleMenuDO; import top.charles7c.cnadmin.system.service.RoleMenuService; /** - * 角色和菜单业务实现类 + * 角色和菜单业务实现 * * @author Charles7c * @since 2023/2/19 10:43 diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/RoleServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/RoleServiceImpl.java index 2ee157d3..f69ddce3 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/RoleServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/RoleServiceImpl.java @@ -47,7 +47,7 @@ import top.charles7c.cnadmin.system.model.vo.RoleVO; import top.charles7c.cnadmin.system.service.*; /** - * 角色业务实现类 + * 角色业务实现 * * @author Charles7c * @since 2023/2/8 23:17 diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/UserRoleServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/UserRoleServiceImpl.java index 7e5c6576..89620b3a 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/UserRoleServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/UserRoleServiceImpl.java @@ -31,7 +31,7 @@ import top.charles7c.cnadmin.system.model.entity.UserRoleDO; import top.charles7c.cnadmin.system.service.UserRoleService; /** - * 用户和角色业务实现类 + * 用户和角色业务实现 * * @author Charles7c * @since 2023/2/20 21:30 diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/UserServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/UserServiceImpl.java index 5dff7b6a..cedf71fc 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/UserServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/UserServiceImpl.java @@ -63,7 +63,7 @@ import top.charles7c.cnadmin.system.service.UserRoleService; import top.charles7c.cnadmin.system.service.UserService; /** - * 用户业务实现类 + * 用户业务实现 * * @author Charles7c * @since 2022/12/21 21:49 diff --git a/continew-admin-webapi/src/main/resources/application-prod.yml b/continew-admin-webapi/src/main/resources/application-prod.yml index 55ffc391..c0aa5884 100644 --- a/continew-admin-webapi/src/main/resources/application-prod.yml +++ b/continew-admin-webapi/src/main/resources/application-prod.yml @@ -128,6 +128,10 @@ rsa: springdoc: swagger-ui: enabled: false +## 接口文档增强配置 +knife4j: + # 开启生产环境屏蔽 + production: true --- ### 文件上传配置 spring.servlet: diff --git a/continew-admin-webapi/src/main/resources/db/changelog/v1.0.0/continew-admin_table.sql b/continew-admin-webapi/src/main/resources/db/changelog/v1.0.0/continew-admin_table.sql index 6d1ab7de..90e631ce 100644 --- a/continew-admin-webapi/src/main/resources/db/changelog/v1.0.0/continew-admin_table.sql +++ b/continew-admin-webapi/src/main/resources/db/changelog/v1.0.0/continew-admin_table.sql @@ -3,11 +3,11 @@ -- changeset Charles7c:1 CREATE TABLE IF NOT EXISTS `sys_menu` ( `id` bigint(20) UNSIGNED AUTO_INCREMENT COMMENT 'ID', - `title` varchar(255) NOT NULL COMMENT '菜单标题', + `title` varchar(50) NOT NULL COMMENT '菜单标题', `parent_id` bigint(20) UNSIGNED DEFAULT 0 COMMENT '上级菜单ID', `type` tinyint(1) UNSIGNED DEFAULT 1 COMMENT '菜单类型(1:目录,2:菜单,3:按钮)', `path` varchar(512) DEFAULT NULL COMMENT '路由地址', - `name` varchar(255) DEFAULT NULL COMMENT '组件名称', + `name` varchar(50) DEFAULT NULL COMMENT '组件名称', `component` varchar(255) DEFAULT NULL COMMENT '组件路径', `icon` varchar(255) DEFAULT NULL COMMENT '菜单图标', `is_external` bit(1) DEFAULT b'0' COMMENT '是否外链', @@ -28,7 +28,7 @@ CREATE TABLE IF NOT EXISTS `sys_menu` ( CREATE TABLE IF NOT EXISTS `sys_dept` ( `id` bigint(20) UNSIGNED AUTO_INCREMENT COMMENT 'ID', - `name` varchar(255) NOT NULL COMMENT '部门名称', + `name` varchar(50) NOT NULL COMMENT '部门名称', `parent_id` bigint(20) UNSIGNED DEFAULT 0 COMMENT '上级部门ID', `ancestors` varchar(512) DEFAULT '' COMMENT '祖级列表', `description` varchar(512) DEFAULT NULL COMMENT '描述', @@ -47,8 +47,8 @@ CREATE TABLE IF NOT EXISTS `sys_dept` ( CREATE TABLE IF NOT EXISTS `sys_role` ( `id` bigint(20) UNSIGNED AUTO_INCREMENT COMMENT 'ID', - `name` varchar(255) NOT NULL COMMENT '角色名称', - `code` varchar(255) NOT NULL COMMENT '角色编码', + `name` varchar(50) NOT NULL COMMENT '角色名称', + `code` varchar(50) NOT NULL COMMENT '角色编码', `data_scope` tinyint(1) DEFAULT 4 COMMENT '数据权限(1:全部数据权限,2:本部门及以下数据权限,3:本部门数据权限,4:仅本人数据权限,5:自定义数据权限)', `description` varchar(512) DEFAULT NULL COMMENT '描述', `sort` int(11) UNSIGNED DEFAULT 999 COMMENT '角色排序', @@ -77,12 +77,12 @@ CREATE TABLE IF NOT EXISTS `sys_role_dept` ( CREATE TABLE IF NOT EXISTS `sys_user` ( `id` bigint(20) UNSIGNED AUTO_INCREMENT COMMENT 'ID', - `username` varchar(255) NOT NULL COMMENT '用户名', - `nickname` varchar(255) DEFAULT NULL COMMENT '昵称', + `username` varchar(50) NOT NULL COMMENT '用户名', + `nickname` varchar(50) DEFAULT NULL COMMENT '昵称', `password` varchar(255) DEFAULT NULL COMMENT '密码', `gender` tinyint(1) UNSIGNED DEFAULT 0 COMMENT '性别(0:未知,1:男,2:女)', - `email` varchar(255) DEFAULT NULL COMMENT '邮箱', - `phone` varchar(255) DEFAULT NULL COMMENT '手机号码', + `email` varchar(100) DEFAULT NULL COMMENT '邮箱', + `phone` varchar(50) DEFAULT NULL COMMENT '手机号码', `avatar` varchar(255) DEFAULT NULL COMMENT '头像地址', `description` varchar(512) DEFAULT NULL COMMENT '描述', `status` tinyint(1) UNSIGNED DEFAULT 1 COMMENT '状态(1:启用,2:禁用)', @@ -110,7 +110,7 @@ CREATE TABLE IF NOT EXISTS `sys_user_role` ( CREATE TABLE IF NOT EXISTS `sys_log` ( `id` bigint(20) UNSIGNED AUTO_INCREMENT COMMENT 'ID', `description` varchar(255) NOT NULL COMMENT '日志描述', - `module` varchar(255) NOT NULL COMMENT '所属模块', + `module` varchar(50) NOT NULL COMMENT '所属模块', `request_url` varchar(512) NOT NULL COMMENT '请求URL', `request_method` varchar(10) NOT NULL COMMENT '请求方式', `request_headers` text DEFAULT NULL COMMENT '请求头', @@ -120,9 +120,9 @@ CREATE TABLE IF NOT EXISTS `sys_log` ( `response_body` mediumtext DEFAULT NULL COMMENT '响应体', `elapsed_time` bigint(20) UNSIGNED NOT NULL COMMENT '请求耗时(ms)', `status` tinyint(1) UNSIGNED DEFAULT 1 COMMENT '操作状态(1:成功,2:失败)', - `client_ip` varchar(255) DEFAULT NULL COMMENT '客户端IP', - `location` varchar(512) DEFAULT NULL COMMENT 'IP归属地', - `browser` varchar(255) DEFAULT NULL COMMENT '浏览器', + `client_ip` varchar(100) DEFAULT NULL COMMENT '客户端IP', + `location` varchar(255) DEFAULT NULL COMMENT 'IP归属地', + `browser` varchar(100) DEFAULT NULL COMMENT '浏览器', `error_msg` text DEFAULT NULL COMMENT '错误信息', `exception_detail` mediumtext DEFAULT NULL COMMENT '异常详情', `create_user` bigint(20) UNSIGNED DEFAULT NULL COMMENT '创建人',