|
@@ -97,7 +97,7 @@ public class DefaultJPushHandler implements JPushHandler {
|
|
|
try {
|
|
|
return this.restTemplate.exchange(url, HttpMethod.GET, entity, ChatMessage.class).getBody();
|
|
|
} catch (Exception e) {
|
|
|
- LoggingContextHolder.warn(log, e);
|
|
|
+ log.warn("JPush message get failed: {}, {}", url, e.getMessage());
|
|
|
return null;
|
|
|
}
|
|
|
}
|
|
@@ -115,7 +115,7 @@ public class DefaultJPushHandler implements JPushHandler {
|
|
|
&& ((code = ((APIRequestException) e).getErrorCode()) == 1011 || code == 899001)) {
|
|
|
return true;
|
|
|
}
|
|
|
- LoggingContextHolder.warn(log, e);
|
|
|
+ log.warn("JPush register failed: {}", e.getMessage());
|
|
|
return false;
|
|
|
}
|
|
|
return true;
|
|
@@ -136,15 +136,13 @@ public class DefaultJPushHandler implements JPushHandler {
|
|
|
try {
|
|
|
result = this.pushClient.sendPush(payload);
|
|
|
} catch (Exception e) {
|
|
|
- LoggingContextHolder.warn(log, e);
|
|
|
+ log.warn("JPush push failed: {}, {}", payload.getTarget(), e.getMessage());
|
|
|
return 0;
|
|
|
}
|
|
|
if (result != null && result.statusCode == 0) {
|
|
|
return result.msg_id;
|
|
|
}
|
|
|
- Integer code = result == null || result.error == null ? null : result.error.getCode();
|
|
|
- String message = result == null || result.error == null ? null : result.error.getMessage();
|
|
|
- LoggingContextHolder.warn(log, code, message);
|
|
|
+ log.warn("JPush push failed: {}, {}", payload.getTarget(), result);
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
@@ -213,7 +211,7 @@ public class DefaultJPushHandler implements JPushHandler {
|
|
|
try {
|
|
|
return this.pushClient.batchSendPushByAlias(payloads);
|
|
|
} catch (Exception e) {
|
|
|
- LoggingContextHolder.warn(log, e);
|
|
|
+ log.warn("JPush push failed: {}", e.getMessage());
|
|
|
return null;
|
|
|
}
|
|
|
}
|
|
@@ -232,7 +230,7 @@ public class DefaultJPushHandler implements JPushHandler {
|
|
|
try {
|
|
|
result = this.pushClient.getReceivedsDetail(ids);
|
|
|
} catch (Exception e) {
|
|
|
- LoggingContextHolder.warn(log, e);
|
|
|
+ log.warn("JPush delivery get failed: {}", e.getMessage());
|
|
|
return Collections.emptyList();
|
|
|
}
|
|
|
return ObjectUtils.ifNull(result.received_list, Collections::emptyList);
|
|
@@ -261,7 +259,7 @@ public class DefaultJPushHandler implements JPushHandler {
|
|
|
try {
|
|
|
return this.messageClient.getUserInfo(username);
|
|
|
} catch (Exception e) {
|
|
|
- LoggingContextHolder.warn(log, e);
|
|
|
+ log.warn("JPush user info get failed: {}, {}", username, e.getMessage());
|
|
|
return null;
|
|
|
}
|
|
|
}
|
|
@@ -271,7 +269,7 @@ public class DefaultJPushHandler implements JPushHandler {
|
|
|
try {
|
|
|
return this.messageClient.getUserState(username);
|
|
|
} catch (Exception e) {
|
|
|
- LoggingContextHolder.warn(log, e);
|
|
|
+ log.warn("JPush user state get failed: {}, {}", username, e.getMessage());
|
|
|
return null;
|
|
|
}
|
|
|
}
|