Commit 939974cd authored by 姜春辉's avatar 姜春辉

修正注册设备卡住的bug

parent 71dceab5
...@@ -18,7 +18,7 @@ namespace GS.Terminal.VisitorSelfService.Logic ...@@ -18,7 +18,7 @@ namespace GS.Terminal.VisitorSelfService.Logic
internal static IAddonContext _Context; internal static IAddonContext _Context;
internal static IObjectSpace _ObjectSpace; internal static IObjectSpace _ObjectSpace;
internal static Locator vmLocator; internal static Locator vmLocator;
internal static string _logicVersion = "0528"; internal static string _logicVersion = "0528.17";
public void Start(IAddonContext Context) public void Start(IAddonContext Context)
{ {
...@@ -45,15 +45,19 @@ namespace GS.Terminal.VisitorSelfService.Logic ...@@ -45,15 +45,19 @@ namespace GS.Terminal.VisitorSelfService.Logic
_ObjectSpace = manager.CreateObjectSpace(_Context, "c1"); _ObjectSpace = manager.CreateObjectSpace(_Context, "c1");
_ObjectSpace.UpdateDataSchema(); _ObjectSpace.UpdateDataSchema();
Handlers.Product(); Handlers.Product();
var signature = WebApi.Signature(); Task.Run(async () =>
if (!signature.success)
{ {
var ex = new Exception($"终端注册失败,失败原因:{signature.message}"); var signature = await WebApi.SignatureAsync();
_Context.Logger.Error("启动失败", ex); if (!signature.success)
throw ex; {
} var ex = new Exception($"终端注册失败,失败原因:{signature.message}");
TerminalConsole.StartHeart(LocalSetting.AppConfig.ServerIP, LocalSetting.AddonDefaultConfig.HeartPort, 30 * 1000); _Context.Logger.Error("启动失败", ex);
ThirdAddon.LogicShell.ShowView(vmLocator.MenuPage); throw ex;
}
TerminalConsole.StartHeart(LocalSetting.AppConfig.ServerIP, LocalSetting.AddonDefaultConfig.HeartPort, 30 * 1000);
ThirdAddon.LogicShell.ShowView(vmLocator.MenuPage);
});
} }
public void Stop(IAddonContext Context) public void Stop(IAddonContext Context)
......
...@@ -140,6 +140,15 @@ namespace GS.Terminal.VisitorSelfService.Logic.Remote ...@@ -140,6 +140,15 @@ namespace GS.Terminal.VisitorSelfService.Logic.Remote
_token = token.tToken; _token = token.tToken;
return (true, _token); return (true, _token);
} }
public static async Task<(bool success, string message)> SignatureAsync()
{
var token = await GetTAsync<TerminalToken>($"/api/GS.WebApi.Terminal/TerminalConsole/Signature?tCode={LocalSetting.AppConfig.tCode}&tMacCode={GetMACAddress()}");
if (token == null) return (false, "网络异常,设备注册失败");
if (!token.Status) return (false, $"设备注册失败.原因:{token.Message}");
_token = token.tToken;
return (true, _token);
}
} }
public class TerminalToken public class TerminalToken
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment