将 UserAccountRole 更名为 UserRole

account/account-service/src/main/java/cn/reghao/tnb/account/app/db/mapper/UserAccountRoleMapper.java → account/account-service/src/main/java/cn/reghao/tnb/account/app/db/mapper/UserRoleMapper.java

@@ -1,7 +1,7 @@
 package cn.reghao.tnb.account.app.db.mapper;
 
 import cn.reghao.jutil.jdk.db.BaseMapper;
-import cn.reghao.tnb.account.app.model.po.UserAccountRole;
+import cn.reghao.tnb.account.app.model.po.UserRole;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
@@ -11,7 +11,7 @@ import java.util.List;
  * @date 2025-08-13 16:32:45
  */
 @Mapper
-public interface UserAccountRoleMapper extends BaseMapper<UserAccountRole> {
-    List<UserAccountRole> findRolesByUserId(long userId);
+public interface UserRoleMapper extends BaseMapper<UserRole> {
+    List<UserRole> findRolesByUserId(long userId);
     List<Long> findUserIdsByRole(String role);
 }

account/account-service/src/main/java/cn/reghao/tnb/account/app/db/repository/AccountRepository.java

@@ -1,12 +1,11 @@
 package cn.reghao.tnb.account.app.db.repository;
 
-import cn.reghao.jutil.web.ServletUtil;
 import cn.reghao.tnb.account.api.dto.AccountInfo;
 import cn.reghao.tnb.account.app.db.mapper.UserAccountMapper;
-import cn.reghao.tnb.account.app.db.mapper.UserAccountRoleMapper;
+import cn.reghao.tnb.account.app.db.mapper.UserRoleMapper;
 import cn.reghao.tnb.account.app.db.mapper.UserRegistryMapper;
 import cn.reghao.tnb.account.app.model.po.UserAccount;
-import cn.reghao.tnb.account.app.model.po.UserAccountRole;
+import cn.reghao.tnb.account.app.model.po.UserRole;
 import cn.reghao.tnb.account.app.model.po.UserAuthority;
 import cn.reghao.tnb.account.app.model.po.UserRegistry;
 import cn.reghao.tnb.common.auth.AccountRole;
@@ -29,24 +28,24 @@ import java.util.stream.Collectors;
 public class AccountRepository {
     private final UserAccountMapper userAccountMapper;
     private final UserRegistryMapper userRegistryMapper;
-    private final UserAccountRoleMapper userAccountRoleMapper;
+    private final UserRoleMapper userRoleMapper;
 
     public AccountRepository(UserAccountMapper userAccountMapper, UserRegistryMapper userRegistryMapper,
-                             UserAccountRoleMapper userAccountRoleMapper) {
+                             UserRoleMapper userRoleMapper) {
         this.userAccountMapper = userAccountMapper;
         this.userRegistryMapper = userRegistryMapper;
-        this.userAccountRoleMapper = userAccountRoleMapper;
+        this.userRoleMapper = userRoleMapper;
     }
 
     @Transactional(rollbackFor = Exception.class)
     public void saveAccount(UserAccount userAccount) {
         long userId = userAccount.getUserId();
-        Set<UserAccountRole> set = userAccount.getAuthorities().stream()
-                .map(role -> new UserAccountRole(userId, role.getAuthority()))
+        Set<UserRole> set = userAccount.getAuthorities().stream()
+                .map(role -> new UserRole(userId, role.getAuthority()))
                 .collect(Collectors.toSet());
 
         userAccountMapper.save(userAccount);
-        userAccountRoleMapper.saveAll(new ArrayList<>(set));
+        userRoleMapper.saveAll(new ArrayList<>(set));
     }
 
     @CacheEvict(cacheNames = "tnb:account:info", key = "#userId")
@@ -60,8 +59,8 @@ public class AccountRepository {
     }
 
     private void addUserRole(long userId, String role) {
-        UserAccountRole userAccountRole = new UserAccountRole(userId, role);
-        userAccountRoleMapper.save(userAccountRole);
+        UserRole userRole = new UserRole(userId, role);
+        userRoleMapper.save(userRole);
     }
 
     @CacheEvict(cacheNames = "tnb:account:registry", key = "'account-registry'")
@@ -95,8 +94,8 @@ public class AccountRepository {
      * @date 2025-10-17 11:30:05
      */
     public Set<String> getUserRoles(long userId) {
-        return userAccountRoleMapper.findRolesByUserId(userId).stream()
-                .map(UserAccountRole::getName)
+        return userRoleMapper.findRolesByUserId(userId).stream()
+                .map(UserRole::getName)
                 .collect(Collectors.toSet());
     }
 
@@ -105,7 +104,7 @@ public class AccountRepository {
             String role1 = accountRole.getValue();
         }
 
-        List<Long> userIds = userAccountRoleMapper.findUserIdsByRole(role);
+        List<Long> userIds = userRoleMapper.findUserIdsByRole(role);
         return userIds;
     }
 
@@ -157,8 +156,8 @@ public class AccountRepository {
     }
 
     private UserAccount setAccountAuthorities(UserAccount userAccount) {
-        Set<UserAuthority> set = userAccountRoleMapper.findRolesByUserId(userAccount.getUserId()).stream()
-                .map(userAccountRole -> new UserAuthority(userAccountRole.getName()))
+        Set<UserAuthority> set = userRoleMapper.findRolesByUserId(userAccount.getUserId()).stream()
+                .map(userRole -> new UserAuthority(userRole.getName()))
                 .collect(Collectors.toSet());
         userAccount.setAuthorities(set);
         return userAccount;

account/account-service/src/main/java/cn/reghao/tnb/account/app/model/po/UserAccountRole.java → account/account-service/src/main/java/cn/reghao/tnb/account/app/model/po/UserRole.java

@@ -12,11 +12,11 @@ import lombok.NoArgsConstructor;
  */
 @NoArgsConstructor
 @Getter
-public class UserAccountRole extends BaseObject<Integer> {
+public class UserRole extends BaseObject<Integer> {
     private Long userId;
     private String name;
 
-    public UserAccountRole(long userId, String name) {
+    public UserRole(long userId, String name) {
         this.userId = userId;
         this.name = name;
     }

account/account-service/src/main/resources/mapper/UserAccountRoleMapper.xml → account/account-service/src/main/resources/mapper/UserRoleMapper.xml

@@ -1,7 +1,7 @@
 <?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="cn.reghao.tnb.account.app.db.mapper.UserAccountRoleMapper">
+<mapper namespace="cn.reghao.tnb.account.app.db.mapper.UserRoleMapper">
     <insert id="save">
         insert into user_account_role
         (`user_id`,`name`)
@@ -17,7 +17,7 @@
         </foreach>
     </insert>
 
-    <select id="findRolesByUserId" resultType="cn.reghao.tnb.account.app.model.po.UserAccountRole">
+    <select id="findRolesByUserId" resultType="cn.reghao.tnb.account.app.model.po.UserRole">
         select *
         from user_account_role
         where user_id=#{userId}