Browse Source

更新临时脚本;登录信息返回增加用户信息

Gaokun Wang 1 month ago
parent
commit
56c29df67e

+ 1 - 1
eco-common/com-core/src/main/java/org/eco/vip/orm/pojo/LoginUser.java

@@ -91,7 +91,7 @@ public class LoginUser implements Serializable {
     /**
      * 菜单权限
      */
-    private Set<String> PermissionCodes;
+    private Set<String> permissionCodes;
 
     /**
      * 角色权限

+ 2 - 0
eco-nexus-core/auth-biz/src/main/java/org/eco/vip/auth/domain/auth/pojo/AuthVO.java

@@ -37,4 +37,6 @@ public class AuthVO {
      * 授权令牌 access_token 的有效期
      */
     private Long expireIn;
+
+    private Object userInfo;
 }

+ 4 - 1
eco-nexus-core/auth-biz/src/main/java/org/eco/vip/auth/service/auth/PasswordAuthStrategy.java

@@ -57,7 +57,10 @@ public class PasswordAuthStrategy implements IAuthStrategy {
         loginUser.setDeviceType(clientVO.getDeviceType());
         SaLoginParameter loginParameter = createLoginModel(clientVO);
         LoginHelper.login(loginUser, loginParameter);
-        return AuthVO.builder().accessToken(StpUtil.getTokenValue()).expireIn(StpUtil.getTokenTimeout()).build();
+        return AuthVO.builder()
+                .accessToken(StpUtil.getTokenValue())
+                .expireIn(StpUtil.getTokenTimeout())
+                .userInfo(loginUser).build();
     }
 
     private static SaLoginParameter createLoginModel(ClientVO clientVO) {

+ 58 - 1
eco-start/src/main/resources/db/mysql/V1_0_0_1__sys-init-ddl.sql

@@ -11,7 +11,7 @@
  Target Server Version : 80041
  File Encoding         : 65001
 
- Date: 10/07/2025 15:01:40
+ Date: 10/07/2025 16:34:39
 */
 
 SET NAMES utf8mb4;
@@ -43,6 +43,13 @@ CREATE TABLE `system_client_t`
     PRIMARY KEY (`client_id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '系统客户端授权表' ROW_FORMAT = DYNAMIC;
 
+-- ----------------------------
+-- Records of system_client_t
+-- ----------------------------
+INSERT INTO `system_client_t`
+VALUES ('71718796894000126', '7daa6e9b-8876-4918-8a12-b68cbfcdc680', 'pc', 'eco-pc2025', 'password', 'pc', 1800, 604800,
+        '1', '1', 0, '0', '1', '2025-07-10 14:55:10', '1', '2025-07-10 14:55:06', NULL);
+
 -- ----------------------------
 -- Table structure for system_menu_t
 -- ----------------------------
@@ -77,6 +84,10 @@ CREATE TABLE `system_menu_t`
     PRIMARY KEY (`menu_id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '菜单' ROW_FORMAT = DYNAMIC;
 
+-- ----------------------------
+-- Records of system_menu_t
+-- ----------------------------
+
 -- ----------------------------
 -- Table structure for system_org_t
 -- ----------------------------
@@ -104,6 +115,10 @@ CREATE TABLE `system_org_t`
     PRIMARY KEY (`org_id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '部门表' ROW_FORMAT = DYNAMIC;
 
+-- ----------------------------
+-- Records of system_org_t
+-- ----------------------------
+
 -- ----------------------------
 -- Table structure for system_permission_t
 -- ----------------------------
@@ -116,6 +131,20 @@ CREATE TABLE `system_permission_t`
     PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '权限点' ROW_FORMAT = DYNAMIC;
 
+-- ----------------------------
+-- Records of system_permission_t
+-- ----------------------------
+INSERT INTO `system_permission_t`
+VALUES ('71723107285000103', '客户端', 'system:client:page');
+INSERT INTO `system_permission_t`
+VALUES ('71723107289000127', 'menu', 'system:menu:delete');
+INSERT INTO `system_permission_t`
+VALUES ('71723107290000120', 'org', 'system:org:add');
+INSERT INTO `system_permission_t`
+VALUES ('71723107290010171', 'org', 'system:org:delete');
+INSERT INTO `system_permission_t`
+VALUES ('71723107290020171', 'position', 'system:position:add');
+
 -- ----------------------------
 -- Table structure for system_position_t
 -- ----------------------------
@@ -140,6 +169,10 @@ CREATE TABLE `system_position_t`
     PRIMARY KEY (`position_id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '职位' ROW_FORMAT = DYNAMIC;
 
+-- ----------------------------
+-- Records of system_position_t
+-- ----------------------------
+
 -- ----------------------------
 -- Table structure for system_role_menu_t
 -- ----------------------------
@@ -151,6 +184,10 @@ CREATE TABLE `system_role_menu_t`
     PRIMARY KEY (`role_id`, `menu_id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '角色菜单' ROW_FORMAT = DYNAMIC;
 
+-- ----------------------------
+-- Records of system_role_menu_t
+-- ----------------------------
+
 -- ----------------------------
 -- Table structure for system_role_perm_t
 -- ----------------------------
@@ -162,6 +199,10 @@ CREATE TABLE `system_role_perm_t`
     PRIMARY KEY (`role_id`, `perm_id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '角色权限关系' ROW_FORMAT = DYNAMIC;
 
+-- ----------------------------
+-- Records of system_role_perm_t
+-- ----------------------------
+
 -- ----------------------------
 -- Table structure for system_role_t
 -- ----------------------------
@@ -186,6 +227,10 @@ CREATE TABLE `system_role_t`
     PRIMARY KEY (`role_id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '角色表' ROW_FORMAT = DYNAMIC;
 
+-- ----------------------------
+-- Records of system_role_t
+-- ----------------------------
+
 -- ----------------------------
 -- Table structure for system_user_role_t
 -- ----------------------------
@@ -197,6 +242,10 @@ CREATE TABLE `system_user_role_t`
     PRIMARY KEY (`user_id`, `role_id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '用户角色关系' ROW_FORMAT = DYNAMIC;
 
+-- ----------------------------
+-- Records of system_user_role_t
+-- ----------------------------
+
 -- ----------------------------
 -- Table structure for system_user_t
 -- ----------------------------
@@ -228,4 +277,12 @@ CREATE TABLE `system_user_t`
     PRIMARY KEY (`user_id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '用户信息表' ROW_FORMAT = DYNAMIC;
 
+-- ----------------------------
+-- Records of system_user_t
+-- ----------------------------
+INSERT INTO `system_user_t`
+VALUES ('1', '', 'superadmin', '超级管理员', 'eco', 'pc_user', NULL, NULL, NULL, NULL,
+        '$2a$10$0dvrBO4B.yyfbLsO3OcDUOaaRf8XklJG6Tyn.6fh907KtxBpzvwo6', NULL, NULL, '1', NULL, 0, '0', '1',
+        '2025-07-10 14:55:25', '1', '2025-07-10 14:55:21', NULL);
+
 SET FOREIGN_KEY_CHECKS = 1;

+ 0 - 39
eco-start/src/main/resources/db/mysql/V1_0_0_2__sys-init-dml.sql

@@ -1,39 +0,0 @@
-SET NAMES utf8mb4;
-SET FOREIGN_KEY_CHECKS = 0;
--- ----------------------------
--- Records of system_client_t
--- ----------------------------
-INSERT INTO `system_client_t`
-VALUES ('71718796894000126', '7daa6e9b-8876-4918-8a12-b68cbfcdc680', 'pc', 'eco-pc2025', 'password', 'pc', 1800, 604800,
-        '1', '1', 0, '0', '71718736906000181', '2025-07-10 14:55:10', '71718736906000181', '2025-07-10 14:55:06',
-        NULL);
-
--- ----------------------------
--- Records of system_org_t
--- ----------------------------
-INSERT INTO `system_org_t`
-VALUES ('7171879626000111', '0', '组织', 'NOB43dT6FB', NULL, 0, NULL, '00000000000', NULL, '1', NULL, 0, '0', NULL,
-        '2025-07-10 14:58:02', '71718736906000181', '2025-07-10 14:58:00', '71718736906000181');
-
--- ----------------------------
--- Records of system_role_t
--- ----------------------------
-INSERT INTO `system_role_t`
-VALUES ('71718940729000127', '7171879626000111', '超级管理员', 'superAdminRole', 'GLOBAL', 0, '1', '1', 0, '0',
-        '71718736906000181', '2025-07-10 14:56:51', '71718736906000181', '2025-07-10 14:56:54', NULL);
-
--- ----------------------------
--- Records of system_user_role_t
--- ----------------------------
-INSERT INTO `system_user_role_t`
-VALUES ('71718736906000181', '71718940729000127');
-
--- ----------------------------
--- Records of system_user_t
--- ----------------------------
-INSERT INTO `system_user_t`
-VALUES ('71718736906000181', '7171879626000111', 'superadmin', '超级管理员', 'eco', 'pc_user', NULL, NULL, NULL, NULL,
-        '$2a$10$0dvrBO4B.yyfbLsO3OcDUOaaRf8XklJG6Tyn.6fh907KtxBpzvwo6', NULL, NULL, '1', NULL, 0, '0',
-        '71718736906000181', '2025-07-10 14:55:25', '71718736906000181', '2025-07-10 14:55:21', NULL);
-
-SET FOREIGN_KEY_CHECKS = 1;