bug fixed

Author: icecoins

Config.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SshTool
+namespace SshTool
 {
     class Config
     {

MainWindow.xaml

@@ -31,7 +31,7 @@
         <Label Content="ssh端口" HorizontalAlignment="Left" Margin="148,270,0,0" VerticalAlignment="Top" Height="40" Width="200" FontSize="20" RenderTransformOrigin="0.531,0.333" FontWeight="Bold" Grid.Column="1"/>
         <TextBox x:Name="ssh_user" HorizontalAlignment="Left" Height="40" Margin="348,210,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="700" RenderTransformOrigin="0.45,0.778" FontSize="18" FontWeight="Bold" ToolTip="如：root" Grid.Column="1"/>
         <Label Content="ssh用户名" HorizontalAlignment="Left" Margin="148,210,0,0" VerticalAlignment="Top" Height="40" Width="200" FontSize="20" RenderTransformOrigin="0.531,0.333" FontWeight="Bold" Grid.Column="1"/>
-        <TextBox x:Name="info" HorizontalAlignment="Left" Height="250" Margin="298,510,0,0" TextWrapping="Wrap" Text="版本：V1.0.2。&#xA;关注作者，持续更新。&#xA;&#xA;输出信息：" VerticalAlignment="Top" Width="750" RenderTransformOrigin="0.45,0.778" FontSize="16" Background="#FFA9E8FF" FontWeight="Bold" AcceptsReturn="True" ToolTip="显示输出信息，也可以作为记事本，可随意更改" Grid.Column="1"/>
+        <TextBox x:Name="info" HorizontalAlignment="Left" Height="250" Margin="298,510,0,0" TextWrapping="Wrap" Text="版本：V1.0.2。关注作者，持续更新。&#xD;&#xA;注：鼠标悬停在控件上方可显示更多信息。&#xA;输出信息：" VerticalAlignment="Top" Width="750" RenderTransformOrigin="0.45,0.778" FontSize="16" Background="#FFA9E8FF" FontWeight="Bold" AcceptsReturn="True" ToolTip="显示输出信息，也可以作为记事本，可随意更改" Grid.Column="1"/>
         <Label Content="输出信息" HorizontalAlignment="Left" Margin="148,510,0,0" VerticalAlignment="Top" Height="40" Width="144" RenderTransformOrigin="0.446,2.115" FontSize="20" FontWeight="Bold" Grid.Column="1"/>
         <Button x:Name="disconnect" Content="断开" HorizontalAlignment="Left" Margin="498,765,0,35" VerticalAlignment="Center" Width="200" Height="70" Click="Disconnect_Click" FontSize="18" Background="#FFEC967D" FontWeight="Bold" RenderTransformOrigin="0.364,1.209" IsEnabled="False" Grid.Column="1"/>
         <Button x:Name="exit" Content="退出" HorizontalAlignment="Left" Margin="848,766,0,34" VerticalAlignment="Center" Width="200" Height="70" Click="Exit_Click" FontSize="18" Background="#FFC3AEAE" ClipToBounds="True" FontWeight="Bold" Grid.Column="1"/>

MainWindow.xaml.cs

@@ -28,17 +28,18 @@ public void ReadConfig()
             {
                 byte[] bytes = File.ReadAllBytes("config");
                 string[] info = System.Text.Encoding.Default.GetString(bytes).Split('\n');
-                Console.WriteLine(info.Length);
+                // Console.WriteLine(info.Length);
                 if (info.Length > 1)
                 {
                     // MsgAppend("已读取配置");
+                    Console.WriteLine(info[0]);
                     last_selected = int.Parse(info[0]);
                     configs = new Config[info.Length - 1];
                     for(int i = 1; i < info.Length; i++)
                     {
                         // Console.WriteLine("ID: " + i + " MSG:" + info[i]);
                         string[] items = info[i].Split('\t');
-                        Console.WriteLine(info[i]);
+                        // Console.WriteLine(info[i]);
                         if (items.Length == 7)
                         {
                             configs[i-1] = new Config(i-1, items[0], items[1], items[2], items[3], items[4], items[5], items[6]);
@@ -270,18 +271,14 @@ private void Create_Click(object sender, RoutedEventArgs e)
 
         void NewConfigFromInput()
         {
-            if (null == config_label.Text || config_label.Text.Equals(""))
-            {
-                config_label.Text = "undefined";
-            }
             var host = ssh_host.Text.Trim();
             var label = config_label.Text.Trim();
             var ssh_u = ssh_user.Text.Trim();
             var ssh_p = ssh_port.Text.Trim();
             var pwd = ssh_password.Text.Trim();
             var app_p = app_port.Text.Trim();
             var local_p = local_port.Text.Trim();
-            if (IsEmpty(host) || IsEmpty(label) || IsEmpty(ssh_p) || IsEmpty(pwd) || IsEmpty(app_p) || IsEmpty(local_p))
+            if (IsEmpty(host) || IsEmpty(label) || IsEmpty(label) || IsEmpty(ssh_u) || IsEmpty(pwd) || IsEmpty(app_p) || IsEmpty(local_p))
             {
                 MessageBox.Show("所有参数均为必填项");
                 return;

SshTool.csproj

@@ -8,7 +8,7 @@
     <OutputType>WinExe</OutputType>
     <RootNamespace>SshTool</RootNamespace>
     <AssemblyName>SshTool</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>
@@ -31,10 +31,12 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+    <WarningLevel>3</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
+    <GenerateSerializationAssemblies>On</GenerateSerializationAssemblies>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
   <PropertyGroup>
     <ApplicationIcon>ic.ico</ApplicationIcon>
@@ -45,6 +47,9 @@
   <PropertyGroup>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   </PropertyGroup>
+  <PropertyGroup>
+    <NoWin32Manifest>true</NoWin32Manifest>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="PresentationFramework.Aero2" />
     <Reference Include="Renci.SshNet, Version=2020.0.2.0, Culture=neutral, PublicKeyToken=1cee9f8bde3db106, processorArchitecture=MSIL">

app.config

@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/></startup></configuration>