增加web超时处理
This commit is contained in:
@@ -22,15 +22,15 @@ namespace Stary.Evo
|
||||
roleType = "client",
|
||||
};
|
||||
string postData = JsonConvert.SerializeObject(data);
|
||||
using (UnityWebRequest webRequest = UnityWebRequest.PostWwwForm(url, postData)) //第二种写法此行注释
|
||||
try
|
||||
{
|
||||
using UnityWebRequest webRequest = UnityWebRequest.PostWwwForm(url, postData);
|
||||
byte[] postBytes = System.Text.Encoding.UTF8.GetBytes(postData);
|
||||
webRequest.uploadHandler = new UploadHandlerRaw(postBytes);
|
||||
webRequest.SetRequestHeader("Content-Type", "application/json");
|
||||
webRequest.timeout = 10;
|
||||
await webRequest.SendWebRequest();
|
||||
Debug.Log("登陆返回");
|
||||
webRequest.uploadHandler?.Dispose();
|
||||
Debug.Log("卸载uploadHandler");
|
||||
// 更新错误检查方式
|
||||
if (webRequest.result == UnityWebRequest.Result.ConnectionError ||
|
||||
webRequest.result == UnityWebRequest.Result.ProtocolError)
|
||||
@@ -39,27 +39,28 @@ namespace Stary.Evo
|
||||
}
|
||||
else
|
||||
{
|
||||
Debug.Log("卸载uploadHandler1");
|
||||
ResultMessageEntity authResponse =
|
||||
JsonConvert.DeserializeObject<ResultMessageEntity>(webRequest.downloadHandler.text);
|
||||
Debug.Log("卸载uploadHandler2"+authResponse.data);
|
||||
Debug.Log("UnityEvo:ResultMessageEntity" + authResponse.data);
|
||||
if (authResponse.code == 200)
|
||||
{
|
||||
Debug.Log("卸载uploadHandler3");
|
||||
AuthenticationResponse authResponseData =
|
||||
JsonConvert.DeserializeObject<AuthenticationResponse>(authResponse.data.ToString());
|
||||
Debug.Log("卸载uploadHandler4"+authResponseData.Token);
|
||||
Debug.Log("UnityEvo:AuthenticationResponse" + authResponseData.Token);
|
||||
authorization = authResponseData.Token;
|
||||
Debug.Log("卸载uploadHandler5");
|
||||
PlayerPrefs.SetString("Authorization", authorization);
|
||||
Debug.Log("卸载uploadHandler6");
|
||||
Debug.Log("登录成功");
|
||||
Debug.Log("UnityEvo:登录成功");
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
Debug.LogError($"UnityEvo:WebRequestSystem.Login" + e.Message);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -73,38 +74,35 @@ namespace Stary.Evo
|
||||
authorization = PlayerPrefs.GetString("Authorization");
|
||||
try
|
||||
{
|
||||
using (UnityWebRequest webRequest = UnityWebRequest.Get($"{url}?token={authorization}"))
|
||||
using UnityWebRequest webRequest = UnityWebRequest.Get($"{url}?token={authorization}");
|
||||
webRequest.downloadHandler = new DownloadHandlerBuffer();
|
||||
webRequest.timeout = 10;
|
||||
await webRequest.SendWebRequest();
|
||||
// 增强错误处理
|
||||
if (webRequest.result != UnityWebRequest.Result.Success)
|
||||
{
|
||||
webRequest.downloadHandler = new DownloadHandlerBuffer();
|
||||
await webRequest.SendWebRequest();
|
||||
var errorMsg = $"HTTP {webRequest.responseCode}\n" +
|
||||
$"URL: {url}\n" +
|
||||
$"Error: {webRequest.error}\n" +
|
||||
$"Response: {webRequest.downloadHandler.text}";
|
||||
|
||||
// 增强错误处理
|
||||
if (webRequest.result != UnityWebRequest.Result.Success)
|
||||
{
|
||||
var errorMsg = $"HTTP {webRequest.responseCode}\n" +
|
||||
$"URL: {url}\n" +
|
||||
$"Error: {webRequest.error}\n" +
|
||||
$"Response: {webRequest.downloadHandler.text}";
|
||||
|
||||
Debug.LogError(errorMsg);
|
||||
return false;
|
||||
}
|
||||
|
||||
ResultMessageEntity resultMessageEntity =
|
||||
JsonConvert.DeserializeObject<ResultMessageEntity>(webRequest.downloadHandler.text);
|
||||
if (resultMessageEntity.code == 200)
|
||||
return true; // 添加返回值
|
||||
else
|
||||
|
||||
return false;
|
||||
Debug.LogError(errorMsg);
|
||||
return false;
|
||||
}
|
||||
|
||||
ResultMessageEntity resultMessageEntity =
|
||||
JsonConvert.DeserializeObject<ResultMessageEntity>(webRequest.downloadHandler.text);
|
||||
if (resultMessageEntity.code == 200)
|
||||
return true; // 添加返回值
|
||||
|
||||
|
||||
return false;
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
Debug.LogError(e);
|
||||
Debug.LogError($"UnityEvo:WebRequestSystem.GetValidateToken" + e.Message);
|
||||
return false;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -124,6 +122,7 @@ namespace Stary.Evo
|
||||
message = "用户未登录,请先登录"
|
||||
};
|
||||
}
|
||||
|
||||
//UnityWebRequest[] files = new UnityWebRequest[3];
|
||||
WWWForm form = new WWWForm();
|
||||
|
||||
@@ -132,12 +131,15 @@ namespace Stary.Evo
|
||||
byte[] bytes = await File.ReadAllBytesAsync(path[i]);
|
||||
form.AddBinaryData("files[]", bytes, Path.GetFileName(path[i]));
|
||||
}
|
||||
using (UnityWebRequest webRequest = UnityWebRequest.Post(url, form))
|
||||
|
||||
try
|
||||
{
|
||||
using UnityWebRequest webRequest = UnityWebRequest.Post(url, form);
|
||||
webRequest.SetRequestHeader("Authorization", authorization);
|
||||
webRequest.disposeUploadHandlerOnDispose = true;
|
||||
webRequest.disposeDownloadHandlerOnDispose = true;
|
||||
webRequest.disposeCertificateHandlerOnDispose = true;
|
||||
webRequest.timeout = 60;
|
||||
await webRequest.SendWebRequest();
|
||||
webRequest.uploadHandler?.Dispose();
|
||||
// 更新错误检查方式
|
||||
@@ -159,18 +161,29 @@ namespace Stary.Evo
|
||||
{
|
||||
Debug.LogError("上传异常,无文件数据返回!!");
|
||||
}
|
||||
|
||||
return resultMessageEntity;
|
||||
}
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
Debug.LogError($"UnityEvo:WebRequestSystem.PostFile" + e.Message);
|
||||
return new ResultMessageEntity()
|
||||
{
|
||||
code = 5001,
|
||||
message = e.Message
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// <summary>
|
||||
/// GET请求数据
|
||||
/// </summary>
|
||||
/// <param name="url">请求数据的URL地址</param>
|
||||
/// <param name="token">token验证的参数,此处为authorization</param>
|
||||
/// <returns></returns>
|
||||
public static async Task<ResultMessageEntity> GetFile(string url,string tempPath, Action<float> downloadProgress = null)
|
||||
public static async Task<ResultMessageEntity> GetFile(string url, string tempPath,
|
||||
Action<float> downloadProgress = null)
|
||||
{
|
||||
if (!GetTokenState())
|
||||
{
|
||||
@@ -184,54 +197,54 @@ namespace Stary.Evo
|
||||
|
||||
try
|
||||
{
|
||||
using (UnityWebRequest webRequest = UnityWebRequest.Get(url))
|
||||
{
|
||||
webRequest.downloadHandler = new DownloadHandlerFile(tempPath);
|
||||
if (authorization != null)
|
||||
webRequest.SetRequestHeader("Authorization", authorization); // 修正请求头名称规范
|
||||
|
||||
|
||||
var operation= webRequest.SendWebRequest();
|
||||
while (!operation.isDone)
|
||||
{
|
||||
downloadProgress?.Invoke(webRequest.downloadProgress);
|
||||
await UniTask.Yield();
|
||||
}
|
||||
// 增强错误处理
|
||||
if (webRequest.result != UnityWebRequest.Result.Success)
|
||||
{
|
||||
var errorMsg = $"HTTP {webRequest.responseCode}\n" +
|
||||
$"URL: {url}\n" +
|
||||
$"Error: {webRequest.error}\n";
|
||||
using UnityWebRequest webRequest = UnityWebRequest.Get(url);
|
||||
webRequest.downloadHandler = new DownloadHandlerFile(tempPath);
|
||||
if (authorization != null)
|
||||
webRequest.SetRequestHeader("Authorization", authorization); // 修正请求头名称规范
|
||||
|
||||
Debug.LogError(errorMsg);
|
||||
return new ResultMessageEntity()
|
||||
{
|
||||
code = 5001,
|
||||
message = errorMsg
|
||||
};
|
||||
}
|
||||
else
|
||||
|
||||
var operation = webRequest.SendWebRequest();
|
||||
while (!operation.isDone)
|
||||
{
|
||||
downloadProgress?.Invoke(webRequest.downloadProgress);
|
||||
await UniTask.Yield();
|
||||
}
|
||||
|
||||
// 增强错误处理
|
||||
if (webRequest.result != UnityWebRequest.Result.Success)
|
||||
{
|
||||
var errorMsg = $"HTTP {webRequest.responseCode}\n" +
|
||||
$"URL: {url}\n" +
|
||||
$"Error: {webRequest.error}\n";
|
||||
|
||||
Debug.LogError(errorMsg);
|
||||
return new ResultMessageEntity()
|
||||
{
|
||||
return new ResultMessageEntity()
|
||||
{
|
||||
code = 200,
|
||||
message = "下载成功"
|
||||
};
|
||||
}
|
||||
code = 5001,
|
||||
message = errorMsg
|
||||
};
|
||||
}
|
||||
else
|
||||
{
|
||||
return new ResultMessageEntity()
|
||||
{
|
||||
code = 200,
|
||||
message = "下载成功"
|
||||
};
|
||||
}
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
Debug.LogError(e);
|
||||
Debug.LogError($"UnityEvo:WebRequestSystem.GetFile" + e.Message);
|
||||
|
||||
return new ResultMessageEntity()
|
||||
{
|
||||
code = 5001,
|
||||
message = e.Message
|
||||
};
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// POST请求数据
|
||||
/// </summary>
|
||||
@@ -250,39 +263,54 @@ namespace Stary.Evo
|
||||
};
|
||||
}
|
||||
|
||||
using (UnityWebRequest webRequest = UnityWebRequest.PostWwwForm(url, postData)) //第二种写法此行注释
|
||||
try
|
||||
{
|
||||
byte[] postBytes = System.Text.Encoding.UTF8.GetBytes(postData);
|
||||
webRequest.uploadHandler = new UploadHandlerRaw(postBytes);
|
||||
webRequest.SetRequestHeader("Content-Type", "application/json");
|
||||
webRequest.SetRequestHeader("Authorization", authorization);
|
||||
webRequest.disposeUploadHandlerOnDispose = true;
|
||||
webRequest.disposeDownloadHandlerOnDispose = true;
|
||||
webRequest.disposeCertificateHandlerOnDispose = true;
|
||||
await webRequest.SendWebRequest();
|
||||
webRequest.uploadHandler?.Dispose();
|
||||
// 更新错误检查方式
|
||||
if (webRequest.result == UnityWebRequest.Result.ConnectionError ||
|
||||
webRequest.result == UnityWebRequest.Result.ProtocolError)
|
||||
using (UnityWebRequest webRequest = UnityWebRequest.PostWwwForm(url, postData)) //第二种写法此行注释
|
||||
{
|
||||
Debug.LogError(webRequest.error);
|
||||
return new ResultMessageEntity()
|
||||
byte[] postBytes = System.Text.Encoding.UTF8.GetBytes(postData);
|
||||
webRequest.uploadHandler = new UploadHandlerRaw(postBytes);
|
||||
webRequest.SetRequestHeader("Content-Type", "application/json");
|
||||
webRequest.SetRequestHeader("Authorization", authorization);
|
||||
webRequest.disposeUploadHandlerOnDispose = true;
|
||||
webRequest.disposeDownloadHandlerOnDispose = true;
|
||||
webRequest.disposeCertificateHandlerOnDispose = true;
|
||||
webRequest.timeout = 20;
|
||||
await webRequest.SendWebRequest();
|
||||
webRequest.uploadHandler?.Dispose();
|
||||
// 更新错误检查方式
|
||||
if (webRequest.result == UnityWebRequest.Result.ConnectionError ||
|
||||
webRequest.result == UnityWebRequest.Result.ProtocolError)
|
||||
{
|
||||
code = 5001,
|
||||
message = webRequest.error
|
||||
};
|
||||
}
|
||||
else
|
||||
{
|
||||
ResultMessageEntity resultMessageEntity =
|
||||
JsonConvert.DeserializeObject<ResultMessageEntity>(webRequest.downloadHandler.text);
|
||||
if (resultMessageEntity.code != 200)
|
||||
{
|
||||
Debug.LogError(resultMessageEntity.message);
|
||||
Debug.LogError(webRequest.error);
|
||||
return new ResultMessageEntity()
|
||||
{
|
||||
code = 5001,
|
||||
message = webRequest.error
|
||||
};
|
||||
}
|
||||
else
|
||||
{
|
||||
ResultMessageEntity resultMessageEntity =
|
||||
JsonConvert.DeserializeObject<ResultMessageEntity>(webRequest.downloadHandler.text);
|
||||
if (resultMessageEntity.code != 200)
|
||||
{
|
||||
Debug.LogError(resultMessageEntity.message);
|
||||
}
|
||||
|
||||
return resultMessageEntity;
|
||||
}
|
||||
return resultMessageEntity;
|
||||
}
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
Debug.LogError($"UnityEvo:WebRequestSystem.Post" + e.Message);
|
||||
|
||||
return new ResultMessageEntity()
|
||||
{
|
||||
code = 5001,
|
||||
message = e.Message
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -305,48 +333,48 @@ namespace Stary.Evo
|
||||
|
||||
try
|
||||
{
|
||||
using (UnityWebRequest webRequest = UnityWebRequest.Get(url))
|
||||
using UnityWebRequest webRequest = UnityWebRequest.Get(url);
|
||||
webRequest.downloadHandler = new DownloadHandlerBuffer();
|
||||
if (authorization != null)
|
||||
webRequest.SetRequestHeader("Authorization", authorization); // 修正请求头名称规范
|
||||
|
||||
webRequest.timeout = 20;
|
||||
await webRequest.SendWebRequest();
|
||||
|
||||
// 增强错误处理
|
||||
if (webRequest.result != UnityWebRequest.Result.Success)
|
||||
{
|
||||
webRequest.downloadHandler = new DownloadHandlerBuffer();
|
||||
if (authorization != null)
|
||||
webRequest.SetRequestHeader("Authorization", authorization); // 修正请求头名称规范
|
||||
var errorMsg = $"HTTP {webRequest.responseCode}\n" +
|
||||
$"URL: {url}\n" +
|
||||
$"Error: {webRequest.error}\n" +
|
||||
$"Response: {webRequest.downloadHandler.text}";
|
||||
|
||||
await webRequest.SendWebRequest();
|
||||
|
||||
// 增强错误处理
|
||||
if (webRequest.result != UnityWebRequest.Result.Success)
|
||||
Debug.LogError(errorMsg);
|
||||
return new ResultMessageEntity()
|
||||
{
|
||||
var errorMsg = $"HTTP {webRequest.responseCode}\n" +
|
||||
$"URL: {url}\n" +
|
||||
$"Error: {webRequest.error}\n" +
|
||||
$"Response: {webRequest.downloadHandler.text}";
|
||||
|
||||
Debug.LogError(errorMsg);
|
||||
return new ResultMessageEntity()
|
||||
{
|
||||
code = 5001,
|
||||
message = errorMsg
|
||||
};
|
||||
}
|
||||
ResultMessageEntity resultMessageEntity =
|
||||
JsonConvert.DeserializeObject<ResultMessageEntity>(webRequest.downloadHandler.text);
|
||||
if (resultMessageEntity.code != 200)
|
||||
{
|
||||
Debug.LogError(resultMessageEntity.message);
|
||||
}
|
||||
return resultMessageEntity;
|
||||
code = 5001,
|
||||
message = errorMsg
|
||||
};
|
||||
}
|
||||
|
||||
ResultMessageEntity resultMessageEntity =
|
||||
JsonConvert.DeserializeObject<ResultMessageEntity>(webRequest.downloadHandler.text);
|
||||
if (resultMessageEntity.code != 200)
|
||||
{
|
||||
Debug.LogError(resultMessageEntity.message);
|
||||
}
|
||||
|
||||
return resultMessageEntity;
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
Debug.LogError(e);
|
||||
Debug.LogError($"UnityEvo:WebRequestSystem.Get" + e.Message);
|
||||
return new ResultMessageEntity()
|
||||
{
|
||||
code = 5001,
|
||||
message = e.Message
|
||||
};
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "com.staryevo.main",
|
||||
"version": "1.2.14",
|
||||
"version": "1.2.15",
|
||||
"displayName": "00.StaryEvo",
|
||||
"description": "This is an Framework package(后台服务器版本,端口9527)",
|
||||
"unity": "2021.3",
|
||||
|
||||
Reference in New Issue
Block a user