fix# 渠道去重 key 修复 && 官方账号Redis初始化 key 修复 && 云片参数判空；

austin-common/src/main/java/com/java3y/austin/common/dto/account/YunPianSmsAccount.java

@@ -1,45 +0,0 @@
-package com.java3y.austin.common.dto.account;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * 云片账号信息
- * <p>
- * 参数示例：
- * [{"sms_20":{"url":"https://sms.yunpian.com/v2/sms/tpl_batch_send.json","apikey":"ca55d4c8544444444444622221b5cd7","tpl_id":"533332222282","supplierId":20,"supplierName":"云片"}}]
- *
- * @author 3y
- */
-@Data
-@Builder
-@AllArgsConstructor
-@NoArgsConstructor
-public class YunPianSmsAccount {
-
-    /**
-     * apikey
-     */
-    private String apikey;
-    /**
-     * tplId
-     */
-    private String tplId;
-
-    /**
-     * api相关
-     */
-    private String url;
-
-    /**
-     * 标识渠道商Id
-     */
-    private Integer supplierId;
-
-    /**
-     * 标识渠道商名字
-     */
-    private String supplierName;
-}

austin-handler/src/main/java/com/java3y/austin/handler/deduplication/service/FrequencyDeduplicationService.java

@@ -31,7 +31,7 @@ public class FrequencyDeduplicationService extends AbstractDeduplicationService
     /**
      * 业务规则去重 构建key
      * <p>
-     * key ： receiver + templateId + sendChannel
+     * key ： receiver  + sendChannel
      * <p>
      * 一天内一个用户只能收到某个渠道的消息 N 次
      *
@@ -43,7 +43,6 @@ public class FrequencyDeduplicationService extends AbstractDeduplicationService
     public String deduplicationSingleKey(TaskInfo taskInfo, String receiver) {
         return PREFIX + StrPool.C_UNDERLINE
                 + receiver + StrPool.C_UNDERLINE
-                + taskInfo.getMessageTemplateId() + StrPool.C_UNDERLINE
                 + taskInfo.getSendChannel();
     }
 }

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

@@ -6,6 +6,7 @@ import cn.hutool.core.net.URLEncodeUtil;
 import cn.hutool.core.text.CharSequenceUtil;
 import cn.hutool.core.text.StrPool;
 import cn.hutool.core.util.ArrayUtil;
+import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.Header;
 import cn.hutool.http.HttpRequest;
 import com.alibaba.fastjson.JSON;
@@ -82,7 +83,9 @@ public class YunPianSmsScript implements SmsScript {
         params.put("apikey", account.getApikey());
         params.put("mobile", StringUtils.join(smsParam.getPhones(), StrPool.COMMA));
         params.put("tpl_id", account.getTplId());
-        params.put("tpl_value", getTplValue(smsParam));
+        if (CharSequenceUtil.isNotBlank(smsParam.getContent()) && smsParam.getContent().contains(PARAMS_KV_SPLIT_KEY)) {
+            params.put("tpl_value", getTplValue(smsParam));
+        }
         return params;
     }
 

austin-support/src/main/java/com/java3y/austin/support/utils/AccountUtils.java

@@ -119,7 +119,7 @@ public class AccountUtils {
      */
     public WxMpService initOfficialAccountService(WeChatOfficialAccount officialAccount) {
         WxMpService wxMpService = new WxMpServiceImpl();
-        WxMpRedisConfigImpl config = new WxMpRedisConfigImpl(redisTemplateWxRedisOps(), ChannelType.ENTERPRISE_WE_CHAT.getAccessTokenPrefix());
+        WxMpRedisConfigImpl config = new WxMpRedisConfigImpl(redisTemplateWxRedisOps(), ChannelType.OFFICIAL_ACCOUNT.getAccessTokenPrefix());
         config.setAppId(officialAccount.getAppId());
         config.setSecret(officialAccount.getSecret());
         config.setToken(officialAccount.getToken());