From 8adfd623d4d8ec434146759d66792d67a5e3d743 Mon Sep 17 00:00:00 2001
From: zuohuaijun <zuohuaijun@163.com>
Date: Thu, 20 Feb 2025 02:35:44 +0800
Subject: [PATCH 1/9] =?UTF-8?q?=F0=9F=98=8E=E4=BC=98=E5=8C=96=E6=B8=85?=
 =?UTF-8?q?=E7=90=86=E5=9C=A8=E7=BA=BF=E7=94=A8=E6=88=B7=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/OnlineUser/SysOnlineUserService.cs               | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Admin.NET/Admin.NET.Core/Service/OnlineUser/SysOnlineUserService.cs b/Admin.NET/Admin.NET.Core/Service/OnlineUser/SysOnlineUserService.cs
index d2068f89..46683ba3 100644
--- a/Admin.NET/Admin.NET.Core/Service/OnlineUser/SysOnlineUserService.cs
+++ b/Admin.NET/Admin.NET.Core/Service/OnlineUser/SysOnlineUserService.cs
@@ -119,14 +119,15 @@ public class SysOnlineUserService : IDynamicApiController, ITransient
         if (await _sysConfigService.GetConfigValueByCode<bool>(ConfigConst.SysSingleLogin)) return;
 
         // 相同账号最后登录的用户Id集合
-        var onlineUserIds = await _sysOnlineUerRep.AsQueryable().GroupBy(u => u.UserId)
+        var onlineUsers = await _sysOnlineUerRep.AsQueryable().GroupBy(u => u.UserId)
             .Select(u => new
             {
                 UserId = u.UserId,
                 Count = SqlFunc.AggregateCount(u.UserId),
                 Id = SqlFunc.AggregateMax(u.Id)
             })
-            .ToListAsync(u => u.Id);
+            .ToListAsync();
+        var onlineUserIds = onlineUsers.Select(u => u.Id).ToList();
 
         // 无效登录用户集合
         var offlineUsers = await _sysOnlineUerRep.AsQueryable().Where(u => !onlineUserIds.Contains(u.Id)).ToListAsync();

From efeb9f843ee4c1f8fe46bcc5a99b3ca8abce3ee6 Mon Sep 17 00:00:00 2001
From: zuohuaijun <zuohuaijun@163.com>
Date: Thu, 20 Feb 2025 03:42:45 +0800
Subject: [PATCH 2/9] =?UTF-8?q?=F0=9F=98=8E=E8=B0=83=E6=95=B4=E5=AD=97?=
 =?UTF-8?q?=E5=85=B8=E7=9B=B8=E5=85=B3=E5=AF=B9=E5=BA=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../OnlineUser/SysOnlineUserService.cs        |  3 +-
 .../wwwroot/template/web_views_List.vue.vm    |  6 +--
 .../template/web_views_editDialog.vue.vm      |  2 -
 .../template/web_views_el_table_index.vue.vm  |  6 +--
 Web/package.json                              |  4 +-
 Web/src/stores/userInfo.ts                    | 42 +++++++++----------
 .../codeGen/component/genConfigDialog.vue     |  4 +-
 .../views/system/org/component/editOrg.vue    |  2 +-
 Web/src/views/system/org/index.vue            |  2 +-
 9 files changed, 35 insertions(+), 36 deletions(-)

diff --git a/Admin.NET/Admin.NET.Core/Service/OnlineUser/SysOnlineUserService.cs b/Admin.NET/Admin.NET.Core/Service/OnlineUser/SysOnlineUserService.cs
index 46683ba3..c6441b0f 100644
--- a/Admin.NET/Admin.NET.Core/Service/OnlineUser/SysOnlineUserService.cs
+++ b/Admin.NET/Admin.NET.Core/Service/OnlineUser/SysOnlineUserService.cs
@@ -127,9 +127,10 @@ public class SysOnlineUserService : IDynamicApiController, ITransient
                 Id = SqlFunc.AggregateMax(u.Id)
             })
             .ToListAsync();
-        var onlineUserIds = onlineUsers.Select(u => u.Id).ToList();
+        if (onlineUsers.Count < 1) return;
 
         // 无效登录用户集合
+        var onlineUserIds = onlineUsers.Select(u => u.Id).ToList();
         var offlineUsers = await _sysOnlineUerRep.AsQueryable().Where(u => !onlineUserIds.Contains(u.Id)).ToListAsync();
         foreach (var user in offlineUsers)
         {
diff --git a/Admin.NET/Admin.NET.Web.Entry/wwwroot/template/web_views_List.vue.vm b/Admin.NET/Admin.NET.Web.Entry/wwwroot/template/web_views_List.vue.vm
index 19957ec7..171b618e 100644
--- a/Admin.NET/Admin.NET.Web.Entry/wwwroot/template/web_views_List.vue.vm
+++ b/Admin.NET/Admin.NET.Web.Entry/wwwroot/template/web_views_List.vue.vm
@@ -165,7 +165,7 @@
 				@:</template>
 						} else if(@column.EffectType == "DictSelector") {
 				@:<template #row_@(@column.LowerPropertyName)="{ row }">
-					@:<el-tag  v-if="row.@(@column.LowerPropertyName)" :type="dc('@(@column.DictTypeCode)', row.@(@column.LowerPropertyName))?.tagType"> {{dc('@(@column.DictTypeCode)', row.@column.LowerPropertyName)?.value}}</el-tag>
+					@:<el-tag  v-if="row.@(@column.LowerPropertyName)" :type="dc('@(@column.DictTypeCode)', row.@(@column.LowerPropertyName))?.tagType"> {{dc('@(@column.DictTypeCode)', row.@column.LowerPropertyName)?.label}}</el-tag>
 				@:</template>
 						} else if(@column.EffectType == "EnumSelector") {
 				@:<template #row_@(@column.LowerPropertyName)="{ row }">
@@ -258,8 +258,8 @@ const userStore = useUserInfo();
 @:const codeToName = userStore.codeToName;
 }
 @if(@Model.TableField.Any(x=>x.EffectType == "DictSelector") || @Model.TableField.Any(x=>x.EffectType == "EnumSelector")){
-@:const dc = userStore.getDictItemByCode;
-@:const dv = userStore.getDictLabelByVal;
+@:const dc = userStore.getDictItemByValue;
+@:const dv = userStore.getDictItemByLabel;
 @:const dl = userStore.getDictDataByCode;
 }
 
diff --git a/Admin.NET/Admin.NET.Web.Entry/wwwroot/template/web_views_editDialog.vue.vm b/Admin.NET/Admin.NET.Web.Entry/wwwroot/template/web_views_editDialog.vue.vm
index 692c0950..80f207a8 100644
--- a/Admin.NET/Admin.NET.Web.Entry/wwwroot/template/web_views_editDialog.vue.vm
+++ b/Admin.NET/Admin.NET.Web.Entry/wwwroot/template/web_views_editDialog.vue.vm
@@ -224,8 +224,6 @@ const userStore = useUserInfo();
 @:const getConstType = userStore.getConstDataByTypeCode;
 }
 @if(@Model.TableField.Any(x=>x.EffectType == "DictSelector") || @Model.TableField.Any(x=>x.EffectType == "EnumSelector")){
-//@:const dc = userStore.getDictItemByCode;
-//@:const dv = userStore.getDictLabelByVal;
 @:const dl = userStore.getDictDataByCode;
 }
 
diff --git a/Admin.NET/Admin.NET.Web.Entry/wwwroot/template/web_views_el_table_index.vue.vm b/Admin.NET/Admin.NET.Web.Entry/wwwroot/template/web_views_el_table_index.vue.vm
index 9270788d..a0f30f8e 100644
--- a/Admin.NET/Admin.NET.Web.Entry/wwwroot/template/web_views_el_table_index.vue.vm
+++ b/Admin.NET/Admin.NET.Web.Entry/wwwroot/template/web_views_el_table_index.vue.vm
@@ -158,7 +158,7 @@
         else if(@column.EffectType == "DictSelector"){
           @:<el-table-column prop="@column.LowerPropertyName" label="@column.ColumnComment" @(column.WhetherSortable == "Y" ? "sortable='custom'" : "") show-overflow-tooltip="" >
             @:<template #default="scope">
-              @:<el-tag :type="dc('@(@column.DictTypeCode)', scope.row.@(@column.LowerPropertyName))?.tagType"> {{dc("@(@column.DictTypeCode)", scope.row.@(@column.LowerPropertyName))?.value}} </el-tag>
+              @:<el-tag :type="dc('@(@column.DictTypeCode)', scope.row.@(@column.LowerPropertyName))?.tagType"> {{dc("@(@column.DictTypeCode)", scope.row.@(@column.LowerPropertyName))?.label}} </el-tag>
             @:</template>
           @:</el-table-column>
         }
@@ -251,8 +251,8 @@
   @:const codeToName = userStore.codeToName;
   }
   @if(@Model.TableField.Any(x=>x.EffectType == "DictSelector") || @Model.TableField.Any(x=>x.EffectType == "EnumSelector")){
-  @:const dc = userStore.getDictItemByCode;
-  @:const dv = userStore.getDictLabelByVal;
+  @:const dc = userStore.getDictItemByValue;
+  @:const dv = userStore.getDictItemByLabel;
   @:const dl = userStore.getDictDataByCode;
   }
 
diff --git a/Web/package.json b/Web/package.json
index afa7570d..bb06f10f 100644
--- a/Web/package.json
+++ b/Web/package.json
@@ -2,7 +2,7 @@
 	"name": "admin.net.pro",
 	"type": "module",
 	"version": "2.4.33",
-	"lastBuildTime": "2025.02.18",
+	"lastBuildTime": "2025.02.20",
 	"description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架",
 	"author": "zuohuaijun",
 	"license": "MIT",
@@ -103,7 +103,7 @@
 		"sass": "^1.85.0",
 		"terser": "^5.39.0",
 		"typescript": "^5.7.3",
-		"vite": "^6.1.0",
+		"vite": "^6.1.1",
 		"vite-plugin-cdn-import": "^1.0.1",
 		"vite-plugin-compression2": "^1.3.3",
 		"vite-plugin-vue-setup-extend": "^0.4.0",
