api运行增加end_point

.gitignore

@@ -25,4 +25,4 @@ stats.html
 .DS_Store
 .vs
 **/bin/
-**/obj/Debug/
+**/obj/Debug/

molilian.api/Properties/PublishProfiles/https___ccr.ccs.tencentyun.com_shaobin.pubxml.user

@@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 <Project>
   <PropertyGroup>
     <TimeStampOfAssociatedLegacyPublishXmlFile />
-    <History>True|2024-06-06T18:58:23.2244952Z||;True|2024-06-07T01:22:30.7386593+08:00||;True|2024-06-06T19:04:12.6541924+08:00||;True|2024-05-31T18:50:23.9756041+08:00||;True|2024-05-30T02:35:55.0365301+08:00||;True|2024-05-30T01:33:28.8061432+08:00||;False|2024-05-30T01:29:34.0129550+08:00||;True|2024-05-30T01:23:20.3030349+08:00||;False|2024-05-30T01:17:18.1241207+08:00||;True|2024-05-30T01:10:17.8305588+08:00||;True|2024-05-28T18:54:19.3394105+08:00||;True|2024-05-28T18:39:34.9758850+08:00||;True|2024-05-28T18:09:29.9892839+08:00||;True|2024-05-27T23:52:48.3818652+08:00||;True|2024-05-24T14:41:21.1021888+08:00||;True|2024-05-23T15:37:16.0345242+08:00||;True|2024-05-22T23:38:36.5655830+08:00||;True|2024-05-22T22:03:57.2780660+08:00||;True|2024-05-22T21:52:22.2696242+08:00||;True|2024-05-22T20:09:51.6806573+08:00||;False|2024-05-21T22:57:22.6468456+08:00||;False|2024-05-21T22:56:04.2196346+08:00||;False|2024-05-21T22:54:15.6508138+08:00||;False|2024-05-21T14:51:18.1140090+08:00||;False|2024-05-21T14:50:56.1160123+08:00||;True|2024-05-21T02:51:40.6380703+08:00||;True|2024-05-21T02:44:50.6881192+08:00||;True|2024-05-17T02:27:08.3785244+08:00||;True|2024-05-16T16:01:05.5724934+08:00||;False|2024-05-16T14:40:35.7848348+08:00||;True|2024-05-15T00:51:56.7872132+08:00||;True|2024-05-14T17:10:52.0615828+08:00||;True|2024-05-14T16:39:39.7256770+08:00||;True|2024-05-11T23:53:02.8084114+08:00||;True|2024-05-11T14:22:07.5683120+08:00||;True|2024-05-11T12:21:19.0229784+08:00||;True|2024-05-11T12:04:15.4285324+08:00||;True|2024-05-11T02:14:35.6662897+08:00||;True|2024-05-11T02:08:01.0318965+08:00||;False|2024-05-11T02:05:04.4105484+08:00||;True|2024-05-11T00:13:08.7831755+08:00||;True|2024-05-04T16:53:43.3538176+08:00||;False|2024-05-04T16:38:25.0193125+08:00||;False|2024-05-04T16:38:20.7562182+08:00||;</History>
+    <History>True|2024-06-07T17:21:19.8437164Z||;True|2024-06-07T02:58:23.2244952+08:00||;True|2024-06-07T01:22:30.7386593+08:00||;True|2024-06-06T19:04:12.6541924+08:00||;True|2024-05-31T18:50:23.9756041+08:00||;True|2024-05-30T02:35:55.0365301+08:00||;True|2024-05-30T01:33:28.8061432+08:00||;False|2024-05-30T01:29:34.0129550+08:00||;True|2024-05-30T01:23:20.3030349+08:00||;False|2024-05-30T01:17:18.1241207+08:00||;True|2024-05-30T01:10:17.8305588+08:00||;True|2024-05-28T18:54:19.3394105+08:00||;True|2024-05-28T18:39:34.9758850+08:00||;True|2024-05-28T18:09:29.9892839+08:00||;True|2024-05-27T23:52:48.3818652+08:00||;True|2024-05-24T14:41:21.1021888+08:00||;True|2024-05-23T15:37:16.0345242+08:00||;True|2024-05-22T23:38:36.5655830+08:00||;True|2024-05-22T22:03:57.2780660+08:00||;True|2024-05-22T21:52:22.2696242+08:00||;True|2024-05-22T20:09:51.6806573+08:00||;False|2024-05-21T22:57:22.6468456+08:00||;False|2024-05-21T22:56:04.2196346+08:00||;False|2024-05-21T22:54:15.6508138+08:00||;False|2024-05-21T14:51:18.1140090+08:00||;False|2024-05-21T14:50:56.1160123+08:00||;True|2024-05-21T02:51:40.6380703+08:00||;True|2024-05-21T02:44:50.6881192+08:00||;True|2024-05-17T02:27:08.3785244+08:00||;True|2024-05-16T16:01:05.5724934+08:00||;False|2024-05-16T14:40:35.7848348+08:00||;True|2024-05-15T00:51:56.7872132+08:00||;True|2024-05-14T17:10:52.0615828+08:00||;True|2024-05-14T16:39:39.7256770+08:00||;True|2024-05-11T23:53:02.8084114+08:00||;True|2024-05-11T14:22:07.5683120+08:00||;True|2024-05-11T12:21:19.0229784+08:00||;True|2024-05-11T12:04:15.4285324+08:00||;True|2024-05-11T02:14:35.6662897+08:00||;True|2024-05-11T02:08:01.0318965+08:00||;False|2024-05-11T02:05:04.4105484+08:00||;True|2024-05-11T00:13:08.7831755+08:00||;True|2024-05-04T16:53:43.3538176+08:00||;False|2024-05-04T16:38:25.0193125+08:00||;False|2024-05-04T16:38:20.7562182+08:00||;</History>
     <LastFailureDetails>
     </LastFailureDetails>
   </PropertyGroup>

