角色和登录改动

src/main/resources/mapper/auth/AuthSessionMapper.xml

@@ -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,

src/main/resources/mapper/auth/AuthUserAccountMapper.xml

@@ -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>

src/main/resources/mapper/auth/RoleUkeyBindingMapper.xml

@@ -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>