更新

tuoheng_oidc_server/target/classes/WEB-INF/classes/mapper/UserMapper.xml

@@ -3,15 +3,16 @@
 <mapper namespace="com.tuoheng.mapper.UserMapper">
 
     <resultMap type="com.tuoheng.model.dto.UserBaseInfoDto" id="UserBaseInfoMap">
-        <id column="userId" jdbcType="INTEGER" property="userId" />
-        <result column="userName" jdbcType="VARCHAR" property="userName" />
-        <result column="password" jdbcType="VARCHAR" property="password" />
-        <collection property="authorityList" ofType="java.lang.String" javaType="java.util.List">
+        <id column="userId" jdbcType="INTEGER" property="userId"/>
+        <result column="userName" jdbcType="VARCHAR" property="userName"/>
+        <result column="password" jdbcType="VARCHAR" property="password"/>
+        <collection property="authorityList" ofType="com.tuoheng.model.dto.AuthoritiesDto" javaType="java.util.List">
             <result column="authority" jdbcType="VARCHAR"/>
+            <result column="status" jdbcType="INTEGER"/>
         </collection>
         <collection property="clientRoleDtoList" ofType="com.tuoheng.model.dto.ClientRoleDto" javaType="java.util.List">
-            <result column="clientId" jdbcType="VARCHAR" property="clientId" />
-            <result column="roleId" jdbcType="INTEGER" property="roleId" />
+            <result column="clientId" jdbcType="VARCHAR" property="clientId"/>
+            <result column="roleId" jdbcType="INTEGER" property="roleId"/>
         </collection>
     </resultMap>
 
@@ -21,7 +22,12 @@
     </insert>
 
     <select id="getUserBaseInfo" resultMap="UserBaseInfoMap">
-        select a.id as userId, a.username as userName, a.password , b.authority, c.client_id as clientId, c.role_id as roleId
+        select a.id        as userId,
+               a.username  as userName,
+               a.password,
+               b.authority,
+               c.client_id as clientId,
+               c.role_id   as roleId
         from users a
                  left join authorities b on a.id = b.user_id
                  left join t_client_user_role c on a.id = c.user_id
@@ -29,7 +35,12 @@
     </select>
 
     <select id="getMpUserInfo" resultMap="UserBaseInfoMap">
-        select a.id as userId, a.username as userName, a.password , b.authority, c.client_id as clientId, c.role_id as roleId
+        select a.id        as userId,
+               a.username  as userName,
+               a.password,
+               b.authority,
+               c.client_id as clientId,
+               c.role_id   as roleId
         from users a
                  left join authorities b on a.id = b.user_id
                  left join t_client_user_role c on a.id = c.user_id

tuoheng_oidc_server/target/classes/mapper/UserMapper.xml

@@ -3,15 +3,17 @@
 <mapper namespace="com.tuoheng.mapper.UserMapper">
 
     <resultMap type="com.tuoheng.model.dto.UserBaseInfoDto" id="UserBaseInfoMap">
-        <id column="userId" jdbcType="INTEGER" property="userId" />
-        <result column="userName" jdbcType="VARCHAR" property="userName" />
-        <result column="password" jdbcType="VARCHAR" property="password" />
-        <collection property="authorityList" ofType="java.lang.String" javaType="java.util.List">
-            <result column="authority" jdbcType="VARCHAR"/>
+        <id column="userId" jdbcType="INTEGER" property="userId"/>
+        <result column="userName" jdbcType="VARCHAR" property="userName"/>
+        <result column="password" jdbcType="VARCHAR" property="password"/>
+        <collection property="authorityList" ofType="com.tuoheng.model.dto.AuthoritiesDto" javaType="java.util.List">
+            <result column="authority" jdbcType="VARCHAR" property="authority"/>
+            <result column="status" jdbcType="INTEGER" property="status"/>
         </collection>
         <collection property="clientRoleDtoList" ofType="com.tuoheng.model.dto.ClientRoleDto" javaType="java.util.List">
-            <result column="clientId" jdbcType="VARCHAR" property="clientId" />
-            <result column="roleId" jdbcType="INTEGER" property="roleId" />
+            <result column="clientId" jdbcType="VARCHAR" property="clientId"/>
+            <result column="roleId" jdbcType="INTEGER" property="roleId"/>
+            <result column="status" jdbcType="INTEGER" property="status"/>
         </collection>
     </resultMap>
 
@@ -21,7 +23,12 @@
     </insert>
 
     <select id="getUserBaseInfo" resultMap="UserBaseInfoMap">
-        select a.id as userId, a.username as userName, a.password , b.authority, c.client_id as clientId, c.role_id as roleId
+        select a.id        as userId,
+               a.username  as userName,
+               a.password,
+               b.authority,
+               c.client_id as clientId,
+               c.role_id   as roleId
         from users a
                  left join authorities b on a.id = b.user_id
                  left join t_client_user_role c on a.id = c.user_id
@@ -29,7 +36,14 @@
     </select>
 
     <select id="getMpUserInfo" resultMap="UserBaseInfoMap">
-        select a.id as userId, a.username as userName, a.password , b.authority, c.client_id as clientId, c.role_id as roleId
+        select a.id        as userId,
+               a.username  as userName,
+               a.password,
+               b.authority,
+               b.status,
+               c.client_id as clientId,
+               c.role_id   as roleId,
+               c.status    as status
         from users a
                  left join authorities b on a.id = b.user_id
                  left join t_client_user_role c on a.id = c.user_id

tuoheng_oidc_server/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -33,5 +33,6 @@ com\tuoheng\model\dto\UserBaseInfoDto.class
 com\tuoheng\oauth2\authentication\OAuth2EndpointUtils.class
 com\tuoheng\model\param\CreateUserDto.class
 com\tuoheng\oauth2\authentication\OAuth2ResourceOwnerPasswordAuthenticationProvider.class
+com\tuoheng\model\dto\AuthoritiesDto.class
 com\tuoheng\service\OidcUserInfoService.class
 com\tuoheng\model\param\GetUserInfoDto.class

tuoheng_oidc_server/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -14,6 +14,7 @@ D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_server\src\main\java\com\tuoheng\
 D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_server\src\main\java\com\tuoheng\model\dto\ClientRoleDto.java
 D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_server\src\main\java\com\tuoheng\oauth2\authentication\OAuth2ResourceOwnerPasswordAuthenticationProvider.java
 D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_server\src\main\java\com\tuoheng\mapper\AuthoritiesMapper.java
+D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_server\src\main\java\com\tuoheng\model\dto\AuthoritiesDto.java
 D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_server\src\main\java\com\tuoheng\oauth2\authentication\OAuth2ResourceOwnerPasswordAuthenticationToken.java
 D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_server\src\main\java\com\tuoheng\model\param\CreateUserDto.java
 D:\myprojects\tuohen\tuoheng_oidc\tuoheng_oidc_server\src\main\java\com\tuoheng\model\po\AuthoritiesPo.java