diff --git a/flowable-service/src/main/java/com/eip4/flowservice/api/FlowController.java b/flowable-service/src/main/java/com/eip4/flowservice/api/FlowController.java index c83eedb..ff3f1e7 100644 --- a/flowable-service/src/main/java/com/eip4/flowservice/api/FlowController.java +++ b/flowable-service/src/main/java/com/eip4/flowservice/api/FlowController.java @@ -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 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) { diff --git a/flowable-service/src/main/java/com/eip4/flowservice/api/Requests.java b/flowable-service/src/main/java/com/eip4/flowservice/api/Requests.java index e8651a0..0544e74 100644 --- a/flowable-service/src/main/java/com/eip4/flowservice/api/Requests.java +++ b/flowable-service/src/main/java/com/eip4/flowservice/api/Requests.java @@ -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 candidateGroups; + public String candidateUser; + public int firstResult = 0; + public int maxResults = 50; + } } diff --git a/platform-flow-gateway/src/main/java/com/eip4/platform/flowgateway/client/FlowableClient.java b/platform-flow-gateway/src/main/java/com/eip4/platform/flowgateway/client/FlowableClient.java index 0c0470d..923e179 100644 --- a/platform-flow-gateway/src/main/java/com/eip4/platform/flowgateway/client/FlowableClient.java +++ b/platform-flow-gateway/src/main/java/com/eip4/platform/flowgateway/client/FlowableClient.java @@ -54,30 +54,18 @@ public class FlowableClient { /** * 当前用户待办(按 assignee + 候选组/候选用户;空集合表示不按该维度过滤)。 * - *

对应引擎 {@code TaskQuery.active().taskAssignee()/taskCandidateGroup()/taskCandidateUser()}。 - * 三维任一为空则不下发该 query 参数(由 flowable-service 侧 {@code isBlank} 跳过)。 + *

F2-6 JWT 瘦身:改用 POST body 传 candidateGroups,避免多角色用户(如 ceshi 236 个角色) + * URL 超 Tomcat 默认 8KB 限制。flowable-service 新增 POST /api/flow/tasks/todo 端点承接。 */ public List todo(String assignee, List 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 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 post(String op, String path, Object body, ParameterizedTypeReference respType) { + return execute(op, () -> restClient.post() + .uri(path) + .body(body == null ? Map.of() : body) + .retrieve() + .body(respType)); + } + /** * 统一执行:连接级故障带退避重试 maxRetries 次,耗尽 → 503 语义;业务错(4xx/5xx)立即透传不重试。 */ diff --git a/platform-metadata/pom.xml b/platform-metadata/pom.xml index 304ecaa..abb9dee 100644 --- a/platform-metadata/pom.xml +++ b/platform-metadata/pom.xml @@ -14,6 +14,8 @@ com.eip4platform-legacy-core com.eip4platform-converter + + com.eip4platform-auth org.springframework.bootspring-boot-starter-web org.springdocspringdoc-openapi-starter-webmvc-ui com.networkntjson-schema-validator diff --git a/platform-metadata/src/main/java/com/eip4/platform/metadata/web/AdminWriteController.java b/platform-metadata/src/main/java/com/eip4/platform/metadata/web/AdminWriteController.java index cdf2b34..5fdf39d 100644 --- a/platform-metadata/src/main/java/com/eip4/platform/metadata/web/AdminWriteController.java +++ b/platform-metadata/src/main/java/com/eip4/platform/metadata/web/AdminWriteController.java @@ -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("角色关联移除成功")); } diff --git a/platform-metadata/src/test/java/com/eip4/platform/metadata/web/AdminWriteControllerTest.java b/platform-metadata/src/test/java/com/eip4/platform/metadata/web/AdminWriteControllerTest.java index 081a32a..cfe1f58 100644 --- a/platform-metadata/src/test/java/com/eip4/platform/metadata/web/AdminWriteControllerTest.java +++ b/platform-metadata/src/test/java/com/eip4/platform/metadata/web/AdminWriteControllerTest.java @@ -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 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); }