取消京东的clickid的dp返回

molilian.api/Controllers/public/TkController.cs

@@ -390,36 +390,65 @@ namespace molilian.api.Controllers
         [HttpGet]
         public async Task<ActionResult> dplist([FromQuery] string query = "", [FromQuery] string a = "", [FromQuery] int t = 0, [FromQuery] string sign = "")
         {
-
+            var clientIp = _accessor.HttpContext.GetUserIp();
             //验证签名
             if (string.IsNullOrEmpty(a) || string.IsNullOrEmpty(sign))
             {
+                _ = new LoggerLibrary("api", "dplist_error")
+                    .Info($"{clientIp}\t{query}")
+                    .Info($"{a}\t{sign}\t{t}")
+                    .Info("验证错误")
+                    .SaveAsync();
+
                 return new APIResult(new { success = false, message = "验证错误" }, APIResultCodeEnum.Unauthorized);
             }
 
             DateTime time1 = t.Convert2Datetime();
             if (time1 < DateTime.Now.AddMinutes(-10))
             {
+                _ = new LoggerLibrary("api", "dplist_error")
+                    .Info($"{clientIp}\t{query}")
+                    .Info($"{a}\t{sign}\t{t}")
+                    .Info("验证错误2")
+                    .SaveAsync();
                 return new APIResult(new { success = false, message = "验证错误2" }, APIResultCodeEnum.Unauthorized);
             }
 
             var account = await ApiAccountCore.GetOneAsync(a);
             if (account == null)
             {
+                _ = new LoggerLibrary("api", "dplist_error")
+                    .Info($"{clientIp}\t{query}")
+                    .Info($"{a}\t{sign}\t{t}")
+                    .Info("验证错误3")
+                    .SaveAsync();
+
                 return new APIResult(new { success = false, message = "验证错误3" }, APIResultCodeEnum.Unauthorized);
             }
             string app_sign = $"{account.api_secret}@{t}".MD5();
             if (sign != app_sign)
             {
+                _ = new LoggerLibrary("api", "dplist_error")
+                    .Info($"{clientIp}\t{query}")
+                    .Info($"{a}\t{sign}\t{t}")
+                    .Info("验证错误4")
+                    .SaveAsync();
+
                 return new APIResult(new { success = false, message = "验证错误4" }, APIResultCodeEnum.Unauthorized);
             }
 
             if (string.IsNullOrEmpty(query))
             {
+                _ = new LoggerLibrary("api", "dplist_error")
+                    .Info($"{clientIp}\t{query}")
+                    .Info($"{a}\t{sign}\t{t}")
+                    .Info("查询条件不能为空")
+                    .SaveAsync();
+
                 return new APIResult(new { success = false, message = "查询条件不能为空" });
             }
-            int[] report_account_ids = account.report_account_ids.ToArray<int>(',');
-            int[] report_exclude_account_ids = account.report_exclude_account_ids.ToArray<int>(',');
+            int[] report_account_ids = account.report_account_ids.TryToArray<int>(',');
+            int[] report_exclude_account_ids = account.report_exclude_account_ids.TryToArray<int>(',');
 
             string filter = $"batchId=@query";
             var account_list = await TkPoolCore.ListAsync();
@@ -454,13 +483,13 @@ namespace molilian.api.Controllers
             {
                 list.Add(new { pid = item.accountId, url = item.deeplinkUrl, item.shortLinkUrl, count = item.click_num, time = item.exp_time });
             }
-            var clientIp = _accessor.HttpContext.GetUserIp();
-            LoggerLibrary log = new LoggerLibrary("api", "dplist");
-            log.Info($"{clientIp}\t{query}\tcount:{list.Count}");
 
             var ids = data.Select(e => e.Id).ToArray();
-            log.Info(string.Join(',', ids));
-            _ = log.SaveAsync();
+
+            _ = new LoggerLibrary("api", "dplist")
+                 .Info($"{clientIp}\t{query}\tcount:{list.Count}")
+                 .Info(string.Join(',', ids))
+                 .SaveAsync();
 
             var update = new DBContext.Table("tk_order_tracking")
                 .Add("last_pull_time", DateTime.Now)
@@ -578,7 +607,7 @@ namespace molilian.api.Controllers
             }
 
             var account = await ApiAccountCore.GetOneAsync(a);
