From 1699ff4c9406f86e9099d1772d701393688912ef Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Mon, 25 Nov 2019 11:18:41 +0800 Subject: [PATCH] 1.0.0-rc.104 Former-commit-id: 4723b943f7045b441d5448bccaf3552aca29aaac --- projects/IoTCenter/Controllers/AppController.cs | 4 ++-- projects/IoTCenter/appsettings.json | 2 +- projects/IoTClient/Assets/StreamingAssets/wwwroot/user.html | 1 + projects/IoTClient/iotclient.apk.REMOVED.git-id | 2 +- projects/IoTNode/appsettings.json | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/projects/IoTCenter/Controllers/AppController.cs b/projects/IoTCenter/Controllers/AppController.cs index 9fe53649..925ba02f 100644 --- a/projects/IoTCenter/Controllers/AppController.cs +++ b/projects/IoTCenter/Controllers/AppController.cs @@ -417,7 +417,7 @@ namespace IoTCenter.Controllers /************************************************************/ - public IActionResult Power(string token,string connectionId, string method,string[] numbers) + public IActionResult Power(string token, string connectionId, string method, string[] numbers) { var userName = this.GetUserName(token); if (string.IsNullOrEmpty(userName)) @@ -461,7 +461,7 @@ namespace IoTCenter.Controllers { var api = device.Product.Apis.FirstOrDefault(o => o.Command == command); var message = $"{api.Path}{api.Command}?number={device.Number}"; - this._hub.Clients.Group(device.Node.Number).SendAsync(Methods.ServerToClient, Methods.ExecApiRequest, message, connectionId); + this._hub.ServerToClient(Methods.ExecApiRequest, message, device.Node.Number, connectionId); } catch (Exception ex) { diff --git a/projects/IoTCenter/appsettings.json b/projects/IoTCenter/appsettings.json index f74900b6..6a922e7e 100644 --- a/projects/IoTCenter/appsettings.json +++ b/projects/IoTCenter/appsettings.json @@ -1,5 +1,5 @@ { - "version": "1.0.0-rc.103", + "version": "1.0.0-rc.104", "Logging": { "LogLevel": { "Default": "Warning", diff --git a/projects/IoTClient/Assets/StreamingAssets/wwwroot/user.html b/projects/IoTClient/Assets/StreamingAssets/wwwroot/user.html index 34f3ab6f..c7a1f66d 100644 --- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/user.html +++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/user.html @@ -37,6 +37,7 @@ +
v {{version}}
house diff --git a/projects/IoTClient/iotclient.apk.REMOVED.git-id b/projects/IoTClient/iotclient.apk.REMOVED.git-id index 59b2d1fe..fd34c3b8 100644 --- a/projects/IoTClient/iotclient.apk.REMOVED.git-id +++ b/projects/IoTClient/iotclient.apk.REMOVED.git-id @@ -1 +1 @@ -a1f050f1d4d523789cd185a274a199295c7f02d5 \ No newline at end of file +25f978cc1dc22e8729d0400a5d8b6b66728855d5 \ No newline at end of file diff --git a/projects/IoTNode/appsettings.json b/projects/IoTNode/appsettings.json index 6930198b..0c2e8998 100644 --- a/projects/IoTNode/appsettings.json +++ b/projects/IoTNode/appsettings.json @@ -1,5 +1,5 @@ { - "version": "1.0.0-rc.103", + "version": "1.0.0-rc.104", "Logging": { "LogLevel": { "Default": "Warning",