test

NTMiner.sln

@@ -94,11 +94,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NTMinerDataSchemas", "src\N
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NTMinerNoDevFee", "src\NTMinerNoDevFee\NTMinerNoDevFee.csproj", "{6CA605E2-2B82-4277-8CD3-BE5EFDF00680}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Server", "Server", "{DC562605-2F35-4D5C-B576-829D8654399D}"
-	ProjectSection(SolutionItems) = preProject
-		docs\Server\README.md = docs\Server\README.md
-	EndProjectSection
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NTMinerServer", "src\NTMinerServer\NTMinerServer.csproj", "{CB2619B7-3F59-41B7-A562-4A3F117822CE}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "UserApp", "UserApp", "{2C8C5FC2-8B81-4228-8EBD-6B491216FBC1}"
@@ -119,7 +114,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UserServer", "src\UserServe
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "websocket-sharp", "src\websocket-sharp\websocket-sharp.csproj", "{B357BAC7-529E-4D81-A0D2-71041B19C8DE}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebSite", "src\WebSite\WebSite.csproj", "{AA37861C-5470-4885-B536-E6CA39D5F574}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WebSite", "WebSite", "{FEA19724-60E0-4B6F-A03D-C0A87F68FFA7}"
+	ProjectSection(SolutionItems) = preProject
+		docs\WebSite\getDotNet.html = docs\WebSite\getDotNet.html
+		docs\WebSite\index.html = docs\WebSite\index.html
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -479,18 +478,6 @@ Global
 		{B357BAC7-529E-4D81-A0D2-71041B19C8DE}.Release|x64.Build.0 = Release|Any CPU
 		{B357BAC7-529E-4D81-A0D2-71041B19C8DE}.Release|x86.ActiveCfg = Release|Any CPU
 		{B357BAC7-529E-4D81-A0D2-71041B19C8DE}.Release|x86.Build.0 = Release|Any CPU
-		{AA37861C-5470-4885-B536-E6CA39D5F574}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AA37861C-5470-4885-B536-E6CA39D5F574}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AA37861C-5470-4885-B536-E6CA39D5F574}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{AA37861C-5470-4885-B536-E6CA39D5F574}.Debug|x64.Build.0 = Debug|Any CPU
-		{AA37861C-5470-4885-B536-E6CA39D5F574}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{AA37861C-5470-4885-B536-E6CA39D5F574}.Debug|x86.Build.0 = Debug|Any CPU
-		{AA37861C-5470-4885-B536-E6CA39D5F574}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AA37861C-5470-4885-B536-E6CA39D5F574}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AA37861C-5470-4885-B536-E6CA39D5F574}.Release|x64.ActiveCfg = Release|Any CPU
-		{AA37861C-5470-4885-B536-E6CA39D5F574}.Release|x64.Build.0 = Release|Any CPU
-		{AA37861C-5470-4885-B536-E6CA39D5F574}.Release|x86.ActiveCfg = Release|Any CPU
-		{AA37861C-5470-4885-B536-E6CA39D5F574}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -518,7 +505,6 @@ Global
 		{85D052AB-44B8-46F3-9D7B-F624C24FD8BA} = {E66C9F7C-617A-4E97-978A-A06E3A95BEE8}
 		{2AC59227-F5C7-4594-9CC0-8FFA5DB9C6C5} = {E0B0D173-418C-49D0-9018-99BC6C526CF5}
 		{6CA605E2-2B82-4277-8CD3-BE5EFDF00680} = {E0B0D173-418C-49D0-9018-99BC6C526CF5}
-		{DC562605-2F35-4D5C-B576-829D8654399D} = {E32C4009-7A81-4A60-B561-286D8A0C5E06}
 		{CB2619B7-3F59-41B7-A562-4A3F117822CE} = {3A26E27F-79C5-44D5-B25F-307A6EFE0636}
 		{2C8C5FC2-8B81-4228-8EBD-6B491216FBC1} = {43C57D59-9DC7-45AE-9D09-5D3D413E41EC}
 		{E7B88637-7704-4701-98E0-7875BB6E8C98} = {103F58A8-D0E9-405D-8FF0-DD600FCA2282}
@@ -528,7 +514,7 @@ Global
 		{3A26E27F-79C5-44D5-B25F-307A6EFE0636} = {43C57D59-9DC7-45AE-9D09-5D3D413E41EC}
 		{103F58A8-D0E9-405D-8FF0-DD600FCA2282} = {3A26E27F-79C5-44D5-B25F-307A6EFE0636}
 		{7141D542-E321-406D-A242-B857255F79F6} = {2C8C5FC2-8B81-4228-8EBD-6B491216FBC1}
-		{AA37861C-5470-4885-B536-E6CA39D5F574} = {43C57D59-9DC7-45AE-9D09-5D3D413E41EC}
+		{FEA19724-60E0-4B6F-A03D-C0A87F68FFA7} = {E32C4009-7A81-4A60-B561-286D8A0C5E06}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {A5D14B0A-73FF-46E8-87F3-7E83FFC1DBDD}

docs/Server/README.md

@@ -1 +0,0 @@
-服务端都是.NET45，挖矿端都是.NET40

src/WebSite/Program.cs

@@ -1,22 +0,0 @@
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace WebSite {
-    public class Program {
-        public static void Main(string[] args) {
-            CreateHostBuilder(args).Build().Run();
-        }
-
-        public static IHostBuilder CreateHostBuilder(string[] args) =>
-            Host.CreateDefaultBuilder(args)
-                .ConfigureWebHostDefaults(webBuilder => {
-                    webBuilder.UseStartup<Startup>();
-                });
-    }
-}

src/WebSite/Properties/launchSettings.json

@@ -1,28 +0,0 @@
-{
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:5577",
-      "sslPort": 44306
-    }
-  },
-  "profiles": {
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "WebSite": {
-      "commandName": "Project",
-      "dotnetRunMessages": "true",
-      "launchBrowser": true,
-      "applicationUrl": "https://localhost:5001;http://localhost:5000",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    }
-  }
-}

src/WebSite/Startup.cs

@@ -1,33 +0,0 @@
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace WebSite {
-    public class Startup {
-        // This method gets called by the runtime. Use this method to add services to the container.
-        // For more information on how to configure your application, visit https://go.microsoft.com/fwlink/?LinkID=398940
-        public void ConfigureServices(IServiceCollection services) {
-        }
-
-        // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
-        public void Configure(IApplicationBuilder app, IWebHostEnvironment env) {
-            if (env.IsDevelopment()) {
-                app.UseDeveloperExceptionPage();
-            }
-
-            app.UseRouting();
-
-            app.UseEndpoints(endpoints => {
-                endpoints.MapGet("/", async context => {
-                    await context.Response.WriteAsync("Hello World!");
-                });
-            });
-        }
-    }
-}

src/WebSite/WebSite.csproj

@@ -1,7 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-
-  <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
-  </PropertyGroup>
-
-</Project>

src/WebSite/appsettings.Development.json

@@ -1,9 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft": "Warning",
-      "Microsoft.Hosting.Lifetime": "Information"
-    }
-  }
-}

src/WebSite/appsettings.json

@@ -1,10 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft": "Warning",
-      "Microsoft.Hosting.Lifetime": "Information"
-    }
-  },
-  "AllowedHosts": "*"
-}