-            if (account == null || !account.enable_report)
+            if (account == null)
             {
                 _ = log.Info($"a:{a}\tt:{t}\tsign:{sign}\t", $"message:验证错误3")
                     .Info(form.GetRawText())

molilian.core/Core/dataoke/DataokeCore.cs

@@ -110,7 +110,7 @@ namespace molilian.core
                 result.accountName = string.Empty;
                 result.content = content;
                 result.shortLinkurl = url;
-                result.deeplink_url = JdUnionPlus.GetDeeplink(null, string.Empty);
+                result.deeplink_url = JdUnionPlus.GetDefaultStyleDeeplink(shortLinkurl);
             }
             else
             {
@@ -142,7 +142,7 @@ namespace molilian.core
 
                 GoodsDetailDTO goods = null;
                 if (success) goods = plus.GetGoods(shortLinkurl);
-                result.deeplink_url = JdUnionPlus.GetDeeplink(shortLinkurl, string.Empty);
+                result.deeplink_url = JdUnionPlus.GetDefaultStyleDeeplink(shortLinkurl);
 
                 if (goods != null)
                 {

molilian.core/Core/taoke/UnionParseCore.cs

@@ -544,8 +544,8 @@ namespace molilian.core
                         LinkTypeEnum.live or
                         LinkTypeEnum.video or
                         LinkTypeEnum.profile or
-                        LinkTypeEnum.goods => JdUnionPlus.GetDeeplink(result.shortLinkurl, clickId),
-                        _ => JdUnionPlus.GetDeeplink(string.Empty, clickId),
+                        LinkTypeEnum.goods => JdUnionPlus.GetDefaultStyleDeeplink(result.shortLinkurl),
+                        _ => JdUnionPlus.GetDefaultStyleDeeplink(result.shortLinkurl),
                     };
 
                     //if (result.link_type == LinkTypeEnum.other_aff)
@@ -592,8 +592,8 @@ namespace molilian.core
                     result.reason = "没有匹配账号";
                     result.deeplink_url = result.link_type switch
                     {
-                        LinkTypeEnum.other_aff or LinkTypeEnum.goods => JdUnionPlus.GetDeeplink(result.shortLinkurl, clickId),
-                        _ => JdUnionPlus.GetDeeplink(string.Empty, clickId),
+                        LinkTypeEnum.other_aff or LinkTypeEnum.goods => JdUnionPlus.GetDefaultStyleDeeplink(result.shortLinkurl),
+                        _ => JdUnionPlus.GetDefaultStyleDeeplink(result.shortLinkurl),
                     };
 
                     _ = TkLogCore.ParseLogAsync(result);
@@ -634,8 +634,8 @@ namespace molilian.core
                 }
                 result.deeplink_url = result.link_type switch
                 {
-                    LinkTypeEnum.other_aff or LinkTypeEnum.goods => JdUnionPlus.GetDeeplink(result.shortLinkurl, clickId),
-                    _ => JdUnionPlus.GetDeeplink(string.Empty, clickId),
+                    LinkTypeEnum.other_aff or LinkTypeEnum.goods => JdUnionPlus.GetDefaultStyleDeeplink(result.shortLinkurl),
+                    _ => JdUnionPlus.GetDefaultStyleDeeplink(result.shortLinkurl),
                 };
             }
             _ = TkLogCore.ParseLogAsync(result);

molilian.core/Plus/JDUnion/JdUnionPlus.cs

@@ -135,7 +135,7 @@ namespace molilian.core
         public static JdDataDTO GetFormattedObject(string content, string ip = "", string oaid = "", string clickId = "")
         {
             string shortLinkurl = GetLink(content);
-            string deeplink_url = GetDeeplink(shortLinkurl, clickId);
+            string deeplink_url = GetDefaultStyleDeeplink(shortLinkurl);
 
             return new JdDataDTO()
             {
@@ -307,7 +307,7 @@ namespace molilian.core
                 result.accountName = string.Empty;
                 result.content = content;
                 result.shortLinkurl = url;
-                result.deeplink_url = GetDeeplink(url, clickId);
+                result.deeplink_url = GetDefaultStyleDeeplink(url);
                 return result;
             }
             string shortLinkurl = url;
@@ -337,7 +337,7 @@ namespace molilian.core
                     result.accountName = string.Empty;
                     result.content = content;
                     result.shortLinkurl = url;
-                    result.deeplink_url = GetDeeplink(url, clickId);
+                    result.deeplink_url = GetDefaultStyleDeeplink(url);
                     return result;
                 case LinkTypeEnum.other_aff:
                     result.success = false;
@@ -349,7 +349,7 @@ namespace molilian.core
                     result.accountName = string.Empty;
                     result.content = content;
                     result.shortLinkurl = url;
-                    result.deeplink_url = GetDeeplink(url, clickId);
+                    result.deeplink_url = GetDefaultStyleDeeplink(url);
                     return result;
                 default:
                     if (string.IsNullOrEmpty(url) || string.IsNullOrEmpty(result.itemId) ||
@@ -367,13 +367,13 @@ namespace molilian.core
                         result.accountId = 0;
                         result.accountName = string.Empty;
                         result.content = content;
-                        result.shortLinkurl = url;
+                        result.shortLinkurl = shortLinkurl;
                         result.deeplink_url = result.link_type switch
                         {
                             LinkTypeEnum.other_aff or
                             LinkTypeEnum.baseDomain or
-                            LinkTypeEnum.goods => JdUnionPlus.GetDeeplink(result.shortLinkurl, clickId),
-                            _ => JdUnionPlus.GetDeeplink(string.Empty, clickId),
+                            LinkTypeEnum.goods => GetDefaultStyleDeeplink(result.shortLinkurl),
+                            _ => GetDefaultStyleDeeplink(result.shortLinkurl),
                         };
                         return result;
                     }
@@ -393,8 +393,8 @@ namespace molilian.core
                 result.shortLinkurl = url;
                 result.deeplink_url = result.link_type switch
                 {
-                    LinkTypeEnum.other_aff or LinkTypeEnum.goods => JdUnionPlus.GetDeeplink(result.shortLinkurl, clickId),
-                    _ => JdUnionPlus.GetDeeplink(string.Empty, clickId),
+                    LinkTypeEnum.other_aff or LinkTypeEnum.goods => GetDefaultStyleDeeplink(result.shortLinkurl),
+                    _ => GetDefaultStyleDeeplink(result.shortLinkurl),
                 };
                 return result;
             }

