张泳健 před 7 roky
rodič
revize
fdc4e5f7c4

+ 6 - 0
DotNettyFrom.sln Zobrazit soubor

7
 EndProject
7
 EndProject
8
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestServer", "TestServer\TestServer.csproj", "{4ED061B5-251E-4813-ABAD-4B6B57A4FC67}"
8
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestServer", "TestServer\TestServer.csproj", "{4ED061B5-251E-4813-ABAD-4B6B57A4FC67}"
9
 EndProject
9
 EndProject
10
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNettyFromTests", "DotNettyFromTests\DotNettyFromTests.csproj", "{BE93EEC6-53F3-43B9-B4BB-291CDAE46290}"
11
+EndProject
10
 Global
12
 Global
11
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
13
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
12
 		Debug|Any CPU = Debug|Any CPU
14
 		Debug|Any CPU = Debug|Any CPU
21
 		{4ED061B5-251E-4813-ABAD-4B6B57A4FC67}.Debug|Any CPU.Build.0 = Debug|Any CPU
23
 		{4ED061B5-251E-4813-ABAD-4B6B57A4FC67}.Debug|Any CPU.Build.0 = Debug|Any CPU
22
 		{4ED061B5-251E-4813-ABAD-4B6B57A4FC67}.Release|Any CPU.ActiveCfg = Release|Any CPU
24
 		{4ED061B5-251E-4813-ABAD-4B6B57A4FC67}.Release|Any CPU.ActiveCfg = Release|Any CPU
23
 		{4ED061B5-251E-4813-ABAD-4B6B57A4FC67}.Release|Any CPU.Build.0 = Release|Any CPU
25
 		{4ED061B5-251E-4813-ABAD-4B6B57A4FC67}.Release|Any CPU.Build.0 = Release|Any CPU
26
+		{BE93EEC6-53F3-43B9-B4BB-291CDAE46290}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
27
+		{BE93EEC6-53F3-43B9-B4BB-291CDAE46290}.Debug|Any CPU.Build.0 = Debug|Any CPU
28
+		{BE93EEC6-53F3-43B9-B4BB-291CDAE46290}.Release|Any CPU.ActiveCfg = Release|Any CPU
29
+		{BE93EEC6-53F3-43B9-B4BB-291CDAE46290}.Release|Any CPU.Build.0 = Release|Any CPU
24
 	EndGlobalSection
30
 	EndGlobalSection
25
 	GlobalSection(SolutionProperties) = preSolution
31
 	GlobalSection(SolutionProperties) = preSolution
26
 		HideSolutionNode = FALSE
32
 		HideSolutionNode = FALSE

+ 2 - 2
DotNettyFrom/Form1.cs Zobrazit soubor

52
 
52
 
53
         private void BtnDisConn_Click(object sender, EventArgs e)
53
         private void BtnDisConn_Click(object sender, EventArgs e)
54
         {
54
         {
55
-            nc.StopNetty();
56
-            t.Abort();
55
+            nc?.StopNetty();
56
+            t?.Abort();
57
         }
57
         }
58
 
58
 
59
         private void BtnSendData_Click(object sender, EventArgs e)
59
         private void BtnSendData_Click(object sender, EventArgs e)

+ 2 - 2
DotNettyFrom/netty/NettyClient.cs Zobrazit soubor

49
             }
49
             }
50
             catch (Exception e)
50
             catch (Exception e)
51
             {
51
             {
52
+                //连接出错,服务器没开启....
52
                 Console.WriteLine(e);
53
                 Console.WriteLine(e);
53
                 await _group.ShutdownGracefullyAsync(TimeSpan.FromMilliseconds(100), TimeSpan.FromSeconds(1));
54
                 await _group.ShutdownGracefullyAsync(TimeSpan.FromMilliseconds(100), TimeSpan.FromSeconds(1));
54
             }
55
             }
74
 
75
 
75
         public void StopNetty()
76
         public void StopNetty()
76
         {
77
         {
77
-            Context.Channel.CloseAsync();
78
+            Context?.Channel.CloseAsync();
78
             _group?.ShutdownGracefullyAsync(TimeSpan.FromMilliseconds(100), TimeSpan.FromSeconds(1));
79
             _group?.ShutdownGracefullyAsync(TimeSpan.FromMilliseconds(100), TimeSpan.FromSeconds(1));
79
             _group = null;
80
             _group = null;
80
-            Context.CloseAsync();
81
             Context = null;
81
             Context = null;
82
             _clientHandler = null;
82
             _clientHandler = null;
83
         }
83
         }

+ 8 - 5
DotNettyFromTests/DotNettyFromTests.csproj Zobrazit soubor

53
         <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
53
         <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
54
       </ItemGroup>
54
       </ItemGroup>
55
     </When>
55
     </When>
56
-    <Otherwise>
57
-      <ItemGroup>
58
-        <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework" />
59
-      </ItemGroup>
60
-    </Otherwise>
56
+    <Otherwise />
61
   </Choose>
57
   </Choose>
62
   <ItemGroup>
58
   <ItemGroup>
59
+    <Compile Include="common\UIInfoModelTests.cs" />
63
     <Compile Include="Properties\AssemblyInfo.cs" />
60
     <Compile Include="Properties\AssemblyInfo.cs" />
64
   </ItemGroup>
61
   </ItemGroup>
65
   <ItemGroup>
62
   <ItemGroup>
66
     <None Include="packages.config" />
63
     <None Include="packages.config" />
67
   </ItemGroup>
64
   </ItemGroup>
65
+  <ItemGroup>
66
+    <ProjectReference Include="..\DotNettyFrom\DotNettyFrom.csproj">
67
+      <Project>{2348CBA6-AD06-457D-9F0C-06BFB0F432CE}</Project>
68
+      <Name>DotNettyFrom</Name>
69
+    </ProjectReference>
70
+  </ItemGroup>
68
   <Choose>
71
   <Choose>
69
     <When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
72
     <When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
70
       <ItemGroup>
73
       <ItemGroup>