pengcong001
/
bbwy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

统一日志由NLogManager管理

qianyi
shanji 3 years ago
parent
22944e5913
commit
c438858460
30 changed files with 93 additions and 92 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      BBWY.Server.API/Controllers/VenderController.cs
  2. 12
      BBWY.Server.API/Middlewares/CustomExceptionMiddleWare.cs
  3. 2
      BBWY.Server.Business/AfterSaleOrder/AfterSaleOrderBusiness.cs
  4. 6
      BBWY.Server.Business/BaseBusiness.cs
  5. 2
      BBWY.Server.Business/FinancialTerminal/FinancialTerminalBusiness.cs
  6. 20
      BBWY.Server.Business/PlatformSDK/JDBusiness.cs
  7. 2
      BBWY.Server.Business/PlatformSDK/PDDBusiness.cs
  8. 6
      BBWY.Server.Business/PlatformSDK/PlatformSDKBusiness.cs
  9. 2
      BBWY.Server.Business/PlatformSDK/TaoBaoBusiness.cs
  10. 12
      BBWY.Server.Business/PlatformSDK/_1688Business.cs
  11. 14
      BBWY.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs
  12. 2
      BBWY.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs
  13. 2
      BBWY.Server.Business/Statistics/JDReportFormStatisticsBusiness.cs
  14. 2
      BBWY.Server.Business/Statistics/StatisticsBusiness.cs
  15. 10
      BBWY.Server.Business/Sync/AfterSaleOrderSyncBusiness.cs
  16. 5
      BBWY.Server.Business/Sync/BaseSyncBusiness.cs
  17. 2
      BBWY.Server.Business/Sync/JD/JDPopularizeReportFormAdGroupLevelSyncBusiness.cs
  18. 2
      BBWY.Server.Business/Sync/JD/JDPopularizeReportFormAdLevelSyncBusiness.cs
  19. 2
      BBWY.Server.Business/Sync/JD/JDPopularizeReportFormCampaignLevelSyncBusiness.cs
  20. 6
      BBWY.Server.Business/Sync/JD/JDPopularizeReportFormOrderLevelSyncBusiness.cs
  21. 6
      BBWY.Server.Business/Sync/JD/JDPopularizeReportFormSkuLevelSyncBusiness.cs
  22. 8
      BBWY.Server.Business/Sync/JD/JDPopularizeSyncBusiness.cs
  23. 8
      BBWY.Server.Business/Sync/OrderSyncBusiness.cs
  24. 4
      BBWY.Server.Business/Sync/ProductSyncBusiness.cs
  25. 4
      BBWY.Server.Business/Sync/RefundOrderSyncBusiness.cs
  26. 7
      BBWY.Server.Business/Vender/VenderBusiness.cs
  27. 6
      BBWY.Server.Model/Dto/Request/Vender/JDShopToken.cs
  28. 1
      JD.API/Middlewares/CustomExceptionMiddleWare.cs
  29. 14
      JD.API/NLog.config
  30. 4
      JD.API/Startup.cs

12
BBWY.Server.API/Controllers/VenderController.cs
View File

@ -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;
}
/// <summary>
@ -64,15 +64,15 @@ namespace BBWY.Server.API.Controllers
/// </summary>
/// <param name="jDShopToken"></param>
[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);
}
/// <summary>

12
BBWY.Server.API/Middlewares/CustomExceptionMiddleWare.cs
View File

@ -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
/// </summary>
private IDictionary<int, string> _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<int, string>
{
{ 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

2
BBWY.Server.Business/AfterSaleOrder/AfterSaleOrderBusiness.cs
View File

@ -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)
{
}

6
BBWY.Server.Business/BaseBusiness.cs
View File

@ -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;
}
}

2
BBWY.Server.Business/FinancialTerminal/FinancialTerminalBusiness.cs
View File

@ -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)
{
}

20
BBWY.Server.Business/PlatformSDK/JDBusiness.cs
View File

@ -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<string>("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)}");

2
BBWY.Server.Business/PlatformSDK/PDDBusiness.cs
View File

@ -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)
{
}
}

6
BBWY.Server.Business/PlatformSDK/PlatformSDKBusiness.cs
View File

