添加用户角色权限点功能

eco-nexus-core/auth-biz/src/main/java/org/eco/vip/auth/domain/role/RolePerm.java

@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2025 GaoKunW
+ *
+ */
+
+package org.eco.vip.auth.domain.role;
+
+
+import com.mybatisflex.annotation.Table;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @description RolePerm
+ *
+ * @author GaoKunW
+ * @date 2025/7/4 14:12
+ */
+@Data
+@NoArgsConstructor
+@Table(value = "system_role_perm_t")
+public class RolePerm implements Serializable {
+    private String roleId;
+    private String permId;
+}

eco-nexus-core/auth-biz/src/main/java/org/eco/vip/auth/domain/user/UserRole.java

@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2025 GaoKunW
+ *
+ */
+
+package org.eco.vip.auth.domain.user;
+
+
+import com.mybatisflex.annotation.Table;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @description UserRole
+ *
+ * @author GaoKunW
+ * @date 2025/7/4 14:12
+ */
+@Data
+@NoArgsConstructor
+@Table(value = "system_user_role_t")
+public class UserRole implements Serializable {
+
+    private String userId;
+    private String roleId;
+}

eco-nexus-core/auth-biz/src/main/java/org/eco/vip/auth/mapper/RolePermMapper.java

@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2025 GaoKunW
+ *
+ */
+
+package org.eco.vip.auth.mapper;
+
+
+import com.mybatisflex.core.BaseMapper;
+import org.eco.vip.auth.domain.role.RolePerm;
+
+/**
+ * @description RolePermMapper
+ *
+ * @author GaoKunW
+ * @date 2025/7/4 14:27
+ */
+public interface RolePermMapper extends BaseMapper<RolePerm> {
+}

eco-nexus-core/auth-biz/src/main/java/org/eco/vip/auth/mapper/UserRoleMapper.java

@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2025 GaoKunW
+ *
+ */
+
+package org.eco.vip.auth.mapper;
+
+
+import com.mybatisflex.core.BaseMapper;
+import org.eco.vip.auth.domain.user.UserRole;
+
+/**
+ * @description UserRoleMapper
+ *
+ * @author GaoKunW
+ * @date 2025/7/4 14:27
+ */
+public interface UserRoleMapper extends BaseMapper<UserRole> {
+}

eco-nexus-core/auth-biz/src/main/java/org/eco/vip/auth/service/role/IRoleService.java

@@ -7,6 +7,7 @@ package org.eco.vip.auth.service.role;
 
 
 import org.eco.vip.auth.domain.role.Role;
+import org.eco.vip.auth.domain.role.RolePerm;
 import org.eco.vip.auth.domain.role.pojo.RoleBO;
 import org.eco.vip.auth.domain.role.pojo.RoleVO;
 import org.eco.vip.orm.pojo.PageResult;
