fix bug

molilian.api/Controllers/public/TkController.cs

@@ -270,7 +270,7 @@ namespace molilian.api.Controllers
             }
             catch (Exception ex)
             {
-                if (ex.Message.Contains("A task was canceled"))
+                if (ex.Message.Contains("was canceled"))
                 {
                     result.success = false;
                     result.message = "放弃转链";

molilian.core/Core/taoke/UnionCouponCore.cs

@@ -92,7 +92,7 @@ namespace molilian.core
             }
             catch (Exception ex)
             {
-                if (ex.Message.Contains("A task was canceled"))
+                if (ex.Message.Contains("was canceled"))
                 {
                     result.success = false;
                     result.message = "放弃转链";
@@ -208,7 +208,7 @@ namespace molilian.core
             }
             catch (Exception ex)
             {
-                if (ex.Message.Contains("A task was canceled"))
+                if (ex.Message.Contains("was canceled"))
                 {
                     result.success = false;
                     result.message = "放弃转链";

molilian.core/Core/taoke/UnionParseCore.cs

@@ -113,9 +113,9 @@ namespace molilian.core
         public static async Task<APIResult> TaobaoParseAsync(string content, string ip = "", string oaid = "")
         {
             AlimamaPlus alimama = null;
-            var result = AlimamaPlus.GetFormattedObject(content, ip, oaid);
             content = content.UrlDecode();
             content = content[..Math.Min(1000, content.Length)];
+            var result = AlimamaPlus.GetFormattedObject(content, ip, oaid);
             result.rawContent = content;
             try
             {
@@ -196,7 +196,7 @@ namespace molilian.core
             }
             catch (Exception ex)
             {
-                if (ex.Message.Contains("A task was canceled"))
+                if (ex.Message.Contains("was canceled"))
                 {
                     result.success = false;
                     result.message = "放弃转链";
@@ -320,7 +320,7 @@ namespace molilian.core
             }
             catch (Exception ex)
             {
-                if (ex.Message.Contains("A task was canceled"))
+                if (ex.Message.Contains("was canceled"))
                 {
                     result.success = false;
                     result.message = "放弃转链";
@@ -390,7 +390,7 @@ namespace molilian.core
             }
             catch (Exception ex)
             {
-                if (ex.Message.Contains("A task was canceled"))
+                if (ex.Message.Contains("was canceled"))
                 {
                     result.success = false;
                     result.message = "放弃转链";

molilian.core/Plus/Alimama/account.cs

@@ -217,6 +217,7 @@ namespace molilian.core
                     message = $"【淘宝联盟:{_accountName}】cookie 续期",
                     tags = ["green_circle"]
                 });
+                EndPointCore.NotifyReload(true);
                 //NotifyCore.AnPushNotify("Cookie更新", $"【淘宝联盟:{_accountName}】cookie 续期");
 
                 return (true, string.Empty);

molilian.core/Plus/Alimama/parse.cs

@@ -92,7 +92,7 @@ namespace molilian.core
 
         public async Task<TkDataDTO> UnionParseAsync(string content, TkDataDTO result)
         {
-            InternalTextProcessing(content, ref result);
+            result = await InternalTextProcessingAsync(content, result);
             //(result.success, result.content, result.link_type, result.shortLinkurl) = InternalTextProcessing(content);
             if (result.link_type == LinkTypeEnum.other_aff)
             {

molilian.core/Plus/Alimama/parse_2.cs

@@ -565,7 +565,7 @@ 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;
 
@@ -593,10 +593,23 @@ namespace molilian.core
 
                     return result;
                 }
-
-
-                body = response.Body();
-                JsonElement root = body.Convert2JsonElement();
+                if (response.ResponseMessage.StatusCode == System.Net.HttpStatusCode.Found)
+                {
+                    _ = new LoggerLibrary("api_error", "fail")
+                        .Info($"302:{response.ResponseMessage.Headers.Location}")
+                        .SaveAsync();
+                    throw new Exception("302 Found, was canceled");
+                }
+                JsonElement root;
+                try
+                {
+                    body = response.Body();
+                    root = body.Convert2JsonElement();
+                }
+                catch (Exception ex)
+                {
+                    throw new Exception(body);
+                }
 
                 bool success = root.Read<bool>("success", false);
                 string message = root.Read("message", string.Empty);
@@ -609,6 +622,8 @@ namespace molilian.core
                 string couponLinkTaoToken = root.PathRead("data.couponLinkTaoToken", string.Empty);
                 string couponShortLinkUrl = root.PathRead("data.couponShortLinkUrl", string.Empty);
                 decimal couponAmount = root.PathRead<decimal>("data.couponAmount", 0);
+                string couponEffectiveEndTime = root.PathRead("data.couponEffectiveEndTime", string.Empty);
+                string couponEffectiveStartTime = root.PathRead("data.couponEffectiveStartTime", string.Empty);
 
                 string itemId = root.PathRead("data.itemId", string.Empty);
                 string itemName = root.PathRead("data.itemName", string.Empty);
@@ -656,6 +671,7 @@ namespace molilian.core
                     shortLinkurl = GetLink(content);
                     switch (message)
                     {
+                        case "该商品已经下架或未加入淘宝客":
                         case "该链接不支持转化，请更换链接尝试":
                         case "网络错误":
                             break;
@@ -686,6 +702,8 @@ namespace molilian.core
                 result.message = message;
                 result.content = content;
                 result.couponAmount = couponAmount;
+                result.couponEffectiveEndTime = couponEffectiveEndTime;
+                result.couponEffectiveStartTime = couponEffectiveStartTime;
                 result.taoToken = taoToken;
                 result.shortLinkurl = shortLinkurl;
                 result.deeplink_url = deeplink_url;
@@ -847,6 +865,7 @@ namespace molilian.core
                     shortLinkurl = GetLink(content);
                     switch (message)
                     {
+                        case "该商品已经下架或未加入淘宝客":
                         case "该链接不支持转化，请更换链接尝试":
                         case "网络错误":
                             break;