From 18bad2af254440e0b323fe10b9833aba7a14bfdc Mon Sep 17 00:00:00 2001
From: Kimdiego2098 <2248356998@qq.com>
Date: Wed, 24 Jan 2024 16:15:26 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4MqttRpc=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ThingsGateway.Foundation/src/OperResult/OperResult.cs  | 3 +++
 .../MqttClient/MqttClient.other.cs                         | 7 ++++---
 .../MqttClient/MqttClientProperty.cs                       | 2 +-
 .../MqttServer/MqttServer.other.cs                         | 7 ++++---
 .../MqttServer/MqttServerProperty.cs                       | 2 +-
 5 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/foundation/ThingsGateway.Foundation/src/OperResult/OperResult.cs b/src/foundation/ThingsGateway.Foundation/src/OperResult/OperResult.cs
index 3721617af..fcf7f6be4 100644
--- a/src/foundation/ThingsGateway.Foundation/src/OperResult/OperResult.cs
+++ b/src/foundation/ThingsGateway.Foundation/src/OperResult/OperResult.cs
@@ -12,6 +12,8 @@
 
 #endregion
 
+using Newtonsoft.Json;
+
 namespace ThingsGateway.Foundation;
 
 /// <inheritdoc/>
@@ -116,6 +118,7 @@ public class OperResult : IOperResult
     /// <summary>
     /// 异常堆栈
     /// </summary>
+    [JsonIgnore]
     public Exception? Exception;
 
     /// <summary>
diff --git a/src/plugin/ThingsGateway.Plugin.Mqtt/MqttClient/MqttClient.other.cs b/src/plugin/ThingsGateway.Plugin.Mqtt/MqttClient/MqttClient.other.cs
index 0b6387c57..ee94aa22e 100644
--- a/src/plugin/ThingsGateway.Plugin.Mqtt/MqttClient/MqttClient.other.cs
+++ b/src/plugin/ThingsGateway.Plugin.Mqtt/MqttClient/MqttClient.other.cs
@@ -157,7 +157,8 @@ public partial class MqttClient : BusinessBaseWithCacheIntervalScript<VariableDa
 
         if (!_driverPropertys.DeviceRpcEnable || string.IsNullOrEmpty(args.ClientId))
             return;
-        if (args.ApplicationMessage.Topic != _driverPropertys.RpcWriteTopic)
+        var t = string.Format(TgMqttRpcClientTopicGenerationStrategy.RpcTopic, _driverPropertys.RpcWriteTopic);
+        if (MqttTopicFilterComparer.Compare(args.ApplicationMessage.Topic, t) != MqttTopicFilterCompareResult.IsMatch)
             return;
         var rpcDatas = Encoding.UTF8.GetString(args.ApplicationMessage.PayloadSegment).FromJsonString<Dictionary<string, string>>();
         if (rpcDatas == null)
@@ -169,7 +170,7 @@ public partial class MqttClient : BusinessBaseWithCacheIntervalScript<VariableDa
             if (isConnect.IsSuccess)
             {
                 var variableMessage = new MqttApplicationMessageBuilder()
-.WithTopic($"{args.ApplicationMessage.Topic}/response")
+.WithTopic($"{args.ApplicationMessage.Topic}/Response")
 .WithPayload(mqttRpcResult.ToJsonString(true)).Build();
                 await _mqttClient.PublishAsync(variableMessage);
             }
