chfei/KJD_WebService
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/KJD2025/KJD_WebService

Browse Source
This commit is contained in:
chfei committed 2026-08-27 14:45:58 +08:00
2 parents c3f7528bd2 ab169a2b83
commit 3e80ac6ac0
4 files changed
+74 -25
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

KJD_WebService/BLL/KJD/UpdateManage.cs
+69 -21
View File
@@ -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;
}
}
}
KJD_WebService/BLL/WXXD/WXOrderManage.cs
+3 -3
View File
@@ -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);
}
KJD_WebService/UpdateService.asmx.cs
+1
View File
@@ -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;
KJD_WebService/Web.config
+1 -1
View File
@@ -8,7 +8,7 @@
<!--<add name="ConnKJD" connectionString="Max Pool Size=512;Database='kjd';Data Source='nj-cynosdbmysql-grp-hl51pkfr.sql.tencentcdb.com';Port=27660;User Id='kjd';Password='Temukjd0625';Charset=utf8mb4;"/>-->
<add name="ConnKJD" connectionString="Server=localhost;Port=3306;Database=mysql;Uid=root;Pwd=123456;"/>
<add name="ConnKJDBAK" connectionString="Max Pool Size=512;Database='kjd';Data Source='nj-cynosdbmysql-grp-9s7x16mt.sql.tencentcdb.com';Port=24049;User Id='kjdbak';Password='Temukjd0126';Charset=utf8mb4;"/>
<add name="UpdateVersion" connectionString="525"/>
<add name="UpdateVersion" connectionString="99999"/>
<add name="UpdateFileDir" connectionString="C:\inetpub\wwwroot\kjd_update"/>
<add name="UpdateNewUrl" connectionString="http://weidian.e57.cn/kjd_update/"/>
<add name="UpdateExe" connectionString="http://1.13.195.131:9000/Download/Update.exe"/>