From 6ed44f32c96a17fd10601a24c3c36ca1229bc89b Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期四, 17 七月 2025 17:18:12 +0800
Subject: [PATCH] 优化货位绑定图片链接保存逻辑，删除不使用的代码
---
api/ErpController.cs | 146 ++----------------------------------------------
1 files changed, 7 insertions(+), 139 deletions(-)
diff --git a/api/ErpController.cs b/api/ErpController.cs
index 88e60c0..02e92a1 100644
--- a/api/ErpController.cs
+++ b/api/ErpController.cs
@@ -23,13 +23,10 @@
[HttpPost]
[Route("InboundDataSync")]
public IHttpActionResult InboundDataSync(InboundDataSyncInfo model) {
- LogHelper.Info("瑙﹀彂API锛氬叆搴撴暟鎹悓姝� + JsonConvert.SerializeObject(model), "API");
+ LogHelper.Info("瑙﹀彂API锛欼nboundDataSync锛氬叆搴撴暟鎹悓姝� + JsonConvert.SerializeObject(model), "API");
- //var headers = Request.Headers;
- //return ProcessInboundData(headers, model); // 濡傛灉瑕佹眰瀵笻TTP鎶ユ枃瀛楁鏍￠獙锛屼娇鐢ㄨ繖琛屼唬鐮�-
- //return ApiHelper.InboundDataSync(model);
- return NormalProcessInboundData(model); // 鏆傛椂浣跨敤鍘熸湰鐨勯�杈�+ var res = ApiHelper.InboundDataSync(model);
+ return CreateSuccessResponse(res);
}
/// <summary>
@@ -40,99 +37,10 @@
[HttpPost]
[Route("OutboundDataSync")]
public IHttpActionResult OutboundDataSync(OutboundDataSyncInfo model) {
- LogHelper.Info("瑙﹀彂API锛氬嚭搴撳彂鏂欏悓姝� + JsonConvert.SerializeObject(model), "API");
-
- //var headers = Request.Headers;
- //return ProcessOutboundData(headers, model); // 濡傛灉瑕佹眰瀵笻TTP鎶ユ枃瀛楁鏍￠獙锛屼娇鐢ㄨ繖琛屼唬鐮�-
- //return ApiHelper.OutboundDataSync(model);
- return NormalProcessOutboundData(model); // 鏆傛椂浣跨敤鍘熸湰鐨勯�杈�- }
-
- private IHttpActionResult NormalProcessInboundData(InboundDataSyncInfo model) {
- var data = ApiHelper.InboundDataSync(model);
- return ResponseMessage(new HttpResponseMessage(HttpStatusCode.OK) {
- Headers = { },
- Content = new StringContent(JsonConvert.SerializeObject(data), Encoding.UTF8, "application/json")
- });
- }
-
- private IHttpActionResult NormalProcessOutboundData(OutboundDataSyncInfo model) {
- var data = ApiHelper.OutboundDataSync(model);
- return ResponseMessage(new HttpResponseMessage(HttpStatusCode.OK) {
- Headers = { },
- Content = new StringContent(JsonConvert.SerializeObject(data), Encoding.UTF8, "application/json")
- });
- }
-
- private IHttpActionResult ProcessInboundData(System.Net.Http.Headers.HttpRequestHeaders headers, InboundDataSyncInfo model) {
- // 蹇呴』瀛楁楠岃瘉
- if (!headers.Contains("sourceAppCode") || !headers.Contains("serviceId") || !headers.Contains("msgSendTime")) {
- return CreateErrorResponse("2003", "缂哄皯蹇呰璇锋眰澶村弬鏁�);
- }
-
- var headerModel = new {
- SourceAppCode = headers.GetValues("sourceAppCode").First(),
- Password = headers.Contains("password") ? headers.GetValues("password").First() : null,
- ServiceId = headers.GetValues("serviceId").First(),
- MsgToken = headers.Contains("msgToken") ? headers.GetValues("msgToken").First() : null,
- MsgSendTime = headers.GetValues("msgSendTime").First()
- };
-
- // 2. 楠岃瘉Header
- var validationResult = ValidateHeaders(headerModel);
- if (validationResult != null) {
- return validationResult;
- }
-
- // 3. 璇诲彇Body
- //string requestBody = await Request.Content.ReadAsStringAsync(); // 涓嶉渶瑕佸紓姝ヨ鍙栵紝鐩存帴鐢╩odel
-
- // 4. 楠岃瘉Body
- if (Request.Content.Headers.ContentLength > 2 * 1024 * 1024) {
- return CreateErrorResponse("2102", "娑堟伅鍐呭杩囬暱锛岃秴杩�M");
- }
-
- // 5. 澶勭悊涓氬姟閫昏緫
- var result = ApiHelper.InboundDataSync(model);
-
- // 6. 杩斿洖鎴愬姛鍝嶅簲
- return CreateSuccessResponse(result);
- }
-
- private IHttpActionResult ProcessOutboundData(System.Net.Http.Headers.HttpRequestHeaders headers, OutboundDataSyncInfo model) {
- // 蹇呴』瀛楁楠岃瘉
- if (!headers.Contains("sourceAppCode") || !headers.Contains("serviceId") || !headers.Contains("msgSendTime")) {
- return CreateErrorResponse("2003", "缂哄皯蹇呰璇锋眰澶村弬鏁�);
- }
-
- var headerModel = new {
- SourceAppCode = headers.GetValues("sourceAppCode").First(),
- Password = headers.Contains("password") ? headers.GetValues("password").First() : null,
- ServiceId = headers.GetValues("serviceId").First(),
- MsgToken = headers.Contains("msgToken") ? headers.GetValues("msgToken").First() : null,
- MsgSendTime = headers.GetValues("msgSendTime").First()
- };
-
- // 2. 楠岃瘉Header
- var validationResult = ValidateHeaders(headerModel);
- if (validationResult != null) {
- return validationResult;
- }
-
- // 3. 璇诲彇Body
- //string requestBody = await Request.Content.ReadAsStringAsync();
-
- // 4. 楠岃瘉Body
- if (Request.Content.Headers.ContentLength > 2 * 1024 * 1024) {
- return CreateErrorResponse("2102", "娑堟伅鍐呭杩囬暱锛岃秴杩�M");
- }
-
- // 5. 澶勭悊涓氬姟閫昏緫
- var result = ApiHelper.OutboundDataSync(model);
-
- // 6. 杩斿洖鎴愬姛鍝嶅簲
- return CreateSuccessResponse(result);
+ LogHelper.Info("瑙﹀彂API锛歄utboundDataSync锛氬嚭搴撳彂鏂欏悓姝� + JsonConvert.SerializeObject(model), "API");
+
+ var res = ApiHelper.OutboundDataSync(model);
+ return CreateSuccessResponse(res);
}
private IHttpActionResult CreateSuccessResponse(object data) {
@@ -140,46 +48,6 @@
Headers = { { "returnCode", "0" } },
Content = new StringContent(JsonConvert.SerializeObject(data), Encoding.UTF8, "application/json")
});
- }
-
- private IHttpActionResult CreateErrorResponse(string code, string message) {
- return ResponseMessage(new HttpResponseMessage(HttpStatusCode.OK) {
- Headers = { { "returnCode", code } },
- Content = new StringContent(message)
- });
- }
-
- private IHttpActionResult ValidateHeaders(dynamic headers) {
- // 瀹炵幇鎵�湁Header楠岃瘉閫昏緫
- if (!IsRegisteredApp(headers.SourceAppCode, headers.Password)) {
- return CreateErrorResponse("2201", "婧愯皟鐢ㄧ郴缁熸湭娉ㄥ唽");
- }
-
- if (!IsValidService(headers.ServiceId)) {
- return CreateErrorResponse("2202", "浠ｇ悊鏈嶅姟鏈敞鍐�);
- }
-
- if (!IsValidDateTime(headers.MsgSendTime)) {
- return CreateErrorResponse("2101", "鏃堕棿鏍煎紡鏍￠獙澶辫触");
- }
-
- if (!string.IsNullOrEmpty(headers.MsgToken) && headers.MsgToken.Length > 32) {
- return CreateErrorResponse("2104", "娑堟伅浠ょ墝杩囬暱锛岃秴杩�2浣�);
- }
-
- return null;
- }
-
- private bool IsRegisteredApp(string appId, string password) {
- return true;
- }
-
- private bool IsValidService(string serviceId) {
- return true;
- }
-
- private bool IsValidDateTime(string dataTime) {
- return true;
}
}
}
\ No newline at end of file
--
Gitblit v1.9.1