From ab169a2b8373f46dd1e3d36171e5b3c04625dbc8 Mon Sep 17 00:00:00 2001 From: wule Date: Wed, 26 Aug 2026 15:46:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E5=8C=85=E6=9B=BF=E6=8D=A2?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- KJD_WebService/BLL/KJD/UpdateManage.cs | 90 ++++++++++++++++++------ KJD_WebService/BLL/WXXD/WXOrderManage.cs | 6 +- KJD_WebService/UpdateService.asmx.cs | 1 + KJD_WebService/Web.config | 2 +- 4 files changed, 74 insertions(+), 25 deletions(-) diff --git a/KJD_WebService/BLL/KJD/UpdateManage.cs b/KJD_WebService/BLL/KJD/UpdateManage.cs index 2dbf444..76adb5e 100644 --- a/KJD_WebService/BLL/KJD/UpdateManage.cs +++ b/KJD_WebService/BLL/KJD/UpdateManage.cs @@ -4,6 +4,9 @@ using System; using System.Collections.Generic; using System.IO; using System.Linq; +using System.Net; +using System.Net.Http; +using System.Threading.Tasks; using System.Web; namespace KJD_Web.BLL @@ -87,21 +90,29 @@ namespace KJD_Web.BLL var fileDir = System.Configuration.ConfigurationManager.ConnectionStrings["UpdateFileDir"].ConnectionString; if (path == "29wx") { - var file = Directory.GetFiles(fileDir); var versionTmp = 0; - foreach (var f in file) + //var file = Directory.GetFiles(fileDir); + //foreach (var f in file) + //{ + // var v = Path.GetFileName(f).Replace("Update29wx", "").Replace(".zip", "").ParseToInt(); + // if (v > versionTmp && v <= serverVersion.ParseToInt() && v <= MaxVersion) + // { + // versionTmp = v; + // } + //} + var f = GetVersionCodeAndFileFromE57(); + var v = Path.GetFileName(f).Replace("Update29wx", "").Replace(".zip", "").ParseToInt(); + if (v > versionTmp && v <= serverVersion.ParseToInt() && v <= MaxVersion) { - var v = Path.GetFileName(f).Replace("Update29wx", "").Replace(".zip", "").ParseToInt(); - if (v > versionTmp && v <= serverVersion.ParseToInt() && v <= MaxVersion) - { - versionTmp = v; - } + versionTmp = v; } if (versionTmp > 0) { serverVersion = versionTmp.ToString(); + //return "{\"code\":200,\"msg\":\"success\",\"next_version\":" + serverVersion + ",\"exe_check\":\"" + UpdateExeChk + + // "\",\"exe_address\":\"" + UpdateExe + "\",\"file_address\":\"" + UpdateNewUrl + "Update" + serverVersion + ".zip\"}"; return "{\"code\":200,\"msg\":\"success\",\"next_version\":" + serverVersion + ",\"exe_check\":\"" + UpdateExeChk + - "\",\"exe_address\":\"" + UpdateExe + "\",\"file_address\":\"" + UpdateNewUrl + "Update" + serverVersion + ".zip\"}"; + "\",\"exe_address\":\"" + UpdateExe + "\",\"file_address\":\"" + f.Replace("29wx" + serverVersion, serverVersion) + "\"}"; } } if (path == "29pdd") @@ -147,6 +158,21 @@ namespace KJD_Web.BLL return "{\"code\":19999,\"msg\":\"未知错误\"}"; } + public string GetVersionCodeAndFileFromE57() + { + var url = "https://update.e57.cn/api/latest?channel=stable"; + var versionRst = HttpUtils.e57GetResponse(url, ""); + + var json = JsonUtils.JObjectParse(versionRst); + var data = json.GetValue("data") as Newtonsoft.Json.Linq.JObject; + + string sha256 = (data["package"]?["sha256"]).ParseToString(); + string latestVersion = data.GetValue("version").ParseToString(); + string downloadUrl = (data["package"]?["downloadUrl"]).ParseToString(); + return downloadUrl; + } + + public string GetWxFindOrderUpdate(string inputData) { @@ -179,34 +205,42 @@ namespace KJD_Web.BLL var fileDir = System.Configuration.ConfigurationManager.ConnectionStrings["UpdateWxFindOrderFileDir"].ConnectionString; //if (path == "29wx") { - var file = Directory.GetFiles(fileDir); var versionTmp = 0; - foreach (var f in file) + //var file = Directory.GetFiles(fileDir); + //foreach (var f in file) + //{ + // var v = Path.GetFileName(f).Replace("WxFindOrderUpdate", "").Replace(".zip", "").ParseToInt(); + // if (v > versionTmp && v <= serverVersion.ParseToInt()) + // { + // versionTmp = v; + // } + //} + var f = GetWxOrderVersionCodeAndFileFromE57(); + var v = Path.GetFileName(f).Replace("WxFindOrderUpdate", "").Replace(".zip", "").ParseToInt(); + if (v > versionTmp && v <= serverVersion.ParseToInt()) { - var v = Path.GetFileName(f).Replace("WxFindOrderUpdate", "").Replace(".zip", "").ParseToInt(); - if (v > versionTmp && v <= serverVersion.ParseToInt()) - { - versionTmp = v; - } + versionTmp = v; } if (versionTmp > 0) { serverVersion = versionTmp.ToString(); + //return "{\"code\":200,\"msg\":\"success\",\"next_version\":" + serverVersion + ",\"exe_check\":\"" + UpdateExeChk + + // "\",\"exe_address\":\"" + UpdateExe + "\",\"file_address\":\"" + UpdateFileNewUrl + "WxFindOrderUpdate" + serverVersion + ".zip\"}"; return "{\"code\":200,\"msg\":\"success\",\"next_version\":" + serverVersion + ",\"exe_check\":\"" + UpdateExeChk + - "\",\"exe_address\":\"" + UpdateExe + "\",\"file_address\":\"" + UpdateFileNewUrl + "WxFindOrderUpdate" + serverVersion + ".zip\"}"; + "\",\"exe_address\":\"" + UpdateExe + "\",\"file_address\":\"" + f + "\"}"; } } } catch (Exception ex) { - //return "{\"code\":500,\"msg\":\"升级文件查询失败\"}"; + return "{\"code\":500,\"msg\":\"升级文件查询失败\"}"; } } - if (serverVersion.ParseToInt() > 1159) - serverVersion = 1159.ToString(); - return "{\"code\":200,\"msg\":\"success\",\"next_version\":" + serverVersion + ",\"exe_check\":\"" + UpdateExeChk + - "\",\"exe_address\":\"" + UpdateExe + "\",\"file_address\":\"" + UpdateFileNewUrl + "WxFindOrderUpdate" + serverVersion + ".zip\"}"; + //if (serverVersion.ParseToInt() > 1159) + // serverVersion = 1159.ToString(); + //return "{\"code\":200,\"msg\":\"success\",\"next_version\":" + serverVersion + ",\"exe_check\":\"" + UpdateExeChk + + // "\",\"exe_address\":\"" + UpdateExe + "\",\"file_address\":\"" + UpdateFileNewUrl + "WxFindOrderUpdate" + serverVersion + ".zip\"}"; } else if (version > 0) { @@ -219,5 +253,19 @@ namespace KJD_Web.BLL } return "{\"code\":19999,\"msg\":\"未知错误\"}"; } + + public string GetWxOrderVersionCodeAndFileFromE57() + { + var url = "https://update-wx-order.e57.cn/api/latest?channel=stable"; + var versionRst = HttpUtils.e57GetResponse(url, ""); + + var json = JsonUtils.JObjectParse(versionRst); + var data = json.GetValue("data") as Newtonsoft.Json.Linq.JObject; + + string sha256 = (data["package"]?["sha256"]).ParseToString(); + string latestVersion = data.GetValue("version").ParseToString(); + string downloadUrl = (data["package"]?["downloadUrl"]).ParseToString(); + return downloadUrl; + } } } \ No newline at end of file diff --git a/KJD_WebService/BLL/WXXD/WXOrderManage.cs b/KJD_WebService/BLL/WXXD/WXOrderManage.cs index d121c16..03d54cc 100644 --- a/KJD_WebService/BLL/WXXD/WXOrderManage.cs +++ b/KJD_WebService/BLL/WXXD/WXOrderManage.cs @@ -49,7 +49,7 @@ namespace KJD_Web.BLL.WXXD string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString; MysqlUtils mySql = new MysqlUtils(conn); - string sql = "SELECT COUNT(id) FROM erp.oms_wei_order o WHERE 1=1 "; + string sql = "SELECT COUNT(*) FROM erp.oms_wei_order o WHERE 1=1 "; string where = ""; if (!string.IsNullOrWhiteSpace(erp_shop_id_in)) @@ -90,9 +90,9 @@ namespace KJD_Web.BLL.WXXD if (sort_type == "asc") //sql += " ORDER BY o.create_time ASC, o.id desc"; - sql += " ORDER BY o.create_time ASC"; + sql += " ORDER BY o.create_time ASC, o.id ASC"; else - sql += " ORDER BY o.create_time DESC"; + sql += " ORDER BY o.create_time DESC, o.id DESC"; sql += " LIMIT " + Math.Max(page - 1, 0) * page_size + "," + page_size; dt = mySql.ExecuteDataTable(sql); } diff --git a/KJD_WebService/UpdateService.asmx.cs b/KJD_WebService/UpdateService.asmx.cs index 61eb626..0169cae 100644 --- a/KJD_WebService/UpdateService.asmx.cs +++ b/KJD_WebService/UpdateService.asmx.cs @@ -5,6 +5,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Text; +using System.Threading.Tasks; using System.Web; using System.Web.Services; diff --git a/KJD_WebService/Web.config b/KJD_WebService/Web.config index 6463865..0dbffb7 100644 --- a/KJD_WebService/Web.config +++ b/KJD_WebService/Web.config @@ -8,7 +8,7 @@ - +