> readIds = ArgumentCaptor.forClass(List.class);
- verify(msgProxy).read(eq(201), readIds.capture());
+ verify(msgProxy).read(eq(201), readIds.capture(), any());
assertTrue(readIds.getValue().contains(5L), "办理成功后标记已读");
}
@@ -180,6 +180,6 @@ class MsgApprovalProxyServiceTest {
assertFalse((Boolean) out.get("ok"));
assertEquals("当前用户不是该任务办理人", out.get("message"), "业务拒绝原文透出（flow-center 逐字复核）");
- verify(msgProxy, never()).read(any(), any());
+ verify(msgProxy, never()).read(any(), any(), any());
}
}
diff --git a/src/test/java/com/yunhai/userhome/service/MsgCenterProxyServiceTest.java b/src/test/java/com/yunhai/userhome/service/MsgCenterProxyServiceTest.java
index c191739..1619619 100644
--- a/src/test/java/com/yunhai/userhome/service/MsgCenterProxyServiceTest.java
+++ b/src/test/java/com/yunhai/userhome/service/MsgCenterProxyServiceTest.java
@@ -5,13 +5,19 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.yunhai.platform.openapi.core.OpenApiException;
import com.yunhai.platform.openapi.core.TargetSpec;
import com.yunhai.platform.openapi.core.YschOpenCall;
+import com.yunhai.platform.openapi.msg.model.AppMsgCount;
+import com.yunhai.platform.openapi.msg.model.MsgListPage;
+import com.yunhai.platform.openapi.msg.model.ReadAllMsgRequest;
+import com.yunhai.platform.openapi.msg.model.UserMsgSummary;
import com.yunhai.userhome.config.MsgCenterProperties;
+import com.yunhai.userhome.entity.UserCurrentRole;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import java.util.Map;
+import java.util.Optional;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -45,27 +51,56 @@ import static org.mockito.Mockito.when;
* 160 事故根因 = IDHttp 共享签名拦截器只剥本应用 base-path，目标带 ctx（/usermsg）时
* 签名路径多一层前缀 → UserMsg AppAuthFilter 401。回归断言：TargetSpec 从
* usermsg-base-url 解析出 basePath=/usermsg（per-target 剥离），调用 path 为 ctx 裸路径。
+ *
+ * 按学校隔离（2026-10-09 批次3）：消息读取（list/summary/unreadCount/countByApp/readAll）改走
+ * SDK msg 域类型化读方法（Tier 1，仍委托同一个 {@link YschOpenCall}，故断言靶心从 JsonNode
+ * 换成 DTO class：{@code MsgListPage/UserMsgSummary/Long/AppMsgCount/Void}），并带
+ * 当前激活身份学校口径（{@link MsgCenterProxyService#resolveReadSchId}，R2）；
+ * 待办角标 todo/list 仍按主学校口径（§8 不动角标链路），两者在 summary 上是两个独立入参。
*/
-@DisplayName("MsgCenterProxyService - YschOpenCall 代理、jumpUrl 改写与 showJump 判权")
+@DisplayName("MsgCenterProxyService - SDK 类型化读取、学校口径下行与 jumpUrl/showJump 改写")
class MsgCenterProxyServiceTest {
/** 160 生产形态的 UserMsg 直连地址（含目标 context-path） */
private static final String PROD_BASE_URL = "http://usermsg-service:10009/usermsg";
+ private static final ObjectMapper MAPPER = new ObjectMapper();
+
private YschOpenCall openCall;
+ private IUserCurrentRoleService userCurrentRoleService;
private MsgCenterProperties properties;
private MsgCenterProxyService service;
@BeforeEach
void setUp() {
openCall = mock(YschOpenCall.class);
+ userCurrentRoleService = mock(IUserCurrentRoleService.class);
properties = new MsgCenterProperties();
properties.setUsermsgBaseUrl(PROD_BASE_URL);
- service = new MsgCenterProxyService(openCall, properties);
+ service = new MsgCenterProxyService(openCall, properties, userCurrentRoleService);
}
private static JsonNode json(String s) throws Exception {
- return new ObjectMapper().readTree(s);
+ return MAPPER.readTree(s);
+ }
+
+ /** SDK 类型化读方法的响应靶心：同一份 JSON 夹具直接绑成 SDK DTO（契约字段与 UserMsg 出参对齐） */
+ private static T dto(String s, Class type) throws Exception {
+ return MAPPER.readValue(s, type);
+ }
+
+ private static java.util.List listDto(String s, Class elementType) throws Exception {
+ return MAPPER.readValue(s, MAPPER.getTypeFactory()
+ .constructCollectionType(java.util.List.class, elementType));
+ }
+
+ /** 当前身份 stub（R2 数据源）：findById(userId) 返回给定 schId 的激活身份 */
+ private void stubCurrentIdentity(Integer schId) {
+ UserCurrentRole role = new UserCurrentRole();
+ role.setUserId(201);
+ role.setRoleId(9);
+ role.setSchId(schId);
+ when(userCurrentRoleService.findById(201)).thenReturn(Optional.of(role));
}
/** 判权 stub：/oapi/app/authorized-codes 返回给定 app_code 集合 */
@@ -89,16 +124,118 @@ class MsgCenterProxyServiceTest {
+ "\",\"name\":\"" + name + "\"}]}]"));
}
+ // ===== R2：读取口径 schId 必须来自当前激活身份（严禁会话主学校） =====
+
+ @Test
+ void resolveReadSchId_usesCurrentIdentitySchool() {
+ stubCurrentIdentity(7);
+ assertEquals(Integer.valueOf(7), service.resolveReadSchId(201), "当前身份 schId>0 → 原值下行（本校+平台可见）");
+ }
+
+ @Test
+ void resolveReadSchId_platformIdentityZeroMeansSeeAll() {
+ stubCurrentIdentity(0);
+ assertNull(service.resolveReadSchId(201), "schId=0（平台/超管）→ null=看全部（D5）");
+ stubCurrentIdentity(null);
+ assertNull(service.resolveReadSchId(201), "身份无 schId 同样按看全部处理");
+ }
+
+ @Test
+ void resolveReadSchId_identityChainDown_seesAllWithoutThrowing() {
+ when(userCurrentRoleService.findById(201)).thenThrow(new OpenApiException("userbase down"));
+ assertNull(service.resolveReadSchId(201), "身份链不可达降级 null=改造前全量口径，铃铛不 500");
+ assertNull(service.resolveReadSchId(null), "无登录人不出站");
+ verify(userCurrentRoleService, never()).findById(null);
+ }
+
+ // ===== 批次3：学校口径随读端点下行（R1 的下游半程） =====
+
+ @Test
+ void list_andSummary_passSchIdDownstream() throws Exception {
+ when(openCall.get(any(TargetSpec.class), eq("/oapi/msg/list"), anyMap(), eq(MsgListPage.class)))
+ .thenReturn(dto("{\"total\":0,\"content\":[]}", MsgListPage.class));
+ when(openCall.get(any(TargetSpec.class), eq("/oapi/msg/summary"), anyMap(), eq(UserMsgSummary.class)))
+ .thenReturn(dto("{\"unreadCount\":1}", UserMsgSummary.class));
+ when(openCall.get(any(TargetSpec.class), eq("/oapi/msg/todo/list"), anyMap(), eq(JsonNode.class)))
+ .thenReturn(json("[]"));
+
+ service.list(201, 1, 10, null, null, null, null, null, 7);
+ service.summary(201, 7, 3);
+
+ @SuppressWarnings("unchecked")
+ ArgumentCaptor> listQuery = ArgumentCaptor.forClass(Map.class);
+ verify(openCall).get(any(TargetSpec.class), eq("/oapi/msg/list"), listQuery.capture(), eq(MsgListPage.class));
+ assertEquals("7", listQuery.getValue().get("schId"));
+
+ @SuppressWarnings("unchecked")
+ ArgumentCaptor> summaryQuery = ArgumentCaptor.forClass(Map.class);
+ verify(openCall).get(any(TargetSpec.class), eq("/oapi/msg/summary"), summaryQuery.capture(),
+ eq(UserMsgSummary.class));
+ assertEquals("7", summaryQuery.getValue().get("schId"), "摘要未读/分类计数按当前身份学校口径");
+
+ @SuppressWarnings("unchecked")
+ ArgumentCaptor> todoQuery = ArgumentCaptor.forClass(Map.class);
+ verify(openCall).get(any(TargetSpec.class), eq("/oapi/msg/todo/list"), todoQuery.capture(), eq(JsonNode.class));
+ assertEquals("3", todoQuery.getValue().get("schId"), "待办角标沿用主学校口径（§8 链路不变）");
+ }
+
+ @Test
+ void countByApp_passesSchIdAndEnriches() throws Exception {
+ stubAppDict(100011, "100019", "流程中心");
+ when(openCall.getList(any(TargetSpec.class), eq("/oapi/msg/countByApp"), anyMap(), eq(AppMsgCount.class)))
+ .thenReturn(listDto("[{\"appKey\":\"100019\",\"total\":4,\"unread\":1}]", AppMsgCount.class));
+
+ java.util.List> rows = service.countByApp(201, 7);
+
+ @SuppressWarnings("unchecked")
+ ArgumentCaptor> query = ArgumentCaptor.forClass(Map.class);
+ verify(openCall).getList(any(TargetSpec.class), eq("/oapi/msg/countByApp"), query.capture(),
+ eq(AppMsgCount.class));
+ assertEquals("7", query.getValue().get("schId"));
+ assertEquals(1, rows.size());
+ assertEquals(100011, rows.get(0).get("appId"));
+ assertEquals(4L, rows.get(0).get("total"));
+ }
+
+ @Test
+ void read_schIdGoesIntoBodyOnlyWhenPresent() {
+ ArgumentCaptor> body = ArgumentCaptor.forClass(Map.class);
+
+ service.read(201, java.util.Collections.singletonList(7L), 7);
+ verify(openCall).post(any(TargetSpec.class), eq("/oapi/msg/read"), anyMap(), body.capture(),
+ eq(JsonNode.class));
+ assertEquals(7, body.getValue().get("schId"), "schId 供 UserMsg 侧缓存失效键与 readState 口径（D8）");
+ assertEquals(201, body.getValue().get("userId"));
+
+ ArgumentCaptor> body2 = ArgumentCaptor.forClass(Map.class);
+ service.read(201, java.util.Collections.singletonList(8L), null);
+ verify(openCall, org.mockito.Mockito.times(2))
+ .post(any(TargetSpec.class), eq("/oapi/msg/read"), anyMap(), body2.capture(), eq(JsonNode.class));
+ assertFalse(body2.getAllValues().get(1).containsKey("schId"), "null 不下发=平台视角（与历史调用一致）");
+ }
+
+ @Test
+ void readAll_goesThroughSdkWithSchId() {
+ ArgumentCaptor body = ArgumentCaptor.forClass(ReadAllMsgRequest.class);
+ service.readAll(201, 7);
+ verify(openCall).post(any(TargetSpec.class), eq("/oapi/msg/readAll"), anyMap(), body.capture(),
+ eq(Void.class));
+ assertEquals(Integer.valueOf(201), body.getValue().getUserId());
+ assertEquals(Integer.valueOf(7), body.getValue().getSchId(), "全部已读按当前身份学校限定（D6）");
+ }
+
+ // ===== 寻址回归（160 事故）与 list 改写 =====
+
@Test
void list_targetSpecStripsUsermsgCtx_forPerTargetSign() {
// 160 回归：签名剥离的载体是 TargetSpec.basePath，必须等于 /usermsg
- when(openCall.get(any(TargetSpec.class), eq("/oapi/msg/list"), anyMap(), eq(JsonNode.class)))
+ when(openCall.get(any(TargetSpec.class), eq("/oapi/msg/list"), anyMap(), eq(MsgListPage.class)))
.thenReturn(null);
- service.list(201, 1, 10, null, null, null, null, null);
+ service.list(201, 1, 10, null, null, null, null, null, null);
ArgumentCaptor spec = ArgumentCaptor.forClass(TargetSpec.class);
- verify(openCall).get(spec.capture(), eq("/oapi/msg/list"), anyMap(), eq(JsonNode.class));
+ verify(openCall).get(spec.capture(), eq("/oapi/msg/list"), anyMap(), eq(MsgListPage.class));
assertEquals("http://usermsg-service:10009", spec.getValue().getBaseHost());
assertEquals("/usermsg", spec.getValue().getBasePath(), "basePath=目标 ctx，AppSignInterceptor 据此剥离后签名");
}
@@ -109,29 +246,31 @@ class MsgCenterProxyServiceTest {
// 自发消息无 jumpApp → 按发送方 appKey 走 by-key 注册表（严格二选一）
stubUserbaseGet("/oapi/app/by-key/100019",
"{\"id\":100011,\"appKey\":100019,\"name\":\"流程中心\",\"pcUrl\":\"http://localhost:8088\"}");
- when(openCall.get(any(TargetSpec.class), eq("/oapi/msg/list"), anyMap(), eq(JsonNode.class)))
- .thenReturn(json("{\"total\":2,\"content\":["
+ when(openCall.get(any(TargetSpec.class), eq("/oapi/msg/list"), anyMap(), eq(MsgListPage.class)))
+ .thenReturn(dto("{\"total\":2,\"content\":["
+ "{\"msgId\":1,\"title\":\"新待办\",\"content\":\"您有新的审批任务\",\"msgType\":2,"
+ "\"jumpType\":1,\"jumpPath\":\"/task/123\",\"appKey\":\"100019\",\"bizType\":\"flow.task\","
+ "\"bizId\":\"123\",\"sendTime\":\"2026-09-13 10:00:00\",\"isRead\":0},"
+ "{\"msgId\":2,\"title\":\"无跳转\",\"content\":\"系统通知\",\"msgType\":0,"
- + "\"jumpType\":0,\"jumpPath\":null,\"bizType\":null,\"isRead\":1}]}"));
+ + "\"jumpType\":0,\"jumpPath\":null,\"bizType\":null,\"isRead\":1}]}", MsgListPage.class));
- Map out = service.list(201, 2, 20, Boolean.TRUE, null, null, null, null);
+ Map out = service.list(201, 2, 20, Boolean.TRUE, null, null, null, null, null);
@SuppressWarnings("unchecked")
ArgumentCaptor> query = ArgumentCaptor.forClass(Map.class);
- verify(openCall).get(any(TargetSpec.class), eq("/oapi/msg/list"), query.capture(), eq(JsonNode.class));
+ verify(openCall).get(any(TargetSpec.class), eq("/oapi/msg/list"), query.capture(), eq(MsgListPage.class));
assertEquals("201", query.getValue().get("userId"));
assertEquals("2", query.getValue().get("pageIndex"));
assertEquals("20", query.getValue().get("pageSize"));
assertEquals("true", query.getValue().get("onlyUnread"));
+ assertFalse(query.getValue().containsKey("schId"), "schId=null 不下发（向后兼容，验收 7）");
assertEquals(2, out.get("total"));
java.util.List rows = (java.util.List) out.get("list");
Map first = (Map) rows.get(0);
assertEquals("http://localhost:8088#/task/123", first.get("jumpUrl"), "注册表 pc_url + # + 裸路径");
assertEquals("flow.task", first.get("bizType"));
+ assertEquals("2026-09-13 10:00:00", first.get("sendTime"), "sendTime 逐字段透传（SDK 侧 String 口径）");
assertEquals(Boolean.TRUE, first.get("showJump"), "无 jumpApp 不判权放行");
assertNull(first.get("appName"), "未配置映射的 appKey 不补应用名");
Map second = (Map) rows.get(1);
@@ -141,12 +280,12 @@ class MsgCenterProxyServiceTest {
@Test
void list_defaultsPageParams() {
- when(openCall.get(any(TargetSpec.class), eq("/oapi/msg/list"), anyMap(), eq(JsonNode.class)))
+ when(openCall.get(any(TargetSpec.class), eq("/oapi/msg/list"), anyMap(), eq(MsgListPage.class)))
.thenReturn(null);
- service.list(201, 0, 999, null, null, null, null, null);
+ service.list(201, 0, 999, null, null, null, null, null, null);
@SuppressWarnings("unchecked")
ArgumentCaptor> query = ArgumentCaptor.forClass(Map.class);
- verify(openCall).get(any(TargetSpec.class), eq("/oapi/msg/list"), query.capture(), eq(JsonNode.class));
+ verify(openCall).get(any(TargetSpec.class), eq("/oapi/msg/list"), query.capture(), eq(MsgListPage.class));
assertEquals("1", query.getValue().get("pageIndex"), "非法页码回退 1");
assertEquals("100", query.getValue().get("pageSize"), "页长上限 100");
assertEquals("false", query.getValue().get("onlyUnread"));
@@ -155,10 +294,11 @@ class MsgCenterProxyServiceTest {
@Test
void list_appNameMappedFromAppKey() throws Exception {
properties.getAppNames().put("100617", "通知公告");
- when(openCall.get(any(TargetSpec.class), eq("/oapi/msg/list"), anyMap(), eq(JsonNode.class)))
- .thenReturn(json("{\"total\":1,\"content\":[{\"msgId\":1,\"title\":\"通知公告\","
- + "\"content\":\"您有一条通知\",\"msgType\":0,\"appKey\":\"100617\",\"isRead\":0}]}"));
- Map out = service.list(201, 1, 10, null, null, null, null, null);
+ when(openCall.get(any(TargetSpec.class), eq("/oapi/msg/list"), anyMap(), eq(MsgListPage.class)))
+ .thenReturn(dto("{\"total\":1,\"content\":[{\"msgId\":1,\"title\":\"通知公告\","
+ + "\"content\":\"您有一条通知\",\"msgType\":0,\"appKey\":\"100617\",\"isRead\":0}]}",
+ MsgListPage.class));
+ Map out = service.list(201, 1, 10, null, null, null, null, null, null);
Map first = (Map) ((java.util.List) out.get("list")).get(0);
assertEquals("通知公告", first.get("appName"), "appKey 命中映射补应用名");
}
@@ -167,9 +307,9 @@ class MsgCenterProxyServiceTest {
* 应用字典（appId 翻译/行富化）2026-10-08 起每次 list 固定取一次，与查址无关。 */
@Test
void list_noRegistrySource_jumpUrlNull() throws Exception {
- when(openCall.get(any(TargetSpec.class), eq("/oapi/msg/list"), anyMap(), eq(JsonNode.class)))
- .thenReturn(json("{\"total\":1,\"content\":[{\"msgId\":1,\"jumpType\":1,"
- + "\"jumpPath\":\"/task/9\",\"bizType\":\"flow.task\",\"isRead\":0}]}"));
+ when(openCall.get(any(TargetSpec.class), eq("/oapi/msg/list"), anyMap(), eq(MsgListPage.class)))
+ .thenReturn(dto("{\"total\":1,\"content\":[{\"msgId\":1,\"jumpType\":1,"
+ + "\"jumpPath\":\"/task/9\",\"bizType\":\"flow.task\",\"isRead\":0}]}", MsgListPage.class));
Map first = firstRow();
assertNull(first.get("jumpUrl"), "无注册表查询键 → 不改写");
assertEquals(Boolean.FALSE, first.get("showJump"));
@@ -188,10 +328,10 @@ class MsgCenterProxyServiceTest {
"{\"id\":100013,\"appKey\":100001,\"name\":\"通知公告\","
+ "\"pcUrl\":\"http://localhost:8077\"}");
stubAuthorizedCodes("notice", "flow-center");
- when(openCall.get(any(TargetSpec.class), eq("/oapi/msg/list"), anyMap(), eq(JsonNode.class)))
- .thenReturn(json("{\"total\":1,\"content\":[{\"msgId\":1,\"jumpType\":1,"
+ when(openCall.get(any(TargetSpec.class), eq("/oapi/msg/list"), anyMap(), eq(MsgListPage.class)))
+ .thenReturn(dto("{\"total\":1,\"content\":[{\"msgId\":1,\"jumpType\":1,"
+ "\"jumpPath\":\"/list/detail?serid=1\",\"bizType\":\"flow.task\",\"jumpApp\":\"notice\","
- + "\"isRead\":0}]}"));
+ + "\"isRead\":0}]}", MsgListPage.class));
Map first = firstRow();
assertEquals("http://localhost:8077#/list/detail?serid=1", first.get("jumpUrl"),
"归属应用 jumpApp 主查 by-code");
@@ -202,10 +342,10 @@ class MsgCenterProxyServiceTest {
/** 存量兼容：改造前落库的绝对 URL 直接透传，不再拼基址（B5；双前缀缺陷即源于二次拼接） */
@Test
void list_absoluteJumpPath_passedThrough() throws Exception {
- when(openCall.get(any(TargetSpec.class), eq("/oapi/msg/list"), anyMap(), eq(JsonNode.class)))
- .thenReturn(json("{\"total\":1,\"content\":[{\"msgId\":1,\"jumpType\":1,"
+ when(openCall.get(any(TargetSpec.class), eq("/oapi/msg/list"), anyMap(), eq(MsgListPage.class)))
+ .thenReturn(dto("{\"total\":1,\"content\":[{\"msgId\":1,\"jumpType\":1,"
+ "\"jumpPath\":\"http://base.yunhaixingtong.com/notice/#/list/detail?serid=1\","
- + "\"bizType\":\"flow.task\",\"isRead\":0}]}"));
+ + "\"bizType\":\"flow.task\",\"isRead\":0}]}", MsgListPage.class));
Map first = firstRow();
assertEquals("http://base.yunhaixingtong.com/notice/#/list/detail?serid=1", first.get("jumpUrl"),
"绝对 URL 原样透传");
@@ -217,9 +357,10 @@ class MsgCenterProxyServiceTest {
void list_jumpAppAbsent_fallsBackToSendersAppKey() throws Exception {
stubUserbaseGet("/oapi/app/by-key/100019",
"{\"id\":100011,\"appKey\":100019,\"name\":\"流程中心\",\"pcUrl\":\"http://localhost:8088\"}");
- when(openCall.get(any(TargetSpec.class), eq("/oapi/msg/list"), anyMap(), eq(JsonNode.class)))
- .thenReturn(json("{\"total\":1,\"content\":[{\"msgId\":1,\"jumpType\":1,"
- + "\"jumpPath\":\"/task/9\",\"bizType\":\"flow.task\",\"appKey\":\"100019\",\"isRead\":0}]}"));
+ when(openCall.get(any(TargetSpec.class), eq("/oapi/msg/list"), anyMap(), eq(MsgListPage.class)))
+ .thenReturn(dto("{\"total\":1,\"content\":[{\"msgId\":1,\"jumpType\":1,"
+ + "\"jumpPath\":\"/task/9\",\"bizType\":\"flow.task\",\"appKey\":\"100019\",\"isRead\":0}]}",
+ MsgListPage.class));
Map first = firstRow();
assertEquals("http://localhost:8088#/task/9", first.get("jumpUrl"), "无归属声明回落发送方 appKey");
assertEquals(Boolean.TRUE, first.get("showJump"));
@@ -229,10 +370,10 @@ class MsgCenterProxyServiceTest {
@Test
void list_jumpAppMiss_noAppKeyFallback_jumpUrlNull() throws Exception {
stubUserbaseGet("/oapi/app/by-code/unknown-app", null);
- when(openCall.get(any(TargetSpec.class), eq("/oapi/msg/list"), anyMap(), eq(JsonNode.class)))
- .thenReturn(json("{\"total\":1,\"content\":[{\"msgId\":1,\"jumpType\":1,"
+ when(openCall.get(any(TargetSpec.class), eq("/oapi/msg/list"), anyMap(), eq(MsgListPage.class)))
+ .thenReturn(dto("{\"total\":1,\"content\":[{\"msgId\":1,\"jumpType\":1,"
+ "\"jumpPath\":\"/task/9\",\"bizType\":\"flow.task\",\"jumpApp\":\"unknown-app\","
- + "\"isRead\":0}]}"));
+ + "\"isRead\":0}]}", MsgListPage.class));
Map first = firstRow();
assertNull(first.get("jumpUrl"));
assertEquals(Boolean.FALSE, first.get("showJump"));
@@ -244,9 +385,10 @@ class MsgCenterProxyServiceTest {
stubUserbaseGet("/oapi/app/by-code/notice", null);
stubUserbaseGet("/oapi/app/by-key/100006",
"{\"id\":100006,\"appKey\":100006,\"name\":\"成绩管理\",\"pcUrl\":\"http://localhost:8090\"}");
- when(openCall.get(any(TargetSpec.class), eq("/oapi/msg/list"), anyMap(), eq(JsonNode.class)))
- .thenReturn(json("{\"total\":1,\"content\":[{\"msgId\":1,\"jumpType\":1,"
- + "\"jumpPath\":\"/score/9\",\"appKey\":\"100006\",\"jumpApp\":\"notice\",\"isRead\":0}]}"));
+ when(openCall.get(any(TargetSpec.class), eq("/oapi/msg/list"), anyMap(), eq(MsgListPage.class)))
+ .thenReturn(dto("{\"total\":1,\"content\":[{\"msgId\":1,\"jumpType\":1,"
+ + "\"jumpPath\":\"/score/9\",\"appKey\":\"100006\",\"jumpApp\":\"notice\",\"isRead\":0}]}",
+ MsgListPage.class));
Map first = firstRow();
assertNull(first.get("jumpUrl"), "jumpApp 命中即只认注册表结果，空就是空");
verify(openCall, never()).get(eq("userbase"), eq("/oapi/app/by-key/100006"), isNull(), eq(JsonNode.class));
@@ -258,9 +400,10 @@ class MsgCenterProxyServiceTest {
stubUserbaseGet("/oapi/app/by-code/notice",
"{\"id\":100013,\"appKey\":100001,\"name\":\"通知公告\",\"pcUrl\":\"http://localhost:8077/\"}");
stubAuthorizedCodes("notice");
- when(openCall.get(any(TargetSpec.class), eq("/oapi/msg/list"), anyMap(), eq(JsonNode.class)))
- .thenReturn(json("{\"total\":1,\"content\":[{\"msgId\":1,\"jumpType\":1,"
- + "\"jumpPath\":\"list/detail?serid=1\",\"jumpApp\":\"notice\",\"isRead\":0}]}"));
+ when(openCall.get(any(TargetSpec.class), eq("/oapi/msg/list"), anyMap(), eq(MsgListPage.class)))
+ .thenReturn(dto("{\"total\":1,\"content\":[{\"msgId\":1,\"jumpType\":1,"
+ + "\"jumpPath\":\"list/detail?serid=1\",\"jumpApp\":\"notice\",\"isRead\":0}]}",
+ MsgListPage.class));
Map first = firstRow();
assertEquals("http://localhost:8077#/list/detail?serid=1", first.get("jumpUrl"),
"尾斜杠归一 + 无前导斜杠路径补斜杠");
@@ -268,9 +411,9 @@ class MsgCenterProxyServiceTest {
@Test
void list_userMsgDown_degradesToEmpty() {
- when(openCall.get(any(TargetSpec.class), eq("/oapi/msg/list"), anyMap(), eq(JsonNode.class)))
+ when(openCall.get(any(TargetSpec.class), eq("/oapi/msg/list"), anyMap(), eq(MsgListPage.class)))
.thenThrow(new OpenApiException("OpenAPI request failed: httpStatus=401"));
- Map out = service.list(201, 1, 10, null, null, null, null, null);
+ Map out = service.list(201, 1, 10, null, null, null, null, null, null);
assertEquals(0, out.get("total"));
assertEquals(0, ((java.util.List) out.get("list")).size());
}
@@ -303,12 +446,12 @@ class MsgCenterProxyServiceTest {
@Test
void summary_combinesUnreadAndTodos_withPerCallDegrade() throws Exception {
- when(openCall.get(any(TargetSpec.class), eq("/oapi/msg/unreadCount"), anyMap(), eq(JsonNode.class)))
- .thenReturn(json("3"));
+ when(openCall.get(any(TargetSpec.class), eq("/oapi/msg/unreadCount"), anyMap(), eq(Long.class)))
+ .thenReturn(3L);
when(openCall.get(any(TargetSpec.class), eq("/oapi/msg/todo/list"), anyMap(), eq(JsonNode.class)))
.thenReturn(json("[{\"appKey\":\"100019\",\"count\":2}]"));
- Map out = service.summary(201, 1);
+ Map out = service.summary(201, null, 1);
assertEquals(3L, out.get("unreadCount"));
assertEquals(1, ((java.util.List) out.get("todos")).size());
// appKey 属后端签名标识不下发（0e57022 口径收尾）：待办行只出 count
@@ -318,9 +461,9 @@ class MsgCenterProxyServiceTest {
assertEquals(2, todoRow.get("count"));
// 未读数不可达单独降级为 0，待办仍可用
- when(openCall.get(any(TargetSpec.class), eq("/oapi/msg/unreadCount"), anyMap(), eq(JsonNode.class)))
+ when(openCall.get(any(TargetSpec.class), eq("/oapi/msg/unreadCount"), anyMap(), eq(Long.class)))
.thenThrow(new OpenApiException("down"));
- Map out2 = service.summary(201, 1);
+ Map out2 = service.summary(201, null, 1);
assertEquals(0L, out2.get("unreadCount"));
assertEquals(1, ((java.util.List) out2.get("todos")).size());
}
@@ -330,25 +473,25 @@ class MsgCenterProxyServiceTest {
@Test
void list_filtersPassedThrough() throws Exception {
stubAppDict(100019, "100019", "流程中心");
- when(openCall.get(any(TargetSpec.class), eq("/oapi/msg/list"), anyMap(), eq(JsonNode.class)))
- .thenReturn(json("{\"total\":0,\"content\":[]}"));
+ when(openCall.get(any(TargetSpec.class), eq("/oapi/msg/list"), anyMap(), eq(MsgListPage.class)))
+ .thenReturn(dto("{\"total\":0,\"content\":[]}", MsgListPage.class));
- service.list(201, 1, 10, null, 2, " 100019 ", 0, "请假");
+ service.list(201, 1, 10, null, 2, " 100019 ", 0, "请假", null);
@SuppressWarnings("unchecked")
ArgumentCaptor> query = ArgumentCaptor.forClass(Map.class);
- verify(openCall).get(any(TargetSpec.class), eq("/oapi/msg/list"), query.capture(), eq(JsonNode.class));
+ verify(openCall).get(any(TargetSpec.class), eq("/oapi/msg/list"), query.capture(), eq(MsgListPage.class));
assertEquals("2", query.getValue().get("msgType"));
assertEquals("100019", query.getValue().get("appKey"), "appId 去空白经字典翻译为 appKey 下行");
assertEquals("0", query.getValue().get("isRead"));
assertEquals("请假", query.getValue().get("keyword"));
// 全空筛选不出现新键（与历史调用逐字一致）
- service.list(201, 1, 10, null, null, " ", null, "");
+ service.list(201, 1, 10, null, null, " ", null, "", null);
@SuppressWarnings("unchecked")
ArgumentCaptor> query2 = ArgumentCaptor.forClass(Map.class);
verify(openCall, org.mockito.Mockito.times(2))
- .get(any(TargetSpec.class), eq("/oapi/msg/list"), query2.capture(), eq(JsonNode.class));
+ .get(any(TargetSpec.class), eq("/oapi/msg/list"), query2.capture(), eq(MsgListPage.class));
assertFalse(query2.getAllValues().get(1).containsKey("msgType"));
assertFalse(query2.getAllValues().get(1).containsKey("appKey"));
assertFalse(query2.getAllValues().get(1).containsKey("isRead"));
@@ -359,12 +502,12 @@ class MsgCenterProxyServiceTest {
@Test
void list_appIdUnknownInDict_emptyPageNoUserMsgOutbound() throws Exception {
// 字典未 stub → /oapi/app/list 返回 null → EMPTY
- when(openCall.get(any(TargetSpec.class), eq("/oapi/msg/list"), anyMap(), eq(JsonNode.class)))
- .thenReturn(json("{\"total\":0,\"content\":[]}"));
- Map out = service.list(201, 1, 10, null, null, "999999", null, null);
+ when(openCall.get(any(TargetSpec.class), eq("/oapi/msg/list"), anyMap(), eq(MsgListPage.class)))
+ .thenReturn(dto("{\"total\":0,\"content\":[]}", MsgListPage.class));
+ Map out = service.list(201, 1, 10, null, null, "999999", null, null, null);
assertEquals(0, out.get("total"));
assertEquals(0, ((java.util.List) out.get("list")).size());
- verify(openCall, never()).get(any(TargetSpec.class), eq("/oapi/msg/list"), anyMap(), eq(JsonNode.class));
+ verify(openCall, never()).get(any(TargetSpec.class), eq("/oapi/msg/list"), anyMap(), eq(MsgListPage.class));
}
/** 按应用计数（0e57022）：UserMsg countByApp 条目经应用字典富化出 appId/appName，总数口径；
@@ -372,11 +515,11 @@ class MsgCenterProxyServiceTest {
@Test
void countByApp_enrichesWithRegistryDict() throws Exception {
stubAppDict(100011, "100019", "流程中心");
- when(openCall.get(any(TargetSpec.class), eq("/oapi/msg/countByApp"), anyMap(), eq(JsonNode.class)))
- .thenReturn(json("[{\"appKey\":\"100019\",\"total\":12,\"unread\":3},"
+ when(openCall.getList(any(TargetSpec.class), eq("/oapi/msg/countByApp"), anyMap(), eq(AppMsgCount.class)))
+ .thenReturn(listDto("[{\"appKey\":\"100019\",\"total\":12,\"unread\":3},"
+ "{\"appKey\":\"999999\",\"total\":5,\"unread\":1},"
- + "{\"total\":2,\"unread\":0}]"));
- java.util.List> rows = service.countByApp(201);
+ + "{\"total\":2,\"unread\":0}]", AppMsgCount.class));
+ java.util.List> rows = service.countByApp(201, null);
assertEquals(2, rows.size(), "无 appKey 行跳过");
Map first = rows.get(0);
assertEquals(100011, first.get("appId"));
@@ -393,61 +536,60 @@ class MsgCenterProxyServiceTest {
void countByApp_disabledOrDown_degradesEmpty() {
properties.setUsermsgBaseUrl("");
when(openCall.hasTarget("usermsg")).thenReturn(false);
- assertTrue(service.countByApp(201).isEmpty());
+ assertTrue(service.countByApp(201, null).isEmpty());
properties.setUsermsgBaseUrl(PROD_BASE_URL);
- when(openCall.get(any(TargetSpec.class), eq("/oapi/msg/countByApp"), anyMap(), eq(JsonNode.class)))
+ when(openCall.getList(any(TargetSpec.class), eq("/oapi/msg/countByApp"), anyMap(), eq(AppMsgCount.class)))
.thenThrow(new OpenApiException("down"));
- assertTrue(service.countByApp(201).isEmpty(), "UserMsg 不可达降级空，不抛出");
+ assertTrue(service.countByApp(201, null).isEmpty(), "UserMsg 不可达降级空，不抛出");
}
/** 摘要优先走 /oapi/msg/summary（分类计数一次喂饱），且不再单查 unreadCount */
@Test
void summary_prefersSummaryEndpoint() throws Exception {
- when(openCall.get(any(TargetSpec.class), eq("/oapi/msg/summary"), anyMap(), eq(JsonNode.class)))
- .thenReturn(json("{\"unreadCount\":5,\"sysUnread\":2,\"bizUnread\":1,\"approvalUnread\":2,"
- + "\"total\":9,\"readCount\":4}"));
+ when(openCall.get(any(TargetSpec.class), eq("/oapi/msg/summary"), anyMap(), eq(UserMsgSummary.class)))
+ .thenReturn(dto("{\"unreadCount\":5,\"sysUnread\":2,\"bizUnread\":1,\"approvalUnread\":2,"
+ + "\"total\":9,\"readCount\":4,\"sysTotal\":3,\"bizTotal\":2,\"approvalTotal\":4}",
+ UserMsgSummary.class));
when(openCall.get(any(TargetSpec.class), eq("/oapi/msg/todo/list"), anyMap(), eq(JsonNode.class)))
.thenReturn(json("[]"));
- Map out = service.summary(201, 1);
+ Map out = service.summary(201, null, 1);
assertEquals(5L, out.get("unreadCount"));
assertEquals(2L, out.get("sysUnread"));
assertEquals(1L, out.get("bizUnread"));
assertEquals(2L, out.get("approvalUnread"));
assertEquals(9L, out.get("total"));
assertEquals(4L, out.get("readCount"));
- verify(openCall, never()).get(any(TargetSpec.class), eq("/oapi/msg/unreadCount"), anyMap(), eq(JsonNode.class));
+ assertEquals(3L, out.get("sysTotal"));
+ verify(openCall, never()).get(any(TargetSpec.class), eq("/oapi/msg/unreadCount"), anyMap(), eq(Long.class));
}
/** 旧版 UserMsg 无 summary 端点（404/异常）→ 降级 unreadCount 单查，分类字段缺省 */
@Test
void summary_legacyUserMsg_fallsBackToUnreadCount() throws Exception {
- when(openCall.get(any(TargetSpec.class), eq("/oapi/msg/summary"), anyMap(), eq(JsonNode.class)))
+ when(openCall.get(any(TargetSpec.class), eq("/oapi/msg/summary"), anyMap(), eq(UserMsgSummary.class)))
.thenThrow(new OpenApiException("OpenAPI request failed: httpStatus=404"));
- when(openCall.get(any(TargetSpec.class), eq("/oapi/msg/unreadCount"), anyMap(), eq(JsonNode.class)))
- .thenReturn(json("7"));
+ when(openCall.get(any(TargetSpec.class), eq("/oapi/msg/unreadCount"), anyMap(), eq(Long.class)))
+ .thenReturn(7L);
when(openCall.get(any(TargetSpec.class), eq("/oapi/msg/todo/list"), anyMap(), eq(JsonNode.class)))
.thenReturn(json("[]"));
- Map out = service.summary(201, 1);
+ Map out = service.summary(201, 7, 1);
assertEquals(7L, out.get("unreadCount"));
assertFalse(out.containsKey("sysUnread"), "旧端点无分类计数，字段缺省由前端降级");
- }
-
- @Test
- void read_sendsOwnerScopedPayload() {
- service.read(201, java.util.Collections.singletonList(7L));
- verify(openCall).post(any(TargetSpec.class), eq("/oapi/msg/read"), anyMap(), any(Map.class),
- eq(JsonNode.class));
+ @SuppressWarnings("unchecked")
+ ArgumentCaptor> query = ArgumentCaptor.forClass(Map.class);
+ verify(openCall).get(any(TargetSpec.class), eq("/oapi/msg/unreadCount"), query.capture(), eq(Long.class));
+ assertEquals("7", query.getValue().get("schId"), "降级单查同样带当前身份学校口径");
}
@Test
void disabled_degradesWithoutOutbound() {
properties.setUsermsgBaseUrl("");
when(openCall.hasTarget("usermsg")).thenReturn(false);
- assertEquals(0, service.list(201, 1, 10, null, null, null, null, null).get("total"));
- service.read(201, java.util.Collections.singletonList(7L));
+ assertEquals(0, service.list(201, 1, 10, null, null, null, null, null, null).get("total"));
+ service.read(201, java.util.Collections.singletonList(7L), null);
verify(openCall, never()).get(any(TargetSpec.class), anyString(), anyMap(), any());
verify(openCall, never()).post(any(TargetSpec.class), anyString(), anyMap(), any(), any());
}
@@ -457,9 +599,9 @@ class MsgCenterProxyServiceTest {
// base-url 未配但服务目录有 usermsg（平台公共配置形态）：按名调用仍可用
properties.setUsermsgBaseUrl("");
when(openCall.hasTarget("usermsg")).thenReturn(true);
- when(openCall.get(eq("usermsg"), eq("/oapi/msg/unreadCount"), anyMap(), eq(JsonNode.class)))
- .thenReturn(json("5"));
- Map out = service.summary(201, null);
+ when(openCall.get(eq("usermsg"), eq("/oapi/msg/unreadCount"), anyMap(), eq(Long.class)))
+ .thenReturn(5L);
+ Map out = service.summary(201, null, null);
assertEquals(5L, out.get("unreadCount"));
}
@@ -467,19 +609,19 @@ class MsgCenterProxyServiceTest {
void summary_disabled_degradesToZero() {
properties.setUsermsgBaseUrl("");
when(openCall.hasTarget("usermsg")).thenReturn(false);
- Map out = service.summary(201, 1);
+ Map out = service.summary(201, null, 1);
assertEquals(0L, out.get("unreadCount"));
assertEquals(0, ((java.util.List) out.get("todos")).size());
}
@Test
void summary_todoQueryIncludesSchIdOnly_whenNotNull() throws Exception {
- when(openCall.get(any(TargetSpec.class), eq("/oapi/msg/unreadCount"), anyMap(), eq(JsonNode.class)))
- .thenReturn(json("0"));
+ when(openCall.get(any(TargetSpec.class), eq("/oapi/msg/unreadCount"), anyMap(), eq(Long.class)))
+ .thenReturn(0L);
when(openCall.get(any(TargetSpec.class), eq("/oapi/msg/todo/list"), anyMap(), eq(JsonNode.class)))
.thenReturn(json("[]"));
- service.summary(201, null);
- service.summary(201, 3);
+ service.summary(201, null, null);
+ service.summary(201, null, 3);
@SuppressWarnings("unchecked")
ArgumentCaptor> query = ArgumentCaptor.forClass(Map.class);
verify(openCall, org.mockito.Mockito.times(2))
@@ -491,7 +633,7 @@ class MsgCenterProxyServiceTest {
@Test
void malformedBaseUrl_disabledNotCrash() {
properties.setUsermsgBaseUrl("::::not-a-url");
- Map out = service.summary(201, 1);
+ Map out = service.summary(201, null, 1);
assertEquals(0L, out.get("unreadCount"), "非法 base-url 降级而非抛出");
}
@@ -503,7 +645,7 @@ class MsgCenterProxyServiceTest {
}
private Map firstRow() throws Exception {
- Map out = service.list(201, 1, 10, null, null, null, null, null);
+ Map out = service.list(201, 1, 10, null, null, null, null, null, null);
return (Map) ((java.util.List) out.get("list")).get(0);
}
@@ -514,9 +656,10 @@ class MsgCenterProxyServiceTest {
"{\"id\":100011,\"appKey\":100009,\"name\":\"流程中心\","
+ "\"pcUrl\":\"http://base.yunhaixingtong.com/flow-center/front/index.html#/my\"}");
stubAuthorizedCodes("flow-center");
- when(openCall.get(any(TargetSpec.class), eq("/oapi/msg/list"), anyMap(), eq(JsonNode.class)))
- .thenReturn(json("{\"total\":1,\"content\":[{\"msgId\":1,\"jumpType\":1,"
- + "\"jumpPath\":\"/task/123\",\"appKey\":\"100009\",\"jumpApp\":\"flow-center\",\"isRead\":0}]}"));
+ when(openCall.get(any(TargetSpec.class), eq("/oapi/msg/list"), anyMap(), eq(MsgListPage.class)))
+ .thenReturn(dto("{\"total\":1,\"content\":[{\"msgId\":1,\"jumpType\":1,"
+ + "\"jumpPath\":\"/task/123\",\"appKey\":\"100009\",\"jumpApp\":\"flow-center\",\"isRead\":0}]}",
+ MsgListPage.class));
Map first = firstRow();
assertEquals("http://base.yunhaixingtong.com/flow-center/front/index.html#/task/123", first.get("jumpUrl"),
"丢 fragment + # 拼接，不产第二个 #");
@@ -531,9 +674,9 @@ class MsgCenterProxyServiceTest {
stubUserbaseGet("/oapi/app/by-code/notice",
"{\"id\":100013,\"appKey\":100001,\"name\":\"通知公告\",\"pcUrl\":\"http://localhost:8077\"}");
stubAuthorizedCodes("flow-center");
- when(openCall.get(any(TargetSpec.class), eq("/oapi/msg/list"), anyMap(), eq(JsonNode.class)))
- .thenReturn(json("{\"total\":1,\"content\":[{\"msgId\":1,\"jumpType\":1,"
- + "\"jumpPath\":\"/list/1\",\"jumpApp\":\"notice\",\"isRead\":0}]}"));
+ when(openCall.get(any(TargetSpec.class), eq("/oapi/msg/list"), anyMap(), eq(MsgListPage.class)))
+ .thenReturn(dto("{\"total\":1,\"content\":[{\"msgId\":1,\"jumpType\":1,"
+ + "\"jumpPath\":\"/list/1\",\"jumpApp\":\"notice\",\"isRead\":0}]}", MsgListPage.class));
Map first = firstRow();
assertEquals(Boolean.FALSE, first.get("showJump"), "无该应用权限 → 隐藏跳转入口");
assertNull(first.get("jumpUrl"), "无权时 jumpUrl 同步置 null（双保险）");
@@ -544,9 +687,9 @@ class MsgCenterProxyServiceTest {
void list_jumpAppBlank_noAuthzOutbound() throws Exception {
stubUserbaseGet("/oapi/app/by-key/100019",
"{\"id\":100011,\"appKey\":100019,\"name\":\"流程中心\",\"pcUrl\":\"http://localhost:8088\"}");
- when(openCall.get(any(TargetSpec.class), eq("/oapi/msg/list"), anyMap(), eq(JsonNode.class)))
- .thenReturn(json("{\"total\":1,\"content\":[{\"msgId\":1,\"jumpType\":1,"
- + "\"jumpPath\":\"/task/9\",\"appKey\":\"100019\",\"isRead\":0}]}"));
+ when(openCall.get(any(TargetSpec.class), eq("/oapi/msg/list"), anyMap(), eq(MsgListPage.class)))
+ .thenReturn(dto("{\"total\":1,\"content\":[{\"msgId\":1,\"jumpType\":1,"
+ + "\"jumpPath\":\"/task/9\",\"appKey\":\"100019\",\"isRead\":0}]}", MsgListPage.class));
Map first = firstRow();
assertEquals(Boolean.TRUE, first.get("showJump"));
verify(openCall, never()).get(eq("userbase"), eq("/oapi/app/authorized-codes"), anyMap(), eq(JsonNode.class));
@@ -557,10 +700,10 @@ class MsgCenterProxyServiceTest {
void list_authzUnreachable_absoluteUrlStillPasses() throws Exception {
when(openCall.get(eq("userbase"), eq("/oapi/app/authorized-codes"), anyMap(), eq(JsonNode.class)))
.thenThrow(new RuntimeException("connect timeout"));
- when(openCall.get(any(TargetSpec.class), eq("/oapi/msg/list"), anyMap(), eq(JsonNode.class)))
- .thenReturn(json("{\"total\":1,\"content\":[{\"msgId\":1,\"jumpType\":1,"
+ when(openCall.get(any(TargetSpec.class), eq("/oapi/msg/list"), anyMap(), eq(MsgListPage.class)))
+ .thenReturn(dto("{\"total\":1,\"content\":[{\"msgId\":1,\"jumpType\":1,"
+ "\"jumpPath\":\"http://base.yunhaixingtong.com/notice/#/list/1\",\"jumpApp\":\"notice\","
- + "\"isRead\":0}]}"));
+ + "\"isRead\":0}]}", MsgListPage.class));
Map first = firstRow();
assertEquals(Boolean.TRUE, first.get("showJump"), "判权通道故障 → 放行");
assertEquals("http://base.yunhaixingtong.com/notice/#/list/1", first.get("jumpUrl"));
@@ -572,11 +715,12 @@ class MsgCenterProxyServiceTest {
stubUserbaseGet("/oapi/app/by-code/notice",
"{\"id\":100013,\"appKey\":100001,\"name\":\"通知公告\",\"pcUrl\":\"http://localhost:8077\"}");
stubAuthorizedCodes("notice");
- when(openCall.get(any(TargetSpec.class), eq("/oapi/msg/list"), anyMap(), eq(JsonNode.class)))
- .thenReturn(json("{\"total\":2,\"content\":["
+ when(openCall.get(any(TargetSpec.class), eq("/oapi/msg/list"), anyMap(), eq(MsgListPage.class)))
+ .thenReturn(dto("{\"total\":2,\"content\":["
+ "{\"msgId\":1,\"jumpType\":1,\"jumpPath\":\"/list/1\",\"jumpApp\":\"notice\",\"isRead\":0},"
- + "{\"msgId\":2,\"jumpType\":1,\"jumpPath\":\"/list/2\",\"jumpApp\":\"notice\",\"isRead\":0}]}"));
- Map out = service.list(201, 1, 10, null, null, null, null, null);
+ + "{\"msgId\":2,\"jumpType\":1,\"jumpPath\":\"/list/2\",\"jumpApp\":\"notice\",\"isRead\":0}]}",
+ MsgListPage.class));
+ Map out = service.list(201, 1, 10, null, null, null, null, null, null);
java.util.List rows = (java.util.List) out.get("list");
assertEquals(Boolean.TRUE, ((Map) rows.get(0)).get("showJump"));
assertEquals(Boolean.TRUE, ((Map) rows.get(1)).get("showJump"));
@@ -589,11 +733,12 @@ class MsgCenterProxyServiceTest {
void list_userbaseDown_shortCircuit_relativeJumpNull() throws Exception {
when(openCall.get(eq("userbase"), anyString(), isNull(), eq(JsonNode.class)))
.thenThrow(new RuntimeException("connect timeout"));
- when(openCall.get(any(TargetSpec.class), eq("/oapi/msg/list"), anyMap(), eq(JsonNode.class)))
- .thenReturn(json("{\"total\":2,\"content\":["
+ when(openCall.get(any(TargetSpec.class), eq("/oapi/msg/list"), anyMap(), eq(MsgListPage.class)))
+ .thenReturn(dto("{\"total\":2,\"content\":["
+ "{\"msgId\":1,\"jumpType\":1,\"jumpPath\":\"/task/1\",\"appKey\":\"100009\",\"bizType\":\"flow.task\",\"isRead\":0},"
- + "{\"msgId\":2,\"jumpType\":1,\"jumpPath\":\"/task/2\",\"appKey\":\"100009\",\"bizType\":\"flow.task\",\"isRead\":0}]}"));
- Map out = service.list(201, 1, 10, null, null, null, null, null);
+ + "{\"msgId\":2,\"jumpType\":1,\"jumpPath\":\"/task/2\",\"appKey\":\"100009\",\"bizType\":\"flow.task\",\"isRead\":0}]}",
+ MsgListPage.class));
+ Map out = service.list(201, 1, 10, null, null, null, null, null, null);
java.util.List rows = (java.util.List) out.get("list");
assertNull(((Map) rows.get(0)).get("jumpUrl"), "注册表不可达无兜底 → null");
assertNull(((Map) rows.get(1)).get("jumpUrl"));