角色和登录改动

2026-04-15 11:18:01 +08:00
parent 622702b0b0
commit 9bea50466f
34 changed files with 1078 additions and 693 deletions
@@ -260,9 +260,7 @@ CREATE TABLE IF NOT EXISTS tms_role_account (
 CREATE TABLE IF NOT EXISTS tms_role_ukey_binding (
    id BIGINT PRIMARY KEY,
    role_code VARCHAR(64) NOT NULL,
-    slot_no INT NOT NULL,
-    uid VARCHAR(64) NULL,
-    rid VARCHAR(64) NULL,
+    uid INT NOT NULL,
    ukey_serial VARCHAR(128) NOT NULL,
    ukey_pubkey TEXT NOT NULL,
    issuer_sign TEXT NULL,
@@ -271,14 +269,33 @@ CREATE TABLE IF NOT EXISTS tms_role_ukey_binding (
    unbound_at DATETIME(3) NULL,
    create_time DATETIME(3) NOT NULL,
    update_time DATETIME(3) NOT NULL,
-    UNIQUE KEY uk_tms_role_ukey_binding_role_slot (role_code, slot_no),
+    UNIQUE KEY uk_tms_role_ukey_binding_role_uid (role_code, uid),
    KEY idx_tms_role_ukey_binding_role_status (role_code, status)
 );

+CREATE TABLE IF NOT EXISTS tms_auth_user_account (
+    id BIGINT PRIMARY KEY,
+    username VARCHAR(64) NOT NULL,
+    display_name VARCHAR(128) NOT NULL,
+    role_code VARCHAR(64) NOT NULL,
+    password_hash VARCHAR(256) NOT NULL,
+    password_salt VARCHAR(128) NOT NULL,
+    status VARCHAR(32) NOT NULL,
+    failed_count INT NOT NULL DEFAULT 0,
+    locked_until DATETIME(3) NULL,
+    last_login_at DATETIME(3) NULL,
+    last_active_at DATETIME(3) NULL,
+    create_time DATETIME(3) NOT NULL,
+    update_time DATETIME(3) NOT NULL,
+    UNIQUE KEY uk_tms_auth_user_account_username (username),
+    KEY idx_tms_auth_user_account_role_code (role_code)
+);
+
 CREATE TABLE IF NOT EXISTS tms_auth_session (
    id BIGINT PRIMARY KEY,
    session_token VARCHAR(128) NOT NULL,
    role_code VARCHAR(64) NOT NULL,
+    authenticated_users_json JSON NULL,
    auth_method VARCHAR(32) NOT NULL,
    auth_level VARCHAR(32) NOT NULL,
    issued_at DATETIME(3) NOT NULL,
@@ -378,7 +395,7 @@ VALUES
        11001,
        'SUPER_ADMIN',
        '超级管理员',
-        3,
+        2,
        'Viuew8WE+qziUZwGGU0x25cUpzsTF+QvQFU0uhb+yVA=',
        'init-super-admin-salt-20260325',
        'UNENABLED',
@@ -394,7 +411,7 @@ VALUES
        11002,
        'KEY_ADMIN',
        '密钥管理员',
-        2,
+        1,
        '/xqmDy3A/q9X5p7XWznIPSBabQ6bxTLAPgtHQ6Be33c=',
        'init-key-admin-salt-20260325',
        'ACTIVE',
@@ -439,6 +456,98 @@ VALUES
        CURRENT_TIMESTAMP(3)
    );

+INSERT IGNORE INTO tms_auth_user_account (
+    id,
+    username,
+    display_name,
+    role_code,
+    password_hash,
+    password_salt,
+    status,
+    failed_count,
+    locked_until,
+    last_login_at,
+    last_active_at,
+    create_time,
+    update_time
+)
+VALUES
+    (
+        12001,
+        'super-admin-01',
+        '超级管理员账号一',
+        'SUPER_ADMIN',
+        'Viuew8WE+qziUZwGGU0x25cUpzsTF+QvQFU0uhb+yVA=',
+        'init-super-admin-salt-20260325',
+        'ACTIVE',
+        0,
+        NULL,
+        NULL,
+        NULL,
+        CURRENT_TIMESTAMP(3),
+        CURRENT_TIMESTAMP(3)
+    ),
+    (
+        12002,
+        'super-admin-02',
+        '超级管理员账号二',
+        'SUPER_ADMIN',
+        'Viuew8WE+qziUZwGGU0x25cUpzsTF+QvQFU0uhb+yVA=',
+        'init-super-admin-salt-20260325',
+        'ACTIVE',
+        0,
+        NULL,
+        NULL,
+        NULL,
+        CURRENT_TIMESTAMP(3),
+        CURRENT_TIMESTAMP(3)
+    ),
+    (
+        12003,
+        'key-admin-01',
+        '密钥管理员账号',
+        'KEY_ADMIN',
+        '/xqmDy3A/q9X5p7XWznIPSBabQ6bxTLAPgtHQ6Be33c=',
+        'init-key-admin-salt-20260325',
+        'ACTIVE',
+        0,
+        NULL,
+        NULL,
+        NULL,
+        CURRENT_TIMESTAMP(3),
+        CURRENT_TIMESTAMP(3)
+    ),
+    (
+        12004,
+        'audit-admin-01',
+        '审计管理员账号',
+        'AUDIT_ADMIN',
+        'j/J1LKyUOzVEJfbbHe2dwKBKNdabRk502olk/LWIwhg=',
+        'init-audit-admin-salt-20260325',
+        'ACTIVE',
+        0,
+        NULL,
+        NULL,
+        NULL,
+        CURRENT_TIMESTAMP(3),
+        CURRENT_TIMESTAMP(3)
+    ),
+    (
+        12005,
+        'ops-admin-01',
+        '运维管理员账号',
+        'OPS_ADMIN',
+        '2e9F4aCgsDb+AuD1LrBEqEg8yjy3ODo27UHtx06vj/A=',
+        'init-ops-admin-salt-20260325',
+        'ACTIVE',
+        0,
+        NULL,
+        NULL,
+        NULL,
+        CURRENT_TIMESTAMP(3),
+        CURRENT_TIMESTAMP(3)
+    );
+

 -- -----------------------------------------------------------------------------
 -- IP白名单表
@@ -8,6 +8,7 @@
        <id property="id" column="id"/>
        <result property="sessionToken" column="session_token"/>
        <result property="roleCode" column="role_code"/>
+        <result property="authenticatedUsersJson" column="authenticated_users_json"/>
        <result property="authMethod" column="auth_method"/>
        <result property="authLevel" column="auth_level"/>
        <result property="issuedAt" column="issued_at"/>
@@ -22,6 +23,7 @@
        SELECT id,
               session_token,
               role_code,
+               authenticated_users_json,
               auth_method,
               auth_level,
               issued_at,
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.cisd.tms.modules.auth.mapper.AuthUserAccountMapper">
+
+    <resultMap id="AuthUserAccountResultMap" type="com.cisd.tms.modules.auth.entity.AuthUserAccountEntity">
+        <id property="id" column="id"/>
+        <result property="username" column="username"/>
+        <result property="displayName" column="display_name"/>
+        <result property="roleCode" column="role_code"/>
+        <result property="passwordHash" column="password_hash"/>
+        <result property="passwordSalt" column="password_salt"/>
+        <result property="status" column="status"/>
+        <result property="failedCount" column="failed_count"/>
+        <result property="lockedUntil" column="locked_until"/>
+        <result property="lastLoginAt" column="last_login_at"/>
+        <result property="lastActiveAt" column="last_active_at"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+    <select id="selectByUsername" parameterType="string" resultMap="AuthUserAccountResultMap">
+        SELECT id,
+               username,
+               display_name,
+               role_code,
+               password_hash,
+               password_salt,
+               status,
+               failed_count,
+               locked_until,
+               last_login_at,
+               last_active_at,
+               create_time,
+               update_time
+        FROM tms_auth_user_account
+        WHERE username = #{username}
+        LIMIT 1
+    </select>
+
+    <select id="selectByRoleCode" parameterType="string" resultMap="AuthUserAccountResultMap">
+        SELECT id,
+               username,
+               display_name,
+               role_code,
+               password_hash,
+               password_salt,
+               status,
+               failed_count,
+               locked_until,
+               last_login_at,
+               last_active_at,
+               create_time,
+               update_time
+        FROM tms_auth_user_account
+        WHERE role_code = #{roleCode}
+        ORDER BY username ASC
+    </select>
+</mapper>
@@ -7,9 +7,7 @@
    <resultMap id="RoleUkeyBindingResultMap" type="com.cisd.tms.modules.auth.entity.RoleUkeyBindingEntity">
        <id property="id" column="id"/>
        <result property="roleCode" column="role_code"/>
-        <result property="slotNo" column="slot_no"/>
        <result property="uid" column="uid"/>
-        <result property="rid" column="rid"/>
        <result property="ukeySerial" column="ukey_serial"/>
        <result property="ukeyPubkey" column="ukey_pubkey"/>
        <result property="issuerSign" column="issuer_sign"/>
@@ -20,12 +18,10 @@
        <result property="updateTime" column="update_time"/>
    </resultMap>

-    <select id="selectActiveByRoleCodeAndSlotNo" resultMap="RoleUkeyBindingResultMap">
+    <select id="selectActiveByRoleCodeAndUid" resultMap="RoleUkeyBindingResultMap">
        SELECT id,
               role_code,
-               slot_no,
               uid,
-               rid,
               ukey_serial,
               ukey_pubkey,
               issuer_sign,
@@ -36,7 +32,7 @@
               update_time
        FROM tms_role_ukey_binding
        WHERE role_code = #{roleCode}
-          AND slot_no = #{slotNo}
+          AND uid = #{uid}
          AND status = 'ACTIVE'
        LIMIT 1
    </select>
@@ -44,9 +40,7 @@
    <select id="selectActiveByRoleCode" parameterType="string" resultMap="RoleUkeyBindingResultMap">
        SELECT id,
               role_code,
-               slot_no,
               uid,
-               rid,
               ukey_serial,
               ukey_pubkey,
               issuer_sign,
@@ -58,6 +52,6 @@
        FROM tms_role_ukey_binding
        WHERE role_code = #{roleCode}
          AND status = 'ACTIVE'
-        ORDER BY slot_no ASC
+        ORDER BY uid ASC
    </select>
 </mapper>