Merge remote-tracking branch 'origin/develop' into develop

pom.xml

@@ -5,11 +5,11 @@
     <parent>
         <groupId>au.com.royalpay.payment</groupId>
         <artifactId>payment-parent</artifactId>
-        <version>2.1.3</version>
+        <version>2.1.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>2.1.2</version>
+    <version>2.1.3</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>1.8.0</jib-maven-plugin.version>
@@ -77,7 +77,7 @@
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
-            <version>1.2.62</version>
+            <version>1.2.68</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>

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"));
+            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,24 +257,21 @@ public class RetailRSvcServiceImpl implements RetailRSvcService {
 
     private void sendRServiceNotifyMessage(JSONObject client, String title, String body, String url) {
         logger.debug("sendGeekMessage Begin");
-//        List<JSONObject> clientTokens = clientDeviceTokenMapper.listTokensByClient_id(client.getIntValue("client_id"));
+        List<JSONObject> clientTokens = clientDeviceTokenMapper.listTokensByClient_id(client.getIntValue("client_id"));
-//        for (JSONObject token : clientTokens) {
+        for (JSONObject tokenJson : clientTokens) {
-//
-//        }
-        JSONObject devToken = clientDeviceTokenMapper.getTestTokens();
             Runnable task = () -> {
-            String token = devToken.getString("token");
+                String token = tokenJson.getString("token");
-            JSONObject log = saveAppMessageLog(devToken.getString("dev_id"),
+                JSONObject log = saveAppMessageLog(tokenJson.getString("dev_id"),
-                    devToken.getIntValue("client_id"),
+                        tokenJson.getIntValue("client_id"),
-                    "annual_bill" + devToken.getString("client_type"),
+                        "annual_bill" + tokenJson.getString("client_type"),
                         token,
                         "跨境商城推送"
                 );
                 try {
                     JSONObject type = new JSONObject();
                     type.put("send_type", "annual_bill");
-                type.put("id", devToken.getString("dev_token_id"));
+                    type.put("id", tokenJson.getString("dev_token_id"));
-                AppMsgSender sender = senderMap.get((devToken.getString("client_type")));
+                    AppMsgSender sender = senderMap.get((tokenJson.getString("client_type")));
                     if (StringUtils.isBlank(token) || sender == null) {
                         return;
                     }
@@ -284,7 +284,7 @@ public class RetailRSvcServiceImpl implements RetailRSvcService {
                     managerMsg.put("data", messageData);
                     managerMsg.put("msgType", "annual_bill");
                     AppMessage appMessage = new AppManagerMessageBuilder(managerMsg).buildMessage();
-                sender.sendMessage(appMessage, devToken);
+                    sender.sendMessage(appMessage, tokenJson);
                     log.put("status", 2);
                     appMessageLogMapper.update(log);
                 } catch (Exception e) {
@@ -294,6 +294,7 @@ public class RetailRSvcServiceImpl implements RetailRSvcService {
             };
             sendingAppleMsgPool.execute(task);
         }
+    }
 
     private String encData(String data, Key key, String publicKey) {
         String pubKeyEncData = SignUtils.encData(data, publicKey);

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<JSONObject> findApClient();
 
     List<JSONObject> listValidClient();