molilian.api/obj/Container/ImageId.cache

@@ -1 +1 @@
-sha256:52bc4795b5a0219b805d800177b965f2650998912a3ecf18ea5645f29bf5e4b5
+sha256:092f799f26e3926243dc143d1738d1eb81364a29f3d028aca1ef4dc6d4329b81

molilian.api/obj/Debug/net8.0/molilian.api.AssemblyInfo.cs

@@ -15,7 +15,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("molilian.api")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+61e986665b50d2d310824b834b5baa7f4b021e27")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+93cce9b3f209cb199ca40f567b7fe40ced653c65")]
 [assembly: System.Reflection.AssemblyProductAttribute("molilian.api")]
 [assembly: System.Reflection.AssemblyTitleAttribute("molilian.api")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

molilian.api/obj/Debug/net8.0/molilian.api.AssemblyInfoInputs.cache

@@ -1 +1 @@
-7a4a4131a5385d1e76b7b01ecec39a88196041c0b627bb7024eb29814537eca4
+c2deaa301ec2f8647d20fdf471736a2a1f2ca17eb2d567a041d607ce0c38a5a6

molilian.api/obj/Release/net8.0/molilian.api.AssemblyInfo.cs

@@ -15,7 +15,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("molilian.api")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Release")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+61e986665b50d2d310824b834b5baa7f4b021e27")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+93cce9b3f209cb199ca40f567b7fe40ced653c65")]
 [assembly: System.Reflection.AssemblyProductAttribute("molilian.api")]
 [assembly: System.Reflection.AssemblyTitleAttribute("molilian.api")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

molilian.api/obj/Release/net8.0/molilian.api.AssemblyInfoInputs.cache

@@ -1 +1 @@
-47fa840a8fbedee40fc6c0ecf2524ae20cffb74f3c3211b9370db891169b7fd5
+4f0619e643910eda50f609979747fe08950385a6c5ebb4de26a0b8d594e8af15

molilian.api/obj/Release/net8.0/molilian.api.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-60d42f8dc6948ff414ff179948443ff62b7781061216fb4bf8a1bd862d750937
+49050b94361b558dd62b2f47beeb25e14cda55160f554c64a9cab5d108cdb682

molilian.core/Core/taoke/TkLogCore.cs

@@ -49,6 +49,10 @@ namespace molilian.core
                         .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)

molilian.core/Core/taoke/TkPoolCore.cs

