up

Author: Coloryr

ColoryrServer/ASP/HttpClientUtils.cs

@@ -10,9 +10,11 @@
 using Lib.Server;
 using Microsoft.AspNetCore.Connections;
 using Microsoft.Extensions.Primitives;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using System.Collections.Concurrent;
 using System.Collections.Specialized;
+using System.Diagnostics;
 using System.Security.Cryptography.X509Certificates;
 using System.Text;
 using HttpRequest = Microsoft.AspNetCore.Http.HttpRequest;
@@ -80,10 +82,6 @@ public static void Main()
             ServerMain.ConfigUtil = new ASPConfigUtils();
             ServerMain.Start();
 
-            HttpClients1.Start();
-
-            //Web.UseRouting();
-
             if (Config.Ssl)
             {
                 builder.Services.AddCertificateForwarding(options =>
@@ -171,7 +169,6 @@ public static void Main()
             Run = false;
             ServerMain.LogOut("正在关闭服务器");
             ServerMain.Stop();
-            HttpClients1.Stop();
             ServerMain.LogOut("按下回车键退出");
         }
 
@@ -472,6 +469,7 @@ private static async Task POSTBack(HttpContext context)
             {
                 if (Request.ContentType is ServerContentType.POSTXFORM)
                 {
+                    type = MyContentType.XFormData;
                     foreach (var item in Request.Form)
                     {
                         temp.Add(item.Key, item.Value);
@@ -485,27 +483,6 @@ private static async Task POSTBack(HttpContext context)
                 {
                     try
                     {
-                        //boundary??
-                        //var temp1 = Request.ContentType.Remove(0, ServerContentType.POSTFORMDATA.Length);
-                        //MemoryStream stream = new();
-                        //await Request.Body.CopyToAsync(stream);
-                        //var temp2 = Encoding.UTF8.GetString(stream.ToArray());
-                        //stream.Seek(0, SeekOrigin.Begin);
-                        //var parser = await MultipartFormDataParser.ParseAsync(stream);
-                        //if (parser == null)
-                        //{
-                        //    httpReturn = new HttpReturn
-                        //    {
-                        //        Data = StreamUtils.JsonOBJ(new GetMeesage
-                        //        {
-                        //            Res = 123,
-                        //            Text = "表单解析发生错误"
-                        //        })
-                        //    };
-                        //    await Response.BodyWriter.WriteAsync(httpReturn.Data);
-                        //    return;
-                        //}
-
                         var parser = await MultipartFormDataParser.ParseAsync(Request.Body);
                         foreach (var item in parser.Parameters)
                         {
@@ -521,19 +498,16 @@ private static async Task POSTBack(HttpContext context)
                                 ContentDisposition = item.ContentDisposition
                             });
                         }
+                        type = MyContentType.MFormData;
                     }
                     catch (Exception e)
                     {
                         ServerMain.LogError(e);
-                        httpReturn = new HttpReturn
+                        await Response.WriteAsJsonAsync(new GetMeesage
                         {
-                            Data = StreamUtils.JsonOBJ(new GetMeesage
-                            {
-                                Res = 123,
-                                Text = "表单解析发生错误，请检查数据"
-                            })
-                        };
-                        await Response.BodyWriter.WriteAsync(httpReturn.Data);
+                            Res = 123,
+                            Text = "表单解析发生错误，请检查数据"
+                        });
                         return;
                     }
                 }
@@ -547,6 +521,7 @@ private static async Task POSTBack(HttpContext context)
                     {
                         temp.Add(item.Key, item.Value);
                     }
+                    type = MyContentType.Json;
                 }
                 else
                 {

ColoryrServer/ASP/Program.cs

@@ -6,6 +6,7 @@
 using System;
 using System.Collections.Generic;
 using System.Reflection;
+using System.Threading.Tasks;
 
 namespace ColoryrServer.DllManager
 {

ColoryrServer/Core/DllManager/DllRun.cs

@@ -25,7 +25,7 @@ namespace ColoryrServer
 {
     public class ServerMain
     {
-        public const string Version = "1.1.0";
+        public const string Version = "1.1.1";
         /// <summary>
         /// 配置文件
         /// </summary>
@@ -50,8 +50,11 @@ public class ServerMain
         public static void LogError(Exception e)
         {
             string a = "[错误]" + e.ToString();
-            Task.Run(() => Logs.LogWrite(a));
-            Console.WriteLine(a);
+            Task.Run(() =>
+            {
+                Logs.LogWrite(a);
+                Console.WriteLine(a);
+            });
         }
         /// <summary>
         /// 写错误到日志中
@@ -60,8 +63,11 @@ public static void LogError(Exception e)
         public static void LogError(string a)
         {
             a = "[错误]" + a;
-            Task.Run(() => Logs.LogWrite(a));
-            Console.WriteLine(a);
+            Task.Run(() =>
+            {
+                Logs.LogWrite(a);
+                Console.WriteLine(a);
+            });
         }
         /// <summary>
         /// 写信息到日志中
@@ -70,8 +76,11 @@ public static void LogError(string a)
         public static void LogOut(string a)
         {
             a = "[信息]" + a;
-            Task.Run(() => Logs.LogWrite(a));
-            Console.WriteLine(a);
+            Task.Run(() =>
+            {
+                Logs.LogWrite(a);
+                Console.WriteLine(a);
+            });
         }
 
         public static void Start()