molilian.core/Plus/JDUnion/coupon.cs

@@ -60,7 +60,7 @@ namespace molilian.core
             result.success = true;
             result.message = "success";
             result.couponAmount = dtkResult.couponAmount;
-            result.deeplink_url = GetDeeplink(dtkResult.couponLink, clickId);
+            result.deeplink_url = GetDefaultStyleDeeplink(dtkResult.couponLink);
             result.couponAmount = dtkResult.couponAmount;
             result.itemId = dtkResult.skuId.ToString();
 

molilian.core/Plus/JDUnion/goods.cs

@@ -83,7 +83,7 @@ namespace molilian.core
             result.success = false;
             result.message = "转链失败";
             result.shortLinkurl = shortLinkurl;
-            result.deeplink_url = GetDeeplink(result.shortLinkurl, clickId);
+            result.deeplink_url = GetDefaultStyleDeeplink(result.shortLinkurl);
 
             _ = new LoggerLibrary("JdUnion", "promotion_get_error").Info(body).SaveAsync();
             return result;
@@ -138,7 +138,7 @@ namespace molilian.core
             result.success = false;
             result.message = "转链失败";
             result.shortLinkurl = shortLinkurl;
-            result.deeplink_url = GetDeeplink(result.shortLinkurl, clickId);
+            result.deeplink_url = GetDefaultStyleDeeplink(result.shortLinkurl);
             _ = new LoggerLibrary("JdUnion", "bysubunionid_get_error").Info(body).SaveAsync();
             return result;
         }
@@ -204,7 +204,7 @@ namespace molilian.core
                 result.message = "转链失败";
                 result.reason = "签名失败";
                 result.shortLinkurl = wareUrl;
-                result.deeplink_url = GetDeeplink(result.shortLinkurl, clickId);
+                result.deeplink_url = GetDefaultStyleDeeplink(result.shortLinkurl);
                 return result;
             }
 
@@ -259,7 +259,7 @@ namespace molilian.core
                 result.message = "转链失败";
                 result.reason = message;
                 result.shortLinkurl = wareUrl;
-                result.deeplink_url = GetDeeplink(result.shortLinkurl, clickId);
+                result.deeplink_url = GetDefaultStyleDeeplink(result.shortLinkurl);
                 _ = new LoggerLibrary("JdUnion", "GetPromotionByCrawlerAsync").Info(body).SaveAsync();
             }
             return result;
@@ -359,7 +359,7 @@ namespace molilian.core
                 result.message = "OK";
                 result.shortLinkurl = shortCode;
                 result.content = result.shortLinkurl;
-                result.deeplink_url = GetDeeplink(result.shortLinkurl, clickId);
+                result.deeplink_url = GetDefaultStyleDeeplink(result.shortLinkurl);
             }
             else
             {
@@ -368,7 +368,7 @@ namespace molilian.core
                 result.message = "转链失败";
                 result.reason = message;
                 result.shortLinkurl = wareUrl;
-                result.deeplink_url = GetDeeplink(result.shortLinkurl, clickId);
+                result.deeplink_url = GetDefaultStyleDeeplink(result.shortLinkurl);
                 _ = new LoggerLibrary("JdUnion", "GetPromotionByCrawlerAsync").Info(body).SaveAsync();
             }
             return result;