修改脚本

eco-common/com-core/src/main/java/org/eco/vip/orm/utils/IdUtils.java

@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2025 GaoKunW
+ *
+ */
+
+package org.eco.vip.orm.utils;
+
+
+import cn.hutool.core.util.IdUtil;
+
+/**
+ * @description IdUtils
+ *
+ * @author GaoKunW
+ * @date 2025/7/10 14:46
+ */
+public class IdUtils extends IdUtil {
+}

eco-nexus-core/auth-biz/src/main/java/org/eco/vip/auth/controller/auth/AuthController.java

@@ -59,7 +59,7 @@ public class AuthController {
         }
         String clientId = authQueryBody.getClientId();
         String grantType = authQueryBody.getGrantType();
-        ClientVO clientVO = clientService.selectById(clientId);
+        ClientVO clientVO = clientService.selectByClientId(clientId);
         if (ObjUtils.isNull(clientVO) || !StrUtils.contains(clientVO.getGrantType(), grantType)) {
             log.info("客户端id: {} 认证类型：{} 异常!.", clientId, grantType);
             return fail("客户端id: {} 认证类型：{} 异常!.", clientId, grantType);

eco-nexus-core/auth-biz/src/main/java/org/eco/vip/auth/domain/auth/pojo/AuthQuery.java

@@ -34,14 +34,10 @@ public class AuthQuery {
      */
     @NotBlank(message = "密码不能为空")
     private String password;
-    /**
-     * 设备
-     */
-    private String device;
+
     /**
      * 验证码
      */
-    @NotBlank(message = "验证码不能为空")
     private String captcha;
 
     /**
@@ -53,15 +49,12 @@ public class AuthQuery {
     /**
      * 授权类型
      */
+    @NotBlank(message = "授权类型不能为空")
     private String grantType;
 
     /**
      * 租户ID
      */
+    @NotBlank(message = "租户ID不能为空")
     private String tenantId;
-
-    /**
-     * 验证码
-     */
-    private String code;
 }

eco-nexus-core/auth-biz/src/main/java/org/eco/vip/auth/domain/client/Client.java

@@ -27,6 +27,11 @@ public class Client extends BaseEntity {
      * 唯一标识
      */
     @Id
+    private String id;
+
+    /**
+     * 客户端ID
+     */
     private String clientId;
 
     /**

eco-nexus-core/auth-biz/src/main/java/org/eco/vip/auth/domain/client/pojo/ClientBO.java

@@ -23,6 +23,11 @@ import org.eco.vip.orm.domain.BaseBO;
 @AutoMapper(target = Client.class, reverseConvertGenerate = false)
 public class ClientBO extends BaseBO {
 
+    /**
+     * 客户端ID
+     */
+    private String clientId;
+
     /**
      * 客户端key
      */

eco-nexus-core/auth-biz/src/main/java/org/eco/vip/auth/domain/client/pojo/ClientVO.java

@@ -28,7 +28,11 @@ public class ClientVO extends BaseEntity {
     /**
      * 唯一标识
      */
-    @Id
+    private String id;
+
+    /**
+     * 客户端ID
+     */
     private String clientId;
 
     /**

eco-nexus-core/auth-biz/src/main/java/org/eco/vip/auth/service/client/ClientService.java

@@ -17,6 +17,7 @@ import org.eco.vip.auth.mapper.ClientMapper;
 import org.eco.vip.orm.domain.PageQuery;
 import org.eco.vip.orm.pojo.PageResult;
 import org.eco.vip.orm.service.BaseService;
+import org.eco.vip.orm.utils.IdUtils;
 import org.eco.vip.orm.utils.MapstructUtils;
 import org.springframework.stereotype.Service;
 
@@ -61,6 +62,7 @@ public class ClientService extends BaseService<ClientMapper, Client> implements
 
     @Override
     public boolean insert(ClientBO clientBO) {
+        clientBO.setClientId(IdUtils.fastUUID());
         Client client = MapstructUtils.convert(clientBO, Client.class);
         return this.save(client);
     }
@@ -77,7 +79,7 @@ public class ClientService extends BaseService<ClientMapper, Client> implements
     }
 
     @Override
-    public ClientVO selectById(String id) {
-        return clientMapper.selectOneWithRelationsByIdAs(id, ClientVO.class);
+    public ClientVO selectByClientId(String id) {
+        return clientMapper.selectOneWithRelationsByQueryAs(QueryWrapper.create().eq("client_id", id), ClientVO.class);
     }
 }

eco-nexus-core/auth-biz/src/main/java/org/eco/vip/auth/service/client/IClientService.java

@@ -63,5 +63,5 @@ public interface IClientService extends IBaseService<Client> {
      * @param id ID
      * @return 结果
      */
-    ClientVO selectById(String id);
+    ClientVO selectByClientId(String id);
 }

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

@@ -11,160 +11,38 @@
  Target Server Version : 80041
  File Encoding         : 65001
 
- Date: 02/07/2025 14:19:37
+ Date: 10/07/2025 15:01:40
 */
 
 SET NAMES utf8mb4;
-SET
-FOREIGN_KEY_CHECKS = 0;
+SET FOREIGN_KEY_CHECKS = 0;
 
 -- ----------------------------
--- Table structure for system_org_t
--- ----------------------------
-DROP TABLE IF EXISTS `system_org_t`;
-CREATE TABLE `system_org_t`
-(
-    `org_id`    varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '唯一标识',
-    `parent_id` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '父组织ID',
-    `name`      varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '组织名称',
-    `code`      varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '组织编码',
-    `category`  varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '类别',
-    `order_num`   int NULL DEFAULT NULL COMMENT '显示顺序',
-    `leader_id` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '负责人',
-    `phone`     varchar(11) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '联系电话',
-    `email`     varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '邮箱',
-    `tenant_id` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '租户编号',
-    `status`    varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '状态（1正常 0停用）',
-    `version`     int NULL DEFAULT NULL COMMENT '乐观锁',
-    `del_flag`  varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '删除标志（1代表已删除 0代表存在）',
-    `create_by` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建者',
-    `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
-    `update_by` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新者',
-    `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
-    `remark`    varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
-    PRIMARY KEY (`org_id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '部门表' ROW_FORMAT = DYNAMIC;
-
-
-
--- ----------------------------
--- Table structure for system_role_t
--- ----------------------------
-DROP TABLE IF EXISTS `system_role_t`;
-CREATE TABLE `system_role_t`
-(
-    `role_id`     varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-    `org_id`      varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '组织id',
-    `name`        varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '名称',
-    `code`        varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '编码',
-    `category`    varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '分类',
-    `order_num`   int NULL DEFAULT NULL COMMENT '显示顺序',
-    `tenant_id` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '租户编号',
-    `status`    varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '状态（1正常 0停用）',
-    `version`     int NULL DEFAULT NULL COMMENT '乐观锁',
-    `del_flag`  varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '删除标志（1代表已删除 0代表存在）',
-    `create_by` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建者',
-    `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
-    `update_by` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新者',
-    `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
-    `remark`    varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
-    PRIMARY KEY (`role_id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '角色表' ROW_FORMAT = DYNAMIC;
-
-
--- ----------------------------
--- Table structure for system_user_t
--- ----------------------------
-DROP TABLE IF EXISTS `system_user_t`;
-CREATE TABLE `system_user_t`
-(
-    `user_id`      varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '唯一标识',
-    `org_id`       varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '组织ID',
-    `account`      varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '用户账号',
-    `user_name`    varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '用户姓名',
-    `nick_name`    varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '用户昵称',
-    `user_type`    varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '用户类型（system系统用户）',
-    `email`        varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '用户邮箱',
-    `phone_number` varchar(11) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '手机号码',
-    `gender`       varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '用户性别（0男 1女 2未知）',
-    `avatar`       longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '头像地址',
-    `password`     varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '密码',
-    `login_ip`     varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '最后登陆IP',
-    `login_date`   datetime NULL DEFAULT NULL COMMENT '最后登陆时间',
-    `tenant_id`    varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '租户编号',
-    `status`       varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '状态（1正常 0停用）',
-    `version`      int NULL DEFAULT NULL COMMENT '乐观锁',
-    `del_flag`     varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '删除标志（1代表已删除 0代表存在）',
-    `create_by`    varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建者',
-    `create_time`  datetime NULL DEFAULT NULL COMMENT '创建时间',
-    `update_by`    varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新者',
-    `update_time`  datetime NULL DEFAULT NULL COMMENT '更新时间',
-    `remark`       varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
-    PRIMARY KEY (`user_id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '用户信息表' ROW_FORMAT = DYNAMIC;
-
--- ----------------------------
--- Table structure for sys_client
+-- Table structure for system_client_t
 -- ----------------------------
 DROP TABLE IF EXISTS `system_client_t`;
 CREATE TABLE `system_client_t`
 (
-    `client_id`     varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '客户端id',
-    `client_key`    varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户端key',
-    `client_secret` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户端秘钥',
-    `grant_type`    varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT 'password' COMMENT '授权类型',
-    `device_type`   varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '设备类型',
+    `id`             varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci  NOT NULL COMMENT '唯一标识',
+    `client_id`      varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '客户端id',
+    `client_key`     varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户端key',
+    `client_secret`  varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户端秘钥',
+    `grant_type`     varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT 'password' COMMENT '授权类型',
+    `device_type`    varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '设备类型',
     `active_timeout` int NULL DEFAULT 1800 COMMENT 'token活跃超时时间',
     `timeout`        int NULL DEFAULT 604800 COMMENT 'token固定超时',
-    `tenant_id`     varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '租户编号',
-    `status`        varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '状态（1正常 0停用）',
+    `tenant_id`      varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '租户编号',
+    `status`         varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '状态（1正常 0停用）',
     `version`        int NULL DEFAULT NULL COMMENT '乐观锁',
-    `del_flag`      varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '删除标志（1代表已删除 0代表存在）',
-    `create_by`     varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建者',
+    `del_flag`       varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '删除标志（1代表已删除 0代表存在）',
+    `create_by`      varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建者',
     `create_time`    datetime NULL DEFAULT NULL COMMENT '创建时间',
-    `update_by`     varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新者',
+    `update_by`      varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新者',
     `update_time`    datetime NULL DEFAULT NULL COMMENT '更新时间',
-    `remark`        varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
+    `remark`         varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
     PRIMARY KEY (`client_id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '系统客户端授权表' ROW_FORMAT = DYNAMIC;
 
-
--- ----------------------------
--- Table structure for system_permission_t
--- ----------------------------
-DROP TABLE IF EXISTS `system_permission_t`;
-CREATE TABLE `system_permission_t`
-(
-    `id`        varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci  NOT NULL COMMENT '唯一标识',
-    `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '名称',
-    `code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '编码',
-    PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '权限点' ROW_FORMAT = Dynamic;
-
--- ----------------------------
--- Table structure for system_user_org_t
--- ----------------------------
-DROP TABLE IF EXISTS `system_user_role_t`;
-CREATE TABLE `system_user_role_t`
-(
-    `user_id` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '用户ID',
-    `role_id`  varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '角色ID',
-    PRIMARY KEY (`user_id`, `role_id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '用户角色关系' ROW_FORMAT = Dynamic;
-
-
--- ----------------------------
--- Table structure for system_org_perm_t
--- ----------------------------
-DROP TABLE IF EXISTS `system_role_perm_t`;
-CREATE TABLE `system_role_perm_t`
-(
-    `role_id`  varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '组织ID',
-    `perm_id` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '权限id',
-    PRIMARY KEY (`role_id`, `perm_id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '角色权限关系' ROW_FORMAT = Dynamic;
-
-
 -- ----------------------------
 -- Table structure for system_menu_t
 -- ----------------------------
@@ -199,6 +77,44 @@ CREATE TABLE `system_menu_t`
     PRIMARY KEY (`menu_id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '菜单' ROW_FORMAT = DYNAMIC;
 
+-- ----------------------------
+-- Table structure for system_org_t
+-- ----------------------------
+DROP TABLE IF EXISTS `system_org_t`;
+CREATE TABLE `system_org_t`
+(
+    `org_id`      varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '唯一标识',
+    `parent_id`   varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '父组织ID',
+    `name`        varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '组织名称',
+    `code`        varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '组织编码',
+    `category`    varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '类别',
+    `order_num`   int NULL DEFAULT NULL COMMENT '显示顺序',
+    `leader_id`   varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '负责人',
+    `phone`       varchar(11) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '联系电话',
+    `email`       varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '邮箱',
+    `tenant_id`   varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '租户编号',
+    `status`      varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '状态（1正常 0停用）',
+    `version`     int NULL DEFAULT NULL COMMENT '乐观锁',
+    `del_flag`    varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '删除标志（1代表已删除 0代表存在）',
+    `create_by`   varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建者',
+    `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
+    `update_by`   varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新者',
+    `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
+    `remark`      varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
+    PRIMARY KEY (`org_id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '部门表' ROW_FORMAT = DYNAMIC;
+
+-- ----------------------------
+-- Table structure for system_permission_t
+-- ----------------------------
+DROP TABLE IF EXISTS `system_permission_t`;
+CREATE TABLE `system_permission_t`
+(
+    `id`   varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci  NOT NULL COMMENT '唯一标识',
+    `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '名称',
+    `code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '编码',
+    PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '权限点' ROW_FORMAT = DYNAMIC;
 
 -- ----------------------------
 -- Table structure for system_position_t
@@ -233,8 +149,83 @@ CREATE TABLE `system_role_menu_t`
     `role_id` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '角色ID',
     `menu_id` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '菜单ID',
     PRIMARY KEY (`role_id`, `menu_id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '角色菜单' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '角色菜单' ROW_FORMAT = DYNAMIC;
 
+-- ----------------------------
+-- Table structure for system_role_perm_t
+-- ----------------------------
+DROP TABLE IF EXISTS `system_role_perm_t`;
+CREATE TABLE `system_role_perm_t`
+(
+    `role_id` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '组织ID',
+    `perm_id` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '权限id',
+    PRIMARY KEY (`role_id`, `perm_id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '角色权限关系' ROW_FORMAT = DYNAMIC;
+
+-- ----------------------------
+-- Table structure for system_role_t
+-- ----------------------------
+DROP TABLE IF EXISTS `system_role_t`;
+CREATE TABLE `system_role_t`
+(
+    `role_id`     varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+    `org_id`      varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '组织id',
+    `name`        varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '名称',
+    `code`        varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '编码',
+    `category`    varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '分类',
+    `order_num`   int NULL DEFAULT NULL COMMENT '显示顺序',
+    `tenant_id`   varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '租户编号',
+    `status`      varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '状态（1正常 0停用）',
+    `version`     int NULL DEFAULT NULL COMMENT '乐观锁',
+    `del_flag`    varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '删除标志（1代表已删除 0代表存在）',
+    `create_by`   varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建者',
+    `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
+    `update_by`   varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新者',
+    `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
+    `remark`      varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
+    PRIMARY KEY (`role_id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '角色表' ROW_FORMAT = DYNAMIC;
+
+-- ----------------------------
+-- Table structure for system_user_role_t
+-- ----------------------------
+DROP TABLE IF EXISTS `system_user_role_t`;
+CREATE TABLE `system_user_role_t`
+(
+    `user_id` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '用户ID',
+    `role_id` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '角色ID',
+    PRIMARY KEY (`user_id`, `role_id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '用户角色关系' ROW_FORMAT = DYNAMIC;
+
+-- ----------------------------
+-- Table structure for system_user_t
+-- ----------------------------
+DROP TABLE IF EXISTS `system_user_t`;
+CREATE TABLE `system_user_t`
+(
+    `user_id`      varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '唯一标识',
+    `org_id`       varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '组织ID',
+    `account`      varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '用户账号',
+    `user_name`    varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '用户姓名',
+    `nick_name`    varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '用户昵称',
+    `user_type`    varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '用户类型（system系统用户）',
+    `email`        varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '用户邮箱',
+    `phone_number` varchar(11) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '手机号码',
+    `gender`       varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '用户性别（0男 1女 2未知）',
+    `avatar`       longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '头像地址',
+    `password`     varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '密码',
+    `login_ip`     varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '最后登陆IP',
+    `login_date`   datetime NULL DEFAULT NULL COMMENT '最后登陆时间',
+    `tenant_id`    varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '租户编号',
+    `status`       varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '状态（1正常 0停用）',
+    `version`      int NULL DEFAULT NULL COMMENT '乐观锁',
+    `del_flag`     varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '删除标志（1代表已删除 0代表存在）',
+    `create_by`    varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建者',
+    `create_time`  datetime NULL DEFAULT NULL COMMENT '创建时间',
+    `update_by`    varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新者',
+    `update_time`  datetime NULL DEFAULT NULL COMMENT '更新时间',
+    `remark`       varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
+    PRIMARY KEY (`user_id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '用户信息表' ROW_FORMAT = DYNAMIC;
 
-SET
-FOREIGN_KEY_CHECKS = 1;
+SET FOREIGN_KEY_CHECKS = 1;

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

@@ -1,7 +1,39 @@
-insert into system_user_t (user_id, dept_id, account, user_name, nick_name, user_type, email, phone_number, gender, avatar, password, login_ip, login_date, tenant_id, status, version, del_flag, create_by, create_time, update_by, update_time, remark)
-values  ('1', '1', 'superAdmin', '王大明', '超级管理员', 'sys_user', 'eco@eco.com', '15888888888', '1', null, '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0:0:0:0:0:0:0:1', '2024-07-02 18:10:18', '1', '1', 0, '0', '1', '2025-03-10 21:32:28', 1, '2025-03-10 21:32:28', '超级管理员'),
-        ('2', '1', 'admin', '王小明', '管理员', 'sys_user', 'eco@eco.com', '15888888888', '1', null, '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0:0:0:0:0:0:0:1', '2024-07-02 18:10:18', '1', '1', 0, '0', '1', '2025-03-10 21:32:28', 1, '2025-03-10 21:32:28', '管理员');
+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);
 
-insert into system_dept_t (dept_id, parent_id, dept_name, order_num, leader_id, phone, email, tenant_id, status, version, del_flag, create_by, create_time, update_by, update_time)
-values  ('1', '0', '集团', 0, '1', '18888888888', 'ecoadmin@wo.cn', '20', '1', 0, '0', '1', '2025-03-10 21:32:28', '1', '2025-03-10 21:32:28'),
-        ('2', '1', '研发部', 2, '2', '', null, '20', '1', 0, '0', '2', '2025-03-10 21:32:28', '2', '2025-03-10 21:32:28');
+-- ----------------------------
+-- 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;