@@ -42,6 +43,12 @@ public interface IRoleService extends IBaseService<Role> {
      * @return boolean 是否成功
      **/
     boolean insert(RoleBO roleBO);
+    /**
+     * @description: 新增
+     * @param rolePerm 参数
+     * @return boolean 是否成功
+     **/
+    boolean insertPerm(RolePerm rolePerm);
 
     /**
      * @description: 更新

eco-nexus-core/auth-biz/src/main/java/org/eco/vip/auth/service/role/RoleService.java

@@ -6,11 +6,14 @@
 package org.eco.vip.auth.service.role;
 
 
+import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.eco.vip.auth.domain.role.Role;
+import org.eco.vip.auth.domain.role.RolePerm;
 import org.eco.vip.auth.domain.role.pojo.RoleBO;
 import org.eco.vip.auth.domain.role.pojo.RoleVO;
 import org.eco.vip.auth.mapper.RoleMapper;
+import org.eco.vip.auth.mapper.RolePermMapper;
 import org.eco.vip.orm.pojo.PageResult;
 import org.eco.vip.orm.service.BaseService;
 import org.eco.vip.orm.utils.MapstructUtils;
@@ -27,6 +30,9 @@ import java.util.List;
 @Service
 @Slf4j
 public class RoleService extends BaseService<RoleMapper, Role> implements IRoleService {
+    @Resource
+    private RolePermMapper rolePermMapper;
+
     @Override
     public PageResult<RoleVO> selectPage(RoleBO roleBO) {
         return null;
@@ -43,6 +49,11 @@ public class RoleService extends BaseService<RoleMapper, Role> implements IRoleS
         return this.save(role);
     }
 
+    @Override
+    public boolean insertPerm(RolePerm rolePerm) {
+        return rolePermMapper.insert(rolePerm) > 0;
+    }
+
     @Override
     public boolean update(RoleBO roleBO) {
         return false;

eco-nexus-core/auth-biz/src/main/java/org/eco/vip/auth/service/user/IUserService.java

@@ -6,7 +6,9 @@
 package org.eco.vip.auth.service.user;
 
 
+import org.eco.vip.auth.domain.role.pojo.RoleVO;
 import org.eco.vip.auth.domain.user.User;
+import org.eco.vip.auth.domain.user.UserRole;
 import org.eco.vip.auth.domain.user.pojo.UserBO;
 import org.eco.vip.auth.domain.user.pojo.UserVO;
 import org.eco.vip.orm.pojo.PageResult;
@@ -21,11 +23,55 @@ import java.util.List;
  * @date 2025/3/9 23:20
  */
 public interface IUserService extends IBaseService<User> {
-    PageResult<UserVO> selectPage();
+    /**
+     * @description: 分页查询
+     * @param userBO 参数
+     * @return PageResult<RoleVO>
+     **/
+    PageResult<UserVO> selectPage(UserBO userBO);
 
-    List<User> getUsers();
+    /**
+     * @description: 查询
+     * @param roleBO 参数
+     * @return List<OrgVO>
+     **/
+    List<UserVO> selectList(UserBO roleBO);
 
-    boolean insert(UserBO userBO);
+    /**
+     * @description: 新增
+     * @param roleBO 参数
+     * @return boolean 是否成功
+     **/
+    boolean insert(UserBO roleBO);
+
+    /**
+     * @description: 新增
+     * @param userRole 参数
+     * @return boolean 是否成功
+     **/
+    boolean insertOrg(UserRole userRole);
+
+    /**
+     * @description: 更新
+     * @param roleBO 参数
+     * @return boolean 是否成功
+     **/
+    boolean update(UserBO roleBO);
+
+    /**
+     * @description: 删除
+     * @param ids ids
+     * @return boolean 是否成功
+     **/
+    boolean delete(List<String> ids);
+
+    /**
+     * 根据ID查询信息
+     *
+     * @param id ID
+     * @return 结果
+     */
+    RoleVO selectById(String id);
 
     UserVO selectTenantUserByUserName(String tenantId, String username);
 }

eco-nexus-core/auth-biz/src/main/java/org/eco/vip/auth/service/user/UserService.java

@@ -9,10 +9,13 @@ package org.eco.vip.auth.service.user;
 import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.query.QueryWrapper;
 import jakarta.annotation.Resource;
+import org.eco.vip.auth.domain.role.pojo.RoleVO;
 import org.eco.vip.auth.domain.user.User;
+import org.eco.vip.auth.domain.user.UserRole;
 import org.eco.vip.auth.domain.user.pojo.UserBO;
 import org.eco.vip.auth.domain.user.pojo.UserVO;
 import org.eco.vip.auth.mapper.UserMapper;
+import org.eco.vip.auth.mapper.UserRoleMapper;
 import org.eco.vip.orm.domain.PageQuery;
 import org.eco.vip.orm.pojo.PageResult;
 import org.eco.vip.orm.service.BaseService;
@@ -33,10 +36,16 @@ import static org.eco.vip.auth.domain.user.table.UserTableDef.USER;
 public class UserService extends BaseService<UserMapper, User> implements IUserService {
     @Resource
     private UserMapper userMapper;
+    @Resource
+    private UserRoleMapper userRoleMapper;
+
 
-    private QueryWrapper buildQueryWrapper() {
-        QueryWrapper queryWrapper = super.buildBaseQueryWrapper();
-        return queryWrapper;
+    private QueryWrapper buildQueryWrapper(UserBO userBO) {
+        return super.buildBaseQueryWrapper()
+                .and(USER.ACCOUNT.eq(userBO.getAccount()))
+                .and(USER.USER_NAME.eq(userBO.getUserName()))
+                .and(USER.STATUS.eq(userBO.getStatus()))
+                .and(USER.TENANT_ID.eq(userBO.getTenantId()));
     }
 
     private QueryWrapper buildOneQueryWrapper() {
@@ -44,15 +53,15 @@ public class UserService extends BaseService<UserMapper, User> implements IUserS
     }
 
     @Override
-    public PageResult<UserVO> selectPage() {
-        QueryWrapper queryWrapper = buildQueryWrapper();
+    public PageResult<UserVO> selectPage(UserBO userBO) {
+        QueryWrapper queryWrapper = buildQueryWrapper(userBO);
         Page<UserVO> page = this.pageAs(PageQuery.build(), queryWrapper, UserVO.class);
         return PageResult.build(page);
     }
 
     @Override
-    public List<User> getUsers() {
-        return this.list();
+    public List<UserVO> selectList(UserBO roleBO) {
+        return List.of();
     }
 
     @Override
@@ -61,6 +70,26 @@ public class UserService extends BaseService<UserMapper, User> implements IUserS
         return this.save(user);
     }
 
+    @Override
+    public boolean insertOrg(UserRole userRole) {
+        return userRoleMapper.insert(userRole) > 0;
+    }
+
+    @Override
+    public boolean update(UserBO roleBO) {
+        return false;
+    }
+
+    @Override
+    public boolean delete(List<String> ids) {
+        return false;
+    }
+
+    @Override
+    public RoleVO selectById(String id) {
+        return null;
+    }
+
     @Override
     public UserVO selectTenantUserByUserName(String tenantId, String account) {
         QueryWrapper queryWrapper = buildOneQueryWrapper()

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

@@ -24,26 +24,26 @@ FOREIGN_KEY_CHECKS = 0;
 DROP TABLE IF EXISTS `system_org_t`;
 CREATE TABLE `system_org_t`
 (
-    `org_id`      varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '唯一标识',
-    `parent_id`   varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '父组织ID',
-    `name`        varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '组织名称',
-    `code`        varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '组织编码',
-    `category`    varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '类别',
+    `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_bin NULL DEFAULT NULL COMMENT '负责人',
-    `phone`       varchar(11) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '联系电话',
-    `email`       varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '邮箱',
-    `tenant_id`   varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '租户编号',
-    `status`      varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '状态（1正常 0停用）',
+    `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_bin NULL DEFAULT NULL COMMENT '删除标志（1代表已删除 0代表存在）',
-    `create_by`   varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin 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_bin 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_bin 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_bin COMMENT = '部门表' ROW_FORMAT = DYNAMIC;
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '部门表' ROW_FORMAT = DYNAMIC;
 
 
 
@@ -59,15 +59,15 @@ CREATE TABLE `system_role_t`
     `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_bin NULL DEFAULT NULL COMMENT '租户编号',
-    `status`      varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin 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_bin NULL DEFAULT NULL COMMENT '删除标志（1代表已删除 0代表存在）',
-    `create_by`   varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin 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_bin 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_bin 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;
 
@@ -78,30 +78,30 @@ CREATE TABLE `system_role_t`
 DROP TABLE IF EXISTS `system_user_t`;
 CREATE TABLE `system_user_t`
 (
-    `user_id`      varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '唯一标识',
-    `org_id`       varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '组织ID',
-    `account`      varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '用户账号',
-    `user_name`    varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '用户姓名',
-    `nick_name`    varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '用户昵称',
-    `user_type`    varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '用户类型（system系统用户）',
-    `email`        varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '用户邮箱',
-    `phone_number` varchar(11) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '手机号码',
-    `gender`       varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '用户性别（0男 1女 2未知）',
-    `avatar`       longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL COMMENT '头像地址',
-    `password`     varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '密码',
-    `login_ip`     varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '最后登陆IP',
+    `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_bin NULL DEFAULT NULL COMMENT '租户编号',
-    `status`       varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin 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_bin NULL DEFAULT NULL COMMENT '删除标志（1代表已删除 0代表存在）',
-    `create_by`    varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin 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_bin 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_bin 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_bin COMMENT = '用户信息表' ROW_FORMAT = DYNAMIC;
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '用户信息表' ROW_FORMAT = DYNAMIC;
 
 -- ----------------------------
 -- Table structure for sys_client
@@ -109,24 +109,24 @@ CREATE TABLE `system_user_t`
 DROP TABLE IF EXISTS `system_client_t`;
 CREATE TABLE `system_client_t`
 (
-    `client_id`      varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '客户端id',
-    `client_key`     varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '客户端key',
-    `client_secret`  varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '客户端秘钥',
-    `grant_type`     varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT 'password' COMMENT '授权类型',
-    `device_type`    varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '设备类型',
+    `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 '设备类型',
     `active_timeout` int NULL DEFAULT 1800 COMMENT 'token活跃超时时间',
     `timeout`        int NULL DEFAULT 604800 COMMENT 'token固定超时',
-    `tenant_id`      varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '租户编号',
-    `status`         varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin 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_bin NULL DEFAULT NULL COMMENT '删除标志（1代表已删除 0代表存在）',
-    `create_by`      varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin 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_bin 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_bin 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_bin COMMENT = '系统客户端授权表' ROW_FORMAT = DYNAMIC;
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '系统客户端授权表' ROW_FORMAT = DYNAMIC;
 
 
 -- ----------------------------
@@ -139,6 +139,30 @@ CREATE TABLE `system_permission_t`
     `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 ROW_FORMAT = Dynamic;
+) 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;
+
 SET
 FOREIGN_KEY_CHECKS = 1;