F2-6: candidateGroup URL 膨胀修复 + 角色缓存失效钩子
- flowable-service: 新增 POST /api/flow/tasks/todo 端点(TodoRequest body), 避免 ceshi 236 角色 × 36 字符拼 GET URL 超 8KB 限制 - FlowableClient.todo() 改用 POST body 传 candidateGroups, 新增 post() ParameterizedTypeReference 重载支持 List 返回类型 - AdminWriteController: 注入 RoleResolver,用户组成员增减调 evict(userId), 用户组角色增减/删除调 evictAll(),确保权限变更后缓存及时失效 - platform-metadata/pom.xml 加 platform-auth 依赖 - AdminWriteControllerTest 适配 RoleResolver mock 参数
This commit is contained in:
@@ -20,6 +20,7 @@ import org.springframework.web.server.ResponseStatusException;
|
||||
|
||||
import com.dsasp.server.common.user.service.LoggedInUser;
|
||||
import com.dsasp.server.common.util.UserSession;
|
||||
import com.eip4.platform.auth.security.RoleResolver;
|
||||
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
@@ -51,9 +52,12 @@ public class AdminWriteController {
|
||||
private static final Logger log = LoggerFactory.getLogger(AdminWriteController.class);
|
||||
|
||||
private final JdbcTemplate jdbcTemplate;
|
||||
/** F2-6 JWT 瘦身:用户组/角色变更后失效角色缓存。 */
|
||||
private final RoleResolver roleResolver;
|
||||
|
||||
public AdminWriteController(JdbcTemplate jdbcTemplate) {
|
||||
public AdminWriteController(JdbcTemplate jdbcTemplate, RoleResolver roleResolver) {
|
||||
this.jdbcTemplate = jdbcTemplate;
|
||||
this.roleResolver = roleResolver;
|
||||
}
|
||||
|
||||
// ================================================================ 用户组写操作
|
||||
@@ -139,6 +143,8 @@ public class AdminWriteController {
|
||||
if (rows == 0) {
|
||||
return ResponseEntity.status(HttpStatus.NOT_FOUND).body(fail("用户组不存在: " + id));
|
||||
}
|
||||
// F2-6:用户组删除影响全部成员角色,全量失效缓存
|
||||
roleResolver.evictAll();
|
||||
log.info("[F2-10][用户组删除] operator={} groupId={}", operator, gid);
|
||||
return ResponseEntity.ok(ok("用户组删除成功"));
|
||||
}
|
||||
@@ -160,6 +166,8 @@ public class AdminWriteController {
|
||||
jdbcTemplate.update(
|
||||
"INSERT INTO sys_usergroupuser(usergroupid, userid) VALUES(?,?) ON CONFLICT DO NOTHING",
|
||||
gid, uid);
|
||||
// F2-6:该用户角色已变,失效其缓存
|
||||
roleResolver.evict(uid);
|
||||
log.info("[F2-10][用户组加成员] operator={} groupId={} userId={}", currentUserId(), gid, uid);
|
||||
return ResponseEntity.ok(ok("成员添加成功"));
|
||||
}
|
||||
@@ -179,6 +187,8 @@ public class AdminWriteController {
|
||||
jdbcTemplate.update(
|
||||
"DELETE FROM sys_usergroupuser WHERE TRIM(usergroupid)=? AND TRIM(userid)=?",
|
||||
id.trim(), userId.trim());
|
||||
// F2-6:该用户角色已变,失效其缓存
|
||||
roleResolver.evict(userId.trim());
|
||||
log.info("[F2-10][用户组减成员] operator={} groupId={} userId={}", currentUserId(), id.trim(), userId.trim());
|
||||
return ResponseEntity.ok(ok("成员移除成功"));
|
||||
}
|
||||
@@ -198,6 +208,8 @@ public class AdminWriteController {
|
||||
jdbcTemplate.update(
|
||||
"INSERT INTO sys_usergrouprole(usergroupid, roleid) VALUES(?,?) ON CONFLICT DO NOTHING",
|
||||
id.trim(), roleId.trim());
|
||||
// F2-6:组角色变更影响该组全部成员,全量失效缓存
|
||||
roleResolver.evictAll();
|
||||
log.info("[F2-10][用户组加角色] operator={} groupId={} roleId={}", currentUserId(), id.trim(), roleId.trim());
|
||||
return ResponseEntity.ok(ok("角色关联成功"));
|
||||
}
|
||||
@@ -217,6 +229,8 @@ public class AdminWriteController {
|
||||
jdbcTemplate.update(
|
||||
"DELETE FROM sys_usergrouprole WHERE TRIM(usergroupid)=? AND TRIM(roleid)=?",
|
||||
id.trim(), roleId.trim());
|
||||
// F2-6:组角色变更影响该组全部成员,全量失效缓存
|
||||
roleResolver.evictAll();
|
||||
log.info("[F2-10][用户组减角色] operator={} groupId={} roleId={}", currentUserId(), id.trim(), roleId.trim());
|
||||
return ResponseEntity.ok(ok("角色关联移除成功"));
|
||||
}
|
||||
|
||||
@@ -30,6 +30,7 @@ import org.springframework.web.server.ResponseStatusException;
|
||||
|
||||
import com.dsasp.server.common.user.service.LoggedInUser;
|
||||
import com.dsasp.server.common.util.UserSession;
|
||||
import com.eip4.platform.auth.security.RoleResolver;
|
||||
|
||||
/**
|
||||
* F2-10 AdminWriteController 单测(mock JdbcTemplate + UserSession,不连库)。
|
||||
@@ -41,13 +42,15 @@ import com.dsasp.server.common.util.UserSession;
|
||||
class AdminWriteControllerTest {
|
||||
|
||||
private JdbcTemplate jdbc;
|
||||
private RoleResolver roleResolver;
|
||||
private AdminWriteController controller;
|
||||
private MockedStatic<UserSession> userSessionMock;
|
||||
|
||||
@BeforeEach
|
||||
void setUp() {
|
||||
jdbc = mock(JdbcTemplate.class);
|
||||
controller = new AdminWriteController(jdbc);
|
||||
roleResolver = mock(RoleResolver.class);
|
||||
controller = new AdminWriteController(jdbc, roleResolver);
|
||||
userSessionMock = mockStatic(UserSession.class);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user