From 9f40ce1f312b9908f81354d0b27cd91d6b878032 Mon Sep 17 00:00:00 2001 From: FallingCliff <8513575+yuluo688@user.noreply.gitee.com> Date: Mon, 16 Jun 2025 13:14:34 +0800 Subject: [PATCH] =?UTF-8?q?feat(admin-server):=20=E5=B0=86=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=91=98=E8=B6=85=E7=BA=A7=E7=AE=A1=E7=90=86=E5=91=98?= =?UTF-8?q?=E6=A0=87=E8=AF=86=E6=94=B9=E9=80=A0=E4=B8=BA=E8=A7=92=E8=89=B2?= =?UTF-8?q?ID=E5=AD=97=E6=AE=B5=EF=BC=8C=E6=9B=B4=E6=96=B0=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E5=AD=97=E6=AE=B5=E6=98=A0=E5=B0=84=E5=8F=8A=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E8=A1=A8=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/AdminAuthController.java | 6 ++---- .../admin_server/model/query/RoleQuery.java | 17 ----------------- .../example/admin_server/model/vo/AdminVO.java | 4 ++-- src/main/resources/db/init.sql | 4 ++-- src/main/resources/mapper/AdminMapper.xml | 2 +- 5 files changed, 7 insertions(+), 26 deletions(-) delete mode 100644 src/main/java/com/example/admin_server/model/query/RoleQuery.java diff --git a/src/main/java/com/example/admin_server/controller/admin/AdminAuthController.java b/src/main/java/com/example/admin_server/controller/admin/AdminAuthController.java index 8a6cd4c..b7aadf2 100644 --- a/src/main/java/com/example/admin_server/controller/admin/AdminAuthController.java +++ b/src/main/java/com/example/admin_server/controller/admin/AdminAuthController.java @@ -55,7 +55,7 @@ public class AdminAuthController { Map claims = new HashMap<>(); claims.put("id", admin.getId()); claims.put("username", admin.getUsername()); - claims.put("isSuper", admin.getIsSuper()); + claims.put("role_id", admin.getRoleId()); // Token 与 RefreshToken return getResult(claims); @@ -107,14 +107,12 @@ public class AdminAuthController { // 获取 Token 与 RefreshToken - private Result getResult(Map data) { + private Result> getResult(Map data) { String newToken = jwtUtil.generateToken(data); String newRefreshToken = jwtUtil.generateRefreshToken(data); - Map tokenMap = new HashMap<>(); tokenMap.put("token", newToken); tokenMap.put("refreshToken", newRefreshToken); - return Result.ok(tokenMap); } diff --git a/src/main/java/com/example/admin_server/model/query/RoleQuery.java b/src/main/java/com/example/admin_server/model/query/RoleQuery.java deleted file mode 100644 index eada10a..0000000 --- a/src/main/java/com/example/admin_server/model/query/RoleQuery.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.example.admin_server.model.query; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class RoleQuery { - @ApiModelProperty("页码") - private Integer pageNum = 1; - - @ApiModelProperty("每页数量") - private Integer pageSize = 10; - - @ApiModelProperty("角色名称关键词") - private String keyword; -} - diff --git a/src/main/java/com/example/admin_server/model/vo/AdminVO.java b/src/main/java/com/example/admin_server/model/vo/AdminVO.java index 2028242..ee99500 100644 --- a/src/main/java/com/example/admin_server/model/vo/AdminVO.java +++ b/src/main/java/com/example/admin_server/model/vo/AdminVO.java @@ -47,8 +47,8 @@ public class AdminVO implements Serializable { private Integer status; @ApiModelProperty(value = "是否为超级管理员：1是，0否") - @TableField("is_super") - private Integer isSuper; + @TableField("role_id") + private Integer roleId; @ApiModelProperty(value = "上次登录IP") @TableField("last_login_ip") diff --git a/src/main/resources/db/init.sql b/src/main/resources/db/init.sql index b88700f..061ded8 100644 --- a/src/main/resources/db/init.sql +++ b/src/main/resources/db/init.sql @@ -8,7 +8,7 @@ CREATE TABLE IF NOT EXISTS `admin` ( `phone` varchar(20) DEFAULT NULL COMMENT '手机号', `avatar` varchar(255) DEFAULT NULL COMMENT '头像', `status` tinyint(1) DEFAULT 1 COMMENT '状态：0禁用，1正常', - `roleId` int(11) DEFAULT 0 COMMENT '角色ID', + `role_id` int(11) DEFAULT 0 COMMENT '角色ID', `last_login_ip` varchar(50) DEFAULT NULL COMMENT '上次登录IP', `last_login_time` datetime DEFAULT NULL COMMENT '上次登录时间', `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', @@ -68,6 +68,6 @@ CREATE TABLE IF NOT EXISTS `sys_menu` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='菜单表'; -- 初始化超级管理员账号 -INSERT INTO `admin` (`username`, `password`, `nickname`, `is_super`, `status`) +INSERT INTO `admin` (`username`, `password`, `nickname`, `role_id`, `status`) VALUES ('admin', 'e10adc3949ba59abbe56e057f20f883e', '超级管理员', 1, 1) ON DUPLICATE KEY UPDATE `id` = `id`; diff --git a/src/main/resources/mapper/AdminMapper.xml b/src/main/resources/mapper/AdminMapper.xml index 455a81e..d2b988e 100644 --- a/src/main/resources/mapper/AdminMapper.xml +++ b/src/main/resources/mapper/AdminMapper.xml @@ -12,7 +12,7 @@ - +