From 6231b2a6bf2beec1273c20b401b2b2c5d581a777 Mon Sep 17 00:00:00 2001 From: luoyang Date: Thu, 9 Apr 2020 14:21:18 +0800 Subject: [PATCH 1/4] update 2.1.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4798a7370..c23d50805 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ au.com.royalpay.payment payment-parent - 2.1.3 + 2.1.4 4.0.0 manage From 545be6818fe2854f005bc82ffafc7344761f3b90 Mon Sep 17 00:00:00 2001 From: luoyang Date: Thu, 9 Apr 2020 14:51:20 +0800 Subject: [PATCH 2/4] fix merge --- .../core/impls/RetailRSvcServiceImpl.java | 79 ++++++++++--------- .../manage/mappers/system/ClientMapper.java | 8 +- 2 files changed, 44 insertions(+), 43 deletions(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailRSvcServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailRSvcServiceImpl.java index 56698f217..15dba879d 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailRSvcServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailRSvcServiceImpl.java @@ -217,7 +217,10 @@ public class RetailRSvcServiceImpl implements RetailRSvcService { String title = params.getString("title"); String body = params.getString("body"); String url = decData(params.getString("url"), key, svcInfo.getString("platform_pri_key")); - sendRServiceNotifyMessage(client, title, body, url); + if (StringUtils.equalsIgnoreCase("PINE", client.getString("client_moniker"))|| + StringUtils.equalsIgnoreCase("TUTU", client.getString("client_moniker"))) { + sendRServiceNotifyMessage(client, title, body, url); + } result.put("result_status", "SUCCESS"); } catch (Exception e) { logger.error("geek notify app fail:{} - {}",sourceCode,e.getMessage()); @@ -254,45 +257,43 @@ public class RetailRSvcServiceImpl implements RetailRSvcService { private void sendRServiceNotifyMessage(JSONObject client, String title, String body, String url) { logger.debug("sendGeekMessage Begin"); -// List clientTokens = clientDeviceTokenMapper.listTokensByClient_id(client.getIntValue("client_id")); -// for (JSONObject token : clientTokens) { -// -// } - JSONObject devToken = clientDeviceTokenMapper.getTestTokens(); - Runnable task = () -> { - String token = devToken.getString("token"); - JSONObject log = saveAppMessageLog(devToken.getString("dev_id"), - devToken.getIntValue("client_id"), - "annual_bill" + devToken.getString("client_type"), - token, - "跨境商城推送" - ); - try { - JSONObject type = new JSONObject(); - type.put("send_type", "annual_bill"); - type.put("id", devToken.getString("dev_token_id")); - AppMsgSender sender = senderMap.get((devToken.getString("client_type"))); - if (StringUtils.isBlank(token) || sender == null) { - return; + List clientTokens = clientDeviceTokenMapper.listTokensByClient_id(client.getIntValue("client_id")); + for (JSONObject tokenJson : clientTokens) { + Runnable task = () -> { + String token = tokenJson.getString("token"); + JSONObject log = saveAppMessageLog(tokenJson.getString("dev_id"), + tokenJson.getIntValue("client_id"), + "annual_bill" + tokenJson.getString("client_type"), + token, + "跨境商城推送" + ); + try { + JSONObject type = new JSONObject(); + type.put("send_type", "annual_bill"); + type.put("id", tokenJson.getString("dev_token_id")); + AppMsgSender sender = senderMap.get((tokenJson.getString("client_type"))); + if (StringUtils.isBlank(token) || sender == null) { + return; + } + JSONObject managerMsg = new JSONObject(); + managerMsg.put("title", title); + managerMsg.put("body", body); + managerMsg.put("type", type); + JSONObject messageData = new JSONObject(); + messageData.put("url", url); + managerMsg.put("data", messageData); + managerMsg.put("msgType", "annual_bill"); + AppMessage appMessage = new AppManagerMessageBuilder(managerMsg).buildMessage(); + sender.sendMessage(appMessage, tokenJson); + log.put("status", 2); + appMessageLogMapper.update(log); + } catch (Exception e) { + logger.error("出错了：" + e.getMessage()); + appMessageLogMapper.updateStatus(log.getString("send_id"), 1, e.getMessage()); } - JSONObject managerMsg = new JSONObject(); - managerMsg.put("title", title); - managerMsg.put("body", body); - managerMsg.put("type", type); - JSONObject messageData = new JSONObject(); - messageData.put("url", url); - managerMsg.put("data", messageData); - managerMsg.put("msgType", "annual_bill"); - AppMessage appMessage = new AppManagerMessageBuilder(managerMsg).buildMessage(); - sender.sendMessage(appMessage, devToken); - log.put("status", 2); - appMessageLogMapper.update(log); - } catch (Exception e) { - logger.error("出错了：" + e.getMessage()); - appMessageLogMapper.updateStatus(log.getString("send_id"), 1, e.getMessage()); - } - }; - sendingAppleMsgPool.execute(task); + }; + sendingAppleMsgPool.execute(task); + } } private String encData(String data, Key key, String publicKey) { diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java index a49330f20..e6ed55306 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java @@ -1,12 +1,12 @@ package au.com.royalpay.payment.manage.mappers.system; +import com.alibaba.fastjson.JSONObject; +import com.github.miemiedev.mybatis.paginator.domain.PageBounds; +import com.github.miemiedev.mybatis.paginator.domain.PageList; import com.yixsoft.support.mybatis.autosql.annotations.AdvanceSelect; import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper; import com.yixsoft.support.mybatis.autosql.annotations.AutoSql; import com.yixsoft.support.mybatis.autosql.annotations.SqlType; -import com.alibaba.fastjson.JSONObject; -import com.github.miemiedev.mybatis.paginator.domain.PageBounds; -import com.github.miemiedev.mybatis.paginator.domain.PageList; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import org.apache.ibatis.executor.keygen.Jdbc3KeyGenerator; @@ -24,7 +24,7 @@ public interface ClientMapper { JSONObject findClient(@Param("client_id") int clientId); @AutoSql(SqlType.SELECT) - @AdvanceSelect(addonWhereClause = "is_valid=1 and length( client_moniker ) > 5") + @AdvanceSelect(addonWhereClause = "is_valid=1 and length( client_moniker ) > 5 and sub_merchant_id='321888408'") List findApClient(); List listValidClient(); From 191d676ddb2b09c9162624453ee6e1e746e35fa6 Mon Sep 17 00:00:00 2001 From: luoyang Date: Thu, 9 Apr 2020 16:26:12 +0800 Subject: [PATCH 3/4] fastjson 1.2.62->1.2.68 --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index c23d50805..ad128b7b8 100644 --- a/pom.xml +++ b/pom.xml @@ -5,11 +5,11 @@ au.com.royalpay.payment payment-parent - 2.1.4 + 2.1.5 4.0.0 manage - 2.1.2 + 2.1.3 UTF-8 1.8.0 @@ -77,7 +77,7 @@ com.alibaba fastjson - 1.2.62 + 1.2.68 org.springframework.boot From 4e339e750deff65fbc18c82da7a9dd2526f5ab0c Mon Sep 17 00:00:00 2001 From: luoyang Date: Thu, 9 Apr 2020 16:28:51 +0800 Subject: [PATCH 4/4] fastjson 2.1.6 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ad128b7b8..1f4b47442 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ au.com.royalpay.payment payment-parent - 2.1.5 + 2.1.6 4.0.0 manage