Commit f0c5201a authored by 姜春辉's avatar 姜春辉

修正token注册bug

parent 26215512
......@@ -33,9 +33,10 @@ namespace GS.Terminal.VisitorSelfService.Logic.Remote
_client.DefaultRequestHeaders.Add("Authorization", $"Bearer {_token}");
});
}
public static async Task<T> GetTAsync<T>(string service)
public static async Task<T> GetTAsync<T>(string service, bool checktoken = true)
{
CheckToken();
if (checktoken)
CheckToken();
var _clientPoolObject = await _httpclientPool.GetAsync();
var _client = _clientPoolObject.Value;
try
......@@ -67,9 +68,10 @@ namespace GS.Terminal.VisitorSelfService.Logic.Remote
return default(T);
}
public static async Task<T> PostAsync<T>(string service, object requestBody)
public static async Task<T> PostAsync<T>(string service, object requestBody, bool checktoken = true)
{
CheckToken();
if (checktoken)
CheckToken();
var bodyString = JsonConvert.SerializeObject(requestBody);
var content = new StringContent(bodyString);
content.Headers.ContentType = new System.Net.Http.Headers.MediaTypeHeaderValue("application/json");
......@@ -146,7 +148,7 @@ namespace GS.Terminal.VisitorSelfService.Logic.Remote
/// <returns></returns>
public static (bool success, string message) Signature()
{
_terminaltoken = GetTAsync<TerminalToken>($"/api/GS.WebApi.Terminal/TerminalConsole/Signature?tCode={LocalSetting.AppConfig.tCode}&tMacCode={GetMACAddress()}").Result;
_terminaltoken = GetTAsync<TerminalToken>($"/api/GS.WebApi.Terminal/TerminalConsole/Signature?tCode={LocalSetting.AppConfig.tCode}&tMacCode={GetMACAddress()}", false).Result;
if (_terminaltoken == null) return (false, "网络异常,设备注册失败");
if (!_terminaltoken.Status) return (false, $"设备注册失败.原因:{_terminaltoken.Message}");
_token = _terminaltoken.tToken;
......
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