1优化cookie登录检测逻辑 2调整标题重组逻辑不再强制前缀 3库存上传、选品上传显示提交时间 4备货管理使用双接口处理

This commit is contained in:
wule committed 2025-08-01 18:55:24 +08:00
1 parent c203c161a2
commit 7ea35b6866
22 files changed
+479 -490

No files matched your search

+2 -2
View File
@@ -617,7 +617,7 @@
// colUpdateCookies
//
this.colUpdateCookies.FillWeight = 67F;
this.colUpdateCookies.HeaderText = "导入Cookies";
this.colUpdateCookies.HeaderText = "导入Cookie";
this.colUpdateCookies.Name = "colUpdateCookies";
this.colUpdateCookies.ReadOnly = true;
this.colUpdateCookies.Resizable = System.Windows.Forms.DataGridViewTriState.True;
@@ -626,7 +626,7 @@
// colCopyCookies
//
this.colCopyCookies.FillWeight = 70F;
this.colCopyCookies.HeaderText = "复制Cookies";
this.colCopyCookies.HeaderText = "复制Cookie";
this.colCopyCookies.Name = "colCopyCookies";
this.colCopyCookies.ReadOnly = true;
this.colCopyCookies.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+47 -135
View File
@@ -20,6 +20,7 @@ using System.Windows.Forms;
using Work;
using NaiBa.Util;
using System.Globalization;
using TemuKJD.KJDForms.AdminForms;
namespace TemuKJD.KJDForms.ShopForms
{
@@ -169,72 +170,8 @@ namespace TemuKJD.KJDForms.ShopForms
var jArr = JObject.Parse(html)["data"];
if (jArr.Count() == 0)
break;
foreach (JObject jObj in jArr)
{
string shopStr = jObj.ToString();
ShopLoginInfo shop = new ShopLoginInfo();
shop.DbId = BaseRegex.GetStringJson(ref shopStr, "id");
if (shop.DbId == null)
continue;
shop.LoginName = BaseRegex.GetStringJson(ref shopStr, "login_name");
shop.Password = BaseRegex.GetStringJson(ref shopStr, "login_pass");
shop.ShopId = BaseRegex.GetStringJson(ref shopStr, "shop_id");
shop.ShopAccount = BaseRegex.GetStringJson(ref shopStr, "shop_account");
shop.UserName = BaseRegex.GetStringJson(ref shopStr, "user_name");
shop.SubUserName = BaseRegex.GetStringJson(ref shopStr, "sub_user_name");
shop.GroupName = BaseRegex.GetStringJson(ref shopStr, "shop_group");
shop.Cookies = BaseRegex.GetStringJson(ref shopStr, "cookie");
shop.Cookies = shop.Cookies.Replace("&", "&").Replace("%", "%").Replace("+", "+");
shop.Cookies2 = BaseRegex.GetStringJson(ref shopStr, "cookie2").ParseToString();
shop.Cookies2 = shop.Cookies2.Replace("&", "&").Replace("%", "%").Replace("+", "+");
shop.CompanyName = BaseRegex.GetStringJson(ref shopStr, "company_name");
shop.Notes = BaseRegex.GetStringJson(ref shopStr, "notes");
shop.LoginStatus = BaseRegex.GetStringJson(ref shopStr, "login_status");
shop.LoginStatus2 = BaseRegex.GetStringJson(ref shopStr, "login_status2");
shop.AddProductRemaining = BaseRegex.GetIntJson(ref shopStr, "add_product_remaining");
shop.OperateSubSaName = BaseRegex.GetStringJson(ref shopStr, "operate_sub_sa_name");
//shop.PayStatus = BaseRegex.GetIntJson(ref shopStr, "shop_pay_status");
//if (list.Any(l => l.ShopId == shop.ShopId) || list.Any(l => l.ShopName == shop.ShopName))
// continue;
list.Add(shop);
}
}
if (list.Count > 0)
{
#region 获取服务端保存的店铺cookies 暂时作废
//string shopNames = "";
//foreach (var shop in list)
//{
// shopNames += shop.ShopName + ",";
//}
//var cookies = GetServerShopCookies(shopNames);
//if (cookies?.Contains("\"code\":200") == false)
// cookies = GetServerShopCookies(shopNames);
//if (cookies?.Contains("\"code\":200") == false)
// cookies = GetServerShopCookies(shopNames);
//if (!string.IsNullOrEmpty(cookies) && cookies.Contains("\"code\":200"))
//{
// var data = JObject.Parse(cookies)["data"];
// foreach (var shop in list)
// {
// for (int j = 0; data != null && j < data.Count(); j++)
// {
// if (data[j][shop.ShopName] != null)
// {
// shop.Cookies = data[j][shop.ShopName].ToString().Replace("&", "&").Replace("%", "%").Replace("+", "+");
// break;
// }
// }
// }
//}
#endregion
#region 获取服务端保存的店铺授权信息 暂时作废
//UpdateShopTokens(list);
#endregion
list.AddRange(AdminForms.AdminShopListForm.DeserializationShop(html));
}
return list;
}
@@ -525,6 +462,7 @@ namespace TemuKJD.KJDForms.ShopForms
shopList = shopList.Where(s => s.ShopAccount.ParseToString().ToLower().Contains(txtShopName.Text.ToLower())).ToList();
}
List<string> shopIdList = GetCheckedShopIdList();
this.Invoke(new Action(() =>
{
this.dgvShop.Rows.Clear();
@@ -543,7 +481,7 @@ namespace TemuKJD.KJDForms.ShopForms
this.statusBar.pgbTaskProgress.Text = (i + 1) + "/" + shopList.Count;
}));
}
AddDataGridViewRow(shopList[i], true);
AddDataGridViewRow(shopList[i], true, shopIdList.Contains(shopList[i].ShopId));
}
if (this.Created)
{
@@ -558,7 +496,7 @@ namespace TemuKJD.KJDForms.ShopForms
});
}
private void AddDataGridViewRow(ShopLoginInfo param, bool isRefresh = false)
private void AddDataGridViewRow(ShopLoginInfo param, bool isRefresh = false, bool isRowCheck = false)
{
if (!this.Created)
return;
@@ -579,7 +517,7 @@ namespace TemuKJD.KJDForms.ShopForms
else
{
int rowIndex = this.dgvShop.Rows.Add(
false,
isRowCheck,
param.LoginName,
param.ShopId,
param.ShopAccount,
@@ -598,8 +536,8 @@ namespace TemuKJD.KJDForms.ShopForms
"多重登录",
param.ApiAuthStatus,
param.BuyApiAuth.ApiAuthStatus,
"导入Cookies",
"复制Cookies",
"导入Cookie",
"复制Cookie",
"编辑",
"删除");
if (!isRefresh)
@@ -662,19 +600,37 @@ namespace TemuKJD.KJDForms.ShopForms
public void CheckShopLogin(string[] shopNames, bool isShowProgress = true)
{
for (int i = 0; i < shopNames.Length; i++)
{
var shop = GlobalConfig.ShopLoginList.FirstOrDefault(v => v.LoginName == shopNames[i]);
var campanys = GlobalConfig.ShopLoginList.Where(v => v.LoginName == shopNames[i]).ToList();
var shop = GlobalConfig.ShopLoginList.FirstOrDefault(v => v.LoginName == shopNames[i]);
// 先从服务端取最新cookie
var serverCampanys = AdminShopListForm.AdminGetServerShopLstByIds(campanys.Select(c => c.ShopId).ToList());
var sss = string.Join(",", serverCampanys.Select(s => s.UserName + s.ShopAccount));
var serverShop = serverCampanys.FirstOrDefault();
if (shop != null && serverShop != null)
{
shop.Cookies = serverShop.Cookies;
shop.Cookies2 = serverShop.Cookies2;
foreach (var sc in campanys)
{
sc.Cookies = serverShop.Cookies;
sc.Cookies2 = serverShop.Cookies2;
}
}
if (shop != null)
{
//var loginResult = "\"code\":0";//GetShopStatus(shop);
var loginResult = GetShopStatus(shop);
if (!loginResult.Contains("\"success\":true"))
{
shop.Cookies = "empty=true;";
foreach (var sc in campanys)
{
sc.LoginStatus = "未登录";
shop.Cookies = "empty=true;";
}
}
else
@@ -682,10 +638,9 @@ namespace TemuKJD.KJDForms.ShopForms
foreach(var sc in campanys)
{
sc.LoginStatus = "登录成功";
sc.LastRefreshDate = DateTime.Now.ToString("yyyyMMdd");
}
}
//if (!string.IsNullOrEmpty(loginResult))
// shop.LastRefreshDate = DateTime.Now.ToString("yyyyMMdd");
loginResult = ShopListForm.GetShopStatus2(shop);
if (!loginResult.Contains("\"success\":true"))
{
@@ -701,9 +656,10 @@ namespace TemuKJD.KJDForms.ShopForms
foreach (var sc in campanys)
{
sc.LoginStatus2 = "国际版在线";
}
}
//if (!string.IsNullOrEmpty(loginResult))
// shop.LastRefreshDate = DateTime.Now.ToString("yyyyMMdd");
UpdateServerShopCookies(shop); // 店铺cookie写入服务端,多店共用一个登录账号一组cookie
StartUp.SaveLocalShopLoginInfo();
}
@@ -725,64 +681,6 @@ namespace TemuKJD.KJDForms.ShopForms
string refere = "https://seller.kuajingmaihuo.com/";
string body = @"{}";
return KJDHttpResponse.PostResponse(shop, url, body, refere);
//HttpWebResponse response = null;
//string result;
//try
//{
// string url = "https://seller.kuajingmaihuo.com/bg/quiet/api/mms/userInfo";
// HttpWebRequest request = (HttpWebRequest)WebRequest.Create(url);
// request.KeepAlive = true;
// request.Headers.Set(HttpRequestHeader.CacheControl, "max-age=0");
// request.Headers.Add("Anti-Content", @"0aqAfqFyXcGvBgd9Q0HiJJ7kvWcKK7muUHnJ6oMAdmem0tmm_enmX1DBr-nJNxmoki33dqHTkZU18BU2p8P72Cg2uEZ_acOOBCxGmIs-Gym4EtKpTdZ6kWRCSClS9L6maLm0imx0GIjodHtLnwpx4ayHnhzNnCXEFecZSC8lBRHb9WCAoyY79kMLIWxBMZZSZrR2_LYUJ5UXzf-82ob455f7OvJa6s895N4wiMGR4vbVH8gFN2VuCxS27RpXDa2WCQQQd6XsJPw7amSUaob6oZ2MXuYb9K3ZqoCX5-nJimNZDR0rNCLB13sYgWq9jy0Q3gjnsFY2dJQDh3ewXS2vvf2DN9IAEzInwWTY31Fn0B6-s8DqwIm61OlXsfYt1AYOOyNMLzkw5llaDaqK21f7vspAuXwnJdAdKXJXSyyEimvTyF_AYLp1gkNqBqN1_ik_jc6cKTDJtGUgFjRojR4g4zM7Ww3wfW63WQrJftYhiTIJiS1tZcsceZht3Zu3MsvyxpAbx4bxFrvL0A6OFx752XsVi04Tm6HDhgt7MmpsrTO5WD_KjgjxNX8VNoGndD0OmriAYVn6kwmZXE6Y_khGedxumIGy4sOQI36__CeiuiPIvB8itfOqd7eyqyeCIaEODrh9dSLBQz8AxQ2xt60OTn4HSiPmlwo1J0TFtjUw2DUZB68tdrINb7ugulMsaIwMKr8S0bilSKW6JuYw3oAsmK3daQfJWy3mzVowY1UwPQfTB4Ibz6uRQxHkvhsRTXkrAygGeZIc9S");
// request.Headers.Add("sec-ch-ua-platform", @"""Windows""");
// request.UserAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/137.0.0.0 Safari/537.36";
// request.Headers.Add("sec-ch-ua", @"""Google Chrome"";v=""137"", ""Chromium"";v=""137"", ""Not/A)Brand"";v=""24""");
// request.Headers.Add("Sec-Purpose", @"prefetch;prerender");
// request.ContentType = "application/json";
// request.Headers.Add("sec-ch-ua-mobile", @"?0");
// request.Accept = "*/*";
// request.Headers.Add("Origin", @"https://seller.kuajingmaihuo.com");
// request.Headers.Add("Purpose", @"prefetch");
// request.Headers.Add("Sec-Fetch-Site", @"same-origin");
// request.Headers.Add("Sec-Fetch-Mode", @"cors");
// request.Headers.Add("Sec-Fetch-Dest", @"empty");
// request.Referer = "https://seller.kuajingmaihuo.com/";
// request.Headers.Set(HttpRequestHeader.AcceptEncoding, "gzip, deflate, br, zstd");
// //request.Headers.Set(HttpRequestHeader.AcceptEncoding, "gzip, deflate");
// request.Headers.Set(HttpRequestHeader.AcceptLanguage, "zh-CN,zh;q=0.9");
// request.Headers.Set(HttpRequestHeader.Cookie, shop.Cookies);
// request.Method = "POST";
// request.ServicePoint.Expect100Continue = false;
// string body = @"{}";
// byte[] postBytes = System.Text.Encoding.UTF8.GetBytes(body);
// request.ContentLength = postBytes.Length;
// Stream stream = request.GetRequestStream();
// stream.Write(postBytes, 0, postBytes.Length);
// stream.Close();
// response = (HttpWebResponse)request.GetResponse();
//}
//catch (WebException ex)
//{
// if (ex.Status == WebExceptionStatus.ProtocolError)
// {
// response = (HttpWebResponse)ex.Response;
// result = GetProxyHtml.ReadResponse(response);
// return result;
// }
// else return ex.Message;
//}
//catch (Exception e)
//{
// if (response != null) response.Close();
// return e.Message;
//}
//result = GetProxyHtml.ReadResponse(response);
//return result;
}
/// <summary>
@@ -884,7 +782,7 @@ namespace TemuKJD.KJDForms.ShopForms
IsOperate = false;
}
break;
case "复制Cookies":
case "复制Cookie":
//SUB_PASS_ID=eyJ0IjoiRHBPWTBvVGxKWlZCZ1FmNVpPNGFwUjczdDZzUGk5bWVzbHZGejBUYlFkK3c4VjN4ZUIyV1RtZ24ybCtwWkhyNSIsInYiOjEsInMiOjEwMDAwLCJ1IjoyNDg3NDUxOTIxNzE0fQ==
string cook = shop.Cookies;
//cook = BaseRegex.GetStringCookie(ref cook, "SUB_PASS_ID");
@@ -946,7 +844,7 @@ namespace TemuKJD.KJDForms.ShopForms
Clipboard.SetDataObject(cookJs);
BaseMsgForm.ShowInfo("复制成功");
break;
case "导入Cookies":
case "导入Cookie":
ShopUpdateCookieForm updateCookieForm = new ShopUpdateCookieForm(shop);
updateCookieForm.SaveComplete += UpdateCookieForm_SaveComplete;
updateCookieForm.ShowDialog();
@@ -1095,6 +993,20 @@ namespace TemuKJD.KJDForms.ShopForms
return shopNameList;
}
private List<string> GetCheckedShopIdList()
{
List<string> shopNameList = new List<string>();
for (int i = 0; i < dgvShop.Rows.Count; i++)
{
if (dgvShop.Rows[i].Cells["colSelect"].Value.ParseToBool())
{
string shopName = dgvShop.Rows[i].Cells["colShopId"].Value.ParseToString();
shopNameList.Add(shopName);
}
}
return shopNameList;
}
private void btnLoginSelect_Click(object sender, EventArgs e)
{
ShopListForm.IsOperate = true;
@@ -136,7 +136,7 @@ namespace TemuKJD.KJDForms.ShopForms
}
List<ShopLoginInfo> serverShopLst = new List<ShopLoginInfo>();
var rst = AdminGetServerShopListForSetCookie(shopLoginInfo, serverShopLst);
var rst = AdminShopListForm.AdminGetServerShopLstForSetCookie(shopLoginInfo, serverShopLst);
if (rst != "success")
{
@@ -211,7 +211,7 @@ namespace TemuKJD.KJDForms.ShopForms
}
List<ShopLoginInfo> serverShopLst = new List<ShopLoginInfo>();
var rst = AdminGetServerShopListForSetCookie(shopLoginInfo, serverShopLst);
var rst = AdminShopListForm.AdminGetServerShopLstForSetCookie(shopLoginInfo, serverShopLst);
if (rst != "success")
{
@@ -290,67 +290,13 @@ namespace TemuKJD.KJDForms.ShopForms
if (oldServerShop == null)
{
if (updateFrom != SetCookieFromEnum.normal_user)
AdminShopForm.AdminAddServerShop(newShop); // 店铺写入到服务端
AdminShopListForm.AdminAddServerShop(newShop); // 店铺写入到服务端
else
ShopListForm.AddServerDouShop(newShop); // 店铺写入到服务端
}
}
}
public static string AdminGetServerShopListForSetCookie(ShopLoginInfo loginShop, List<ShopLoginInfo> lstRst)
{
if (lstRst == null)
lstRst = new List<ShopLoginInfo>();
var url = BaseClass.BuildObjString("shop/admin_get_shop_list");
var data = UserLogin.GetSignaturex() +
"&search_user_name=" + loginShop.UserName +
"&search_login_name=" + loginShop.LoginName;
var html = GetHtml.PostUtf8(url, data);
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
html = GetHtml.PostUtf8(url, data);
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
html = GetHtml.PostUtf8(url, data);
if (string.IsNullOrEmpty(html)
|| !html.Contains("shop_id") || !html.Contains("shop_account") || !html.Contains("login_pass"))
{
return "获取失败:" + BaseRegex.GetStringJson(ref html, "msg");
}
var jArr = JObject.Parse(html)["data"];
if (jArr.Count() == 0)
return "获取失败:未获取到data数据";
foreach (JObject jObj in jArr)
{
string shopStr = jObj.ToString();
ShopLoginInfo shop = new ShopLoginInfo();
shop.DbId = BaseRegex.GetStringJson(ref shopStr, "id");
if (shop.DbId == null)
continue;
shop.LoginName = BaseRegex.GetStringJson(ref shopStr, "login_name");
shop.Password = BaseRegex.GetStringJson(ref shopStr, "login_pass");
shop.ShopId = BaseRegex.GetStringJson(ref shopStr, "shop_id");
shop.ShopAccount = BaseRegex.GetStringJson(ref shopStr, "shop_account");
shop.UserName = BaseRegex.GetStringJson(ref shopStr, "user_name");
shop.SubUserName = BaseRegex.GetStringJson(ref shopStr, "sub_user_name");
shop.GroupName = BaseRegex.GetStringJson(ref shopStr, "shop_group");
shop.Cookies = BaseRegex.GetStringJson(ref shopStr, "cookie");
shop.Cookies = shop.Cookies.Replace("&", "&").Replace("%", "%").Replace("+", "+");
shop.Cookies2 = BaseRegex.GetStringJson(ref shopStr, "cookie2");
shop.Cookies2 = shop.Cookies2.Replace("&", "&").Replace("%", "%").Replace("+", "+");
shop.CompanyName = BaseRegex.GetStringJson(ref shopStr, "company_name");
shop.Notes = BaseRegex.GetStringJson(ref shopStr, "notes");
shop.LoginStatus = BaseRegex.GetStringJson(ref shopStr, "login_status");
shop.LoginStatus2 = BaseRegex.GetStringJson(ref shopStr, "login_status2");
shop.OperateSubSaName = BaseRegex.GetStringJson(ref shopStr, "operate_sub_sa_name");
lstRst.Add(shop);
}
return "success";
}
private void btnGetCookie_Click(object sender, EventArgs e)
{
//复制cookie