From a22995ea9ded904780c27319510a82275a972cab Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期五, 21 三月 2025 17:55:17 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/LifePaymentApi
---
LifePayment/LifePayment.Host/LifePaymentServices.Application.Contracts.xml | 2
LifePayment/LifePayment.HttpApi/LifePay/ACOOLYNotifyController.cs | 26 ++++----
LifePayment/LifePayment.Application.Contracts/LifePay/ILifePayService.cs | 2
LifePayment/LifePayment.Domain/LifePay/LifePayOrder.cs | 4
LifePayment/LifePayment.Domain.Shared/Enum/LifePay/LifePayEnum.cs | 38 ++++++++++--
LifePayment/LifePayment.Worker/appsettings.json | 20 ++++++
LifePayment/LifePayment.Application/LifePay/LifePayService.cs | 54 ++++++++---------
LifePayment/LifePayment.Worker/Worker/GetStaticsWorker.cs | 10 +-
LifePayment/LifePayment.Application/LifePay/StatisticsService.cs | 2
9 files changed, 98 insertions(+), 60 deletions(-)
diff --git a/LifePayment/LifePayment.Application.Contracts/LifePay/ILifePayService.cs b/LifePayment/LifePayment.Application.Contracts/LifePay/ILifePayService.cs
index 8fd6eb2..ab6c296 100644
--- a/LifePayment/LifePayment.Application.Contracts/LifePay/ILifePayService.cs
+++ b/LifePayment/LifePayment.Application.Contracts/LifePay/ILifePayService.cs
@@ -50,7 +50,7 @@
Task LifePaySuccessHandler(string orderNo, string outOrderNo);
/// <summary>
- /// 鏀粯鎴愬姛鍥炶皟澶勭悊
+ /// 渚涘簲鍟嗗洖璋冨鐞�
/// </summary>
/// <param name="orderNo"></param>
/// <param name="acoolyOrderNo"></param>
diff --git a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
index 0fc2dec..f7d0078 100644
--- a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
+++ b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
@@ -290,8 +290,7 @@
{
var result = await (from a in _channelFilter.GetChannelLifePayOrderFilter(_lifePayOrderRepository)
- .Where(x => x.PayStatus == LifePayStatusEnum.寰呴��娆� || x.PayStatus == LifePayStatusEnum.宸查��娆� || x.PayStatus == LifePayStatusEnum.閫�娆句腑
- || x.LifePayOrderStatus == LifePayOrderStatusEnum.閫�娆惧緟瀹℃牳 || x.LifePayOrderStatus == LifePayOrderStatusEnum.宸查��娆� || x.LifePayOrderStatus == LifePayOrderStatusEnum.閫�娆惧け璐�
+ .Where(x => x.LifePayOrderStatus == LifePayOrderStatusEnum.寰呴��娆� || x.LifePayOrderStatus == LifePayOrderStatusEnum.宸查��娆� || x.LifePayOrderStatus == LifePayOrderStatusEnum.閫�娆句腑
|| x.LifePayRefundStatus > LifePayRefundStatusEnum.鏃犻渶閫�娆�)
.WhereIf(input.BeginFinishTime.HasValue, x => x.FinishTime >= input.BeginFinishTime)
.WhereIf(input.EndFinishTime.HasValue, x => x.FinishTime <= input.EndFinishTime)
@@ -779,7 +778,7 @@
var orderInput = new CreateLifePayOrderInput
{
OrderNo = channle.ChannlesNum + CreateOrderNo(),
- LifePayOrderStatus = LifePayOrderStatusEnum.寰呯‘璁�,
+ LifePayOrderStatus = LifePayOrderStatusEnum.鍏呭�间腑,
LifePayOrderType = LifePayOrderTypeEnum.璇濊垂璁㈠崟,
//LifePayType = input.LifePayType,
OrderParamDetailJsonStr = JsonConvert.SerializeObject(input.ProductData),
@@ -828,7 +827,7 @@
var orderInput = new CreateLifePayOrderInput
{
OrderNo = channle.ChannlesNum + CreateOrderNo(),
- LifePayOrderStatus = LifePayOrderStatusEnum.寰呯‘璁�,
+ LifePayOrderStatus = LifePayOrderStatusEnum.鍏呭�间腑,
LifePayOrderType = LifePayOrderTypeEnum.鐢佃垂璁㈠崟,
// LifePayType = input.LifePayType,
OrderParamDetailJsonStr = JsonConvert.SerializeObject(input.ProductData),
@@ -877,7 +876,7 @@
var orderInput = new CreateLifePayOrderInput
{
OrderNo = channle.ChannlesNum + CreateOrderNo(),
- LifePayOrderStatus = LifePayOrderStatusEnum.寰呯‘璁�,
+ LifePayOrderStatus = LifePayOrderStatusEnum.鍏呭�间腑,
LifePayOrderType = LifePayOrderTypeEnum.鐕冩皵璁㈠崟,
// LifePayType = input.LifePayType,
OrderParamDetailJsonStr = JsonConvert.SerializeObject(input.ProductData),
@@ -1190,7 +1189,7 @@
}
order.LifePayRefundStatus = LifePayRefundStatusEnum.鏃犻渶閫�娆�;
- order.LifePayOrderStatus = LifePayOrderStatusEnum.寰呯‘璁�;
+ order.LifePayOrderStatus = LifePayOrderStatusEnum.鍏呭�间腑;
//SetOrderStatus(order, result.Code);
order.OutRequestNo = result.RequestNo.IsNullOrEmpty() ? null : result.RequestNo;
order.ACOOLYOrderNo = result.ACOOLYOrderNo.IsNullOrEmpty() ? null : result.ACOOLYOrderNo;
@@ -1198,7 +1197,7 @@
catch (Exception ex)
{
_logger.LogError(ex, "澶勭悊鐢熸椿缂磋垂鏀粯鎴愬姛鍥炶皟鏃跺紓甯�");
- order.LifePayOrderStatus = LifePayOrderStatusEnum.宸插け璐�;
+ order.LifePayOrderStatus = LifePayOrderStatusEnum.寰呴��娆�;
order.LifePayRefundStatus = LifePayRefundStatusEnum.寰呴��娆�;
}
_logger.LogError("鐢熸椿缂磋垂璁㈠崟鐘舵�侊細" + order.LifePayOrderStatus.ToString());
@@ -1216,10 +1215,10 @@
var order = await _lifePayOrderRepository.Where(x => x.OrderNo == orderNo).FirstOrDefaultAsync();
CheckExtensions.IfTrueThrowUserFriendlyException(order == null, "璁㈠崟涓嶅瓨鍦�");
- if (order.LifePayOrderStatus == LifePayOrderStatusEnum.宸插畬鎴�)
- {
- return;
- }
+ //if (order.LifePayOrderStatus == LifePayOrderStatusEnum.宸插畬鎴�)
+ //{
+ // return;
+ //}
order.PlatformDeductionAmount = payAmount;
if (acoolyOrderNo.IsNotNullOrEmpty())
@@ -1227,15 +1226,6 @@
order.ACOOLYOrderNo = acoolyOrderNo;
}
- if (order.LifePayOrderStatus == LifePayOrderStatusEnum.宸插畬鎴�)
- {
- order.FinishTime = DateTime.Now;
- }
-
- if (order.LifePayOrderStatus == LifePayOrderStatusEnum.宸插け璐� && order.LifePayRefundStatus != LifePayRefundStatusEnum.宸查��娆�)
- {
- order.LifePayRefundStatus = LifePayRefundStatusEnum.寰呴��娆�;
- }
order.LifePayOrderStatus = status;
order.ACOOLYStatus = acoolyStatus;
@@ -1269,7 +1259,7 @@
input.RefundPrice = order.PayAmount;
}
- if (order.LifePayOrderStatus != LifePayOrderStatusEnum.宸插け璐� && order.PayStatus != LifePayStatusEnum.寰呴��娆� && order.LifePayOrderStatus != LifePayOrderStatusEnum.閫�娆惧緟瀹℃牳)
+ if (order.LifePayOrderStatus != LifePayOrderStatusEnum.寰呴��娆� || order.PayStatus != LifePayStatusEnum.宸叉敮浠� || order.LifePayRefundStatus != LifePayRefundStatusEnum.寰呴��娆�)
{
throw new UserFriendlyException("褰撳墠璁㈠崟鐘舵�佹棤娉曢��娆�");
}
@@ -1292,7 +1282,7 @@
}
else
{
- order.LifePayOrderStatus = LifePayOrderStatusEnum.閫�娆惧け璐�;
+ order.LifePayOrderStatus = LifePayOrderStatusEnum.寰呴��娆�;
order.LifePayRefundStatus = LifePayRefundStatusEnum.寰呴��娆�;
}
@@ -1344,13 +1334,12 @@
return;
}
- if (order.LifePayOrderStatus != LifePayOrderStatusEnum.寰呯‘璁� && order.LifePayOrderStatus != LifePayOrderStatusEnum.宸插け璐�
- && order.PayStatus != LifePayStatusEnum.宸叉敮浠�)
+ if (order.PayStatus != LifePayStatusEnum.宸叉敮浠� || order.LifePayOrderStatus != LifePayOrderStatusEnum.宸插畬鎴�)
{
throw new UserFriendlyException("褰撳墠璁㈠崟鐘舵�佹棤娉曠敵璇烽��娆�");
}
- order.LifePayOrderStatus = LifePayOrderStatusEnum.閫�娆惧緟瀹℃牳;
+ order.LifePayOrderStatus = LifePayOrderStatusEnum.寰呴��娆�;
order.RefundApplyRemark = input.RefundApplyRemark;
order.RefundApplyTime = DateTime.Now;
@@ -1478,10 +1467,17 @@
return;
}
- if ((order.LifePayOrderStatus == LifePayOrderStatusEnum.宸插け璐� && order.PayStatus == LifePayStatusEnum.寰呴��娆�) ||
- order.LifePayOrderStatus == LifePayOrderStatusEnum.閫�娆惧緟瀹℃牳 || order.LifePayOrderStatus == LifePayOrderStatusEnum.寰呯‘璁�)
+ if (order.LifePayOrderStatus == LifePayOrderStatusEnum.寰呴��娆�)
{
- order.LifePayOrderStatus = LifePayOrderStatusEnum.閫�娆惧け璐�;
+ if (order.ACOOLYStatus == ACOOLYStatusEnum.宸插畬鎴� || order.ACOOLYStatus == ACOOLYStatusEnum.閮ㄥ垎鍏呭�兼垚鍔�)
+ {
+ order.LifePayOrderStatus = LifePayOrderStatusEnum.宸插畬鎴�;
+ }
+ else if (order.ACOOLYStatus == ACOOLYStatusEnum.鍏呭�煎け璐�)
+ {
+ order.LifePayOrderStatus = LifePayOrderStatusEnum.閫�娆惧け璐�;
+ }
+
order.RefundCheckRemark = input.RefundCheckRemark;
order.RefundCheckUserId = CurrentUser.Id;
@@ -1680,7 +1676,7 @@
order.FinishTime = DateTime.Now;
break;
case ACOOLYConstant.Code.PROCESSING:
- order.LifePayOrderStatus = LifePayOrderStatusEnum.寰呯‘璁�;
+ order.LifePayOrderStatus = LifePayOrderStatusEnum.鍏呭�间腑;
break;
default:
break;
diff --git a/LifePayment/LifePayment.Application/LifePay/StatisticsService.cs b/LifePayment/LifePayment.Application/LifePay/StatisticsService.cs
index d6b7fad..670e2e3 100644
--- a/LifePayment/LifePayment.Application/LifePay/StatisticsService.cs
+++ b/LifePayment/LifePayment.Application/LifePay/StatisticsService.cs
@@ -47,7 +47,7 @@
var accumulatedIncome = await _lifePayOrderRepository.Where(x => x.CreationTime < today).SumAsync(x => x.ActualRechargeAmount);
var ordersNumYesterday = await _lifePayOrderRepository.Where(x => x.CreationTime >= today.AddDays(-1) && x.CreationTime < today).CountAsync();
var yesterdaySuccess = await _lifePayOrderRepository.Where(x => x.CreationTime >= today.AddDays(-1) && x.CreationTime < today && x.LifePayOrderStatus == LifePayOrderStatusEnum.宸插畬鎴�).CountAsync();
- var yesterdayFail = await _lifePayOrderRepository.Where(x => x.CreationTime >= today.AddDays(-1) && x.CreationTime < today && x.LifePayOrderStatus == LifePayOrderStatusEnum.宸插け璐�).CountAsync();
+ var yesterdayFail = await _lifePayOrderRepository.Where(x => x.CreationTime >= today.AddDays(-1) && x.CreationTime < today && x.LifePayOrderStatus == LifePayOrderStatusEnum.閫�娆惧け璐�).CountAsync();
var accumulatedUsers = await _lifePayUserRepository.CountAsync();
var entity = new DallyStatistics()
diff --git a/LifePayment/LifePayment.Domain.Shared/Enum/LifePay/LifePayEnum.cs b/LifePayment/LifePayment.Domain.Shared/Enum/LifePay/LifePayEnum.cs
index 3ab14a3..5963033 100644
--- a/LifePayment/LifePayment.Domain.Shared/Enum/LifePay/LifePayEnum.cs
+++ b/LifePayment/LifePayment.Domain.Shared/Enum/LifePay/LifePayEnum.cs
@@ -41,19 +41,44 @@
閫�娆句腑 = 50,
}
+//public enum LifePayOrderStatusEnum
+//{
+// [Description("鍏呭�间腑")]
+// 寰呯‘璁� = 10,
+
+// [Description("宸插け璐�")]
+// 宸插け璐� = 20,
+
+// [Description("宸插畬鎴�")]
+// 宸插畬鎴� = 30,
+
+// [Description("閫�娆惧緟瀹℃牳")]
+// 閫�娆惧緟瀹℃牳 = 40,
+
+// [Description("宸查��娆�")]
+// 宸查��娆� = 50,
+
+// [Description("閫�娆惧け璐�")]
+// 閫�娆惧け璐� = 60,
+
+
+// [Description("閫�娆句腑")]
+// 閫�娆句腑 = 70,
+//}
+
public enum LifePayOrderStatusEnum
{
- [Description("寰呯‘璁�")]
- 寰呯‘璁� = 10,
+ [Description("鍏呭�间腑")]
+ 鍏呭�间腑 = 10,
- [Description("宸插け璐�")]
- 宸插け璐� = 20,
+ //[Description("宸插け璐�")]
+ //宸插け璐� = 20,
[Description("宸插畬鎴�")]
宸插畬鎴� = 30,
- [Description("閫�娆惧緟瀹℃牳")]
- 閫�娆惧緟瀹℃牳 = 40,
+ [Description("寰呴��娆�")]
+ 寰呴��娆� = 40,
[Description("宸查��娆�")]
宸查��娆� = 50,
@@ -64,6 +89,7 @@
[Description("閫�娆句腑")]
閫�娆句腑 = 70,
+
}
public enum ACOOLYStatusEnum
diff --git a/LifePayment/LifePayment.Domain/LifePay/LifePayOrder.cs b/LifePayment/LifePayment.Domain/LifePay/LifePayOrder.cs
index 01146f6..f6c1394 100644
--- a/LifePayment/LifePayment.Domain/LifePay/LifePayOrder.cs
+++ b/LifePayment/LifePayment.Domain/LifePay/LifePayOrder.cs
@@ -81,12 +81,12 @@
public string ACOOLYOrderNo { get; set; }
/// <summary>
- /// 璁㈠崟鐘舵��
+ /// 骞冲彴璁㈠崟鐘舵��
/// </summary>
public LifePayOrderStatusEnum LifePayOrderStatus { get; set; }
/// <summary>
- /// 骞冲彴鐘舵��
+ /// 渚涘簲鍟嗙姸鎬�
/// </summary>
public ACOOLYStatusEnum? ACOOLYStatus { get; set; }
diff --git a/LifePayment/LifePayment.Host/LifePaymentServices.Application.Contracts.xml b/LifePayment/LifePayment.Host/LifePaymentServices.Application.Contracts.xml
index b13c919..020653b 100644
--- a/LifePayment/LifePayment.Host/LifePaymentServices.Application.Contracts.xml
+++ b/LifePayment/LifePayment.Host/LifePaymentServices.Application.Contracts.xml
@@ -44,7 +44,7 @@
</member>
<member name="M:LifePayment.Application.Contracts.ILifePayService.ACOOLYOrderNotifyHandler(System.String,System.String,LifePayment.Domain.Shared.LifePayOrderStatusEnum,LifePayment.Domain.Shared.ACOOLYStatusEnum,System.Decimal)">
<summary>
- 鏀粯鎴愬姛鍥炶皟澶勭悊
+ 渚涘簲鍟嗗洖璋冨鐞�
</summary>
<param name="orderNo"></param>
<param name="acoolyOrderNo"></param>
diff --git a/LifePayment/LifePayment.HttpApi/LifePay/ACOOLYNotifyController.cs b/LifePayment/LifePayment.HttpApi/LifePay/ACOOLYNotifyController.cs
index df58574..8c2b4be 100644
--- a/LifePayment/LifePayment.HttpApi/LifePay/ACOOLYNotifyController.cs
+++ b/LifePayment/LifePayment.HttpApi/LifePay/ACOOLYNotifyController.cs
@@ -52,7 +52,7 @@
}
var baseInfo = JsonConvert.DeserializeObject<ACOOLYRequestBaseResponse>(body);
var orderNo = string.Empty;
- LifePayOrderStatusEnum status = LifePayOrderStatusEnum.宸插け璐�;
+ LifePayOrderStatusEnum status = LifePayOrderStatusEnum.寰呴��娆�;
ACOOLYStatusEnum acoolyStatus = ACOOLYStatusEnum.鍏呭�煎け璐�;
var acoolyOrderNo = string.Empty;
decimal payAmount = 0;
@@ -70,7 +70,7 @@
if (!confirmElectricOrderResponse.Success
|| (confirmElectricOrderResponse.Code != ACOOLYConstant.Code.SUCCESS && confirmElectricOrderResponse.Code != ACOOLYConstant.Code.PROCESSING))
{
- status = LifePayOrderStatusEnum.宸插け璐�;
+ status = LifePayOrderStatusEnum.寰呴��娆�;
acoolyStatus = ACOOLYStatusEnum.鍏呭�煎け璐�;
}
else
@@ -82,13 +82,13 @@
else
if (confirmElectricOrderResponse.ElectricChargeOrder.Status == ACOOLYConstant.Status.鍏呭�间腑)
{
- status = LifePayOrderStatusEnum.寰呯‘璁�;
+ status = LifePayOrderStatusEnum.鍏呭�间腑;
acoolyStatus = ACOOLYStatusEnum.鍏呭�间腑;
}
else
if (confirmElectricOrderResponse.ElectricChargeOrder.Status == ACOOLYConstant.Status.鍏呭�煎け璐�)
{
- status = LifePayOrderStatusEnum.宸插け璐�;
+ status = LifePayOrderStatusEnum.寰呴��娆�;
acoolyStatus = ACOOLYStatusEnum.鍏呭�煎け璐�;
}
else
@@ -106,7 +106,7 @@
else
if (confirmElectricOrderResponse.ElectricChargeOrder.Status == ACOOLYConstant.Status.澶辫触鍏抽棴)
{
- status = LifePayOrderStatusEnum.宸插け璐�;
+ status = LifePayOrderStatusEnum.寰呴��娆�;
acoolyStatus = ACOOLYStatusEnum.鍏呭�煎け璐�;
}
break;
@@ -119,7 +119,7 @@
if (!confirmPhoneOrderResponse.Success
|| (confirmPhoneOrderResponse.Code != ACOOLYConstant.Code.SUCCESS && confirmPhoneOrderResponse.Code != ACOOLYConstant.Code.PROCESSING))
{
- status = LifePayOrderStatusEnum.宸插け璐�;
+ status = LifePayOrderStatusEnum.寰呴��娆�;
acoolyStatus = ACOOLYStatusEnum.鍏呭�煎け璐�;
}
else
@@ -133,13 +133,13 @@
if (confirmPhoneOrderResponse.PhoneChargeOrder.Status == ACOOLYConstant.Status.鍏呭�间腑)
{
- status = LifePayOrderStatusEnum.寰呯‘璁�;
+ status = LifePayOrderStatusEnum.鍏呭�间腑;
acoolyStatus = ACOOLYStatusEnum.鍏呭�间腑;
}
else
if (confirmPhoneOrderResponse.PhoneChargeOrder.Status == ACOOLYConstant.Status.鍏呭�煎け璐�)
{
- status = LifePayOrderStatusEnum.宸插け璐�;
+ status = LifePayOrderStatusEnum.寰呴��娆�;
acoolyStatus = ACOOLYStatusEnum.鍏呭�煎け璐�;
}
else
@@ -157,7 +157,7 @@
else
if (confirmPhoneOrderResponse.PhoneChargeOrder.Status == ACOOLYConstant.Status.澶辫触鍏抽棴)
{
- status = LifePayOrderStatusEnum.宸插け璐�;
+ status = LifePayOrderStatusEnum.寰呴��娆�;
acoolyStatus = ACOOLYStatusEnum.鍏呭�煎け璐�;
}
break;
@@ -170,7 +170,7 @@
if (!confirmGasOrderResponse.Success
|| (confirmGasOrderResponse.Code != ACOOLYConstant.Code.SUCCESS && confirmGasOrderResponse.Code != ACOOLYConstant.Code.PROCESSING))
{
- status = LifePayOrderStatusEnum.宸插け璐�;
+ status = LifePayOrderStatusEnum.寰呴��娆�;
acoolyStatus = ACOOLYStatusEnum.鍏呭�煎け璐�;
}
else
@@ -184,13 +184,13 @@
if (confirmGasOrderResponse.GasChargeOrder.Status == ACOOLYConstant.Status.鍏呭�间腑)
{
- status = LifePayOrderStatusEnum.寰呯‘璁�;
+ status = LifePayOrderStatusEnum.寰呴��娆�;
acoolyStatus = ACOOLYStatusEnum.鍏呭�间腑;
}
else
if (confirmGasOrderResponse.GasChargeOrder.Status == ACOOLYConstant.Status.鍏呭�煎け璐�)
{
- status = LifePayOrderStatusEnum.宸插け璐�;
+ status = LifePayOrderStatusEnum.寰呴��娆�;
acoolyStatus = ACOOLYStatusEnum.鍏呭�煎け璐�;
}
else
@@ -208,7 +208,7 @@
else
if (confirmGasOrderResponse.GasChargeOrder.Status == ACOOLYConstant.Status.澶辫触鍏抽棴)
{
- status = LifePayOrderStatusEnum.宸插け璐�;
+ status = LifePayOrderStatusEnum.寰呴��娆�;
acoolyStatus = ACOOLYStatusEnum.鍏呭�煎け璐�;
}
break;
diff --git a/LifePayment/LifePayment.Worker/Worker/GetStaticsWorker.cs b/LifePayment/LifePayment.Worker/Worker/GetStaticsWorker.cs
index d0e6ef7..4059589 100644
--- a/LifePayment/LifePayment.Worker/Worker/GetStaticsWorker.cs
+++ b/LifePayment/LifePayment.Worker/Worker/GetStaticsWorker.cs
@@ -16,14 +16,14 @@
{
public class GetStaticsWorker : AsyncPeriodicBackgroundWorkerBase
{
- private readonly ILifePayService _lifePayService;
+ private readonly IStatisticsService _statisticService;
private readonly int _doWorkHour = 0;
private readonly int _doWorkMinute = 30;
- public GetStaticsWorker(AbpAsyncTimer timer, IServiceScopeFactory serviceScopeFactory, ILifePayService lifePayService) : base(timer, serviceScopeFactory)
+ public GetStaticsWorker(AbpAsyncTimer timer, IServiceScopeFactory serviceScopeFactory, IStatisticsService statisticService) : base(timer, serviceScopeFactory)
{
- _lifePayService = lifePayService;
+ _statisticService = statisticService;
timer.Period = PeriodTool.CalcuPeriodFromEveryDayTime(_doWorkHour, _doWorkMinute, 0);
- //timer.Period =5 * 60000;
+ //timer.Period =1 * 60000;
}
[UnitOfWork]
@@ -31,7 +31,7 @@
{
try
{
- await _lifePayService.GetTopStatistics();
+ await _statisticService.GetTopStatistics();
Logger.LogError($"鑾峰彇缁熻淇℃伅寮�濮�: {DateTime.Now}");
}
catch (Exception ex)
diff --git a/LifePayment/LifePayment.Worker/appsettings.json b/LifePayment/LifePayment.Worker/appsettings.json
index 6a600f9..93c551b 100644
--- a/LifePayment/LifePayment.Worker/appsettings.json
+++ b/LifePayment/LifePayment.Worker/appsettings.json
@@ -21,10 +21,12 @@
"CorsOrigins": "http://localhost:31804"
},
"ElasticSearch": {
- "Url": "http://localhost:9200"
+ "Url": "http://106.12.151.86:19200",
+ "UserName": "elastic",
+ "PassWord": "bole5201314"
},
"Redis": {
- "Configuration": "localhost:6379"
+ "Configuration": "118.178.252.28:5390,defaultDatabase=5,password=Bole123!"
},
"AliYunSMSSetting": {
"AliYunSmsAccessId": "LTAI4G5qXfYeS14JxEeN9JxF",
@@ -44,6 +46,20 @@
"CheckPath": false,
"AppName": "C绔鎴风"
},
+ "RabbitMQ": {
+ "Connections": {
+ "Default": {
+ "HostName": "118.178.252.28",
+ "UserName": "admin",
+ "Password": "Bole12345678",
+ "Port": "5673"
+ }
+ },
+ "EventBus": {
+ "ClientName": "MsDemo_LifePaymentService_Development_Ling1122",
+ "ExchangeName": "MsDemo_Development_Ling1122"
+ }
+ },
"InitSetting": {
"SelfSupportingServiceName": "澹硅窗鍙佸弫鍙佷俊鎭妧鏈�",
"PlatServicePhone": "13005741111",
--
Gitblit v1.9.1