diff --git a/YLErpWeb/appsettings.dev.json b/YLErpWeb/appsettings.dev.json index 61bdf12d..6d28cf55 100644 --- a/YLErpWeb/appsettings.dev.json +++ b/YLErpWeb/appsettings.dev.json @@ -37,7 +37,6 @@ "HedgingAccountTopic": "ylHedgingAccountTopic", //对冲账户生产topic "ReqAccountCapitalTopic": "ReqAccountCapital", //账户资金请求topic "OnRspAccountCapitalTopic": "OnRspAccountCapital", //账户资金请求返回topic - "RealtimeCalcAccountBalance": "RealtimeCalcAccountBalance", //实时资金计算topic "AccountCapitalTopicGroupId": "YiLian_OnRspAccountCapitalConsumer", //账户资金消费组 "AutoOffsetReset": 1, //Latest(0),Earliest(1),Error(2) "EnableCalcBongd": false, //是否启用kafka计算 @@ -83,4 +82,4 @@ "Urgent": 1, //紧急程度,1一般 2紧急 3加急 "Issend": 0 //流程是否自动发送,0不发送,1自动发送下一步 } -} +} \ No newline at end of file diff --git a/YLErpWeb/appsettings.local.json b/YLErpWeb/appsettings.local.json index 4d38ff0d..e17bfe4f 100644 --- a/YLErpWeb/appsettings.local.json +++ b/YLErpWeb/appsettings.local.json @@ -40,7 +40,6 @@ "AccountCapitalTopicGroupId": "YiLian_OnRspAccountCapitalConsumer", //账户资金消费组 "ReqAccountCapitalTopic": "ReqAccountCapital", //账户资金请求topic "OnRspAccountCapitalTopic": "OnRspAccountCapital", //账户资金请求返回topic - "RealtimeCalcAccountBalance": "RealtimeCalcAccountBalance", //实时资金计算topic "AutoOffsetReset": 1, //Latest(0),Earliest(1),Error(2) "EnableCalcBongd": false, //是否启用kafka计算 "ReqClientRiskCheckTopic": "YiLian_ReqClientRiskCheck", //客户风控检查 @@ -85,4 +84,4 @@ "Urgent": 1, //紧急程度,1一般 2紧急 3加急 "Issend": 0 //流程是否自动发送,0不发送,1自动发送下一步 } -} +} \ No newline at end of file diff --git a/YLErpWeb/appsettings.prod.json b/YLErpWeb/appsettings.prod.json index f9ed854c..aa0e95d8 100644 --- a/YLErpWeb/appsettings.prod.json +++ b/YLErpWeb/appsettings.prod.json @@ -40,7 +40,6 @@ "AccountCapitalTopicGroupId": "YiLian_OnRspAccountCapitalConsumer", //账户资金消费组 "ReqAccountCapitalTopic": "ReqAccountCapital", //账户资金请求topic "OnRspAccountCapitalTopic": "OnRspAccountCapital", //账户资金请求返回topic - "RealtimeCalcAccountBalance": "RealtimeCalcAccountBalance", //实时资金计算topic "AutoOffsetReset": 1, //Latest(0),Earliest(1),Error(2) "EnableCalcBongd": false, //是否启用kafka计算 "ReqClientRiskCheckTopic": "YiLian_ReqClientRiskCheck", //客户风控检查 diff --git a/YLWinSer/RealTimeCalcPositionService/ClientNoDMABalanceTask.cs b/YLWinSer/RealTimeCalcPositionService/ClientNoDMABalanceTask.cs index 1a47e574..7653c14b 100644 --- a/YLWinSer/RealTimeCalcPositionService/ClientNoDMABalanceTask.cs +++ b/YLWinSer/RealTimeCalcPositionService/ClientNoDMABalanceTask.cs @@ -1,4 +1,4 @@ -using Newtonsoft.Json; +using Newtonsoft.Json; using YLErp; using YLErp.Abstract; using YLErp.BLL; @@ -14,13 +14,13 @@ namespace RealTimeCalcPositionService private readonly IYcLogger _logger; private readonly CancellationTokenSource _cts = new CancellationTokenSource(); private IKafkaProduce kafkaProduceHelper; - private string RealtimeCalcAccountBalance = string.Empty; + private string onRspAccountCapitalTopicTopic = string.Empty; private Dictionary clientDic = new Dictionary(); private IYLCache _yLCache; public ClientNoDMABalanceTask(IKafkaProduce kafkaProduce, IYLCache yLCache) { _logger = LogFactory.GetLogger("ClientNoDMABalanceTask"); - RealtimeCalcAccountBalance = Environment.GetEnvironmentVariable("KafkaConfig_RealtimeCalcAccountBalance"); + onRspAccountCapitalTopicTopic = Environment.GetEnvironmentVariable("KafkaConfig_OnRspAccountCapitalTopic"); kafkaProduceHelper = kafkaProduce; _yLCache = yLCache; } @@ -91,7 +91,8 @@ namespace RealTimeCalcPositionService } if (needProduce) { - kafkaProduceHelper.Produce(RealtimeCalcAccountBalance, resultStr); + // 使用原有的topic而不是新增的RealtimeCalcAccountBalance + kafkaProduceHelper.Produce(onRspAccountCapitalTopicTopic, resultStr); } } Thread.Sleep(3000); @@ -110,4 +111,4 @@ namespace RealTimeCalcPositionService await Task.CompletedTask; } } -} +} \ No newline at end of file diff --git a/YLWinSer/RealTimeCalcPositionService/appsettings.json b/YLWinSer/RealTimeCalcPositionService/appsettings.json index 9439601d..26ed92ee 100644 --- a/YLWinSer/RealTimeCalcPositionService/appsettings.json +++ b/YLWinSer/RealTimeCalcPositionService/appsettings.json @@ -36,7 +36,6 @@ "HedgingAccountTopic": "ylHedgingAccountTopic", //对冲账户生产topic "ReqAccountCapitalTopic": "ReqAccountCapital", //账户资金请求topic "OnRspAccountCapitalTopic": "OnRspAccountCapital", //账户资金请求返回topic - "RealtimeCalcAccountBalance": "RealtimeCalcAccountBalance", //实时资金计算topic "AccountCapitalTopicGroupId": "YiLian_OnRspAccountCapitalConsumer", //账户资金消费组 "ReqCalcBondTopic": "ReqCalcBond", //互换成交收益率计算器topic "OnRspCalcBondTopic": "OnRspCalcBond", //互换成交收益率计算器消费topic