Sunyard/cisd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix：角色设计修改

Browse Source
This commit is contained in:
waner
2026-04-22 18:29:00 +08:00
parent 1fc32dbcf0
commit a3fd33a6e4
34 changed files with 1819 additions and 338 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/mapper/auth/AuthFullAccountMapper.xml
+67
View File
@@ -0,0 +1,67 @@
<?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.AuthFullAccountMapper">
<resultMap id="AuthFullAccountResultMap" type="com.cisd.tms.modules.auth.entity.AuthFullAccountEntity">
<id property="id" column="id"/>
<result property="roleCode" column="role_code"/>
<result property="uid" column="uid"/>
<result property="accountName" column="account_name"/>
<result property="displayName" column="display_name"/>
<result property="passwordHash" column="password_hash"/>
<result property="passwordSalt" column="password_salt"/>
<result property="status" column="status"/>
<result property="needChangePassword" column="need_change_password"/>
<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="selectByRoleCodeAndUid" resultMap="AuthFullAccountResultMap">
SELECT id,
role_code,
uid,
account_name,
display_name,
password_hash,
password_salt,
status,
need_change_password,
failed_count,
locked_until,
last_login_at,
last_active_at,
create_time,
update_time
FROM tms_auth_full_account
WHERE role_code = #{roleCode}
AND uid = #{uid}
LIMIT 1
</select>
<select id="selectByRoleCode" resultMap="AuthFullAccountResultMap">
SELECT id,
role_code,
uid,
account_name,
display_name,
password_hash,
password_salt,
status,
need_change_password,
failed_count,
locked_until,
last_login_at,
last_active_at,
create_time,
update_time
FROM tms_auth_full_account
WHERE role_code = #{roleCode}
ORDER BY uid ASC
</select>
</mapper>
src/main/resources/mapper/auth/AuthSessionMapper.xml
+45 -2
View File
@@ -8,7 +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="authenticatedPrincipalsJson" column="authenticated_principals_json"/>
<result property="authMethod" column="auth_method"/>
<result property="authLevel" column="auth_level"/>
<result property="issuedAt" column="issued_at"/>
@@ -23,7 +23,7 @@
SELECT id,
session_token,
role_code,
authenticated_users_json,
authenticated_principals_json,
auth_method,
auth_level,
issued_at,
@@ -36,4 +36,47 @@
WHERE session_token = #{sessionToken}
LIMIT 1
</select>
<select id="selectActiveByRoleCodeAndAuthLevel" resultMap="AuthSessionResultMap">
SELECT id,
session_token,
role_code,
authenticated_principals_json,
auth_method,
auth_level,
issued_at,
last_active_at,
expires_at,
logout_at,
create_time,
update_time
FROM tms_auth_session
WHERE role_code = #{roleCode}
AND auth_level = #{authLevel}
AND logout_at IS NULL
AND expires_at IS NOT NULL
AND expires_at > #{now}
</select>
<select id="selectActiveByRoleCodeAndAuthLevelAndAuthenticatedPrincipalsJson" resultMap="AuthSessionResultMap">
SELECT id,
session_token,
role_code,
authenticated_principals_json,
auth_method,
auth_level,
issued_at,
last_active_at,
expires_at,
logout_at,
create_time,
update_time
FROM tms_auth_session
WHERE role_code = #{roleCode}
AND auth_level = #{authLevel}
AND authenticated_principals_json = #{authenticatedPrincipalsJson}
AND logout_at IS NULL
AND expires_at IS NOT NULL
AND expires_at > #{now}
</select>
</mapper>
src/main/resources/mapper/auth/AuthUserAccountMapper.xml
+3
View File
@@ -12,6 +12,7 @@
<result property="passwordHash" column="password_hash"/>
<result property="passwordSalt" column="password_salt"/>
<result property="status" column="status"/>
<result property="needChangePassword" column="need_change_password"/>
<result property="failedCount" column="failed_count"/>
<result property="lockedUntil" column="locked_until"/>
<result property="lastLoginAt" column="last_login_at"/>
@@ -28,6 +29,7 @@
password_hash,
password_salt,
status,
need_change_password,
failed_count,
locked_until,
last_login_at,
@@ -47,6 +49,7 @@
password_hash,
password_salt,
status,
need_change_password,
failed_count,
locked_until,
last_login_at,
src/main/resources/mapper/auth/RoleAccountMapper.xml
-14
View File
@@ -9,14 +9,7 @@
<result property="roleCode" column="role_code"/>
<result property="displayName" column="display_name"/>
<result property="requiredUkeyCount" column="required_ukey_count"/>
<result property="passwordHash" column="password_hash"/>
<result property="passwordSalt" column="password_salt"/>
<result property="status" column="status"/>
<result property="needChangePassword" column="need_change_password"/>
<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>
@@ -26,14 +19,7 @@
role_code,
display_name,
required_ukey_count,
password_hash,
password_salt,
status,
need_change_password,
failed_count,
locked_until,
last_login_at,
last_active_at,
create_time,
update_time
FROM tms_role_account