Merge branch '黑龙江艺术高中职' of http://8.141.155.183:3000/bjquanjiang/DigitalScholl into 黑龙江艺术高中职

Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/AttendanceApi.cs

@@ -130,8 +130,16 @@ namespace Learun.Application.WebApi.Modules
                 string imgid = parameter.Img;
 
                 var url = Config.GetValue("FaceCheckApi");
+                try
+                {
 
-                result = Util.HttpMethods.HttpGet($"{url}{userimg}/{imgid}");
+                    result = Util.HttpMethods.HttpGet($"{url}{userimg}/{imgid}");
+                }
+                catch (Exception e)
+                {
+
+                    return Fail($"照片验证超时！{e.Message}");
+                }
             }
             if (result == "1")
             {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Util/Learun.Util/Web/HttpMethods.cs

@@ -110,6 +110,7 @@ namespace Learun.Util
         public static string HttpGet(string url)
         {
             WebRequest myWebRequest = WebRequest.Create(url);
+            myWebRequest.Timeout = 20000;
             WebResponse myWebResponse = myWebRequest.GetResponse();
             Stream ReceiveStream = myWebResponse.GetResponseStream();
             string responseStr = "";