回退

tuoheng_oidc_server/src/main/java/com/tuoheng/model/dto/ClientRoleDto.java

@@ -13,7 +13,4 @@ public class ClientRoleDto {
     private String clientId;
 
     private Integer roleId;
-
-    private Integer status;
-
 }

tuoheng_oidc_server/src/main/java/com/tuoheng/model/dto/UserBaseInfoDto.java

@@ -21,7 +21,7 @@ public class UserBaseInfoDto {
     /**
      * 可以访问的 client
      */
-    private List<AuthoritiesDto> authorityList;
+    private List<String> authorityList;
 
     /**
      * 可以访问的 client 以及 role

tuoheng_oidc_server/src/main/resources/mapper/UserMapper.xml

@@ -6,14 +6,12 @@
         <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 property="authorityList" ofType="java.lang.String" javaType="java.util.List">
+            <result column="authority" jdbcType="VARCHAR"/>
         </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="status" jdbcType="INTEGER" property="status"/>
         </collection>
     </resultMap>
 
@@ -40,10 +38,8 @@
                a.username  as userName,
                a.password,
                b.authority,
-               b.status,
                c.client_id as clientId,
-               c.role_id   as roleId,
-               c.status    as status
+               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

@@ -6,14 +6,12 @@
         <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 property="authorityList" ofType="java.lang.String" javaType="java.util.List">
+            <result column="authority" jdbcType="VARCHAR"/>
         </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="status" jdbcType="INTEGER" property="status"/>
         </collection>
     </resultMap>
 
@@ -40,10 +38,8 @@
                a.username  as userName,
                a.password,
                b.authority,
-               b.status,
                c.client_id as clientId,
-               c.role_id   as roleId,
-               c.status    as status
+               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