商品选品数据库列表 商品选品申请功能 优化cookie存取
This commit is contained in:
1 parent
a77278c6d1
commit
f2135af339
37 files changed
+3221
-296
No files matched your search
+2
-51
@@ -65,58 +65,9 @@ namespace TemuKJD
|
||||
{
|
||||
//while (string.IsNullOrEmpty(BaseClass.CompanyName))
|
||||
while (!BaseClass.IsLoginSuccess)
|
||||
Thread.Sleep(100);
|
||||
Thread.Sleep(100);
|
||||
|
||||
// 获取本地店铺和服务端店铺。将服务端相关信息与本地店铺合并后暂时存在内存中(不保存敏感信息)。
|
||||
GlobalConfig.ShopLoginList = new ConcurrentList<ShopLoginInfo>();
|
||||
// 获取服务端店铺
|
||||
var serverDouShopList = KJDForms.ShopForms.ShopListForm.GetServerShop();
|
||||
var localDouShopList = NaiBa.Util.Helper.ConfigHelper.LoadConfig<ConcurrentList<ShopLoginInfo>>("dou_shop_login");
|
||||
if (localDouShopList == null)
|
||||
localDouShopList = new ConcurrentList<ShopLoginInfo>();
|
||||
foreach (var serverShop in serverDouShopList)
|
||||
{
|
||||
var localShop = localDouShopList.FirstOrDefault(s => s.LoginName == serverShop.LoginName && s.ShopId == serverShop.ShopId);
|
||||
if (localShop == null)
|
||||
{
|
||||
localDouShopList.Add(serverShop);
|
||||
}
|
||||
}
|
||||
//var localDouShopList = new ConcurrentList<DouShopLoginInfo>();
|
||||
//localDouShopList.AddRange(serverDouShopList);
|
||||
foreach (var localShop in localDouShopList)
|
||||
{
|
||||
if (GlobalConfig.ShopLoginList.Any(s => s.LoginName == localShop.LoginName && s.ShopId == localShop.ShopId))
|
||||
continue;
|
||||
|
||||
var serverShop = serverDouShopList.FirstOrDefault(s => s.LoginName == localShop.LoginName && s.ShopId == localShop.ShopId);
|
||||
if (serverShop != null)
|
||||
{
|
||||
localShop.ShopAccount = serverShop.ShopAccount;
|
||||
localShop.LoginName = serverShop.LoginName;
|
||||
localShop.Password = serverShop.Password;
|
||||
localShop.Cookies = serverShop.Cookies;
|
||||
localShop.DbId = serverShop.DbId;
|
||||
localShop.UserName = serverShop.UserName;
|
||||
localShop.SubUserName = serverShop.SubUserName;
|
||||
localShop.ApiAuthInfoList = new List<AuthInfo>();
|
||||
localShop.ApiAuthInfoList.AddRange(serverShop.ApiAuthInfoList);
|
||||
localShop.BuyApiAuth.AccessToken = serverShop.BuyApiAuth.AccessToken;
|
||||
localShop.BuyApiAuth.AddTime = serverShop.BuyApiAuth.AddTime;
|
||||
localShop.BuyApiAuth.AppKey = serverShop.BuyApiAuth.AppKey;
|
||||
localShop.BuyApiAuth.ExpiresTime = serverShop.BuyApiAuth.ExpiresTime;
|
||||
localShop.BuyApiAuth.RefreshToken = serverShop.BuyApiAuth.RefreshToken;
|
||||
localShop.PayStatus = serverShop.PayStatus;
|
||||
localShop.GroupName = serverShop.GroupName;
|
||||
localShop.Notes = serverShop.Notes;
|
||||
localShop.LoginStatus = serverShop.LoginStatus;
|
||||
if (localShop.TrialUploadCount < 0)
|
||||
localShop.TrialUploadCount = 0;
|
||||
GlobalConfig.ShopLoginList.Add(localShop);
|
||||
}
|
||||
}
|
||||
GlobalConfig.DouShopLoginOtherUserShopList = new ConcurrentList<ShopLoginInfo>();
|
||||
GlobalConfig.DouShopLoginOtherUserShopList.AddRange(localDouShopList.Where(l => !GlobalConfig.ShopLoginList.Any(s => s.LoginName == l.LoginName)));
|
||||
KJDForms.ShopForms.ShopListForm.UpdateShop();
|
||||
|
||||
IsShopInit = true;
|
||||
//while (true)
|
||||
|
||||
Reference in new issue
Block a user