|
@@ -23,14 +23,25 @@ namespace molilian.core
|
|
|
|
|
|
|
|
switch (request.Channel)
|
|
switch (request.Channel)
|
|
|
{
|
|
{
|
|
|
- case "brwsimilar":
|
|
|
|
|
case "tbpush":
|
|
case "tbpush":
|
|
|
|
|
+ case "brwsimilar":
|
|
|
|
|
+ case "icon":
|
|
|
request.RiskStrategy = request.Channel;
|
|
request.RiskStrategy = request.Channel;
|
|
|
request.LaunchScene = 0;
|
|
request.LaunchScene = 0;
|
|
|
request.Channel = "tb";
|
|
request.Channel = "tb";
|
|
|
break;
|
|
break;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+
|
|
|
|
|
+ switch (request.RiskStrategy)
|
|
|
|
|
+ {
|
|
|
|
|
+ case "tbpush":
|
|
|
|
|
+ case "brwsimilar":
|
|
|
|
|
+ case "icon":
|
|
|
|
|
+ request.LaunchScene = 0;
|
|
|
|
|
+ break;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
if (request.SpecialText == 1)
|
|
if (request.SpecialText == 1)
|
|
|
{
|
|
{
|
|
|
return await SpecialTextParseAsync(request);
|
|
return await SpecialTextParseAsync(request);
|
|
@@ -1316,6 +1327,23 @@ namespace molilian.core
|
|
|
_ = TkLogCore.ParseLogAsync(result);
|
|
_ = TkLogCore.ParseLogAsync(result);
|
|
|
return PddParseOutput(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;
|
|
PddPoolDTO account = null;
|
|
|
// 直接调用GetOne获取账号
|
|
// 直接调用GetOne获取账号
|
|
|
// 新的调度策略已经在内部处理了:
|
|
// 新的调度策略已经在内部处理了:
|
|
@@ -1456,6 +1484,21 @@ namespace molilian.core
|
|
|
_ = TkLogCore.ParseLogAsync(result);
|
|
_ = TkLogCore.ParseLogAsync(result);
|
|
|
return PddParseOutput(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;
|
|
PddPoolDTO account = null;
|
|
|
// 直接调用GetOne获取账号
|
|
// 直接调用GetOne获取账号
|
|
|
// 新的调度策略已经在内部处理了:
|
|
// 新的调度策略已经在内部处理了:
|
|
@@ -1464,7 +1507,6 @@ namespace molilian.core
|
|
|
// 3. 依次尝试多个候选账号
|
|
// 3. 依次尝试多个候选账号
|
|
|
// 因此不需要外层重试逻辑
|
|
// 因此不需要外层重试逻辑
|
|
|
account = PddPoolCore.GetOne(PddUnionWorkMode.All, request.AccountId);
|
|
account = PddPoolCore.GetOne(PddUnionWorkMode.All, request.AccountId);
|
|
|
-
|
|
|
|
|
if (account == null)
|
|
if (account == null)
|
|
|
{
|
|
{
|
|
|
result.success = false;
|
|
result.success = false;
|