Move ConnectionUriParser class to QpClientOptions class.

Author: aaasoft

QpTestClient/Forms/GenerateConnectionUrl.cs

@@ -35,8 +35,7 @@ private void generate()
             var includePassword = cbIncludePassword.Checked;
             var includeOtherProperty = cbIncludeOtherProperty.Checked;
 
-            txtOutput.Text = Quick.Protocol.AllClients.ConnectionUriParser.GenerateConnectionUri(
-                connectionContext.ConnectionInfo.QpClientOptions,
+            txtOutput.Text = connectionContext.ConnectionInfo.QpClientOptions.ToUri(
                 includePassword,
                 includeOtherProperty
                 ).ToString();

QpTestClient/Program.cs

@@ -14,6 +14,8 @@ static class Program
         [STAThread]
         static void Main()
         {
+            Quick.Protocol.QpAllClients.RegisterUriSchema();
+
             QpClientTypeManager.Instance.Init();
 
             Application.SetHighDpiMode(HighDpiMode.SystemAware);

QpTestClient/QuickConnectForm.cs

@@ -1,4 +1,5 @@
-using System;
+using Quick.Protocol.Utils;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data;
@@ -44,18 +45,22 @@ private void btnOk_Click(object sender, EventArgs e)
                 return;
             }
             var uri = new Uri(url);
-            var connectionInfo = Quick.Protocol.AllClients.ConnectionUriParser.Parse(uri);
-            if (connectionInfo==null)
+            Quick.Protocol.QpClientOptions options = null;
+            try
             {
-                MessageBox.Show("无效的URL！", Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                options = Quick.Protocol.QpClientOptions.Parse(uri);
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show("解析URL时出错，原因：" + ExceptionUtils.GetExceptionString(ex), Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Warning);
                 return;
             }
-            connectionInfo.QpClientOptions.Password = password;
+            options.Password = password;
             ConnectionInfo = new TestConnectionInfo()
             {
                 Name = name,
-                QpClientTypeName = connectionInfo.QpClientType.FullName,
-                QpClientOptions = connectionInfo.QpClientOptions
+                QpClientTypeName = options.GetQpClientType().FullName,
+                QpClientOptions = options
             };
             DialogResult = DialogResult.OK;
             Close();

Quick.Protocol.AllClients/ConnectionInfo.cs

@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Quick.Protocol
+{
+    public class QpAllClients
+    {
+        public static void RegisterUriSchema()
+        {
+            Pipeline.QpPipelineClientOptions.RegisterUriSchema();
+            SerialPort.QpSerialPortClientOptions.RegisterUriSchema();
+            Tcp.QpTcpClientOptions.RegisterUriSchema();
+            WebSocket.Client.QpWebSocketClientOptions.RegisterUriSchema();
+        }
+    }
+}

Quick.Protocol.AllClients/ConnectionUriParser.cs

@@ -7,6 +7,8 @@ namespace Quick.Protocol.Pipeline
 {
     public class QpPipelineClientOptions : QpClientOptions
     {
+        public const string URI_SCHEMA = "pipe";
+
         [Category("常用")]
         [DisplayName("服务器名称")]
         public string ServerName { get; set; } = ".";
@@ -23,5 +25,19 @@ public override void Check()
         }
 
         public override string GetConnectionInfo() => $"{ServerName}\\{PipeName}";
+
+        public override Type GetQpClientType() => typeof(QpPipelineClient);
+
+        protected override string ToUriBasic(HashSet<string> ignorePropertyNames)
+        {
+            ignorePropertyNames.Add(nameof(ServerName));
+            ignorePropertyNames.Add(nameof(PipeName));
+            return $"{URI_SCHEMA}://{ServerName}/{PipeName}";
+        }
+
+        public static void RegisterUriSchema()
+        {
+            RegisterUriSchema(URI_SCHEMA, typeof(QpPipelineClientOptions));
+        }
     }
 }

Quick.Protocol.AllClients/QpAllClients.cs

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>netstandard2.0;net46</TargetFrameworks>
+		<TargetFramework>netstandard2.0</TargetFramework>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<PackageProjectUrl>https://github.com/QuickProtocol</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/QuickProtocol/QuickProtocol_CSharp</RepositoryUrl>

Quick.Protocol.Pipeline/QpPipelineClientOptions.cs

@@ -8,6 +8,7 @@ namespace Quick.Protocol.SerialPort
 {
     public class QpSerialPortClientOptions : QpClientOptions
     {
+        public const string URI_SCHEMA = "serialport";
         /// <summary>
         /// 端口名称
         /// </summary>
@@ -47,5 +48,18 @@ public override void Check()
         }
 
         public override string GetConnectionInfo() => PortName;
+
+        public override Type GetQpClientType() => typeof(QpSerialPortClient);
+
+        protected override string ToUriBasic(HashSet<string> ignorePropertyNames)
+        {
+            ignorePropertyNames.Add(nameof(PortName));
+            return $"{URI_SCHEMA}://{PortName}";            
+        }
+
+        public static void RegisterUriSchema()
+        {
+            RegisterUriSchema(URI_SCHEMA, typeof(QpSerialPortClientOptions));
+        }
     }
 }

Quick.Protocol.Pipeline/Quick.Protocol.Pipeline.csproj

@@ -7,6 +7,7 @@ namespace Quick.Protocol.Tcp
 {
     public class QpTcpClientOptions : QpClientOptions
     {
+        public const string URI_SCHEMA = "tcp";
         /// <summary>
         /// 主机
         /// </summary>
@@ -42,5 +43,19 @@ public override void Check()
         }
 
         public override string GetConnectionInfo() => $"{Host}:{Port}";
+
+        public override Type GetQpClientType() => typeof(QpTcpClient);
+
+        protected override string ToUriBasic(HashSet<string> ignorePropertyNames)
+        {
+            ignorePropertyNames.Add(nameof(Host));
+            ignorePropertyNames.Add(nameof(Port));
+            return $"{URI_SCHEMA}://{Host}:{Port}";
+        }
+
+        public static void RegisterUriSchema()
+        {
+            RegisterUriSchema(URI_SCHEMA, typeof(QpTcpClientOptions));
+        }
     }
 }