@@ -16,6 +16,15 @@ namespace molilian.core
 {
     public partial class TkPoolCore
     {
+        private static string _end_point;
+        static TkPoolCore()
+        {
+            _end_point = Environment.GetEnvironmentVariable("EndPoint");
+#if DEBUG
+            _end_point = "zz";
+#endif
+        }
+
         private static readonly object _lockObj = new();
         private static IEnumerable<TkPoolDTO> _cached;
         private static Dictionary<string, decimal> _incomeAmt = new();
@@ -23,11 +32,7 @@ namespace molilian.core
         {
             var list = List();
             if (!list.Any()) return null;
-#if DEBUG
-            return list.Where(e => e.id == 7).OrderBy(l => Guid.NewGuid()).FirstOrDefault();
-#else
             return list.Where(IsNotExceedDailyIncomeLimit).OrderBy(l => Guid.NewGuid()).FirstOrDefault();
-#endif
         }
 
         internal static void SaveIncomeAmt(string accountName, decimal income_amt)
@@ -58,6 +63,10 @@ namespace molilian.core
         }
         private static bool IsNotExceedDailyIncomeLimit(TkPoolDTO item)
         {
+            if (!string.IsNullOrEmpty(_end_point) && !string.IsNullOrEmpty(item.end_point))
+            {
+                if (item.end_point != _end_point) return false;
+            }
             if (item.daily_income_limit == 0) return true;
             decimal income_amt = GetIncomeAmt(item.name);
             return income_amt < item.daily_income_limit;

molilian.core/DTO/alimama/TkPoolDTO.cs

@@ -21,5 +21,6 @@
         public decimal draw_balance { get; set; } = 0;
         public string api { get; set; } = string.Empty;
         public int api_id { get; set; } = 0;
+        public string end_point { get; set; } = string.Empty;
     }
 }

molilian.core/Plus/Alimama/orders.cs

@@ -60,7 +60,7 @@ namespace molilian.core
 
             int pageNo = 1;
             string positionIndex = string.Empty;
-            int pageSize = 100;
+            int pageSize = 20;
 
             bool hasNext = true;
             int total = 0;
@@ -118,10 +118,11 @@ namespace molilian.core
                         item.accountId = _accountId;
                         item.accountName = _accountName;
 
-                        if (last_modifiedTime != DateTime.MinValue && last_modifiedTime.AddHours(-1) >= item.modifiedTime)
+                        if (last_modifiedTime != DateTime.MinValue && last_modifiedTime.AddMinutes(-2) >= item.modifiedTime)
                         {
                             return total;
                         }
+
                         int? id = conn.Replace(item);
 
                         total++;

molilian.core/obj/Debug/net8.0/molilian.core.AssemblyInfo.cs

@@ -14,7 +14,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("molilian.core")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+61e986665b50d2d310824b834b5baa7f4b021e27")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+93cce9b3f209cb199ca40f567b7fe40ced653c65")]
 [assembly: System.Reflection.AssemblyProductAttribute("molilian.core")]
 [assembly: System.Reflection.AssemblyTitleAttribute("molilian.core")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

molilian.core/obj/Debug/net8.0/molilian.core.AssemblyInfoInputs.cache

@@ -1 +1 @@
-42f4545ebae39a17d249f1813c701543f481bd7e6c7a18c23e35980fee65f0cf
+23be1e3625581e33e0333ffef693ed292daa0018fbb7063a861b4f72441546fd

molilian.core/obj/Release/net8.0/molilian.core.AssemblyInfo.cs

@@ -14,7 +14,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("molilian.core")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Release")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d8e14776ffb15d944852bf020eea073160febd28")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+93cce9b3f209cb199ca40f567b7fe40ced653c65")]
 [assembly: System.Reflection.AssemblyProductAttribute("molilian.core")]
 [assembly: System.Reflection.AssemblyTitleAttribute("molilian.core")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

molilian.core/obj/Release/net8.0/molilian.core.AssemblyInfoInputs.cache

@@ -1 +1 @@
-87a60c3c0ce140c8cf5cb12c567f6ce37e26e057ac0013e3d7253310748a5b00
+ae523926f439685135edd1a33dea16a34e13c4c5641dec6d5e7a502eb9f86df3