将所有调试ip和oaid集中管理

molilian.api/Controllers/admin/DataReportController.cs

@@ -38,10 +38,10 @@ namespace molilian.api.Controllers
             string sort = form.Read<string>("sort");
             string order = form.Read<string>("order");
 
-            //string filter = string.Empty;
+            string filter = string.Empty;
 
             // 临时锁定所有口令推送数据
-            string filter = "type<>1";
+            //string filter = "type<>1";
 
             int type = form.Read("type", 0);
             if (type > 0) filter += $" AND type = @type";
@@ -94,7 +94,7 @@ namespace molilian.api.Controllers
             if (item == null) return new APIResult(new { data = new { success = false, msg = "PUSH失败，记录不存在" } });
 
             // 临时锁定所有口令推送数据
-            if (item.type == 1) return new APIResult(new { data = new { success = false, msg = "PUSH失败，类型错误" } });
+            //if (item.type == 1) return new APIResult(new { data = new { success = false, msg = "PUSH失败，类型错误" } });
 
             PushDataReportPush plus = new PushDataReportPush();
 
@@ -132,7 +132,7 @@ namespace molilian.api.Controllers
             if (item == null) return new APIResult(new { data = new { success = false, msg = "删除失败，记录不存在" } });
 
             // 临时锁定所有口令推送数据
-            if (item.type == 1) return new APIResult(new { data = new { success = false, msg = "删除失败，类型错误" } });
+            //if (item.type == 1) return new APIResult(new { data = new { success = false, msg = "删除失败，类型错误" } });
 
             var result = new DBContext.Table("push_data_report").Delete("id=@id", new { id });
             bool success = result > 0;
@@ -161,7 +161,7 @@ namespace molilian.api.Controllers
                 var type = from.Read<int>("type", 0);
 
                 // 临时锁定所有口令推送数据
-                if (type == 1) return new APIResult(new { data = new { success = false, msg = "更新失败，类型错误" } });
+                //if (type == 1) return new APIResult(new { data = new { success = false, msg = "更新失败，类型错误" } });
 
                 var update = new DBContext.Table("push_data_report");
 

molilian.api/Controllers/public/TaskController.cs

@@ -44,7 +44,7 @@ namespace molilian.api.Controllers
         {
             PushDataReportCore core = new();
             DateTime sdate = DateTime.Parse("2025-01-01");
-            DateTime edate = DateTime.Parse("2025-03-24");
+            DateTime edate = DateTime.Now.Date;
             int count = 0;
             while (sdate < edate)
             {
@@ -427,18 +427,30 @@ namespace molilian.api.Controllers
 
         [HttpGet]
 
-        public async Task<ActionResult> ApiCallStatistics(int intervalDay = 1)
+        public async Task<ActionResult> ApiCallStatistics(int intervalDay = 1, int? chanel = null)
         {
             try
             {
+                if (chanel == null)
+                {
+
+
 #if DEBUG
-                await AlimamaPlus.ApiCallStatisticsAsync(1, intervalDay, TkChannelEnum.jd);
+                    await AlimamaPlus.ApiCallStatisticsAsync(1, intervalDay, TkChannelEnum.pdd);
 #else
                 await AlimamaPlus.ApiCallStatisticsAsync(1, intervalDay, TkChannelEnum.tb);
                 await AlimamaPlus.ApiCallStatisticsAsync(2, intervalDay, TkChannelEnum.tb);
                 await AlimamaPlus.ApiCallStatisticsAsync(1, intervalDay, TkChannelEnum.jd);
                 await AlimamaPlus.ApiCallStatisticsAsync(1, intervalDay, TkChannelEnum.pdd);
 #endif
+
+                }
+                else
+                {
+                    TkChannelEnum _chanel = (TkChannelEnum)chanel;
+                    await AlimamaPlus.ApiCallStatisticsAsync(1, intervalDay, _chanel);
+
+                }
             }
             catch (Exception ex)
             {
@@ -888,6 +900,8 @@ namespace molilian.api.Controllers
                     }
                 }
             }
+            //更新前一天的pdd统计表
+            await AlimamaPlus.ApiCallStatisticsAsync(1, 1, TkChannelEnum.pdd);
             return new APIResult(new { success = true, message = "ok" });
         }
 

