Forráskód Böngészése

pdd:流量控制移动到分配账号签名

dodo hold 3 hónapja
szülő
commit
6ed72acfd8

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
molilian.api/Properties/PublishProfiles/latest.pubxml.user


+ 44 - 2
molilian.core/Core/taoke/UnionParseCore/UnionParseCore.cs

@@ -23,14 +23,25 @@ namespace molilian.core
 
             switch (request.Channel)
             {
-                case "brwsimilar":
                 case "tbpush":
+                case "brwsimilar":
+                case "icon":
                     request.RiskStrategy = request.Channel;
                     request.LaunchScene = 0;
                     request.Channel = "tb";
                     break;
             }
 
+
+            switch (request.RiskStrategy)
+            {
+                case "tbpush":
+                case "brwsimilar":
+                case "icon":
+                    request.LaunchScene = 0;
+                    break;
+            }
+
             if (request.SpecialText == 1)
             {
                 return await SpecialTextParseAsync(request);
@@ -1316,6 +1327,23 @@ namespace molilian.core
                     _ = TkLogCore.ParseLogAsync(result);
                     return PddParseOutput(result);
                 }
+
+                if (!TestParseCore.InWhitelist(result.ip, result.oaid) && PddUnionPlus.FlowControlIgnoreRequest(config, out reason))
+                {
+                    result.success = false;
+                    result.link_type = LinkTypeEnum.unknown;
+                    result.channel_type = ChannelTypeEnum.pdd;
+                    result.message = "放弃转链";
+                    result.reason = reason;
+                    result.accountId = 0;
+                    result.accountName = string.Empty;
+                    result.content = content;
+                    result.deeplink_url = PddUnionPlus.GetDeeplink(result.shortLinkurl);
+                    _ = TkLogCore.ParseLogAsync(result);
+                    return PddParseOutput(result);
+                }
+
+
                 PddPoolDTO account = null;
                 // 直接调用GetOne获取账号
                 // 新的调度策略已经在内部处理了:
@@ -1456,6 +1484,21 @@ namespace molilian.core
                     _ = TkLogCore.ParseLogAsync(result);
                     return PddParseOutput(result);
                 }
+                if (!TestParseCore.InWhitelist(result.ip, result.oaid) && PddUnionPlus.FlowControlIgnoreRequest(config, out reason))
+                {
+                    result.success = false;
+                    result.link_type = LinkTypeEnum.unknown;
+                    result.channel_type = ChannelTypeEnum.pdd;
+                    result.message = "放弃转链";
+                    result.reason = reason;
+                    result.accountId = 0;
+                    result.accountName = string.Empty;
+                    result.content = content;
+                    result.deeplink_url = PddUnionPlus.GetDeeplink(result.shortLinkurl);
+                    _ = TkLogCore.ParseLogAsync(result);
+                    return PddParseOutput(result);
+                }
+
                 PddPoolDTO account = null;
                 // 直接调用GetOne获取账号
                 // 新的调度策略已经在内部处理了:
@@ -1464,7 +1507,6 @@ namespace molilian.core
                 // 3. 依次尝试多个候选账号
                 // 因此不需要外层重试逻辑
                 account = PddPoolCore.GetOne(PddUnionWorkMode.All, request.AccountId);
-
                 if (account == null)
                 {
                     result.success = false;

+ 16 - 1
molilian.core/Core/taoke/UnionParseCore/dp2dp.cs

@@ -745,7 +745,6 @@ namespace molilian.core
                     }
                 }
 
-
                 //============================== 放弃转链-地区过滤 ==============================
                 if (request.AccountId == 0 && PddUnionPlus.ShouldIgnoreRequest(config, request.Ip, request.Oaid, out string reason))
                 {
@@ -756,6 +755,22 @@ namespace molilian.core
                     _ = TkLogCore.ParseLogAsync(result);
                     return PddParseOutput(result);
                 }
