|
|
@@ -14,6 +14,9 @@ using WingInterfaceLibrary.Result.Device;
|
|
|
using WingServerCommon.Log;
|
|
|
using WingServerCommon.Service;
|
|
|
using WingInterfaceLibrary.DTO.Management;
|
|
|
+using WingInterfaceLibrary.Request.Management;
|
|
|
+using WingInterfaceLibrary.Request.Device;
|
|
|
+using WingInterfaceLibrary.Request.User;
|
|
|
|
|
|
namespace WingCloudServer.Plugin
|
|
|
{
|
|
|
@@ -55,21 +58,28 @@ namespace WingCloudServer.Plugin
|
|
|
if (!string.IsNullOrWhiteSpace(ipAddress) && !string.IsNullOrWhiteSpace(resultString))
|
|
|
{
|
|
|
var token = string.Empty;
|
|
|
+ var name = string.Empty;
|
|
|
switch (_apiName)
|
|
|
{
|
|
|
case "IManagementService/AdminLogin":
|
|
|
- token= JsonConvert.DeserializeObject<AdminLoginResult>(resultString).Token;
|
|
|
+ var result1 = JsonConvert.DeserializeObject<AdminLoginResult>(resultString);
|
|
|
+ token = result1.Token;
|
|
|
+ name = result1.AdminName;
|
|
|
break;
|
|
|
case "ILoginService/CommonLoginAsync":
|
|
|
- token = JsonConvert.DeserializeObject<LoginResult>(resultString).Token;
|
|
|
+ var result2 = JsonConvert.DeserializeObject<LoginResult>(resultString);
|
|
|
+ token = result2.Token;
|
|
|
+ name = result2.AccountName;
|
|
|
break;
|
|
|
case "IConnectService/ConnectAsync":
|
|
|
- token = JsonConvert.DeserializeObject<ConnectResult>(resultString).Token;
|
|
|
+ var result3 = JsonConvert.DeserializeObject<ConnectResult>(resultString);
|
|
|
+ token = result3.Token;
|
|
|
+ name = result3.UniqueCode;
|
|
|
break;
|
|
|
}
|
|
|
if (!string.IsNullOrWhiteSpace(token))
|
|
|
{
|
|
|
- Logger.WriteLineInfo($"IPAddressPlugin PostProcess api name:{_apiName}, ip address:{ipAddress}, token:{token}");
|
|
|
+ Logger.WriteLineInfo($"IPAddressPlugin PostProcess api name:{_apiName}, ip address:{ipAddress}, name:{name}, token:{token}");
|
|
|
var setIpAddressResult = _authenticationService.SetIPAddressAsync(new SetIPAddressRequest
|
|
|
{
|
|
|
Token = token,
|
