dodo hold před 1 rokem
rodič
revize
8934f14754

binární
csredis-server.zip


binární
freeredis-server.zip


+ 0 - 6
molilian.api/Dockerfile

@@ -6,12 +6,6 @@ WORKDIR /app
 EXPOSE 8080
 EXPOSE 8081
 
-# 设置区域设置和字符编码
-ENV LANG en_US.UTF-8
-ENV LANGUAGE en_US:en
-ENV LC_ALL en_US.UTF-8
-
-
 FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
 ARG BUILD_CONFIGURATION=Release
 WORKDIR /src

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 0
molilian.api/Properties/PublishProfiles/https___ccr.ccs.tencentyun.com_shaobin.pubxml.user


+ 3 - 3
molilian.core/Core/jd/JdPoolCore.cs

@@ -46,7 +46,7 @@ namespace molilian.core
         {
             var list = AllList();
             if (!list.Any()) return null;
-            return list.Where(e => e.id == accountid).FirstOrDefault();
+            return list.Where(e => e.id == accountid).OrderBy(l => Guid.NewGuid()).FirstOrDefault();
         }
 
 
@@ -54,14 +54,14 @@ namespace molilian.core
         {
             var list = List();
             if (!list.Any()) return null;
-            return list.Where(e => e.id == id && IsNotExceedDailyIncomeLimit(e, action)).FirstOrDefault();
+            return list.Where(e => e.id == id && IsNotExceedDailyIncomeLimit(e, action)).OrderBy(l => Guid.NewGuid()).FirstOrDefault();
         }
 
         public static JdPoolDTO? GetOne(JdAction action)
         {
             var list = List();
             if (!list.Any()) return null;
-            return list.Where(e => IsNotExceedDailyIncomeLimit(e, action)).FirstOrDefault();
+            return list.Where(e => IsNotExceedDailyIncomeLimit(e, action)).OrderBy(l => Guid.NewGuid()).FirstOrDefault();
         }
         private static bool IsNotExceedDailyIncomeLimit(JdPoolDTO item, JdAction action)
         {

+ 24 - 24
molilian.core/Core/taoke/UnionParseCore.cs

@@ -247,18 +247,18 @@ namespace molilian.core
 
 
                     //20241204 特例
-                    if ("bj".Equals(EndPointCore.CurrentEndPoint))
-                    {
-                        string ruleKey = $"tmp_rules2:tb:{DateTime.Now:yyyyMMdd}";
-                        var count = RedisHelper.Get<int>(ruleKey);
-                        if (DateTime.Now < DateTime.Parse("2024-12-09") && count < 500)
-                        {
-                            //result.deeplink_url = "tbopen://m.taobao.com/tbopen/index.html?action=ali.open.nav&module=h5&source=alimama&bc_fl_src=tunion_vipmedia_sy&h5Url=https%3A%2F%2Fs.click.taobao.com%2Ft%3Funion_lens%3DlensId%253APUB%25401733285378%25402105593d_0f2e_1938fdbfb08_56d2%254001%2540eyJmbG9vcklkIjozODg1Miiwiic3BtQiiI6Il9wb3J0YWxfdjJfcGFnZXNfYWN0aXZpdHlfb2ZmaWNpYWxfaW5kZXhfaHRtIn0ie%253BeventPageId%253A20150318020019405%26e%3Dm%253D2%2526s%253DHT55zNJ42uRw4vFB6t2Z2iperVdZeJviAMbqNcPEYg76sTlfBitgxDLxqsKAeUFqgEGu%252B0FGP7cWpIFXOotQwxwkghS%252B3Tth35QMLhvYd5WzAlsM3q9KBQgChlAI37hjOkwAUKujKr8%252BB0zf4OD7u5LL0QPsyT77slidLc%252FfR2bfW12dRBt0XJ7LmQijlljrM7kxpdONUAKgtf8I59Gmj7WOELdnGdZV3eHn14rW1PBcfk1oQPCr5xDqzYVRkKA1NNRdkxXQuw4cJIIUvt07Yd%252BUDC4b2HeVswJbDN6vSgUIAoZQCN%252B4Y859REbZnVo89hl0nxWy%252BeTjkOUQ%252FOHRwAPUBlppf%252Btjs7UNLsd2bI5z8saC7t5FlO9Zh8BraVZYIcqHs8UcdUpXL0nm%252FTxRaQ4VydfXBQxnSpQpV4IkRoOOqZbKHGSDxYLRK9woGjcZwM7sKH2NkQIJ%252Fov1pArqR5rCLGafPO1NzTpSwSQKdJD1UZJeBohmpzCclrzRGqIlouD5cf%252BfoU5VXRkZOvK%252FVyaa21c5k%252BY9DYGmadGiXn0jUIaYy7GzzyoG4bBR4UOYsQQxcVtq4KEjiVO%252FBgG2pWuj0Yecd3Dfdij0RQXJBsf3Oqj9M98VWj7lCjCC8ck8";
-                            result.deeplink_url = "tbopen://m.taobao.com/tbopen/index.html?source=auto&action=ali.open.nav&module=h5&bootImage=0&afc_route=1&bc_fl_src=growth_dhh_2200803434968_100-1930985-1595034112&dpa_Inid=159503411212096&dpa_material_id=530637422585&dpa_material_type=1&dpa_source_code=12096&force_no_smb=true&h5Url=https%3A%2F%2Fs.m.taobao.com%2Fh5%3Ffrom%3Dcustoms%26g_channelSrp%3Ddhhdpa_1232552832%26dpa_material_type%3D1%26ut_sk%3Dsearch%26spm%3Da2141.mb819t211c7%26sLaunch%3D0%26sKeep%3D1%26sModuleName%3Dsearch%26spm_back_up%3Da2141.mb819t211c7%26bc_fl_src%3Dgrowth_dhh_2200803434968_100-1930985-1595034112%26dpa_Inid%3D159503411212096%26dpa_material_id%3D530637422585%26dpa_material_type%3D1%26dpa_source_code%3D12096%26force_no_smb%3Dtrue%26itemIds%3D530637422585%26slk_actid%3D100000000207%26spm%3D2014.ugdhh.2200803434968.100-1930985-1595034112%26wh_biz%3Dtm&itemIds=530637422585&slk_actid=100000000207&spm=2014.ugdhh.2200803434968.100-1930985-1595034112&wh_biz=tm";
-                            RedisHelper.IncrBy(ruleKey);
-                            RedisHelper.Expire(ruleKey, 86400 * 1);
-                        }
-                    }
+                    //if ("bj".Equals(EndPointCore.CurrentEndPoint))
+                    //{
+                    //    string ruleKey = $"tmp_rules2:tb:{DateTime.Now:yyyyMMdd}";
+                    //    var count = RedisHelper.Get<int>(ruleKey);
+                    //    if (DateTime.Now < DateTime.Parse("2024-12-09") && count < 500)
+                    //    {
+                    //        //result.deeplink_url = "tbopen://m.taobao.com/tbopen/index.html?action=ali.open.nav&module=h5&source=alimama&bc_fl_src=tunion_vipmedia_sy&h5Url=https%3A%2F%2Fs.click.taobao.com%2Ft%3Funion_lens%3DlensId%253APUB%25401733285378%25402105593d_0f2e_1938fdbfb08_56d2%254001%2540eyJmbG9vcklkIjozODg1Miiwiic3BtQiiI6Il9wb3J0YWxfdjJfcGFnZXNfYWN0aXZpdHlfb2ZmaWNpYWxfaW5kZXhfaHRtIn0ie%253BeventPageId%253A20150318020019405%26e%3Dm%253D2%2526s%253DHT55zNJ42uRw4vFB6t2Z2iperVdZeJviAMbqNcPEYg76sTlfBitgxDLxqsKAeUFqgEGu%252B0FGP7cWpIFXOotQwxwkghS%252B3Tth35QMLhvYd5WzAlsM3q9KBQgChlAI37hjOkwAUKujKr8%252BB0zf4OD7u5LL0QPsyT77slidLc%252FfR2bfW12dRBt0XJ7LmQijlljrM7kxpdONUAKgtf8I59Gmj7WOELdnGdZV3eHn14rW1PBcfk1oQPCr5xDqzYVRkKA1NNRdkxXQuw4cJIIUvt07Yd%252BUDC4b2HeVswJbDN6vSgUIAoZQCN%252B4Y859REbZnVo89hl0nxWy%252BeTjkOUQ%252FOHRwAPUBlppf%252Btjs7UNLsd2bI5z8saC7t5FlO9Zh8BraVZYIcqHs8UcdUpXL0nm%252FTxRaQ4VydfXBQxnSpQpV4IkRoOOqZbKHGSDxYLRK9woGjcZwM7sKH2NkQIJ%252Fov1pArqR5rCLGafPO1NzTpSwSQKdJD1UZJeBohmpzCclrzRGqIlouD5cf%252BfoU5VXRkZOvK%252FVyaa21c5k%252BY9DYGmadGiXn0jUIaYy7GzzyoG4bBR4UOYsQQxcVtq4KEjiVO%252FBgG2pWuj0Yecd3Dfdij0RQXJBsf3Oqj9M98VWj7lCjCC8ck8";
+                    //        result.deeplink_url = "tbopen://m.taobao.com/tbopen/index.html?source=auto&action=ali.open.nav&module=h5&bootImage=0&afc_route=1&bc_fl_src=growth_dhh_2200803434968_100-1930985-1595034112&dpa_Inid=159503411212096&dpa_material_id=530637422585&dpa_material_type=1&dpa_source_code=12096&force_no_smb=true&h5Url=https%3A%2F%2Fs.m.taobao.com%2Fh5%3Ffrom%3Dcustoms%26g_channelSrp%3Ddhhdpa_1232552832%26dpa_material_type%3D1%26ut_sk%3Dsearch%26spm%3Da2141.mb819t211c7%26sLaunch%3D0%26sKeep%3D1%26sModuleName%3Dsearch%26spm_back_up%3Da2141.mb819t211c7%26bc_fl_src%3Dgrowth_dhh_2200803434968_100-1930985-1595034112%26dpa_Inid%3D159503411212096%26dpa_material_id%3D530637422585%26dpa_material_type%3D1%26dpa_source_code%3D12096%26force_no_smb%3Dtrue%26itemIds%3D530637422585%26slk_actid%3D100000000207%26spm%3D2014.ugdhh.2200803434968.100-1930985-1595034112%26wh_biz%3Dtm&itemIds=530637422585&slk_actid=100000000207&spm=2014.ugdhh.2200803434968.100-1930985-1595034112&wh_biz=tm";
+                    //        RedisHelper.IncrBy(ruleKey);
+                    //        RedisHelper.Expire(ruleKey, 86400 * 1);
+                    //    }
+                    //}
                     other_aff = true;
                     return TaobaoParseOutput(result, swData, new
                     {
@@ -283,18 +283,18 @@ namespace molilian.core
                     _ = TkLogCore.ParseLogAsync(result);
 
                     //20241204 特例
-                    if ("bj".Equals(EndPointCore.CurrentEndPoint))
-                    {
-                        string ruleKey = $"tmp_rules2:tb:{DateTime.Now:yyyyMMdd}";
-                        var count = RedisHelper.Get<int>(ruleKey);
-                        if (DateTime.Now < DateTime.Parse("2024-12-09") && count < 500)
-                        {
-                            //result.deeplink_url = "tbopen://m.taobao.com/tbopen/index.html?action=ali.open.nav&module=h5&source=alimama&bc_fl_src=tunion_vipmedia_sy&h5Url=https%3A%2F%2Fs.click.taobao.com%2Ft%3Funion_lens%3DlensId%253APUB%25401733285378%25402105593d_0f2e_1938fdbfb08_56d2%254001%2540eyJmbG9vcklkIjozODg1Miiwiic3BtQiiI6Il9wb3J0YWxfdjJfcGFnZXNfYWN0aXZpdHlfb2ZmaWNpYWxfaW5kZXhfaHRtIn0ie%253BeventPageId%253A20150318020019405%26e%3Dm%253D2%2526s%253DHT55zNJ42uRw4vFB6t2Z2iperVdZeJviAMbqNcPEYg76sTlfBitgxDLxqsKAeUFqgEGu%252B0FGP7cWpIFXOotQwxwkghS%252B3Tth35QMLhvYd5WzAlsM3q9KBQgChlAI37hjOkwAUKujKr8%252BB0zf4OD7u5LL0QPsyT77slidLc%252FfR2bfW12dRBt0XJ7LmQijlljrM7kxpdONUAKgtf8I59Gmj7WOELdnGdZV3eHn14rW1PBcfk1oQPCr5xDqzYVRkKA1NNRdkxXQuw4cJIIUvt07Yd%252BUDC4b2HeVswJbDN6vSgUIAoZQCN%252B4Y859REbZnVo89hl0nxWy%252BeTjkOUQ%252FOHRwAPUBlppf%252Btjs7UNLsd2bI5z8saC7t5FlO9Zh8BraVZYIcqHs8UcdUpXL0nm%252FTxRaQ4VydfXBQxnSpQpV4IkRoOOqZbKHGSDxYLRK9woGjcZwM7sKH2NkQIJ%252Fov1pArqR5rCLGafPO1NzTpSwSQKdJD1UZJeBohmpzCclrzRGqIlouD5cf%252BfoU5VXRkZOvK%252FVyaa21c5k%252BY9DYGmadGiXn0jUIaYy7GzzyoG4bBR4UOYsQQxcVtq4KEjiVO%252FBgG2pWuj0Yecd3Dfdij0RQXJBsf3Oqj9M98VWj7lCjCC8ck8";
-                            result.deeplink_url = "tbopen://m.taobao.com/tbopen/index.html?source=auto&action=ali.open.nav&module=h5&bootImage=0&afc_route=1&bc_fl_src=growth_dhh_2200803434968_100-1930985-1595034112&dpa_Inid=159503411212096&dpa_material_id=530637422585&dpa_material_type=1&dpa_source_code=12096&force_no_smb=true&h5Url=https%3A%2F%2Fs.m.taobao.com%2Fh5%3Ffrom%3Dcustoms%26g_channelSrp%3Ddhhdpa_1232552832%26dpa_material_type%3D1%26ut_sk%3Dsearch%26spm%3Da2141.mb819t211c7%26sLaunch%3D0%26sKeep%3D1%26sModuleName%3Dsearch%26spm_back_up%3Da2141.mb819t211c7%26bc_fl_src%3Dgrowth_dhh_2200803434968_100-1930985-1595034112%26dpa_Inid%3D159503411212096%26dpa_material_id%3D530637422585%26dpa_material_type%3D1%26dpa_source_code%3D12096%26force_no_smb%3Dtrue%26itemIds%3D530637422585%26slk_actid%3D100000000207%26spm%3D2014.ugdhh.2200803434968.100-1930985-1595034112%26wh_biz%3Dtm&itemIds=530637422585&slk_actid=100000000207&spm=2014.ugdhh.2200803434968.100-1930985-1595034112&wh_biz=tm";
-                            RedisHelper.IncrBy(ruleKey);
-                            RedisHelper.Expire(ruleKey, 86400 * 1);
-                        }
-                    }
+                    //if ("bj".Equals(EndPointCore.CurrentEndPoint))
+                    //{
+                    //    string ruleKey = $"tmp_rules2:tb:{DateTime.Now:yyyyMMdd}";
+                    //    var count = RedisHelper.Get<int>(ruleKey);
+                    //    if (DateTime.Now < DateTime.Parse("2024-12-09") && count < 500)
+                    //    {
+                    //        //result.deeplink_url = "tbopen://m.taobao.com/tbopen/index.html?action=ali.open.nav&module=h5&source=alimama&bc_fl_src=tunion_vipmedia_sy&h5Url=https%3A%2F%2Fs.click.taobao.com%2Ft%3Funion_lens%3DlensId%253APUB%25401733285378%25402105593d_0f2e_1938fdbfb08_56d2%254001%2540eyJmbG9vcklkIjozODg1Miiwiic3BtQiiI6Il9wb3J0YWxfdjJfcGFnZXNfYWN0aXZpdHlfb2ZmaWNpYWxfaW5kZXhfaHRtIn0ie%253BeventPageId%253A20150318020019405%26e%3Dm%253D2%2526s%253DHT55zNJ42uRw4vFB6t2Z2iperVdZeJviAMbqNcPEYg76sTlfBitgxDLxqsKAeUFqgEGu%252B0FGP7cWpIFXOotQwxwkghS%252B3Tth35QMLhvYd5WzAlsM3q9KBQgChlAI37hjOkwAUKujKr8%252BB0zf4OD7u5LL0QPsyT77slidLc%252FfR2bfW12dRBt0XJ7LmQijlljrM7kxpdONUAKgtf8I59Gmj7WOELdnGdZV3eHn14rW1PBcfk1oQPCr5xDqzYVRkKA1NNRdkxXQuw4cJIIUvt07Yd%252BUDC4b2HeVswJbDN6vSgUIAoZQCN%252B4Y859REbZnVo89hl0nxWy%252BeTjkOUQ%252FOHRwAPUBlppf%252Btjs7UNLsd2bI5z8saC7t5FlO9Zh8BraVZYIcqHs8UcdUpXL0nm%252FTxRaQ4VydfXBQxnSpQpV4IkRoOOqZbKHGSDxYLRK9woGjcZwM7sKH2NkQIJ%252Fov1pArqR5rCLGafPO1NzTpSwSQKdJD1UZJeBohmpzCclrzRGqIlouD5cf%252BfoU5VXRkZOvK%252FVyaa21c5k%252BY9DYGmadGiXn0jUIaYy7GzzyoG4bBR4UOYsQQxcVtq4KEjiVO%252FBgG2pWuj0Yecd3Dfdij0RQXJBsf3Oqj9M98VWj7lCjCC8ck8";
+                    //        result.deeplink_url = "tbopen://m.taobao.com/tbopen/index.html?source=auto&action=ali.open.nav&module=h5&bootImage=0&afc_route=1&bc_fl_src=growth_dhh_2200803434968_100-1930985-1595034112&dpa_Inid=159503411212096&dpa_material_id=530637422585&dpa_material_type=1&dpa_source_code=12096&force_no_smb=true&h5Url=https%3A%2F%2Fs.m.taobao.com%2Fh5%3Ffrom%3Dcustoms%26g_channelSrp%3Ddhhdpa_1232552832%26dpa_material_type%3D1%26ut_sk%3Dsearch%26spm%3Da2141.mb819t211c7%26sLaunch%3D0%26sKeep%3D1%26sModuleName%3Dsearch%26spm_back_up%3Da2141.mb819t211c7%26bc_fl_src%3Dgrowth_dhh_2200803434968_100-1930985-1595034112%26dpa_Inid%3D159503411212096%26dpa_material_id%3D530637422585%26dpa_material_type%3D1%26dpa_source_code%3D12096%26force_no_smb%3Dtrue%26itemIds%3D530637422585%26slk_actid%3D100000000207%26spm%3D2014.ugdhh.2200803434968.100-1930985-1595034112%26wh_biz%3Dtm&itemIds=530637422585&slk_actid=100000000207&spm=2014.ugdhh.2200803434968.100-1930985-1595034112&wh_biz=tm";
+                    //        RedisHelper.IncrBy(ruleKey);
+                    //        RedisHelper.Expire(ruleKey, 86400 * 1);
+                    //    }
+                    //}
                     other_aff = true;
                     return TaobaoParseOutput(result, swData, new
                     {

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

@@ -133,9 +133,6 @@ namespace molilian.core
                         RedisHelper.Expire(ruleKey, 86400 * 10);
                     }
                 }
-
-
-
                 return result;
             }
 
@@ -504,7 +501,7 @@ namespace molilian.core
                 }
 
                 int limit_num = config.tk_limit_per_ip_24h;
-                if (limit_num > 0)
+                if (!"127.0.0.1".Equals(ip) && limit_num > 0)
                 {
                     int num = TkLogCore.getClientRequestTotalByIp(TkChannelEnum.tb, ip);
                     if (num >= limit_num)

+ 9 - 2
molilian.core/Plus/Alimama/parse_2.cs

@@ -195,7 +195,8 @@ namespace molilian.core
                 string desiredUrlPattern = "var url = '(.*?)'";
                 WebClientUtility client = new()
                 {
-                    Proxy = ProxyNodesCore.RandomOne(_account.nodeName),
+                    //Proxy = ProxyNodesCore.RandomOne(_account.nodeName),
+                    Proxy = _proxy,
                     UserAgent = Sayaka.Common.ProviderFakeUserAgent.RandomComputer
                 };
 #if DEBUG
@@ -238,7 +239,7 @@ namespace molilian.core
             catch (Exception ex)
             {
                 _ = new LoggerLibrary("api_error", "desiredUrl_error").Info(ex.Message, ex.StackTrace).SaveAsync();
-                result = $"{ex.Message}\n{ex.StackTrace}";
+                result = "网络异常";
             }
             return (false, result);
         }
@@ -490,6 +491,12 @@ namespace molilian.core
                 else
                 {
                     result.link_type = GetLinkType(url);
+                    if ("网络错误".Equals(resultText))
+                    {
+                        result.link_type = LinkTypeEnum.unknown;
+                        result.content = resultText;
+                        result.reason = resultText;
+                    }
                 }
 
                 if (result.content.Contains("霸下通用 web 页面-验证码"))

+ 1 - 1
molilian.core/Plus/JDUnion/H5stHack.cs

@@ -14,7 +14,7 @@ namespace molilian.core
 
             var args = new
             {
-                version = "4.9.6",
+                version = "4.9.7",
                 body = querystring,
                 pin = _account.pin,
                 ua = _account.user_agent,

+ 140 - 144
molilian.core/Plus/JDUnion/goods.cs

@@ -208,8 +208,8 @@ namespace molilian.core
                 return result;
             }
 
-            WebClientUtility client = new WebClientUtility();
-            client.Proxy = _proxy;
+    WebClientUtility client = new WebClientUtility();
+    client.Proxy = _proxy;
 #if DEBUG
             client.Proxy = null;
 #endif
@@ -224,6 +224,8 @@ namespace molilian.core
             var response = await client.RequestAsync(url, "GET", cancellationToken);
 
 
+    https://api.m.jd.com/api?functionId=unionPromoteLinkService&appid=unionpc&_=1734447407687&loginType=3&uuid=1734444378650448359604&x-api-eid-token=jdd03YJZYUINYGLWQKYT2SFR5PF5CNZ5PK5SQB3SOWOR5DHKS62647SPYBXWBMLYF7YEFH7RDZG22SM77HWYSFKYKTZJICUAAAAMT2TYOUQQAAAAADOZREVGL2Z3VVEX&h5st=20241217225647690;ff8lvy5fkzklklr1;586ae;tk03wb3c71ba318nQZgEdIpw3aqKhQNr_DOL4ffKT_bx3botkXGLthFRyT-TL0p502UEdMny0L0mZSLWUXs6264cdk-I;45b11a32199c9d0e995efe3339eff00f;4.9;1734447407690;pjbMhjZf561R-_FNASVeySkQzTFSJrJdJrESJrpjh7Je6rJdJz1TIipjLDrgJf4f5n1e7XldHe4e6TIS1f1f7rITHeof0b1TFeVf6nVSJrJdJrEa-OFTGOEjLrJp-jpe7PYSHKYeIWlf1roeJaleJq4e2XYd3fVS5X1ezHIS4jpjxj5PKSEQKeFjLrJp-j5e9HIg3T0UG6VRFuWeDipjxjJOJrpjh7JjSOUbA_nOyroNneWbJrJdJ31QHyVT5ipjLDrgJj4f9G1WJrJdJTlPJrpjh7ZMLrJp7rJdJLYOJipjLrpjh7JjJrJdJPYOJipjLrpjh7Je6rJdJTYOJipjLrpjh7pfLDIj2XETJrpjLrJp-rojxjpe2iFjLrpjLDrgzjYfLDIj4XETJrpjLrJp-jYgLDIj5XETJrpjLrJp-jZe9nIg7jpjxjZf2iFjLrpjLDrg7rJdJ-1OJrpjLrJp-Xojxj5P-ipjLrpjh7pfLDIj-ipjLrpjh7pfLDIjHOEjLrpjLD7NLDIjHyVS3KUSJrpjh7ZMLrJpJrUO3ekQJrJdJjoPJrpjLrJpwqJdJrkPJrpjh7Jj3ToNL-oe1zVRUq5d7zpf6rpWdq5P0ulS9G1WJrJdJnVO4ipjLD7N;76beaa50fd5fe694a2824d4dbde781c0
+
 
             //if (response.ResponseMessage.StatusCode == HttpStatusCode.Forbidden)
             //{
@@ -237,10 +239,10 @@ namespace molilian.core
 
 
             string body = response.Body();
-            var root = body.Convert2JsonElement();
-            int code = root.Read<int>("code");
-            string message = root.Read<string>("message");
-            string shortCode = root.PathRead<string>("data.shortCode");
+    var root = body.Convert2JsonElement();
+    int code = root.Read<int>("code");
+    string message = root.Read<string>("message");
+    string shortCode = root.PathRead<string>("data.shortCode");
 
             if (code == 200)
             {
@@ -249,169 +251,163 @@ namespace molilian.core
                 result.shortLinkurl = shortCode;
                 result.content = result.shortLinkurl;
                 result.deeplink_url = GetDeeplink(result.shortLinkurl);
-            }
+}
             else
