1调整拼多多工作台cookie时的cef user-agent,防止掉线
2优化商品删除逻辑,修复bug 3查找pdd版本长时间运行程序卡死原因并尝试修复 4pdd上货记住主要上货选项避免每次都重新选择
This commit is contained in:
1 parent
61264a5a99
commit
5e9bdd1700
19 files changed
+612
-557
No files matched your search
@@ -59,10 +59,10 @@ namespace TemuKJD.PDDForms.ShopForms
|
||||
|
||||
public PDDShopLoginForm(ShopLoginInfo shopInfo)
|
||||
{
|
||||
if (shopLoginInstance != null && !shopLoginInstance.IsDisposed)
|
||||
{
|
||||
shopLoginInstance.Dispose();
|
||||
}
|
||||
//if (shopLoginInstance != null && !shopLoginInstance.IsDisposed)
|
||||
//{
|
||||
// shopLoginInstance.Dispose();
|
||||
//}
|
||||
shopLoginInstance = this;
|
||||
|
||||
InitializeComponent();
|
||||
@@ -146,7 +146,7 @@ namespace TemuKJD.PDDForms.ShopForms
|
||||
cookieListNew.Add(cookie);
|
||||
}
|
||||
|
||||
if (cookieListNew.Any(c => c.Name == "PASS_ID" && c.Value.StartsWith("windows")) &&
|
||||
if (cookieListNew.Any(c => c.Name == "PASS_ID" && c.Value.StartsWith("windows_1")) &&
|
||||
!cookieListNew.Any(c => c.Name == "PddBrowser"))
|
||||
{
|
||||
cookieList.Add(new Cookie() { Domain = ".pinduoduo.com", Name = "PddBrowser", Value = "1", Expires = DateTime.Now.AddYears(1), });
|
||||
@@ -351,9 +351,9 @@ namespace TemuKJD.PDDForms.ShopForms
|
||||
{
|
||||
//cefWebBrowser = CEFBrowser.CreateChromiumWebBrowser("about:blank", false);
|
||||
if (!string.IsNullOrEmpty(InitUrl)) //temu国际版不支持无痕模式多开,此处改为true,每次创建cefwebbrowser时删除cookie
|
||||
cefWebBrowser = CEFBrowser.CreateChromiumWebBrowser(InitUrl, true);
|
||||
cefWebBrowser = CEFBrowser.CreateChromiumWebBrowser(InitUrl, false);
|
||||
else
|
||||
cefWebBrowser = CEFBrowser.CreateChromiumWebBrowser(shopMainUrl, true);
|
||||
cefWebBrowser = CEFBrowser.CreateChromiumWebBrowser(shopMainUrl, false);
|
||||
CustomResourceRequestHandlerLocal resourceRequestHandler = new CustomResourceRequestHandlerLocal();
|
||||
resourceRequestHandler.ResourceLoadCompleteEvent += RequestHandler_ResourceLoadComplete;
|
||||
resourceRequestHandler.BeforeResourceLoadEvent += RequestHandler_BeforeResourceLoad;
|
||||
@@ -408,8 +408,8 @@ namespace TemuKJD.PDDForms.ShopForms
|
||||
Thread.Sleep(20);
|
||||
CEFBrowser.DeleteCookie(cefWebBrowser.GetCookieManager(null));
|
||||
|
||||
if (cookieLst.Any(c=>c.Name == "PddBrowser") && cookieLst.Any(c => c.Value.StartsWith ("windows")) && !string.IsNullOrEmpty(shop.pddid))
|
||||
cefWebBrowser.ExecuteScriptAsync("navigator.__defineGetter__('userAgent', function() { return 'Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/75.5.40.8 Safari/537.36 PddWorkbench-Online PddBrowser pdd_windows_version/3.0.3.12'; });");
|
||||
//if (cookieLst.Any(c => c.Value.StartsWith("windows_1")))
|
||||
// cefWebBrowser.ExecuteScriptAsync("navigator.__defineGetter__('userAgent', function() { return 'Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/75.5.40.8 Safari/537.36 PddWorkbench-Online PddBrowser pdd_windows_version/3.0.3.12'; });");
|
||||
|
||||
//cef 138 如果没有设置RequestContext 可能为空,直接getCookieManager
|
||||
//if (this.openType != EnumOpenType.login)
|
||||
@@ -490,7 +490,7 @@ namespace TemuKJD.PDDForms.ShopForms
|
||||
|
||||
private void CefWebBrowser_AddressChanged(object sender, CefSharp.AddressChangedEventArgs e)
|
||||
{
|
||||
if (this.Created && !this.IsDisposed)
|
||||
if (this.Created && !this.Disposing && !this.IsDisposed)
|
||||
Invoke(new Action(() =>
|
||||
{
|
||||
currentUrl = e.Address;
|
||||
@@ -552,21 +552,26 @@ namespace TemuKJD.PDDForms.ShopForms
|
||||
//public Func<object, string, string, request, bool> BeforeResourceLoadEvent; // sender, requestUrl, postData, request, true(表示取消执行)
|
||||
private bool RequestHandler_BeforeResourceLoad(object sender, string url, string postData, IRequest request)
|
||||
{
|
||||
if (shop.Cookies.Contains("windows") && shop.Cookies.Contains("PddBrowser") && !string.IsNullOrEmpty(shop.pddid))
|
||||
if (BaseClass.MainPath == "binxixi" && BaseClass.UsePddWorkbanch && !shop.Cookies.Contains("windows_1"))
|
||||
{
|
||||
var ua = "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/75.5.40.8 Safari/537.36 PddWorkbench-Online PddBrowser pdd_windows_version/3.0.3.12";
|
||||
var ua = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/138.0.0.0 Safari/537.36";
|
||||
//ua = "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/75.5.40.8 Safari/537.36";
|
||||
request.SetHeaderByName("User-Agent", ua, true);
|
||||
request.SetHeaderByName("pddid", shop.pddid, true);
|
||||
request.SetHeaderByName("Accept-Encoding", "gzip, deflate, br", true);
|
||||
var headers = request.Headers;
|
||||
headers.Remove("sec-ch-ua");
|
||||
headers.Remove("sec-ch-ua-mobile");
|
||||
headers.Remove("sec-ch-ua-platform");
|
||||
headers.Remove("Accept-Language");
|
||||
headers.Remove("Origin");
|
||||
//headers["User-Agent"] = ua;
|
||||
//headers["Accept-Encoding"] = "gzip, deflate, br";
|
||||
request.Headers = headers;
|
||||
|
||||
//var ua = "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/75.5.40.8 Safari/537.36 PddWorkbench-Online PddBrowser pdd_windows_version/3.0.3.12";
|
||||
//request.SetHeaderByName("User-Agent", ua, true);
|
||||
////if (request.Method == "POST")
|
||||
//request.SetHeaderByName("pddid", shop.pddid, true);
|
||||
//request.SetHeaderByName("Accept-Encoding", "gzip, deflate, br", true);
|
||||
//var headers = request.Headers;
|
||||
//headers.Remove("sec-ch-ua");
|
||||
//headers.Remove("sec-ch-ua-mobile");
|
||||
//headers.Remove("sec-ch-ua-platform");
|
||||
//headers.Remove("Accept-Language");
|
||||
//headers.Remove("Origin");
|
||||
////headers["User-Agent"] = ua;
|
||||
////headers["Accept-Encoding"] = "gzip, deflate, br";
|
||||
//request.Headers = headers;
|
||||
}
|
||||
|
||||
return false;
|
||||
@@ -576,18 +581,18 @@ namespace TemuKJD.PDDForms.ShopForms
|
||||
private void RequestHandler_ResourceLoadComplete(object sender, string url, string postData, string responseData, IRequest request)
|
||||
{
|
||||
var antiContent = request.Headers.AllKeys.Contains("Anti-Content") ? request.Headers["Anti-Content"] : "";
|
||||
if (shop != null && !url.StartsWith("https://mms.pinduoduo.com/janus/api/userinfo") && !string.IsNullOrEmpty(antiContent))
|
||||
if (shop != null && !url.StartsWith("https://mms.pinduoduo.com/janus/api/userinfo") && !string.IsNullOrEmpty(antiContent) && request.Method == "POST")
|
||||
{
|
||||
Task.Run(() =>
|
||||
{
|
||||
GetAntiContentsTimes++;
|
||||
if (this.Created && !this.IsDisposed)
|
||||
if (this.Created && !this.Disposing && !this.IsDisposed)
|
||||
Invoke(new Action(() =>
|
||||
{
|
||||
try { this.TitleText = "店铺登录 - " + GetAntiContentsTimes; } catch { return; }
|
||||
}));
|
||||
shop.AntiContents.Add(antiContent);
|
||||
while (shop.AntiContents.Count > 50)
|
||||
while (shop.AntiContents.Count > 100)
|
||||
shop.AntiContents.RemoveAt(0);
|
||||
if (!string.IsNullOrEmpty(shop.ShopId) && GetAntiContentsTimes > 500)
|
||||
{
|
||||
@@ -996,7 +1001,7 @@ function fireKeyEvent(el, evtType, keyCode) {
|
||||
//OnSaveComplete(shop);
|
||||
Task.Run(() => {
|
||||
Thread.Sleep(500);
|
||||
if (!this.IsDisposed)
|
||||
if (!this.Disposing && !this.IsDisposed)
|
||||
{
|
||||
MainForm.instance.Invoke(new Action(() => { this.Dispose(); }));
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user