Browse Source

超时严重的另外写表(临时);
成功任务另外写表;

dodo hold 2 years ago
parent
commit
2e8cf18a3e

File diff suppressed because it is too large
+ 0 - 0
molilian.api/Properties/PublishProfiles/https___ccr.ccs.tencentyun.com_shaobin.pubxml.user


+ 1 - 1
molilian.api/molilian.api.csproj

@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="dodohold.core" Version="1.0.1.10" />
+    <PackageReference Include="dodohold.core" Version="1.0.1.11" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.20.0-Preview.1" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
   </ItemGroup>

+ 118 - 0
molilian.core/Core/taoke/TkLogCore.cs

@@ -79,6 +79,63 @@ namespace molilian.core
                         .Add("oaid", data.oaid)
                         .Add("create_time", data.create_time)
                         .Create(DBContext.InsertType.NORMAL, transaction);
+
+                    if (data.elapsedTime > 1000)
+                    {
+                        new DBContext.Table(connection, "tk_logs_test")
+                            .Add("end_point", data.end_point)
+                            .Add("channel", (int)data.channel)
+                            .Add("accountId", data.accountId)
+                            .Add("accountName", data.accountName)
+                            .Add("rawContent", data.rawContent)
+                            .Add("rawContent2", data.rawContent2)
+                            .Add("success", data.success)
+                            .Add("message", data.message)
+                            .Add("reason", data.reason)
+                            .Add("content", data.content)
+                            .Add("couponAmount", data.couponAmount)
+                            .Add("itemId", data.itemId)
+                            .Add("itemName", data.itemName)
+                            .Add("pic", data.pic)
+                            .Add("promotionPrice", data.promotionPrice)
+                            .Add("taoToken", data.taoToken)
+                            .Add("shortLinkurl", data.shortLinkurl)
+                            .Add("deeplink_url", data.deeplink_url)
+                            .Add("num_iid", data.num_iid)
+                            .Add("elapsedTime", data.elapsedTime)
+                            .Add("ip", data.ip)
+                            .Add("oaid", data.oaid)
+                            .Add("create_time", data.create_time)
+                            .Create(DBContext.InsertType.NORMAL, transaction);
+                    }
+                    if (data.success)
+                    {
+                        new DBContext.Table(connection, "tk_success_logs")
+                            .Add("end_point", data.end_point)
+                            .Add("channel", (int)data.channel)
+                            .Add("accountId", data.accountId)
+                            .Add("accountName", data.accountName)
+                            .Add("rawContent", data.rawContent)
+                            .Add("rawContent2", data.rawContent2)
+                            .Add("success", data.success)
+                            .Add("message", data.message)
+                            .Add("reason", data.reason)
+                            .Add("content", data.content)
+                            .Add("couponAmount", data.couponAmount)
+                            .Add("itemId", data.itemId)
+                            .Add("itemName", data.itemName)
+                            .Add("pic", data.pic)
+                            .Add("promotionPrice", data.promotionPrice)
+                            .Add("taoToken", data.taoToken)
+                            .Add("shortLinkurl", data.shortLinkurl)
+                            .Add("deeplink_url", data.deeplink_url)
+                            .Add("num_iid", data.num_iid)
+                            .Add("elapsedTime", data.elapsedTime)
+                            .Add("ip", data.ip)
+                            .Add("oaid", data.oaid)
+                            .Add("create_time", data.create_time)
+                            .Create(DBContext.InsertType.NORMAL, transaction);
+                    }
                     if (!string.IsNullOrEmpty(data.itemId)) TkOrderTrackingCore.SaveLinkSummary(data);
                     total++;
                 }
@@ -138,6 +195,67 @@ namespace molilian.core
                         .Add("oaid", data.oaid)
                         .Add("create_time", data.create_time)
                         .Create(DBContext.InsertType.NORMAL, transaction);
