更新脚本

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

@@ -31,7 +31,7 @@ public class Org extends BaseEntity {
      * 唯一标识
      */
     @Id
-    private String id;
+    private String orgId;
 
     /**
      * 父组织ID

eco-nexus-core/auth-biz/src/main/java/org/eco/vip/auth/domain/org/vo/OrgVO.java

@@ -28,7 +28,7 @@ public class OrgVO extends BaseEntity {
      * 部门ID
      */
     @Id
-    private String id;
+    private String orgId;
 
     /**
      * 父部门ID

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

@@ -27,7 +27,7 @@ public class Role extends BaseEntity {
      * id
      */
     @Id
-    private String id;
+    private String roleId;
 
     /**
      * 组织id

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

@@ -25,7 +25,7 @@ public class RoleVO extends BaseEntity {
     /**
      * id
      */
-    private String id;
+    private String roleId;
 
     /**
      * 组织id

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

@@ -31,7 +31,7 @@ public class User extends BaseEntity {
      * 用户ID
      */
     @Id
-    private String id;
+    private String userId;
 
     /**
      * 组织ID

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

@@ -28,7 +28,7 @@ public class UserVO extends BaseEntity {
      * 用户ID
      */
     @Id
-    private String id;
+    private String userId;
 
     /**
      * 组织ID

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

@@ -27,7 +27,7 @@ public class LoginService {
     public LoginUser buildLoginUser(UserVO user) {
         LoginUser loginUser = new LoginUser();
         loginUser.setTenantId(user.getTenantId());
-        loginUser.setUserId(user.getId());
+        loginUser.setUserId(user.getUserId());
         loginUser.setOrgId(user.getOrgId());
         loginUser.setUserName(user.getUserName());
         loginUser.setNickname(user.getNickName());

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

@@ -95,7 +95,7 @@ public class OrgService extends BaseService<OrgMapper, Org> implements IOrgServi
         QueryWrapper queryWrapper = query().where(ORG.NAME.eq(orgBO.getName()));
         queryWrapper.and(ORG.PARENT_ID.eq(orgBO.getParentId()));
         OrgVO orgVO = this.getOneAs(queryWrapper, OrgVO.class);
-        if (ObjUtils.isNotNull(orgVO) && !StrUtils.equals(orgVO.getId(), orgId)) {
+        if (ObjUtils.isNotNull(orgVO) && !StrUtils.equals(orgVO.getOrgId(), orgId)) {
             return Constants.NOT_UNIQUE;
         }
         return Constants.UNIQUE;

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

@@ -24,7 +24,7 @@ FOREIGN_KEY_CHECKS = 0;
 DROP TABLE IF EXISTS `system_org_t`;
 CREATE TABLE `system_org_t`
 (
-    `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 '唯一标识',
     `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 '组织编码',
@@ -42,7 +42,7 @@ CREATE TABLE `system_org_t`
     `update_by`   varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '更新者',
     `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
     `remark`      varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '备注',
-    PRIMARY KEY (`id`) USING BTREE
+    PRIMARY KEY (`org_id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '部门表' ROW_FORMAT = DYNAMIC;
 
 
@@ -53,7 +53,7 @@ CREATE TABLE `system_org_t`
 DROP TABLE IF EXISTS `system_role_t`;
 CREATE TABLE `system_role_t`
 (
-    `id`          varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+    `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 '编码',
@@ -68,7 +68,7 @@ CREATE TABLE `system_role_t`
     `update_by`   varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '更新者',
     `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
     `remark`      varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '备注',
-    PRIMARY KEY (`id`) USING BTREE
+    PRIMARY KEY (`role_id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '角色表' ROW_FORMAT = DYNAMIC;
 
 
@@ -78,7 +78,7 @@ CREATE TABLE `system_role_t`
 DROP TABLE IF EXISTS `system_user_t`;
 CREATE TABLE `system_user_t`
 (
-    `id`           varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '唯一标识',
+    `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 '用户姓名',
@@ -100,9 +100,35 @@ CREATE TABLE `system_user_t`
     `update_by`    varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '更新者',
     `update_time`  datetime NULL DEFAULT NULL COMMENT '更新时间',
     `remark`       varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '备注',
-    PRIMARY KEY (`id`) USING BTREE
+    PRIMARY KEY (`user_id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '用户信息表' ROW_FORMAT = DYNAMIC;
 
+-- ----------------------------
+-- Table structure for sys_client
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_client`;
+CREATE TABLE `sys_client`
+(
+    `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_cd`    varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT 'password' COMMENT '授权类型',
+    `device_type_cd`   varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '设备类型',
+    `active_timeout`   int NULL DEFAULT 1800 COMMENT 'token活跃超时时间',
+    `timeout`          int NULL DEFAULT 604800 COMMENT 'token固定超时',
+    `client_status_cd` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT '0' 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停用）',
+    `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 '创建者',
+    `create_time`  datetime NULL DEFAULT NULL COMMENT '创建时间',
+    `update_by`    varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '更新者',
+    `update_time`  datetime NULL DEFAULT NULL COMMENT '更新时间',
+    `remark`       varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '备注',
+    PRIMARY KEY (`client_id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '系统客户端授权表' ROW_FORMAT = DYNAMIC;
+
 
 SET
 FOREIGN_KEY_CHECKS = 1;