+
+                if (!TestParseCore.InWhitelist(result.ip, result.oaid) && PddUnionPlus.FlowControlIgnoreRequest(config, out reason))
+                {
+                    result.success = false;
+                    result.link_type = LinkTypeEnum.unknown;
+                    result.channel_type = ChannelTypeEnum.pdd;
+                    result.message = "放弃转链";
+                    result.reason = reason;
+                    result.accountId = 0;
+                    result.accountName = string.Empty;
+                    result.content = content;
+                    result.deeplink_url = PddUnionPlus.GetDeeplink(result.shortLinkurl);
+                    _ = TkLogCore.ParseLogAsync(result);
+                    return PddParseOutput(result);
+                }
+
                 PddPoolDTO account = null;
                 // 直接调用GetOne获取账号(parse_type="dp")
                 // 新的调度策略已经在内部处理了:

+ 4 - 1
molilian.core/Core/tool/TestParseCore.cs

@@ -9,7 +9,10 @@ namespace molilian.core
             "8E61FDE9411443F9A3642A6ACAD42747EC7D424979CC9C51CB1670D630EE7D8F",
             //capi
             "FF29AB4ECA4E42A7A4E90DD266AE7B94c4e39ff01b38641d1738a7d57e83511b",
-            "C3516876C271412593EE38CC2FC23F453cd4f48566c73a32f0f45ca37556b3bd"
+            "C3516876C271412593EE38CC2FC23F453cd4f48566c73a32f0f45ca37556b3bd",
+
+            //tbpush
+            "39BF2556DB784082B805FF5766AF913D473df584ee5852bba96e537ee659f885",
             ];
 
         public static bool InWhitelist(string ip, string oaid)

+ 10 - 1
molilian.core/Plus/Alimama/parse.cs

@@ -702,6 +702,14 @@ namespace molilian.core
             ////2025-05-11 brw不做风控
             //if (!string.IsNullOrEmpty(riskStrategy) && !"os".Equals(riskStrategy) && launchScene != -1) return false;
 
+            switch (riskStrategy)
+            {
+                case "tbpush":
+                case "brwsimilar":
+                case "icon":
+                    return false;
+            }
+
             if (TestParseCore.InWhitelist(ip, oaid)) return false;
 
             try
@@ -736,8 +744,9 @@ namespace molilian.core
 
             switch (request.RiskStrategy)
             {
-                case "brwsimilar":
                 case "tbpush":
+                case "brwsimilar":
+                case "icon":
                     if (IsDigitsOnly(content))
                     {
                         content = $"https://item.taobao.com/item.htm?id={content}";

+ 14 - 13
molilian.core/Plus/pdd/PddUnionPlus.cs

@@ -165,19 +165,20 @@ namespace molilian.core
                 return result;
             }
 
-            if (!TestParseCore.InWhitelist(result.ip, result.oaid) && FlowControlIgnoreRequest(_config, out string reason))
-            {
-                result.success = false;
-                result.link_type = LinkTypeEnum.unknown;
-                result.channel_type = ChannelTypeEnum.pdd;
-                result.message = "放弃转链";
-                result.reason = reason;
-                result.accountId = 0;
-                result.accountName = string.Empty;
-                result.content = content;
-                result.deeplink_url = GetDeeplink(result.shortLinkurl);
-                return result;
-            }
+            // 移到外围了
+            //if (!TestParseCore.InWhitelist(result.ip, result.oaid) && FlowControlIgnoreRequest(_config, out string reason))
+            //{
+            //    result.success = false;
+            //    result.link_type = LinkTypeEnum.unknown;
+            //    result.channel_type = ChannelTypeEnum.pdd;
+            //    result.message = "放弃转链";
+            //    result.reason = reason;
+            //    result.accountId = 0;
+            //    result.accountName = string.Empty;
+            //    result.content = content;
+            //    result.deeplink_url = GetDeeplink(result.shortLinkurl);
+            //    return result;
+            //}
 
 
             var isTrackUrl = IsTrackUrl(url);

Nem az összes módosított fájl került megjelenítésre, mert túl sok fájl változott