Skip to content

Commit

Permalink
Fix CHeader use in method parameter error,HttpClusterApi support Mult…
Browse files Browse the repository at this point in the history
…i-HTTP Services,refactor task action execute fun
  • Loading branch information
beetlex-io committed Dec 7, 2018
1 parent 52ec805 commit 16a11e8
Show file tree
Hide file tree
Showing 47 changed files with 259 additions and 18,015 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Expand Up @@ -67,3 +67,5 @@ samples/HttpApiServer.Options/obj/
src/License.txt
samples/HttpApiServer.TaskActions/bin/
samples/HttpApiServer.TaskActions/obj/
samples/HttpApiServer.DataPost/Properties/
samples/HttpApiServer.DataPost/HttpApiServer.DataPost.csproj.user
Binary file modified .vs/BeetleX.FastHttpApi/v15/.suo
Binary file not shown.
18 changes: 2 additions & 16 deletions BeetleX.FastHttpApi.sln
Expand Up @@ -13,12 +13,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HttpApiServer.Web", "sample
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HttpApiServer.Cookies", "samples\HttpApiServer.Cookies\HttpApiServer.Cookies.csproj", "{A1BE1465-037F-432C-9AF3-4CB35F982A57}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HttpApiServer.AsyncResult", "samples\HttpApiServer.AsyncResult\HttpApiServer.AsyncResult.csproj", "{8505A7E4-08FD-4FB8-BC3D-1E5F9469CC82}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HttpApiServer.HttpAndWebsocketApi", "samples\HttpApiServer.HttpAndWebsocketApi\HttpApiServer.HttpAndWebsocketApi.csproj", "{CEFA643C-342C-4B8B-AC54-3E21374C7779}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HttpApiServer.Chat", "samples\HttpApiServer.Chat\HttpApiServer.Chat.csproj", "{40A7A601-DF18-4B4F-BA31-F06F96D58736}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BeetleX.FastHttpApi.Admin", "Extend\BeetleX.FastHttpApi.Admin\BeetleX.FastHttpApi.Admin.csproj", "{343769E9-1292-456D-B55A-A0F0C5A9E6A6}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HttpApiServer.Admin", "samples\HttpApiServer.Admin\HttpApiServer.Admin.csproj", "{4FEF2F5E-47E9-44F0-A71A-72E5EDDC9334}"
Expand Down Expand Up @@ -46,9 +42,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HttpApiServer.JWT", "sample
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HttpApiServer.UploadFile", "samples\HttpApiServer.UploadFile\HttpApiServer.UploadFile.csproj", "{A2694429-207E-49B5-9F76-F851E873C620}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HttpApiServer.Options", "samples\HttpApiServer.Options\HttpApiServer.Options.csproj", "{F73141EE-158F-440E-8B33-A204EE25FD80}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HttpApiServer.Options", "samples\HttpApiServer.Options\HttpApiServer.Options.csproj", "{F73141EE-158F-440E-8B33-A204EE25FD80}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HttpApiServer.TaskActions", "samples\HttpApiServer.TaskActions\HttpApiServer.TaskActions.csproj", "{0A2E21F0-EE1C-4E23-938D-67BA02D4EE11}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HttpApiServer.TaskActions", "samples\HttpApiServer.TaskActions\HttpApiServer.TaskActions.csproj", "{0A2E21F0-EE1C-4E23-938D-67BA02D4EE11}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand All @@ -72,18 +68,10 @@ Global
{A1BE1465-037F-432C-9AF3-4CB35F982A57}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A1BE1465-037F-432C-9AF3-4CB35F982A57}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A1BE1465-037F-432C-9AF3-4CB35F982A57}.Release|Any CPU.Build.0 = Release|Any CPU
{8505A7E4-08FD-4FB8-BC3D-1E5F9469CC82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8505A7E4-08FD-4FB8-BC3D-1E5F9469CC82}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8505A7E4-08FD-4FB8-BC3D-1E5F9469CC82}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8505A7E4-08FD-4FB8-BC3D-1E5F9469CC82}.Release|Any CPU.Build.0 = Release|Any CPU
{CEFA643C-342C-4B8B-AC54-3E21374C7779}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CEFA643C-342C-4B8B-AC54-3E21374C7779}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CEFA643C-342C-4B8B-AC54-3E21374C7779}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CEFA643C-342C-4B8B-AC54-3E21374C7779}.Release|Any CPU.Build.0 = Release|Any CPU
{40A7A601-DF18-4B4F-BA31-F06F96D58736}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{40A7A601-DF18-4B4F-BA31-F06F96D58736}.Debug|Any CPU.Build.0 = Debug|Any CPU
{40A7A601-DF18-4B4F-BA31-F06F96D58736}.Release|Any CPU.ActiveCfg = Release|Any CPU
{40A7A601-DF18-4B4F-BA31-F06F96D58736}.Release|Any CPU.Build.0 = Release|Any CPU
{343769E9-1292-456D-B55A-A0F0C5A9E6A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{343769E9-1292-456D-B55A-A0F0C5A9E6A6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{343769E9-1292-456D-B55A-A0F0C5A9E6A6}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand Down Expand Up @@ -140,9 +128,7 @@ Global
{92EB6BC1-7680-4684-87ED-FD2034F81F22} = {74AFF152-DF0F-4D19-8CF1-5453E95C126F}
{9277DD69-CCD4-4A94-B369-193D1664B0D3} = {74AFF152-DF0F-4D19-8CF1-5453E95C126F}
{A1BE1465-037F-432C-9AF3-4CB35F982A57} = {74AFF152-DF0F-4D19-8CF1-5453E95C126F}
{8505A7E4-08FD-4FB8-BC3D-1E5F9469CC82} = {74AFF152-DF0F-4D19-8CF1-5453E95C126F}
{CEFA643C-342C-4B8B-AC54-3E21374C7779} = {74AFF152-DF0F-4D19-8CF1-5453E95C126F}
{40A7A601-DF18-4B4F-BA31-F06F96D58736} = {74AFF152-DF0F-4D19-8CF1-5453E95C126F}
{4FEF2F5E-47E9-44F0-A71A-72E5EDDC9334} = {74AFF152-DF0F-4D19-8CF1-5453E95C126F}
{D84C813C-A815-4186-9BB7-C2EC33AB0913} = {74AFF152-DF0F-4D19-8CF1-5453E95C126F}
{305CE559-7CD5-45AB-B828-0BF29D71AF93} = {74AFF152-DF0F-4D19-8CF1-5453E95C126F}
Expand Down
2 changes: 1 addition & 1 deletion Extend/BeetleX.FastHttpApi.Admin/FileManagerController.cs
Expand Up @@ -93,7 +93,7 @@ public void Init(BeetleX.FastHttpApi.HttpApiServer server)
{
mPath = server.ServerConfig.FileManagerPath;
if (string.IsNullOrEmpty(mPath))
mPath = server.ServerConfig.StaticResourcePath;
mPath = System.IO.Directory.GetCurrentDirectory();
if (!System.IO.Directory.Exists(mPath))
System.IO.Directory.CreateDirectory(mPath);
if (mPath[mPath.Length - 1] == System.IO.Path.DirectorySeparatorChar)
Expand Down
12 changes: 0 additions & 12 deletions samples/HttpApiServer.AsyncResult/HttpApiServer.AsyncResult.csproj

This file was deleted.

24 changes: 0 additions & 24 deletions samples/HttpApiServer.AsyncResult/HttpConfig.json

This file was deleted.

41 changes: 0 additions & 41 deletions samples/HttpApiServer.AsyncResult/Program.cs

This file was deleted.

0 comments on commit 16a11e8

Please sign in to comment.