From 733c975cd8647f6d006736f1863bad731e32e6fb Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期日, 26 十月 2025 17:15:52 +0800
Subject: [PATCH] 上传最新代码，ERP接口，MES接口优化，WMS业务优化等
---
项目代码/WMS/WMSServices/WIDESEA_Core/Helper/HttpMesHelper.cs | 47 +++++------------------------------------------
1 files changed, 5 insertions(+), 42 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_Core/Helper/HttpMesHelper.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_Core/Helper/HttpMesHelper.cs"
index 1bfabba..315c02e 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_Core/Helper/HttpMesHelper.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_Core/Helper/HttpMesHelper.cs"
@@ -11,7 +11,7 @@
{
public class HttpMesHelper
{
- public static string Post(string serviceAddress, string requestJson = null, string contentType = "application/json", Dictionary<string, string>? headers = null)
+ public static string Post(string serviceAddress, string requestJson = "", string contentType = "application/json", Dictionary<string, string>? headers = null)
{
string result = string.Empty;
DateTime beginDate = DateTime.Now;
@@ -22,20 +22,14 @@
httpContent.Headers.ContentType = new MediaTypeHeaderValue("application/json");
using HttpClient httpClient = new HttpClient();
- httpClient.Timeout = new TimeSpan(0, 0, 60);
- //姝ｅ紡
- string authorization = "AppKey 1830415116987195392";
- //娴嬭瘯
- //string authorization = "AppKey 1773317109539201024";
-
-
+ httpClient.Timeout = new TimeSpan(0, 0, 30);
+ string LoginToken = AppSettings.Get("MESLoginToken");
headers = new Dictionary<string, string>
{
- { "Authorization", authorization },
//姝ｅ紡
- { "Site_tenant_id", "0dc2d164-8a62-417e-8a00-808007464feb" }
+ { "LoginToken", LoginToken }
//娴嬭瘯
- //{ "Site_tenant_id", "ced19269-2b83-4577-be43-8cc2f700251e" }
+ //{ "LoginToken", "Z6_BusModel_LLD:5_92e848cf-b0b8-4f7e-9ac4-41e015c1fca3" }
};
if (headers != null)
{
@@ -55,37 +49,6 @@
{
Logger.Add(serviceAddress, requestJson == null ? "" : requestJson, result, beginDate);
}
- }
- public static string GetStr(string textToEncrypt)
- {
- string publicKey;
- string privateKey;
- GenerateRSAKeyPair(out publicKey, out privateKey);
- byte[] encryptedBytes = RSAEncrypt(textToEncrypt, publicKey);
- // 鍙互灏嗗姞瀵嗗悗鐨勫瓧鑺傛暟缁勮浆鎹负Base64瀛楃涓叉柟渚垮悗缁鐞嗭紝渚嬪浼犺緭绛�
- string encryptedBase64 = Convert.ToBase64String(encryptedBytes);
- return encryptedBase64;
- }
- public static void GenerateRSAKeyPair(out string publicKey, out string privateKey)
- {
- using (RSACryptoServiceProvider rsa = new RSACryptoServiceProvider(2048))
- {
- publicKey = rsa.ToXmlString(false);
- privateKey = rsa.ToXmlString(true);
- }
- }
- public static byte[] RSAEncrypt(string plainText, string publicKey)
- {
- byte[] encryptedData;
- using (RSACryptoServiceProvider rsa = new RSACryptoServiceProvider())
- {
- rsa.FromXmlString(publicKey);
- // 灏嗘枃鏈浆鎹负UTF8缂栫爜鐨勫瓧鑺傛暟缁�
- byte[] plainBytes = Encoding.UTF8.GetBytes(plainText);
- // 浣跨敤SHA1鍝堝笇绠楁硶浠ュ強Pkcs1濉厖瑙勫垯杩涜鍔犲瘑
- encryptedData = rsa.Encrypt(plainBytes, true);
- }
- return encryptedData;
}
}
}
--
Gitblit v1.9.3