From f7c706219fe267fb83d8d006e43adb5bed8c436f Mon Sep 17 00:00:00 2001 From: hjhan Date: Thu, 18 Dec 2025 14:25:00 +0800 Subject: [PATCH] =?UTF-8?q?refactor(config):=20=E7=A7=BB=E9=99=A4=E5=86=97?= =?UTF-8?q?=E4=BD=99=E7=9A=84=E5=AE=9E=E6=97=B6=E8=B5=84=E9=87=91=E8=AE=A1?= =?UTF-8?q?=E7=AE=97=E9=85=8D=E7=BD=AE=E9=A1=B9=20=20=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E5=A4=9A=E4=B8=AA=E7=8E=AF=E5=A2=83=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E4=B8=AD=E7=9A=84RealtimeCalcAccountBalance=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=20-=20=E6=9B=B4=E6=96=B0ClientNoDMABalanceTask?= =?UTF-8?q?=E7=B1=BB=E4=B8=AD=E4=BD=BF=E7=94=A8=E7=9A=84=E8=B5=84=E9=87=91?= =?UTF-8?q?=E8=AE=A1=E7=AE=97topic=20-=20=E4=BF=AE=E6=94=B9=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E9=80=BB=E8=BE=91=E4=BB=A5=E5=A4=8D=E7=94=A8=E5=B7=B2?= =?UTF-8?q?=E6=9C=89=E7=9A=84OnRspAccountCapitalTopic=20-=20=E6=B8=85?= =?UTF-8?q?=E7=90=86=E6=97=A0=E7=94=A8=E7=9A=84=E7=8E=AF=E5=A2=83=E5=8F=98?= =?UTF-8?q?=E9=87=8F=E8=AF=BB=E5=8F=96=E9=80=BB=E8=BE=91=20-=20=E7=BB=9F?= =?UTF-8?q?=E4=B8=80=E4=BD=BF=E7=94=A8onRspAccountCapitalTopic=E8=BF=9B?= =?UTF-8?q?=E8=A1=8C=E6=B6=88=E6=81=AF=E7=94=9F=E4=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- YLErpWeb/appsettings.dev.json | 3 +-- YLErpWeb/appsettings.local.json | 3 +-- YLErpWeb/appsettings.prod.json | 1 - .../ClientNoDMABalanceTask.cs | 11 ++++++----- YLWinSer/RealTimeCalcPositionService/appsettings.json | 1 - 5 files changed, 8 insertions(+), 11 deletions(-) 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