Merge remote-tracking branch 'origin/master'
This commit is contained in:
+1
-3
@@ -105,9 +105,7 @@ public class KsimTestController {
|
|||||||
if (msgRespBody != null) {
|
if (msgRespBody != null) {
|
||||||
int code = msgRespBody.getIntValue("code");
|
int code = msgRespBody.getIntValue("code");
|
||||||
result.put("success", code == 0 || code == 200);
|
result.put("success", code == 0 || code == 200);
|
||||||
if (msgRespBody.getJSONObject("dataBody") != null) {
|
result.put("requestId", msgRespBody.getString("requestId"));
|
||||||
result.put("messageId", msgRespBody.getJSONObject("dataBody").getString("messageId"));
|
|
||||||
}
|
|
||||||
result.put("responseCode", code);
|
result.put("responseCode", code);
|
||||||
} else {
|
} else {
|
||||||
result.put("success", false);
|
result.put("success", false);
|
||||||
|
|||||||
+3
-4
@@ -66,10 +66,9 @@ public class KsimMessageServiceImpl implements IKsimMessageService {
|
|||||||
return Result.error(apiResult.getCode(), "即时通发送失败: " + apiResult.getMessage());
|
return Result.error(apiResult.getCode(), "即时通发送失败: " + apiResult.getMessage());
|
||||||
}
|
}
|
||||||
|
|
||||||
String messageId = apiResult.getDataBody() != null
|
String requestId = apiResult.getRequestId() != null ? apiResult.getRequestId() : "";
|
||||||
? apiResult.getDataBody().getString("messageId") : "";
|
log.info("【即时通推送-sendBatch】成功, requestId: {}, toUserCount: {}, title: {}", requestId,
|
||||||
log.info("【即时通推送-sendBatch】成功, messageId: {}, toUserCount: {}, title: {}", messageId,
|
|
||||||
toUserValueList != null ? toUserValueList.size() : 0, title);
|
toUserValueList != null ? toUserValueList.size() : 0, title);
|
||||||
return Result.OK(messageId);
|
return Result.OK(requestId);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user