+
+                    if (data.elapsedTime > 1000)
+                    {
+                        new DBContext.Table(connection, "tk_parse_logs_test")
+                            .Add("end_point", data.end_point)
+                            .Add("channel", (int)data.channel)
+                            .Add("accountId", data.accountId)
+                            .Add("accountName", data.accountName)
+                            .Add("rawContent", data.rawContent)
+                            .Add("success", data.success)
+                            .Add("message", data.message)
+                            .Add("reason", data.reason)
+                            .Add("content", data.content)
+                            .Add("itemId", data.itemId)
+                            .Add("itemName", data.itemName)
+                            .Add("pic", data.pic)
+                            .Add("couponAmount", data.couponAmount)
+                            .Add("promotionPrice", data.promotionPrice)
+                            .Add("taoToken", data.taoToken)
+                            .Add("shortLinkurl", data.shortLinkurl)
+                            .Add("deeplink_url", data.deeplink_url)
+                            .Add("num_iid", data.num_iid)
+                            .Add("elapsedTime", data.elapsedTime)
+                            .Add("elapsedTime2", data.elapsedTime2)
+                            .Add("elapsedTime3", data.elapsedTime3)
+                            .Add("ip", data.ip)
+                            .Add("oaid", data.oaid)
+                            .Add("create_time", data.create_time)
+                            .Create(DBContext.InsertType.NORMAL, transaction);
+                    }
+
+                    if (data.success)
+                    {
+                        new DBContext.Table(connection, "tk_success_parse_logs")
+                            .Add("end_point", data.end_point)
+                            .Add("channel", (int)data.channel)
+                            .Add("accountId", data.accountId)
+                            .Add("accountName", data.accountName)
+                            .Add("rawContent", data.rawContent)
+                            .Add("success", data.success)
+                            .Add("message", data.message)
+                            .Add("reason", data.reason)
+                            .Add("content", data.content)
+                            .Add("itemId", data.itemId)
+                            .Add("itemName", data.itemName)
+                            .Add("pic", data.pic)
+                            .Add("couponAmount", data.couponAmount)
+                            .Add("promotionPrice", data.promotionPrice)
+                            .Add("taoToken", data.taoToken)
+                            .Add("shortLinkurl", data.shortLinkurl)
+                            .Add("deeplink_url", data.deeplink_url)
+                            .Add("num_iid", data.num_iid)
+                            .Add("elapsedTime", data.elapsedTime)
+                            .Add("elapsedTime2", data.elapsedTime2)
+                            .Add("elapsedTime3", data.elapsedTime3)
+                            .Add("ip", data.ip)
+                            .Add("oaid", data.oaid)
+                            .Add("create_time", data.create_time)
+                            .Create(DBContext.InsertType.NORMAL, transaction);
+                    }
+
                     if (!string.IsNullOrEmpty(data.itemId)) TkOrderTrackingCore.SaveLinkSummary(data);
                     total++;
                 }

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

@@ -82,7 +82,7 @@ namespace molilian.core
             {
                 //处理过后的正文 用于转链
                 if (result.success) content = result.content;
-                alimamaParse(content, ref result);
+                result = alimamaParse(content, result);
             }
 
             result.content = content;

+ 11 - 4
molilian.core/Plus/Alimama/parse_2.cs

@@ -135,7 +135,7 @@ namespace molilian.core
         public TimeSpan GetRequestTimeout(int deduction = 0)
         {
 #if DEBUG
-            return TimeSpan.FromMilliseconds(10 * 1000);
+            //return TimeSpan.FromMilliseconds(10 * 1000);
 #endif
             if (_config.rt_max == 0) return TimeSpan.FromMilliseconds(1000);
             int timeout = _config.rt_max;
@@ -370,8 +370,6 @@ namespace molilian.core
         private async Task<TkDataDTO> InternalTextProcessingAsync(string content, TkDataDTO result)
         {
             //(result.success, result.content, result.link_type, result.shortLinkurl) = InternalTextProcessing(content,ref result);
-
-
             bool success;
             string resultText;
             LinkTypeEnum link_type = LinkTypeEnum.unknown;
@@ -466,6 +464,7 @@ namespace molilian.core
             result.content = "纯口令 没链接";
             result.link_type = LinkTypeEnum.other_aff;
             result.shortLinkurl = null;
+            return result;
         }
         private (bool, string, LinkTypeEnum, string) InternalTextProcessing222(string content)
         {
@@ -552,6 +551,9 @@ namespace molilian.core
                 $"t={t}&_tb_token_={_tb_token}&floorId={_floorId}&refpid={_refpid}&variableMap={variableMap}";
 
 
+
+            Stopwatch stopwatch = Stopwatch.StartNew();
+            stopwatch.Start();
             var client = new WebClientUtility().SetContentType("application/json;charset=utf-8")
                         .AddHeaders("X-Requested-With", "XMLHttpRequest")
                         .AddHeaders("Cookie", _cookies);
@@ -563,6 +565,11 @@ namespace molilian.core
             client.Timeout = GetRequestTimeout(result.elapsedTime2);
             //var response = client.Request(url);
             var response = await client.RequestAsync(url);
+             
+            stopwatch.Stop();
+            result.elapsedTime3 = (int)stopwatch.ElapsedMilliseconds;
+
+
 
             var body = string.Empty;
             try
@@ -925,6 +932,6 @@ namespace molilian.core
             return result;
         }
 
-         
+
     }
 }

+ 1 - 1
molilian.core/molilian.core.csproj

@@ -13,7 +13,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="dodohold.core" Version="1.0.1.10" />
+    <PackageReference Include="dodohold.core" Version="1.0.1.11" />
     <PackageReference Include="FakeUserAgent" Version="1.0.2" />
     <PackageReference Include="IP2Region.Net" Version="2.0.2" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />

Some files were not shown because too many files changed in this diff