Merge branch 'dev-xym-fix' of Server/growth-manager into master

api-module/src/main/java/com/tzld/piaoquan/api/common/enums/SecretEnum.java

@@ -2,6 +2,7 @@ package com.tzld.piaoquan.api.common.enums;
 
 
 import java.util.Objects;
+import java.util.UUID;
 
 public enum SecretEnum {
 
@@ -9,7 +10,9 @@ public enum SecretEnum {
     SECRET_ENUM_2("70d342bf11a84ac7aca6b3e99541e085", "老来福", "llf"),
     SECRET_ENUM_3("595db67618174499b2bed23d8be6a3c1", "微小盟", "wxm"),
     SECRET_ENUM_4("9a48498757774ddf8a3878b9c02d0fef", "福州像素", "xs"),
-    SECRET_ENUM_5("35afea64fd374477bb32999120b91637", "泽火", "zh");
+    SECRET_ENUM_5("35afea64fd374477bb32999120b91637", "泽火", "zh"),
+    SECRET_ENUM_6("ee93a44c4be4448ab0ac9334a296016e", "云誉", "yy");
+
 
     SecretEnum(String secret, String desc, String channel) {
         this.secret = secret;
@@ -38,4 +41,8 @@ public enum SecretEnum {
         }
         return null;
     }
+
+    public static void main(String[] args) {
+        System.out.println(UUID.randomUUID());
+    }
 }

api-module/src/main/java/com/tzld/piaoquan/api/service/strategy/impl/ThirdPartyPushMessageStrategyV1.java

@@ -211,8 +211,7 @@ public class ThirdPartyPushMessageStrategyV1 implements ReplyStrategyService {
             // 获取最新dt的策略
             String dtVersion = algGhAutoreplyVideoRankDataMapper.selectLatestDtVersionByStrategyKeyAndGhId(key, bucketDataParam.getGhId());
             if (StringUtils.isEmpty(dtVersion)) {
-                bucketDataParam.setGhId("default");
-                dtVersion = algGhAutoreplyVideoRankDataMapper.selectLatestDtVersionByStrategyKeyAndGhId(key, bucketDataParam.getGhId());
+                continue;
             }
             // 判断当前的dtVersion是否已经处理过了
             CgiReplyBucketDataExample cgiReplyBucketDataExample = new CgiReplyBucketDataExample();

api-module/src/main/java/com/tzld/piaoquan/api/service/strategy/impl/WeComPushMessageStrategyV1.java

@@ -210,8 +210,7 @@ public class WeComPushMessageStrategyV1 implements ReplyStrategyService {
             // 获取最新dt的策略
             String dtVersion = algGhAutoreplyVideoRankDataMapper.selectLatestDtVersionByStrategyKeyAndGhId(key, bucketDataParam.getGhId());
             if (StringUtils.isEmpty(dtVersion)) {
-                bucketDataParam.setGhId("default");
-                dtVersion = algGhAutoreplyVideoRankDataMapper.selectLatestDtVersionByStrategyKeyAndGhId(key, bucketDataParam.getGhId());
+                continue;
             }
             // 判断当前的dtVersion是否已经处理过了
             CgiReplyBucketDataExample cgiReplyBucketDataExample = new CgiReplyBucketDataExample();