diff --git a/AllBase/GetHtml.cs b/AllBase/GetHtml.cs index fa6d368..d420ec4 100644 --- a/AllBase/GetHtml.cs +++ b/AllBase/GetHtml.cs @@ -56,7 +56,7 @@ namespace AllBase rst = ""; //return LoadImage(imgUrl); - if (imgUrl.Contains("wxapp")) + if (imgUrl.Contains("wxapp") || imgUrl.Contains("mmecimage.cn")) { return ImageBuild.LoadBitmapLoadBitmipImageFromUrl(imgUrl, out rst); } diff --git a/AllBase/Model/Result/PDDResult/PDDFrontProductInfo3.cs b/AllBase/Model/Result/PDDResult/PDDFrontProductInfo3.cs index fdb19ad..c9aba00 100644 --- a/AllBase/Model/Result/PDDResult/PDDFrontProductInfo3.cs +++ b/AllBase/Model/Result/PDDResult/PDDFrontProductInfo3.cs @@ -139,6 +139,15 @@ namespace AllBase.Model.Result.PDDResult } + public class pddFrontGoods3List + { + public long? goodsID { get; set; } // 1661424397, + public string goodsName { get; set; } // "红薏仁5斤装 红薏仁米小薏米仁农家自产新红薏米1斤2斤苡仁糙薏米", + public long? mallID { get; set; } // 525159017 + public string mallName { get; set; } + public List skus { get; set; } + } + public class newShareTitleInfo { public string price { get; set; } // "13.5元 ", diff --git a/TEMUKJD/BLL/HttpResponseWxAiTalkBLL.cs b/TEMUKJD/BLL/HttpResponseWxAiTalkBLL.cs index c223dd9..2310faf 100644 --- a/TEMUKJD/BLL/HttpResponseWxAiTalkBLL.cs +++ b/TEMUKJD/BLL/HttpResponseWxAiTalkBLL.cs @@ -44,7 +44,9 @@ namespace TemuKJD.BLL request.Headers.Set(HttpRequestHeader.AcceptEncoding, "gzip, deflate"); request.Headers.Set(HttpRequestHeader.AcceptLanguage, "zh-CN,zh;q=0.9,en;q=0.8,en-GB;q=0.7,en-US;q=0.6"); if (!string.IsNullOrEmpty(cookies)) + { request.Headers.Set(HttpRequestHeader.Cookie, cookies); + } response = (HttpWebResponse)request.GetResponse(); } diff --git a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUploadForm.cs b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUploadForm.cs index 93be350..f85aae2 100644 --- a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUploadForm.cs +++ b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUploadForm.cs @@ -8354,7 +8354,7 @@ Content-Type: image/jpeg //------------------------------------------------------------------------------------------------------------------------------------- //生成图片base64字符串 string getImgError; - if (!img_url.Contains("wst.wxapp.tc.qq.com")) + if (!img_url.Contains("wst.wxapp.tc.qq.com") && !img_url.Contains("mmecimage.cn")) img_url = img_url.Replace("https://", "http://"); var image = GetHtml.GetUrlImg(img_url, out getImgError); if (image == null) diff --git a/TEMUKJD/WXForms/AiTalkForms/WxAiTalkForm.cs b/TEMUKJD/WXForms/AiTalkForms/WxAiTalkForm.cs index 3e07fde..9d83716 100644 --- a/TEMUKJD/WXForms/AiTalkForms/WxAiTalkForm.cs +++ b/TEMUKJD/WXForms/AiTalkForms/WxAiTalkForm.cs @@ -9,6 +9,7 @@ using NaiBa.CefHelper; using NaiBa.CefHelper.Handler; using NaiBa.Util; using NaiBa.Util.Extension; +using Newtonsoft.Json.Linq; using System; using System.Collections.Generic; using System.ComponentModel; @@ -467,7 +468,7 @@ namespace TemuKJD.WXForms.AiTalkForms aiTalkAdminWebBrowser.Dock = DockStyle.Fill; aiTalkAdminWebBrowser.SendToBack(); } - aiTalkAdminWebBrowser.Load("http://14.103.99.254"); + aiTalkAdminWebBrowser.Load(AiTalkUrl + "/login"); pnlShop.Controls.Add(aiTalkAdminWebBrowser); Task.Run(() => @@ -491,6 +492,21 @@ namespace TemuKJD.WXForms.AiTalkForms { //var cookies = CEFBrowser.GetCookieList("", aiTalkAdminWebBrowser.RequestContext.GetCookieManager(null)); var cookies = CEFBrowser.GetCookieList("", aiTalkAdminWebBrowser.RequestContext.GetCookieManager(null)); + + // 获取店铺列表 + //var getUsersUrl = AiTalkUrl + "/admin-api/api/users"; + //var getUsersReferer = AiTalkUrl; + //var getUsersRst = HttpResponseWxAiTalkBLL.GetResponse(new ShopLoginInfo() { Cookies = JsonHelper.SerializeObject(cookies) }, getUsersUrl, getUsersReferer); + //if (getUsersRst.Contains(BaseClass.UserName)) + //{ + // JArray jUsers = JsonHelper.JObjectParse(getUsersRst)["users"] as JArray; + // var jUser = jUsers.FirstOrDefault(u => u["username"].ParseToString() == BaseClass.UserName); + // var jUserStr = jUser.ParseToString(); + //} + //else + //{ + //} + data = @"{""username"":""" + BaseClass.UserName + @""",""password"":""" + BaseClass.PassWord + @""",""role"":""supervisor"",""status"":""active"",""expiresAt"":"""",""storeIds"":[]}"; url = AiTalkUrl + "/api/users"; refer = AiTalkUrl + "workbench"; @@ -505,8 +521,8 @@ namespace TemuKJD.WXForms.AiTalkForms aiTalkWebBrowser.Load(AiTalkUrl + "/workbench"); Thread.Sleep(1000); - aiTalkWebBrowser.Load(AiTalkUrl + "/workbench"); - Thread.Sleep(500); + //aiTalkWebBrowser.Load(AiTalkUrl + "/workbench"); + //Thread.Sleep(500); while (aiTalkWebBrowser.Address.Contains("/login")) { diff --git a/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs b/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs index 8807bed..e841d95 100644 --- a/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs +++ b/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs @@ -5964,7 +5964,9 @@ namespace TemuKJD.WXForms.ProductForms public string UploadImg(ShopLoginInfo shop, string img_url, DataGridViewCell cell = null, bool randomBlock = false) { string getImgError; - var image = GetHtml.GetUrlImg(img_url.Replace("https://", "http://"), out getImgError); + if (!img_url.Contains("wst.wxapp.tc.qq.com") && !img_url.Contains("mmecimage.cn")) + img_url = img_url.Replace("https://", "http://"); + var image = GetHtml.GetUrlImg(img_url, out getImgError); if (image == null) image = new Bitmap(800, 800); var imageBg = new Bitmap(image.Width, image.Height);