fix:模板频控功能

mallchat-common/pom.xml

@@ -119,6 +119,16 @@
             <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+            <version>5.3.19</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-test</artifactId>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

mallchat-custom-server/pom.xml

@@ -16,6 +16,19 @@
             <groupId>com.abin.mallchat</groupId>
             <artifactId>mallchat-common</artifactId>
         </dependency>
+        <!-- Used for unit testing -->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>${junit.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+            <version>5.3.19</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

mallchat-custom-server/src/main/java/com/abin/mallchat/custom/chat/service/impl/WeChatMsgOperationServiceImpl.java

@@ -5,14 +5,11 @@ import com.abin.mallchat.common.common.domain.dto.FrequencyControlDTO;
 import com.abin.mallchat.common.common.exception.FrequencyControlException;
 import com.abin.mallchat.common.common.handler.GlobalUncaughtExceptionHandler;
 import com.abin.mallchat.common.common.service.frequencycontrol.FrequencyControlUtil;
-import com.abin.mallchat.common.common.utils.JsonUtils;
 import com.abin.mallchat.common.user.domain.entity.User;
 import com.abin.mallchat.common.user.service.cache.UserCache;
 import com.abin.mallchat.custom.chat.service.WeChatMsgOperationService;
 import lombok.extern.slf4j.Slf4j;
-import me.chanjar.weixin.common.error.WxErrorException;
 import me.chanjar.weixin.mp.api.WxMpService;
-import me.chanjar.weixin.mp.api.WxMpTemplateMsgService;
 import me.chanjar.weixin.mp.bean.template.WxMpTemplateData;
 import me.chanjar.weixin.mp.bean.template.WxMpTemplateMessage;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,7 +34,7 @@ public class WeChatMsgOperationServiceImpl implements WeChatMsgOperationService
                     new GlobalUncaughtExceptionHandler()));
 
     // at消息的微信推送模板id
-    private final String atMsgPublishTemplateId = "";
+    private final String atMsgPublishTemplateId = "Xd7sWPZsuWa0UmpvLaZPvaJVjNj1KjEa0zLOm5_Z7IU";
 
     private final String WE_CHAT_MSG_COLOR = "#A349A4";
 
@@ -96,8 +93,8 @@ public class WeChatMsgOperationServiceImpl implements WeChatMsgOperationService
     private List<WxMpTemplateData> generateAtMsgData(User sender, String msg) {
         List dataList = new ArrayList<WxMpTemplateData>();
 //        todo: 没有消息模板，暂不实现
-//        dataList.add(new WxMpTemplateData("senderName", sender.getName() , WE_CHAT_MSG_COLOR));
+        dataList.add(new WxMpTemplateData("name", sender.getName(), WE_CHAT_MSG_COLOR));
-//        dataList.add(new WxMpTemplateData("content", msg , WE_CHAT_MSG_COLOR));
+        dataList.add(new WxMpTemplateData("content", msg, WE_CHAT_MSG_COLOR));
         return dataList;
     }
 
@@ -107,12 +104,12 @@ public class WeChatMsgOperationServiceImpl implements WeChatMsgOperationService
      * @param templateMsg 微信模板消息
      */
     protected void publishTemplateMsg(WxMpTemplateMessage templateMsg) {
-        WxMpTemplateMsgService wxMpTemplateMsgService = wxMpService.getTemplateMsgService();
+//        WxMpTemplateMsgService wxMpTemplateMsgService = wxMpService.getTemplateMsgService();todo 等审核通过
-        try {
+//        try {
-            wxMpTemplateMsgService.sendTemplateMsg(templateMsg);
+//            wxMpTemplateMsgService.sendTemplateMsg(templateMsg);
-        } catch (WxErrorException e) {
+//        } catch (WxErrorException e) {
-            log.error("publish we chat msg failed! open id is {}, msg is {}.",
+//            log.error("publish we chat msg failed! open id is {}, msg is {}.",
-                    templateMsg.getToUser(), JsonUtils.toStr(templateMsg.getData()));
+//                    templateMsg.getToUser(), JsonUtils.toStr(templateMsg.getData()));
-        }
+//        }
     }
 }

mallchat-custom-server/src/test/java/com/abin/mallchat/custom/ac/ACTrieTest.java

@@ -1,5 +1,7 @@
-package com.abin.mallchat.common.common.algorithm.ac;
+package com.abin.mallchat.custom.ac;
 
+import com.abin.mallchat.common.common.algorithm.ac.ACTrie;
+import com.abin.mallchat.common.common.algorithm.ac.MatchResult;
 import com.google.common.collect.Lists;
 import org.junit.Test;
 

mallchat-custom-server/src/test/java/com/abin/mallchat/custom/ac/CreateTokenTest.java

@@ -1,4 +1,4 @@
-package com.abin.mallchat.common.common.algorithm.ac;
+package com.abin.mallchat.custom.ac;
 
 
 import com.auth0.jwt.JWT;

mallchat-custom-server/src/test/java/com/abin/mallchat/custom/spring/WXTemplate.java

@@ -0,0 +1,31 @@
+package com.abin.mallchat.custom.spring;
+
+import com.abin.mallchat.custom.chat.service.WeChatMsgOperationService;
+import com.abin.mallchat.custom.chat.service.impl.ChatServiceImpl;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.util.Collections;
+
+/**
+ * Description: 微信模板测试
+ * Author: <a href="https://github.com/zongzibinbin">abin</a>
+ * Date: 2023-07-06
+ */
+@RunWith(SpringRunner.class)
+@SpringBootTest
+public class WXTemplate {
+
+    @Autowired
+    private WeChatMsgOperationService chatMsgOperationService;
+    @Autowired
+    private ChatServiceImpl chatService;
+
+    @Test
+    public void test() {
+        chatMsgOperationService.publishChatMsgToWeChatUser(1L, Collections.singletonList(10008L), "你家规下去");
+    }
+}