代理版本调试
This commit is contained in:
1 parent
0b325e7cd8
commit
8ff2508632
36 files changed
+1049
-342
No files matched your search
+31
-1
@@ -82,6 +82,7 @@ namespace TemuKJD.WXForms.AiTalkForms
|
||||
this.label5 = new System.Windows.Forms.Label();
|
||||
this.pbLoading = new System.Windows.Forms.PictureBox();
|
||||
this.panel4 = new System.Windows.Forms.Panel();
|
||||
this.btnReload = new DevComponents.DotNetBar.PanelEx();
|
||||
this.btnClose = new DevComponents.DotNetBar.PanelEx();
|
||||
this.btnToKfMainPage = new DevComponents.DotNetBar.PanelEx();
|
||||
this.ucTabControl1 = new TemuKJD.UserComponent.UcTabControl();
|
||||
@@ -862,6 +863,7 @@ namespace TemuKJD.WXForms.AiTalkForms
|
||||
//
|
||||
// panel4
|
||||
//
|
||||
this.panel4.Controls.Add(this.btnReload);
|
||||
this.panel4.Controls.Add(this.btnClose);
|
||||
this.panel4.Controls.Add(this.btnToKfMainPage);
|
||||
this.panel4.Controls.Add(this.ucTabControl1);
|
||||
@@ -871,6 +873,33 @@ namespace TemuKJD.WXForms.AiTalkForms
|
||||
this.panel4.Size = new System.Drawing.Size(1115, 618);
|
||||
this.panel4.TabIndex = 906;
|
||||
//
|
||||
// btnReload
|
||||
//
|
||||
this.btnReload.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.btnReload.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
|
||||
this.btnReload.Cursor = System.Windows.Forms.Cursors.Hand;
|
||||
this.btnReload.DisabledBackColor = System.Drawing.Color.Empty;
|
||||
this.btnReload.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
this.btnReload.Location = new System.Drawing.Point(929, 12);
|
||||
this.btnReload.Name = "btnReload";
|
||||
this.btnReload.Size = new System.Drawing.Size(88, 23);
|
||||
this.btnReload.Style.Alignment = System.Drawing.StringAlignment.Center;
|
||||
this.btnReload.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.btnReload.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
this.btnReload.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
|
||||
this.btnReload.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
|
||||
this.btnReload.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
|
||||
this.btnReload.Style.CornerDiameter = 3;
|
||||
this.btnReload.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
|
||||
this.btnReload.Style.ForeColor.Color = System.Drawing.Color.White;
|
||||
this.btnReload.Style.GradientAngle = 90;
|
||||
this.btnReload.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
|
||||
this.btnReload.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
|
||||
this.btnReload.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
|
||||
this.btnReload.TabIndex = 738;
|
||||
this.btnReload.Text = "重新登录";
|
||||
this.btnReload.Click += new System.EventHandler(this.btnReload_Click);
|
||||
//
|
||||
// btnClose
|
||||
//
|
||||
this.btnClose.Anchor = System.Windows.Forms.AnchorStyles.Left;
|
||||
@@ -1058,7 +1087,7 @@ namespace TemuKJD.WXForms.AiTalkForms
|
||||
//
|
||||
this.pnlCover.Controls.Add(this.pictureBox1);
|
||||
this.pnlCover.Controls.Add(this.btnReLogin);
|
||||
this.pnlCover.Location = new System.Drawing.Point(24, 18);
|
||||
this.pnlCover.Location = new System.Drawing.Point(46, 36);
|
||||
this.pnlCover.Name = "pnlCover";
|
||||
this.pnlCover.Size = new System.Drawing.Size(200, 100);
|
||||
this.pnlCover.TabIndex = 0;
|
||||
@@ -1332,5 +1361,6 @@ namespace TemuKJD.WXForms.AiTalkForms
|
||||
private DevComponents.DotNetBar.PanelEx btnReLogin;
|
||||
private System.Windows.Forms.PictureBox pictureBox1;
|
||||
private DevComponents.DotNetBar.PanelEx btnRefreshAiStatus;
|
||||
private DevComponents.DotNetBar.PanelEx btnReload;
|
||||
}
|
||||
}
|
||||
@@ -3,6 +3,7 @@ using AllBase.Helper;
|
||||
using AllBase.Model.Config;
|
||||
using AllBase.Model.Result;
|
||||
using CefSharp;
|
||||
using CefSharp.DevTools.LayerTree;
|
||||
using CefSharp.WinForms;
|
||||
using NaiBa.CefHelper;
|
||||
using NaiBa.CefHelper.Handler;
|
||||
@@ -161,10 +162,10 @@ namespace TemuKJD.WXForms.AiTalkForms
|
||||
mainWebBrowser = CEFBrowser.CreateChromiumWebBrowser("about:blank", false);
|
||||
mainWebBrowser.KeyboardHandler = new KeyboardHandler();
|
||||
mainWebBrowser.Dock = DockStyle.Fill;
|
||||
var lifeSpanHandler = new LifeSpanHandlerLocal(PopWindowType.NewTitleWindow);
|
||||
lifeSpanHandler.parent = mainWebBrowser;
|
||||
lifeSpanHandler.OnPop += MainLifeHandler_OnPop;
|
||||
mainWebBrowser.LifeSpanHandler = lifeSpanHandler;
|
||||
//var lifeSpanHandler = new LifeSpanHandlerLocal(PopWindowType.NewTitleWindow);
|
||||
//lifeSpanHandler.parent = mainWebBrowser;
|
||||
//lifeSpanHandler.OnPop += MainLifeHandler_OnPop;
|
||||
//mainWebBrowser.LifeSpanHandler = lifeSpanHandler;
|
||||
mainWebBrowser.AddressChanged += MainWebBrowser_AddressChanged;
|
||||
mainWebBrowser.FrameLoadEnd += MainWebBrowser_FrameLoadEnd;
|
||||
mainPanel.Controls.Add(mainWebBrowser);
|
||||
@@ -400,6 +401,7 @@ namespace TemuKJD.WXForms.AiTalkForms
|
||||
dgvShop.Rows[iGrid].Cells["colSelect"].Value = true;
|
||||
r = dgvShop.Rows[iGrid];
|
||||
}
|
||||
r.Cells["colSelect"].Value = false;
|
||||
r.Cells["colShopId"].Value = shop.ShopId; // 店铺ID
|
||||
r.Cells["colShopName"].Value = shop.ShopAccount; // 店铺名称
|
||||
r.Cells["colShopName"].Style.BackColor = LstTagShop.Contains(shop.ShopId) ? Color.LightGreen : (r.Tag is Color ? (Color)r.Tag : Color.White);
|
||||
@@ -424,19 +426,22 @@ namespace TemuKJD.WXForms.AiTalkForms
|
||||
aiTalkWebBrowser = CEFBrowser.CreateChromiumWebBrowser("about:blank", true);
|
||||
CustomResourceRequestHandler resourceRequestHandler = new CustomResourceRequestHandler();
|
||||
var handler = resourceRequestHandler;
|
||||
handler.ResourceLoadCompleteEvent += RequestHandler_ResourceLoadComplete;
|
||||
handler.ResourceLoadCompleteEvent += AiRequestHandler_ResourceLoadComplete;
|
||||
aiTalkWebBrowser.RequestHandler = new CustomRequestHandler(resourceRequestHandler);
|
||||
aiTalkWebBrowser.KeyboardHandler = new KeyboardHandler();
|
||||
//var lifeHandler = new LifeSpanHandlerLocal(PopWindowType.NewTitleWindow);
|
||||
//lifeHandler.OnPop += LifeHandler_OnPop;
|
||||
//lifeHandler.parent = aiTalkWebBrowser;
|
||||
//aiTalkWebBrowser.LifeSpanHandler = lifeHandler;
|
||||
var lifeHandler = new LifeSpanHandlerLocal(PopWindowType.NewWindow);
|
||||
lifeHandler.OnPop += LifeHandler_OnPop;
|
||||
lifeHandler.parent = aiTalkWebBrowser;
|
||||
aiTalkWebBrowser.LifeSpanHandler = lifeHandler;
|
||||
//var lifeSapnHandler = new LifeSpanHandlerLocal(PopWindowType.SelfWindow);
|
||||
//aiTalkWebBrowser.LifeSpanHandler = lifeSapnHandler;
|
||||
|
||||
//RequestContextSettings requestContextSettings = new RequestContextSettings();
|
||||
//requestContextSettings.PersistSessionCookies = false; // 会话 Cookie(未设置过期时间的 Cookie)仅在内存中存在,关闭浏览器进程后即被删除,下次启动需重新登录。
|
||||
//requestContextSettings.PersistUserPreferences = false;
|
||||
//aiTalkWebBrowser.RequestContext = new RequestContext(requestContextSettings);
|
||||
aiTalkWebBrowser.Dock = DockStyle.Fill;
|
||||
aiTalkWebBrowser.Load("http://14.103.99.254");
|
||||
aiTalkWebBrowser.Load(AiTalkUrl + "/workbench");
|
||||
pnlAiTalk.Controls.Add(aiTalkWebBrowser);
|
||||
//while (aiTalkWebBrowser.IsBrowserInitialized != true)
|
||||
//{
|
||||
@@ -452,7 +457,7 @@ namespace TemuKJD.WXForms.AiTalkForms
|
||||
aiTalkAdminWebBrowser = CEFBrowser.CreateChromiumWebBrowser("about:blank", false);
|
||||
CustomResourceRequestHandler resourceRequestHandler = new CustomResourceRequestHandler();
|
||||
var adminHandler = resourceRequestHandler;
|
||||
adminHandler.ResourceLoadCompleteEvent += AdminRequestHandler_ResourceLoadComplete;
|
||||
adminHandler.ResourceLoadCompleteEvent += AdminAiRequestHandler_ResourceLoadComplete;
|
||||
aiTalkAdminWebBrowser.RequestHandler = new CustomRequestHandler(resourceRequestHandler);
|
||||
aiTalkAdminWebBrowser.KeyboardHandler = new KeyboardHandler();
|
||||
//var lifeHandler = new LifeSpanHandlerLocal(PopWindowType.NewTitleWindow);
|
||||
@@ -475,6 +480,7 @@ namespace TemuKJD.WXForms.AiTalkForms
|
||||
document.getElementsByTagName('button')[0].click();";
|
||||
var response = aiTalkAdminWebBrowser.GetBrowser().MainFrame.EvaluateScriptAsync(loginJs);
|
||||
response.Wait(2000);
|
||||
Thread.Sleep(500);
|
||||
}
|
||||
|
||||
string data = @"{""username"":""" + BaseClass.UserName + @""",""password"":""" + BaseClass.PassWord + @"""}";
|
||||
@@ -483,6 +489,7 @@ namespace TemuKJD.WXForms.AiTalkForms
|
||||
var rst = HttpResponseWxAiTalkBLL.PostResponse(new ShopLoginInfo(), url, data, refer);
|
||||
if (!rst.Contains("\"ok\":true"))
|
||||
{
|
||||
//var cookies = CEFBrowser.GetCookieList("", aiTalkAdminWebBrowser.RequestContext.GetCookieManager(null));
|
||||
var cookies = CEFBrowser.GetCookieList("", aiTalkAdminWebBrowser.RequestContext.GetCookieManager(null));
|
||||
data = @"{""username"":""" + BaseClass.UserName + @""",""password"":""" + BaseClass.PassWord + @""",""role"":""supervisor"",""status"":""active"",""expiresAt"":"""",""storeIds"":[]}";
|
||||
url = AiTalkUrl + "/api/users";
|
||||
@@ -496,16 +503,28 @@ namespace TemuKJD.WXForms.AiTalkForms
|
||||
}
|
||||
AiTalkUserId = BaseRegex.GetStringJson(ref rst, "id");
|
||||
|
||||
aiTalkWebBrowser.Load(AiTalkUrl);
|
||||
aiTalkWebBrowser.Load(AiTalkUrl + "/workbench");
|
||||
Thread.Sleep(1000);
|
||||
aiTalkWebBrowser.Load(AiTalkUrl + "/workbench");
|
||||
Thread.Sleep(500);
|
||||
while (!aiTalkWebBrowser.Address.Contains("/workbench"))
|
||||
|
||||
while (aiTalkWebBrowser.Address.Contains("/login"))
|
||||
{
|
||||
Thread.Sleep(500);
|
||||
string loginJs = @"document.getElementById('username').value='" + BaseClass.UserName + @"';
|
||||
document.getElementById('password').value='" + BaseClass.PassWord + @"';
|
||||
document.getElementsByTagName('button')[0].click();";
|
||||
var response = aiTalkWebBrowser.GetBrowser().MainFrame.EvaluateScriptAsync(loginJs);
|
||||
response.Wait(2000);
|
||||
//var response = aiTalkWebBrowser.GetBrowser().MainFrame.EvaluateScriptAsync(loginJs);
|
||||
var client = aiTalkWebBrowser.GetDevToolsClient();
|
||||
if (client != null)
|
||||
{
|
||||
var result = client.Runtime.EvaluateAsync(loginJs, null, true, null, null, true, null, true);
|
||||
result.Wait(5000);
|
||||
}
|
||||
//Invoke(new Action(() => {
|
||||
// pnlCover.SendToBack();
|
||||
//}));
|
||||
Thread.Sleep(500);
|
||||
}
|
||||
|
||||
var shopIds = string.Join(",", GlobalConfig.ShopLoginList.Select(s => s.ShopId));
|
||||
@@ -528,13 +547,13 @@ namespace TemuKJD.WXForms.AiTalkForms
|
||||
return;
|
||||
}
|
||||
|
||||
Thread.Sleep(1000);
|
||||
|
||||
foreach (var shop in GlobalConfig.ShopLoginList)
|
||||
{
|
||||
BindAiTalkStatus(shop);
|
||||
}
|
||||
|
||||
Thread.Sleep(1000);
|
||||
|
||||
Invoke(new Action(() => {
|
||||
pnlCover.Visible = false;
|
||||
pnlCover.SendToBack();
|
||||
@@ -593,9 +612,9 @@ namespace TemuKJD.WXForms.AiTalkForms
|
||||
}
|
||||
}
|
||||
|
||||
private void RequestHandler_ResourceLoadComplete(object sender, string url, string postData, string responseData)
|
||||
private void AiRequestHandler_ResourceLoadComplete(object sender, string url, string postData, string responseData)
|
||||
{
|
||||
if (responseData.Contains("登录失败") || responseData.Contains("\\u767b\\u5f55\\u5931\\u8d25"))
|
||||
if (url.Contains(AiTalkUrl) && (responseData.Contains("登录失败") || responseData.Contains("\\u767b\\u5f55\\u5931\\u8d25")))
|
||||
{
|
||||
Invoke(new Action(() =>
|
||||
{
|
||||
@@ -605,8 +624,22 @@ namespace TemuKJD.WXForms.AiTalkForms
|
||||
this.btnReLogin.Visible = true;
|
||||
}));
|
||||
}
|
||||
if (url.Contains("/api/me"))
|
||||
{
|
||||
if (!responseData.Contains("\"" + BaseClass.UserName + "\""))
|
||||
{
|
||||
Task.Run(() =>
|
||||
{
|
||||
Invoke(new Action(() =>
|
||||
{
|
||||
var cookieManager = aiTalkWebBrowser.GetCookieManager(null);
|
||||
cookieManager.DeleteCookiesAsync(AiTalkUrl.Replace("https://", "").Replace("http://", ""), null);
|
||||
}));
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
private void AdminRequestHandler_ResourceLoadComplete(object sender, string url, string postData, string responseData)
|
||||
private void AdminAiRequestHandler_ResourceLoadComplete(object sender, string url, string postData, string responseData)
|
||||
{
|
||||
}
|
||||
|
||||
@@ -637,7 +670,7 @@ namespace TemuKJD.WXForms.AiTalkForms
|
||||
{
|
||||
if (lifeHandler.parent != null)
|
||||
{
|
||||
var cookies = CEFBrowser.GetCookieList("", lifeHandler.parent.RequestContext.GetCookieManager(null));
|
||||
var cookies = CEFBrowser.GetCookieList("", lifeHandler.parent.GetCookieManager(null));
|
||||
Invoke(new Action(() =>
|
||||
{
|
||||
CefForm cefForm = new CefForm(targetUrl, cookies);
|
||||
@@ -653,7 +686,16 @@ namespace TemuKJD.WXForms.AiTalkForms
|
||||
var lifeHandler = sender as LifeSpanHandlerLocal;
|
||||
|
||||
Task.Run(() =>
|
||||
{
|
||||
{
|
||||
if (lifeHandler.parent != null)
|
||||
{
|
||||
var cookies = CEFBrowser.GetCookieList("", lifeHandler.parent.GetCookieManager(null));
|
||||
Invoke(new Action(() =>
|
||||
{
|
||||
CefForm cefForm = new CefForm(targetUrl, cookies);
|
||||
cefForm.Show();
|
||||
}));
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@@ -1348,6 +1390,11 @@ namespace TemuKJD.WXForms.AiTalkForms
|
||||
}
|
||||
}
|
||||
|
||||
private void btnReload_Click(object sender, EventArgs e)
|
||||
{
|
||||
LoadAiTalkAdmin();
|
||||
}
|
||||
|
||||
//https://store.weixin.qq.com/shop-faas/mmchannelstradeorder/list/cgi/orderSearch?token=&lang=zh_CN
|
||||
//https://store.weixin.qq.com/shop/order/list
|
||||
// 待发货
|
||||
|
||||
@@ -3208,6 +3208,7 @@ namespace TemuKJD.WXForms.ProductForms
|
||||
}
|
||||
if (propInfo.values.Count == 0)
|
||||
continue;
|
||||
|
||||
|
||||
var attr = productAttr.attr.FirstOrDefault(r => r.name == propInfo.name);
|
||||
if (attr == null)
|
||||
@@ -3509,6 +3510,27 @@ namespace TemuKJD.WXForms.ProductForms
|
||||
else
|
||||
attrValue = "100 g";
|
||||
}
|
||||
else if (attr.value == "日;月;年")
|
||||
{
|
||||
var propInfoValue = (propInfo.values.FirstOrDefault()?.value).ParseToString();
|
||||
if (propInfoValue.EndsWith("日") || propInfoValue.EndsWith("月") || propInfoValue.EndsWith("年"))
|
||||
attrValue = propInfo.values.FirstOrDefault()?.value + propInfoValue.LastOrDefault();
|
||||
else
|
||||
attrValue = "30 日";
|
||||
}
|
||||
else if (attr.value.ParseToString().Length > 0 && !attr.value.ParseToString().Contains(";"))
|
||||
{
|
||||
if ((propInfo.values.FirstOrDefault()?.value).ParseToString().EndsWith(attr.value))
|
||||
{
|
||||
attrValue = propInfo.values.FirstOrDefault()?.value;
|
||||
if (attrValue.Substring(0, attrValue.Length - attr.value.Length - 1).ParseToInt() == 0)
|
||||
attrValue = BaseRegex.GetMatchMaxRegexString(ref attrValue, "(\\d{1,6})") + " " + attr.value;
|
||||
if (attrValue.Substring(0, attrValue.Length - attr.value.Length - 1).ParseToInt() == 0)
|
||||
attrValue = "1 " + attr.value;
|
||||
}
|
||||
else
|
||||
attrValue = "1 " + attr.value;
|
||||
}
|
||||
else
|
||||
{
|
||||
var param = recommendParamRst.productInfo.param.FirstOrDefault(p => p.categorys?.FirstOrDefault()?.name == attr.name);
|
||||
@@ -3731,6 +3753,8 @@ namespace TemuKJD.WXForms.ProductForms
|
||||
attrValue = "100 ml";
|
||||
else if (attr.value == "L")
|
||||
attrValue = "1 L";
|
||||
else if (attr.value == "日;月;年")
|
||||
attrValue = "30 日";
|
||||
}
|
||||
|
||||
var wxPropParam = new wxPropParam();
|
||||
|
||||
@@ -123,7 +123,6 @@ namespace TemuKJD.WXForms.ProductForms
|
||||
|
||||
private void btnOk_Click(object sender, EventArgs e)
|
||||
{
|
||||
//var url = BaseClass.BuildPDDObjString("product/mdy_product_notes");
|
||||
var url = BaseClass.BuildPDDObjString("product/mdy_db_product");
|
||||
var data = UserLogin.GetSignaturex() +
|
||||
"&db_id=" + dbProd.id + "¬es=" + this.txtNotes.Text.Trim();
|
||||
|
||||
@@ -349,6 +349,11 @@ namespace TemuKJD.WXForms.ShopForms
|
||||
bool isExist = false;
|
||||
var existUrl = BaseClass.BuildPDDObjString("product/get_product_spu_id_list");
|
||||
string existData = UserLogin.GetSignaturex() + "&search_spu_ids=" + prodId + collectAuthorityTag;
|
||||
if (isCollectAuthorityUser)
|
||||
{
|
||||
existData += "&add_user_name=" + BaseClass.UserName;
|
||||
existData += "&group=用户" + BaseClass.UserName;
|
||||
}
|
||||
//if (!string.IsNullOrEmpty(prod.dbProduct.real_spu_id))
|
||||
// existData = UserLogin.GetSignaturex() + "&search_spu_ids=" + prod.spuId + "," + prod.dbProduct.real_spu_id;
|
||||
string html = GetHtml.PostUtf8(existUrl, existData);
|
||||
|
||||
Reference in new issue
Block a user