Add IQpModel and AbstractQpModel

aaasoft · aaasoft · commit 7546cfe2444c · 2023-12-06T08:48:58.000+08:00
diff --git a/Quick.Protocol/Commands/Authenticate/Request.cs b/Quick.Protocol/Commands/Authenticate/Request.cs
@@ -1,10 +1,14 @@
-﻿using System.ComponentModel;
+﻿using Quick.Protocol.Model;
+using System.ComponentModel;
+using System.Text.Json.Serialization.Metadata;
 
 namespace Quick.Protocol.Commands.Authenticate
 {
     [DisplayName("认证")]
-    public class Request : IQpCommandRequest<Response>
+    public class Request : AbstractQpModel<Request>, IQpCommandRequest<Response>
     {
+        protected override JsonTypeInfo<Request> TypeInfo => AuthenticateCommandSerializerContext.Default.Request;
+
         /// 认证回答
         /// </summary>
         public string Answer { get; set; }
diff --git a/Quick.Protocol/Commands/Authenticate/Response.cs b/Quick.Protocol/Commands/Authenticate/Response.cs
@@ -1,10 +1,11 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Text;
+﻿using Quick.Protocol.Model;
+using System.Text.Json.Serialization.Metadata;
 
 namespace Quick.Protocol.Commands.Authenticate
 {
-    public class Response
+    public class Response : AbstractQpModel<Response>
     {
+        protected override JsonTypeInfo<Response> TypeInfo => AuthenticateCommandSerializerContext.Default.Response;
+
     }
 }
diff --git a/Quick.Protocol/Commands/Connect/Request.cs b/Quick.Protocol/Commands/Connect/Request.cs
@@ -1,16 +1,16 @@
-﻿using System;
-using System.Collections.Generic;
+﻿using Quick.Protocol.Model;
 using System.ComponentModel;
-using System.Text;
+using System.Text.Json.Serialization.Metadata;
 
 namespace Quick.Protocol.Commands.Connect
 {
     /// <summary>
     /// 连接请求命令
     /// </summary>
     [DisplayName("连接")]
-    public class Request : IQpCommandRequest<Response>
+    public class Request : AbstractQpModel<Request>, IQpCommandRequest<Response>
     {
+        protected override JsonTypeInfo<Request> TypeInfo => ConnectCommandSerializerContext.Default.Request;
         /// <summary>
         /// 指令集编号数组
         /// </summary>
diff --git a/Quick.Protocol/Commands/Connect/Response.cs b/Quick.Protocol/Commands/Connect/Response.cs
@@ -1,14 +1,15 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Text;
+﻿using Quick.Protocol.Model;
+using System.Text.Json.Serialization.Metadata;
 
 namespace Quick.Protocol.Commands.Connect
 {
     /// <summary>
     /// 连接响应命令
     /// </summary>
-    public class Response
+    public class Response : AbstractQpModel<Response>
     {
+        protected override JsonTypeInfo<Response> TypeInfo => ConnectCommandSerializerContext.Default.Response;
+
         /// <summary>
         /// 缓存大小
         /// </summary>
diff --git a/Quick.Protocol/Commands/GetQpInstructions/Request.cs b/Quick.Protocol/Commands/GetQpInstructions/Request.cs
@@ -1,12 +1,15 @@
-﻿using System.ComponentModel;
+﻿using Quick.Protocol.Model;
+using System.ComponentModel;
+using System.Text.Json.Serialization.Metadata;
 
 namespace Quick.Protocol.Commands.GetQpInstructions
 {
     /// <summary>
     /// 获取全部指令集信息请求
     /// </summary>
     [DisplayName("获取全部指令集信息")]
-    public class Request : IQpCommandRequest<Response>
+    public class Request : AbstractQpModel<Request>, IQpCommandRequest<Response>
     {
+        protected override JsonTypeInfo<Request> TypeInfo => GetQpInstructionsCommandSerializerContext.Default.Request;
     }
 }
diff --git a/Quick.Protocol/Commands/GetQpInstructions/Response.cs b/Quick.Protocol/Commands/GetQpInstructions/Response.cs
@@ -1,10 +1,14 @@
-﻿namespace Quick.Protocol.Commands.GetQpInstructions
+﻿using Quick.Protocol.Model;
+using System.Text.Json.Serialization.Metadata;
+
+namespace Quick.Protocol.Commands.GetQpInstructions
 {
     /// <summary>
     /// 获取全部指令集信息响应
     /// </summary>
-    public class Response
+    public class Response: AbstractQpModel<Response>
     {
+        protected override JsonTypeInfo<Response> TypeInfo => GetQpInstructionsCommandSerializerContext.Default.Response;
         /// <summary>
         /// 指令集数据
         /// </summary>
diff --git a/Quick.Protocol/Commands/HandShake/Request.cs b/Quick.Protocol/Commands/HandShake/Request.cs
@@ -1,13 +1,14 @@
-﻿using System;
-using System.Collections.Generic;
+﻿using Quick.Protocol.Model;
 using System.ComponentModel;
-using System.Text;
+using System.Text.Json.Serialization.Metadata;
 
 namespace Quick.Protocol.Commands.HandShake
 {
     [DisplayName("握手")]
-    public class Request : IQpCommandRequest<Response>
+    public class Request : AbstractQpModel<Request>, IQpCommandRequest<Response>
     {
+        protected override JsonTypeInfo<Request> TypeInfo => HandShakeCommandSerializerContext.Default.Request;
+
         /// <summary>
         /// 传输超时(默认15秒)
         /// </summary>
diff --git a/Quick.Protocol/Commands/HandShake/Response.cs b/Quick.Protocol/Commands/HandShake/Response.cs
@@ -1,10 +1,10 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Text;
+﻿using Quick.Protocol.Model;
+using System.Text.Json.Serialization.Metadata;
 
 namespace Quick.Protocol.Commands.HandShake
 {
-    public class Response
+    public class Response : AbstractQpModel<Response>
     {
+        protected override JsonTypeInfo<Response> TypeInfo => HandShakeCommandSerializerContext.Default.Response;
     }
 }
diff --git a/Quick.Protocol/Commands/PrivateCommand/Request.cs b/Quick.Protocol/Commands/PrivateCommand/Request.cs
@@ -1,16 +1,16 @@
-﻿using System;
-using System.Collections.Generic;
+﻿using Quick.Protocol.Model;
 using System.ComponentModel;
-using System.Text;
+using System.Text.Json.Serialization.Metadata;
 
 namespace Quick.Protocol.Commands.PrivateCommand
 {
     /// <summary>
     /// 私有命令请求
     /// </summary>
     [DisplayName("私有命令")]
-    public class Request : IQpCommandRequest<Response>
+    public class Request : AbstractQpModel<Request>, IQpCommandRequest<Response>
     {
+        protected override JsonTypeInfo<Request> TypeInfo => PrivateCommandCommandSerializerContext.Default.Request;
         /// <summary>
         /// 动作
         /// </summary>
diff --git a/Quick.Protocol/Commands/PrivateCommand/Response.cs b/Quick.Protocol/Commands/PrivateCommand/Response.cs
@@ -1,14 +1,17 @@
-﻿using System;
+﻿using Quick.Protocol.Model;
+using System;
 using System.Collections.Generic;
 using System.Text;
+using System.Text.Json.Serialization.Metadata;
 
 namespace Quick.Protocol.Commands.PrivateCommand
 {
     /// <summary>
     /// 私有命令响应
     /// </summary>
-    public class Response
+    public class Response : AbstractQpModel<Response>
     {
+        protected override JsonTypeInfo<Response> TypeInfo => PrivateCommandCommandSerializerContext.Default.Response;
         /// <summary>
         /// 内容
         /// </summary>
diff --git a/Quick.Protocol/Model/AbstractQpModel.cs b/Quick.Protocol/Model/AbstractQpModel.cs
@@ -0,0 +1,30 @@
+﻿using System.Text.Json;
+using System.Text.Json.Serialization.Metadata;
+
+namespace Quick.Protocol.Model
+{
+    public abstract class AbstractQpModel<T> : IQpModel, IQpModel<T>
+    {
+        protected abstract JsonTypeInfo<T> TypeInfo { get; }
+
+        public T Deserialize(string value)
+        {
+            return JsonSerializer.Deserialize<T>(value, TypeInfo);
+        }
+
+        public string Serialize(T obj)
+        {
+            return JsonSerializer.Serialize<T>(obj, TypeInfo);
+        }
+
+        object IQpModel.Deserialize(string value)
+        {
+            return Deserialize(value);
+        }
+
+        string IQpModel.Serialize(object obj)
+        {
+            return Serialize((T)obj);
+        }
+    }
+}
diff --git a/Quick.Protocol/Model/IQpModel.cs b/Quick.Protocol/Model/IQpModel.cs
@@ -0,0 +1,13 @@
+﻿namespace Quick.Protocol.Model;
+
+public interface IQpModel
+{
+    string Serialize(object obj);
+    object Deserialize(string value);
+}
+
+public interface IQpModel<T> : IQpModel
+{
+    string Serialize(T obj);
+    new T Deserialize(string value);
+}
diff --git a/Quick.Protocol/Notices/PrivateNotice.cs b/Quick.Protocol/Notices/PrivateNotice.cs
@@ -1,14 +1,15 @@
-﻿using System;
-using System.Collections.Generic;
+﻿using Quick.Protocol.Model;
 using System.ComponentModel;
-using System.Text;
+using System.Text.Json.Serialization.Metadata;
 
 namespace Quick.Protocol.Notices
 {
     [DisplayName("私有通知")]
     [Description("用于传递私有协议通知。")]
-    public class PrivateNotice
+    public class PrivateNotice : AbstractQpModel<PrivateNotice>
     {
+        protected override JsonTypeInfo<PrivateNotice> TypeInfo => NoticesSerializerContext.Default.PrivateNotice;
+
         /// <summary>
         /// 动作
         /// </summary>

Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,11 @@`
`1`		`-using System;`
`2`		`-using System.Collections.Generic;`
`3`		`-using System.Text;`
	`1`	`+using Quick.Protocol.Model;`
	`2`	`+using System.Text.Json.Serialization.Metadata;`
`4`	`3`
`5`	`4`	`namespace Quick.Protocol.Commands.Authenticate`
`6`	`5`	`{`
`7`		`- public class Response`
	`6`	`+ public class Response : AbstractQpModel<Response>`
`8`	`7`	`{`
	`8`	`+ protected override JsonTypeInfo<Response> TypeInfo => AuthenticateCommandSerializerContext.Default.Response;`
	`9`	`+`
`9`	`10`	`}`
`10`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,15 @@`
`1`		`-using System.ComponentModel;`
	`1`	`+using Quick.Protocol.Model;`
	`2`	`+using System.ComponentModel;`
	`3`	`+using System.Text.Json.Serialization.Metadata;`
`2`	`4`
`3`	`5`	`namespace Quick.Protocol.Commands.GetQpInstructions`
`4`	`6`	`{`
`5`	`7`	`/// <summary>`
`6`	`8`	`/// 获取全部指令集信息请求`
`7`	`9`	`/// </summary>`
`8`	`10`	`[DisplayName("获取全部指令集信息")]`
`9`		`- public class Request : IQpCommandRequest<Response>`
	`11`	`+ public class Request : AbstractQpModel<Request>, IQpCommandRequest<Response>`
`10`	`12`	`{`
	`13`	`+ protected override JsonTypeInfo<Request> TypeInfo => GetQpInstructionsCommandSerializerContext.Default.Request;`
`11`	`14`	`}`
`12`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,10 @@`
`1`		`-using System;`
`2`		`-using System.Collections.Generic;`
`3`		`-using System.Text;`
	`1`	`+using Quick.Protocol.Model;`
	`2`	`+using System.Text.Json.Serialization.Metadata;`
`4`	`3`
`5`	`4`	`namespace Quick.Protocol.Commands.HandShake`
`6`	`5`	`{`
`7`		`- public class Response`
	`6`	`+ public class Response : AbstractQpModel<Response>`
`8`	`7`	`{`
	`8`	`+ protected override JsonTypeInfo<Response> TypeInfo => HandShakeCommandSerializerContext.Default.Response;`
`9`	`9`	`}`
`10`	`10`	`}`