|
|
|
@ -66,7 +66,7 @@ namespace SlnMesnac.TouchSocket
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
/// <summary>s
|
|
|
|
/// 获取到的JToken类型转换为实体类
|
|
|
|
/// 获取到的JToken类型转换为实体类
|
|
|
|
/// </summary>
|
|
|
|
/// </summary>
|
|
|
|
/// <typeparam name="T"></typeparam>
|
|
|
|
/// <typeparam name="T"></typeparam>
|
|
|
|
@ -98,18 +98,22 @@ namespace SlnMesnac.TouchSocket
|
|
|
|
{
|
|
|
|
{
|
|
|
|
FeedbackType = FeedbackType.WaitInvoke
|
|
|
|
FeedbackType = FeedbackType.WaitInvoke
|
|
|
|
};
|
|
|
|
};
|
|
|
|
if (MESHttpClient != null)
|
|
|
|
if (MESHttpClient == null)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (!MESHttpClient.Online)
|
|
|
|
Console.WriteLine("MES客户端为空,重新初始化...");
|
|
|
|
|
|
|
|
await CreateWebApiClientAsync(m_IpHost);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
else if (!MESHttpClient.Online)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
Console.WriteLine("连接断开,尝试重连...");
|
|
|
|
|
|
|
|
try
|
|
|
|
{
|
|
|
|
{
|
|
|
|
Console.WriteLine("与MES客户端连接断开,尝试重新连接...");
|
|
|
|
|
|
|
|
await MESHttpClient.SetupAsync(new TouchSocketConfig()
|
|
|
|
|
|
|
|
.SetRemoteIPHost(m_IpHost)
|
|
|
|
|
|
|
|
);
|
|
|
|
|
|
|
|
Console.WriteLine("正在连接:" + m_IpHost);
|
|
|
|
|
|
|
|
await MESHttpClient.ConnectAsync();
|
|
|
|
await MESHttpClient.ConnectAsync();
|
|
|
|
Console.WriteLine("连接成功");
|
|
|
|
}
|
|
|
|
Console.WriteLine(m_IpHost + "连接成功");
|
|
|
|
catch
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
Console.WriteLine("重连失败,重新初始化客户端...");
|
|
|
|
|
|
|
|
await CreateWebApiClientAsync(m_IpHost);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@ -120,7 +124,28 @@ namespace SlnMesnac.TouchSocket
|
|
|
|
try
|
|
|
|
try
|
|
|
|
{
|
|
|
|
{
|
|
|
|
//responseValue = await MESHttpClient.InvokeTAsync<string>("/ApiServer/get", invokeOption_30s, request);
|
|
|
|
//responseValue = await MESHttpClient.InvokeTAsync<string>("/ApiServer/get", invokeOption_30s, request);
|
|
|
|
|
|
|
|
try
|
|
|
|
|
|
|
|
{
|
|
|
|
responseValue = await MESHttpClient.InvokeTAsync<string>("/api/plan/get", invokeOption_30s, request);
|
|
|
|
responseValue = await MESHttpClient.InvokeTAsync<string>("/api/plan/get", invokeOption_30s, request);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
catch (Exception ex)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
Console.WriteLine("调用失败,准备重连重试:" + ex.Message);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 强制重连
|
|
|
|
|
|
|
|
try
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
await MESHttpClient.ConnectAsync();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
catch
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
await CreateWebApiClientAsync(m_IpHost);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 再试一次
|
|
|
|
|
|
|
|
responseValue = await MESHttpClient.InvokeTAsync<string>("/api/plan/get", invokeOption_30s, request);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (responseValue != null)
|
|
|
|
if (responseValue != null)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
Console.WriteLine("MES接口返回:" + JsonSerializer.Serialize(responseValue));
|
|
|
|
Console.WriteLine("MES接口返回:" + JsonSerializer.Serialize(responseValue));
|
|
|
|
|