diff --git a/ColoryrServer/ASP/.config/dotnet-tools.json b/ColoryrServer/ASP/.config/dotnet-tools.json new file mode 100644 index 0000000..337014b --- /dev/null +++ b/ColoryrServer/ASP/.config/dotnet-tools.json @@ -0,0 +1,12 @@ +{ + "version": 1, + "isRoot": true, + "tools": { + "dotnet-ef": { + "version": "5.0.10", + "commands": [ + "dotnet-ef" + ] + } + } +} \ No newline at end of file diff --git a/ColoryrServer/ASP/ASPConfig.cs b/ColoryrServer/ASP/ASPConfig.cs index 923465c..7f2491f 100644 --- a/ColoryrServer/ASP/ASPConfig.cs +++ b/ColoryrServer/ASP/ASPConfig.cs @@ -4,7 +4,7 @@ namespace ColoryrServer.ASP { internal record Rote - { + { public string Url { get; set; } } internal record ASPConfig : MainConfig diff --git a/ColoryrServer/ASP/Http/ASPHttpUtils.cs b/ColoryrServer/ASP/ASPHttpUtils.cs similarity index 62% rename from ColoryrServer/ASP/Http/ASPHttpUtils.cs rename to ColoryrServer/ASP/ASPHttpUtils.cs index 68df128..9ea87af 100644 --- a/ColoryrServer/ASP/Http/ASPHttpUtils.cs +++ b/ColoryrServer/ASP/ASPHttpUtils.cs @@ -2,12 +2,9 @@ { public class ASPHttpUtils { - public static string HaveCookie(IHeaderDictionary hashtable) + public static string HaveCookie(string hashtable) { - string Temp = hashtable.Cookie; - if (Temp == null) - return null; - string[] Cookies = Temp.Split(';'); + string[] Cookies = hashtable.Split(';'); foreach (var Item in Cookies) { var temp = Item.Replace(" ", ""); diff --git a/ColoryrServer/ASP/Http/ASPHttpGet.cs b/ColoryrServer/ASP/Http/ASPHttpGet.cs deleted file mode 100644 index 10c9c2c..0000000 --- a/ColoryrServer/ASP/Http/ASPHttpGet.cs +++ /dev/null @@ -1,54 +0,0 @@ -using ColoryrServer.DllManager; -using ColoryrServer.FileSystem; -using ColoryrServer.Http; -using ColoryrServer.SDK; -using System.Collections.Specialized; -using HttpRequest = ColoryrServer.SDK.HttpRequest; - -namespace ColoryrServer.ASP -{ - public class ASPHttpGet - { - public static HttpReturn HttpGET(string Url, IHeaderDictionary Hashtable, QueryString Data, string uuid, string name = "") - { - if (Url.StartsWith("//")) - { - Url = Url[1..]; - } - var Dll = DllStonge.GetDll(uuid); - if (Dll != null) - { - var Temp = new Dictionary(); - if (Data.HasValue) - { - foreach (string a in Data.Value.Split('&')) - { - var item = a.Split("="); - Temp.Add(item[0], item[1]); - } - } - NameValueCollection collection = new(); - foreach (var item in Hashtable) - { - collection.Add(item.Key, item.Value); - } - var Http = new HttpRequest - { - Cookie = ASPHttpUtils.HaveCookie(Hashtable), - RowRequest = collection, - Parameter = Temp, - ContentType = MyContentType.XFormData - }; - var Data1 = DllRun.DllGo(Dll, Http, name); - return Data1; - } - - return new HttpReturn - { - Data = HtmlUtils.Html404, - ContentType = ServerContentType.HTML, - ReCode = 200 - }; - } - } -} diff --git a/ColoryrServer/ASP/Program.cs b/ColoryrServer/ASP/Program.cs index e54aac6..e99ecf9 100644 --- a/ColoryrServer/ASP/Program.cs +++ b/ColoryrServer/ASP/Program.cs @@ -32,7 +32,7 @@ public bool IsEnabled(LogLevel logLevel) } public void Log(LogLevel logLevel, EventId eventId, TState state, - Exception exception, Func formatter) + Exception? exception, Func formatter) { if (eventId.Id == 100 || eventId.Id == 101) return; @@ -153,7 +153,7 @@ public static void Main() Web.MapPost("/", PostBuild); Web.MapPost("/{**name}", GetWeb); - // Web.MapPost("/{uuid}/{name}", GetGetWeb1); + // Web.MapPost("/{uuid}/{name}", GetGetWeb1); Web.MapPost(ServerMain.Config.Requset.WebAPI + "/{uuid}", POSTBack); Web.MapPost(ServerMain.Config.Requset.WebAPI + "/{uuid}/{name}", POSTBack); @@ -168,7 +168,6 @@ private static async Task PostBuild(HttpContext context) { HttpRequest Request = context.Request; HttpResponse Response = context.Response; - HttpReturn httpReturn; if (Request.Headers[BuildKV.BuildK] == BuildKV.BuildV) { string Str; @@ -238,7 +237,45 @@ private static async Task GetBack(HttpContext context) HttpReturn httpReturn; var uuid = context.GetRouteValue("uuid") as string; var name = context.GetRouteValue("name") as string; - httpReturn = ASPHttpGet.HttpGET(Request.Path, Request.Headers, Request.QueryString, uuid, name); + string Url = Request.Path; + if (Url.StartsWith("//")) + { + Url = Url[1..]; + } + var Dll = DllStonge.GetDll(uuid); + if (Dll != null) + { + var Temp = new Dictionary(); + if (Request.QueryString.HasValue) + { + foreach (string a in Request.QueryString.Value.Split('&')) + { + var item = a.Split("="); + Temp.Add(item[0], item[1]); + } + } + NameValueCollection collection = new(); + foreach (var item in Request.Headers) + { + collection.Add(item.Key, item.Value); + } + httpReturn = DllRun.DllGo(Dll, new() + { + Cookie = ASPHttpUtils.HaveCookie(Request.Headers.Cookie), + RowRequest = collection, + Parameter = Temp, + ContentType = MyContentType.XFormData + }, name); + } + else + { + httpReturn = new() + { + Data = HtmlUtils.Html404, + ContentType = ServerContentType.HTML, + ReCode = 200 + }; + } Response.ContentType = httpReturn.ContentType; Response.StatusCode = httpReturn.ReCode; if (httpReturn.Head != null) @@ -343,7 +380,7 @@ private static async Task GetWeb(HttpContext context) Response.ContentType = httpReturn.ContentType; Response.StatusCode = httpReturn.ReCode; await Response.BodyWriter.WriteAsync(httpReturn.Data); - } + } } private static async Task POSTBack(HttpContext context) @@ -453,7 +490,7 @@ private static async Task POSTBack(HttpContext context) httpReturn = DllRun.DllGo(Dll, new() { - Cookie = ASPHttpUtils.HaveCookie(Request.Headers), + Cookie = ASPHttpUtils.HaveCookie(Request.Headers.Cookie), Parameter = temp, RowRequest = collection, ContentType = type, diff --git a/ColoryrServer/ASP/Properties/PublishProfiles/FolderProfile.pubxml b/ColoryrServer/ASP/Properties/PublishProfiles/FolderProfile.pubxml index 6f80eef..44784be 100644 --- a/ColoryrServer/ASP/Properties/PublishProfiles/FolderProfile.pubxml +++ b/ColoryrServer/ASP/Properties/PublishProfiles/FolderProfile.pubxml @@ -8,13 +8,12 @@ https://go.microsoft.com/fwlink/?LinkID=208121. False True Release - Any CPU + x64 FileSystem ..\..\build_out\Publish\ASP\ FileSystem net6.0 - linux-x64 ce8e78c5-911d-4423-8dee-51aa8afb3f74 false diff --git a/ColoryrServer/ASP/Properties/launchSettings.json b/ColoryrServer/ASP/Properties/launchSettings.json deleted file mode 100644 index 7f21a68..0000000 --- a/ColoryrServer/ASP/Properties/launchSettings.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "iisSettings": { - "windowsAuthentication": false, - "anonymousAuthentication": true, - "iisExpress": { - "applicationUrl": "http://localhost:25133", - "sslPort": 44336 - } - }, - "profiles": { - "ColoryrServer.ASP": { - "commandName": "Project", - "dotnetRunMessages": true, - "launchBrowser": true, - "applicationUrl": "https://localhost:7112;http://localhost:5112", - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } - }, - "IIS Express": { - "commandName": "IISExpress", - "launchBrowser": true, - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } - } - } -} diff --git a/ColoryrServer/Core/ColoryrServer.Core.csproj b/ColoryrServer/Core/ColoryrServer.Core.csproj index 296e254..41a613c 100644 --- a/ColoryrServer/Core/ColoryrServer.Core.csproj +++ b/ColoryrServer/Core/ColoryrServer.Core.csproj @@ -10,7 +10,7 @@ - ..\..\build_out\ServerCore + ..\..\build_out\Core x64 diff --git a/ColoryrServer/Core/FileSystem/HtmlUtils.cs b/ColoryrServer/Core/FileSystem/HtmlUtils.cs index f8392de..8651171 100644 --- a/ColoryrServer/Core/FileSystem/HtmlUtils.cs +++ b/ColoryrServer/Core/FileSystem/HtmlUtils.cs @@ -1,7 +1,6 @@ using ColoryrServer.Core; using ColoryrServer.SDK; using Lib.Build.Object; -using Lib.Server; using Newtonsoft.Json; using System; using System.Collections.Concurrent; diff --git a/ColoryrWork.sln b/ColoryrWork.sln index f8370d4..85b1814 100644 --- a/ColoryrWork.sln +++ b/ColoryrWork.sln @@ -19,8 +19,6 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Lib.App", "Lib.App\Lib.App. EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ColoryrServer.ASP", "ColoryrServer\ASP\ColoryrServer.ASP.csproj", "{CE8E78C5-911D-4423-8DEE-51AA8AFB3F74}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ColoryrServer.NoASP", "ColoryrServer\NoASP\ColoryrServer.NoASP.csproj", "{BD201938-3655-45CB-8427-AE4D04B756F7}" -EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution Lib\Lib.Server\Lib.Server.projitems*{013195f8-cd93-4c2e-b3f8-d1706c16eebb}*SharedItemsImports = 13 @@ -71,14 +69,6 @@ Global {CE8E78C5-911D-4423-8DEE-51AA8AFB3F74}.Release|Any CPU.Build.0 = Release|Any CPU {CE8E78C5-911D-4423-8DEE-51AA8AFB3F74}.Release|x64.ActiveCfg = Release|Any CPU {CE8E78C5-911D-4423-8DEE-51AA8AFB3F74}.Release|x64.Build.0 = Release|Any CPU - {BD201938-3655-45CB-8427-AE4D04B756F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BD201938-3655-45CB-8427-AE4D04B756F7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BD201938-3655-45CB-8427-AE4D04B756F7}.Debug|x64.ActiveCfg = Debug|Any CPU - {BD201938-3655-45CB-8427-AE4D04B756F7}.Debug|x64.Build.0 = Debug|Any CPU - {BD201938-3655-45CB-8427-AE4D04B756F7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BD201938-3655-45CB-8427-AE4D04B756F7}.Release|Any CPU.Build.0 = Release|Any CPU - {BD201938-3655-45CB-8427-AE4D04B756F7}.Release|x64.ActiveCfg = Release|Any CPU - {BD201938-3655-45CB-8427-AE4D04B756F7}.Release|x64.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/ColoryrServer/NoASP/ColoryrServer.NoASP.csproj b/old/NoASP/ColoryrServer.NoASP.csproj similarity index 100% rename from ColoryrServer/NoASP/ColoryrServer.NoASP.csproj rename to old/NoASP/ColoryrServer.NoASP.csproj diff --git a/ColoryrServer/NoASP/ColoryrWork.ico b/old/NoASP/ColoryrWork.ico similarity index 100% rename from ColoryrServer/NoASP/ColoryrWork.ico rename to old/NoASP/ColoryrWork.ico diff --git a/ColoryrServer/NoASP/Http/HttpGet.cs b/old/NoASP/Http/HttpGet.cs similarity index 100% rename from ColoryrServer/NoASP/Http/HttpGet.cs rename to old/NoASP/Http/HttpGet.cs diff --git a/ColoryrServer/NoASP/Http/HttpListenerWorker.cs b/old/NoASP/Http/HttpListenerWorker.cs similarity index 100% rename from ColoryrServer/NoASP/Http/HttpListenerWorker.cs rename to old/NoASP/Http/HttpListenerWorker.cs diff --git a/ColoryrServer/NoASP/Http/HttpPost.cs b/old/NoASP/Http/HttpPost.cs similarity index 100% rename from ColoryrServer/NoASP/Http/HttpPost.cs rename to old/NoASP/Http/HttpPost.cs diff --git a/ColoryrServer/NoASP/Http/HttpServer.cs b/old/NoASP/Http/HttpServer.cs similarity index 100% rename from ColoryrServer/NoASP/Http/HttpServer.cs rename to old/NoASP/Http/HttpServer.cs diff --git a/ColoryrServer/NoASP/Http/HttpUtils.cs b/old/NoASP/Http/HttpUtils.cs similarity index 100% rename from ColoryrServer/NoASP/Http/HttpUtils.cs rename to old/NoASP/Http/HttpUtils.cs diff --git a/ColoryrServer/NoASP/Http/HttpWorker.cs b/old/NoASP/Http/HttpWorker.cs similarity index 100% rename from ColoryrServer/NoASP/Http/HttpWorker.cs rename to old/NoASP/Http/HttpWorker.cs diff --git a/ColoryrServer/NoASP/NoASPConfig.cs b/old/NoASP/NoASPConfig.cs similarity index 100% rename from ColoryrServer/NoASP/NoASPConfig.cs rename to old/NoASP/NoASPConfig.cs diff --git a/ColoryrServer/NoASP/Program.cs b/old/NoASP/Program.cs similarity index 100% rename from ColoryrServer/NoASP/Program.cs rename to old/NoASP/Program.cs