From 471b0f2c91d8b27684e00f3d6b0f644cad65d5a3 Mon Sep 17 00:00:00 2001 From: HZG System Date: Mon, 22 Jun 2026 13:44:43 +0800 Subject: [PATCH 1/3] =?UTF-8?q?{"Message":"=E7=AD=BE=E5=87=BA=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=20:=20[=E5=BA=94=E7=94=A8=E8=AE=BE=E7=BD=AE]","Messag?= =?UTF-8?q?eType":1,"Modules":[],"Version":"v1"}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .collaboration | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.collaboration b/.collaboration index 06ab323..8999e2e 100644 --- a/.collaboration +++ b/.collaboration @@ -183,8 +183,18 @@ }, { "ModuleName": "ApplicationSetting", + "State": 1, + "LockedBy": { + "UserName": "XA-GCSCN-WILL\\NingWei", + "Email": "will.ning@grapecity.com" + }, + "LockDateTime": "2026-06-22T13:44:43.7393578+08:00", "ModuleType": 8, - "IconType": 10 + "IconType": 10, + "ToRemoveFiles": [ + "ApplicationSettings.json", + "favicon.ico" + ] }, { "ModuleName": "Theme", -- Gitee From 8fc1c047077de9e5f2d13647ee364faf632e63d2 Mon Sep 17 00:00:00 2001 From: HZG System Date: Tue, 23 Jun 2026 10:51:23 +0800 Subject: [PATCH 2/3] =?UTF-8?q?{"Message":"=E7=AD=BE=E5=87=BA=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=20:=20ensureMQTTConnection","MessageType":1,"Modules"?= =?UTF-8?q?:[],"Version":"v1"}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .collaboration | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.collaboration b/.collaboration index 8999e2e..9dd8079 100644 --- a/.collaboration +++ b/.collaboration @@ -358,8 +358,17 @@ }, { "ModuleName": "ServerCommandPrivate/ensureMQTTConnection", + "State": 1, + "LockedBy": { + "UserName": "XA-GCSCN-WILL\\NingWei", + "Email": "will.ning@grapecity.com" + }, + "LockDateTime": "2026-06-23T10:51:23.7236702+08:00", "ModuleType": 27, - "IconType": 16 + "IconType": 16, + "ToRemoveFiles": [ + "ServerCommands\\监听\\ensureMQTTConnection.json" + ] }, { "ModuleName": "ServerCommandPrivate/ensureMQTTSubscription", -- Gitee From 3e3131897aa48e40f466b5f2c2a9a1bbf8c09833 Mon Sep 17 00:00:00 2001 From: "XA-GCSCN-WILL\\NingWei" Date: Tue, 23 Jun 2026 10:52:29 +0800 Subject: [PATCH 3/3] =?UTF-8?q?{"Message":"=E6=94=AF=E6=8C=81=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E8=87=AA=E5=AE=9A=E4=B9=89MQTT=E7=AB=AF=E5=8F=A3","Me?= =?UTF-8?q?ssageType":2,"Modules":[{"State":1,"Type":8,"IconType":10,"Name?= =?UTF-8?q?":"ApplicationSetting"},{"State":1,"Type":27,"IconType":16,"Nam?= =?UTF-8?q?e":"ServerCommandPrivate/ensureMQTTConnection"}],"Version":"v1"?= =?UTF-8?q?}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .collaboration | 23 ++----------------- ApplicationSettings.json | 6 ++--- .../ensureMQTTConnection.json" | 10 +++++--- 3 files changed, 12 insertions(+), 27 deletions(-) diff --git a/.collaboration b/.collaboration index 9dd8079..06ab323 100644 --- a/.collaboration +++ b/.collaboration @@ -183,18 +183,8 @@ }, { "ModuleName": "ApplicationSetting", - "State": 1, - "LockedBy": { - "UserName": "XA-GCSCN-WILL\\NingWei", - "Email": "will.ning@grapecity.com" - }, - "LockDateTime": "2026-06-22T13:44:43.7393578+08:00", "ModuleType": 8, - "IconType": 10, - "ToRemoveFiles": [ - "ApplicationSettings.json", - "favicon.ico" - ] + "IconType": 10 }, { "ModuleName": "Theme", @@ -358,17 +348,8 @@ }, { "ModuleName": "ServerCommandPrivate/ensureMQTTConnection", - "State": 1, - "LockedBy": { - "UserName": "XA-GCSCN-WILL\\NingWei", - "Email": "will.ning@grapecity.com" - }, - "LockDateTime": "2026-06-23T10:51:23.7236702+08:00", "ModuleType": 27, - "IconType": 16, - "ToRemoveFiles": [ - "ServerCommands\\监听\\ensureMQTTConnection.json" - ] + "IconType": 16 }, { "ModuleName": "ServerCommandPrivate/ensureMQTTSubscription", diff --git a/ApplicationSettings.json b/ApplicationSettings.json index 67ffdd1..37f6468 100644 --- a/ApplicationSettings.json +++ b/ApplicationSettings.json @@ -13,17 +13,17 @@ }, { "Name": "AIOS_MQTT_CHANNEL_PASSWORD", - "Value": "R2CZBOJcNPnqSU-zIZoAv_bL3cFuBCBH", + "Value": "aebewoa8GTJuPitZZ0j8K1qnnCWWT56z", "Remark": "" }, { "Name": "AIOS_S3_SECRET_ACCESS_KEY", - "Value": "jFLF69i_PNnjAkkwS3oaHlQLZ7h0zn8t", + "Value": "F5GM6xW0aOHbypNhFDxQdwiP0yfNQZf6", "Remark": "" }, { "Name": "AIOS_MANAGEMENT_CONSOLE_TOKEN", - "Value": "sk--ey_cQBhOAK26u8OQZ4GcekF", + "Value": "sk-E3Sa19awL2GfJQdKjHWKXdL2", "Remark": "" }, { diff --git "a/ServerCommands/\347\233\221\345\220\254/ensureMQTTConnection.json" "b/ServerCommands/\347\233\221\345\220\254/ensureMQTTConnection.json" index 66f5aba..ea3e370 100644 --- "a/ServerCommands/\347\233\221\345\220\254/ensureMQTTConnection.json" +++ "b/ServerCommands/\347\233\221\345\220\254/ensureMQTTConnection.json" @@ -70,6 +70,10 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=AIOS_SERVER_IP" }, + "Port": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=AIOS_MQTT_CHANNEL_PORT" + }, "UserName": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=AIOS_MQTT_CHANNEL_USERNAME" @@ -96,7 +100,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "sys_log", "ColumnName": "log_entry", - "GUID": "1b5c5630-8c13-47ef-9fe7-486c4c82b3d5" + "GUID": "23ce3735-b5d4-42be-b5b5-de1745f41739" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -109,7 +113,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "sys_log", "ColumnName": "user_name", - "GUID": "10260618-2529-4ba7-969c-d39afec1256b" + "GUID": "fc742300-e145-4aa6-af10-9f2deeedc72e" }, "Value": "%CurrentUser.UserName%" } @@ -119,7 +123,7 @@ } ] }, - "ID": "aa1133ee-2d9c-4fde-8512-9410474ad157" + "ID": "2b9ee013-ccb2-4112-a888-b97520a49892" } ] }, -- Gitee