[api] userType, userRole 추가

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

@@ -9,8 +9,8 @@
 	</insert>
 	<insert id="insertUserTokenSignup" useGeneratedKeys="true" keyProperty="userTokenIdx">
 		/*UserMapper.insertUserTokenSignup*/
-		insert into ALISTLMS.test_user_token (user_idx, user_api_key, user_role, created_at, updated_at)
-		value (#{userIdx}, #{userApiKey}, #{userRole}, now(), now())
+		insert into ALISTLMS.test_user_token (user_idx, user_api_key, user_role, user_type, created_at, updated_at)
+		value (#{userIdx}, #{userApiKey}, #{userRole}, #{userType}, now(), now())
 	</insert>
 
 	<select id="selectDuplicateUserCount" resultType="int">

src/main/resources/mapper/admin/auth/AdminLoginMapper.xml

@@ -9,7 +9,7 @@
 			, expires_at = #{expiresAt}
 			, updated_at = now()
 		WHERE user_token_idx = #{userTokenIdx}
-		AND user_role IN ('A')
+		AND user_type IN ('A')
 	</update>
 	<update id="updateAdminLastLoginAt">
 		/*AdminLoginMapper.updateAdminLastLoginAt*/
@@ -25,7 +25,7 @@
 			, expires_at = null
 			, updated_at = now()
 		WHERE user_token_idx = #{userTokenIdx}
-		AND user_role IN ('A')
+		AND user_type IN ('A')
 	</update>
 	<select id="selectAdminLoginById" resultType="com.alist.api.modules.admin.auth.vo.AdminLoginVo">
 		/*AdminLoginMapper.selectAdminLoginById*/
@@ -33,23 +33,27 @@
 			, ATU.id
 			, ATU.password
 			, ATUT.user_token_idx
+			, ATUT.user_role
+			, ATUT.user_type
 		FROM ALISTLMS.test_user ATU
 		INNER JOIN ALISTLMS.test_user_token ATUT ON ATUT.user_idx = ATU.user_idx
 		WHERE ATU.id = #{id}
 			AND ATU.del_yn = 1
-			AND ATUT.user_role IN ('A')
+			AND ATUT.user_type IN ('A')
 		LIMIT 1
 	</select>
 	<select id="selectAdminTokenByUserTokenIdx" resultType="com.alist.api.modules.admin.auth.vo.AdminLoginVo">
 		/*AdminLoginMapper.selectAdminTokenByUserTokenIdx*/
 		SELECT ATU.user_idx
-			 , ATU.id
-			 , ATUT.user_token_idx
-			 , ATUT.refresh_token
+			, ATU.id
+			, ATUT.user_token_idx
+			, ATUT.refresh_token
+			, ATUT.user_role
+			, ATUT.user_type
 		FROM ALISTLMS.test_user_token ATUT
 		INNER JOIN ALISTLMS.test_user ATU ON ATU.user_idx = ATUT.user_idx
 		WHERE ATUT.user_token_idx = #{userTokenIdx}
-			AND ATUT.user_role IN ('A')
+			AND ATUT.user_type IN ('A')
 		  	AND ATU.del_yn = 1
 		LIMIT 1
 	</select>

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

@@ -20,7 +20,7 @@
 		INNER JOIN ALISTLMS.test_user_token ATUT ON ATUT.user_idx = ATU.user_idx
 		WHERE ATU.id = #{id}
 			AND ATU.del_yn = 1
-			AND ATUT.user_role IN ('T','S1','S2')
+			AND ATUT.user_type IN ('T','S')
 		LIMIT 1
 	</select>
 
@@ -28,6 +28,7 @@
 		/*LoginMapper.selectUserTokenByUserId*/
 		select user_token_idx
 			, user_role
+			, user_type
 			, refresh_token
 		from ALISTLMS.test_user_token
 		where user_idx = #{userIdx}
@@ -37,6 +38,7 @@
 		/*LoginMapper.selectUserTokenByUserApiKey*/
 		select user_token_idx
 			, user_role
+			, user_type
 			, refresh_token
 		from ALISTLMS.test_user_token
 		where user_api_key = #{userApiKey}
@@ -46,6 +48,7 @@
 		/*LoginMapper.selectUserTokenByUserTokenIdx*/
 		select user_token_idx
 			, user_role
+			, user_type
 			, refresh_token
 		from ALISTLMS.test_user_token
 		where user_token_idx = #{userTokenIdx}