Pārlūkot izejas kodu

1、success重新定义,只要有DP返回则success=true (包括兜底DP)
2、淘宝京东拼多多以及其他只做DP转链的平台都返回commercial字段,按照是否商业化返回true/false

dodo hold 7 mēneši atpakaļ
vecāks
revīzija
ba114d1e4b

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
molilian.api/Properties/PublishProfiles/latest.pubxml.user


+ 18 - 16
molilian.core/Core/taoke/UnionParseCore/UnionParseCore.cs

@@ -200,7 +200,7 @@ namespace molilian.core
                     _ = TkLogCore.ParseLogAsync(result);
                     return TaobaoParseOutput(result, swData, new
                     {
-                        result.success,
+                        success = !string.IsNullOrEmpty(result.deeplink_url),
                         result.commercial,
                         result.with_middle_page,
                         result.message,
@@ -290,7 +290,7 @@ namespace molilian.core
 
             return TaobaoParseOutput(result, swData, new
             {
-                result.success,
+                success = !string.IsNullOrEmpty(result.deeplink_url),
                 result.commercial,
                 result.with_middle_page,
                 result.message,
@@ -365,7 +365,7 @@ namespace molilian.core
                     _ = TkLogCore.ParseLogAsync(result);
                     return TaobaoParseOutput(result, swData, new
                     {
-                        result.success,
+                        success = !string.IsNullOrEmpty(result.deeplink_url),
                         result.commercial,
                         result.with_middle_page,
                         result.message,
@@ -393,7 +393,7 @@ namespace molilian.core
 
                     return TaobaoParseOutput(result, swData, new
                     {
-                        result.success,
+                        success = !string.IsNullOrEmpty(result.deeplink_url),
                         result.commercial,
                         result.with_middle_page,
                         result.message,
@@ -422,7 +422,7 @@ namespace molilian.core
 
                     return TaobaoParseOutput(result, swData, new
                     {
-                        result.success,
+                        success = !string.IsNullOrEmpty(result.deeplink_url),
                         result.commercial,
                         result.with_middle_page,
                         result.message,
@@ -466,7 +466,7 @@ namespace molilian.core
                     other_aff = true;
                     return TaobaoParseOutput(result, swData, new
                     {
-                        result.success,
+                        success = !string.IsNullOrEmpty(result.deeplink_url),
                         result.commercial,
                         result.with_middle_page,
                         result.message,
@@ -507,7 +507,7 @@ namespace molilian.core
                     other_aff = true;
                     return TaobaoParseOutput(result, swData, new
                     {
-                        result.success,
+                        success = !string.IsNullOrEmpty(result.deeplink_url),
                         result.commercial,
                         result.with_middle_page,
                         result.message,
@@ -537,7 +537,7 @@ namespace molilian.core
 
                     return TaobaoParseOutput(result, swData, new
                     {
-                        result.success,
+                        success = !string.IsNullOrEmpty(result.deeplink_url),
                         result.commercial,
                         result.with_middle_page,
                         result.message,
@@ -565,7 +565,7 @@ namespace molilian.core
                     _ = TkLogCore.ParseLogAsync(result);
                     return TaobaoParseOutput(result, swData, new
                     {
-                        result.success,
+                        success = !string.IsNullOrEmpty(result.deeplink_url),
                         result.commercial,
                         result.with_middle_page,
                         result.message,
@@ -595,7 +595,7 @@ namespace molilian.core
                     _ = TkLogCore.ParseLogAsync(result);
                     return TaobaoParseOutput(result, swData, new
                     {
-                        result.success,
+                        success = !string.IsNullOrEmpty(result.deeplink_url),
                         result.commercial,
                         result.with_middle_page,
                         result.message,
@@ -689,7 +689,7 @@ namespace molilian.core
 
             return TaobaoParseOutput(result, swData, new
             {
-                result.success,
+                success = !string.IsNullOrEmpty(result.deeplink_url),
                 result.commercial,
                 result.with_middle_page,
                 result.message,
@@ -718,13 +718,12 @@ namespace molilian.core
 
         private static APIResult JdParseOutput(JdDataDTO result, APIResultCodeEnum code = APIResultCodeEnum.OK)
         {
-
-
             return new APIResult(new
             {
-                result.success,
-                result.commercial,
+                success = !string.IsNullOrEmpty(result.deeplink_url),
+                //result.success,
                 result.message,
+                result.commercial,
                 link_type = result.link_type.ToString(),
                 channel = result?.channel.ToString(),
                 result.channel_type,
@@ -1188,6 +1187,7 @@ namespace molilian.core
             {
                 result.success = true;
                 result.message = "OK";
+                result.commercial = true;
                 result.deeplink_url = overrideContent.output_text;
 
                 _ = TkLogCore.ParseLogAsync(result);
@@ -1449,8 +1449,10 @@ namespace molilian.core
         {
             return new APIResult(new
             {
-                result.success,
+                //result.success,
+                success = !string.IsNullOrEmpty(result.deeplink_url),
                 result.message,
+                result.commercial,
                 sub_message = result.reason,
                 home_page = "pinduoduo://com.xunmeng.pinduoduo/".Equals(result.deeplink_url),
                 link_type = result.link_type.ToString(),

+ 13 - 11
molilian.core/Core/taoke/UnionParseCore/dp2dp.cs

@@ -45,7 +45,7 @@ namespace molilian.core
                     _ = TkLogCore.ParseLogAsync(result);
                     return TaobaoParseOutput(result, swData, new
                     {
-                        result.success,
+                        success = !string.IsNullOrEmpty(result.deeplink_url),
                         result.commercial,
                         result.with_middle_page,
                         result.message,
@@ -76,7 +76,7 @@ namespace molilian.core
                     _ = TkLogCore.ParseLogAsync(result);
                     return TaobaoParseOutput(result, swData, new
                     {
-                        result.success,
+                        success = !string.IsNullOrEmpty(result.deeplink_url),
                         result.commercial,
                         result.with_middle_page,
                         result.message,
@@ -108,7 +108,7 @@ namespace molilian.core
                         _ = TkLogCore.ParseLogAsync(result);
                         return TaobaoParseOutput(result, swData, new
                         {
-                            result.success,
+                            success = !string.IsNullOrEmpty(result.deeplink_url),
                             result.commercial,
                             result.with_middle_page,
                             result.message,
@@ -167,7 +167,7 @@ namespace molilian.core
 
                     return TaobaoParseOutput(result, swData, new
                     {
-                        result.success,
+                        success = !string.IsNullOrEmpty(result.deeplink_url),
                         result.commercial,
                         result.with_middle_page,
                         result.message,
@@ -196,7 +196,7 @@ namespace molilian.core
 
                     return TaobaoParseOutput(result, swData, new
                     {
-                        result.success,
+                        success = !string.IsNullOrEmpty(result.deeplink_url),
                         result.commercial,
                         result.with_middle_page,
                         result.message,
@@ -246,7 +246,7 @@ namespace molilian.core
                     other_aff = true;
                     return TaobaoParseOutput(result, swData, new
                     {
-                        result.success,
+                        success = !string.IsNullOrEmpty(result.deeplink_url),
                         result.commercial,
                         result.with_middle_page,
                         result.message,
@@ -291,7 +291,7 @@ namespace molilian.core
                     other_aff = true;
                     return TaobaoParseOutput(result, swData, new
                     {
-                        result.success,
+                        success = !string.IsNullOrEmpty(result.deeplink_url),
                         result.commercial,
                         result.with_middle_page,
                         result.message,
@@ -325,7 +325,7 @@ namespace molilian.core
 
                     return TaobaoParseOutput(result, swData, new
                     {
-                        result.success,
+                        success = !string.IsNullOrEmpty(result.deeplink_url),
                         result.commercial,
                         result.with_middle_page,
                         result.message,
@@ -357,7 +357,7 @@ namespace molilian.core
                     _ = TkLogCore.ParseLogAsync(result);
                     return TaobaoParseOutput(result, swData, new
                     {
-                        result.success,
+                        success = !string.IsNullOrEmpty(result.deeplink_url),
                         result.commercial,
                         result.with_middle_page,
                         result.message,
@@ -391,7 +391,7 @@ namespace molilian.core
                     _ = TkLogCore.ParseLogAsync(result);
                     return TaobaoParseOutput(result, swData, new
                     {
-                        result.success,
+                        success = !string.IsNullOrEmpty(result.deeplink_url),
                         result.commercial,
                         result.with_middle_page,
                         result.message,
@@ -489,7 +489,8 @@ namespace molilian.core
 
             return TaobaoParseOutput(result, swData, new
             {
-                result.success,
+                //result.success,
+                success = !string.IsNullOrEmpty(result.deeplink_url),
                 result.commercial,
                 result.with_middle_page,
                 result.message,
@@ -712,6 +713,7 @@ namespace molilian.core
                 {
                     result.success = true;
                     result.message = "OK";
+                    result.commercial = true;
                     result.deeplink_url = overrideContent.output_text;
 
                     _ = TkLogCore.ParseLogAsync(result);

+ 2 - 0
molilian.core/Plus/pdd/Crawler.cs

@@ -110,6 +110,7 @@ namespace molilian.core
 
             result.success = true;
             result.message = "OK";
+            result.commercial = true;
             result.link_type = LinkTypeEnum.goods;
             result.shortLinkurl = root.result?.multiGroupShortUrl;
             result.content = result.shortLinkurl;
@@ -193,6 +194,7 @@ namespace molilian.core
 
             result.success = true;
             result.message = "OK";
+            result.commercial = true;
             result.link_type = LinkTypeEnum.goods;
             result.shortLinkurl = root.result?.multiGroupShortUrl;
             result.content = result.shortLinkurl;

+ 1 - 0
molilian.core/Plus/pdd/open.cs

@@ -153,6 +153,7 @@ namespace molilian.core
             }
             result.success = true;
             result.message = "OK";
+            result.commercial = true;
             result.link_type = LinkTypeEnum.goods;
             result.shortLinkurl = root.goods_zs_unit_generate_response.short_url;
             result.content = result.shortLinkurl;

Daži faili netika attēloti, jo izmaiņu fails ir pārāk liels