From c4388584605e6bcceb21ce0e3618928a9b921d7f Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Tue, 8 Nov 2022 13:00:22 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E6=97=A5=E5=BF=97=E7=94=B1NL?=
=?UTF-8?q?ogManager=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Controllers/VenderController.cs | 12 +++++------
.../Middlewares/CustomExceptionMiddleWare.cs | 12 +++++++----
.../AfterSaleOrder/AfterSaleOrderBusiness.cs | 2 +-
BBWY.Server.Business/BaseBusiness.cs | 6 +++---
.../FinancialTerminalBusiness.cs | 2 +-
.../PlatformSDK/JDBusiness.cs | 20 +++++++++----------
.../PlatformSDK/PDDBusiness.cs | 2 +-
.../PlatformSDK/PlatformSDKBusiness.cs | 6 +++---
.../PlatformSDK/TaoBaoBusiness.cs | 2 +-
.../PlatformSDK/_1688Business.cs | 12 +++++------
.../PurchaseOrder/PurchaseOrderBusiness.cs | 14 ++++++-------
.../PurchaseScheme/PurchaseSchemeBusiness.cs | 2 +-
.../JDReportFormStatisticsBusiness.cs | 2 +-
.../Statistics/StatisticsBusiness.cs | 2 +-
.../Sync/AfterSaleOrderSyncBusiness.cs | 10 ++++------
BBWY.Server.Business/Sync/BaseSyncBusiness.cs | 5 +----
...arizeReportFormAdGroupLevelSyncBusiness.cs | 2 --
...PopularizeReportFormAdLevelSyncBusiness.cs | 2 --
...rizeReportFormCampaignLevelSyncBusiness.cs | 2 --
...ularizeReportFormOrderLevelSyncBusiness.cs | 6 ++----
...opularizeReportFormSkuLevelSyncBusiness.cs | 6 ++----
.../Sync/JD/JDPopularizeSyncBusiness.cs | 8 +++-----
.../Sync/OrderSyncBusiness.cs | 8 +++-----
.../Sync/ProductSyncBusiness.cs | 4 +---
.../Sync/RefundOrderSyncBusiness.cs | 4 ++--
BBWY.Server.Business/Vender/VenderBusiness.cs | 7 ++++---
.../Dto/Request/Vender/JDShopToken.cs | 6 +++---
.../Middlewares/CustomExceptionMiddleWare.cs | 1 +
JD.API/NLog.config | 14 +++++++++++++
JD.API/Startup.cs | 4 +++-
30 files changed, 93 insertions(+), 92 deletions(-)
create mode 100644 JD.API/NLog.config
diff --git a/BBWY.Server.API/Controllers/VenderController.cs b/BBWY.Server.API/Controllers/VenderController.cs
index d2a0c728..0b7f7ba5 100644
--- a/BBWY.Server.API/Controllers/VenderController.cs
+++ b/BBWY.Server.API/Controllers/VenderController.cs
@@ -16,14 +16,14 @@ namespace BBWY.Server.API.Controllers
public class VenderController : BaseApiController
{
private VenderBusiness venderBusiness;
- private ILogger logger;
+ private NLogManager nLogManager;
public VenderController(IHttpContextAccessor httpContextAccessor,
VenderBusiness venderBusiness,
- ILogger logger) : base(httpContextAccessor)
+ NLogManager nLogManager) : base(httpContextAccessor)
{
this.venderBusiness = venderBusiness;
- this.logger = logger;
+ this.nLogManager = nLogManager;
}
///
@@ -64,15 +64,15 @@ namespace BBWY.Server.API.Controllers
///
///
[HttpPost]
- public void AcceptJDShopToken([FromBody] JDShopToken jDShopToken)
+ public string AcceptJDShopToken([FromBody] JDShopToken jDShopToken)
{
var httpContext = httpContextAccessor.HttpContext;
var stringBuilder = new StringBuilder();
stringBuilder.AppendLine("AcceptJDShopToken");
stringBuilder.AppendLine($"ContentType:{httpContext.Request.ContentType}");
stringBuilder.Append($"jDShopToken:{JsonConvert.SerializeObject(jDShopToken)}");
- logger.Info(stringBuilder.ToString());
- venderBusiness.AcceptJDShopToken(jDShopToken);
+ nLogManager.Default().Info(stringBuilder.ToString());
+ return venderBusiness.AcceptJDShopToken(jDShopToken);
}
///
diff --git a/BBWY.Server.API/Middlewares/CustomExceptionMiddleWare.cs b/BBWY.Server.API/Middlewares/CustomExceptionMiddleWare.cs
index 30d9d46f..ceb24a6d 100644
--- a/BBWY.Server.API/Middlewares/CustomExceptionMiddleWare.cs
+++ b/BBWY.Server.API/Middlewares/CustomExceptionMiddleWare.cs
@@ -1,4 +1,5 @@
using BBWY.Common.Models;
+using BBWY.Server.Business;
using Microsoft.AspNetCore.Http;
using Newtonsoft.Json;
using NLog;
@@ -21,12 +22,14 @@ namespace BBWY.Server.API.Middlewares
///
private IDictionary _exceptionStatusCodeDic;
- private ILogger logger;
+ //private NLogManager nLogManager;
- public CustomExceptionMiddleWare(RequestDelegate next, ILogger logger)
+ private NLogManager nLogManager;
+
+ public CustomExceptionMiddleWare(RequestDelegate next, NLogManager nLogManager)
{
_next = next;
- this.logger = logger;
+ //this.logger = logger;
_exceptionStatusCodeDic = new Dictionary
{
{ 401, "未授权的请求" },
@@ -56,7 +59,8 @@ namespace BBWY.Server.API.Middlewares
{
context.Response.Clear();
context.Response.StatusCode = 500; //发生未捕获的异常,手动设置状态码
- logger.Error(ex); //记录错误
+ //logger.Error(ex); //记录错误
+ nLogManager.Default().Error(ex);
}
}
finally
diff --git a/BBWY.Server.Business/AfterSaleOrder/AfterSaleOrderBusiness.cs b/BBWY.Server.Business/AfterSaleOrder/AfterSaleOrderBusiness.cs
index 8250a295..fec6bfc0 100644
--- a/BBWY.Server.Business/AfterSaleOrder/AfterSaleOrderBusiness.cs
+++ b/BBWY.Server.Business/AfterSaleOrder/AfterSaleOrderBusiness.cs
@@ -11,7 +11,7 @@ namespace BBWY.Server.Business
{
public class AfterSaleOrderBusiness : BaseBusiness, IDenpendency
{
- public AfterSaleOrderBusiness(IFreeSql fsql, NLog.ILogger logger, IIdGenerator idGenerator) : base(fsql, logger, idGenerator)
+ public AfterSaleOrderBusiness(IFreeSql fsql, NLogManager nLogManager, IIdGenerator idGenerator) : base(fsql, nLogManager, idGenerator)
{
}
diff --git a/BBWY.Server.Business/BaseBusiness.cs b/BBWY.Server.Business/BaseBusiness.cs
index 38e1a7f1..eef7520d 100644
--- a/BBWY.Server.Business/BaseBusiness.cs
+++ b/BBWY.Server.Business/BaseBusiness.cs
@@ -4,13 +4,13 @@ namespace BBWY.Server.Business
public class BaseBusiness
{
protected IFreeSql fsql;
- protected NLog.ILogger logger;
+ protected NLogManager nLogManager;
protected IIdGenerator idGenerator;
- public BaseBusiness(IFreeSql fsql, NLog.ILogger logger, IIdGenerator idGenerator)
+ public BaseBusiness(IFreeSql fsql, NLogManager nLogManager, IIdGenerator idGenerator)
{
this.fsql = fsql;
- this.logger = logger;
+ this.nLogManager = nLogManager;
this.idGenerator = idGenerator;
}
}
diff --git a/BBWY.Server.Business/FinancialTerminal/FinancialTerminalBusiness.cs b/BBWY.Server.Business/FinancialTerminal/FinancialTerminalBusiness.cs
index 3b27b775..ec5fefce 100644
--- a/BBWY.Server.Business/FinancialTerminal/FinancialTerminalBusiness.cs
+++ b/BBWY.Server.Business/FinancialTerminal/FinancialTerminalBusiness.cs
@@ -9,7 +9,7 @@ namespace BBWY.Server.Business
{
public class FinancialTerminalBusiness : BaseBusiness, IDenpendency
{
- public FinancialTerminalBusiness(IFreeSql fsql, NLog.ILogger logger, IIdGenerator idGenerator) : base(fsql, logger, idGenerator)
+ public FinancialTerminalBusiness(IFreeSql fsql, NLogManager nLogManager, IIdGenerator idGenerator) : base(fsql, nLogManager, idGenerator)
{
}
diff --git a/BBWY.Server.Business/PlatformSDK/JDBusiness.cs b/BBWY.Server.Business/PlatformSDK/JDBusiness.cs
index d3fccf42..e75ac760 100644
--- a/BBWY.Server.Business/PlatformSDK/JDBusiness.cs
+++ b/BBWY.Server.Business/PlatformSDK/JDBusiness.cs
@@ -34,7 +34,7 @@ namespace BBWY.Server.Business
};
- public JDBusiness(IMemoryCache memoryCache, ILogger logger) : base(memoryCache, logger) { }
+ public JDBusiness(IMemoryCache memoryCache, NLogManager nLogManager) : base(memoryCache, nLogManager) { }
private IJdClient GetJdClient(string appKey, string appSecret)
{
@@ -58,9 +58,9 @@ namespace BBWY.Server.Business
if (venderJDResponse.IsError)
throw new BusinessException(string.IsNullOrEmpty(venderJDResponse.ErrorMsg) ? venderJDResponse.ErrMsg : venderJDResponse.ErrorMsg);
- logger.Info($"shopJDResponse\r\n{shopJDResponse.Body}\r\n shopJDResponse Json is null {shopJDResponse.Json == null}");
+ nLogManager.Default().Info($"shopJDResponse\r\n{shopJDResponse.Body}\r\n shopJDResponse Json is null {shopJDResponse.Json == null}");
- logger.Info($"venderJDResponse\r\n{venderJDResponse.Body}\r\n venderJDResponse Json is null {venderJDResponse.Json == null}");
+ nLogManager.Default().Info($"venderJDResponse\r\n{venderJDResponse.Body}\r\n venderJDResponse Json is null {venderJDResponse.Json == null}");
var v = new VenderResponse();
v.VenderId = venderJDResponse.Json["jingdong_seller_vender_info_get_responce"]["vender_info_result"].Value("vender_id");
@@ -208,7 +208,7 @@ namespace BBWY.Server.Business
var fbpResponse = jdClient.Execute(fbpReq, searchOrderRequest.AppToken, DateTime.Now.ToLocalTime());
if (searchOrderRequest.SaveResponseLog)
- logger.Info($"fbpResponse\r\n{JsonConvert.SerializeObject(fbpResponse)}");
+ nLogManager.Default().Info($"fbpResponse\r\n{JsonConvert.SerializeObject(fbpResponse)}");
if (fbpResponse.IsError)
throw new BusinessException($"获取FBP订单失败 {(string.IsNullOrEmpty(fbpResponse.ErrorMsg) ? fbpResponse.ErrMsg : fbpResponse.ErrorMsg)}");
@@ -244,7 +244,7 @@ namespace BBWY.Server.Business
var sopResponse = jdClient.Execute(sopReq, searchOrderRequest.AppToken, DateTime.Now.ToLocalTime());
if (searchOrderRequest.SaveResponseLog)
- logger.Info($"sopRequest\r\n{JsonConvert.SerializeObject(searchOrderRequest)} \r\nsopResponse\r\n{JsonConvert.SerializeObject(sopResponse)}");
+ nLogManager.Default().Info($"sopRequest\r\n{JsonConvert.SerializeObject(searchOrderRequest)} \r\nsopResponse\r\n{JsonConvert.SerializeObject(sopResponse)}");
if (sopResponse.IsError)
throw new BusinessException($"获取SOP订单失败 {(string.IsNullOrEmpty(sopResponse.ErrorMsg) ? sopResponse.ErrMsg : sopResponse.ErrorMsg)}");
@@ -265,7 +265,7 @@ namespace BBWY.Server.Business
if (jdResponse.IsError)
throw new BusinessException(jdResponse.ErrorMsg);
if (searchOrderRequest.SaveResponseLog)
- logger.Info($"jdResponse\r\n{JsonConvert.SerializeObject(jdResponse)}");
+ nLogManager.Default().Info($"jdResponse\r\n{JsonConvert.SerializeObject(jdResponse)}");
if (jdResponse.IsError)
throw new BusinessException($"获取单订单失败 {(string.IsNullOrEmpty(jdResponse.ErrorMsg) ? jdResponse.ErrMsg : jdResponse.ErrorMsg)}");
@@ -356,7 +356,7 @@ namespace BBWY.Server.Business
if (response.Json == null)
response.Json = JObject.Parse(response.Body);
if (platformRequest.SaveResponseLog)
- logger.Info(response.Body);
+ nLogManager.Default().Info(response.Body);
var jarray = (JArray)(response.Json["jingdong_fce_alpha_getVenderCarrier_responce"]["StandardGenericResponse"]["result"]["carrierList"]);
@@ -379,7 +379,7 @@ namespace BBWY.Server.Business
var response = jdClient.Execute(req, outStockRequest.AppToken, DateTime.Now.ToLocalTime());
if (outStockRequest.SaveResponseLog)
- logger.Info($"出库发货 Request:{JsonConvert.SerializeObject(outStockRequest)} Response:{JsonConvert.SerializeObject(response)}");
+ nLogManager.Default().Info($"出库发货 Request:{JsonConvert.SerializeObject(outStockRequest)} Response:{JsonConvert.SerializeObject(response)}");
if (response.IsError)
throw new BusinessException($"{response.RealErrorMsg}");
@@ -414,7 +414,7 @@ namespace BBWY.Server.Business
var response = jdClient.Execute(req, searchRefundPlatformOrderRequest.AppToken, DateTime.Now.ToLocalTime());
if (searchRefundPlatformOrderRequest.SaveResponseLog)
- logger.Info($"获取退款订单 Request:{JsonConvert.SerializeObject(searchRefundPlatformOrderRequest)} Response:{JsonConvert.SerializeObject(response)}");
+ nLogManager.Default().Info($"获取退款订单 Request:{JsonConvert.SerializeObject(searchRefundPlatformOrderRequest)} Response:{JsonConvert.SerializeObject(response)}");
if (response.IsError)
throw new BusinessException($"获取退款订单失败 {(string.IsNullOrEmpty(response.ErrorMsg) ? response.ErrMsg : response.ErrorMsg)}");
@@ -459,7 +459,7 @@ namespace BBWY.Server.Business
PopOrderNotPayOrderByIdResponse response = jdClient.Execute(req, searchOrderRequest.AppToken, DateTime.Now.ToLocalTime());
- logger.Info(response);
+ nLogManager.Default().Info(response);
if (response.IsError)
throw new BusinessException($"获取未付款订单失败,{(string.IsNullOrEmpty(response.ErrorMsg) ? response.ErrMsg : response.ErrorMsg)}");
diff --git a/BBWY.Server.Business/PlatformSDK/PDDBusiness.cs b/BBWY.Server.Business/PlatformSDK/PDDBusiness.cs
index e2e26e5d..9566af0e 100644
--- a/BBWY.Server.Business/PlatformSDK/PDDBusiness.cs
+++ b/BBWY.Server.Business/PlatformSDK/PDDBusiness.cs
@@ -10,7 +10,7 @@ namespace BBWY.Server.Business
public class PDDBusiness : PlatformSDKBusiness
{
public override Enums.Platform Platform => Enums.Platform.拼多多;
- public PDDBusiness(IMemoryCache memoryCache, ILogger logger) : base(memoryCache, logger)
+ public PDDBusiness(IMemoryCache memoryCache, NLogManager nLogManager) : base(memoryCache, nLogManager)
{
}
}
diff --git a/BBWY.Server.Business/PlatformSDK/PlatformSDKBusiness.cs b/BBWY.Server.Business/PlatformSDK/PlatformSDKBusiness.cs
index 0ea9baec..ea8134e4 100644
--- a/BBWY.Server.Business/PlatformSDK/PlatformSDKBusiness.cs
+++ b/BBWY.Server.Business/PlatformSDK/PlatformSDKBusiness.cs
@@ -19,12 +19,12 @@ namespace BBWY.Server.Business
///
public virtual Enums.Platform Platform { get; }
- protected ILogger logger;
+ protected NLogManager nLogManager;
- public PlatformSDKBusiness(IMemoryCache memoryCache, ILogger logger)
+ public PlatformSDKBusiness(IMemoryCache memoryCache, NLogManager nLogManager)
{
this.memoryCache = memoryCache;
- this.logger = logger;
+ this.nLogManager = nLogManager;
this.expirationTimeSpan = TimeSpan.FromMinutes(60);
}
diff --git a/BBWY.Server.Business/PlatformSDK/TaoBaoBusiness.cs b/BBWY.Server.Business/PlatformSDK/TaoBaoBusiness.cs
index b5873afb..ce486ade 100644
--- a/BBWY.Server.Business/PlatformSDK/TaoBaoBusiness.cs
+++ b/BBWY.Server.Business/PlatformSDK/TaoBaoBusiness.cs
@@ -9,7 +9,7 @@ namespace BBWY.Server.Business
{
public class TaoBaoBusiness : PlatformSDKBusiness
{
- public TaoBaoBusiness(IMemoryCache memoryCache, ILogger logger) : base(memoryCache, logger)
+ public TaoBaoBusiness(IMemoryCache memoryCache, NLogManager nLogManager) : base(memoryCache, nLogManager)
{
}
diff --git a/BBWY.Server.Business/PlatformSDK/_1688Business.cs b/BBWY.Server.Business/PlatformSDK/_1688Business.cs
index d0db87ee..1ac4e600 100644
--- a/BBWY.Server.Business/PlatformSDK/_1688Business.cs
+++ b/BBWY.Server.Business/PlatformSDK/_1688Business.cs
@@ -23,7 +23,7 @@ namespace BBWY.Server.Business
private RestApiService restApiService;
private _1688TradeTypeCompare _1688TradeTypeCompare;
- public _1688Business(IMemoryCache memoryCache, ILogger logger, RestApiService restApiService) : base(memoryCache, logger)
+ public _1688Business(IMemoryCache memoryCache, NLogManager nLogManager, RestApiService restApiService) : base(memoryCache, nLogManager)
{
this.restApiService = restApiService;
_1688TradeTypeCompare = new _1688TradeTypeCompare();
@@ -66,7 +66,7 @@ namespace BBWY.Server.Business
throw new BusinessException(result.Value("errorMessage")) { Code = 0 };
- logger.Info($"GetWayBillNoByOrderId QueryOrderWayBillNoRequest {JsonConvert.SerializeObject(queryOrderWayBillNoRequest)} Result {result}");
+ nLogManager.Default().Info($"GetWayBillNoByOrderId QueryOrderWayBillNoRequest {JsonConvert.SerializeObject(queryOrderWayBillNoRequest)} Result {result}");
var firstJToken = result["result"].FirstOrDefault();
return new WayBillNoResponse()
@@ -130,7 +130,7 @@ namespace BBWY.Server.Business
if (result.Value("success") != true)
throw new BusinessException(result.Value("errorMsg")) { Code = 0 };
- logger.Info($"PreviewOrder Request:{JsonConvert.SerializeObject(previewOrderReuqest)} Response:{result}");
+ nLogManager.Default().Info($"PreviewOrder Request:{JsonConvert.SerializeObject(previewOrderReuqest)} Response:{result}");
var orderPreviewResuslt = (JArray)result["orderPreviewResuslt"];
List intersectTradeModeList = new List();
@@ -215,7 +215,7 @@ namespace BBWY.Server.Business
if (result.Value("success") != true)
{
var ex = new BusinessException(result.ToString()) { Code = 0 };
- logger.Error(ex, $"下单失败 订单Id{createOnlinePurchaseOrderRequest.OrderId}\r\n请求参数{JsonConvert.SerializeObject(createOnlinePurchaseOrderRequest)}\r\n1688返回{result}");
+ nLogManager.Default().Error(ex, $"下单失败 订单Id{createOnlinePurchaseOrderRequest.OrderId}\r\n请求参数{JsonConvert.SerializeObject(createOnlinePurchaseOrderRequest)}\r\n1688返回{result}");
throw ex;
}
@@ -231,7 +231,7 @@ namespace BBWY.Server.Business
foreach (var failedOfferJToken in failedOfferJArray)
failOrderStringBuilder.AppendLine(failedOfferJToken.ToString());
var ex = new Exception(failOrderStringBuilder.ToString());
- logger.Error(ex, $"下单部分商品失败 采购单Id{purchaseOrderId} 请求参数{JsonConvert.SerializeObject(createOnlinePurchaseOrderRequest)}");
+ nLogManager.Default().Error(ex, $"下单部分商品失败 采购单Id{purchaseOrderId} 请求参数{JsonConvert.SerializeObject(createOnlinePurchaseOrderRequest)}");
}
return new CreateOnlinePurchaseOrderResponse()
@@ -280,7 +280,7 @@ namespace BBWY.Server.Business
request.AccessToken = getOrderInfoRequest.AppToken;
var result = client.NewRequest(request, reqPolicy);
if (getOrderInfoRequest.SaveResponseLog)
- logger.Info(result.ToString());
+ nLogManager.Default().Info(result.ToString());
if (result.Value("success") != true)
throw new BusinessException(result.Value("errorMessage")) { Code = 0 };
diff --git a/BBWY.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs b/BBWY.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs
index c3cadae3..1aabcfd4 100644
--- a/BBWY.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs
+++ b/BBWY.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs
@@ -29,14 +29,14 @@ namespace BBWY.Server.Business
//private IDictionary deliverySelfDic;
public PurchaseOrderBusiness(IFreeSql fsql,
- NLog.ILogger logger,
+ NLogManager nLogManager,
IIdGenerator idGenerator,
IEnumerable platformSDKBusinessList,
TaskSchedulerManager taskSchedulerManager,
OrderBusiness orderBusiness,
MDSBusiness mdsBusiness,
VenderBusiness venderBusiness,
- LogisticsCompanyConverter logisticsCompanyConverter) : base(fsql, logger, idGenerator)
+ LogisticsCompanyConverter logisticsCompanyConverter) : base(fsql, nLogManager, idGenerator)
{
this.platformSDKBusinessList = platformSDKBusinessList;
this.taskSchedulerManager = taskSchedulerManager;
@@ -180,7 +180,7 @@ namespace BBWY.Server.Business
Platform = createOnlinePurchaseOrderRequest.Platform
});
- logger.Info($"NewFastCreateOrder\r\ncreateOnlinePurchaseOrderRequest\r\n{JsonConvert.SerializeObject(createOnlinePurchaseOrderRequest)}\r\npurchaseOrderSimpleInfo\r\n{JsonConvert.SerializeObject(purchaseOrderSimpleInfo)}");
+ nLogManager.Default().Info($"NewFastCreateOrder\r\ncreateOnlinePurchaseOrderRequest\r\n{JsonConvert.SerializeObject(createOnlinePurchaseOrderRequest)}\r\npurchaseOrderSimpleInfo\r\n{JsonConvert.SerializeObject(purchaseOrderSimpleInfo)}");
List insertPurchaseOrders = new List();
List insertPurchaseOrderDetails = new List();
@@ -367,7 +367,7 @@ namespace BBWY.Server.Business
#region 1688CallBack
public void CallbackFrom1688(string jsonStr)
{
- logger.Info(jsonStr);
+ nLogManager.Default().Info(jsonStr);
var jObject = JObject.Parse(jsonStr);
var type = jObject.Value("type").ToUpper();
switch (type)
@@ -507,11 +507,11 @@ namespace BBWY.Server.Business
orderBusiness.OutStock(outStockRequest);
#endregion
- logger.Info($"DeliveryCallback 回调平台{callbackPlatform},订单号{orderId},采购单号{purchaseOrderId},执行进度[{currentProgress}],采购单物流信息:{wayBillNoResponseInfo},店铺平台物流公司列表:{logisticsCompanyListInfo},翻译后的物流公司Id:{logisticsCompanyId},出库请求:{(outStockRequest != null ? JsonConvert.SerializeObject(outStockRequest) : null)}");
+ nLogManager.Default().Info($"DeliveryCallback 回调平台{callbackPlatform},订单号{orderId},采购单号{purchaseOrderId},执行进度[{currentProgress}],采购单物流信息:{wayBillNoResponseInfo},店铺平台物流公司列表:{logisticsCompanyListInfo},翻译后的物流公司Id:{logisticsCompanyId},出库请求:{(outStockRequest != null ? JsonConvert.SerializeObject(outStockRequest) : null)}");
}
catch (Exception ex)
{
- logger.Error(ex, $"DeliveryCallback 回调平台{callbackPlatform},订单号{orderId},采购单号{purchaseOrderId},执行进度[{currentProgress}],采购单物流信息:{wayBillNoResponseInfo},店铺平台物流公司列表:{logisticsCompanyListInfo},翻译后的物流公司Id:{logisticsCompanyId},出库请求:{(outStockRequest != null ? JsonConvert.SerializeObject(outStockRequest) : null)}");
+ nLogManager.Default().Error(ex, $"DeliveryCallback 回调平台{callbackPlatform},订单号{orderId},采购单号{purchaseOrderId},执行进度[{currentProgress}],采购单物流信息:{wayBillNoResponseInfo},店铺平台物流公司列表:{logisticsCompanyListInfo},翻译后的物流公司Id:{logisticsCompanyId},出库请求:{(outStockRequest != null ? JsonConvert.SerializeObject(outStockRequest) : null)}");
}
}
@@ -673,7 +673,7 @@ namespace BBWY.Server.Business
}
catch (Exception ex)
{
- logger.Error(ex, $"OrderPriceModificationCallback 回调平台{callbackPlatform},采购单号{purchaseOrderId},执行进度[{currentProgress}]");
+ nLogManager.Default().Error(ex, $"OrderPriceModificationCallback 回调平台{callbackPlatform},采购单号{purchaseOrderId},执行进度[{currentProgress}]");
}
}
#endregion
diff --git a/BBWY.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs b/BBWY.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs
index fb76ea91..8534b2cf 100644
--- a/BBWY.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs
+++ b/BBWY.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs
@@ -11,7 +11,7 @@ namespace BBWY.Server.Business
{
public class PurchaseSchemeBusiness : BaseBusiness, IDenpendency
{
- public PurchaseSchemeBusiness(IFreeSql fsql, NLog.ILogger logger, IIdGenerator idGenerator) : base(fsql, logger, idGenerator) { }
+ public PurchaseSchemeBusiness(IFreeSql fsql, NLogManager nLogManager, IIdGenerator idGenerator) : base(fsql, nLogManager, idGenerator) { }
private void ExtractNewPurchaser(IList purchaserSchemeList, IList addPurchaserList) where T : InputPurchaseSchemeRequest
{
diff --git a/BBWY.Server.Business/Statistics/JDReportFormStatisticsBusiness.cs b/BBWY.Server.Business/Statistics/JDReportFormStatisticsBusiness.cs
index 20389d8f..ee83113b 100644
--- a/BBWY.Server.Business/Statistics/JDReportFormStatisticsBusiness.cs
+++ b/BBWY.Server.Business/Statistics/JDReportFormStatisticsBusiness.cs
@@ -11,7 +11,7 @@ namespace BBWY.Server.Business.Statistics
{
public class JDReportFormStatisticsBusiness : BaseBusiness, IDenpendency
{
- public JDReportFormStatisticsBusiness(IFreeSql fsql, NLog.ILogger logger, IIdGenerator idGenerator) : base(fsql, logger, idGenerator)
+ public JDReportFormStatisticsBusiness(IFreeSql fsql, NLogManager nLogManager, IIdGenerator idGenerator) : base(fsql, nLogManager, idGenerator)
{
}
diff --git a/BBWY.Server.Business/Statistics/StatisticsBusiness.cs b/BBWY.Server.Business/Statistics/StatisticsBusiness.cs
index e12642dc..23de2942 100644
--- a/BBWY.Server.Business/Statistics/StatisticsBusiness.cs
+++ b/BBWY.Server.Business/Statistics/StatisticsBusiness.cs
@@ -16,7 +16,7 @@ namespace BBWY.Server.Business
private IList invalidOrderStateList;
private FreeSqlMultiDBManager freeSqlMultiDBManager;
- public StatisticsBusiness(IFreeSql fsql, NLog.ILogger logger, IIdGenerator idGenerator, FreeSqlMultiDBManager freeSqlMultiDBManager) : base(fsql, logger, idGenerator)
+ public StatisticsBusiness(IFreeSql fsql, NLogManager nLogManager, IIdGenerator idGenerator, FreeSqlMultiDBManager freeSqlMultiDBManager) : base(fsql, nLogManager, idGenerator)
{
invalidOrderStateList = new List() { Enums.OrderState.待付款, Enums.OrderState.已取消 };
this.freeSqlMultiDBManager = freeSqlMultiDBManager;
diff --git a/BBWY.Server.Business/Sync/AfterSaleOrderSyncBusiness.cs b/BBWY.Server.Business/Sync/AfterSaleOrderSyncBusiness.cs
index f3e27d91..c9ac367e 100644
--- a/BBWY.Server.Business/Sync/AfterSaleOrderSyncBusiness.cs
+++ b/BBWY.Server.Business/Sync/AfterSaleOrderSyncBusiness.cs
@@ -27,15 +27,13 @@ namespace BBWY.Server.Business
public AfterSaleOrderSyncBusiness(RestApiService restApiService,
IOptions options,
- ILogger logger,
+ NLogManager nLogManager,
IFreeSql fsql,
- NLogManager logManager,
IIdGenerator idGenerator,
TaskSchedulerManager taskSchedulerManager,
VenderBusiness venderBusiness, YunDingBusiness yunDingBusiness) : base(restApiService,
options,
- logger,
- logManager,
+ nLogManager,
fsql,
idGenerator,
taskSchedulerManager,
@@ -98,7 +96,7 @@ namespace BBWY.Server.Business
}
catch (Exception ex)
{
- logger.Error(ex, $"SyncAfterOrder-SyncRefound ServiceId:{serviceId} OrderId:{orderId} ShopData:{JsonConvert.SerializeObject(shop)}");
+ nLogManager.Default().Error(ex, $"SyncAfterOrder-SyncRefound ServiceId:{serviceId} OrderId:{orderId} ShopData:{JsonConvert.SerializeObject(shop)}");
}
@@ -186,7 +184,7 @@ namespace BBWY.Server.Business
catch (Exception ex)
{
var shopData = JsonConvert.SerializeObject(shop);
- logger.Error(ex, $"SyncAfterOrder ShopData:{shopData}");
+ nLogManager.Default().Error(ex, $"SyncAfterOrder ShopData:{shopData}");
}
}
diff --git a/BBWY.Server.Business/Sync/BaseSyncBusiness.cs b/BBWY.Server.Business/Sync/BaseSyncBusiness.cs
index 7dfd8e44..6d729648 100644
--- a/BBWY.Server.Business/Sync/BaseSyncBusiness.cs
+++ b/BBWY.Server.Business/Sync/BaseSyncBusiness.cs
@@ -9,16 +9,14 @@ namespace BBWY.Server.Business
{
public class BaseSyncBusiness : BasePlatformRelayBusiness, IDenpendency
{
- protected ILogger logger;
+ protected NLogManager nLogManager;
protected IFreeSql fsql;
protected IIdGenerator idGenerator;
protected TaskSchedulerManager taskSchedulerManager;
protected VenderBusiness venderBusiness;
- protected NLogManager nLogManager;
public BaseSyncBusiness(RestApiService restApiService,
IOptions options,
- ILogger logger,
NLogManager nLogManager,
IFreeSql fsql,
IIdGenerator idGenerator,
@@ -26,7 +24,6 @@ namespace BBWY.Server.Business
VenderBusiness venderBusiness,
YunDingBusiness yunDingBusiness) : base(restApiService, options, yunDingBusiness)
{
- this.logger = logger;
this.nLogManager = nLogManager;
this.fsql = fsql;
this.idGenerator = idGenerator;
diff --git a/BBWY.Server.Business/Sync/JD/JDPopularizeReportFormAdGroupLevelSyncBusiness.cs b/BBWY.Server.Business/Sync/JD/JDPopularizeReportFormAdGroupLevelSyncBusiness.cs
index 4450a43c..a592b94d 100644
--- a/BBWY.Server.Business/Sync/JD/JDPopularizeReportFormAdGroupLevelSyncBusiness.cs
+++ b/BBWY.Server.Business/Sync/JD/JDPopularizeReportFormAdGroupLevelSyncBusiness.cs
@@ -23,13 +23,11 @@ namespace BBWY.Server.Business.Sync
public JDPopularizeReportFormAdGroupLevelSyncBusiness(RestApiService restApiService,
IOptions options,
NLogManager nLogManager,
- ILogger logger,
IFreeSql fsql,
IIdGenerator idGenerator,
TaskSchedulerManager taskSchedulerManager,
VenderBusiness venderBusiness, YunDingBusiness yunDingBusiness) : base(restApiService,
options,
- logger,
nLogManager,
fsql,
idGenerator,
diff --git a/BBWY.Server.Business/Sync/JD/JDPopularizeReportFormAdLevelSyncBusiness.cs b/BBWY.Server.Business/Sync/JD/JDPopularizeReportFormAdLevelSyncBusiness.cs
index 1ad715f8..4fa24343 100644
--- a/BBWY.Server.Business/Sync/JD/JDPopularizeReportFormAdLevelSyncBusiness.cs
+++ b/BBWY.Server.Business/Sync/JD/JDPopularizeReportFormAdLevelSyncBusiness.cs
@@ -23,13 +23,11 @@ namespace BBWY.Server.Business.Sync
public JDPopularizeReportFormAdLevelSyncBusiness(RestApiService restApiService,
IOptions options,
NLogManager nLogManager,
- ILogger logger,
IFreeSql fsql,
IIdGenerator idGenerator,
TaskSchedulerManager taskSchedulerManager,
VenderBusiness venderBusiness, YunDingBusiness yunDingBusiness) : base(restApiService,
options,
- logger,
nLogManager,
fsql,
idGenerator,
diff --git a/BBWY.Server.Business/Sync/JD/JDPopularizeReportFormCampaignLevelSyncBusiness.cs b/BBWY.Server.Business/Sync/JD/JDPopularizeReportFormCampaignLevelSyncBusiness.cs
index 15920862..63eec634 100644
--- a/BBWY.Server.Business/Sync/JD/JDPopularizeReportFormCampaignLevelSyncBusiness.cs
+++ b/BBWY.Server.Business/Sync/JD/JDPopularizeReportFormCampaignLevelSyncBusiness.cs
@@ -21,7 +21,6 @@ namespace BBWY.Server.Business.Sync
{
public JDPopularizeReportFormCampaignLevelSyncBusiness(RestApiService restApiService,
IOptions options,
- ILogger logger,
NLogManager nLogManager,
IFreeSql fsql,
IIdGenerator idGenerator,
@@ -29,7 +28,6 @@ namespace BBWY.Server.Business.Sync
VenderBusiness venderBusiness,
YunDingBusiness yunDingBusiness) : base(restApiService,
options,
- logger,
nLogManager,
fsql,
idGenerator,
diff --git a/BBWY.Server.Business/Sync/JD/JDPopularizeReportFormOrderLevelSyncBusiness.cs b/BBWY.Server.Business/Sync/JD/JDPopularizeReportFormOrderLevelSyncBusiness.cs
index c7ddf2be..bdd87bed 100644
--- a/BBWY.Server.Business/Sync/JD/JDPopularizeReportFormOrderLevelSyncBusiness.cs
+++ b/BBWY.Server.Business/Sync/JD/JDPopularizeReportFormOrderLevelSyncBusiness.cs
@@ -22,16 +22,14 @@ namespace BBWY.Server.Business.Sync
{
public JDPopularizeReportFormOrderLevelSyncBusiness(RestApiService restApiService,
IOptions options,
- ILogger logger,
- NLogManager logManager,
+ NLogManager nLogManager,
IFreeSql fsql,
IIdGenerator idGenerator,
TaskSchedulerManager taskSchedulerManager,
VenderBusiness venderBusiness,
YunDingBusiness yunDingBusiness) : base(restApiService,
options,
- logger,
- logManager,
+ nLogManager,
fsql,
idGenerator,
taskSchedulerManager,
diff --git a/BBWY.Server.Business/Sync/JD/JDPopularizeReportFormSkuLevelSyncBusiness.cs b/BBWY.Server.Business/Sync/JD/JDPopularizeReportFormSkuLevelSyncBusiness.cs
index f213c4a5..4c7a957d 100644
--- a/BBWY.Server.Business/Sync/JD/JDPopularizeReportFormSkuLevelSyncBusiness.cs
+++ b/BBWY.Server.Business/Sync/JD/JDPopularizeReportFormSkuLevelSyncBusiness.cs
@@ -21,16 +21,14 @@ namespace BBWY.Server.Business.Sync
{
public JDPopularizeReportFormSkuLevelSyncBusiness(RestApiService restApiService,
IOptions options,
- ILogger logger,
- NLogManager logManager,
+ NLogManager nLogManager,
IFreeSql fsql,
IIdGenerator idGenerator,
TaskSchedulerManager taskSchedulerManager,
VenderBusiness venderBusiness,
YunDingBusiness yunDingBusiness) : base(restApiService,
options,
- logger,
- logManager,
+ nLogManager,
fsql,
idGenerator,
taskSchedulerManager,
diff --git a/BBWY.Server.Business/Sync/JD/JDPopularizeSyncBusiness.cs b/BBWY.Server.Business/Sync/JD/JDPopularizeSyncBusiness.cs
index 6a54e940..ea264f26 100644
--- a/BBWY.Server.Business/Sync/JD/JDPopularizeSyncBusiness.cs
+++ b/BBWY.Server.Business/Sync/JD/JDPopularizeSyncBusiness.cs
@@ -23,16 +23,14 @@ namespace BBWY.Server.Business.Sync
{
public JDPopularizeSyncBusiness(RestApiService restApiService,
IOptions options,
- ILogger logger,
- NLogManager nlogManager,
+ NLogManager nLogManager,
IFreeSql fsql,
IIdGenerator idGenerator,
TaskSchedulerManager taskSchedulerManager,
VenderBusiness venderBusiness,
YunDingBusiness yunDingBusiness) : base(restApiService,
options,
- logger,
- nlogManager,
+ nLogManager,
fsql,
idGenerator,
taskSchedulerManager,
@@ -101,7 +99,7 @@ namespace BBWY.Server.Business.Sync
catch (Exception ex)
{
var shopData = JsonConvert.SerializeObject(shop);
- logger.Error(ex, $"SyncShopPopularizeRecord ShopData:{shopData}");
+ nLogManager.Default().Error(ex, $"SyncShopPopularizeRecord ShopData:{shopData}");
}
}
diff --git a/BBWY.Server.Business/Sync/OrderSyncBusiness.cs b/BBWY.Server.Business/Sync/OrderSyncBusiness.cs
index b11e823b..7a0b63f9 100644
--- a/BBWY.Server.Business/Sync/OrderSyncBusiness.cs
+++ b/BBWY.Server.Business/Sync/OrderSyncBusiness.cs
@@ -28,8 +28,7 @@ namespace BBWY.Server.Business
public OrderSyncBusiness(RestApiService restApiService,
IOptions options,
- ILogger logger,
- NLogManager nlogManager,
+ NLogManager nLogManager,
IFreeSql fsql,
IIdGenerator idGenerator,
TaskSchedulerManager taskSchedulerManager,
@@ -37,8 +36,7 @@ namespace BBWY.Server.Business
IMemoryCache memoryCache,
YunDingBusiness yunDingBusiness) : base(restApiService,
options,
- logger,
- nlogManager,
+ nLogManager,
fsql,
idGenerator,
taskSchedulerManager,
@@ -103,7 +101,7 @@ namespace BBWY.Server.Business
catch (Exception ex)
{
var shopData = JsonConvert.SerializeObject(shop);
- logger.Error(ex, $"SyncOrder ShopData:{shopData}");
+ nLogManager.Default().Error(ex, $"SyncOrder ShopData:{shopData}");
}
}
diff --git a/BBWY.Server.Business/Sync/ProductSyncBusiness.cs b/BBWY.Server.Business/Sync/ProductSyncBusiness.cs
index 398ad234..bfd4afce 100644
--- a/BBWY.Server.Business/Sync/ProductSyncBusiness.cs
+++ b/BBWY.Server.Business/Sync/ProductSyncBusiness.cs
@@ -21,7 +21,6 @@ namespace BBWY.Server.Business.Sync
public ProductSyncBusiness(RestApiService restApiService,
IOptions options,
- ILogger logger,
NLogManager nLogManager,
IFreeSql fsql,
IIdGenerator idGenerator,
@@ -30,7 +29,6 @@ namespace BBWY.Server.Business.Sync
ProductBusiness productBusiness,
YunDingBusiness yunDingBusiness) : base(restApiService,
options,
- logger,
nLogManager,
fsql,
idGenerator,
@@ -190,7 +188,7 @@ namespace BBWY.Server.Business.Sync
catch (Exception ex)
{
var shopData = JsonConvert.SerializeObject(shop);
- logger.Error(ex, $"SyncProduct ShopData:{shopData}");
+ nLogManager.Default().Error(ex, $"SyncProduct ShopData:{shopData}");
}
}
diff --git a/BBWY.Server.Business/Sync/RefundOrderSyncBusiness.cs b/BBWY.Server.Business/Sync/RefundOrderSyncBusiness.cs
index a5041e0c..47a96a6a 100644
--- a/BBWY.Server.Business/Sync/RefundOrderSyncBusiness.cs
+++ b/BBWY.Server.Business/Sync/RefundOrderSyncBusiness.cs
@@ -24,13 +24,13 @@ namespace BBWY.Server.Business
// public RefundOrderSyncBusiness(RestApiService restApiService,
// IOptions options,
- // ILogger logger,
+ // NLogManager nLogManager,
// IFreeSql fsql,
// IIdGenerator idGenerator,
// TaskSchedulerManager taskSchedulerManager,
// VenderBusiness venderBusiness) : base(restApiService,
// options,
- // logger,
+ // nLogManager,
// fsql,
// idGenerator,
// taskSchedulerManager,
diff --git a/BBWY.Server.Business/Vender/VenderBusiness.cs b/BBWY.Server.Business/Vender/VenderBusiness.cs
index 6adcf3b6..1e888f4b 100644
--- a/BBWY.Server.Business/Vender/VenderBusiness.cs
+++ b/BBWY.Server.Business/Vender/VenderBusiness.cs
@@ -52,13 +52,13 @@ namespace BBWY.Server.Business
return response.Data;
}
- public void AcceptJDShopToken(JDShopToken jDShopToken)
+ public string AcceptJDShopToken(JDShopToken jDShopToken)
{
var venderResponse = GetVenderInfo(new PlatformRequest()
{
AppKey = "120EA9EC65AB017567D78CC1139EEEA5",
AppSecret = "8a42bc2301e8439b896e99f5475e0a9b",
- AppToken = jDShopToken.Access_Token,
+ AppToken = jDShopToken.AccessToken,
Platform = Enums.Platform.京东
});
@@ -67,9 +67,10 @@ namespace BBWY.Server.Business
venderResponse.ShopName,
venderResponse.ShopId,
ShopType = venderResponse.ColType,
- AppToken = jDShopToken.Access_Token,
+ AppToken = jDShopToken.AccessToken,
venderResponse.VenderId
}, new Dictionary() { { "qy", "qy" } }, HttpMethod.Post);
+ return JsonConvert.SerializeObject(jDShopToken);
}
public long SaveShopSetting(ShopSettingRequest shopSettingRequest)
diff --git a/BBWY.Server.Model/Dto/Request/Vender/JDShopToken.cs b/BBWY.Server.Model/Dto/Request/Vender/JDShopToken.cs
index 1fa85f51..6c84c908 100644
--- a/BBWY.Server.Model/Dto/Request/Vender/JDShopToken.cs
+++ b/BBWY.Server.Model/Dto/Request/Vender/JDShopToken.cs
@@ -2,10 +2,10 @@
{
public class JDShopToken
{
- public string Access_Token { get; set; }
+ public string AccessToken { get; set; }
- public int Code { get; set; }
+ public string ShopName { get; set; }
- public bool IsSuccess { get; set; }
+ public string ShopNick { get; set; }
}
}
diff --git a/JD.API/Middlewares/CustomExceptionMiddleWare.cs b/JD.API/Middlewares/CustomExceptionMiddleWare.cs
index 8e31e91c..38ff1b65 100644
--- a/JD.API/Middlewares/CustomExceptionMiddleWare.cs
+++ b/JD.API/Middlewares/CustomExceptionMiddleWare.cs
@@ -1,4 +1,5 @@
using BBWY.Common.Models;
+using BBWY.Server.Business;
using Microsoft.AspNetCore.Http;
using Newtonsoft.Json;
using NLog;
diff --git a/JD.API/NLog.config b/JD.API/NLog.config
new file mode 100644
index 00000000..8405deac
--- /dev/null
+++ b/JD.API/NLog.config
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/JD.API/Startup.cs b/JD.API/Startup.cs
index e3573ef5..bc7db727 100644
--- a/JD.API/Startup.cs
+++ b/JD.API/Startup.cs
@@ -39,7 +39,9 @@ namespace JD.API
services.AddHttpContextAccessor();
services.AddHttpClient();
services.AddMemoryCache();
- services.AddSingleton(typeof(NLog.ILogger), NLog.LogManager.GetCurrentClassLogger());
+
+ services.AddSingleton();
+ //services.AddSingleton(typeof(NLog.ILogger), NLog.LogManager.GetCurrentClassLogger());
var fsql = new FreeSql.FreeSqlBuilder().UseConnectionString(FreeSql.DataType.MySql, Configuration.GetConnectionString("DB")).Build();
services.AddSingleton(typeof(IFreeSql), fsql);