diff --git a/Web/src/stores/userInfo.ts b/Web/src/stores/userInfo.ts
index 00454b97..d64b7f8b 100644
--- a/Web/src/stores/userInfo.ts
+++ b/Web/src/stores/userInfo.ts
@@ -139,18 +139,23 @@ export const useUserInfo = defineStore('userInfo', {
 			return data.find((item: any) => item.code === itemCode)?.name;
 		},
 
+		// 常量编码和名称转换
+		codeToName(code: any, type: any) {
+			return this.constList.find((x: any) => x.code === type).data.result.find((x: any) => x.code === code)?.name;
+		},
+
 		// 根据字典类型获取字典数据
 		getDictDataByCode(dictTypeCode: string) {
 			return this.dictList[dictTypeCode] || [];
 		},
 
-		// 根据字典类型和代码取字典项
-		getDictItemByCode(typePCode: string, code: string) {
-			if (code != undefined && code !== '') {
-				const _code = code.toString();
-				const ds = this.getDictDataByCode(typePCode);
+		// 根据字典类型和值获取取字典项
+		getDictItemByValue(dictTypeCode: string, value: string) {
+			if (value != undefined && value !== '') {
+				const _value = value.toString();
+				const ds = this.dictList[dictTypeCode] || [];
 				for (const element of ds) {
-					if (element.code == _code) {
+					if (element.value == _value) {
 						return element;
 					}
 				}
@@ -158,30 +163,25 @@ export const useUserInfo = defineStore('userInfo', {
 			return {};
 		},
 
-		// 根据字典类型和值取描述
-		getDictLabelByVal(typePCode: string, val: string) {
-			if (val != undefined && val !== '') {
-				const _val = val.toString();
-				const ds = this.getDictDataByCode(typePCode);
+		// 根据字典类型和名称获取取字典项
+		getDictItemByLabel(dictTypeCode: string, label: string) {
+			if (label != undefined && label !== '') {
+				const _label = label.toString();
+				const ds = this.dictList[dictTypeCode] || [];
 				for (const element of ds) {
-					if (element.value == _val) {
+					if (element.label == _label) {
 						return element;
 					}
 				}
 			}
 			return {};
 		},
-
-		// 常量编码和名称转换
-		codeToName(code: any, type: any) {
-			return this.constList.find((x: any) => x.code === type).data.result.find((x: any) => x.code === code)?.name;
-		},
 	},
 });
 
-// 处理字典国际化, 默认显示字典中的value值
+// 处理字典国际化, 默认显示字典中的label值
 const setDictLangMessageAsync = async (dict: any) => {
-	dict.langMessage = `message.system.dictType.${dict.typeCode}.${dict.code}`;
-	const value = t(dict.langMessage);
-	dict.value = value !== dict.langMessage ? value : dict.value;
+	dict.langMessage = `message.dictType.${dict.typeCode}_${dict.value}`;
+	const text = t(dict.langMessage);
+	dict.label = text !== dict.langMessage ? text : dict.label;
 };
diff --git a/Web/src/views/system/codeGen/component/genConfigDialog.vue b/Web/src/views/system/codeGen/component/genConfigDialog.vue
index b2f7a487..db307ae2 100644
--- a/Web/src/views/system/codeGen/component/genConfigDialog.vue
+++ b/Web/src/views/system/codeGen/component/genConfigDialog.vue
@@ -10,7 +10,7 @@
 					</template>
 					<template #effectType="{ row, $index }">
 						<vxe-select v-model="row.effectType" class="m-2" style="width: 70%" placeholder="Select" transfer :disabled="judgeColumns(row)" @change="effectTypeChange(row, $index)" filterable>
-							<vxe-option v-for="item in state.effectTypeList" :key="item.code" :label="item.value" :value="item.code" />
+							<vxe-option v-for="item in state.effectTypeList" :key="item.value" :label="item.label" :value="item.value" />
 						</vxe-select>
 						<vxe-button v-if="row.effectType === 'ApiTreeSelector' || row.effectType === 'ForeignKey'" style="width: 30%" icon="vxe-icon-edit" @click="effectTypeChange(row, $index)">修改</vxe-button>
 					</template>
@@ -43,7 +43,7 @@
 					</template>
 					<template #queryType="{ row }">
 						<vxe-select v-model="row.queryType" class="m-2" placeholder="Select" :disabled="!row.queryWhether" filterable transfer>
-							<vxe-option v-for="item in state.queryTypeList" :key="item.code" :label="item.value" :value="item.code" />
+							<vxe-option v-for="item in state.queryTypeList" :key="item.value" :label="item.label" :value="item.value" />
 						</vxe-select>
 					</template>
 					<template #verification="{ row }">
diff --git a/Web/src/views/system/org/component/editOrg.vue b/Web/src/views/system/org/component/editOrg.vue
index 2ee246e2..8bc16005 100644
--- a/Web/src/views/system/org/component/editOrg.vue
+++ b/Web/src/views/system/org/component/editOrg.vue
@@ -37,7 +37,7 @@
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
 						<el-form-item label="机构类型">
 							<el-select v-model="state.ruleForm.type" filterable clearable class="w100">
-								<el-option v-for="item in state.orgTypeList" :key="item.value" :label="item.value" :value="item.code" />
+								<el-option v-for="item in state.orgTypeList" :key="item.value" :label="item.label" :value="item.value" />
 							</el-select>
 						</el-form-item>
 					</el-col>
diff --git a/Web/src/views/system/org/index.vue b/Web/src/views/system/org/index.vue
index dc95b472..078a9ca1 100644
--- a/Web/src/views/system/org/index.vue
+++ b/Web/src/views/system/org/index.vue
@@ -21,7 +21,7 @@
 							<el-col class="mb5" :xs="24" :sm="12" :md="8" :lg="6" :xl="6">
 								<el-form-item label="机构类型" prop="type">
 									<el-select v-model="state.queryParams.type" filterable clearable class="w100" @clear="state.queryParams.type = undefined">
-										<el-option v-for="item in state.orgTypeList" :key="item.value" :label="item.value" :value="item.code" />
+										<el-option v-for="item in state.orgTypeList" :key="item.value" :label="item.label" :value="item.value" />
 									</el-select>
 								</el-form-item>
 							</el-col>

From 42dc3b479fa32e1d6f8329b059bd9e22032b1e65 Mon Sep 17 00:00:00 2001
From: zuohuaijun <zuohuaijun@163.com>
Date: Thu, 20 Feb 2025 09:44:03 +0800
Subject: [PATCH 3/9] =?UTF-8?q?=F0=9F=98=8E1=E3=80=81=E5=A2=9E=E5=8A=A0=20?=
 =?UTF-8?q?MQTT=20=E7=9B=B8=E5=85=B3WebAPI=20=202=E3=80=81=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E8=BF=9C=E7=A8=8B=E8=AF=B7=E6=B1=82=E5=AE=9A=E6=97=B6?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E8=84=9A=E6=9C=AC=20=20=203=E3=80=81?=
 =?UTF-8?q?=E5=8D=87=E7=BA=A7=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin.NET.Core/Admin.NET.Core.csproj      |  8 ++---
 .../{Mqtt => Job}/MqttHostedService.cs        |  7 +----
 .../Service/Mqtt/SysMqttService.cs            | 31 +++++++++++++++++++
 .../system/job/component/JobScriptCode.ts     |  6 ++--
 4 files changed, 40 insertions(+), 12 deletions(-)
 rename Admin.NET/Admin.NET.Core/{Mqtt => Job}/MqttHostedService.cs (98%)
 create mode 100644 Admin.NET/Admin.NET.Core/Service/Mqtt/SysMqttService.cs

diff --git a/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj b/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj
index e349147c..d6f747bb 100644
--- a/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj
+++ b/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj
@@ -20,9 +20,9 @@
     <PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
     <PackageReference Include="BouncyCastle.Cryptography" Version="2.5.1" Aliases="BouncyCastleV2" />
     <PackageReference Include="Elastic.Clients.Elasticsearch" Version="8.17.1" />
-    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.7.8" />
-    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.8" />
-    <PackageReference Include="Furion.Pure" Version="4.9.7.8" />
+    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.7.9" />
+    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.9" />
+    <PackageReference Include="Furion.Pure" Version="4.9.7.9" />
     <PackageReference Include="Hardware.Info" Version="101.0.1" />
     <PackageReference Include="Hashids.net" Version="1.7.0" />
     <PackageReference Include="IPTools.China" Version="1.6.0" />
@@ -40,7 +40,7 @@
     <PackageReference Include="Novell.Directory.Ldap.NETStandard" Version="3.6.0" />
     <PackageReference Include="OnceMi.AspNetCore.OSS" Version="1.2.0" />
     <PackageReference Include="QRCoder" Version="1.6.0" />
-    <PackageReference Include="RabbitMQ.Client" Version="7.0.0" />
+    <PackageReference Include="RabbitMQ.Client" Version="7.1.0" />
     <PackageReference Include="SixLabors.ImageSharp.Web" Version="3.1.3" />
     <PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="3.7.0" />
     <PackageReference Include="SKIT.FlurlHttpClient.Wechat.TenpayV3" Version="3.10.0" />
diff --git a/Admin.NET/Admin.NET.Core/Mqtt/MqttHostedService.cs b/Admin.NET/Admin.NET.Core/Job/MqttHostedService.cs
similarity index 98%
rename from Admin.NET/Admin.NET.Core/Mqtt/MqttHostedService.cs
rename to Admin.NET/Admin.NET.Core/Job/MqttHostedService.cs
index 2fc64a1d..1e0e76d4 100644
--- a/Admin.NET/Admin.NET.Core/Mqtt/MqttHostedService.cs
+++ b/Admin.NET/Admin.NET.Core/Job/MqttHostedService.cs
@@ -17,7 +17,7 @@ using System.Threading.Tasks;
 /// <summary>
 /// MQTT 服务
 /// </summary>
-public class MqttHostedService(IOptions<MqttOptions> mqttOptions, ISqlSugarClient db) : IHostedService, IDisposable
+public class MqttHostedService(IOptions<MqttOptions> mqttOptions, ISqlSugarClient db) : IHostedService, ITransient
 {
     private const string ServerClientId = "Admin.NET.MQTT";
     public MqttServer MqttServer { get; set; }
@@ -181,9 +181,4 @@ public class MqttHostedService(IOptions<MqttOptions> mqttOptions, ISqlSugarClien
     {
         return Task.CompletedTask;
     }
-
-    public void Dispose()
-    {
-        throw new NotImplementedException();
-    }
 }
\ No newline at end of file
diff --git a/Admin.NET/Admin.NET.Core/Service/Mqtt/SysMqttService.cs b/Admin.NET/Admin.NET.Core/Service/Mqtt/SysMqttService.cs
new file mode 100644
index 00000000..7f054256
--- /dev/null
+++ b/Admin.NET/Admin.NET.Core/Service/Mqtt/SysMqttService.cs
@@ -0,0 +1,31 @@
+// Admin.NET 项目的版权、商标、专利和其他相关权利均受相应法律法规的保护。使用本项目应遵守相关法律法规和许可证的要求。
+//
+// 本项目主要遵循 MIT 许可证和 Apache 许可证（版本 2.0）进行分发和使用。许可证位于源代码树根目录中的 LICENSE-MIT 和 LICENSE-APACHE 文件。
+//
+// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！
+
+using MQTTnet.Server;
+
+namespace Admin.NET.Core.Service;
+
+/// <summary>
+/// 系统 MQTT 服务 🧩
+/// </summary>
+[ApiDescriptionSettings(Order = 90, Description = "MQTT 服务")]
+public class SysMqttService(MqttHostedService mqttHostedService) : IDynamicApiController, ITransient
+{
+    private readonly MqttHostedService _mqttHostedService = mqttHostedService;
+
+    /// <summary>
+    /// 获取客户端列表 🔖
+    /// </summary>
+    /// <returns></returns>
+    [DisplayName("获取客户端列表")]
+    public async Task<IList<MqttClientStatus>> GetClients()
+    {
+        if (_mqttHostedService.MqttServer == null)
+            throw Oops.Oh("【MQTT】服务未启动");
+
+        return await _mqttHostedService.MqttServer.GetClientsAsync();
+    }
+}
\ No newline at end of file
diff --git a/Web/src/views/system/job/component/JobScriptCode.ts b/Web/src/views/system/job/component/JobScriptCode.ts
index 344f3021..b83eb832 100644
--- a/Web/src/views/system/job/component/JobScriptCode.ts
+++ b/Web/src/views/system/job/component/JobScriptCode.ts
@@ -7,8 +7,8 @@ export const JobScriptCode = `// Admin.NET 项目的版权、商标、专利和
 #region using
 
 using Furion;
+using Furion.HttpRemote;
 using Furion.Logging;
-using Furion.RemoteRequest.Extensions;
 using Furion.Schedule;
 using Microsoft.Extensions.DependencyInjection;
 using System;
@@ -45,7 +45,9 @@ public class DynamicJob : IJob
         // var rep = serviceScope.ServiceProvider.GetService<SqlSugarRepository<SysUser>>();
 
         // 请求网址
-        // var result = await "http://www.baidu.com".GetAsStringAsync();
+        // var url = "http://www.baidu.com";
+        // var httpRemoteService = App.GetRequiredService<IHttpRemoteService>();
+        // var result = await httpRemoteService.GetAsStringAsync(url);
         // Console.WriteLine(result);
 
         // 日志

From 9a4407017d0477e8faf7116452612f8440bd3efc Mon Sep 17 00:00:00 2001
From: zuohuaijun <zuohuaijun@163.com>
Date: Thu, 20 Feb 2025 13:04:05 +0800
Subject: [PATCH 4/9] =?UTF-8?q?=F0=9F=98=8E=E8=B0=83=E6=95=B4=20MTQTT=20?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=B3=A8=E5=85=A5=E4=B8=8E=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Admin.NET/Admin.NET.Core/Job/MqttHostedService.cs       | 4 ++--
 Admin.NET/Admin.NET.Core/Service/Mqtt/SysMqttService.cs | 8 +++-----
 Web/package.json                                        | 2 +-
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/Admin.NET/Admin.NET.Core/Job/MqttHostedService.cs b/Admin.NET/Admin.NET.Core/Job/MqttHostedService.cs
index 1e0e76d4..cbea4875 100644
--- a/Admin.NET/Admin.NET.Core/Job/MqttHostedService.cs
+++ b/Admin.NET/Admin.NET.Core/Job/MqttHostedService.cs
@@ -17,10 +17,10 @@ using System.Threading.Tasks;
 /// <summary>
 /// MQTT 服务
 /// </summary>
-public class MqttHostedService(IOptions<MqttOptions> mqttOptions, ISqlSugarClient db) : IHostedService, ITransient
+public class MqttHostedService(IOptions<MqttOptions> mqttOptions, ISqlSugarClient db) : IHostedService, ISingleton
 {
     private const string ServerClientId = "Admin.NET.MQTT";
-    public MqttServer MqttServer { get; set; }
+    public static MqttServer MqttServer { get; set; }
     private readonly MqttOptions _mqttOptions = mqttOptions.Value;
     private readonly ISqlSugarClient _db = db;
 
diff --git a/Admin.NET/Admin.NET.Core/Service/Mqtt/SysMqttService.cs b/Admin.NET/Admin.NET.Core/Service/Mqtt/SysMqttService.cs
index 7f054256..231a8b29 100644
--- a/Admin.NET/Admin.NET.Core/Service/Mqtt/SysMqttService.cs
+++ b/Admin.NET/Admin.NET.Core/Service/Mqtt/SysMqttService.cs
@@ -12,10 +12,8 @@ namespace Admin.NET.Core.Service;
 /// 系统 MQTT 服务 🧩
 /// </summary>
 [ApiDescriptionSettings(Order = 90, Description = "MQTT 服务")]
-public class SysMqttService(MqttHostedService mqttHostedService) : IDynamicApiController, ITransient
+public class SysMqttService() : IDynamicApiController, ITransient
 {
-    private readonly MqttHostedService _mqttHostedService = mqttHostedService;
-
     /// <summary>
     /// 获取客户端列表 🔖
     /// </summary>
@@ -23,9 +21,9 @@ public class SysMqttService(MqttHostedService mqttHostedService) : IDynamicApiCo
     [DisplayName("获取客户端列表")]
     public async Task<IList<MqttClientStatus>> GetClients()
     {
-        if (_mqttHostedService.MqttServer == null)
+        if (MqttHostedService.MqttServer == null)
             throw Oops.Oh("【MQTT】服务未启动");
 
-        return await _mqttHostedService.MqttServer.GetClientsAsync();
+        return await MqttHostedService.MqttServer.GetClientsAsync();
     }
 }
\ No newline at end of file
diff --git a/Web/package.json b/Web/package.json
index bb06f10f..001b344e 100644
--- a/Web/package.json
+++ b/Web/package.json
@@ -74,7 +74,7 @@
 		"vue-router": "^4.5.0",
 		"vue-signature-pad": "^3.0.2",
 		"vue3-tree-org": "^4.2.2",
-		"vxe-pc-ui": "^4.3.90",
+		"vxe-pc-ui": "^4.3.91",
 		"vxe-table": "^4.10.0",
 		"vxe-table-plugin-element": "^4.0.4",
 		"vxe-table-plugin-export-xlsx": "^4.0.7",

From f4afd8e9005f8b548fbfcb5ef4cdb1e28d69a05b Mon Sep 17 00:00:00 2001
From: yzp <yzp0755@qq.com>
Date: Fri, 21 Feb 2025 15:24:35 +0800
Subject: [PATCH 5/9] =?UTF-8?q?=E5=A2=9E=E5=8A=A0MqttEventHandler=E7=B1=BB?=
 =?UTF-8?q?=E7=94=A8=E4=BA=8E=E5=A4=84=E7=90=86Mqtt=E4=B8=9A=E5=8A=A1?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E7=9A=84=E4=BA=8B=E4=BB=B6=EF=BC=8C=E4=BD=BF?=
 =?UTF-8?q?=E6=A1=86=E6=9E=B6=E5=88=9D=E5=A7=8B=E5=8C=96=E7=9A=84=E6=A0=B8?=
 =?UTF-8?q?=E5=BF=83=E4=BB=A3=E7=A0=81=E4=B8=8D=E9=9C=80=E8=A6=81=E6=A0=B9?=
 =?UTF-8?q?=E6=8D=AE=E4=B8=9A=E5=8A=A1=E7=9A=84=E5=8A=9F=E8=83=BD=E4=BA=A7?=
 =?UTF-8?q?=E7=94=9F=E5=8F=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Configuration/Mqtt.json                   |  10 +-
 .../Admin.NET.Core/Job/MqttHostedService.cs   | 144 +++++++++++-------
 .../Admin.NET.Core/Mqtt/MqttEventHandler.cs   |  90 +++++++++++
 .../Mqtt/MqttEventHandlerForAdminNet.cs       |  43 ++++++
 .../Admin.NET.Core/Option/MqttOptions.cs      |  74 +++++----
 .../Service/Mqtt/MqttService.cs               |  34 +++++
 Admin.NET/Admin.NET.Web.Core/Startup.cs       |  16 ++
 7 files changed, 330 insertions(+), 81 deletions(-)
 create mode 100644 Admin.NET/Admin.NET.Core/Mqtt/MqttEventHandler.cs
 create mode 100644 Admin.NET/Admin.NET.Core/Mqtt/MqttEventHandlerForAdminNet.cs
 create mode 100644 Admin.NET/Admin.NET.Core/Service/Mqtt/MqttService.cs

diff --git a/Admin.NET/Admin.NET.Application/Configuration/Mqtt.json b/Admin.NET/Admin.NET.Application/Configuration/Mqtt.json
index 427640ef..c9afa21a 100644
--- a/Admin.NET/Admin.NET.Application/Configuration/Mqtt.json
+++ b/Admin.NET/Admin.NET.Application/Configuration/Mqtt.json
@@ -1,10 +1,14 @@
-{
+{
   "$schema": "https://gitee.com/dotnetchina/Furion/raw/v4/schemas/v4/furion-schema.json",
 
   // MQTT 配置
   "Mqtt": {
-    "Enabled": false, // 是否开启
-    "Port": "5001",
+    "MqttServerId": "MqttServer", // 服务器主动发布时用的ClientId
+    "Enabled": true, // 是否开启
+    "Logging": true, // 记录文件日志
+    "ConsoleOutput": true, // 输出控制台日志
+    "ConnectionBacklog": 1000,
+    "Port": "1883",
     "IPAddress": ""
   }
 }
\ No newline at end of file
diff --git a/Admin.NET/Admin.NET.Core/Job/MqttHostedService.cs b/Admin.NET/Admin.NET.Core/Job/MqttHostedService.cs
index cbea4875..b132df76 100644
--- a/Admin.NET/Admin.NET.Core/Job/MqttHostedService.cs
+++ b/Admin.NET/Admin.NET.Core/Job/MqttHostedService.cs
@@ -4,9 +4,11 @@
 //
 // 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！
 
-namespace Admin.NET.Core;
-
+namespace Admin.NET.Core;
+
+using Furion.Logging.Extensions;
 using Microsoft.Extensions.Hosting;
+using MQTTnet;
 using MQTTnet.Protocol;
 using MQTTnet.Server;
 using System;
@@ -22,17 +24,46 @@ public class MqttHostedService(IOptions<MqttOptions> mqttOptions, ISqlSugarClien
     private const string ServerClientId = "Admin.NET.MQTT";
     public static MqttServer MqttServer { get; set; }
     private readonly MqttOptions _mqttOptions = mqttOptions.Value;
-    private readonly ISqlSugarClient _db = db;
-
+    private readonly ISqlSugarClient _db = db;
+    private bool _isLogging = false;
+    private bool _consoleOutput = false;
+
+    static List<MqttEventHandler> mqttEventHandlers = new List<MqttEventHandler>();
+
+    public static void RegistMqttEventHandler(MqttEventHandler eh, int order)
+    {
+        eh.Order = order;
+        mqttEventHandlers.Add(eh);
+        mqttEventHandlers.Sort((a,b) => b.Order - a.Order);
+    }
+
+    public async void PublicMessage(string topic, string message)
+    {
+        // 创建一个 MQTT 应用消息
+        var applicationMessage = new MqttApplicationMessageBuilder()
+           .WithTopic(topic)
+           .WithPayload(message)
+           .Build();
+
+        // 记录日志
+        Log($"服务器发布主题： {topic}, 内容：{message}");
+        await MqttServer.InjectApplicationMessage(new InjectedMqttApplicationMessage(applicationMessage)
+        {
+            SenderClientId = _mqttOptions.MqttServerId
+        });
+    }
+
     public async Task StartAsync(CancellationToken cancellationToken)
     {
         if (!_mqttOptions.Enabled) return;
+        _isLogging = _mqttOptions.Logging;
+        _consoleOutput = _mqttOptions.ConsoleOutput;
 
         var options = new MqttServerOptionsBuilder()
             .WithDefaultEndpoint() // 默认地址127.0.0.1
             .WithDefaultEndpointPort(_mqttOptions.Port) // 端口号
             //.WithDefaultEndpointBoundIPAddress(_mqttOptions.IPAddress) // IP地址
-            .WithConnectionBacklog(1000) // 最大连接数
+            .WithConnectionBacklog(_mqttOptions.ConnectionBacklog) // 最大连接数
             .WithPersistentSessions()
             .Build();
 
@@ -68,10 +99,13 @@ public class MqttHostedService(IOptions<MqttOptions> mqttOptions, ISqlSugarClien
     /// </summary>
     /// <param name="arg"></param>
     /// <returns></returns>
-    private Task MqttServer_StoppedAsync(EventArgs arg)
+    private async Task MqttServer_StoppedAsync(EventArgs arg)
     {
-        Console.WriteLine($"【MQTT】服务已关闭...... {DateTime.Now}");
-        return Task.CompletedTask;
+        Console.WriteLine($"【MQTT】服务已关闭...... {DateTime.Now}");
+        foreach (var eh in mqttEventHandlers)
+        {
+            await eh.StoppedAsync(arg);
+        }
     }
 
     /// <summary>
@@ -79,32 +113,14 @@ public class MqttHostedService(IOptions<MqttOptions> mqttOptions, ISqlSugarClien
     /// </summary>
     /// <param name="arg"></param>
     /// <returns></returns>
-    private Task MqttServer_ValidatingConnectionAsync(ValidatingConnectionEventArgs arg)
+    private async Task MqttServer_ValidatingConnectionAsync(ValidatingConnectionEventArgs arg)
     {
-        arg.ReasonCode = MqttConnectReasonCode.Success;
-
-        // 验证账号
-        var user = _db.Queryable<SysUser>().First(u => u.Account == arg.UserName);
-        if (user == null)
-        {
-            arg.ReasonCode = MqttConnectReasonCode.BadUserNameOrPassword;
-            Console.WriteLine($"客户端验证：客户端ID=【{arg.ClientId}】用户名或密码验证错误 {DateTime.Now} ");
-            throw Oops.Oh("MQTT客户端验证：账号不能为空或不存在！");
+        foreach (var eh in mqttEventHandlers)
+        {
+            await eh.ValidatingConnectionAsync(arg);
+            if (arg.ReasonCode != MqttConnectReasonCode.Success)
+                break;
         }
-
-        // 验证密码
-        var password = arg.Password;
-        if (CryptogramUtil.CryptoType == CryptogramEnum.MD5.ToString())
-        {
-            if (user.Password.Equals(MD5Encryption.Encrypt(password))) return Task.CompletedTask;
-        }
-        else
-        {
-            if (CryptogramUtil.Decrypt(user.Password).Equals(password)) return Task.CompletedTask;
-        }
-        arg.ReasonCode = MqttConnectReasonCode.BadUserNameOrPassword;
-        Console.WriteLine($"客户端验证：客户端ID=【{arg.ClientId}】用户名或密码验证错误 {DateTime.Now} ");
-        throw Oops.Oh("MQTT客户端验证：密码错误！");
     }
 
     /// <summary>
@@ -112,10 +128,13 @@ public class MqttHostedService(IOptions<MqttOptions> mqttOptions, ISqlSugarClien
     /// </summary>
     /// <param name="arg"></param>
     /// <returns></returns>
-    private Task MqttServer_ClientConnectedAsync(ClientConnectedEventArgs arg)
+    private async Task MqttServer_ClientConnectedAsync(ClientConnectedEventArgs arg)
     {
-        Console.WriteLine($"客户端连接：客户端ID=【{arg.ClientId}】已连接：用户名=【{arg.UserName}】地址=【{arg.RemoteEndPoint}】 {DateTime.Now}");
-        return Task.CompletedTask;
+        Log($"客户端连接：客户端ID=【{arg.ClientId}】已连接：用户名=【{arg.UserName}】地址=【{arg.RemoteEndPoint}】 {DateTime.Now}");
+        foreach (var eh in mqttEventHandlers)
+        {
+            await eh.ClientConnectedAsync(arg);
+        }
     }
 
     /// <summary>
@@ -124,10 +143,13 @@ public class MqttHostedService(IOptions<MqttOptions> mqttOptions, ISqlSugarClien
     /// <param name="arg"></param>
     /// <returns></returns>
     /// <exception cref="NotImplementedException"></exception>
-    private Task MqttServer_ClientDisconnectedAsync(ClientDisconnectedEventArgs arg)
+    private async Task MqttServer_ClientDisconnectedAsync(ClientDisconnectedEventArgs arg)
     {
-        Console.WriteLine($"客户端断开：客户端ID=【{arg.ClientId}】已断开：用户名=【{arg.UserName}】地址=【{arg.RemoteEndPoint}】 {DateTime.Now}");
-        return Task.CompletedTask;
+        Log($"客户端断开：客户端ID=【{arg.ClientId}】已断开：用户名=【{arg.UserName}】地址=【{arg.RemoteEndPoint}】 {DateTime.Now}");
+        foreach (var eh in mqttEventHandlers)
+        {
+            await eh.ClientDisconnectedAsync(arg);
+        }
     }
 
     /// <summary>
@@ -135,10 +157,13 @@ public class MqttHostedService(IOptions<MqttOptions> mqttOptions, ISqlSugarClien
     /// </summary>
     /// <param name="arg"></param>
     /// <returns></returns>
-    private Task MqttServer_ClientSubscribedTopicAsync(ClientSubscribedTopicEventArgs arg)
+    private async Task MqttServer_ClientSubscribedTopicAsync(ClientSubscribedTopicEventArgs arg)
     {
-        Console.WriteLine($"订阅主题：客户端ID=【{arg.ClientId}】订阅主题=【{arg.TopicFilter}】 {DateTime.Now}");
-        return Task.CompletedTask;
+        Log($"订阅主题：客户端ID=【{arg.ClientId}】订阅主题=【{arg.TopicFilter}】 {DateTime.Now}");
+        foreach (var eh in mqttEventHandlers)
+        {
+            await eh.ClientSubscribedTopicAsync(arg);
+        }
     }
 
     /// <summary>
@@ -146,10 +171,13 @@ public class MqttHostedService(IOptions<MqttOptions> mqttOptions, ISqlSugarClien
     /// </summary>
     /// <param name="arg"></param>
     /// <returns></returns>
-    private Task MqttServer_ClientUnsubscribedTopicAsync(ClientUnsubscribedTopicEventArgs arg)
+    private async Task MqttServer_ClientUnsubscribedTopicAsync(ClientUnsubscribedTopicEventArgs arg)
     {
-        Console.WriteLine($"取消订阅：客户端ID=【{arg.ClientId}】取消订阅主题=【{arg.TopicFilter}】 {DateTime.Now}");
-        return Task.CompletedTask;
+        Log($"取消订阅：客户端ID=【{arg.ClientId}】取消订阅主题=【{arg.TopicFilter}】 {DateTime.Now}");
+        foreach (var eh in mqttEventHandlers)
+        {
+            await eh.ClientUnsubscribedTopicAsync(arg);
+        }
     }
 
     /// <summary>
@@ -157,13 +185,16 @@ public class MqttHostedService(IOptions<MqttOptions> mqttOptions, ISqlSugarClien
     /// </summary>
     /// <param name="arg"></param>
     /// <returns></returns>
-    private Task MqttServer_InterceptingPublishAsync(InterceptingPublishEventArgs arg)
+    private async Task MqttServer_InterceptingPublishAsync(InterceptingPublishEventArgs arg)
     {
-        if (string.Equals(arg.ClientId, ServerClientId))
-            return Task.CompletedTask;
+        if (string.Equals(arg.ClientId, _mqttOptions.MqttServerId))
+            return;
 
-        Console.WriteLine($"拦截消息：客户端ID=【{arg.ClientId}】 Topic主题=【{arg.ApplicationMessage.Topic}】 消息=【{Encoding.UTF8.GetString(arg.ApplicationMessage.Payload)}】 qos等级=【{arg.ApplicationMessage.QualityOfServiceLevel}】 {DateTime.Now}");
-        return Task.CompletedTask;
+        Log($"拦截消息：客户端ID=【{arg.ClientId}】 Topic主题=【{arg.ApplicationMessage.Topic}】 消息=【{Encoding.UTF8.GetString(arg.ApplicationMessage.Payload)}】 qos等级=【{arg.ApplicationMessage.QualityOfServiceLevel}】 {DateTime.Now}");
+        foreach (var eh in mqttEventHandlers)
+        {
+            await eh.InterceptingPublishAsync(arg);
+        }
     }
 
     /// <summary>
@@ -171,14 +202,25 @@ public class MqttHostedService(IOptions<MqttOptions> mqttOptions, ISqlSugarClien
     /// </summary>
     /// <param name="arg"></param>
     /// <returns></returns>
-    private Task MqttServer_ApplicationMessageNotConsumedAsync(ApplicationMessageNotConsumedEventArgs arg)
+    private async Task MqttServer_ApplicationMessageNotConsumedAsync(ApplicationMessageNotConsumedEventArgs arg)
     {
         Console.WriteLine($"接收消息：发送端ID=【{arg.SenderId}】 Topic主题=【{arg.ApplicationMessage.Topic}】 消息=【{Encoding.UTF8.GetString(arg.ApplicationMessage.Payload)}】 qos等级=【{arg.ApplicationMessage.QualityOfServiceLevel}】 {DateTime.Now}");
-        return Task.CompletedTask;
+        foreach (var eh in mqttEventHandlers)
+        {
+            await eh.ApplicationMessageNotConsumedAsync(arg);
+        }
     }
 
     public Task StopAsync(CancellationToken cancellationToken)
     {
         return Task.CompletedTask;
+    }
+
+    protected void Log(string msg)
+    {
+        if (_consoleOutput)
+            Console.WriteLine(msg);
+        if (_isLogging)
+            msg.LogDebug();
     }
 }
\ No newline at end of file
diff --git a/Admin.NET/Admin.NET.Core/Mqtt/MqttEventHandler.cs b/Admin.NET/Admin.NET.Core/Mqtt/MqttEventHandler.cs
new file mode 100644
index 00000000..ea3146f3
--- /dev/null
+++ b/Admin.NET/Admin.NET.Core/Mqtt/MqttEventHandler.cs
@@ -0,0 +1,90 @@
+// Admin.NET 项目的版权、商标、专利和其他相关权利均受相应法律法规的保护。使用本项目应遵守相关法律法规和许可证的要求。
+//
+// 本项目主要遵循 MIT 许可证和 Apache 许可证（版本 2.0）进行分发和使用。许可证位于源代码树根目录中的 LICENSE-MIT 和 LICENSE-APACHE 文件。
+//
+// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！
+
+using MQTTnet.Server;
+using MQTTnet;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Threading.Tasks;
+using MQTTnet.Protocol;
+using Furion.Logging.Extensions;
+using Furion.HttpRemote;
+
+namespace Admin.NET.Core;
+
+/// <summary>
+/// Mqtt事件拦截器
+/// </summary>
+/// <remarks>
+/// 为了让底层的 Mqtt 代码与业务层代码分离，应该不同的业务继函 MqttEventHandler 类，实现自己的代码后
+/// 在 Startup.cs 的 Configure 函数中，调用 MqttHostedService 对象的 RegistMqttEventHandler 函数，来注册自己的事件处理器
+/// “业务相关的代码千万不要写在 MqttHostedService 中”
+/// </remarks>
+
+public class MqttEventHandler
+{
+    /// <summary>
+    /// 排序，数据越大越先执行
+    /// </summary>
+    public int Order = 0;
+
+    protected void Log(string msg)
+    {
+        var mqttOptions = App.GetOptions<MqttOptions>();
+        if (mqttOptions.ConsoleOutput)
+            Console.WriteLine(msg);
+        if (mqttOptions.Logging)
+            msg.LogDebug();
+    }
+
+    public virtual async Task ValidatingConnectionAsync(ValidatingConnectionEventArgs arg)
+    {
+    }
+
+    public virtual async Task StartedAsync(EventArgs arg)
+    {
+    }
+
+    public virtual async  Task StoppedAsync(EventArgs arg)
+    {
+    }
+
+    /// <summary>
+    /// 客户端发布的数据
+    /// </summary>
+    /// <param name="arg"></param>
+    /// <returns></returns>
+    public virtual async Task InterceptingPublishAsync(InterceptingPublishEventArgs arg)
+    {
+    }
+
+    /// <summary>
+    /// 没有客户端接收的数据
+    /// </summary>
+    /// <param name="arg"></param>
+    /// <returns></returns>
+    public virtual async Task ApplicationMessageNotConsumedAsync(ApplicationMessageNotConsumedEventArgs arg)
+    {
+    }
+
+    public virtual async Task ClientSubscribedTopicAsync(ClientSubscribedTopicEventArgs arg)
+    {
+    }
+    public virtual async Task ClientUnsubscribedTopicAsync(ClientUnsubscribedTopicEventArgs arg)
+    {
+    }
+
+    public virtual async Task ClientDisconnectedAsync(ClientDisconnectedEventArgs arg)
+    {
+    }
+
+    public virtual async Task ClientConnectedAsync(ClientConnectedEventArgs arg)
+    {
+    }
+}
diff --git a/Admin.NET/Admin.NET.Core/Mqtt/MqttEventHandlerForAdminNet.cs b/Admin.NET/Admin.NET.Core/Mqtt/MqttEventHandlerForAdminNet.cs
new file mode 100644
index 00000000..b11e3062
--- /dev/null
+++ b/Admin.NET/Admin.NET.Core/Mqtt/MqttEventHandlerForAdminNet.cs
@@ -0,0 +1,43 @@
+// Admin.NET 项目的版权、商标、专利和其他相关权利均受相应法律法规的保护。使用本项目应遵守相关法律法规和许可证的要求。
+//
+// 本项目主要遵循 MIT 许可证和 Apache 许可证（版本 2.0）进行分发和使用。许可证位于源代码树根目录中的 LICENSE-MIT 和 LICENSE-APACHE 文件。
+//
+// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！
+
+using MQTTnet.Protocol;
+using MQTTnet.Server;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Admin.NET.Core;
+public class MqttEventHandlerForAdminNet : MqttEventHandler
+{
+    public override async Task ValidatingConnectionAsync(ValidatingConnectionEventArgs arg)
+    {
+        ISqlSugarClient _db = App.GetRequiredService<ISqlSugarClient>();
+        // 验证账号
+        var user = _db.Queryable<SysUser>().First(u => u.Account == arg.UserName);
+        if (user == null)
+        {
+            arg.ReasonCode = MqttConnectReasonCode.BadUserNameOrPassword;
+            Log($"客户端验证：客户端ID=【{arg.ClientId}】用户名不存在 {DateTime.Now} ");
+            return;
+        }
+
+        // 验证密码
+        var password = arg.Password;
+        if (CryptogramUtil.CryptoType == CryptogramEnum.MD5.ToString())
+        {
+            if (user.Password.Equals(MD5Encryption.Encrypt(password))) return;
+        }
+        else
+        {
+            if (CryptogramUtil.Decrypt(user.Password).Equals(password)) return;
+        }
+        arg.ReasonCode = MqttConnectReasonCode.BadUserNameOrPassword;
+        Log($"客户端验证：客户端ID=【{arg.ClientId}】用户名或密码验证错误 {DateTime.Now} ");
+    }
+}
diff --git a/Admin.NET/Admin.NET.Core/Option/MqttOptions.cs b/Admin.NET/Admin.NET.Core/Option/MqttOptions.cs
index 69a4fa2f..60078e6a 100644
--- a/Admin.NET/Admin.NET.Core/Option/MqttOptions.cs
+++ b/Admin.NET/Admin.NET.Core/Option/MqttOptions.cs
@@ -1,28 +1,48 @@
-// Admin.NET 项目的版权、商标、专利和其他相关权利均受相应法律法规的保护。使用本项目应遵守相关法律法规和许可证的要求。
-//
-// 本项目主要遵循 MIT 许可证和 Apache 许可证（版本 2.0）进行分发和使用。许可证位于源代码树根目录中的 LICENSE-MIT 和 LICENSE-APACHE 文件。
-//
-// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！
-
-namespace Admin.NET.Core;
-
-/// <summary>
-/// MQTT 配置选项
-/// </summary>
-public sealed class MqttOptions : IConfigurableOptions
-{
-    /// <summary>
-    /// 是否启用
-    /// </summary>
-    public bool Enabled { get; set; }
-
-    /// <summary>
-    /// 端口
-    /// </summary>
-    public int Port { get; set; }
-
-    /// <summary>
-    /// IP地址
-    /// </summary>
-    public string IPAddress { get; set; }
+// Admin.NET 项目的版权、商标、专利和其他相关权利均受相应法律法规的保护。使用本项目应遵守相关法律法规和许可证的要求。
+//
+// 本项目主要遵循 MIT 许可证和 Apache 许可证（版本 2.0）进行分发和使用。许可证位于源代码树根目录中的 LICENSE-MIT 和 LICENSE-APACHE 文件。
+//
+// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！
+
+namespace Admin.NET.Core;
+
+/// <summary>
+/// MQTT 配置选项
+/// </summary>
+public sealed class MqttOptions : IConfigurableOptions
+{
+    /// <summary>
+    /// 服务器主动发布时用的ClientId
+    /// </summary>
+    public string MqttServerId { get; set; }
+
+    /// <summary>
+    /// 是否启用
+    /// </summary>
+    public bool Enabled { get; set; }
+
+    /// <summary>
+    /// 输出文件日志
+    /// </summary>
+    public bool Logging { get; set; }
+
+    /// <summary>
+    /// 控制台输出
+    /// </summary>
+    public bool ConsoleOutput { get; set; }
+
+    /// <summary>
+    /// ConnectionBacklog
+    /// </summary>
+    public int ConnectionBacklog { get; set; }
+
+    /// <summary>
+    /// 端口
+    /// </summary>
+    public int Port { get; set; }
+
+    /// <summary>
+    /// IP地址
+    /// </summary>
+    public string IPAddress { get; set; }
 }
\ No newline at end of file
diff --git a/Admin.NET/Admin.NET.Core/Service/Mqtt/MqttService.cs b/Admin.NET/Admin.NET.Core/Service/Mqtt/MqttService.cs
new file mode 100644
index 00000000..d9582097
--- /dev/null
+++ b/Admin.NET/Admin.NET.Core/Service/Mqtt/MqttService.cs
@@ -0,0 +1,34 @@
+// Admin.NET 项目的版权、商标、专利和其他相关权利均受相应法律法规的保护。使用本项目应遵守相关法律法规和许可证的要求。
+//
+// 本项目主要遵循 MIT 许可证和 Apache 许可证（版本 2.0）进行分发和使用。许可证位于源代码树根目录中的 LICENSE-MIT 和 LICENSE-APACHE 文件。
+//
+// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！
+
+using Admin.NET.Core.Service.Mqtt.Dto;
+
+namespace Admin.NET.Core.Service;
+
+/// <summary>
+/// 系统职位服务 🧩
+/// </summary>
+[ApiDescriptionSettings(Order = 460, Description = "MQTT 服务")]
+public class MqttService : IDynamicApiController, ITransient
+{
+    MqttHostedService _mqttHostedService;
+    public MqttService(MqttHostedService mqttProvider)
+    {
+        _mqttHostedService = mqttProvider;
+    }
+
+    /// <summary>
+    /// 发布消息 🔖
+    /// </summary>
+    /// <param name="input"></param>
+    /// <returns></returns>
+    [AllowAnonymous]
+    [DisplayName("发布消息")]
+    public async Task PublicMessage(PublicMessageInput input)
+    {
+        _mqttHostedService.PublicMessage(input.Topic, input.Message);
+    }
+}
\ No newline at end of file
diff --git a/Admin.NET/Admin.NET.Web.Core/Startup.cs b/Admin.NET/Admin.NET.Web.Core/Startup.cs
index 487ffc0f..f97a092c 100644
--- a/Admin.NET/Admin.NET.Web.Core/Startup.cs
+++ b/Admin.NET/Admin.NET.Web.Core/Startup.cs
@@ -22,6 +22,8 @@ using Microsoft.AspNetCore.ResponseCompression;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.FileProviders;
 using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Options;
+using MQTTnet.AspNetCore;
 using Newtonsoft.Json;
 using OnceMi.AspNetCore.OSS;
 using RabbitMQ.Client;
@@ -410,6 +412,7 @@ public class Startup : AppStartup
             }
         });
 
+        IOptions<MqttOptions> mqttOptions = App.GetRequiredService<IOptions<MqttOptions>>();
         app.UseEndpoints(endpoints =>
         {
             // 注册集线器
@@ -418,6 +421,19 @@ public class Startup : AppStartup
             endpoints.MapControllerRoute(
                 name: "default",
                 pattern: "{controller=Home}/{action=Index}/{id?}");
+            if (mqttOptions.Value.Enabled)
+            {
+                endpoints.MapConnectionHandler<MqttConnectionHandler>(
+                    "/mqtt",
+                    httpConnectionDispatcherOptions => httpConnectionDispatcherOptions.WebSockets.SubProtocolSelector =
+                        protocolList => protocolList.FirstOrDefault() ?? string.Empty);
+            }
         });
+
+        // 注册自己业务的 Mqtt 处理器，如果有不同的认证方式，要把以下这句注释掉
+        if (mqttOptions.Value.Enabled)
+        {
+            MqttHostedService.RegistMqttEventHandler(new MqttEventHandlerForAdminNet());
+        }
     }
 }
\ No newline at end of file

From e102529c6fed47dcb49ef3cfcbfa6e510a6fda7c Mon Sep 17 00:00:00 2001
From: yzp <yzp0755@qq.com>
Date: Fri, 21 Feb 2025 15:30:05 +0800
Subject: [PATCH 6/9] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E7=9A=84=E9=AA=8C=E8=AF=81=E6=9C=BA=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Admin.NET/Admin.NET.Web.Core/Startup.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Admin.NET/Admin.NET.Web.Core/Startup.cs b/Admin.NET/Admin.NET.Web.Core/Startup.cs
index f97a092c..f637206c 100644
--- a/Admin.NET/Admin.NET.Web.Core/Startup.cs
+++ b/Admin.NET/Admin.NET.Web.Core/Startup.cs
@@ -430,10 +430,11 @@ public class Startup : AppStartup
             }
         });
 
-        // 注册自己业务的 Mqtt 处理器，如果有不同的认证方式，要把以下这句注释掉
+        
         if (mqttOptions.Value.Enabled)
         {
-            MqttHostedService.RegistMqttEventHandler(new MqttEventHandlerForAdminNet());
+            // [以下是验证的示例] 注册自己业务的 Mqtt 处理器，如果有不同的认证方式，要把以下这句注释掉
+            //MqttHostedService.RegistMqttEventHandler(new MqttEventHandlerForAdminNet(), int.MaxValue);
         }
     }
 }
\ No newline at end of file

From e3f9975657fd5636b4f726000667c2521578776a Mon Sep 17 00:00:00 2001
From: yzp <yzp0755@qq.com>
Date: Sat, 22 Feb 2025 08:40:10 +0800
Subject: [PATCH 7/9] =?UTF-8?q?=E8=A1=A5=E7=BC=BA=E5=A4=B1=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Mqtt/Dto/SysMqttDto.cs            | 19 +++++++++++
 .../Service/Mqtt/MqttService.cs               | 34 -------------------
 .../Service/Mqtt/SysMqttService.cs            | 21 +++++++++++-
 3 files changed, 39 insertions(+), 35 deletions(-)
 create mode 100644 Admin.NET/Admin.NET.Core/Service/Mqtt/Dto/SysMqttDto.cs
 delete mode 100644 Admin.NET/Admin.NET.Core/Service/Mqtt/MqttService.cs

diff --git a/Admin.NET/Admin.NET.Core/Service/Mqtt/Dto/SysMqttDto.cs b/Admin.NET/Admin.NET.Core/Service/Mqtt/Dto/SysMqttDto.cs
new file mode 100644
index 00000000..6df5ed55
--- /dev/null
+++ b/Admin.NET/Admin.NET.Core/Service/Mqtt/Dto/SysMqttDto.cs
@@ -0,0 +1,19 @@
+// Admin.NET 项目的版权、商标、专利和其他相关权利均受相应法律法规的保护。使用本项目应遵守相关法律法规和许可证的要求。
+//
+// 本项目主要遵循 MIT 许可证和 Apache 许可证（版本 2.0）进行分发和使用。许可证位于源代码树根目录中的 LICENSE-MIT 和 LICENSE-APACHE 文件。
+//
+// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Admin.NET.Core;
+public class PublicMessageInput
+{
+    public string Topic { get; set; }
+
+    public string Message { get; set; }
+}
diff --git a/Admin.NET/Admin.NET.Core/Service/Mqtt/MqttService.cs b/Admin.NET/Admin.NET.Core/Service/Mqtt/MqttService.cs
deleted file mode 100644
index d9582097..00000000
--- a/Admin.NET/Admin.NET.Core/Service/Mqtt/MqttService.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-// Admin.NET 项目的版权、商标、专利和其他相关权利均受相应法律法规的保护。使用本项目应遵守相关法律法规和许可证的要求。
-//
-// 本项目主要遵循 MIT 许可证和 Apache 许可证（版本 2.0）进行分发和使用。许可证位于源代码树根目录中的 LICENSE-MIT 和 LICENSE-APACHE 文件。
-//
-// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！
-
-using Admin.NET.Core.Service.Mqtt.Dto;
-
-namespace Admin.NET.Core.Service;
-
-/// <summary>
-/// 系统职位服务 🧩
-/// </summary>
-[ApiDescriptionSettings(Order = 460, Description = "MQTT 服务")]
-public class MqttService : IDynamicApiController, ITransient
-{
-    MqttHostedService _mqttHostedService;
-    public MqttService(MqttHostedService mqttProvider)
-    {
-        _mqttHostedService = mqttProvider;
-    }
-
-    /// <summary>
-    /// 发布消息 🔖
-    /// </summary>
-    /// <param name="input"></param>
-    /// <returns></returns>
-    [AllowAnonymous]
-    [DisplayName("发布消息")]
-    public async Task PublicMessage(PublicMessageInput input)
-    {
-        _mqttHostedService.PublicMessage(input.Topic, input.Message);
-    }
-}
\ No newline at end of file
diff --git a/Admin.NET/Admin.NET.Core/Service/Mqtt/SysMqttService.cs b/Admin.NET/Admin.NET.Core/Service/Mqtt/SysMqttService.cs
index 231a8b29..1f1d174b 100644
--- a/Admin.NET/Admin.NET.Core/Service/Mqtt/SysMqttService.cs
+++ b/Admin.NET/Admin.NET.Core/Service/Mqtt/SysMqttService.cs
@@ -13,7 +13,14 @@ namespace Admin.NET.Core.Service;
 /// </summary>
 [ApiDescriptionSettings(Order = 90, Description = "MQTT 服务")]
 public class SysMqttService() : IDynamicApiController, ITransient
-{
+{
+
+    MqttHostedService _mqttHostedService;
+    public SysMqttService(MqttHostedService mqttProvider)
+    {
+        _mqttHostedService = mqttProvider;
+    }
+
     /// <summary>
     /// 获取客户端列表 🔖
     /// </summary>
@@ -25,5 +32,17 @@ public class SysMqttService() : IDynamicApiController, ITransient
             throw Oops.Oh("【MQTT】服务未启动");
 
         return await MqttHostedService.MqttServer.GetClientsAsync();
+    }
+
+    /// <summary>
+    /// 发布消息 🔖
+    /// </summary>
+    /// <param name="input"></param>
+    /// <returns></returns>
+    [AllowAnonymous]
+    [DisplayName("发布消息")]
+    public async Task PublicMessage(PublicMessageInput input)
+    {
+        _mqttHostedService.PublicMessage(input.Topic, input.Message);
     }
 }
\ No newline at end of file

From 102b336a85bf1afc7cae4719890546d4581c8e60 Mon Sep 17 00:00:00 2001
From: yzp <yzp0755@qq.com>
Date: Sat, 22 Feb 2025 08:46:28 +0800
Subject: [PATCH 8/9] =?UTF-8?q?=E8=A1=A5=E7=BC=BA=E5=A4=B1=E4=BE=9D?=
 =?UTF-8?q?=E6=87=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Mqtt/SysMqttService.cs             | 18 ++++++------------
 .../Admin.NET.Web.Core.csproj                  |  1 +
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/Admin.NET/Admin.NET.Core/Service/Mqtt/SysMqttService.cs b/Admin.NET/Admin.NET.Core/Service/Mqtt/SysMqttService.cs
index 1f1d174b..85dbdfb0 100644
--- a/Admin.NET/Admin.NET.Core/Service/Mqtt/SysMqttService.cs
+++ b/Admin.NET/Admin.NET.Core/Service/Mqtt/SysMqttService.cs
@@ -13,14 +13,7 @@ namespace Admin.NET.Core.Service;
 /// </summary>
 [ApiDescriptionSettings(Order = 90, Description = "MQTT 服务")]
 public class SysMqttService() : IDynamicApiController, ITransient
-{
-
-    MqttHostedService _mqttHostedService;
-    public SysMqttService(MqttHostedService mqttProvider)
-    {
-        _mqttHostedService = mqttProvider;
-    }
-
+{
     /// <summary>
     /// 获取客户端列表 🔖
     /// </summary>
@@ -35,14 +28,15 @@ public class SysMqttService() : IDynamicApiController, ITransient
     }
 
     /// <summary>
-    /// 发布消息 🔖
+    /// 发布主题 🔖
     /// </summary>
     /// <param name="input"></param>
     /// <returns></returns>
     [AllowAnonymous]
-    [DisplayName("发布消息")]
+    [DisplayName("发布主题")]
     public async Task PublicMessage(PublicMessageInput input)
-    {
-        _mqttHostedService.PublicMessage(input.Topic, input.Message);
+    {
+        MqttHostedService mqttHostedService = App.GetRequiredService<MqttHostedService>();
+        mqttHostedService.PublicMessage(input.Topic, input.Message);
     }
 }
\ No newline at end of file
diff --git a/Admin.NET/Admin.NET.Web.Core/Admin.NET.Web.Core.csproj b/Admin.NET/Admin.NET.Web.Core/Admin.NET.Web.Core.csproj
index 9a5475c5..4bb365c3 100644
--- a/Admin.NET/Admin.NET.Web.Core/Admin.NET.Web.Core.csproj
+++ b/Admin.NET/Admin.NET.Web.Core/Admin.NET.Web.Core.csproj
@@ -11,6 +11,7 @@
 
   <ItemGroup>
     <PackageReference Include="IGeekFan.AspNetCore.Knife4jUI" Version="0.0.16" />
+    <PackageReference Include="MQTTnet.AspNetCore" Version="5.0.1.1416" />
     <PackageReference Include="System.Security.Cryptography.Pkcs" Version="9.0.2" />
   </ItemGroup>
 

From 1358cd397df05bfe388f788276cad267668eee88 Mon Sep 17 00:00:00 2001
From: zuohuaijun <zuohuaijun@163.com>
Date: Sun, 23 Feb 2025 03:10:34 +0800
Subject: [PATCH 9/9] =?UTF-8?q?=F0=9F=98=8E1=E3=80=81=E4=BC=98=E5=8C=96MQT?=
 =?UTF-8?q?T=E7=9B=B8=E5=85=B3=20=20=20=202=E3=80=81=E5=8D=87=E7=BA=A7?=
 =?UTF-8?q?=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Configuration/Mqtt.json                   |  13 +-
 .../Admin.NET.Core/Admin.NET.Core.csproj      |  12 +-
 .../Admin.NET.Core/Job/MqttHostedService.cs   | 141 ++++++------
 ...nNet.cs => DefaultMqttEventInterceptor.cs} |  90 ++++----
 ...ventHandler.cs => MqttEventInterceptor.cs} | 210 +++++++++--------
 .../Admin.NET.Core/Option/MqttOptions.cs      |  35 ++-
 .../Dto/{SysMqttDto.cs => MessageInput.cs}    |  42 ++--
 .../Service/Mqtt/SysMqttService.cs            |  11 +-
 Admin.NET/Admin.NET.Web.Core/Startup.cs       |  21 +-
 Web/package.json                              |  18 +-
 Web/src/api-services/api.ts                   |   1 +
 Web/src/api-services/apis/sys-enum-api.ts     |  75 ++++++
 Web/src/api-services/apis/sys-mqtt-api.ts     | 214 ++++++++++++++++++
 .../api-services/apis/sys-online-user-api.ts  |  75 ++++++
 Web/src/api-services/models/address-family.ts |  53 +++++
 ...dmin-netresult-ilist-mqtt-client-status.ts |  71 ++++++
 Web/src/api-services/models/end-point.ts      |  29 +++
 Web/src/api-services/models/index.ts          |   7 +
 .../api-services/models/mqtt-client-status.ts | 115 ++++++++++
 .../models/mqtt-protocol-version.ts           |  26 +++
 .../models/mqtt-session-status.ts             |  58 +++++
 .../models/public-message-input.ts            |  38 ++++
 Web/src/api-services/models/sys-file.ts       |   8 +
 23 files changed, 1085 insertions(+), 278 deletions(-)
 rename Admin.NET/Admin.NET.Core/Mqtt/{MqttEventHandlerForAdminNet.cs => DefaultMqttEventInterceptor.cs} (64%)
 rename Admin.NET/Admin.NET.Core/Mqtt/{MqttEventHandler.cs => MqttEventInterceptor.cs} (51%)
 rename Admin.NET/Admin.NET.Core/Service/Mqtt/Dto/{SysMqttDto.cs => MessageInput.cs} (81%)
 create mode 100644 Web/src/api-services/apis/sys-mqtt-api.ts
 create mode 100644 Web/src/api-services/models/address-family.ts
 create mode 100644 Web/src/api-services/models/admin-netresult-ilist-mqtt-client-status.ts
 create mode 100644 Web/src/api-services/models/end-point.ts
 create mode 100644 Web/src/api-services/models/mqtt-client-status.ts
 create mode 100644 Web/src/api-services/models/mqtt-protocol-version.ts
 create mode 100644 Web/src/api-services/models/mqtt-session-status.ts
 create mode 100644 Web/src/api-services/models/public-message-input.ts

diff --git a/Admin.NET/Admin.NET.Application/Configuration/Mqtt.json b/Admin.NET/Admin.NET.Application/Configuration/Mqtt.json
index c9afa21a..18d14166 100644
--- a/Admin.NET/Admin.NET.Application/Configuration/Mqtt.json
+++ b/Admin.NET/Admin.NET.Application/Configuration/Mqtt.json
@@ -3,12 +3,11 @@
 
   // MQTT 配置
   "Mqtt": {
-    "MqttServerId": "MqttServer", // 服务器主动发布时用的ClientId
-    "Enabled": true, // 是否开启
-    "Logging": true, // 记录文件日志
-    "ConsoleOutput": true, // 输出控制台日志
-    "ConnectionBacklog": 1000,
-    "Port": "1883",
-    "IPAddress": ""
+    "Enabled": false, // 是否开启
+    "Port": "1883", // 端口
+    "IPAddress": "", // IP地址
+    "ConnectionBacklog": 1000, // 最大连接数
+    "MqttServerId": "Admin.NET.MQTT", // 服务器主动发消息时的ClientId
+    "Logging": false // 记录日志
   }
 }
\ No newline at end of file
diff --git a/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj b/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj
index d6f747bb..c4570d6a 100644
--- a/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj
+++ b/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj
@@ -14,20 +14,20 @@
 
   <ItemGroup>
     <PackageReference Include="AlibabaCloud.SDK.Dysmsapi20170525" Version="3.1.1" />
-    <PackageReference Include="AlipaySDKNet.Standard" Version="4.9.409" />
+    <PackageReference Include="AlipaySDKNet.Standard" Version="4.9.412" />
     <PackageReference Include="AngleSharp" Version="1.2.0" />
     <PackageReference Include="AspectCore.Extensions.Reflection" Version="2.4.0" />
     <PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
     <PackageReference Include="BouncyCastle.Cryptography" Version="2.5.1" Aliases="BouncyCastleV2" />
     <PackageReference Include="Elastic.Clients.Elasticsearch" Version="8.17.1" />
-    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.7.9" />
-    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.9" />
-    <PackageReference Include="Furion.Pure" Version="4.9.7.9" />
+    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.7.10" />
+    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.10" />
+    <PackageReference Include="Furion.Pure" Version="4.9.7.10" />
     <PackageReference Include="Hardware.Info" Version="101.0.1" />
     <PackageReference Include="Hashids.net" Version="1.7.0" />
     <PackageReference Include="IPTools.China" Version="1.6.0" />
     <PackageReference Include="IPTools.International" Version="1.6.0" />
-    <PackageReference Include="log4net" Version="3.0.3" />
+    <PackageReference Include="log4net" Version="3.0.4" />
     <PackageReference Include="Magicodes.IE.Excel" Version="2.7.5.2" />
     <PackageReference Include="Magicodes.IE.Pdf" Version="2.7.5.2" />
     <PackageReference Include="Magicodes.IE.Word" Version="2.7.5.2" />
@@ -48,7 +48,7 @@
     <PackageReference Include="SSH.NET" Version="2024.2.0" />
     <PackageReference Include="System.Linq.Dynamic.Core" Version="1.6.0.2" />
     <PackageReference Include="System.Net.Http" Version="4.3.4" />
-    <PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1182" />
+    <PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1184" />
     <PackageReference Include="UAParser" Version="3.1.47" />
     <PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />
   </ItemGroup>
diff --git a/Admin.NET/Admin.NET.Core/Job/MqttHostedService.cs b/Admin.NET/Admin.NET.Core/Job/MqttHostedService.cs
index b132df76..250952ed 100644
--- a/Admin.NET/Admin.NET.Core/Job/MqttHostedService.cs
+++ b/Admin.NET/Admin.NET.Core/Job/MqttHostedService.cs
@@ -6,7 +6,6 @@
 
 namespace Admin.NET.Core;
 
-using Furion.Logging.Extensions;
 using Microsoft.Extensions.Hosting;
 using MQTTnet;
 using MQTTnet.Protocol;
@@ -19,50 +18,35 @@ using System.Threading.Tasks;
 /// <summary>
 /// MQTT 服务
 /// </summary>
-public class MqttHostedService(IOptions<MqttOptions> mqttOptions, ISqlSugarClient db) : IHostedService, ISingleton
-{
-    private const string ServerClientId = "Admin.NET.MQTT";
-    public static MqttServer MqttServer { get; set; }
+public class MqttHostedService(IOptions<MqttOptions> mqttOptions) : IHostedService, ISingleton
+{
     private readonly MqttOptions _mqttOptions = mqttOptions.Value;
-    private readonly ISqlSugarClient _db = db;
-    private bool _isLogging = false;
-    private bool _consoleOutput = false;
+    public static MqttServer MqttServer { get; set; }
+    public static readonly List<MqttEventInterceptor> MqttEventInterceptors = []; // MQTT 事件拦截器集合
 
-    static List<MqttEventHandler> mqttEventHandlers = new List<MqttEventHandler>();
-
-    public static void RegistMqttEventHandler(MqttEventHandler eh, int order)
+    /// <summary>
+    /// 注册 MQTT 事件拦截器
+    /// </summary>
+    /// <param name="mqttEventInterceptor"></param>
+    /// <param name="order"></param>
+    public static void AddMqttEventInterceptor(MqttEventInterceptor mqttEventInterceptor, int order = 0)
     {
-        eh.Order = order;
-        mqttEventHandlers.Add(eh);
-        mqttEventHandlers.Sort((a,b) => b.Order - a.Order);
-    }
-
-    public async void PublicMessage(string topic, string message)
-    {
-        // 创建一个 MQTT 应用消息
-        var applicationMessage = new MqttApplicationMessageBuilder()
-           .WithTopic(topic)
-           .WithPayload(message)
-           .Build();
-
-        // 记录日志
-        Log($"服务器发布主题： {topic}, 内容：{message}");
-        await MqttServer.InjectApplicationMessage(new InjectedMqttApplicationMessage(applicationMessage)
-        {
-            SenderClientId = _mqttOptions.MqttServerId
-        });
+        mqttEventInterceptor.Order = order;
+        MqttEventInterceptors.Add(mqttEventInterceptor);
+        MqttEventInterceptors.Sort((a, b) => b.Order - a.Order);
     }
 
     public async Task StartAsync(CancellationToken cancellationToken)
     {
-        if (!_mqttOptions.Enabled) return;
-        _isLogging = _mqttOptions.Logging;
-        _consoleOutput = _mqttOptions.ConsoleOutput;
+        if (!_mqttOptions.Enabled) return;
+
+        // 注册 MQTT 自定义客户端验证事件拦截器
+        AddMqttEventInterceptor(new DefaultMqttEventInterceptor());
 
         var options = new MqttServerOptionsBuilder()
             .WithDefaultEndpoint() // 默认地址127.0.0.1
-            .WithDefaultEndpointPort(_mqttOptions.Port) // 端口号
-            //.WithDefaultEndpointBoundIPAddress(_mqttOptions.IPAddress) // IP地址
+            .WithDefaultEndpointPort(_mqttOptions.Port) // 端口号
+            //.WithDefaultEndpointBoundIPAddress(_mqttOptions.IPAddress) // IP地址
             .WithConnectionBacklog(_mqttOptions.ConnectionBacklog) // 最大连接数
             .WithPersistentSessions()
             .Build();
@@ -102,7 +86,7 @@ public class MqttHostedService(IOptions<MqttOptions> mqttOptions, ISqlSugarClien
     private async Task MqttServer_StoppedAsync(EventArgs arg)
     {
         Console.WriteLine($"【MQTT】服务已关闭...... {DateTime.Now}");
-        foreach (var eh in mqttEventHandlers)
+        foreach (var eh in MqttEventInterceptors)
         {
             await eh.StoppedAsync(arg);
         }
@@ -115,7 +99,7 @@ public class MqttHostedService(IOptions<MqttOptions> mqttOptions, ISqlSugarClien
     /// <returns></returns>
     private async Task MqttServer_ValidatingConnectionAsync(ValidatingConnectionEventArgs arg)
     {
-        foreach (var eh in mqttEventHandlers)
+        foreach (var eh in MqttEventInterceptors)
         {
             await eh.ValidatingConnectionAsync(arg);
             if (arg.ReasonCode != MqttConnectReasonCode.Success)
@@ -129,12 +113,13 @@ public class MqttHostedService(IOptions<MqttOptions> mqttOptions, ISqlSugarClien
     /// <param name="arg"></param>
     /// <returns></returns>
     private async Task MqttServer_ClientConnectedAsync(ClientConnectedEventArgs arg)
-    {
-        Log($"客户端连接：客户端ID=【{arg.ClientId}】已连接：用户名=【{arg.UserName}】地址=【{arg.RemoteEndPoint}】 {DateTime.Now}");
-        foreach (var eh in mqttEventHandlers)
+    {
+        foreach (var eh in MqttEventInterceptors)
         {
             await eh.ClientConnectedAsync(arg);
-        }
+        }
+
+        Logging($"客户端连接：客户端ID=【{arg.ClientId}】已连接：用户名=【{arg.UserName}】地址=【{arg.RemoteEndPoint}】 {DateTime.Now}");
     }
 
     /// <summary>
@@ -145,11 +130,12 @@ public class MqttHostedService(IOptions<MqttOptions> mqttOptions, ISqlSugarClien
     /// <exception cref="NotImplementedException"></exception>
     private async Task MqttServer_ClientDisconnectedAsync(ClientDisconnectedEventArgs arg)
     {
-        Log($"客户端断开：客户端ID=【{arg.ClientId}】已断开：用户名=【{arg.UserName}】地址=【{arg.RemoteEndPoint}】 {DateTime.Now}");
-        foreach (var eh in mqttEventHandlers)
+        foreach (var eh in MqttEventInterceptors)
         {
             await eh.ClientDisconnectedAsync(arg);
-        }
+        }
+
+        Logging($"客户端断开：客户端ID=【{arg.ClientId}】已断开：用户名=【{arg.UserName}】地址=【{arg.RemoteEndPoint}】 {DateTime.Now}");
     }
 
     /// <summary>
@@ -159,11 +145,12 @@ public class MqttHostedService(IOptions<MqttOptions> mqttOptions, ISqlSugarClien
     /// <returns></returns>
     private async Task MqttServer_ClientSubscribedTopicAsync(ClientSubscribedTopicEventArgs arg)
     {
-        Log($"订阅主题：客户端ID=【{arg.ClientId}】订阅主题=【{arg.TopicFilter}】 {DateTime.Now}");
-        foreach (var eh in mqttEventHandlers)
+        foreach (var eh in MqttEventInterceptors)
         {
             await eh.ClientSubscribedTopicAsync(arg);
-        }
+        }
+
+        Logging($"订阅主题：客户端ID=【{arg.ClientId}】订阅主题=【{arg.TopicFilter}】 {DateTime.Now}");
     }
 
     /// <summary>
@@ -173,15 +160,16 @@ public class MqttHostedService(IOptions<MqttOptions> mqttOptions, ISqlSugarClien
     /// <returns></returns>
     private async Task MqttServer_ClientUnsubscribedTopicAsync(ClientUnsubscribedTopicEventArgs arg)
     {
-        Log($"取消订阅：客户端ID=【{arg.ClientId}】取消订阅主题=【{arg.TopicFilter}】 {DateTime.Now}");
-        foreach (var eh in mqttEventHandlers)
+        foreach (var eh in MqttEventInterceptors)
         {
             await eh.ClientUnsubscribedTopicAsync(arg);
-        }
+        }
+
+        Logging($"取消订阅：客户端ID=【{arg.ClientId}】取消订阅主题=【{arg.TopicFilter}】 {DateTime.Now}");
     }
 
     /// <summary>
-    /// 拦截接收消息
+    /// 拦截发布的消息事件
     /// </summary>
     /// <param name="arg"></param>
     /// <returns></returns>
@@ -190,25 +178,48 @@ public class MqttHostedService(IOptions<MqttOptions> mqttOptions, ISqlSugarClien
         if (string.Equals(arg.ClientId, _mqttOptions.MqttServerId))
             return;
 
-        Log($"拦截消息：客户端ID=【{arg.ClientId}】 Topic主题=【{arg.ApplicationMessage.Topic}】 消息=【{Encoding.UTF8.GetString(arg.ApplicationMessage.Payload)}】 qos等级=【{arg.ApplicationMessage.QualityOfServiceLevel}】 {DateTime.Now}");
-        foreach (var eh in mqttEventHandlers)
+        foreach (var eh in MqttEventInterceptors)
         {
             await eh.InterceptingPublishAsync(arg);
-        }
+        }
+
+        Logging($"拦截消息：客户端ID=【{arg.ClientId}】 Topic主题=【{arg.ApplicationMessage.Topic}】 消息=【{Encoding.UTF8.GetString(arg.ApplicationMessage.Payload)}】 qos等级=【{arg.ApplicationMessage.QualityOfServiceLevel}】 {DateTime.Now}");
     }
 
     /// <summary>
-    /// 消息未被消费
+    /// 未被消费的消息事件
     /// </summary>
     /// <param name="arg"></param>
     /// <returns></returns>
     private async Task MqttServer_ApplicationMessageNotConsumedAsync(ApplicationMessageNotConsumedEventArgs arg)
-    {
-        Console.WriteLine($"接收消息：发送端ID=【{arg.SenderId}】 Topic主题=【{arg.ApplicationMessage.Topic}】 消息=【{Encoding.UTF8.GetString(arg.ApplicationMessage.Payload)}】 qos等级=【{arg.ApplicationMessage.QualityOfServiceLevel}】 {DateTime.Now}");
-        foreach (var eh in mqttEventHandlers)
+    {
+        foreach (var eh in MqttEventInterceptors)
         {
             await eh.ApplicationMessageNotConsumedAsync(arg);
-        }
+        }
+
+        Logging($"接收消息：发送端ID=【{arg.SenderId}】 Topic主题=【{arg.ApplicationMessage.Topic}】 消息=【{Encoding.UTF8.GetString(arg.ApplicationMessage.Payload)}】 qos等级=【{arg.ApplicationMessage.QualityOfServiceLevel}】 {DateTime.Now}");
+    }
+
+    /// <summary>
+    /// 发布主题消息
+    /// </summary>
+    /// <param name="topic"></param>
+    /// <param name="message"></param>
+    public async Task PublicMessageAsync(string topic, string message)
+    {
+        var applicationMessage = new MqttApplicationMessageBuilder()
+           .WithTopic(topic)
+           .WithPayload(message)
+           .Build();
+
+        await MqttServer.InjectApplicationMessage(new InjectedMqttApplicationMessage(applicationMessage)
+        {
+            SenderClientId = _mqttOptions.MqttServerId,
+            SenderUserName = _mqttOptions.MqttServerId,
+        });
+
+        Logging($"服务器发布主题：{topic}, 内容：{message}");
     }
 
     public Task StopAsync(CancellationToken cancellationToken)
@@ -216,11 +227,13 @@ public class MqttHostedService(IOptions<MqttOptions> mqttOptions, ISqlSugarClien
         return Task.CompletedTask;
     }
 
-    protected void Log(string msg)
+    /// <summary>
+    /// 输出日志
+    /// </summary>
+    /// <param name="msg"></param>
+    protected void Logging(string msg)
     {
-        if (_consoleOutput)
-            Console.WriteLine(msg);
-        if (_isLogging)
-            msg.LogDebug();
+        if (!_mqttOptions.Logging) return;
+        LoggingWriter.LogInformation(msg);
     }
 }
\ No newline at end of file
diff --git a/Admin.NET/Admin.NET.Core/Mqtt/MqttEventHandlerForAdminNet.cs b/Admin.NET/Admin.NET.Core/Mqtt/DefaultMqttEventInterceptor.cs
similarity index 64%
rename from Admin.NET/Admin.NET.Core/Mqtt/MqttEventHandlerForAdminNet.cs
rename to Admin.NET/Admin.NET.Core/Mqtt/DefaultMqttEventInterceptor.cs
index b11e3062..f77a0283 100644
--- a/Admin.NET/Admin.NET.Core/Mqtt/MqttEventHandlerForAdminNet.cs
+++ b/Admin.NET/Admin.NET.Core/Mqtt/DefaultMqttEventInterceptor.cs
@@ -1,43 +1,47 @@
-// Admin.NET 项目的版权、商标、专利和其他相关权利均受相应法律法规的保护。使用本项目应遵守相关法律法规和许可证的要求。
-//
-// 本项目主要遵循 MIT 许可证和 Apache 许可证（版本 2.0）进行分发和使用。许可证位于源代码树根目录中的 LICENSE-MIT 和 LICENSE-APACHE 文件。
-//
-// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！
-
-using MQTTnet.Protocol;
-using MQTTnet.Server;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Admin.NET.Core;
-public class MqttEventHandlerForAdminNet : MqttEventHandler
-{
-    public override async Task ValidatingConnectionAsync(ValidatingConnectionEventArgs arg)
-    {
-        ISqlSugarClient _db = App.GetRequiredService<ISqlSugarClient>();
-        // 验证账号
-        var user = _db.Queryable<SysUser>().First(u => u.Account == arg.UserName);
-        if (user == null)
-        {
-            arg.ReasonCode = MqttConnectReasonCode.BadUserNameOrPassword;
-            Log($"客户端验证：客户端ID=【{arg.ClientId}】用户名不存在 {DateTime.Now} ");
-            return;
-        }
-
-        // 验证密码
-        var password = arg.Password;
-        if (CryptogramUtil.CryptoType == CryptogramEnum.MD5.ToString())
-        {
-            if (user.Password.Equals(MD5Encryption.Encrypt(password))) return;
-        }
-        else
-        {
-            if (CryptogramUtil.Decrypt(user.Password).Equals(password)) return;
-        }
-        arg.ReasonCode = MqttConnectReasonCode.BadUserNameOrPassword;
-        Log($"客户端验证：客户端ID=【{arg.ClientId}】用户名或密码验证错误 {DateTime.Now} ");
-    }
-}
+// Admin.NET 项目的版权、商标、专利和其他相关权利均受相应法律法规的保护。使用本项目应遵守相关法律法规和许可证的要求。
+//
+// 本项目主要遵循 MIT 许可证和 Apache 许可证（版本 2.0）进行分发和使用。许可证位于源代码树根目录中的 LICENSE-MIT 和 LICENSE-APACHE 文件。
+//
+// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！
+
+using MQTTnet.Protocol;
+using MQTTnet.Server;
+
+namespace Admin.NET.Core;
+
+/// <summary>
+/// 默认 MQTT 事件拦截器
+/// </summary>
+public class DefaultMqttEventInterceptor : MqttEventInterceptor
+{
+    public new int Order = int.MinValue;
+
+    public override Task ValidatingConnectionAsync(ValidatingConnectionEventArgs arg)
+    {
+        var _db = App.GetRequiredService<ISqlSugarClient>();
+        // 验证账号
+        var user = _db.Queryable<SysUser>().First(u => u.Account == arg.UserName);
+        if (user == null)
+        {
+            arg.ReasonCode = MqttConnectReasonCode.BadUserNameOrPassword;
+            Logging($"客户端验证：客户端ID=【{arg.ClientId}】用户名不存在 {DateTime.Now} ");
+            return Task.CompletedTask;
+        }
+
+        // 验证密码
+        var password = arg.Password;
+        if (CryptogramUtil.CryptoType == CryptogramEnum.MD5.ToString())
+        {
+            if (user.Password.Equals(MD5Encryption.Encrypt(password)))
+                return Task.CompletedTask;
+        }
+        else
+        {
+            if (CryptogramUtil.Decrypt(user.Password).Equals(password))
+                return Task.CompletedTask;
+        }
+        arg.ReasonCode = MqttConnectReasonCode.BadUserNameOrPassword;
+        Logging($"客户端验证：客户端ID=【{arg.ClientId}】用户名或密码验证错误 {DateTime.Now} ");
+        return Task.CompletedTask;
+    }
+}
\ No newline at end of file
diff --git a/Admin.NET/Admin.NET.Core/Mqtt/MqttEventHandler.cs b/Admin.NET/Admin.NET.Core/Mqtt/MqttEventInterceptor.cs
similarity index 51%
rename from Admin.NET/Admin.NET.Core/Mqtt/MqttEventHandler.cs
rename to Admin.NET/Admin.NET.Core/Mqtt/MqttEventInterceptor.cs
index ea3146f3..1442ddd0 100644
--- a/Admin.NET/Admin.NET.Core/Mqtt/MqttEventHandler.cs
+++ b/Admin.NET/Admin.NET.Core/Mqtt/MqttEventInterceptor.cs
@@ -1,90 +1,120 @@
-// Admin.NET 项目的版权、商标、专利和其他相关权利均受相应法律法规的保护。使用本项目应遵守相关法律法规和许可证的要求。
-//
-// 本项目主要遵循 MIT 许可证和 Apache 许可证（版本 2.0）进行分发和使用。许可证位于源代码树根目录中的 LICENSE-MIT 和 LICENSE-APACHE 文件。
-//
-// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！
-
-using MQTTnet.Server;
-using MQTTnet;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
-using MQTTnet.Protocol;
-using Furion.Logging.Extensions;
-using Furion.HttpRemote;
-
-namespace Admin.NET.Core;
-
-/// <summary>
-/// Mqtt事件拦截器
-/// </summary>
-/// <remarks>
-/// 为了让底层的 Mqtt 代码与业务层代码分离，应该不同的业务继函 MqttEventHandler 类，实现自己的代码后
-/// 在 Startup.cs 的 Configure 函数中，调用 MqttHostedService 对象的 RegistMqttEventHandler 函数，来注册自己的事件处理器
-/// “业务相关的代码千万不要写在 MqttHostedService 中”
-/// </remarks>
-
-public class MqttEventHandler
-{
-    /// <summary>
-    /// 排序，数据越大越先执行
-    /// </summary>
-    public int Order = 0;
-
-    protected void Log(string msg)
-    {
-        var mqttOptions = App.GetOptions<MqttOptions>();
-        if (mqttOptions.ConsoleOutput)
-            Console.WriteLine(msg);
-        if (mqttOptions.Logging)
-            msg.LogDebug();
-    }
-
-    public virtual async Task ValidatingConnectionAsync(ValidatingConnectionEventArgs arg)
-    {
-    }
-
-    public virtual async Task StartedAsync(EventArgs arg)
-    {
-    }
-
-    public virtual async  Task StoppedAsync(EventArgs arg)
-    {
-    }
-
-    /// <summary>
-    /// 客户端发布的数据
-    /// </summary>
-    /// <param name="arg"></param>
-    /// <returns></returns>
-    public virtual async Task InterceptingPublishAsync(InterceptingPublishEventArgs arg)
-    {
-    }
-
-    /// <summary>
-    /// 没有客户端接收的数据
-    /// </summary>
-    /// <param name="arg"></param>
-    /// <returns></returns>
-    public virtual async Task ApplicationMessageNotConsumedAsync(ApplicationMessageNotConsumedEventArgs arg)
-    {
-    }
-
-    public virtual async Task ClientSubscribedTopicAsync(ClientSubscribedTopicEventArgs arg)
-    {
-    }
-    public virtual async Task ClientUnsubscribedTopicAsync(ClientUnsubscribedTopicEventArgs arg)
-    {
-    }
-
-    public virtual async Task ClientDisconnectedAsync(ClientDisconnectedEventArgs arg)
-    {
-    }
-
-    public virtual async Task ClientConnectedAsync(ClientConnectedEventArgs arg)
-    {
-    }
-}
+// Admin.NET 项目的版权、商标、专利和其他相关权利均受相应法律法规的保护。使用本项目应遵守相关法律法规和许可证的要求。
+//
+// 本项目主要遵循 MIT 许可证和 Apache 许可证（版本 2.0）进行分发和使用。许可证位于源代码树根目录中的 LICENSE-MIT 和 LICENSE-APACHE 文件。
+//
+// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！
+
+using MQTTnet.Server;
+
+namespace Admin.NET.Core;
+
+/// <summary>
+/// MQTT 事件拦截器
+/// </summary>
+public class MqttEventInterceptor
+{
+    /// <summary>
+    /// 数值越大越先执行
+    /// </summary>
+    public int Order = 0;
+
+    /// <summary>
+    /// 启动后事件
+    /// </summary>
+    /// <param name="arg"></param>
+    /// <returns></returns>
+    public virtual async Task StartedAsync(EventArgs arg)
+    {
+        await Task.CompletedTask;
+    }
+
+    /// <summary>
+    /// 关闭后事件
+    /// </summary>
+    /// <param name="arg"></param>
+    /// <returns></returns>
+    public virtual async Task StoppedAsync(EventArgs arg)
+    {
+        await Task.CompletedTask;
+    }
+
+    /// <summary>
+    /// 客户端验证事件
+    /// </summary>
+    /// <param name="arg"></param>
+    /// <returns></returns>
+    public virtual async Task ValidatingConnectionAsync(ValidatingConnectionEventArgs arg)
+    {
+        await Task.CompletedTask;
+    }
+
+    /// <summary>
+    /// 客户端连接事件
+    /// </summary>
+    /// <param name="arg"></param>
+    /// <returns></returns>
+    public virtual async Task ClientConnectedAsync(ClientConnectedEventArgs arg)
+    {
+        await Task.CompletedTask;
+    }
+
+    /// <summary>
+    /// 客户端断开事件
+    /// </summary>
+    /// <param name="arg"></param>
+    /// <returns></returns>
+    public virtual async Task ClientDisconnectedAsync(ClientDisconnectedEventArgs arg)
+    {
+        await Task.CompletedTask;
+    }
+
+    /// <summary>
+    /// 订阅主题事件
+    /// </summary>
+    /// <param name="arg"></param>
+    /// <returns></returns>
+    public virtual async Task ClientSubscribedTopicAsync(ClientSubscribedTopicEventArgs arg)
+    {
+        await Task.CompletedTask;
+    }
+
+    /// <summary>
+    /// 取消订阅事件
+    /// </summary>
+    /// <param name="arg"></param>
+    /// <returns></returns>
+    public virtual async Task ClientUnsubscribedTopicAsync(ClientUnsubscribedTopicEventArgs arg)
+    {
+        await Task.CompletedTask;
+    }
+
+    /// <summary>
+    /// 拦截发布的消息事件
+    /// </summary>
+    /// <param name="arg"></param>
+    /// <returns></returns>
+    public virtual async Task InterceptingPublishAsync(InterceptingPublishEventArgs arg)
+    {
+        await Task.CompletedTask;
+    }
+
+    /// <summary>
+    /// 未被消费的消息事件
+    /// </summary>
+    /// <param name="arg"></param>
+    /// <returns></returns>
+    public virtual async Task ApplicationMessageNotConsumedAsync(ApplicationMessageNotConsumedEventArgs arg)
+    {
+        await Task.CompletedTask;
+    }
+
+    /// <summary>
+    /// 输出日志事件
+    /// </summary>
+    /// <param name="msg"></param>
+    protected static void Logging(string msg)
+    {
+        if (!App.GetOptions<MqttOptions>().Logging) return;
+        LoggingWriter.LogInformation(msg);
+    }
+}
\ No newline at end of file
diff --git a/Admin.NET/Admin.NET.Core/Option/MqttOptions.cs b/Admin.NET/Admin.NET.Core/Option/MqttOptions.cs
index 60078e6a..873a5d6a 100644
--- a/Admin.NET/Admin.NET.Core/Option/MqttOptions.cs
+++ b/Admin.NET/Admin.NET.Core/Option/MqttOptions.cs
@@ -11,31 +11,11 @@ namespace Admin.NET.Core;
 /// </summary>
 public sealed class MqttOptions : IConfigurableOptions
 {
-    /// <summary>
-    /// 服务器主动发布时用的ClientId
-    /// </summary>
-    public string MqttServerId { get; set; }
-
     /// <summary>
     /// 是否启用
     /// </summary>
     public bool Enabled { get; set; }
 
-    /// <summary>
-    /// 输出文件日志
-    /// </summary>
-    public bool Logging { get; set; }
-
-    /// <summary>
-    /// 控制台输出
-    /// </summary>
-    public bool ConsoleOutput { get; set; }
-
-    /// <summary>
-    /// ConnectionBacklog
-    /// </summary>
-    public int ConnectionBacklog { get; set; }
-
     /// <summary>
     /// 端口
     /// </summary>
@@ -45,4 +25,19 @@ public sealed class MqttOptions : IConfigurableOptions
     /// IP地址
     /// </summary>
     public string IPAddress { get; set; }
+
+    /// <summary>
+    /// 最大连接数
+    /// </summary>
+    public int ConnectionBacklog { get; set; }
+
+    /// <summary>
+    /// 服务器主动发消息时的ClientId
+    /// </summary>
+    public string MqttServerId { get; set; }
+
+    /// <summary>
+    /// 输出日志
+    /// </summary>
+    public bool Logging { get; set; }
 }
\ No newline at end of file
diff --git a/Admin.NET/Admin.NET.Core/Service/Mqtt/Dto/SysMqttDto.cs b/Admin.NET/Admin.NET.Core/Service/Mqtt/Dto/MessageInput.cs
similarity index 81%
rename from Admin.NET/Admin.NET.Core/Service/Mqtt/Dto/SysMqttDto.cs
rename to Admin.NET/Admin.NET.Core/Service/Mqtt/Dto/MessageInput.cs
index 6df5ed55..3d105392 100644
--- a/Admin.NET/Admin.NET.Core/Service/Mqtt/Dto/SysMqttDto.cs
+++ b/Admin.NET/Admin.NET.Core/Service/Mqtt/Dto/MessageInput.cs
@@ -1,19 +1,23 @@
-// Admin.NET 项目的版权、商标、专利和其他相关权利均受相应法律法规的保护。使用本项目应遵守相关法律法规和许可证的要求。
-//
-// 本项目主要遵循 MIT 许可证和 Apache 许可证（版本 2.0）进行分发和使用。许可证位于源代码树根目录中的 LICENSE-MIT 和 LICENSE-APACHE 文件。
-//
-// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Admin.NET.Core;
-public class PublicMessageInput
-{
-    public string Topic { get; set; }
-
-    public string Message { get; set; }
-}
+// Admin.NET 项目的版权、商标、专利和其他相关权利均受相应法律法规的保护。使用本项目应遵守相关法律法规和许可证的要求。
+//
+// 本项目主要遵循 MIT 许可证和 Apache 许可证（版本 2.0）进行分发和使用。许可证位于源代码树根目录中的 LICENSE-MIT 和 LICENSE-APACHE 文件。
+//
+// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！
+
+namespace Admin.NET.Core;
+
+/// <summary>
+/// 发布主题消息
+/// </summary>
+public class PublicMessageInput
+{
+    /// <summary>
+    /// 主题名称
+    /// </summary>
+    public string Topic { get; set; }
+
+    /// <summary>
+    /// 消息内容
+    /// </summary>
+    public string Message { get; set; }
+}
\ No newline at end of file
diff --git a/Admin.NET/Admin.NET.Core/Service/Mqtt/SysMqttService.cs b/Admin.NET/Admin.NET.Core/Service/Mqtt/SysMqttService.cs
index 85dbdfb0..bde16576 100644
--- a/Admin.NET/Admin.NET.Core/Service/Mqtt/SysMqttService.cs
+++ b/Admin.NET/Admin.NET.Core/Service/Mqtt/SysMqttService.cs
@@ -18,7 +18,7 @@ public class SysMqttService() : IDynamicApiController, ITransient
     /// 获取客户端列表 🔖
     /// </summary>
     /// <returns></returns>
-    [DisplayName("获取客户端列表")]
+    [DisplayName("获取客户端列表")]
     public async Task<IList<MqttClientStatus>> GetClients()
     {
         if (MqttHostedService.MqttServer == null)
@@ -28,15 +28,14 @@ public class SysMqttService() : IDynamicApiController, ITransient
     }
 
     /// <summary>
-    /// 发布主题 🔖
+    /// 发布主题消息 🔖
     /// </summary>
     /// <param name="input"></param>
     /// <returns></returns>
-    [AllowAnonymous]
-    [DisplayName("发布主题")]
+    [DisplayName("发布主题消息")]
     public async Task PublicMessage(PublicMessageInput input)
     {
-        MqttHostedService mqttHostedService = App.GetRequiredService<MqttHostedService>();
-        mqttHostedService.PublicMessage(input.Topic, input.Message);
+        var mqttHostedService = App.GetRequiredService<MqttHostedService>();
+        await mqttHostedService.PublicMessageAsync(input.Topic, input.Message);
     }
 }
\ No newline at end of file
diff --git a/Admin.NET/Admin.NET.Web.Core/Startup.cs b/Admin.NET/Admin.NET.Web.Core/Startup.cs
index f637206c..b7b2ad8e 100644
--- a/Admin.NET/Admin.NET.Web.Core/Startup.cs
+++ b/Admin.NET/Admin.NET.Web.Core/Startup.cs
@@ -22,7 +22,6 @@ using Microsoft.AspNetCore.ResponseCompression;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.FileProviders;
 using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Options;
 using MQTTnet.AspNetCore;
 using Newtonsoft.Json;
 using OnceMi.AspNetCore.OSS;
@@ -108,7 +107,8 @@ public class Startup : AppStartup
             // setting.MetadataPropertyHandling = MetadataPropertyHandling.Ignore; // 解决DateTimeOffset异常
             // setting.DateParseHandling = DateParseHandling.None; // 解决DateTimeOffset异常
             // setting.Converters.Add(new IsoDateTimeConverter { DateTimeStyles = DateTimeStyles.AssumeUniversal }); // 解决DateTimeOffset异常
-        };
+        }
+        ;
 
         services.AddControllersWithViews()
             .AddAppLocalization()
@@ -412,29 +412,22 @@ public class Startup : AppStartup
             }
         });
 
-        IOptions<MqttOptions> mqttOptions = App.GetRequiredService<IOptions<MqttOptions>>();
+        var mqttOptions = App.GetConfig<MqttOptions>("Mqtt", true);
         app.UseEndpoints(endpoints =>
         {
             // 注册集线器
             endpoints.MapHubs();
-
+            // 注册路由
             endpoints.MapControllerRoute(
                 name: "default",
                 pattern: "{controller=Home}/{action=Index}/{id?}");
-            if (mqttOptions.Value.Enabled)
+            // 注册 MQTT 支持 WebSocket
+            if (mqttOptions.Enabled)
             {
-                endpoints.MapConnectionHandler<MqttConnectionHandler>(
-                    "/mqtt",
+                endpoints.MapConnectionHandler<MqttConnectionHandler>("/mqtt",
                     httpConnectionDispatcherOptions => httpConnectionDispatcherOptions.WebSockets.SubProtocolSelector =
                         protocolList => protocolList.FirstOrDefault() ?? string.Empty);
             }
         });
-
-        
-        if (mqttOptions.Value.Enabled)
-        {
-            // [以下是验证的示例] 注册自己业务的 Mqtt 处理器，如果有不同的认证方式，要把以下这句注释掉
-            //MqttHostedService.RegistMqttEventHandler(new MqttEventHandlerForAdminNet(), int.MaxValue);
-        }
     }
 }
\ No newline at end of file
diff --git a/Web/package.json b/Web/package.json
index 001b344e..1953e0ec 100644
--- a/Web/package.json
+++ b/Web/package.json
@@ -2,7 +2,7 @@
 	"name": "admin.net.pro",
 	"type": "module",
 	"version": "2.4.33",
-	"lastBuildTime": "2025.02.20",
+	"lastBuildTime": "2025.02.23",
 	"description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架",
 	"author": "zuohuaijun",
 	"license": "MIT",
@@ -18,8 +18,8 @@
 	},
 	"dependencies": {
 		"@element-plus/icons-vue": "^2.3.1",
-		"@logicflow/core": "^2.0.10",
-		"@logicflow/extension": "^2.0.14",
+		"@logicflow/core": "^2.0.11",
+		"@logicflow/extension": "^2.0.15",
 		"@microsoft/signalr": "^8.0.7",
 		"@vue-office/docx": "^1.6.2",
 		"@vue-office/excel": "^1.7.14",
@@ -36,7 +36,7 @@
 		"echarts": "^5.6.0",
 		"echarts-gl": "^2.0.9",
 		"echarts-wordcloud": "^2.1.0",
-		"element-plus": "^2.9.4",
+		"element-plus": "^2.9.5",
 		"exceljs": "^4.4.0",
 		"ezuikit-js": "^8.1.6",
 		"gcoord": "^1.0.7",
@@ -45,7 +45,7 @@
 		"jsplumb": "^2.15.6",
 		"jwchat": "^2.0.3",
 		"lodash-es": "^4.17.21",
-		"md-editor-v3": "^5.2.3",
+		"md-editor-v3": "^5.3.2",
 		"mitt": "^3.0.1",
 		"monaco-editor": "^0.52.2",
 		"mqtt": "^5.10.3",
@@ -74,7 +74,7 @@
 		"vue-router": "^4.5.0",
 		"vue-signature-pad": "^3.0.2",
 		"vue3-tree-org": "^4.2.2",
-		"vxe-pc-ui": "^4.3.91",
+		"vxe-pc-ui": "^4.3.95",
 		"vxe-table": "^4.10.0",
 		"vxe-table-plugin-element": "^4.0.4",
 		"vxe-table-plugin-export-xlsx": "^4.0.7",
@@ -94,11 +94,11 @@
 		"@vitejs/plugin-vue-jsx": "^4.1.1",
 		"@vue/compiler-sfc": "^3.5.13",
 		"code-inspector-plugin": "^0.20.0",
-		"eslint": "^9.20.1",
+		"eslint": "^9.21.0",
 		"eslint-plugin-vue": "^9.32.0",
-		"globals": "^15.15.0",
+		"globals": "^16.0.0",
 		"less": "^4.2.2",
-		"prettier": "^3.5.1",
+		"prettier": "^3.5.2",
 		"rollup-plugin-visualizer": "^5.14.0",
 		"sass": "^1.85.0",
 		"terser": "^5.39.0",
diff --git a/Web/src/api-services/api.ts b/Web/src/api-services/api.ts
index ef08566b..0944a5c1 100644
--- a/Web/src/api-services/api.ts
+++ b/Web/src/api-services/api.ts
@@ -38,6 +38,7 @@ export * from './apis/sys-log-op-api';
 export * from './apis/sys-log-vis-api';
 export * from './apis/sys-menu-api';
 export * from './apis/sys-message-api';
+export * from './apis/sys-mqtt-api';
 export * from './apis/sys-notice-api';
 export * from './apis/sys-oauth-api';
 export * from './apis/sys-oauth-user-api';
diff --git a/Web/src/api-services/apis/sys-enum-api.ts b/Web/src/api-services/apis/sys-enum-api.ts
index f7bf078c..4f65d065 100644
--- a/Web/src/api-services/apis/sys-enum-api.ts
+++ b/Web/src/api-services/apis/sys-enum-api.ts
@@ -77,6 +77,49 @@ export const SysEnumApiAxiosParamCreator = function (configuration?: Configurati
                 options: localVarRequestOptions,
             };
         },
+        /**
+         * 
+         * @summary 枚举转字典
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        apiSysEnumEnumToDictPost: async (options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+            const localVarPath = `/api/sysEnum/enumToDict`;
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, 'https://example.com');
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions :AxiosRequestConfig = { method: 'POST', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+            // authentication Bearer required
+            // http bearer authentication required
+            if (configuration && configuration.accessToken) {
+                const accessToken = typeof configuration.accessToken === 'function'
+                    ? await configuration.accessToken()
+                    : await configuration.accessToken;
+                localVarHeaderParameter["Authorization"] = "Bearer " + accessToken;
+            }
+
+            const query = new URLSearchParams(localVarUrlObj.search);
+            for (const key in localVarQueryParameter) {
+                query.set(key, localVarQueryParameter[key]);
+            }
+            for (const key in options.params) {
+                query.set(key, options.params[key]);
+            }
+            localVarUrlObj.search = (new URLSearchParams(query)).toString();
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+
+            return {
+                url: localVarUrlObj.pathname + localVarUrlObj.search + localVarUrlObj.hash,
+                options: localVarRequestOptions,
+            };
+        },
         /**
          * 
          * @summary 获取所有枚举类型 🔖
@@ -143,6 +186,19 @@ export const SysEnumApiFp = function(configuration?: Configuration) {
                 return axios.request(axiosRequestArgs);
             };
         },
+        /**
+         * 
+         * @summary 枚举转字典
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async apiSysEnumEnumToDictPost(options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<void>>> {
+            const localVarAxiosArgs = await SysEnumApiAxiosParamCreator(configuration).apiSysEnumEnumToDictPost(options);
+            return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
+                const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
+                return axios.request(axiosRequestArgs);
+            };
+        },
         /**
          * 
          * @summary 获取所有枚举类型 🔖
@@ -175,6 +231,15 @@ export const SysEnumApiFactory = function (configuration?: Configuration, basePa
         async apiSysEnumEnumDataListGet(enumName: string, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminNETResultListEnumEntity>> {
             return SysEnumApiFp(configuration).apiSysEnumEnumDataListGet(enumName, options).then((request) => request(axios, basePath));
         },
+        /**
+         * 
+         * @summary 枚举转字典
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async apiSysEnumEnumToDictPost(options?: AxiosRequestConfig): Promise<AxiosResponse<void>> {
+            return SysEnumApiFp(configuration).apiSysEnumEnumToDictPost(options).then((request) => request(axios, basePath));
+        },
         /**
          * 
          * @summary 获取所有枚举类型 🔖
@@ -205,6 +270,16 @@ export class SysEnumApi extends BaseAPI {
     public async apiSysEnumEnumDataListGet(enumName: string, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminNETResultListEnumEntity>> {
         return SysEnumApiFp(this.configuration).apiSysEnumEnumDataListGet(enumName, options).then((request) => request(this.axios, this.basePath));
     }
+    /**
+     * 
+     * @summary 枚举转字典
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof SysEnumApi
+     */
+    public async apiSysEnumEnumToDictPost(options?: AxiosRequestConfig) : Promise<AxiosResponse<void>> {
+        return SysEnumApiFp(this.configuration).apiSysEnumEnumToDictPost(options).then((request) => request(this.axios, this.basePath));
+    }
     /**
      * 
      * @summary 获取所有枚举类型 🔖
diff --git a/Web/src/api-services/apis/sys-mqtt-api.ts b/Web/src/api-services/apis/sys-mqtt-api.ts
new file mode 100644
index 00000000..ae673eb4
--- /dev/null
+++ b/Web/src/api-services/apis/sys-mqtt-api.ts
@@ -0,0 +1,214 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * Admin.NET 通用权限开发平台
+ * 让 .NET 开发更简单、更通用、更流行。整合最新技术，模块插件式开发，前后端分离，开箱即用。<br/><u><b><font color='FF0000'> 👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！</font></b></u>
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+import globalAxios, { AxiosResponse, AxiosInstance, AxiosRequestConfig } from 'axios';
+import { Configuration } from '../configuration';
+// Some imports not used depending on template conditions
+// @ts-ignore
+import { BASE_PATH, COLLECTION_FORMATS, RequestArgs, BaseAPI, RequiredError } from '../base';
+import { AdminNETResultIListMqttClientStatus } from '../models';
+import { PublicMessageInput } from '../models';
+/**
+ * SysMqttApi - axios parameter creator
+ * @export
+ */
+export const SysMqttApiAxiosParamCreator = function (configuration?: Configuration) {
+    return {
+        /**
+         * 
+         * @summary 获取客户端列表 🔖
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        apiSysMqttClientsGet: async (options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+            const localVarPath = `/api/sysMqtt/clients`;
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, 'https://example.com');
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions :AxiosRequestConfig = { method: 'GET', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+            // authentication Bearer required
+            // http bearer authentication required
+            if (configuration && configuration.accessToken) {
+                const accessToken = typeof configuration.accessToken === 'function'
+                    ? await configuration.accessToken()
+                    : await configuration.accessToken;
+                localVarHeaderParameter["Authorization"] = "Bearer " + accessToken;
+            }
+
+            const query = new URLSearchParams(localVarUrlObj.search);
+            for (const key in localVarQueryParameter) {
+                query.set(key, localVarQueryParameter[key]);
+            }
+            for (const key in options.params) {
+                query.set(key, options.params[key]);
+            }
+            localVarUrlObj.search = (new URLSearchParams(query)).toString();
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+
+            return {
+                url: localVarUrlObj.pathname + localVarUrlObj.search + localVarUrlObj.hash,
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @summary 发布主题消息 🔖
+         * @param {PublicMessageInput} [body] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        apiSysMqttPublicMessagePost: async (body?: PublicMessageInput, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+            const localVarPath = `/api/sysMqtt/publicMessage`;
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, 'https://example.com');
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions :AxiosRequestConfig = { method: 'POST', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+            // authentication Bearer required
+            // http bearer authentication required
+            if (configuration && configuration.accessToken) {
+                const accessToken = typeof configuration.accessToken === 'function'
+                    ? await configuration.accessToken()
+                    : await configuration.accessToken;
+                localVarHeaderParameter["Authorization"] = "Bearer " + accessToken;
+            }
+
+            localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
+
+            const query = new URLSearchParams(localVarUrlObj.search);
+            for (const key in localVarQueryParameter) {
+                query.set(key, localVarQueryParameter[key]);
+            }
+            for (const key in options.params) {
+                query.set(key, options.params[key]);
+            }
+            localVarUrlObj.search = (new URLSearchParams(query)).toString();
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+            const needsSerialization = (typeof body !== "string") || localVarRequestOptions.headers['Content-Type'] === 'application/json';
+            localVarRequestOptions.data =  needsSerialization ? JSON.stringify(body !== undefined ? body : {}) : (body || "");
+
+            return {
+                url: localVarUrlObj.pathname + localVarUrlObj.search + localVarUrlObj.hash,
+                options: localVarRequestOptions,
+            };
+        },
+    }
+};
+
+/**
+ * SysMqttApi - functional programming interface
+ * @export
+ */
+export const SysMqttApiFp = function(configuration?: Configuration) {
+    return {
+        /**
+         * 
+         * @summary 获取客户端列表 🔖
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async apiSysMqttClientsGet(options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminNETResultIListMqttClientStatus>>> {
+            const localVarAxiosArgs = await SysMqttApiAxiosParamCreator(configuration).apiSysMqttClientsGet(options);
+            return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
+                const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
+                return axios.request(axiosRequestArgs);
+            };
+        },
+        /**
+         * 
+         * @summary 发布主题消息 🔖
+         * @param {PublicMessageInput} [body] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async apiSysMqttPublicMessagePost(body?: PublicMessageInput, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<void>>> {
+            const localVarAxiosArgs = await SysMqttApiAxiosParamCreator(configuration).apiSysMqttPublicMessagePost(body, options);
+            return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
+                const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
+                return axios.request(axiosRequestArgs);
+            };
+        },
+    }
+};
+
+/**
+ * SysMqttApi - factory interface
+ * @export
+ */
+export const SysMqttApiFactory = function (configuration?: Configuration, basePath?: string, axios?: AxiosInstance) {
+    return {
+        /**
+         * 
+         * @summary 获取客户端列表 🔖
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async apiSysMqttClientsGet(options?: AxiosRequestConfig): Promise<AxiosResponse<AdminNETResultIListMqttClientStatus>> {
+            return SysMqttApiFp(configuration).apiSysMqttClientsGet(options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @summary 发布主题消息 🔖
+         * @param {PublicMessageInput} [body] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async apiSysMqttPublicMessagePost(body?: PublicMessageInput, options?: AxiosRequestConfig): Promise<AxiosResponse<void>> {
+            return SysMqttApiFp(configuration).apiSysMqttPublicMessagePost(body, options).then((request) => request(axios, basePath));
+        },
+    };
+};
+
+/**
+ * SysMqttApi - object-oriented interface
+ * @export
+ * @class SysMqttApi
+ * @extends {BaseAPI}
+ */
+export class SysMqttApi extends BaseAPI {
+    /**
+     * 
+     * @summary 获取客户端列表 🔖
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof SysMqttApi
+     */
+    public async apiSysMqttClientsGet(options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminNETResultIListMqttClientStatus>> {
+        return SysMqttApiFp(this.configuration).apiSysMqttClientsGet(options).then((request) => request(this.axios, this.basePath));
+    }
+    /**
+     * 
+     * @summary 发布主题消息 🔖
+     * @param {PublicMessageInput} [body] 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof SysMqttApi
+     */
+    public async apiSysMqttPublicMessagePost(body?: PublicMessageInput, options?: AxiosRequestConfig) : Promise<AxiosResponse<void>> {
+        return SysMqttApiFp(this.configuration).apiSysMqttPublicMessagePost(body, options).then((request) => request(this.axios, this.basePath));
+    }
+}
diff --git a/Web/src/api-services/apis/sys-online-user-api.ts b/Web/src/api-services/apis/sys-online-user-api.ts
index 5eb8c50c..bacc81fa 100644
--- a/Web/src/api-services/apis/sys-online-user-api.ts
+++ b/Web/src/api-services/apis/sys-online-user-api.ts
@@ -74,6 +74,49 @@ export const SysOnlineUserApiAxiosParamCreator = function (configuration?: Confi
                 options: localVarRequestOptions,
             };
         },
+        /**
+         * 
+         * @summary 清理在线用户（开启单设备登录时只留相同账号最后登录的）
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        apiSysOnlineUserOnlinePost: async (options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+            const localVarPath = `/api/sysOnlineUser/online`;
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, 'https://example.com');
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions :AxiosRequestConfig = { method: 'POST', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+            // authentication Bearer required
+            // http bearer authentication required
+            if (configuration && configuration.accessToken) {
+                const accessToken = typeof configuration.accessToken === 'function'
+                    ? await configuration.accessToken()
+                    : await configuration.accessToken;
+                localVarHeaderParameter["Authorization"] = "Bearer " + accessToken;
+            }
+
+            const query = new URLSearchParams(localVarUrlObj.search);
+            for (const key in localVarQueryParameter) {
+                query.set(key, localVarQueryParameter[key]);
+            }
+            for (const key in options.params) {
+                query.set(key, options.params[key]);
+            }
+            localVarUrlObj.search = (new URLSearchParams(query)).toString();
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+
+            return {
+                url: localVarUrlObj.pathname + localVarUrlObj.search + localVarUrlObj.hash,
+                options: localVarRequestOptions,
+            };
+        },
         /**
          * 
          * @summary 获取在线用户分页列表 🔖
@@ -145,6 +188,19 @@ export const SysOnlineUserApiFp = function(configuration?: Configuration) {
                 return axios.request(axiosRequestArgs);
             };
         },
+        /**
+         * 
+         * @summary 清理在线用户（开启单设备登录时只留相同账号最后登录的）
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async apiSysOnlineUserOnlinePost(options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<void>>> {
+            const localVarAxiosArgs = await SysOnlineUserApiAxiosParamCreator(configuration).apiSysOnlineUserOnlinePost(options);
+            return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
+                const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
+                return axios.request(axiosRequestArgs);
+            };
+        },
         /**
          * 
          * @summary 获取在线用户分页列表 🔖
@@ -178,6 +234,15 @@ export const SysOnlineUserApiFactory = function (configuration?: Configuration,
         async apiSysOnlineUserForceOfflinePost(body?: SysOnlineUser, options?: AxiosRequestConfig): Promise<AxiosResponse<void>> {
             return SysOnlineUserApiFp(configuration).apiSysOnlineUserForceOfflinePost(body, options).then((request) => request(axios, basePath));
         },
+        /**
+         * 
+         * @summary 清理在线用户（开启单设备登录时只留相同账号最后登录的）
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async apiSysOnlineUserOnlinePost(options?: AxiosRequestConfig): Promise<AxiosResponse<void>> {
+            return SysOnlineUserApiFp(configuration).apiSysOnlineUserOnlinePost(options).then((request) => request(axios, basePath));
+        },
         /**
          * 
          * @summary 获取在线用户分页列表 🔖
@@ -209,6 +274,16 @@ export class SysOnlineUserApi extends BaseAPI {
     public async apiSysOnlineUserForceOfflinePost(body?: SysOnlineUser, options?: AxiosRequestConfig) : Promise<AxiosResponse<void>> {
         return SysOnlineUserApiFp(this.configuration).apiSysOnlineUserForceOfflinePost(body, options).then((request) => request(this.axios, this.basePath));
     }
+    /**
+     * 
+     * @summary 清理在线用户（开启单设备登录时只留相同账号最后登录的）
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof SysOnlineUserApi
+     */
+    public async apiSysOnlineUserOnlinePost(options?: AxiosRequestConfig) : Promise<AxiosResponse<void>> {
+        return SysOnlineUserApiFp(this.configuration).apiSysOnlineUserOnlinePost(options).then((request) => request(this.axios, this.basePath));
+    }
     /**
      * 
      * @summary 获取在线用户分页列表 🔖
diff --git a/Web/src/api-services/models/address-family.ts b/Web/src/api-services/models/address-family.ts
new file mode 100644
index 00000000..654715f1
--- /dev/null
+++ b/Web/src/api-services/models/address-family.ts
@@ -0,0 +1,53 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * Admin.NET 通用权限开发平台
+ * 让 .NET 开发更简单、更通用、更流行。整合最新技术，模块插件式开发，前后端分离，开箱即用。<br/><u><b><font color='FF0000'> 👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！</font></b></u>
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+/**
+ * 
+ * @export
+ * @enum {string}
+ */
+export enum AddressFamily {
+    NUMBER_0 = 0,
+    NUMBER_1 = 1,
+    NUMBER_2 = 2,
+    NUMBER_3 = 3,
+    NUMBER_4 = 4,
+    NUMBER_5 = 5,
+    NUMBER_6 = 6,
+    NUMBER_7 = 7,
+    NUMBER_8 = 8,
+    NUMBER_9 = 9,
+    NUMBER_10 = 10,
+    NUMBER_11 = 11,
+    NUMBER_12 = 12,
+    NUMBER_13 = 13,
+    NUMBER_14 = 14,
+    NUMBER_15 = 15,
+    NUMBER_16 = 16,
+    NUMBER_17 = 17,
+    NUMBER_18 = 18,
+    NUMBER_19 = 19,
+    NUMBER_21 = 21,
+    NUMBER_22 = 22,
+    NUMBER_23 = 23,
+    NUMBER_24 = 24,
+    NUMBER_25 = 25,
+    NUMBER_26 = 26,
+    NUMBER_28 = 28,
+    NUMBER_29 = 29,
+    NUMBER_65536 = 65536,
+    NUMBER_65537 = 65537,
+    NUMBER_MINUS_1 = -1
+}
+
diff --git a/Web/src/api-services/models/admin-netresult-ilist-mqtt-client-status.ts b/Web/src/api-services/models/admin-netresult-ilist-mqtt-client-status.ts
new file mode 100644
index 00000000..2f6c29da
--- /dev/null
+++ b/Web/src/api-services/models/admin-netresult-ilist-mqtt-client-status.ts
@@ -0,0 +1,71 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * Admin.NET 通用权限开发平台
+ * 让 .NET 开发更简单、更通用、更流行。整合最新技术，模块插件式开发，前后端分离，开箱即用。<br/><u><b><font color='FF0000'> 👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！</font></b></u>
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+import { MqttClientStatus } from './mqtt-client-status';
+ /**
+ * 全局返回结果
+ *
+ * @export
+ * @interface AdminNETResultIListMqttClientStatus
+ */
+export interface AdminNETResultIListMqttClientStatus {
+
+    /**
+     * 状态码
+     *
+     * @type {number}
+     * @memberof AdminNETResultIListMqttClientStatus
+     */
+    code?: number;
+
+    /**
+     * 类型success、warning、error
+     *
+     * @type {string}
+     * @memberof AdminNETResultIListMqttClientStatus
+     */
+    type?: string | null;
+
+    /**
+     * 错误信息
+     *
+     * @type {string}
+     * @memberof AdminNETResultIListMqttClientStatus
+     */
+    message?: string | null;
+
+    /**
+     * 数据
+     *
+     * @type {Array<MqttClientStatus>}
+     * @memberof AdminNETResultIListMqttClientStatus
+     */
+    result?: Array<MqttClientStatus> | null;
+
+    /**
+     * 附加数据
+     *
+     * @type {any}
+     * @memberof AdminNETResultIListMqttClientStatus
+     */
+    extras?: any | null;
+
+    /**
+     * 时间
+     *
+     * @type {Date}
+     * @memberof AdminNETResultIListMqttClientStatus
+     */
+    time?: Date;
+}
diff --git a/Web/src/api-services/models/end-point.ts b/Web/src/api-services/models/end-point.ts
new file mode 100644
index 00000000..d8fb2621
--- /dev/null
+++ b/Web/src/api-services/models/end-point.ts
@@ -0,0 +1,29 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * Admin.NET 通用权限开发平台
+ * 让 .NET 开发更简单、更通用、更流行。整合最新技术，模块插件式开发，前后端分离，开箱即用。<br/><u><b><font color='FF0000'> 👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！</font></b></u>
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+import { AddressFamily } from './address-family';
+ /**
+ * 
+ *
+ * @export
+ * @interface EndPoint
+ */
+export interface EndPoint {
+
+    /**
+     * @type {AddressFamily}
+     * @memberof EndPoint
+     */
+    addressFamily?: AddressFamily;
+}
diff --git a/Web/src/api-services/models/index.ts b/Web/src/api-services/models/index.ts
index ac63806c..77de8f9a 100644
--- a/Web/src/api-services/models/index.ts
+++ b/Web/src/api-services/models/index.ts
@@ -21,6 +21,7 @@ export * from './add-sys-ldap-input';
 export * from './add-tenant-input';
 export * from './add-upgrade-input';
 export * from './add-user-input';
+export * from './address-family';
 export * from './admin-netresult-boolean';
 export * from './admin-netresult-captcha-output';
 export * from './admin-netresult-create-pay-transaction-native-output';
@@ -34,6 +35,7 @@ export * from './admin-netresult-grant-role-output';
 export * from './admin-netresult-iaction-result';
 export * from './admin-netresult-idisposable';
 export * from './admin-netresult-ienumerable-entity-info';
+export * from './admin-netresult-ilist-mqtt-client-status';
 export * from './admin-netresult-int32';
 export * from './admin-netresult-int64';
 export * from './admin-netresult-jobject';
@@ -210,6 +212,7 @@ export * from './delete-user-input';
 export * from './dict-data-input';
 export * from './dict-type-input';
 export * from './digit-shapes';
+export * from './end-point';
 export * from './entity-column-info';
 export * from './entity-info';
 export * from './enum-entity';
@@ -276,6 +279,9 @@ export * from './method-impl-attributes';
 export * from './method-info';
 export * from './module';
 export * from './module-handle';
+export * from './mqtt-client-status';
+export * from './mqtt-protocol-version';
+export * from './mqtt-session-status';
 export * from './navigate';
 export * from './notice-input';
 export * from './notice-status-enum';
@@ -322,6 +328,7 @@ export * from './print-type-enum';
 export * from './promotion';
 export * from './property-attributes';
 export * from './property-info';
+export * from './public-message-input';
 export * from './query-region-input';
 export * from './refund-request-input';
 export * from './reset-pwd-user-input';
diff --git a/Web/src/api-services/models/mqtt-client-status.ts b/Web/src/api-services/models/mqtt-client-status.ts
new file mode 100644
index 00000000..49acff86
--- /dev/null
+++ b/Web/src/api-services/models/mqtt-client-status.ts
@@ -0,0 +1,115 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * Admin.NET 通用权限开发平台
+ * 让 .NET 开发更简单、更通用、更流行。整合最新技术，模块插件式开发，前后端分离，开箱即用。<br/><u><b><font color='FF0000'> 👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！</font></b></u>
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+import { EndPoint } from './end-point';
+import { MqttProtocolVersion } from './mqtt-protocol-version';
+import { MqttSessionStatus } from './mqtt-session-status';
+ /**
+ * 
+ *
+ * @export
+ * @interface MqttClientStatus
+ */
+export interface MqttClientStatus {
+
+    /**
+     * @type {number}
+     * @memberof MqttClientStatus
+     */
+    bytesReceived?: number;
+
+    /**
+     * @type {number}
+     * @memberof MqttClientStatus
+     */
+    bytesSent?: number;
+
+    /**
+     * @type {Date}
+     * @memberof MqttClientStatus
+     */
+    connectedTimestamp?: Date;
+
+    /**
+     * @type {EndPoint}
+     * @memberof MqttClientStatus
+     */
+    remoteEndPoint?: EndPoint;
+
+    /**
+     * @type {string}
+     * @memberof MqttClientStatus
+     */
+    endpoint?: string | null;
+
+    /**
+     * @type {string}
+     * @memberof MqttClientStatus
+     */
+    id?: string | null;
+
+    /**
+     * @type {Date}
+     * @memberof MqttClientStatus
+     */
+    lastNonKeepAlivePacketReceivedTimestamp?: Date;
+
+    /**
+     * @type {Date}
+     * @memberof MqttClientStatus
+     */
+    lastPacketReceivedTimestamp?: Date;
+
+    /**
+     * @type {Date}
+     * @memberof MqttClientStatus
+     */
+    lastPacketSentTimestamp?: Date;
+
+    /**
+     * @type {MqttProtocolVersion}
+     * @memberof MqttClientStatus
+     */
+    protocolVersion?: MqttProtocolVersion;
+
+    /**
+     * @type {number}
+     * @memberof MqttClientStatus
+     */
+    receivedApplicationMessagesCount?: number;
+
+    /**
+     * @type {number}
+     * @memberof MqttClientStatus
+     */
+    receivedPacketsCount?: number;
+
+    /**
+     * @type {number}
+     * @memberof MqttClientStatus
+     */
+    sentApplicationMessagesCount?: number;
+
+    /**
+     * @type {number}
+     * @memberof MqttClientStatus
+     */
+    sentPacketsCount?: number;
+
+    /**
+     * @type {MqttSessionStatus}
+     * @memberof MqttClientStatus
+     */
+    session?: MqttSessionStatus;
+}
diff --git a/Web/src/api-services/models/mqtt-protocol-version.ts b/Web/src/api-services/models/mqtt-protocol-version.ts
new file mode 100644
index 00000000..22fcb5c0
--- /dev/null
+++ b/Web/src/api-services/models/mqtt-protocol-version.ts
@@ -0,0 +1,26 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * Admin.NET 通用权限开发平台
+ * 让 .NET 开发更简单、更通用、更流行。整合最新技术，模块插件式开发，前后端分离，开箱即用。<br/><u><b><font color='FF0000'> 👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！</font></b></u>
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+/**
+ * 
+ * @export
+ * @enum {string}
+ */
+export enum MqttProtocolVersion {
+    NUMBER_0 = 0,
+    NUMBER_3 = 3,
+    NUMBER_4 = 4,
+    NUMBER_5 = 5
+}
+
diff --git a/Web/src/api-services/models/mqtt-session-status.ts b/Web/src/api-services/models/mqtt-session-status.ts
new file mode 100644
index 00000000..e83e0538
--- /dev/null
+++ b/Web/src/api-services/models/mqtt-session-status.ts
@@ -0,0 +1,58 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * Admin.NET 通用权限开发平台
+ * 让 .NET 开发更简单、更通用、更流行。整合最新技术，模块插件式开发，前后端分离，开箱即用。<br/><u><b><font color='FF0000'> 👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！</font></b></u>
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+ /**
+ * 
+ *
+ * @export
+ * @interface MqttSessionStatus
+ */
+export interface MqttSessionStatus {
+
+    /**
+     * @type {Date}
+     * @memberof MqttSessionStatus
+     */
+    createdTimestamp?: Date;
+
+    /**
+     * @type {Date}
+     * @memberof MqttSessionStatus
+     */
+    disconnectedTimestamp?: Date | null;
+
+    /**
+     * @type {number}
+     * @memberof MqttSessionStatus
+     */
+    expiryInterval?: number;
+
+    /**
+     * @type {string}
+     * @memberof MqttSessionStatus
+     */
+    id?: string | null;
+
+    /**
+     * @type {{ [key: string]: any; }}
+     * @memberof MqttSessionStatus
+     */
+    items?: { [key: string]: any; } | null;
+
+    /**
+     * @type {number}
+     * @memberof MqttSessionStatus
+     */
+    pendingApplicationMessagesCount?: number;
+}
diff --git a/Web/src/api-services/models/public-message-input.ts b/Web/src/api-services/models/public-message-input.ts
new file mode 100644
index 00000000..13fedfa0
--- /dev/null
+++ b/Web/src/api-services/models/public-message-input.ts
@@ -0,0 +1,38 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * Admin.NET 通用权限开发平台
+ * 让 .NET 开发更简单、更通用、更流行。整合最新技术，模块插件式开发，前后端分离，开箱即用。<br/><u><b><font color='FF0000'> 👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！</font></b></u>
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+ /**
+ * 发布主题消息
+ *
+ * @export
+ * @interface PublicMessageInput
+ */
+export interface PublicMessageInput {
+
+    /**
+     * 主题名称
+     *
+     * @type {string}
+     * @memberof PublicMessageInput
+     */
+    topic?: string | null;
+
+    /**
+     * 消息内容
+     *
+     * @type {string}
+     * @memberof PublicMessageInput
+     */
+    message?: string | null;
+}
diff --git a/Web/src/api-services/models/sys-file.ts b/Web/src/api-services/models/sys-file.ts
index 72381d10..e0ca5143 100644
--- a/Web/src/api-services/models/sys-file.ts
+++ b/Web/src/api-services/models/sys-file.ts
@@ -140,6 +140,14 @@ export interface SysFile {
      */
     suffix?: string | null;
 
+    /**
+     * MIME类型
+     *
+     * @type {string}
+     * @memberof SysFile
+     */
+    contentType?: string | null;
+
     /**
      * 存储路径
      *