From b48dff1110919d39ee088a4914b7fab85a842438 Mon Sep 17 00:00:00 2001 From: "DESKTOP-P0BC20V\\Eric" Date: Tue, 23 Oct 2018 15:14:03 +0800 Subject: [PATCH 1/2] =?UTF-8?q?.net=20core=E5=8C=85=E4=BB=8E1.x=E5=8D=87?= =?UTF-8?q?=E7=BA=A7=E5=88=B02.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/WS.Core/WS.Core.csproj | 14 +++++++------- src/WS.Test/Startup.cs | 3 ++- src/WS.Test/WS.Test.csproj | 12 ++++++------ src/WS.sln | 35 +++++++++++++++++++---------------- 4 files changed, 34 insertions(+), 30 deletions(-) diff --git a/src/WS.Core/WS.Core.csproj b/src/WS.Core/WS.Core.csproj index fceb7d3..fdca4ef 100644 --- a/src/WS.Core/WS.Core.csproj +++ b/src/WS.Core/WS.Core.csproj @@ -1,17 +1,17 @@  - netstandard1.6.1 + netstandard2.0 - - - - - + + + + + - + \ No newline at end of file diff --git a/src/WS.Test/Startup.cs b/src/WS.Test/Startup.cs index 0bd4a03..d1dc7f2 100644 --- a/src/WS.Test/Startup.cs +++ b/src/WS.Test/Startup.cs @@ -7,6 +7,7 @@ using WS.Core; using WS.Core.IO; using System; +using WS.Core.Base; namespace WS.Coin { @@ -50,7 +51,7 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF app.UseStaticFiles(); app.UseWebSockets(); - app.UseWSSockets(GlobalConfig.DefaultIocManager, loggerGenerator); + app.UseWSSockets(GlobalConfig.DefaultIocManager, loggerGenerator,new WSSessionManager()); GlobalConfig.DefaultIocManager.Build();//初始化默认IOC管理器 } diff --git a/src/WS.Test/WS.Test.csproj b/src/WS.Test/WS.Test.csproj index bf79701..3c5580b 100644 --- a/src/WS.Test/WS.Test.csproj +++ b/src/WS.Test/WS.Test.csproj @@ -1,6 +1,7 @@  - netcoreapp1.1 + netcoreapp2.1 + false @@ -12,12 +13,11 @@ - - - - + + + - + diff --git a/src/WS.sln b/src/WS.sln index 888b902..05b1085 100644 --- a/src/WS.sln +++ b/src/WS.sln @@ -19,30 +19,33 @@ Global GlobalSection(ProjectConfigurationPlatforms) = postSolution {159A6D60-83A6-416C-8EA7-5670E161F20A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {159A6D60-83A6-416C-8EA7-5670E161F20A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {159A6D60-83A6-416C-8EA7-5670E161F20A}.Debug|x64.ActiveCfg = Debug|x64 - {159A6D60-83A6-416C-8EA7-5670E161F20A}.Debug|x64.Build.0 = Debug|x64 - {159A6D60-83A6-416C-8EA7-5670E161F20A}.Debug|x86.ActiveCfg = Debug|x86 - {159A6D60-83A6-416C-8EA7-5670E161F20A}.Debug|x86.Build.0 = Debug|x86 + {159A6D60-83A6-416C-8EA7-5670E161F20A}.Debug|x64.ActiveCfg = Debug|Any CPU + {159A6D60-83A6-416C-8EA7-5670E161F20A}.Debug|x64.Build.0 = Debug|Any CPU + {159A6D60-83A6-416C-8EA7-5670E161F20A}.Debug|x86.ActiveCfg = Debug|Any CPU + {159A6D60-83A6-416C-8EA7-5670E161F20A}.Debug|x86.Build.0 = Debug|Any CPU {159A6D60-83A6-416C-8EA7-5670E161F20A}.Release|Any CPU.ActiveCfg = Release|Any CPU {159A6D60-83A6-416C-8EA7-5670E161F20A}.Release|Any CPU.Build.0 = Release|Any CPU - {159A6D60-83A6-416C-8EA7-5670E161F20A}.Release|x64.ActiveCfg = Release|x64 - {159A6D60-83A6-416C-8EA7-5670E161F20A}.Release|x64.Build.0 = Release|x64 - {159A6D60-83A6-416C-8EA7-5670E161F20A}.Release|x86.ActiveCfg = Release|x86 - {159A6D60-83A6-416C-8EA7-5670E161F20A}.Release|x86.Build.0 = Release|x86 + {159A6D60-83A6-416C-8EA7-5670E161F20A}.Release|x64.ActiveCfg = Release|Any CPU + {159A6D60-83A6-416C-8EA7-5670E161F20A}.Release|x64.Build.0 = Release|Any CPU + {159A6D60-83A6-416C-8EA7-5670E161F20A}.Release|x86.ActiveCfg = Release|Any CPU + {159A6D60-83A6-416C-8EA7-5670E161F20A}.Release|x86.Build.0 = Release|Any CPU {BF43212D-65F6-497E-BCAE-6768D48CC019}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {BF43212D-65F6-497E-BCAE-6768D48CC019}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BF43212D-65F6-497E-BCAE-6768D48CC019}.Debug|x64.ActiveCfg = Debug|x64 - {BF43212D-65F6-497E-BCAE-6768D48CC019}.Debug|x64.Build.0 = Debug|x64 - {BF43212D-65F6-497E-BCAE-6768D48CC019}.Debug|x86.ActiveCfg = Debug|x86 - {BF43212D-65F6-497E-BCAE-6768D48CC019}.Debug|x86.Build.0 = Debug|x86 + {BF43212D-65F6-497E-BCAE-6768D48CC019}.Debug|x64.ActiveCfg = Debug|Any CPU + {BF43212D-65F6-497E-BCAE-6768D48CC019}.Debug|x64.Build.0 = Debug|Any CPU + {BF43212D-65F6-497E-BCAE-6768D48CC019}.Debug|x86.ActiveCfg = Debug|Any CPU + {BF43212D-65F6-497E-BCAE-6768D48CC019}.Debug|x86.Build.0 = Debug|Any CPU {BF43212D-65F6-497E-BCAE-6768D48CC019}.Release|Any CPU.ActiveCfg = Release|Any CPU {BF43212D-65F6-497E-BCAE-6768D48CC019}.Release|Any CPU.Build.0 = Release|Any CPU - {BF43212D-65F6-497E-BCAE-6768D48CC019}.Release|x64.ActiveCfg = Release|x64 - {BF43212D-65F6-497E-BCAE-6768D48CC019}.Release|x64.Build.0 = Release|x64 - {BF43212D-65F6-497E-BCAE-6768D48CC019}.Release|x86.ActiveCfg = Release|x86 - {BF43212D-65F6-497E-BCAE-6768D48CC019}.Release|x86.Build.0 = Release|x86 + {BF43212D-65F6-497E-BCAE-6768D48CC019}.Release|x64.ActiveCfg = Release|Any CPU + {BF43212D-65F6-497E-BCAE-6768D48CC019}.Release|x64.Build.0 = Release|Any CPU + {BF43212D-65F6-497E-BCAE-6768D48CC019}.Release|x86.ActiveCfg = Release|Any CPU + {BF43212D-65F6-497E-BCAE-6768D48CC019}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {00FCB4A8-436F-43EC-B71C-321A17AABAB3} + EndGlobalSection EndGlobal From b18d5bd3f58bb9b0d2f79397808c72fb078f33cc Mon Sep 17 00:00:00 2001 From: "DESKTOP-P0BC20V\\Eric" Date: Tue, 23 Oct 2018 15:16:39 +0800 Subject: [PATCH 2/2] =?UTF-8?q?Example=E5=9C=B0=E5=9D=80=E6=94=B9=E4=B8=BA?= =?UTF-8?q?127.0.0.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/WS.Test/Properties/launchSettings.json | 8 ++++---- src/WS.Test/wwwroot/Example/Chat.js | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/WS.Test/Properties/launchSettings.json b/src/WS.Test/Properties/launchSettings.json index 2dd7a0c..ac3fabf 100644 --- a/src/WS.Test/Properties/launchSettings.json +++ b/src/WS.Test/Properties/launchSettings.json @@ -1,9 +1,9 @@ -{ +{ "iisSettings": { "windowsAuthentication": false, "anonymousAuthentication": true, "iisExpress": { - "applicationUrl": "http://192.168.3.192:8987", + "applicationUrl": "http://127.0.0.1:8987", "sslPort": 0 } }, @@ -21,7 +21,7 @@ "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" }, - "applicationUrl": "http://192.168.199.236:8987" + "applicationUrl": "http://127.0.0.1:8987" } } -} +} \ No newline at end of file diff --git a/src/WS.Test/wwwroot/Example/Chat.js b/src/WS.Test/wwwroot/Example/Chat.js index 56a7fe3..a2f32b4 100644 --- a/src/WS.Test/wwwroot/Example/Chat.js +++ b/src/WS.Test/wwwroot/Example/Chat.js @@ -17,7 +17,7 @@ var SendCommand = { function StartWS(root) { var Chat = root.lookup("Chat"); - var ws = new WebSocket("ws://192.168.199.236:8987/ws/market"); + var ws = new WebSocket("ws://127.0.0.1:8987ws/market"); ws.onopen = function (e) { console.log("Connection open..."); };