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

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/enums/AlertTypeEnum.java

@@ -7,7 +7,7 @@ public enum AlertTypeEnum {
     QYWX_TAG_SYNC(1, "企微标签同步", null),
     QUNFA_MESSAGE(2, "企微群发", null),
     FRIEND_ADD(3, "企微好友添加", null),
-    CLOUD_STORE_CHANGE(4, "观云台转态变回收站", null),;
+    CLOUD_STORE_CHANGE(4, "观云台门店进回收站", null),;
     private Integer type;
     private String name;
     private String dingUrl;

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/CheckQywxSettingApiServiceImpl.java

@@ -136,7 +136,8 @@ public class CheckQywxSettingApiServiceImpl implements CheckQywxSettingApiServic
         }
         //告警是否拦截重复告警 防止批量触发
         if (StringUtils.isNotBlank(messageDTO.getKey())) {
-            RBucket<Object> bucket = RedisUtil.getRedisClient().getBucket(messageDTO.getKey());
+            String key = messageDTO.getKey() + messageDTO.getAlertType();
+            RBucket<Object> bucket = RedisUtil.getRedisClient().getBucket(key);
             boolean b = bucket.trySet(1, 60L, TimeUnit.SECONDS);
             if (!b) {
                 return;