@ -19,12 +19,12 @@ namespace BBWY.Server.Business
/// </summary>
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);
}

2
BBWY.Server.Business/PlatformSDK/TaoBaoBusiness.cs
View File

@ -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)
{
}

12
BBWY.Server.Business/PlatformSDK/_1688Business.cs
View File

@ -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<string>("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<bool>("success") != true)
throw new BusinessException(result.Value<string>("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<JToken> intersectTradeModeList = new List<JToken>();
@ -215,7 +215,7 @@ namespace BBWY.Server.Business
if (result.Value<bool>("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<bool>("success") != true)
throw new BusinessException(result.Value<string>("errorMessage")) { Code = 0 };

14
BBWY.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs
View File

@ -29,14 +29,14 @@ namespace BBWY.Server.Business
//private IDictionary<Enums.Platform, string> deliverySelfDic;
public PurchaseOrderBusiness(IFreeSql fsql,
NLog.ILogger logger,
NLogManager nLogManager,
IIdGenerator idGenerator,
IEnumerable<PlatformSDKBusiness> 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<PurchaseOrder> insertPurchaseOrders = new List<PurchaseOrder>();
List<PurchaseOrderDetail> insertPurchaseOrderDetails = new List<PurchaseOrderDetail>();
@ -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<string>("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

2
BBWY.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs
View File

@ -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<T>(IList<T> purchaserSchemeList, IList<Purchaser> addPurchaserList) where T : InputPurchaseSchemeRequest
{

2
BBWY.Server.Business/Statistics/JDReportFormStatisticsBusiness.cs
View File

@ -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)
{
}

2
BBWY.Server.Business/Statistics/StatisticsBusiness.cs
View File

@ -16,7 +16,7 @@ namespace BBWY.Server.Business
private IList<Enums.OrderState> 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.待付款, Enums.OrderState.已取消 };
this.freeSqlMultiDBManager = freeSqlMultiDBManager;

10
BBWY.Server.Business/Sync/AfterSaleOrderSyncBusiness.cs
View File

@ -27,15 +27,13 @@ namespace BBWY.Server.Business
public AfterSaleOrderSyncBusiness(RestApiService restApiService,
IOptions<GlobalConfig> 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}");
}
}

5
BBWY.Server.Business/Sync/BaseSyncBusiness.cs
View File

@ -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<GlobalConfig> 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;

2
BBWY.Server.Business/Sync/JD/JDPopularizeReportFormAdGroupLevelSyncBusiness.cs
View File

@ -23,13 +23,11 @@ namespace BBWY.Server.Business.Sync
public JDPopularizeReportFormAdGroupLevelSyncBusiness(RestApiService restApiService,
IOptions<GlobalConfig> options,
NLogManager nLogManager,
ILogger logger,
IFreeSql fsql,
IIdGenerator idGenerator,
TaskSchedulerManager taskSchedulerManager,
VenderBusiness venderBusiness, YunDingBusiness yunDingBusiness) : base(restApiService,
options,
logger,
nLogManager,
fsql,
idGenerator,

2
BBWY.Server.Business/Sync/JD/JDPopularizeReportFormAdLevelSyncBusiness.cs
View File

@ -23,13 +23,11 @@ namespace BBWY.Server.Business.Sync
public JDPopularizeReportFormAdLevelSyncBusiness(RestApiService restApiService,
IOptions<GlobalConfig> options,
NLogManager nLogManager,
ILogger logger,
IFreeSql fsql,
IIdGenerator idGenerator,
TaskSchedulerManager taskSchedulerManager,
VenderBusiness venderBusiness, YunDingBusiness yunDingBusiness) : base(restApiService,
options,
logger,
nLogManager,
fsql,
idGenerator,

2
BBWY.Server.Business/Sync/JD/JDPopularizeReportFormCampaignLevelSyncBusiness.cs
View File

@ -21,7 +21,6 @@ namespace BBWY.Server.Business.Sync
{
public JDPopularizeReportFormCampaignLevelSyncBusiness(RestApiService restApiService,
IOptions<GlobalConfig> 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,

6
BBWY.Server.Business/Sync/JD/JDPopularizeReportFormOrderLevelSyncBusiness.cs
View File

@ -22,16 +22,14 @@ namespace BBWY.Server.Business.Sync
{
public JDPopularizeReportFormOrderLevelSyncBusiness(RestApiService restApiService,
IOptions<GlobalConfig> 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,

6
BBWY.Server.Business/Sync/JD/JDPopularizeReportFormSkuLevelSyncBusiness.cs
View File

@ -21,16 +21,14 @@ namespace BBWY.Server.Business.Sync
{
public JDPopularizeReportFormSkuLevelSyncBusiness(RestApiService restApiService,
IOptions<GlobalConfig> 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,

8
BBWY.Server.Business/Sync/JD/JDPopularizeSyncBusiness.cs
View File

@ -23,16 +23,14 @@ namespace BBWY.Server.Business.Sync
{
public JDPopularizeSyncBusiness(RestApiService restApiService,
IOptions<GlobalConfig> 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}");
}
}

8
BBWY.Server.Business/Sync/OrderSyncBusiness.cs
View File

@ -28,8 +28,7 @@ namespace BBWY.Server.Business
public OrderSyncBusiness(RestApiService restApiService,
IOptions<GlobalConfig> 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}");
}
}

4
BBWY.Server.Business/Sync/ProductSyncBusiness.cs
View File

@ -21,7 +21,6 @@ namespace BBWY.Server.Business.Sync
public ProductSyncBusiness(RestApiService restApiService,
IOptions<GlobalConfig> 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}");
}
}

4
BBWY.Server.Business/Sync/RefundOrderSyncBusiness.cs
View File

@ -24,13 +24,13 @@ namespace BBWY.Server.Business
// public RefundOrderSyncBusiness(RestApiService restApiService,
// IOptions<GlobalConfig> options,
// ILogger logger,
// NLogManager nLogManager,
// IFreeSql fsql,
// IIdGenerator idGenerator,
// TaskSchedulerManager taskSchedulerManager,
// VenderBusiness venderBusiness) : base(restApiService,
// options,
// logger,
// nLogManager,
// fsql,
// idGenerator,
// taskSchedulerManager,

7
BBWY.Server.Business/Vender/VenderBusiness.cs
View File

@ -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<string, string>() { { "qy", "qy" } }, HttpMethod.Post);
return JsonConvert.SerializeObject(jDShopToken);
}
public long SaveShopSetting(ShopSettingRequest shopSettingRequest)

6
BBWY.Server.Model/Dto/Request/Vender/JDShopToken.cs
View File

@ -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; }
}
}

1
JD.API/Middlewares/CustomExceptionMiddleWare.cs
View File

@ -1,4 +1,5 @@
using BBWY.Common.Models;
using BBWY.Server.Business;
using Microsoft.AspNetCore.Http;
using Newtonsoft.Json;
using NLog;

14
JD.API/NLog.config
View File

@ -0,0 +1,14 @@
<nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<targets>
<target name="errorFile" xsi:type="File" fileName="${basedir}/logs/${logger}/error/${shortdate}.txt"
layout="${longdate} | ${level:uppercase=false} ${newline}${message} ${newline}${onexception:${exception:format=tostring} ${newline}${stacktrace} ${newline}${newline}"
autoFlush="true"/>
<target name="infoFile" xsi:type="File" fileName="${basedir}/logs/${logger}/info/${shortdate}.txt"
layout="${longdate} | ${level:uppercase=false} ${newline}${message} ${newline}"
autoFlush="true"/>
</targets>
<rules>
<logger name="*" level="Error" writeTo="errorFile"/>
<logger name="*" level="Info" writeTo="infoFile" />
</rules>
</nlog>

4
JD.API/Startup.cs
View File

@ -39,7 +39,9 @@ namespace JD.API
services.AddHttpContextAccessor();
services.AddHttpClient();
services.AddMemoryCache();
services.AddSingleton(typeof(NLog.ILogger), NLog.LogManager.GetCurrentClassLogger());
services.AddSingleton<NLogManager>();
//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);

Write Preview
Loading…
Cancel
Save