fix pull sms content

austin-handler/src/main/java/com/java3y/austin/handler/handler/impl/PushHandler.java

@@ -154,7 +154,7 @@ public class PushHandler extends BaseHandler implements Handler {
         SendPushParam param = SendPushParam.builder()
                 .requestId(String.valueOf(IdUtil.getSnowflake().nextId()))
                 .pushMessage(SendPushParam.PushMessageVO.builder().notification(SendPushParam.PushMessageVO.NotificationVO.builder()
-                                .title(pushContentModel.getTitle()).body(pushContentModel.getContent()).clickType("startapp").build())
+                        .title(pushContentModel.getTitle()).body(pushContentModel.getContent()).clickType("startapp").build())
                         .build())
                 .build();
         if (CollUtil.isNotEmpty(cid)) {

austin-handler/src/main/java/com/java3y/austin/handler/receipt/stater/impl/SmsPullReceiptStarterImpl.java

@@ -47,7 +47,7 @@ public class SmsPullReceiptStarterImpl implements ReceiptMessageStater {
             List<ChannelAccount> channelAccountList = channelAccountDao.findAllByIsDeletedEqualsAndSendChannelEquals(CommonConstant.FALSE, ChannelType.SMS.getCode());
             for (ChannelAccount channelAccount : channelAccountList) {
                 SmsAccount smsAccount = JSON.parseObject(channelAccount.getAccountConfig(), SmsAccount.class);
-                List<SmsRecord> smsRecordList = scriptMap.get(smsAccount.getScriptName()).pull(smsAccount.getScriptName());
+                List<SmsRecord> smsRecordList = scriptMap.get(smsAccount.getScriptName()).pull(channelAccount.getId().intValue());
                 if (CollUtil.isNotEmpty(smsRecordList)) {
                     smsRecordDao.saveAll(smsRecordList);
                 }

austin-handler/src/main/java/com/java3y/austin/handler/script/SmsScript.java

@@ -26,9 +26,9 @@ public interface SmsScript {
     /**
      * 拉取回执
      *
-     * @param scriptName 标识账号的脚本名
+     * @param id 渠道账号的ID
      * @return 渠道商回执接口返回值
      */
-    List<SmsRecord> pull(String scriptName);
+    List<SmsRecord> pull(Integer id);
 
 }

austin-handler/src/main/java/com/java3y/austin/handler/script/impl/TencentSmsScript.java

@@ -59,9 +59,9 @@ public class TencentSmsScript implements SmsScript {
     }
 
     @Override
-    public List<SmsRecord> pull(String scriptName) {
+    public List<SmsRecord> pull(Integer accountId) {
         try {
-            TencentSmsAccount account = accountUtils.getSmsAccountByScriptName(scriptName, TencentSmsAccount.class);
+            TencentSmsAccount account = accountUtils.getAccountById(accountId, TencentSmsAccount.class);
             SmsClient client = init(account);
             PullSmsSendStatusRequest req = assemblePullReq(account);
             PullSmsSendStatusResponse resp = client.PullSmsSendStatus(req);

austin-handler/src/main/java/com/java3y/austin/handler/script/impl/YunPianSmsScript.java

@@ -58,8 +58,7 @@ public class YunPianSmsScript implements SmsScript {
     }
 
     @Override
-    public List<SmsRecord> pull(String scriptName) {
+    public List<SmsRecord> pull(Integer accountId) {
-        YunPianSmsAccount account = accountUtils.getSmsAccountByScriptName(scriptName, YunPianSmsAccount.class);
         // .....
         return null;
     }

austin-handler/src/main/java/com/java3y/austin/handler/shield/impl/ShieldServiceImpl.java

@@ -51,7 +51,7 @@ public class ShieldServiceImpl implements ShieldService {
             }
             if (ShieldType.NIGHT_SHIELD_BUT_NEXT_DAY_SEND.getCode().equals(taskInfo.getShieldType())) {
                 redisUtils.lPush(NIGHT_SHIELD_BUT_NEXT_DAY_SEND_KEY, JSON.toJSONString(taskInfo,
-                                SerializerFeature.WriteClassName),
+                        SerializerFeature.WriteClassName),
                         (DateUtil.offsetDay(new Date(), 1).getTime() / 1000) - DateUtil.currentSeconds());
                 logUtils.print(AnchorInfo.builder().state(AnchorState.NIGHT_SHIELD_NEXT_SEND.getCode()).businessId(taskInfo.getBusinessId()).ids(taskInfo.getReceiver()).build());
             }