-            {
-                if (string.IsNullOrEmpty(body)) message = "网络异常";
-                result.success = false;
-                result.message = "转链失败";
-                result.reason = message;
-                result.shortLinkurl = wareUrl;
-                result.deeplink_url = GetDeeplink(result.shortLinkurl);
-                _ = new LoggerLibrary("JdUnion", "GetPromotionByCrawlerAsync").Info(body).SaveAsync();
-            }
-            return result;
+{
+    if (string.IsNullOrEmpty(body)) message = "网络异常";
+    result.success = false;
+    result.message = "转链失败";
+    result.reason = message;
+    result.shortLinkurl = wareUrl;
+    result.deeplink_url = GetDeeplink(result.shortLinkurl);
+    _ = new LoggerLibrary("JdUnion", "GetPromotionByCrawlerAsync").Info(body).SaveAsync();
+}
+return result;
         }
 
         public async Task<JdDataDTO> GetPromotionByCrawlerAsync2(JdDataDTO result, string wareUrl, CancellationToken cancellationToken = default)
-        {
-            string[] parts = wareUrl.Split(new string[] { ".html" }, StringSplitOptions.None);
-            if (parts.Length > 1)
-            {
-                wareUrl = parts[0] + ".html";
-            }
-
+{
+    string[] parts = wareUrl.Split(new string[] { ".html" }, StringSplitOptions.None);
+    if (parts.Length > 1)
+    {
+        wareUrl = parts[0] + ".html";
+    }
 
-            var ts = DateTime.Now.Convert2UnixTimestamp(true);
-            string cookies = _account.cookies;
-            //cookies = "pinId=lDSKR4P756s; __jdu=797222838; unpl=JF8EAM1nNSttXxtVVxtSSEFASw9QWwpbTh4KP28NAwlaTAvEt16MoRnbUfHBdCarU9683KT3AsB67n92UtFSEXtdVV9fD0oeBm5vNWRdXU8ABh5VSUAXJV06KgF6SUxXbxN6CCU2S1UEGgYfExlOX11bEAl7FANfZjVSVV5IVwYSABIiEXtdXFptCEoWAmtjBF1YWkJRNSsHGxMRTltWX1oBexYzbWYEUV1fQ10AGjJZfMnF8oHV_d_CidTxw9Df9oz_3EgdCh0RE0hUVldtCXsU; shshshfpa=02d19590-d1e4-c91f-76d9-50b5b48caeae-1696955111; shshshfpx=02d19590-d1e4-c91f-76d9-50b5b48caeae-1696955111; TrackID=1P1YIoOSuMvq9KVQS8e4qaKAWslU3bHIlXwpUNeXUOPY_dPOhYcH5fl6XgaIzKppd5zTuGg52Ql9Ht7h1LNA62ZkhO1G3xwkTKekmP3nhjjmnOr5rzvlohhH3EkChqHLB; thor=D3FCA70DCE7542F87C212B790D3JDaxNfPy83okP3kLScwCkGiuMcyC4Pcyn8202E9E708F27CB58F480D2CC3FE67C9253747FE21007250E37AE528C577139FEEC81E6EE68034351A54BE200FF3JDaxNfPy83okP3kLScwCkGiuMcyC4Pcyn7n92UtFE03B1646F11A6B796AEE7DE71C760EDFF210BD03D24599A6CFF007C0D40BA49D; pin=23117; unick=jd2311kga; _tp=D8kjVbHzTJzgqxcxaN3m1w%3D%3D; _pst=23117; ipLoc-djd=24-2144-3909-58335; 3AB9D23F7A4B3C9B=IPF6PUOISQRNPNXNQVLJJVKQVBTAvEt16MoRnbUfHBdCarU9683JDaxNfPy83okP3kLScwCkGiuMcyC4PcynYGLMEE; flash=2_YNg0msef1iArLpGWQBwhJos62BkQWLuFuDD-HGOLK2KKuPtQ08qYx9js2jlEHwoRT7AVTOjRo8iR1-PT6ZsT8ZDnqdgMfbeoSNMJvJa8qphobenATQ0WXPYP62_XgiF1J7II6jY1qovmiIDadA7rd5tHyAVpTzEsqpI6xVJ9b6D*; __jda=209449046.797222838.1720272224.1720293360.1721239059.3; __jdc=209449046; __jdv=209449046|baidu|-|organic|notset|1721239059356; 3AB9D23F7A4B3CSS=jdd03IPF6PUOISQRNPNXNQVLJJVKQVBTAvEt16MoRnbUfHBdCarU9683JDaxNfPy83okP3kLScwCkGiuMcyC4PcynvEt16MoRnbUfHBdCarU9683KT3AsB67n92UtFUX; _gia_d=1; shshshfpb=BApXcdm_fwvVAJzuAI6Mnq8QQOcIPSh90B9TUVj599xJ1MlKCa4O2; __jdb=209449046.5.797222838|3.1721239059; RT=\"z=1&dm=jd.com&si=zpw2ttxi9&ss=lyq5alej&sl=6&tt=3x4&ld=z4s&nu=3d2f85352c70c73af100bf1449967844&cl=x78\"\r\n\r\n;";
 
-            string uuid = cookies.GetContentPart("__jdu=", ";");
-            string __jda = cookies.GetContentPart("__jda=", ";");
-            if (__jda.Split('.').Length > 1)
-            {
-                uuid = __jda.Split('.')[1];
-            }
+    var ts = DateTime.Now.Convert2UnixTimestamp(true);
+    string cookies = _account.cookies;
+    //cookies = "pinId=lDSKR4P756s; __jdu=797222838; unpl=JF8EAM1nNSttXxtVVxtSSEFASw9QWwpbTh4KP28NAwlaTAvEt16MoRnbUfHBdCarU9683KT3AsB67n92UtFSEXtdVV9fD0oeBm5vNWRdXU8ABh5VSUAXJV06KgF6SUxXbxN6CCU2S1UEGgYfExlOX11bEAl7FANfZjVSVV5IVwYSABIiEXtdXFptCEoWAmtjBF1YWkJRNSsHGxMRTltWX1oBexYzbWYEUV1fQ10AGjJZfMnF8oHV_d_CidTxw9Df9oz_3EgdCh0RE0hUVldtCXsU; shshshfpa=02d19590-d1e4-c91f-76d9-50b5b48caeae-1696955111; shshshfpx=02d19590-d1e4-c91f-76d9-50b5b48caeae-1696955111; TrackID=1P1YIoOSuMvq9KVQS8e4qaKAWslU3bHIlXwpUNeXUOPY_dPOhYcH5fl6XgaIzKppd5zTuGg52Ql9Ht7h1LNA62ZkhO1G3xwkTKekmP3nhjjmnOr5rzvlohhH3EkChqHLB; thor=D3FCA70DCE7542F87C212B790D3JDaxNfPy83okP3kLScwCkGiuMcyC4Pcyn8202E9E708F27CB58F480D2CC3FE67C9253747FE21007250E37AE528C577139FEEC81E6EE68034351A54BE200FF3JDaxNfPy83okP3kLScwCkGiuMcyC4Pcyn7n92UtFE03B1646F11A6B796AEE7DE71C760EDFF210BD03D24599A6CFF007C0D40BA49D; pin=23117; unick=jd2311kga; _tp=D8kjVbHzTJzgqxcxaN3m1w%3D%3D; _pst=23117; ipLoc-djd=24-2144-3909-58335; 3AB9D23F7A4B3C9B=IPF6PUOISQRNPNXNQVLJJVKQVBTAvEt16MoRnbUfHBdCarU9683JDaxNfPy83okP3kLScwCkGiuMcyC4PcynYGLMEE; flash=2_YNg0msef1iArLpGWQBwhJos62BkQWLuFuDD-HGOLK2KKuPtQ08qYx9js2jlEHwoRT7AVTOjRo8iR1-PT6ZsT8ZDnqdgMfbeoSNMJvJa8qphobenATQ0WXPYP62_XgiF1J7II6jY1qovmiIDadA7rd5tHyAVpTzEsqpI6xVJ9b6D*; __jda=209449046.797222838.1720272224.1720293360.1721239059.3; __jdc=209449046; __jdv=209449046|baidu|-|organic|notset|1721239059356; 3AB9D23F7A4B3CSS=jdd03IPF6PUOISQRNPNXNQVLJJVKQVBTAvEt16MoRnbUfHBdCarU9683JDaxNfPy83okP3kLScwCkGiuMcyC4PcynvEt16MoRnbUfHBdCarU9683KT3AsB67n92UtFUX; _gia_d=1; shshshfpb=BApXcdm_fwvVAJzuAI6Mnq8QQOcIPSh90B9TUVj599xJ1MlKCa4O2; __jdb=209449046.5.797222838|3.1721239059; RT=\"z=1&dm=jd.com&si=zpw2ttxi9&ss=lyq5alej&sl=6&tt=3x4&ld=z4s&nu=3d2f85352c70c73af100bf1449967844&cl=x78\"\r\n\r\n;";
 
-            string useragent = _account.user_agent;
-            if (string.IsNullOrEmpty(useragent)) useragent = ProviderFakeUserAgent.RandomComputer;
-            string url = $"https://api.m.jd.com/api?functionId=unionPromoteLinkService&" +
-                $"appid=unionpc&_={ts}&loginType=3&uuid={uuid}";
+    string uuid = cookies.GetContentPart("__jdu=", ";");
+    string __jda = cookies.GetContentPart("__jda=", ";");
+    if (__jda.Split('.').Length > 1)
+    {
+        uuid = __jda.Split('.')[1];
+    }
 
-            var args = new
-            {
-                funName = "getCode",
-                param = new
-                {
-                    couponLink = "",
-                    isPinGou = 0,
-                    materialId = result.itemId,
-                    materialType = 1,
-                    planId = 3479956501,
-                    promotionType = 15,
-                    receiveType = "cps",
-                    wareUrl = wareUrl,
-                    isSmartGraphics = 0,
-                    command = 1,
-                    ext1 = "618|pc|".UrlEncode()
-                },
-                lientPageId = "jingfen_pc"
-            };
-            string data = args.Convert2Json().UrlEncode();
+    string useragent = _account.user_agent;
+    if (string.IsNullOrEmpty(useragent)) useragent = ProviderFakeUserAgent.RandomComputer;
+    string url = $"https://api.m.jd.com/api?functionId=unionPromoteLinkService&" +
+        $"appid=unionpc&_={ts}&loginType=3&uuid={uuid}";
 
-            WebClientUtility client = new WebClientUtility();
-            client.Proxy = _proxy;
+    var args = new
+    {
+        funName = "getCode",
+        param = new
+        {
+            couponLink = "",
+            isPinGou = 0,
+            materialId = result.itemId,
+            materialType = 1,
+            planId = 3479956501,
+            promotionType = 15,
+            receiveType = "cps",
+            wareUrl = wareUrl,
+            isSmartGraphics = 0,
+            command = 1,
+            ext1 = "618|pc|".UrlEncode()
+        },
+        lientPageId = "jingfen_pc"
+    };
+    string data = args.Convert2Json().UrlEncode();
+
+    WebClientUtility client = new WebClientUtility();
+    client.Proxy = _proxy;
 #if DEBUG
 
-            client.Proxy = new WebProxy
-            {
-                Address = new Uri("http://bjapi.molilian.com:20063"),
-                //Credentials = new NetworkCredential("t12881967077999", "6a1eh304")
-            };
-
-            client.Proxy = new WebProxy
-            {
-                Address = new Uri("http://f848.kdltps.com:15818"),
-                Credentials = new NetworkCredential("t12881967077999", "6a1eh304")
-            };
+    client.Proxy = new WebProxy
+    {
+        Address = new Uri("http://bjapi.molilian.com:20063"),
+        //Credentials = new NetworkCredential("t12881967077999", "6a1eh304")
+    };
 
-            client.Proxy = null;
+    client.Proxy = null;
 
 #endif
-            client.SetContentType("application/x-www-form-urlencoded");
-            client.AddHeaders("X-Referer-Page", "https://union.jd.com/proManager/index");
-            client.AddHeaders("X-Rp-Client", "h5_1.0.0");
-            client.AddHeaders("Referer", "https://union.jd.com/");
-            client.AddHeaders("Origin", "https://union.jd.com");
-            client.UserAgent = useragent;
-            client.AddHeaders("Cookie", cookies);
-            client.Post($"body={data}");
-            var response = await client.RequestAsync(url, "POST", cancellationToken);
-
-
-
-            //if (response.ResponseMessage.StatusCode == HttpStatusCode.Forbidden)
-            //{
-            //    result.success = false;
-            //    result.message = "转链失败";
-            //    result.reason = "nologin";
-            //    result.shortLinkurl = wareUrl;
-            //    result.deeplink_url = GetDeeplink(result.shortLinkurl);
-            //    return result;  
-            //}
-
-
-            string body = response.Body();
-            var root = body.Convert2JsonElement();
-            int code = root.Read<int>("code");
-            string message = root.Read<string>("message");
-            string shortCode = root.PathRead<string>("data.shortCode");
-
-            if (code == 200)
-            {
-                result.success = true;
-                result.message = "OK";
-                result.shortLinkurl = shortCode;
-                result.content = result.shortLinkurl;
-                result.deeplink_url = GetDeeplink(result.shortLinkurl);
-            }
-            else
-            {
-                if (string.IsNullOrEmpty(body)) message = "网络异常";
-                result.success = false;
-                result.message = "转链失败";
-                result.reason = message;
-                result.shortLinkurl = wareUrl;
-                result.deeplink_url = GetDeeplink(result.shortLinkurl);
-                _ = new LoggerLibrary("JdUnion", "GetPromotionByCrawlerAsync").Info(body).SaveAsync();
-            }
-            return result;
-        }
+    client.SetContentType("application/x-www-form-urlencoded");
+    client.AddHeaders("X-Referer-Page", "https://union.jd.com/proManager/index");
+    client.AddHeaders("X-Rp-Client", "h5_1.0.0");
+    client.AddHeaders("Referer", "https://union.jd.com/");
+    client.AddHeaders("Origin", "https://union.jd.com");
+    client.UserAgent = useragent;
+    client.AddHeaders("Cookie", cookies);
+    client.Post($"body={data}");
+    var response = await client.RequestAsync(url, "POST", cancellationToken);
+
+
+
+    //if (response.ResponseMessage.StatusCode == HttpStatusCode.Forbidden)
+    //{
+    //    result.success = false;
+    //    result.message = "转链失败";
+    //    result.reason = "nologin";
+    //    result.shortLinkurl = wareUrl;
+    //    result.deeplink_url = GetDeeplink(result.shortLinkurl);
+    //    return result;  
+    //}
+
+
+    string body = response.Body();
+    var root = body.Convert2JsonElement();
+    int code = root.Read<int>("code");
+    string message = root.Read<string>("message");
+    string shortCode = root.PathRead<string>("data.shortCode");
+
+    if (code == 200)
+    {
+        result.success = true;
+        result.message = "OK";
+        result.shortLinkurl = shortCode;
+        result.content = result.shortLinkurl;
+        result.deeplink_url = GetDeeplink(result.shortLinkurl);
+    }
+    else
+    {
+        if (string.IsNullOrEmpty(body)) message = "网络异常";
+        result.success = false;
+        result.message = "转链失败";
+        result.reason = message;
+        result.shortLinkurl = wareUrl;
+        result.deeplink_url = GetDeeplink(result.shortLinkurl);
+        _ = new LoggerLibrary("JdUnion", "GetPromotionByCrawlerAsync").Info(body).SaveAsync();
+    }
+    return result;
+}
 
     }
 
 
     public class JdData