@@ -190,7 +191,7 @@ public partial class MqttClient : BusinessBaseWithCacheIntervalScript<VariableDa
                 if (tag != null)
                 {
                     var rpcEnable = tag.GetPropertyValue(DeviceId, nameof(_variablePropertys.VariableRpcEnable))?.Value?.ToBoolean();
-                    if (rpcEnable != true)
+                    if (rpcEnable == false)
                     {
                         mqttRpcResult.Add(rpcData.Key, new("权限不足，变量不支持写入"));
                     }
diff --git a/src/plugin/ThingsGateway.Plugin.Mqtt/MqttClient/MqttClientProperty.cs b/src/plugin/ThingsGateway.Plugin.Mqtt/MqttClient/MqttClientProperty.cs
index 9789c61e8..77388c2e3 100644
--- a/src/plugin/ThingsGateway.Plugin.Mqtt/MqttClient/MqttClientProperty.cs
+++ b/src/plugin/ThingsGateway.Plugin.Mqtt/MqttClient/MqttClientProperty.cs
@@ -80,7 +80,7 @@ public class MqttClientProperty : BusinessPropertyWithCacheIntervalScript
     /// <summary>
     /// Rpc写入Topic
     /// </summary>
-    [DynamicProperty("Rpc写入Topic", "实际的写入主题为固定通配 {ThingsGateway/+/[RpcWrite]} ,其中RpcWrite为该属性填入内容，+通配符是不固定GUID值，每次执行写入时会在不同的主题中返回；返回结果主题会在主题后添加Response , 也就是{ThingsGateway/+/[RpcWrite]/Response}")]
+    [DynamicProperty("Rpc写入Topic", "实际的写入主题为固定通配 {ThingsGateway.Rpc/+/[RpcWrite]} ,其中RpcWrite为该属性填入内容，+通配符是不固定GUID值，每次执行写入时会在不同的主题中返回；返回结果主题会在主题后添加Response , 也就是{ThingsGateway.Rpc/+/[RpcWrite]/Response}")]
     public string RpcWriteTopic
     {
         get
diff --git a/src/plugin/ThingsGateway.Plugin.Mqtt/MqttServer/MqttServer.other.cs b/src/plugin/ThingsGateway.Plugin.Mqtt/MqttServer/MqttServer.other.cs
index 32dcffa52..bc181dfeb 100644
--- a/src/plugin/ThingsGateway.Plugin.Mqtt/MqttServer/MqttServer.other.cs
+++ b/src/plugin/ThingsGateway.Plugin.Mqtt/MqttServer/MqttServer.other.cs
@@ -121,7 +121,8 @@ public partial class MqttServer : BusinessBaseWithCacheIntervalScript<VariableDa
     {
         if (!_driverPropertys.DeviceRpcEnable || string.IsNullOrEmpty(args.ClientId))
             return;
-        if (args.ApplicationMessage.Topic != _driverPropertys.RpcWriteTopic)
+        var t = string.Format(TgMqttRpcClientTopicGenerationStrategy.RpcTopic, _driverPropertys.RpcWriteTopic);
+        if (MqttTopicFilterComparer.Compare(args.ApplicationMessage.Topic, t) != MqttTopicFilterCompareResult.IsMatch)
             return;
         var rpcDatas = Encoding.UTF8.GetString(args.ApplicationMessage.PayloadSegment).FromJsonString<Dictionary<string, string>>();
         if (rpcDatas == null)
@@ -131,7 +132,7 @@ public partial class MqttServer : BusinessBaseWithCacheIntervalScript<VariableDa
         try
         {
             var variableMessage = new MqttApplicationMessageBuilder()
-.WithTopic($"{args.ApplicationMessage.Topic}/response")
+.WithTopic($"{args.ApplicationMessage.Topic}/Response")
 .WithPayload(mqttRpcResult.ToJsonString(true)).Build();
             await _mqttServer.InjectApplicationMessage(
                      new InjectedMqttApplicationMessage(variableMessage));
@@ -152,7 +153,7 @@ public partial class MqttServer : BusinessBaseWithCacheIntervalScript<VariableDa
                 if (tag != null)
                 {
                     var rpcEnable = tag.GetPropertyValue(DeviceId, nameof(_variablePropertys.VariableRpcEnable))?.Value?.ToBoolean();
-                    if (rpcEnable != true)
+                    if (rpcEnable == false)
                     {
                         mqttRpcResult.Add(rpcData.Key, new("权限不足，变量不支持写入"));
                     }
diff --git a/src/plugin/ThingsGateway.Plugin.Mqtt/MqttServer/MqttServerProperty.cs b/src/plugin/ThingsGateway.Plugin.Mqtt/MqttServer/MqttServerProperty.cs
index 792d368e2..65273fdc8 100644
--- a/src/plugin/ThingsGateway.Plugin.Mqtt/MqttServer/MqttServerProperty.cs
+++ b/src/plugin/ThingsGateway.Plugin.Mqtt/MqttServer/MqttServerProperty.cs
@@ -56,7 +56,7 @@ public class MqttServerProperty : BusinessPropertyWithCacheIntervalScript
     /// <summary>
     /// Rpc写入Topic
     /// </summary>
-    [DynamicProperty("Rpc写入Topic", "实际的写入主题为固定通配 {ThingsGateway/+/[RpcWrite]} ,其中RpcWrite为该属性填入内容，+通配符是不固定GUID值，每次执行写入时会在不同的主题中返回；返回结果主题会在主题后添加Response , 也就是{ThingsGateway/+/[RpcWrite]/Response}")]
+    [DynamicProperty("Rpc写入Topic", "实际的写入主题为固定通配 {ThingsGateway.Rpc/+/[RpcWrite]} ,其中RpcWrite为该属性填入内容，+通配符是不固定GUID值，每次执行写入时会在不同的主题中返回；返回结果主题会在主题后添加Response , 也就是{ThingsGateway.Rpc/+/[RpcWrite]/Response}")]
     public string RpcWriteTopic
     {
         get