molilian.core/Core/log/base.cs

@@ -13,8 +13,6 @@ namespace molilian.core
 
         public static bool save_dailys_log = false;
 
-        public static string _test_oaid = "3B191CFA4C6B48F9BA459E915B57743BEC7D424979CC9C51BCAD0C245B1C7BA2";
-
         static TkLogCore()
         {
             int flag = RedisHelper.Get<int>("turn:save_dailys_log");

molilian.core/Core/log/coupon.cs

@@ -22,8 +22,8 @@ namespace molilian.core
                     var data = await redis.LPopAsync<UnionCouponDTO>(queue_coupon_key);
                     if (data == null) break;
 
-                    if (_test_oaid.Equals(data.oaid) ||
-                         data.ip.StartsWith("127.0.0"))
+
+                    if (TestParseCore.InWhitelist(data.ip, data.oaid))
                     {
                         var test_data = data.Convert2Json().Convert2Object<TestUnionCouponDTO>();
                         connection.Insert(test_data);
@@ -68,8 +68,7 @@ namespace molilian.core
                     var data = redis.LPop<UnionCouponDTO>(queue_coupon_key);
                     if (data == null) break;
 
-                    if (_test_oaid.Equals(data.oaid) ||
-                         data.ip.StartsWith("127.0.0"))
+                    if (TestParseCore.InWhitelist(data.ip, data.oaid))
                     {
                         var test_data = data.Convert2Json().Convert2Object<TestUnionCouponDTO>();
                         connection.Insert(test_data);
@@ -109,7 +108,8 @@ namespace molilian.core
                 response.elapsedTime = (int)ts.TotalMilliseconds;
                 _ = RedisHelper.RPushAsync(queue_coupon_key, response);
 
-                if (!response.ip.StartsWith("127.0.0"))
+
+                if (!TestParseCore.InWhitelist(response.ip, response.oaid))
                 {
                     saveCouponCache(response.channel.ToString(), response.accountId, response.accountName, response.success, response.message, response.reason);
                 }

molilian.core/Core/log/cps.cs

@@ -23,8 +23,7 @@ namespace molilian.core
                     var data = await redis.LPopAsync<UnionCpsDTO>(queue_cps_key);
                     if (data == null) break;
 
-                    if (_test_oaid.Equals(data.oaid) ||
-                         data.ip.StartsWith("127.0.0"))
+                    if (TestParseCore.InWhitelist(data.ip, data.oaid))
                     {
                         var test_data = data.Convert2Json().Convert2Object<TestUnionCpsDTO>();
                         connection.Insert(test_data);
@@ -67,8 +66,7 @@ namespace molilian.core
                     var data = redis.LPop<UnionCpsDTO>(queue_cps_key);
                     if (data == null) break;
 
-                    if (_test_oaid.Equals(data.oaid) ||
-                         data.ip.StartsWith("127.0.0"))
+                    if (TestParseCore.InWhitelist(data.ip, data.oaid))
                     {
                         var test_data = data.Convert2Json().Convert2Object<TestUnionCpsDTO>();
                         connection.Insert(test_data);
@@ -140,7 +138,7 @@ namespace molilian.core
                     await saveClientRequestTotalAsync(response.channel, response.ip, response.oaid);
                 }
 
-                if (!response.ip.StartsWith("127.0.0"))
+                if (!TestParseCore.InWhitelist(response.ip, response.oaid))
                 {
                     saveCpsCache(response.channel, response.accountId,
                         response.success, response.message, response.reason);

molilian.core/Core/log/deeplink.cs

@@ -26,8 +26,7 @@ namespace molilian.core
                     if (data == null) break;
 
 
-                    if (_test_oaid.Equals(data.oaid) ||
-                         data.ip.StartsWith("127.0.0"))
+                    if (TestParseCore.InWhitelist(data.ip, data.oaid))
                     {
                         save_dp_parse_logs(data, "deeplink_parse_logs_test", connection, transaction);
                     }
@@ -85,8 +84,7 @@ namespace molilian.core
                     if (data == null) break;
 
 
-                    if (_test_oaid.Equals(data.oaid) ||
-                         data.ip.StartsWith("127.0.0"))
+                    if (TestParseCore.InWhitelist(data.ip, data.oaid))
                     {
                         save_dp_parse_logs(data, "deeplink_parse_logs_test", connection, transaction);
                     }
@@ -170,7 +168,7 @@ namespace molilian.core
                 response.elapsedTime = (int)ts.TotalMilliseconds;
                 _ = RedisKit.RPushAsync(queue_deeplink_parse_key, response);
 
-                if (!response.ip.StartsWith("127.0.0"))
+                if (!TestParseCore.InWhitelist(response.ip, response.oaid))
                 {
                     await SaveParseCacheAsync(response.channel_name, 0, "tool",
                         response.success, response.message, response.reason,

molilian.core/Core/log/dy.cs

@@ -140,7 +140,7 @@ namespace molilian.core
 
                 if (response.success) await saveClientRequestTotalAsync(response.channel, response.ip, response.oaid);
 
-                if (!response.ip.StartsWith("127.0.0"))
+                if (!TestParseCore.InWhitelist(response.ip, response.oaid))
                 {
                     await SaveParseCacheAsync(response.channel.ToString(), response.accountId,
                         response.accountName, response.success, response.message, response.reason,

molilian.core/Core/log/jd.cs

@@ -23,8 +23,7 @@ namespace molilian.core
                     var data = await redis.LPopAsync<JdDataDTO>(queue_parse_jd_key);
                     if (data == null) break;
 
-                    if (_test_oaid.Equals(data.oaid) ||
-                         data.ip.StartsWith("127.0.0"))
+                    if (TestParseCore.InWhitelist(data.ip, data.oaid))
                     {
                         save_jd_parse_logs(data, "jd_parse_logs_test", connection, transaction);
                     }
@@ -79,8 +78,7 @@ namespace molilian.core
                     var data = redis.LPop<JdDataDTO>(queue_parse_jd_key);
                     if (data == null) break;
 
-                    if (_test_oaid.Equals(data.oaid) ||
-                         data.ip.StartsWith("127.0.0"))
+                    if (TestParseCore.InWhitelist(data.ip, data.oaid))
                     {
                         save_jd_parse_logs(data, "jd_parse_logs_test", connection, transaction);
                     }
@@ -130,7 +128,7 @@ namespace molilian.core
                 response.elapsedTime = (int)ts.TotalMilliseconds;
                 _ = RedisKit.RPushAsync(queue_parse_jd_key, response);
 
-                if (!response.ip.StartsWith("127.0.0"))
+                if (!TestParseCore.InWhitelist(response.ip, response.oaid))
                 {
                     await SaveParseCacheAsync(response.channel.ToString(), response.accountId,
                         response.accountName, response.success, response.message, response.reason,

molilian.core/Core/log/ks.cs

@@ -26,7 +26,7 @@ namespace molilian.core
                     if (data == null) break;
 
 
-                    if (_test_oaid.Equals(data.oaid) || data.ip.StartsWith("127.0.0"))
+                    if (TestParseCore.InWhitelist(data.ip, data.oaid))
                     {
                         save_ks_parse_logs(data, "ks_parse_logs_test", connection, transaction);
                     }
@@ -78,7 +78,7 @@ namespace molilian.core
                     if (data == null) break;
 
 
-                    if (_test_oaid.Equals(data.oaid) || data.ip.StartsWith("127.0.0"))
+                    if (TestParseCore.InWhitelist(data.ip, data.oaid))
                     {
                         save_ks_parse_logs(data, "ks_parse_logs_test", connection, transaction);
                     }
@@ -124,7 +124,7 @@ namespace molilian.core
                 response.elapsedTime = (int)ts.TotalMilliseconds;
                 _ = RedisKit.RPushAsync(queue_parse_ks_key, response);
 
-                if (!response.ip.StartsWith("127.0.0"))
+                if (!TestParseCore.InWhitelist(response.ip, response.oaid))
                 {
                     await SaveParseCacheAsync(response.channel.ToString(), response.accountId,
                         response.accountName, response.success, response.message, response.reason,

molilian.core/Core/log/pdd.cs

@@ -24,8 +24,7 @@ namespace molilian.core
                     if (data == null) break;
 
 
-                    if (_test_oaid.Equals(data.oaid) ||
-                         data.ip.StartsWith("127.0.0"))
+                    if (TestParseCore.InWhitelist(data.ip, data.oaid))
                     {
                         save_pdd_parse_logs(data, "pdd_parse_logs_test", connection, transaction);
                     }
@@ -75,8 +74,7 @@ namespace molilian.core
                     if (data == null) break;
 
 
-                    if (_test_oaid.Equals(data.oaid) ||
-                         data.ip.StartsWith("127.0.0"))
+                    if (TestParseCore.InWhitelist(data.ip, data.oaid))
                     {
                         save_pdd_parse_logs(data, "pdd_parse_logs_test", connection, transaction);
                     }
@@ -120,7 +118,7 @@ namespace molilian.core
                 response.elapsedTime = (int)ts.TotalMilliseconds;
                 _ = RedisKit.RPushAsync(queue_parse_pdd_key, response);
 
-                if (!response.ip.StartsWith("127.0.0"))
+                if (!TestParseCore.InWhitelist(response.ip, response.oaid))
                 {
                     await SaveParseCacheAsync(response.channel.ToString(), response.accountId,
                           response.accountName, response.success, response.message, response.reason,

molilian.core/Core/log/taobao.cs

@@ -23,8 +23,7 @@ namespace molilian.core
                     var data = await redis.LPopAsync<TkDataDTO>(queue_parse_tb_key);
                     if (data == null) break;
 
-                    if (_test_oaid.Equals(data.oaid) ||
-                         data.ip.StartsWith("127.0.0"))
+                    if (TestParseCore.InWhitelist(data.ip, data.oaid))
                     {
                         save_tk_parse_logs(data, "tk_parse_logs_test", connection, transaction);
                     }
@@ -95,8 +94,7 @@ namespace molilian.core
                     var data = redis.LPop<TkDataDTO>(queue_parse_tb_key);
                     if (data == null) break;
 
-                    if (_test_oaid.Equals(data.oaid) ||
-                         data.ip.StartsWith("127.0.0"))
+                    if (TestParseCore.InWhitelist(data.ip, data.oaid))
                     {
                         save_tk_parse_logs(data, "tk_parse_logs_test", connection, transaction);
                     }
@@ -174,7 +172,7 @@ namespace molilian.core
                 {
                     _ = saveUnionCouponParseCacheAsync(response);
                 }
-                if (!response.ip.StartsWith("127.0.0"))
+                if (!TestParseCore.InWhitelist(response.ip, response.oaid))
                 {
                     await SaveParseCacheAsync(response.channel.ToString(), response.accountId,
                         response.accountName, response.success, response.message, response.reason,

molilian.core/Core/log/tool.cs

@@ -24,8 +24,7 @@ namespace molilian.core
                     if (data == null) break;
 
 
-                    if (_test_oaid.Equals(data.oaid) ||
-                         data.ip.StartsWith("127.0.0"))
+                    if (TestParseCore.InWhitelist(data.ip, data.oaid))
                     {
                         new DBContext.Table(connection, "tool_parse_logs_test")
                             .Add("end_point", data.end_point)
@@ -98,8 +97,7 @@ namespace molilian.core
                     if (data == null) break;
 
 
-                    if (_test_oaid.Equals(data.oaid) ||
-                         data.ip.StartsWith("127.0.0"))
+                    if (TestParseCore.InWhitelist(data.ip, data.oaid))
                     {
                         new DBContext.Table(connection, "tool_parse_logs_test")
                             .Add("end_point", data.end_point)
@@ -166,7 +164,7 @@ namespace molilian.core
 
                 _ = RedisKit.RPushAsync(queue_parse_tool_key, response);
 
-                if (!response.ip.StartsWith("127.0.0"))
+                if (!TestParseCore.InWhitelist(response.ip, response.oaid))
                 {
                     await SaveParseCacheAsync(response.channel.ToString(), 0, "tool",
                         response.success, response.message, response.reason,

molilian.core/Core/log/第三方旧接口.cs

@@ -23,8 +23,7 @@ namespace molilian.core
                     var data = redis.LPop<TkDataDTO>(queue_tb_key);
                     if (data == null) break;
 
-                    if (_test_oaid.Equals(data.oaid) ||
-                         data.ip.StartsWith("127.0.0"))
+                    if (TestParseCore.InWhitelist(data.ip, data.oaid))
                     {
                         save_tk_log(data, "tk_logs_test", connection, transaction);
                     }
@@ -92,6 +91,7 @@ namespace molilian.core
                 _ = RedisHelper.RPushAsync(queue_jd_key, response);
 
                 if (!response.ip.StartsWith("127.0.0"))
+
                 {
                     saveCache(response.channel.ToString(), response.accountId, response.accountName, response.success, response.message, response.reason);
                 }

molilian.core/Core/taoke/UnionParseCore.cs

@@ -470,6 +470,7 @@ namespace molilian.core
             return new APIResult(new
             {
                 result.success,
+                result.commercial,
                 result.message,
                 link_type = result.link_type.ToString(),
                 channel = result?.channel.ToString(),
@@ -517,7 +518,7 @@ namespace molilian.core
                 string itemId = null;
 
                 //============================== 放弃转链-地区过滤 ==============================
-                if (!result.ip.StartsWith("127.0.0") && accountid == 0 && JdUnionPlus.ShouldIgnoreRequest(config, ip, oaid, out string reason))
+                if (!TestParseCore.InWhitelist(result.ip, result.oaid) && accountid == 0 && JdUnionPlus.ShouldIgnoreRequest(config, ip, oaid, out string reason))
                 {
                     result.link_type = JdUnionPlus.GetLinkType(result.shortLinkurl, out out_url, out itemId);
 

molilian.core/Core/tool/TestParseCore.cs

@@ -0,0 +1,23 @@
+
+using dodohold.core;
+using Microsoft.AspNetCore.Mvc;
+using Sayaka.Common;
+using System.Text.Json;
+using System.Text.RegularExpressions;
+using System.Web;
+namespace molilian.core
+{
+    public partial class TestParseCore
+    {
+        public static string _test_oaid = "C712574A37194CC8AA2C94F4E94BF632069e05173327fe9168cc3829a5a22820";
+
+        public static bool InWhitelist(string ip, string oaid)
+        {
+            if (_test_oaid.Equals(oaid, StringComparison.OrdinalIgnoreCase)) return true;
+            if (!string.IsNullOrEmpty(ip) && ip.StartsWith("127.0.0")) return true;
+
+            return false;
+        }
+    }
+
+}

molilian.core/Plus/Alimama/parse.cs

@@ -557,7 +557,7 @@ namespace molilian.core
                 }
 
                 int limit_num = config.tk_limit_per_ip_24h;
-                if (!ip.StartsWith("127.0.0") && limit_num > 0)
+                if (!TestParseCore.InWhitelist(ip, oaid) && limit_num > 0)
                 {
                     int num = TkLogCore.getClientRequestTotalByIp(TkChannelEnum.tb, ip);
                     if (num >= limit_num)
@@ -567,7 +567,7 @@ namespace molilian.core
                     }
                 }
                 limit_num = config.tk_limit_per_oaid_24h;
-                if (!ip.StartsWith("127.0.0") && limit_num > 0)
+                if (!TestParseCore.InWhitelist(ip, oaid) && limit_num > 0)
                 {
                     int num = TkLogCore.getClientRequestTotalByOAID(TkChannelEnum.tb, oaid);
                     if (num >= limit_num)
@@ -590,7 +590,7 @@ namespace molilian.core
             //2025-05-11 brw不做风控
             if ("brw".Equals(riskStrategy)) return false;
 
-            if (ip.StartsWith("127.0.0")) return false;
+            if (!TestParseCore.InWhitelist(ip, oaid)) return false;
 
             try
             {

molilian.core/Plus/JDUnion/JdUnionPlus.cs

@@ -381,7 +381,7 @@ namespace molilian.core
                     break;
             }
 
-            if (!result.ip.StartsWith("127.0.0") && FlowControlIgnoreRequest(_config, out string reason))
+            if (!TestParseCore.InWhitelist(result.ip, result.oaid) && FlowControlIgnoreRequest(_config, out string reason))
             {
                 result.success = false;
                 result.link_type = LinkTypeEnum.unknown;

molilian.core/Plus/JDUnion/goods.cs

@@ -64,6 +64,7 @@ namespace molilian.core
                         var url = promotion_data.data.clickURL;
 
                         result.success = true;
+                        result.commercial = true;
                         result.message = "OK";
                         result.shortLinkurl = url;
                         result.content = result.shortLinkurl;
@@ -120,6 +121,7 @@ namespace molilian.core
 
                         result.success = true;
                         result.message = "OK";
+                        result.commercial = true;
                         result.shortLinkurl = url;
                         result.content = result.shortLinkurl;
                         result.deeplink_url = GetDefaultStyleDeeplink(result.shortLinkurl);
@@ -159,6 +161,7 @@ namespace molilian.core
             {
                 result.success = true;
                 result.message = "OK";
+                result.commercial = true;
                 result.shortLinkurl = shortURL;
                 result.content = result.shortLinkurl;
                 result.deeplink_url = GetDefaultStyleDeeplink(result.shortLinkurl);
@@ -261,7 +264,7 @@ namespace molilian.core
             client.AddHeaders("Cookie", cookies);
             client.Post($"body={data}");
             var response = await client.RequestAsync(url, "GET", cancellationToken);
- 
+
             string body = response.Body();
             var root = body.Convert2JsonElement();
             int code = root.Read<int>("code");
@@ -272,6 +275,7 @@ namespace molilian.core
             {
                 result.success = true;
                 result.message = "OK";
+                result.commercial = true;
                 result.shortLinkurl = shortCode;
                 result.content = result.shortLinkurl;
                 result.deeplink_url = GetDefaultStyleDeeplink(result.shortLinkurl);
@@ -381,6 +385,7 @@ namespace molilian.core
             {
                 result.success = true;
                 result.message = "OK";
+                result.commercial = true;
                 result.shortLinkurl = shortCode;
                 result.content = result.shortLinkurl;
                 result.deeplink_url = GetDefaultStyleDeeplink(result.shortLinkurl);

molilian.core/Plus/ks/KsUnionPlus.cs

@@ -227,7 +227,7 @@ namespace molilian.core
             }
 
 
-            if (!result.ip.StartsWith("127.0.0") && FlowControlIgnoreRequest(_config, out string reason))
+            if (!TestParseCore.InWhitelist(result.ip, result.oaid) && FlowControlIgnoreRequest(_config, out string reason))
             {
                 result.success = false;
                 result.link_type = LinkTypeEnum.unknown;

molilian.core/Plus/pdd/PddUnionPlus.cs

@@ -162,7 +162,7 @@ namespace molilian.core
                 return result;
             }
 
-            if (!result.ip.StartsWith("127.0.0") && FlowControlIgnoreRequest(_config, out string reason))
+            if (!TestParseCore.InWhitelist(result.ip, result.oaid) && FlowControlIgnoreRequest(_config, out string reason))
             {
                 result.success = false;
                 result.link_type = LinkTypeEnum.unknown;