-    {
-        public int code { get; set; }
-        public string message { get; set; }
-        public string requestId { get; set; }
-        public JdClickData data { get; set; }
-    }
+{
+    public int code { get; set; }
+    public string message { get; set; }
+    public string requestId { get; set; }
+    public JdClickData data { get; set; }
+}
 
-    public class JdClickData
-    {
-        public string shortURL { get; set; }
-        public string clickURL { get; set; }
-        public string jCommand { get; set; }
-    }
+public class JdClickData
+{
+    public string shortURL { get; set; }
+    public string clickURL { get; set; }
+    public string jCommand { get; set; }
+}
 
 
 
-    public class JdUnionResponse
-    {
-        public JdUnionOpenPromotionCommonGetResponce jd_union_open_promotion_common_get_responce { get; set; }
-        public JdUnionOpenPromotionCommonGetResponce jd_union_open_promotion_bysubunionid_get_responce { get; set; }
+public class JdUnionResponse
+{
+    public JdUnionOpenPromotionCommonGetResponce jd_union_open_promotion_common_get_responce { get; set; }
+    public JdUnionOpenPromotionCommonGetResponce jd_union_open_promotion_bysubunionid_get_responce { get; set; }
 
-    }
+}
 
-    public class JdUnionOpenPromotionCommonGetResponce
-    {
-        public string code { get; set; }
-        public string getResult { get; set; }
-        public string message { get; set; }
-        public string requestId { get; set; }
-    }
+public class JdUnionOpenPromotionCommonGetResponce
+{
+    public string code { get; set; }
+    public string getResult { get; set; }
+    public string message { get; set; }
+    public string requestId { get; set; }
+}
 
 
 }

+ 7 - 0
nuget.config

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
+    <add key="local" value="http://10.10.10.10:5555/v3/index.json" />
+  </packageSources>
+</configuration>

Některé soubory nejsou zobrazeny, neboť je v těchto rozdílových datech změněno mnoho souborů