Merge branch 'dev' into 2.0.x

# Conflicts: # continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/query/SortQuery.java # continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/LoginLogQuery.java # continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/OperationLogQuery.java # continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/SystemLogQuery.java # continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/query/OnlineUserQuery.java # continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/DeptQuery.java # continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/MenuQuery.java # continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/RoleQuery.java # continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/UserQuery.java
2025-10-31 00:57:13 +08:00 · 2023-04-13 22:36:57 +08:00
parent 0f2f35d608 b1c0ac1998
commit 3738fa4872
29 changed files with 53 additions and 80 deletions
--- a/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/common/CommonController.java
+++ b/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/common/CommonController.java
@@ -71,21 +71,21 @@ public class CommonController {

    @Operation(summary = "查询部门树", description = "查询树结构的部门列表")
    @GetMapping("/tree/dept")
-    public R<List<Tree<Long>>> listDeptTree(@Validated DeptQuery query, @Validated SortQuery sortQuery) {
+    public R<List<Tree<Long>>> listDeptTree(DeptQuery query, SortQuery sortQuery) {
        List<Tree<Long>> treeList = deptService.tree(query, sortQuery, true);
        return R.ok(treeList);
    }

    @Operation(summary = "查询菜单树", description = "查询树结构的菜单列表")
    @GetMapping("/tree/menu")
-    public R<List<Tree<Long>>> listMenuTree(@Validated MenuQuery query, @Validated SortQuery sortQuery) {
+    public R<List<Tree<Long>>> listMenuTree(MenuQuery query, SortQuery sortQuery) {
        List<Tree<Long>> treeList = menuService.tree(query, sortQuery, true);
        return R.ok(treeList);
    }

    @Operation(summary = "查询角色字典", description = "查询角色字典列表")
    @GetMapping("/dict/role")
-    public R<List<LabelValueVO<Long>>> listRoleDict(@Validated RoleQuery query, @Validated SortQuery sortQuery) {
+    public R<List<LabelValueVO<Long>>> listRoleDict(RoleQuery query, SortQuery sortQuery) {
        List<RoleVO> list = roleService.list(query, sortQuery);
        List<LabelValueVO<Long>> labelValueVOList = roleService.buildDict(list);
        return R.ok(labelValueVOList);
--- a/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/monitor/LogController.java
+++ b/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/monitor/LogController.java
@@ -57,7 +57,7 @@ public class LogController {
    @Log(module = "登录日志")
    @Operation(summary = "分页查询登录日志列表")
    @GetMapping("/login")
-    public R<PageDataVO<LoginLogVO>> page(@Validated LoginLogQuery query, @Validated PageQuery pageQuery) {
+    public R<PageDataVO<LoginLogVO>> page(LoginLogQuery query, @Validated PageQuery pageQuery) {
        PageDataVO<LoginLogVO> pageDataVO = logService.page(query, pageQuery);
        return R.ok(pageDataVO);
    }
@@ -65,7 +65,7 @@ public class LogController {
    @Log(module = "操作日志")
    @Operation(summary = "分页查询操作日志列表")
    @GetMapping("/operation")
-    public R<PageDataVO<OperationLogVO>> page(@Validated OperationLogQuery query, @Validated PageQuery pageQuery) {
+    public R<PageDataVO<OperationLogVO>> page(OperationLogQuery query, @Validated PageQuery pageQuery) {
        PageDataVO<OperationLogVO> pageDataVO = logService.page(query, pageQuery);
        return R.ok(pageDataVO);
    }
@@ -73,7 +73,7 @@ public class LogController {
    @Log(module = "系统日志")
    @Operation(summary = "分页查询系统日志列表")
    @GetMapping("/system")
-    public R<PageDataVO<SystemLogVO>> page(@Validated SystemLogQuery query, @Validated PageQuery pageQuery) {
+    public R<PageDataVO<SystemLogVO>> page(SystemLogQuery query, @Validated PageQuery pageQuery) {
        PageDataVO<SystemLogVO> pageDataVO = logService.page(query, pageQuery);
        return R.ok(pageDataVO);
    }
--- a/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/monitor/OnlineUserController.java
+++ b/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/monitor/OnlineUserController.java
@@ -52,7 +52,7 @@ public class OnlineUserController {
    @Operation(summary = "分页查询列表")
    @SaCheckPermission("monitor:online:user:list")
    @GetMapping
-    public R<PageDataVO<OnlineUserVO>> page(@Validated OnlineUserQuery query, @Validated PageQuery pageQuery) {
+    public R<PageDataVO<OnlineUserVO>> page(OnlineUserQuery query, @Validated PageQuery pageQuery) {
        return R.ok(onlineUserService.page(query, pageQuery));
    }

--- 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:
--- a/continew-admin-webapi/src/main/resources/application.yml
+++ b/continew-admin-webapi/src/main/resources/application.yml
@@ -47,6 +47,9 @@ logging:

 --- ### 接口文档配置
 springdoc:
+  # 设置对象型参数的展示形式（设为 true 表示将对象型参数平展开，即对象内的属性直接作为参数展示而不是嵌套在对象内，默认为 false）
+  # 如果不添加该全局配置，可以在需要如此处理的对象参数类上使用 @ParameterObject
+  default-flat-param-object: true
  swagger-ui:
    path: /swagger-ui.html
    tags-sorter: alpha
--- 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 '创建人',