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:
2026-06-12 03:09:36 +08:00
parent 2f1f00a74a
commit 2dcc0c61bf
6 changed files with 61 additions and 23 deletions

View File

@@ -111,6 +111,17 @@ public class FlowController {
}
}
/**
* F2-6 JWT 瘦身:待办查询 POST 版本,candidateGroups 放 body 避免 URL 超 8KB。
* 语义与 GET /tasks/todo 完全一致,gateway 优先调此端点。
*/
@PostMapping("/tasks/todo")
@Operation(summary = "待办列表(POST body版)", description = "F2-6:candidateGroups 放 body,避免多角色用户 URL 超 8KB 限制;语义同 GET /tasks/todo")
public List<TaskDto> todoPost(@RequestBody Requests.TodoRequest req) {
if (req == null) req = new Requests.TodoRequest();
return todo(req.assignee, req.candidateGroups, req.candidateUser, req.firstResult, req.maxResults);
}
@GetMapping("/tasks/todo/count")
@Operation(summary = "待办计数", description = "与 act_ru_task 直查对账用:按 assignee 计活动待办数")
public long todoCount(@RequestParam(required = false) String assignee) {

View File

@@ -27,4 +27,16 @@ public final class Requests {
public static class DelegateRequest {
public String delegateUserId;
}
/**
* F2-6 JWT 瘦身:待办查询 body(替代 GET candidateGroup 多值参数,
* 避免多角色用户 URL 超 8KB Tomcat 默认限制)。
*/
public static class TodoRequest {
public String assignee;
public java.util.List<String> candidateGroups;
public String candidateUser;
public int firstResult = 0;
public int maxResults = 50;
}
}

View File

@@ -54,30 +54,18 @@ public class FlowableClient {
/**
* 当前用户待办(按 assignee + 候选组/候选用户;空集合表示不按该维度过滤)。
*
* <p>对应引擎 {@code TaskQuery.active().taskAssignee()/taskCandidateGroup()/taskCandidateUser()}。
* 三维任一为空则不下发该 query 参数(由 flowable-service 侧 {@code isBlank} 跳过)。
* <p>F2-6 JWT 瘦身:改用 POST body 传 candidateGroups,避免多角色用户(如 ceshi 236 个角色)
* URL 超 Tomcat 默认 8KB 限制。flowable-service 新增 POST /api/flow/tasks/todo 端点承接。
*/
public List<FlowTaskDto> todo(String assignee, List<String> candidateGroups, String candidateUser,
int firstResult, int maxResults) {
return get("待办", uri -> {
uri.path("/api/flow/tasks/todo");
if (notBlank(assignee)) {
uri.queryParam("assignee", assignee);
}
if (candidateGroups != null) {
for (String g : candidateGroups) {
if (notBlank(g)) {
uri.queryParam("candidateGroup", g);
}
}
}
if (notBlank(candidateUser)) {
uri.queryParam("candidateUser", candidateUser);
}
uri.queryParam("firstResult", firstResult);
uri.queryParam("maxResults", maxResults);
return uri.build();
});
Map<String, Object> body = new java.util.LinkedHashMap<>();
body.put("assignee", assignee);
body.put("candidateGroups", candidateGroups != null ? candidateGroups : List.of());
body.put("candidateUser", candidateUser);
body.put("firstResult", firstResult);
body.put("maxResults", maxResults);
return post("待办", "/api/flow/tasks/todo", body, TASK_LIST);
}
/** 当前用户已办(历史已完成任务,按 assignee)。 */
@@ -155,6 +143,14 @@ public class FlowableClient {
.body(respType));
}
private <T> T post(String op, String path, Object body, ParameterizedTypeReference<T> respType) {
return execute(op, () -> restClient.post()
.uri(path)
.body(body == null ? Map.of() : body)
.retrieve()
.body(respType));
}
/**
* 统一执行:连接级故障带退避重试 maxRetries 次,耗尽 → 503 语义;业务错(4xx/5xx)立即透传不重试。
*/

View File

@@ -14,6 +14,8 @@
<dependencies>
<dependency><groupId>com.eip4</groupId><artifactId>platform-legacy-core</artifactId></dependency>
<dependency><groupId>com.eip4</groupId><artifactId>platform-converter</artifactId></dependency>
<!-- F2-6 JWT 瘦身:AdminWriteController 调 RoleResolver.evict/evictAll 失效角色缓存 -->
<dependency><groupId>com.eip4</groupId><artifactId>platform-auth</artifactId></dependency>
<dependency><groupId>org.springframework.boot</groupId><artifactId>spring-boot-starter-web</artifactId></dependency>
<dependency><groupId>org.springdoc</groupId><artifactId>springdoc-openapi-starter-webmvc-ui</artifactId></dependency>
<dependency><groupId>com.networknt</groupId><artifactId>json-schema-validator</artifactId></dependency>

View File

@@ -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("角色关联移除成功"));
}

View File

@@ -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);
}