tij

PPTXMLParser/ColorConverter.cs

@@ -270,7 +270,7 @@ namespace ConsoleApplication
             double G = (double)g / 255;
             double B = (double)b / 255;
             double max = 0, min = 0;
-            double H = 0, S = 0, L = 0;
+            double H = 0;//, S, L;
             bool rBool = false, gBool = false, bBool = false;
 
             //find max

PPTXMLParser/PPTXMLParser.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

TEAMModelOS.Model/Core/Dtos/CodeValue.cs

@@ -1,11 +1,9 @@
-using MessagePack;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Text;
 
 namespace TEAMModelOS.Model.Core.Dtos
 {
-    [MessagePackObject(keyAsPropertyName: true)]
     public class CodeValue
     {
         public string Code { get; set; }

TEAMModelOS.Model/Core/Dtos/TeamModelIdInfo.cs

@@ -1,5 +1,4 @@
-using MessagePack;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Text;
 
@@ -8,7 +7,6 @@ namespace TEAMModelOS.Model.Core.Dtos
     /// <summary>
     /// 对接醍摩豆ID封装信息
     /// </summary>
-    [MessagePackObject(keyAsPropertyName: true)]
     public class TeamModelIdInfo
     {
         public string name { get; set; }

TEAMModelOS.Model/Core/Models/Region.cs

@@ -1,5 +1,4 @@
-using MessagePack;
-using Microsoft.WindowsAzure.Storage.Table;
+using Microsoft.WindowsAzure.Storage.Table;
 using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
@@ -9,7 +8,6 @@ using TEAMModelOS.SDK.Context.Attributes.Azure;
 namespace TEAMModelOS.Model.Core.Models
 {
     [TableSpace(Name = "Core")]
-    [MessagePackObject(keyAsPropertyName: true)]
     public class Region :TableEntity
     {
         public int SysAddID { get; set; }

TEAMModelOS.Model/Core/Models/RoleIdentityClaimValue.cs

@@ -1,5 +1,4 @@
-using MessagePack;
-using Microsoft.WindowsAzure.Storage.Table;
+using Microsoft.WindowsAzure.Storage.Table;
 using System;
 using System.Collections.Generic;
 using System.Text;
@@ -8,7 +7,6 @@ using TEAMModelOS.SDK.Context.Attributes.Azure;
 namespace TEAMModelOS.Model.Core.Models
 {
     [TableSpace(Name = "Core")]
-    [MessagePackObject(keyAsPropertyName: true)]
     public class RoleIdentityClaimValue :TableEntity
     {
         public string TeamModelId { get; set; }

TEAMModelOS.Model/Core/Models/RoleUser.cs

@@ -1,5 +1,4 @@
-using MessagePack;
-using Microsoft.WindowsAzure.Storage.Table;
+using Microsoft.WindowsAzure.Storage.Table;
 using System;
 using System.Collections.Generic;
 using System.Text;
@@ -9,7 +8,6 @@ namespace TEAMModelOS.Model.Core.Models
 {
 
     [TableSpace(Name = "Core")]
-    [MessagePackObject(keyAsPropertyName: true)]
     public class RoleUser : TableEntity
     {
         public string Phone { get; set; }

TEAMModelOS.Model/Core/Models/School.cs

@@ -1,5 +1,4 @@
-using MessagePack;
-using Microsoft.WindowsAzure.Storage.Table;
+using Microsoft.WindowsAzure.Storage.Table;
 using System;
 using System.Collections.Generic;
 using System.Text;
@@ -8,7 +7,6 @@ using TEAMModelOS.SDK.Context.Attributes.Azure;
 namespace TEAMModelOS.Model.Core.Models
 {
     [TableSpace(Name = "Core")]
-    [MessagePackObject(keyAsPropertyName: true)]
     public class School :TableEntity
     {
         public string code { get; set; }

TEAMModelOS.Model/Core/Models/SchoolArea.cs

@@ -1,4 +1,4 @@
-using MessagePack;
+
 using Microsoft.WindowsAzure.Storage.Table;
 using System;
 using System.Collections.Generic;
@@ -8,7 +8,7 @@ using TEAMModelOS.SDK.Context.Attributes.Azure;
 namespace TEAMModelOS.Model.Core.Models
 {
     [TableSpace(Name = "Core")]
-    [MessagePackObject(keyAsPropertyName: true)]
+    
     public class SchoolArea :TableEntity
     {
         /// <summary>

TEAMModelOS.Model/Core/Models/SchoolAreaMember.cs

@@ -1,4 +1,4 @@
-using MessagePack;
+
 using Microsoft.WindowsAzure.Storage.Table;
 using System;
 using System.Collections.Generic;
@@ -11,7 +11,7 @@ namespace TEAMModelOS.Model.Core.Models
     /// 智慧学区成员学校
     /// </summary>
     [TableSpace(Name = "Core")]
-    [MessagePackObject(keyAsPropertyName: true)]
+    
     public  class SchoolAreaMember: TableEntity
     {
         /// <summary>

TEAMModelOS.Model/Core/Models/SchoolCampus.cs

@@ -1,4 +1,4 @@
-using MessagePack;
+
 using Microsoft.WindowsAzure.Storage.Table;
 using System;
 using System.Collections.Generic;
@@ -8,7 +8,7 @@ using TEAMModelOS.SDK.Context.Attributes.Azure;
 namespace TEAMModelOS.Model.Core.Models
 {
     [TableSpace(Name = "Core")]
-    [MessagePackObject(keyAsPropertyName: true)]
+    
     public class SchoolCampus : TableEntity
     {
         public string Name { get; set; }

TEAMModelOS.Model/Core/Models/SchoolClass.cs

@@ -1,4 +1,4 @@
-using MessagePack;
+
 using Microsoft.WindowsAzure.Storage.Table;
 using System;
 using System.Collections.Generic;
@@ -8,7 +8,7 @@ using TEAMModelOS.SDK.Context.Attributes.Azure;
 namespace TEAMModelOS.Model.Core.Models
 {
     [TableSpace(Name = "Core")]
-    [MessagePackObject(keyAsPropertyName: true)]
+    
     public class SchoolClass : TableEntity
     {
         /// <summary>

TEAMModelOS.Model/Core/Models/SchoolGrade.cs

@@ -1,4 +1,4 @@
-using MessagePack;
+
 using Microsoft.WindowsAzure.Storage.Table;
 using System;
 using System.Collections.Generic;
@@ -8,7 +8,7 @@ using TEAMModelOS.SDK.Context.Attributes.Azure;
 namespace TEAMModelOS.Model.Core.Models
 {
     [TableSpace(Name = "Core")]
-    [MessagePackObject(keyAsPropertyName: true)]
+    
     public class SchoolGrade:TableEntity
     {
         public string Name { get; set; }

TEAMModelOS.Model/Core/Models/SchoolGradeSubject.cs

@@ -1,4 +1,4 @@
-using MessagePack;
+
 using Microsoft.WindowsAzure.Storage.Table;
 using System;
 using System.Collections.Generic;
@@ -11,7 +11,7 @@ namespace TEAMModelOS.Model.Core.Models
     /// 暂不使用
     /// </summary>
     [TableSpace(Name = "Core")]
-    [MessagePackObject(keyAsPropertyName: true)]
+    
     public class SchoolGradeSubject :TableEntity
     {
         public string Name { get; set; }

TEAMModelOS.Model/Core/Models/SchoolGradeTerm.cs

@@ -1,4 +1,4 @@
-using MessagePack;
+
 using Microsoft.WindowsAzure.Storage.Table;
 using System;
 using System.Collections.Generic;
@@ -11,7 +11,7 @@ namespace TEAMModelOS.Model.Core.Models
     /// 暂不使用
     /// </summary>
     [TableSpace(Name = "Core")]
-    [MessagePackObject(keyAsPropertyName: true)]
+    
     public  class SchoolGradeTerm :TableEntity
     {
         public string Name { get; set; }

TEAMModelOS.Model/Core/Models/SchoolPeriod.cs

@@ -1,4 +1,4 @@
-using MessagePack;
+
 using Microsoft.WindowsAzure.Storage.Table;
 using System;
 using System.Collections.Generic;
@@ -8,7 +8,7 @@ using TEAMModelOS.SDK.Context.Attributes.Azure;
 namespace TEAMModelOS.Model.Core.Models
 {
     [TableSpace(Name = "Core")]
-    [MessagePackObject(keyAsPropertyName: true)]
+    
     public class SchoolPeriod : TableEntity
     {
         public string Name { get; set; }

TEAMModelOS.Model/Core/Models/SchoolSession.cs

@@ -1,4 +1,4 @@
-using MessagePack;
+
 using Microsoft.WindowsAzure.Storage.Table;
 using System;
 using System.Collections.Generic;
@@ -8,7 +8,7 @@ using TEAMModelOS.SDK.Context.Attributes.Azure;
 namespace TEAMModelOS.Model.Core.Models
 {
     [TableSpace(Name = "Core")]
-    [MessagePackObject(keyAsPropertyName: true)]
+    
     public class SchoolSession : TableEntity
     {
         public string Name { get; set; }

TEAMModelOS.Model/Core/Models/SchoolSubject.cs

@@ -1,4 +1,4 @@
-using MessagePack;
+
 using Microsoft.WindowsAzure.Storage.Table;
 using System;
 using System.Collections.Generic;
@@ -9,7 +9,7 @@ using TEAMModelOS.SDK.Context.Attributes.Azure;
 namespace TEAMModelOS.Model.Core.Models
 {
     [TableSpace(Name = "Core")]
-    [MessagePackObject(keyAsPropertyName: true)]
+    
     public class SchoolSubject :TableEntity
     {
         /// <summary>

TEAMModelOS.Model/Core/Models/SchoolTerm.cs

@@ -1,4 +1,4 @@
-using MessagePack;
+
 using Microsoft.WindowsAzure.Storage.Table;
 using System;
 using System.Collections.Generic;
@@ -8,7 +8,7 @@ using TEAMModelOS.SDK.Context.Attributes.Azure;
 namespace TEAMModelOS.Model.Core.Models
 {
     [TableSpace(Name = "Core")]
-    [MessagePackObject(keyAsPropertyName: true)]
+    
     public class SchoolTerm :TableEntity
     {
         /// <summary>

TEAMModelOS.Model/Evaluation/Dtos/Own/DocInfoDto.cs

@@ -1,4 +1,4 @@
-using MessagePack;
+
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
@@ -6,7 +6,7 @@ using System.Text;
 
 namespace TEAMModelOS.Model.Evaluation.Dtos.Own
 {
-    [MessagePackObject(keyAsPropertyName: true)]
+    
     public class DocInfoDto
     {
         [Required(ErrorMessage = "{0} 必须填写")]

TEAMModelOS.Model/Evaluation/Dtos/Own/ExerciseDto.cs

@@ -1,12 +1,13 @@
-using MessagePack;
+
 using System;
 using System.Collections.Generic;
 using System.Text;
+using System.Text.Json.Serialization;
 using TEAMModelOS.Model.Core.Dtos;
 
 namespace TEAMModelOS.Model.Evaluation.Dtos.Own
 {
-    [MessagePackObject(keyAsPropertyName: true)]
+    
     public class ExerciseDto
     {
         public ExerciseDto()
@@ -22,7 +23,7 @@ namespace TEAMModelOS.Model.Evaluation.Dtos.Own
         public string Explain { get; set; }
         public string Type { get; set; }
         public string PShaCode { get; set; }
-        [IgnoreMember]
+        [JsonIgnore]
         public List<ExerciseDto> Children { get; set; }
     }
 }

TEAMModelOS.Model/Evaluation/Dtos/Own/ItemBankDto.cs

@@ -1,12 +1,13 @@
-using MessagePack;
+
 using System;
 using System.Collections.Generic;
 using System.Text;
+using System.Text.Json.Serialization;
 using TEAMModelOS.Model.Core.Dtos;
 
 namespace TEAMModelOS.Model.Evaluation.Dtos.Own
 {
-    [MessagePackObject(keyAsPropertyName: true)]
+    
     public class ItemBankDto
     {
         public ItemBankDto()
@@ -31,7 +32,7 @@ namespace TEAMModelOS.Model.Evaluation.Dtos.Own
         public string SubjectCode { get; set; }
         public string PShaCode { get; set; }
         public int ResourceType { get; set; }
-        [IgnoreMember]
+        [JsonIgnore]
         public List<ItemBankDto> Children { get; set; }
     }
 }

TEAMModelOS.Model/Evaluation/Dtos/Own/UseItemBankDto.cs

@@ -1,4 +1,4 @@
-using MessagePack;
+
 using System;
 using System.Collections.Generic;
 using System.Text;
@@ -6,7 +6,7 @@ using TEAMModelOS.Model.Core.Dtos;
 
 namespace TEAMModelOS.Model.Evaluation.Dtos.Own
 {
-    [MessagePackObject(keyAsPropertyName: true)]
+    
     public class UseItemBankDto
     {
         public UseItemBankDto()

TEAMModelOS.Model/Evaluation/Dtos/Third/ExerciseInfo.cs

@@ -1,52 +1,51 @@
-using MessagePack;
+
 using System;
 using System.Collections.Generic;
 using System.Text;
-
+using System.Text.Json.Serialization;
 namespace TEAMModelOS.Model.EvaluaTion.Dtos
 {
-    [MessagePackObject]
     public class ExerciseInfo
     {
-        [Key("ExNO")]
+        [JsonPropertyName("ExNO")]
         public string ExNO { get; set; }
-        [Key("ExName")]
+        [JsonPropertyName("ExName")]
         public string Ex_name { get; set; }
-        [Key("ExTime")]
+        [JsonPropertyName("ExTime")]
         public string Ex_time { get; set; }
-        [Key("EndTime")]
+        [JsonPropertyName("EndTime")]
         public string End_time { get; set; }
-        [Key("ExType")]
+        [JsonPropertyName("ExType")]
         public string Ex_type { get; set; }
-        [Key("ExMode")]
+        [JsonPropertyName("ExMode")]
         public string Ex_mode { get; set; }
-        [Key("CourseNO")]
+        [JsonPropertyName("CourseNO")]
         public string Course_no { get; set; }
-        [Key("CourseCode")]
+        [JsonPropertyName("CourseCode")]
         public string Class_code { get; set; }
-        [Key("CourseName")]
+        [JsonPropertyName("CourseName")]
         public string Class_name { get; set; }
-        [Key("ClassID")]
+        [JsonPropertyName("ClassID")]
         public string Class_no { get; set; }
-        [Key("ReportSubject")]
+        [JsonPropertyName("ReportSubject")]
         public string Course_name { get; set; }
-        [Key("SERIALNUMBER")]
+        [JsonPropertyName("SERIALNUMBER")]
         public string Serialnumber { get; set; }
-        [Key("StuCount")]
+        [JsonPropertyName("StuCount")]
         public string Stucount { get; set; }
-        [Key("AvgScore")]
+        [JsonPropertyName("AvgScore")]
         public string AvgScore { get; set; }
-        [Key("QNumber")]
+        [JsonPropertyName("QNumber")]
         public string QNumber { get; set; }
-        [IgnoreMember]
+        [JsonIgnore]
         public string Cover { get; set; } = "1";
-        [Key("SchoolName")]
+        [JsonPropertyName("SchoolName")]
         public string SchoolName { get; set; }
-        [Key("GradeName")]
+        [JsonPropertyName("GradeName")]
         public string GradeName {get;set;}
-        [Key("AcademicYear")]
+        [JsonPropertyName("AcademicYear")]
         public string AcademicYear { get; set; }
-        [Key("SOrder")]
+        [JsonPropertyName("SOrder")]
         public string SOrder { get; set; }
     }
 }

TEAMModelOS.Model/Evaluation/Dtos/Third/Item.cs

@@ -1,40 +1,41 @@
-using MessagePack;
+
 using System;
 using System.Collections.Generic;
 using System.Text;
+using System.Text.Json.Serialization;
 
 namespace TEAMModelOS.Model.EvaluaTion.Dtos
 {
-    [MessagePackObject]
+    
     public class Item
     {
-        [Key("ItemIndex")]
+        [JsonPropertyName("ItemIndex")]
         public string Itemindex { get; set; }
-        [Key("Type")]
+       [JsonPropertyName("Type")]
         public string Type { get; set; }
-        [IgnoreMember]
+        [JsonIgnore]
         public string Objective { get; set; }
-        [Key("Point")]
+       [JsonPropertyName("Point")]
         public string Point { get; set; }
-        [Key("Answer")]
+       [JsonPropertyName("Answer")]
         public string Answer { get; set; }
-        [Key("SpendTime")]
+       [JsonPropertyName("SpendTime")]
         public string Spend_time { get; set; }
-        [Key("EDU_GOAL")]
+       [JsonPropertyName("EDU_GOAL")]
         public string Edu_goal { get; set; }
-        [Key("IDX")]
+       [JsonPropertyName("IDX")]
         public string Idx { get; set; }
-        [Key("CONCEPTSUBJECT")]
+       [JsonPropertyName("CONCEPTSUBJECT")]
         public string Concept_subject { get; set; }
-        [Key("CONCEPTAREA")]
+       [JsonPropertyName("CONCEPTAREA")]
         public string Concept_area { get; set; }
-        [Key("CONCEPT")]
+       [JsonPropertyName("CONCEPT")]
         public string Concept { get; set; }
-        [Key("URL")]
+       [JsonPropertyName("URL")]
         public string Url { get; set; }
-        [Key("Question")]
+       [JsonPropertyName("Question")]
         public string Question { get; set; }
-        [IgnoreMember]
+        [JsonIgnore]
         public List<string> Option { get; set; }
     }
 }

TEAMModelOS.Model/Evaluation/Dtos/Third/MemberAnswer.cs

@@ -1,32 +1,32 @@
-using MessagePack;
+
 using System;
 using System.Collections.Generic;
 using System.Text;
+using System.Text.Json.Serialization;
 
 namespace TEAMModelOS.Model.EvaluaTion.Dtos
 {
-    [MessagePackObject]
     public class MemberAnswer
     {
-        [Key("MemberID")]
+        [JsonPropertyName("MemberID")]
         public string StudentId { get; set; }
-        [Key("ExNO")]
+        [JsonPropertyName("ExNO")]
         public string ExNO { get; set; }
-        [Key("ItemIndex")]
+        [JsonPropertyName("ItemIndex")]
         public string Itemindex { get; set; }
-        [Key("Selection")]
+        [JsonPropertyName("Selection")]
         public string Selection { get; set; }
-        [Key("SpendTime")]
+        [JsonPropertyName("SpendTime")]
         public string Spend_time { get; set; }
-        [Key("stu_point")]
+        [JsonPropertyName("stu_point")]
         public string Point { get; set; }
-        [Key("MiniNotePngFile")]
+        [JsonPropertyName("MiniNotePngFile")]
         public string Mininote_image { get; set; }
-        [Key("MiniNoteXmlFile")]
+        [JsonPropertyName("MiniNoteXmlFile")]
         public string Mininote_xml { get; set; }
-        [Key("MiniNoteTextAnswer")]
+        [JsonPropertyName("MiniNoteTextAnswer")]
         public string Mininote_text { get; set; }
-        [Key("MiniNoteNoteLink")]
+        [JsonPropertyName("MiniNoteNoteLink")]
         public string Mininote_link { get; set; }
     }
 }

TEAMModelOS.Model/Evaluation/Models/AnswerInfo.cs

@@ -1,4 +1,4 @@
-using MessagePack;
+
 using Microsoft.WindowsAzure.Storage.Table;
 using System;
 using System.Collections.Generic;
@@ -8,7 +8,7 @@ using TEAMModelOS.SDK.Context.Attributes.Azure;
 namespace TEAMModelOS.Model.EvaluaTion.Models
 {
     [TableSpace(Name = "Evaluation")]
-    [MessagePackObject(keyAsPropertyName: true)]
+    
     public class AnswerInfo : TableEntity
     {
         /// <summary>

TEAMModelOS.Model/Evaluation/Models/Evaluating.cs

@@ -1,4 +1,4 @@
-using MessagePack;
+
 using Microsoft.WindowsAzure.Storage.Table;
 using System;
 using System.Collections.Generic;
@@ -8,7 +8,7 @@ using TEAMModelOS.SDK.Context.Attributes.Azure;
 namespace TEAMModelOS.Model.Evaluation.Models
 {
     [TableSpace(Name = "Evaluation")]
-    [MessagePackObject(keyAsPropertyName: true)]
+    
     public class Evaluating: TableEntity
     {
         /// <summary>

TEAMModelOS.Model/Evaluation/Models/ExamInfo.cs

@@ -1,4 +1,4 @@
-using MessagePack;
+
 using Microsoft.WindowsAzure.Storage.Table;
 using System;
 using System.Collections.Generic;
@@ -8,7 +8,7 @@ using TEAMModelOS.SDK.Context.Attributes.Azure;
 namespace TEAMModelOS.Model.EvaluaTion.Models
 {
     [TableSpace(Name = "Evaluation")]
-    [MessagePackObject(keyAsPropertyName: true)]
+    
     public class ExamInfo : TableEntity
     {
 

TEAMModelOS.Model/Evaluation/Models/Exscore.cs

@@ -1,4 +1,4 @@
-using MessagePack;
+
 using Microsoft.WindowsAzure.Storage.Table;
 using System;
 using System.Collections.Generic;
@@ -8,7 +8,7 @@ using TEAMModelOS.SDK.Context.Attributes.Azure;
 namespace TEAMModelOS.Model.Evaluation.Models
 {
     [TableSpace(Name = "Evaluation")]
-    [MessagePackObject(keyAsPropertyName: true)]
+    
     public class Exscore : TableEntity
     {
         public string StuId { get; set; }

TEAMModelOS.Model/Evaluation/Models/ItemBank.cs

@@ -1,4 +1,4 @@
-using MessagePack;
+
 using Microsoft.WindowsAzure.Storage.Table;
 using System;
 using System.Collections.Generic;
@@ -8,7 +8,7 @@ using TEAMModelOS.SDK.Context.Attributes.Azure;
 namespace TEAMModelOS.Model.EvaluaTion.Models
 {
     [TableSpace(Name = "Evaluation")]
-    [MessagePackObject(keyAsPropertyName: true)]
+    
     public class ItemBank : TableEntity
     {
         public string Id { get; set; }

TEAMModelOS.Model/Evaluation/Models/Option.cs

@@ -1,4 +1,4 @@
-using MessagePack;
+
 using Microsoft.WindowsAzure.Storage.Table;
 using System;
 using System.Collections.Generic;
@@ -9,7 +9,7 @@ namespace TEAMModelOS.Model.EvaluaTion.Models
 {
 
     [TableSpace(Name = "Evaluation")]
-    [MessagePackObject(keyAsPropertyName: true)]
+    
     /// <summary>
     /// 选项信息
     /// </summary>

TEAMModelOS.Model/Evaluation/Models/Paper.cs

@@ -1,4 +1,4 @@
-using MessagePack;
+
 using Microsoft.WindowsAzure.Storage.Table;
 using System;
 using System.Collections.Generic;
@@ -8,7 +8,7 @@ using TEAMModelOS.SDK.Context.Attributes.Azure;
 namespace TEAMModelOS.Model.EvaluaTion.Models
 {
     [TableSpace(Name = "Evaluation")]
-    [MessagePackObject(keyAsPropertyName: true)]
+    
     public class Paper: TableEntity
     {
         public string Id { get; set; }

TEAMModelOS.Model/Evaluation/Models/UseItemBank.cs

@@ -1,4 +1,4 @@
-using MessagePack;
+
 using Microsoft.WindowsAzure.Storage.Table;
 using System;
 using System.Collections.Generic;
@@ -8,7 +8,7 @@ using TEAMModelOS.SDK.Context.Attributes.Azure;
 namespace TEAMModelOS.Model.EvaluaTion.Models
 {
     [TableSpace(Name = "Evaluation")]
-    [MessagePackObject(keyAsPropertyName: true)]
+    
     public class UseItemBank : TableEntity
     {
         public string Id { get; set; }

TEAMModelOS.Model/Syllabus/Dtos/BlockPointDto.cs

@@ -1,11 +1,12 @@
-using MessagePack;
+
 using System;
 using System.Collections.Generic;
 using System.Text;
+using System.Text.Json.Serialization;
 
 namespace TEAMModelOS.Model.Syllabus.Dtos
 {
-    [MessagePackObject(keyAsPropertyName: true)]
+    
     public class BlockPointDto
     { 
         public string PartitionKey { get; set; }
@@ -42,7 +43,7 @@ namespace TEAMModelOS.Model.Syllabus.Dtos
         //public DateTimeOffset Timestamp { get; set; }
         //[IgnoreMember]
         // public List<PointDto> Points { get; set; }
-        [IgnoreMember]
+        [JsonIgnore]
         public List<BlockPointDto> Children { get; set; }
 
         public BlockPointDto()

TEAMModelOS.Model/Syllabus/Dtos/KnowledgeDto.cs

@@ -1,11 +1,11 @@
-using MessagePack;
+
 using System;
 using System.Collections.Generic;
 using System.Text;
 
 namespace TEAMModelOS.Model.Syllabus.Dtos
 {
-    [MessagePackObject(keyAsPropertyName: true)]
+    
     public class KnowledgeDto
     {
         public KnowledgeDto() {

TEAMModelOS.Model/Syllabus/Dtos/PointDto.cs

@@ -1,11 +1,11 @@
-using MessagePack;
+
 using System;
 using System.Collections.Generic;
 using System.Text;
 
 namespace TEAMModelOS.Model.Syllabus.Dtos
 {
-    [MessagePackObject(keyAsPropertyName: true)]
+    
     public class PointDto
     {   
         public string PartitionKey { get; set; }

TEAMModelOS.Model/Syllabus/Dtos/SchoolKnowledgeDto.cs

@@ -1,11 +1,12 @@
-using MessagePack;
+
 using System;
 using System.Collections.Generic;
 using System.Text;
+using System.Text.Json.Serialization;
 
 namespace TEAMModelOS.Model.Syllabus.Dtos
 {
-    [MessagePackObject(keyAsPropertyName: true)]
+    
     public class SchoolKnowledgeDto
     {
         public string PartitionKey { get; set; }
@@ -37,7 +38,7 @@ namespace TEAMModelOS.Model.Syllabus.Dtos
         /// </summary>
         public bool Expand { get; set; } = true;
         public int Order { get; set; }
-        [IgnoreMember]
+        [JsonIgnore]
         public List<SchoolKnowledgeDto> Children { get; set; }
 
         public SchoolKnowledgeDto()

TEAMModelOS.Model/Syllabus/Dtos/SyllabusTree.cs

@@ -1,13 +1,14 @@
-using MessagePack;
+
 using Microsoft.WindowsAzure.Storage.Table;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Text;
+using System.Text.Json.Serialization;
 
 namespace TEAMModelOS.Model.Syllabus.Dtos
 {
-    [MessagePackObject(keyAsPropertyName: true)]
+    
     public class SyllabusTree
     {
         /// <summary>
@@ -61,7 +62,7 @@ namespace TEAMModelOS.Model.Syllabus.Dtos
         {
            Children = new List<SyllabusTree>();
         }
-        [IgnoreMember]
+        [JsonIgnore]
         public  List<SyllabusTree> Children { get; set; }
         /// <summary>
         /// 册别编码

TEAMModelOS.Model/Syllabus/Models/KnowledgeBlock.cs

@@ -1,4 +1,4 @@
-using MessagePack;
+
 using Microsoft.WindowsAzure.Storage.Table;
 using System;
 using System.Collections.Generic;
@@ -9,7 +9,7 @@ using TEAMModelOS.SDK.Context.Attributes.Azure;
 namespace TEAMModelOS.Model.Syllabus.Models
 {
     [TableSpace(Name = "Syllabus")]
-    [MessagePackObject(keyAsPropertyName: true)]
+    
     public class KnowledgeBlock : TableEntity
     {
         /// <summary>

TEAMModelOS.Model/Syllabus/Models/KnowledgeBlockPoint.cs

@@ -1,4 +1,4 @@
-using MessagePack;
+
 using Microsoft.WindowsAzure.Storage.Table;
 using System;
 using System.Collections.Generic;
@@ -9,7 +9,7 @@ using TEAMModelOS.SDK.Context.Attributes.Azure;
 namespace TEAMModelOS.Model.Syllabus.Models
 {
     [TableSpace(Name = "Syllabus")]
-    [MessagePackObject(keyAsPropertyName: true)]
+    
     public class KnowledgeBlockPoint : TableEntity
     {
         //public string Id { get; set; }

TEAMModelOS.Model/Syllabus/Models/KnowledgePoint.cs

@@ -1,4 +1,4 @@
-using MessagePack;
+
 using Microsoft.WindowsAzure.Storage.Table;
 using System;
 using System.Collections.Generic;
@@ -12,7 +12,7 @@ namespace TEAMModelOS.Model.Syllabus.Models
     /// 知识点
     /// </summary>
     [TableSpace(Name = "Syllabus")]
-    [MessagePackObject(keyAsPropertyName: true)]
+    
     public class KnowledgePoint : TableEntity
     {
         // public string Id { get; set; }

TEAMModelOS.Model/Syllabus/Models/SchoolBlock.cs

@@ -1,4 +1,4 @@
-using MessagePack;
+
 using Microsoft.WindowsAzure.Storage.Table;
 using System;
 using System.Collections.Generic;
@@ -9,7 +9,7 @@ using TEAMModelOS.SDK.Context.Attributes.Azure;
 namespace TEAMModelOS.Model.Syllabus.Models
 {
     [TableSpace(Name = "Syllabus")]
-    [MessagePackObject(keyAsPropertyName: true)]
+    
     public class SchoolBlock :TableEntity
     {  
         /// <summary>

TEAMModelOS.Model/Syllabus/Models/SchoolBlockPoint.cs

@@ -1,4 +1,4 @@
-using MessagePack;
+
 using Microsoft.WindowsAzure.Storage.Table;
 using System;
 using System.Collections.Generic;
@@ -9,7 +9,7 @@ using TEAMModelOS.SDK.Context.Attributes.Azure;
 namespace TEAMModelOS.Model.Syllabus.Models
 {
     [TableSpace(Name = "Syllabus")]
-    [MessagePackObject(keyAsPropertyName: true)]
+    
     public class SchoolBlockPoint : TableEntity
     {
         [Required(ErrorMessage = "{0} 必须填写")]

TEAMModelOS.Model/Syllabus/Models/SchoolPoint.cs

@@ -1,4 +1,4 @@
-using MessagePack;
+
 using Microsoft.WindowsAzure.Storage.Table;
 using System;
 using System.Collections.Generic;
@@ -9,7 +9,7 @@ using TEAMModelOS.SDK.Context.Attributes.Azure;
 namespace TEAMModelOS.Model.Syllabus.Models
 {
     [TableSpace(Name = "Syllabus")]
-    [MessagePackObject(keyAsPropertyName: true)]
+    
     public class SchoolPoint : TableEntity
     {
         /// <summary>

TEAMModelOS.Model/Syllabus/Models/SchoolVolume.cs

@@ -1,4 +1,4 @@
-using MessagePack;
+
 using Microsoft.WindowsAzure.Storage.Table;
 using System;
 using System.Collections.Generic;
@@ -9,7 +9,7 @@ using TEAMModelOS.SDK.Context.Attributes.Azure;
 namespace TEAMModelOS.Model.Syllabus.Models
 {
     [TableSpace(Name = "Syllabus")]
-    [MessagePackObject(keyAsPropertyName: true)]
+    
     public class SchoolVolume : TableEntity
     {
         /// <summary>

TEAMModelOS.Model/Syllabus/Models/SyllabusNode.cs

@@ -1,4 +1,4 @@
-using MessagePack;
+
 using Microsoft.WindowsAzure.Storage.Table;
 using System;
 using System.Collections.Generic;
@@ -10,7 +10,7 @@ namespace TEAMModelOS.Model.Syllabus.Models
     /// <summary>
     /// 课纲结构
     /// </summary>
-    [MessagePackObject(keyAsPropertyName: true)]
+    
     public class SyllabusNode : TableEntity
     {
         /// <summary>

TEAMModelOS.Model/Syllabus/Models/TagBlock.cs

@@ -1,4 +1,4 @@
-using MessagePack;
+
 using Microsoft.WindowsAzure.Storage.Table;
 using System;
 using System.Collections.Generic;
@@ -10,7 +10,7 @@ namespace TEAMModelOS.Model.Syllabus.Models
 {
 
     [TableSpace(Name = "Syllabus")]
-    [MessagePackObject(keyAsPropertyName: true)]
+    
     public class TagBlock : TableEntity
     {
         /// <summary>

TEAMModelOS.Model/Syllabus/Models/TagBlockPoint.cs

@@ -1,4 +1,4 @@
-using MessagePack;
+
 using Microsoft.WindowsAzure.Storage.Table;
 using System;
 using System.Collections.Generic;
@@ -10,7 +10,7 @@ namespace TEAMModelOS.Model.Syllabus.Models
 {
 
     [TableSpace(Name = "Syllabus")]
-    [MessagePackObject(keyAsPropertyName: true)]
+    
     public class TagBlockPoint : TableEntity
     {
         /// <summary>

TEAMModelOS.Model/Syllabus/Models/Volume.cs

@@ -1,4 +1,4 @@
-using MessagePack;
+
 using Microsoft.WindowsAzure.Storage.Table;
 using System;
 using System.Collections.Generic;
@@ -9,7 +9,7 @@ using TEAMModelOS.SDK.Context.Attributes.Azure;
 namespace TEAMModelOS.Model.Syllabus.Models
 {
     [TableSpace(Name = "Syllabus")]
-    [MessagePackObject(keyAsPropertyName: true)]
+    
     public class Volume : TableEntity
     {
         /// <summary>

TEAMModelOS.Model/Syllabus/Models/VolumeEditor.cs

@@ -1,4 +1,4 @@
-using MessagePack;
+
 using Microsoft.WindowsAzure.Storage.Table;
 using System;
 using System.Collections.Generic;
@@ -11,7 +11,7 @@ namespace TEAMModelOS.Model.Syllabus.Models
     /// 
     /// </summary>
     [TableSpace(Name = "Syllabus")]
-    [MessagePackObject(keyAsPropertyName: true)]
+    
     public class VolumeEditor : TableEntity
     {
         public string VolumeCode { get; set; }

TEAMModelOS.Model/TEAMModelOS.Model.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

TEAMModelOS.SDK/Context/Filters/HttpGlobalExceptionFilter.cs

@@ -20,8 +20,8 @@ namespace TEAMModelOS.SDK.Context.Filters
     public class HttpGlobalExceptionFilter : IExceptionFilter
     {
         readonly ILoggerFactory _loggerFactory;
-        readonly IHostingEnvironment _env;
-        public HttpGlobalExceptionFilter(ILoggerFactory loggerFactory, IHostingEnvironment env)
+        readonly IWebHostEnvironment _env;
+        public HttpGlobalExceptionFilter(ILoggerFactory loggerFactory, IWebHostEnvironment env)
         {
             _loggerFactory = loggerFactory;
             _env = env;
@@ -73,7 +73,7 @@ namespace TEAMModelOS.SDK.Context.Filters
         {
             var data = new ErrorResponse<string>(statusCode, msg, devmsg);
             context.Response.ContentType = "application/json;charset=utf-8";
-            await context.Response.WriteAsync(MessagePackHelper.ObjectToJson(data));
+            await context.Response.WriteAsync(data.ToJson());
         }
     }
     public class ApplicationErrorResult : ObjectResult

TEAMModelOS.SDK/Context/Filters/HttpGlobalExceptionInvoke.cs

@@ -1,5 +1,4 @@
-using MessagePack;
-using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http;
 using System;
 using System.Threading.Tasks;
 using TEAMModelOS.SDK.Context.Constant.Common;
@@ -54,28 +53,16 @@ namespace TEAMModelOS.SDK.Context.Filter
             {
                 if (!isCatched && context.Response.StatusCode != 200)//未捕捉过并且状态码不为200
                 {
-                    string msg = "";
-                    switch (context.Response.StatusCode)
+                    string msg;
+                    msg = context.Response.StatusCode switch
                     {
-                        case 401:
-                            msg = "Unauthorized";
-                            break;
-                        case 404:
-                            msg = "Service Not Found";
-                            break;
-                        case 502:
-                            msg = "Request Erro";
-                            break;
-                        case 500:
-                            msg = exs.Message;
-                            break;
-                        case 403:
-                            msg = exs.Message;
-                            break;
-                        default:
-                            msg = "Unknown Error";
-                            break;
-                    }
+                        401 => "Unauthorized",
+                        404 => "Service Not Found",
+                        502 => "Request Erro",
+                        500 => exs.Message,
+                        403 => exs.Message,
+                        _ => "Unknown Error",
+                    };
                     await HandleExceptionAsync(context, context.Response.StatusCode, msg, exs == null ? "" : exs.StackTrace);
                 }
             }
@@ -93,13 +80,12 @@ namespace TEAMModelOS.SDK.Context.Filter
         {
             var data = new ErrorResponse<string>(statusCode, msg, devmsg);
             context.Response.ContentType = Constants.CONTENT_TYPE_JSON;
-            await context.Response.WriteAsync(MessagePackHelper.ObjectToJson(data));
+            await context.Response.WriteAsync(data.ToJson());
         }
         /// <summary>
         /// 异常信息封装
         /// </summary>
         /// 
-        [MessagePackObject(keyAsPropertyName: true)]
         public class ErrorResponse<T>
         {
             public ErrorResponse()
@@ -141,7 +127,6 @@ namespace TEAMModelOS.SDK.Context.Filter
             public ErrorModel<T> error { get; set; } = null;
         }
     }
-    [MessagePackObject(keyAsPropertyName: true)]
     public class ErrorModel<E>
     {
         public long responseTime = DateTime.Now.Ticks;

TEAMModelOS.SDK/Extension/DataResult/JsonRpcRequest/BaseJosnRPCRequest.cs

@@ -1,9 +1,7 @@
-using MessagePack;
-using System;
+using System;
 
 namespace TEAMModelOS.SDK.Extension.DataResult.JsonRpcRequest
 {
-    [MessagePackObject(keyAsPropertyName: true)]
     public abstract class BaseJosnRPCRequest
     {
         public long requestTime { get; set; } = DateTime.Now.ToUniversalTime().Ticks - 621355968000000000;

TEAMModelOS.SDK/Extension/DataResult/JsonRpcRequest/JosnRPCRequest.cs

@@ -1,11 +1,9 @@
-using MessagePack;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Text;
 
 namespace TEAMModelOS.SDK.Extension.DataResult.JsonRpcRequest
 {
-    [MessagePackObject(keyAsPropertyName: true)]
     public class JosnRPCRequest<T>:BaseJosnRPCRequest
     {
         public T @params { get; set; }

TEAMModelOS.SDK/Extension/DataResult/JsonRpcResponse/BaseJosnRPCResponse.cs

@@ -1,9 +1,7 @@
-using MessagePack;
-using Microsoft.VisualBasic;
+using Microsoft.VisualBasic;
 
 namespace TEAMModelOS.SDK.Extension.DataResult.JsonRpcResponse
 {
-    [MessagePackObject(keyAsPropertyName: true)]
     public class BaseJosnRPCResponse 
     {
         public string jsonrpc { get; set; } = "2.0";

TEAMModelOS.SDK/Extension/DataResult/JsonRpcResponse/DataJosnRPCResponse.cs

@@ -1,11 +1,9 @@
-using MessagePack;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Text;
 
 namespace TEAMModelOS.SDK.Extension.DataResult.JsonRpcResponse
 {
-    [MessagePackObject(keyAsPropertyName: true)]
     public class DataJosnRPCResponse<T> : BaseJosnRPCResponse
     {
 		public DataJosnRPCResponse() { 

TEAMModelOS.SDK/Extension/DataResult/JsonRpcResponse/ErrorJosnRPCResponse.cs

@@ -1,11 +1,9 @@
-using MessagePack;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Text;
 
 namespace TEAMModelOS.SDK.Extension.DataResult.JsonRpcResponse
 {
-    [MessagePackObject(keyAsPropertyName: true)]
     public class ErrorJosnRPCResponse<E> : BaseJosnRPCResponse
     {
         public ErrorJosnRPCResponse() {

TEAMModelOS.SDK/Extension/DataResult/JsonRpcResponse/ErrorModel.cs

@@ -1,8 +1,6 @@
-using MessagePack;
-
+
 namespace TEAMModelOS.SDK.Extension.DataResult.JsonRpcResponse
 {
-    [MessagePackObject(keyAsPropertyName: true)]
     public class ErrorModel<E>
     {
         public int code { get; set; }

TEAMModelOS.SDK/Extension/DataResult/JsonRpcResponse/JosnRPCResponse.cs

@@ -1,11 +1,9 @@
-using MessagePack;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Text;
 
 namespace TEAMModelOS.SDK.Extension.DataResult.JsonRpcResponse
 {
-    [MessagePackObject(keyAsPropertyName: true)]
     public class JosnRPCResponse<T>:BaseJosnRPCResponse
     {
         public  T result { get; set; }

TEAMModelOS.SDK/Extension/DataResult/JsonRpcResponse/JsonRPCResponseBuilder.cs

@@ -1,12 +1,10 @@
 using TEAMModelOS.SDK.Extension.DataResult.PageToken;
-using MessagePack;
 using System;
 using System.Collections.Generic;
 using System.Text;
 
 namespace TEAMModelOS.SDK.Extension.DataResult.JsonRpcResponse
 {
-    [MessagePackObject(keyAsPropertyName: true)]
     public  class JsonRPCResponseBuilder
     {
         private string message="Success";

TEAMModelOS.SDK/Extension/DataResult/JsonRpcResponse/JsonRPCResult.cs

@@ -1,11 +1,9 @@
-using MessagePack;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Text;
 
 namespace TEAMModelOS.SDK.Extension.DataResult.JsonRpcResponse
 {
-    [MessagePackObject(keyAsPropertyName: true)]
     public class JsonRPCResult<T>
     {
         public Dictionary<string, object> extend { get; set; } = null;

TEAMModelOS.SDK/Extension/DataResult/JsonRpcResponse/PageJosnRPCResponse.cs

@@ -1,11 +1,9 @@
-using MessagePack;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Text;
 
 namespace TEAMModelOS.SDK.Extension.DataResult.JsonRpcResponse
 {
-    [MessagePackObject(keyAsPropertyName: true)]
     public class PageJosnRPCResponse<T> : BaseJosnRPCResponse
     {
 		public PageJosnRPCResponse()

TEAMModelOS.SDK/Extension/DataResult/JsonRpcResponse/PageJsonRPCResult.cs

@@ -1,9 +1,7 @@
 using TEAMModelOS.SDK.Extension.DataResult.PageToken;
-using MessagePack;
 
 namespace TEAMModelOS.SDK.Extension.DataResult.JsonRpcResponse
 {
-    [MessagePackObject(keyAsPropertyName: true)]
     public class PageJsonRPCResult<T> : JsonRPCResult<T>
     {
         public Pagination page { get; set; }

TEAMModelOS.SDK/Extension/DataResult/JsonRpcResponse/TokenJosnRPCResponse.cs

@@ -1,11 +1,9 @@
-using MessagePack;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Text;
 
 namespace TEAMModelOS.SDK.Extension.DataResult.JsonRpcResponse
 {
-    [MessagePackObject(keyAsPropertyName: true)]
     public class TokenJosnRPCResponse<T>: BaseJosnRPCResponse
     {
 		public TokenJosnRPCResponse()

TEAMModelOS.SDK/Extension/DataResult/JsonRpcResponse/TokenJsonRPCResult.cs

@@ -1,12 +1,10 @@
 using TEAMModelOS.SDK.Extension.DataResult.PageToken;
-using MessagePack;
 using System;
 using System.Collections.Generic;
 using System.Text;
 
 namespace TEAMModelOS.SDK.Extension.DataResult.JsonRpcResponse
 {
-    [MessagePackObject(keyAsPropertyName: true)]
     public class TokenJsonRPCResult<T> : JsonRPCResult<T>
     {
        

TEAMModelOS.SDK/Extension/DataResult/PageToken/AzurePagination.cs

@@ -1,9 +1,7 @@
-using MessagePack;
-using System.Collections.Generic;
+using System.Collections.Generic;
 
 namespace TEAMModelOS.SDK.Extension.DataResult.PageToken
 {
-    [MessagePackObject(keyAsPropertyName: true)]
     public class AzurePagination<T>
     {
         public AzurePagination(){}

TEAMModelOS.SDK/Extension/DataResult/PageToken/AzureTableToken.cs

@@ -1,9 +1,7 @@
-using MessagePack;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 
 namespace TEAMModelOS.SDK.Extension.DataResult.PageToken
 {
-    [MessagePackObject(keyAsPropertyName: true)]
     public class AzureTableToken
     {
         //[Required]

TEAMModelOS.SDK/Extension/DataResult/PageToken/Pagination.cs

@@ -1,10 +1,8 @@
-using MessagePack;
-using System;
+using System;
 using System.Collections.Generic;
 
 namespace TEAMModelOS.SDK.Extension.DataResult.PageToken
 {
-    [MessagePackObject(keyAsPropertyName: true)]
     public class Pagination
     {
         public long total { get; set; }

TEAMModelOS.SDK/Extension/DataResult/ResponseData/BaseResponse.cs

@@ -1,9 +1,7 @@
-using MessagePack;
-using System.Collections.Generic;
+using System.Collections.Generic;
 
 namespace TEAMModelOS.SDK.Extension.DataResult.ResponseData
 {
-    [MessagePackObject(keyAsPropertyName: true)]
     public class BaseResponse : TimeStampResponse
     {
         public Dictionary<string, object> extend { get; set; }

TEAMModelOS.SDK/Extension/DataResult/ResponseData/DataResponse.cs

@@ -1,8 +1,6 @@
-using MessagePack;
-
+
 namespace TEAMModelOS.SDK.Extension.DataResult.ResponseData
 {
-    [MessagePackObject(keyAsPropertyName: true)]
     public class DataResponse<T> : BaseResponse
     {
         public T data { get; set; }

TEAMModelOS.SDK/Extension/DataResult/ResponseData/PageDatasResponse.cs

@@ -1,9 +1,7 @@
 using TEAMModelOS.SDK.Extension.DataResult.PageToken;
-using MessagePack;
 
 namespace TEAMModelOS.SDK.Extension.DataResult.ResponseData
 {
-    [MessagePackObject(keyAsPropertyName: true)]
     public class PageDatasResponse<T> : DataResponse<T>
     {
         public Pagination page { get; set; }

TEAMModelOS.SDK/Extension/DataResult/ResponseData/ResponseBuilder.cs

@@ -1,12 +1,10 @@
 using TEAMModelOS.SDK.Extension.DataResult.PageToken;
-using MessagePack;
 using System;
 using System.Collections.Generic;
 
 
 namespace TEAMModelOS.SDK.Extension.DataResult.ResponseData
 {
-    [MessagePackObject(keyAsPropertyName: true)]
     public class ResponseBuilder
     {
         private string message = "success";

TEAMModelOS.SDK/Extension/DataResult/ResponseData/TimeStampResponse.cs

@@ -1,10 +1,8 @@
-using MessagePack;
-using System;
+using System;
 
 
 namespace TEAMModelOS.SDK.Extension.DataResult.ResponseData
 {
-    [MessagePackObject(keyAsPropertyName: true)]
     public class TimeStampResponse
     {
         public long responseTime { get; set; } = DateTime.Now.ToUniversalTime().Ticks - 621355968000000000;

TEAMModelOS.SDK/Extension/DataResult/ResponseData/TokenPageDatasResponse.cs

@@ -1,10 +1,8 @@
 using TEAMModelOS.SDK.Extension.DataResult.PageToken;
-using MessagePack;
 
 
 namespace TEAMModelOS.SDK.Extension.DataResult.ResponseData
 {
-    [MessagePackObject(keyAsPropertyName: true)]
     public class TokenPageDatasResponse<T> : DataResponse<T>
     {
         public AzureTableToken azureToken { get; set; }

TEAMModelOS.SDK/Extension/JsonPath/JsonPath.cs

@@ -10,7 +10,7 @@ namespace TEAMModelOS.SDK.Extension.JsonPath
     public delegate object JsonPathScriptEvaluator(string script, object value, string context);
     public delegate void JsonPathResultAccumulator(object value, string[] indicies);
 
-    
+
     [Serializable]
     public sealed class JsonPathNode
     {
@@ -250,11 +250,11 @@ namespace TEAMModelOS.SDK.Extension.JsonPath
                 {
                     Trace(tail, Index(value, atom), path + ";" + atom);
                 }
-                else if (atom .Equals( "*"))
+                else if (atom.Equals("*"))
                 {
                     Walk(atom, tail, value, path, new WalkCallback(WalkWild));
                 }
-                else if (atom .Equals(".."))
+                else if (atom.Equals(".."))
                 {
                     Trace(tail, value, path);
                     Walk(atom, tail, value, path, new WalkCallback(WalkTree));

TEAMModelOS.SDK/Extension/JwtAuth/JwtAuthExtension.cs

@@ -76,7 +76,7 @@ namespace TEAMModelOS.SDK.Extension.JwtAuth
                 };
             });
             //自定义授权
-            services.AddAuthorization(auth =>
+            services.AddAuthorizationCore(auth =>
             {
                 auth.AddPolicy("Bearer", new AuthorizationPolicyBuilder()
                     .AddAuthenticationSchemes(JwtBearerDefaults.AuthenticationScheme)

TEAMModelOS.SDK/Extension/MessagePush/Implements/SendCloudService.cs

@@ -92,8 +92,8 @@ namespace TEAMModelOS.SDK.Extension.MessagePush.Implements
         /// <returns></returns>
         public async Task<SendCloudResponse> SendSmsByBizCode(string  BizNum  , string BizCode, int CountryCode, string phone, Dictionary<string, string> vars = null)
         {
-            SmsCountryCode code = null;
-            bool flag = _languageService.GetSmsLanguage().TryGetValue(CountryCode + "", out code);
+           
+            bool flag = _languageService.GetSmsLanguage().TryGetValue(CountryCode + "", out SmsCountryCode code);
             string SmsLang = "EN";
             int templateId = 0;
             if (flag)
@@ -138,7 +138,7 @@ namespace TEAMModelOS.SDK.Extension.MessagePush.Implements
             };
             if (vars != null)
             {
-                paramList.Add(new KeyValuePair<string, string>("vars", MessagePackHelper.ObjectToJson(vars)));
+                paramList.Add(new KeyValuePair<string, string>("vars", vars.ToJson()));
             }
             var param_str = "";
             foreach (var param in paramList)
@@ -149,7 +149,7 @@ namespace TEAMModelOS.SDK.Extension.MessagePush.Implements
             string sign = Md5Hash.Encrypt(sign_str);
             paramList.Add(new KeyValuePair<string, string>("signature", sign));
             string result = await _httpClientService.HttpPostAsync(smsSendCloud.SmsUrl, paramList);
-            return MessagePackHelper.JsonToObject<SendCloudResponse>(result);
+            return result.FromJson<SendCloudResponse>();
         }
     }
 }

TEAMModelOS.SDK/Extension/MessagePush/Model/SendCloudResponse.cs

@@ -1,11 +1,9 @@
-using MessagePack;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Text;
 
 namespace TEAMModelOS.SDK.Extension.MessagePush.Model
 {
-    [MessagePackObject(keyAsPropertyName: true)]
     public  class SendCloudResponse
     {
         public string message { get; set; }
@@ -13,7 +11,6 @@ namespace TEAMModelOS.SDK.Extension.MessagePush.Model
         public bool result { get; set; }
         public int  statusCode { get; set; }
     }
-    [MessagePackObject(keyAsPropertyName: true)]
     public class Info
     {
         public int successCount { get; set; }
@@ -21,7 +18,6 @@ namespace TEAMModelOS.SDK.Extension.MessagePush.Model
         public int failedCount { get; set; }
         public Item[] items { get; set; }
     }
-    [MessagePackObject(keyAsPropertyName: true)]
     public class Item
     {
         public string phone { get; set; }

TEAMModelOS.SDK/Helper/Common/ColorHelper/ColorConverter.cs

@@ -162,7 +162,7 @@ namespace TEAMModelOS.SDK.Helper.Common.ColorHelper
             if (tintConv > 0)
                 rLin = (rLin * tintConv) + (1 - tintConv);
             else
-                rLin = rLin * (1 + tintConv);
+                rLin *= (1 + tintConv);
 
             if (tintConv > 0)
                 gLin = (gLin * tintConv) + (1 - tintConv);
@@ -276,7 +276,7 @@ namespace TEAMModelOS.SDK.Helper.Common.ColorHelper
             double G = (double)g / 255;
             double B = (double)b / 255;
             double max = 0, min = 0;
-            double H = 0, S = 0, L = 0;
+            double H = 0;//, S = 0, L = 0;
             bool rBool = false, gBool = false, bBool = false;
 
             //find max
@@ -347,7 +347,7 @@ namespace TEAMModelOS.SDK.Helper.Common.ColorHelper
         private Color HSL_to_RGB(ColorHSL hslColor)
         {
 
-            double r = 0, g = 0, b = 0;
+            double r , g  , b  ;
             double temp1, temp2;
 
 

TEAMModelOS.SDK/Helper/Common/ColorHelper/ColorHelper.cs

@@ -107,7 +107,7 @@ namespace TEAMModelOS.SDK.Helper.Common.ColorHelper
         /// <returns></returns>
         public static ColorHSL RgbToHsl(ColorRGB rgb)
         {
-            double min, max, tmp, H = 0, S = 0, L = 0;
+            double min, max, tmp, H=0  , S  , L  ;
             double R = rgb.R * 1.0f / 255, G = rgb.G * 1.0f / 255, B = rgb.B * 1.0f / 255;
             tmp = Math.Min(R, G);
             min = Math.Min(tmp, B);
@@ -164,7 +164,7 @@ namespace TEAMModelOS.SDK.Helper.Common.ColorHelper
             var l = hsl.L;
             var s = hsl.S;
             var h = hsl.H;
-            double R = 0, G = 0, B = 0;
+            double R  , G , B ;
             if (hsl.S == 0)
             {
                 R = G = B = hsl.L;

TEAMModelOS.SDK/Helper/Common/FileHelper/FileHelperCore.cs

@@ -12,7 +12,7 @@ namespace TEAMModelOS.SDK.Helper.Common.FileHelper
     /// </summary>
     public class FileHelperCore
     {
-        private static IHostingEnvironment _hostingEnvironment = new HttpContextAccessor().HttpContext.RequestServices.GetService(typeof(IHostingEnvironment)) as IHostingEnvironment;
+        private static IWebHostEnvironment _hostingEnvironment = new HttpContextAccessor().HttpContext.RequestServices.GetService(typeof(IWebHostEnvironment)) as IWebHostEnvironment;
 
         /// <summary>
         /// 目录分隔符
@@ -116,7 +116,7 @@ namespace TEAMModelOS.SDK.Helper.Common.FileHelper
                 throw ex;
             }
         }
-        
+
         /// <summary>
         /// 清空目录下所有文件及子目录，依然保留该目录
         /// </summary>
@@ -403,7 +403,7 @@ namespace TEAMModelOS.SDK.Helper.Common.FileHelper
                     default:
                         return "fa fa-file-word-o";
                 }
-            if (fileExt.ToLower() .Equals( "zip") || fileExt.ToLower().Equals("rar)"))
+            if (fileExt.ToLower().Equals("zip") || fileExt.ToLower().Equals("rar)"))
                 return "fa fa-file-zip-o";
             else
                 return "fa fa-file";

TEAMModelOS.SDK/Helper/Common/JsonHelper/ClassSerializers.cs

@@ -22,6 +22,19 @@ namespace TEAMModelOS.SDK.Helper.Common.JsonHelper
             serializer.Serialize(memStream, request); //将对象序列化为内存流中
             return memStream;
         }
+
+        public static byte[] SerializeByte(object request) //将对象流转换成二进制流
+        {
+            BinaryFormatter serializer = new BinaryFormatter();
+            MemoryStream memStream = new MemoryStream(); //创建一个内存流存储区
+            serializer.Serialize(memStream, request); //将对象序列化为内存流中
+            byte[] bytes = new byte[memStream.Length];
+            memStream.Read(bytes, 0, bytes.Length);
+
+            // 设置当前流的位置为流的开始 
+            memStream.Seek(0, SeekOrigin.Begin);
+            return bytes;
+        }
         /// <summary>
         ///   将二进制流转换成对象
         /// </summary>

TEAMModelOS.SDK/Helper/Common/JsonHelper/JsonApiHelper.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Text.Json;
+
+namespace TEAMModelOS.SDK.Helper.Common.JsonHelper
+{
+    public static class JsonApiHelper
+    {
+        static JsonSerializerOptions options = new JsonSerializerOptions()
+        {
+            WriteIndented = true,                                   //格式化json字符串
+            AllowTrailingCommas = true,                             //可以结尾有逗号
+            //IgnoreNullValues = true,                              //可以有空值,转换json去除空值属性
+            IgnoreReadOnlyProperties = true,                        //忽略只读属性
+            PropertyNameCaseInsensitive = true,                     //忽略大小写
+            //PropertyNamingPolicy = JsonNamingPolicy.CamelCase     //命名方式是默认还是CamelCase
+        };
+        public static string ToJson(this object input ) {
+            return JsonSerializer.Serialize(input, options);
+        }
+
+        public static T FromJson<T>(this string input) {
+            return JsonSerializer.Deserialize<T>(input, options);
+        }
+    }
+}

TEAMModelOS.SDK/Helper/Common/JsonHelper/JsonSerialization.cs

@@ -5,7 +5,7 @@ using System.Text;
 
 namespace TEAMModelOS.SDK.Helper.Common.JsonHelper
 {
-    public static class JsonSerialization
+    public static class JsonNetHelper
     {
         static JsonSerializerSettings settings = new JsonSerializerSettings()
         {
@@ -108,7 +108,7 @@ namespace TEAMModelOS.SDK.Helper.Common.JsonHelper
             }
             catch
             {
-                return default(T);
+                return default;
             }
         }
 
@@ -120,16 +120,16 @@ namespace TEAMModelOS.SDK.Helper.Common.JsonHelper
         /// <param name="input"></param>
         /// <param name="dateTimeFormat">默认null,即使用json.net默认的序列化机制</param>
         /// <returns></returns>
-        public static T DictToObj<T>(this Dictionary<string,object> dict, string dateTimeFormat = "yyyy-MM-dd HH:mm:ss", bool ignoreNullValue = true)
+        public static T DictToObj<T>(this Dictionary<string, object> dict, string dateTimeFormat = "yyyy-MM-dd HH:mm:ss", bool ignoreNullValue = true)
         {
             try
             {
-                string input= ToJson(dict);
+                string input = ToJson(dict);
                 return input.FromJson<T>(dateTimeFormat, ignoreNullValue);
             }
             catch
             {
-                return default(T);
+                return default;
             }
         }
         /// <summary>
@@ -139,7 +139,7 @@ namespace TEAMModelOS.SDK.Helper.Common.JsonHelper
         /// <param name="dateTimeFormat"></param>
         /// <param name="ignoreNullValue"></param>
         /// <returns></returns>
-        public static Dictionary<string ,object> ObjToDict(this object obj, string dateTimeFormat = "yyyy-MM-dd HH:mm:ss", bool ignoreNullValue = true)
+        public static Dictionary<string, object> ObjToDict(this object obj, string dateTimeFormat = "yyyy-MM-dd HH:mm:ss", bool ignoreNullValue = true)
         {
             string input = ToJson(obj);
             return input.FromJson<Dictionary<string, object>>(dateTimeFormat, ignoreNullValue);

TEAMModelOS.SDK/Helper/Common/JsonHelper/MessagePackHelper.cs

@@ -1,74 +0,0 @@
-using MessagePack;
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace TEAMModelOS.SDK.Helper.Common.JsonHelper
-{
-    public class MessagePackHelper
-    {
-        /// <summary>
-        /// Json字符串转Byte
-        /// </summary>
-        /// <param name="json"></param>
-        /// <returns>byte[]</returns>
-        public static byte[] JsonToByte(string json)
-        {
-            return LZ4MessagePackSerializer.FromJson(json);
-        }
-
-        /// <summary>
-        /// Json字符串转对象
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="json"></param>
-        /// <returns>T</returns>
-        public static T JsonToObject<T>(string json)
-        {
-            Type type = typeof(T);
-            return (T)LZ4MessagePackSerializer.NonGeneric.Deserialize(type, JsonToByte(json));
-        }
-
-        /// <summary>
-        /// 对象转Byte
-        /// </summary>
-        /// <param name="obj"></param>
-        /// <returns>byte[]</returns>
-        public static byte[] ObjectToByte(Object obj)
-        {
-            return LZ4MessagePackSerializer.Serialize(obj);
-        }
-
-        /// <summary>
-        /// 对象转Json
-        /// </summary>
-        /// <param name="obj"></param>
-        /// <returns>string</returns>
-        public static string ObjectToJson(Object obj)
-        {
-            return LZ4MessagePackSerializer.ToJson(ObjectToByte(obj));
-        }
-
-        /// <summary>
-        /// byte转Json
-        /// </summary>
-        /// <param name="bt"></param>
-        /// <returns></returns>
-        public static string ByteToJson(byte[] bt)
-        {
-            return LZ4MessagePackSerializer.ToJson(bt);
-        }
-
-        /// <summary>
-        /// byte转对象
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="bt"></param>
-        /// <returns></returns>
-        public static T ByteToObject<T>(byte[] bt)
-        {
-            Type type = typeof(T);
-            return (T)LZ4MessagePackSerializer.NonGeneric.Deserialize(type, bt);
-        }
-    }
-}

TEAMModelOS.SDK/Helper/Common/ValidateHelper/ValidateHelper.cs

@@ -35,7 +35,7 @@ namespace TEAMModelOS.SDK.Helper.Common.ValidateHelper
             }
             else
             {
-                return default(T);
+                return default;
             }
         }
         /// <summary>

TEAMModelOS.SDK/Helper/Common/WMFConverter/Gdi/GdiUtils.cs

@@ -51,7 +51,7 @@ namespace WMFConverter.Gdi
                 }
                 catch (Exception ex2)
                 {
-                    throw new Exception(ex2.Message);
+                    throw new Exception(ex.Message +ex2.Message);
                 }
             }
             return str;
@@ -64,47 +64,28 @@ namespace WMFConverter.Gdi
         /// <returns></returns>
         public static string GetCharset(int charset)
         {
-            switch (charset)
+            return charset switch
             {
-                case (int)FontCharsetEnum.ANSI_CHARSET:
-                    return "Cp1252";
-                case (int)FontCharsetEnum.SYMBOL_CHARSET:
-                    return "Cp1252";
-                case (int)FontCharsetEnum.MAC_CHARSET:
-                    return "MacRoman";
-                case (int)FontCharsetEnum.SHIFTJIS_CHARSET:
-                    return "MS932";
-                case (int)FontCharsetEnum.HANGUL_CHARSET:
-                    return "MS949";
-                case (int)FontCharsetEnum.JOHAB_CHARSET:
-                    return "Johab";
-                case (int)FontCharsetEnum.GB2312_CHARSET:
-                    return "MS936";
-                case (int)FontCharsetEnum.CHINESEBIG5_CHARSET:
-                    return "MS950";
-                case (int)FontCharsetEnum.GREEK_CHARSET:
-                    return "Cp1253";
-                case (int)FontCharsetEnum.TURKISH_CHARSET:
-                    return "Cp1254";
-                case (int)FontCharsetEnum.VIETNAMESE_CHARSET:
-                    return "Cp1258";
-                case (int)FontCharsetEnum.HEBREW_CHARSET:
-                    return "Cp1255";
-                case (int)FontCharsetEnum.ARABIC_CHARSET:
-                    return "Cp1256";
-                case (int)FontCharsetEnum.BALTIC_CHARSET:
-                    return "Cp1257";
-                case (int)FontCharsetEnum.RUSSIAN_CHARSET:
-                    return "Cp1251";
-                case (int)FontCharsetEnum.THAI_CHARSET:
-                    return "MS874";
-                case (int)FontCharsetEnum.EASTEUROPE_CHARSET:
-                    return "Cp1250";
-                case (int)FontCharsetEnum.OEM_CHARSET:
-                    return "Cp1252";
-                default:
-                    return "Cp1252";
-            }
+                (int)FontCharsetEnum.ANSI_CHARSET => "Cp1252",
+                (int)FontCharsetEnum.SYMBOL_CHARSET => "Cp1252",
+                (int)FontCharsetEnum.MAC_CHARSET => "MacRoman",
+                (int)FontCharsetEnum.SHIFTJIS_CHARSET => "MS932",
+                (int)FontCharsetEnum.HANGUL_CHARSET => "MS949",
+                (int)FontCharsetEnum.JOHAB_CHARSET => "Johab",
+                (int)FontCharsetEnum.GB2312_CHARSET => "MS936",
+                (int)FontCharsetEnum.CHINESEBIG5_CHARSET => "MS950",
+                (int)FontCharsetEnum.GREEK_CHARSET => "Cp1253",
+                (int)FontCharsetEnum.TURKISH_CHARSET => "Cp1254",
+                (int)FontCharsetEnum.VIETNAMESE_CHARSET => "Cp1258",
+                (int)FontCharsetEnum.HEBREW_CHARSET => "Cp1255",
+                (int)FontCharsetEnum.ARABIC_CHARSET => "Cp1256",
+                (int)FontCharsetEnum.BALTIC_CHARSET => "Cp1257",
+                (int)FontCharsetEnum.RUSSIAN_CHARSET => "Cp1251",
+                (int)FontCharsetEnum.THAI_CHARSET => "MS874",
+                (int)FontCharsetEnum.EASTEUROPE_CHARSET => "Cp1250",
+                (int)FontCharsetEnum.OEM_CHARSET => "Cp1252",
+                _ => "Cp1252",
+            };
         }
 
         /// <summary>
@@ -114,47 +95,28 @@ namespace WMFConverter.Gdi
         /// <returns></returns>
         public static string GetLanguage(int charset)
         {
-            switch (charset)
+            return charset switch
             {
-                case (int)FontCharsetEnum.ANSI_CHARSET:
-                    return "en";
-                case (int)FontCharsetEnum.SYMBOL_CHARSET:
-                    return "en";
-                case (int)FontCharsetEnum.MAC_CHARSET:
-                    return "en";
-                case (int)FontCharsetEnum.SHIFTJIS_CHARSET:
-                    return "ja";
-                case (int)FontCharsetEnum.HANGUL_CHARSET:
-                    return "ko";
-                case (int)FontCharsetEnum.JOHAB_CHARSET:
-                    return "ko";
-                case (int)FontCharsetEnum.GB2312_CHARSET:
-                    return "zh-CN";
-                case (int)FontCharsetEnum.CHINESEBIG5_CHARSET:
-                    return "zh-TW";
-                case (int)FontCharsetEnum.GREEK_CHARSET:
-                    return "el";
-                case (int)FontCharsetEnum.TURKISH_CHARSET:
-                    return "tr";
-                case (int)FontCharsetEnum.VIETNAMESE_CHARSET:
-                    return "vi";
-                case (int)FontCharsetEnum.HEBREW_CHARSET:
-                    return "iw";
-                case (int)FontCharsetEnum.ARABIC_CHARSET:
-                    return "ar";
-                case (int)FontCharsetEnum.BALTIC_CHARSET:
-                    return "bat";
-                case (int)FontCharsetEnum.RUSSIAN_CHARSET:
-                    return "ru";
-                case (int)FontCharsetEnum.THAI_CHARSET:
-                    return "th";
-                case (int)FontCharsetEnum.EASTEUROPE_CHARSET:
-                    return null;
-                case (int)FontCharsetEnum.OEM_CHARSET:
-                    return null;
-                default:
-                    return null;
-            }
+                (int)FontCharsetEnum.ANSI_CHARSET => "en",
+                (int)FontCharsetEnum.SYMBOL_CHARSET => "en",
+                (int)FontCharsetEnum.MAC_CHARSET => "en",
+                (int)FontCharsetEnum.SHIFTJIS_CHARSET => "ja",
+                (int)FontCharsetEnum.HANGUL_CHARSET => "ko",
+                (int)FontCharsetEnum.JOHAB_CHARSET => "ko",
+                (int)FontCharsetEnum.GB2312_CHARSET => "zh-CN",
+                (int)FontCharsetEnum.CHINESEBIG5_CHARSET => "zh-TW",
+                (int)FontCharsetEnum.GREEK_CHARSET => "el",
+                (int)FontCharsetEnum.TURKISH_CHARSET => "tr",
+                (int)FontCharsetEnum.VIETNAMESE_CHARSET => "vi",
+                (int)FontCharsetEnum.HEBREW_CHARSET => "iw",
+                (int)FontCharsetEnum.ARABIC_CHARSET => "ar",
+                (int)FontCharsetEnum.BALTIC_CHARSET => "bat",
+                (int)FontCharsetEnum.RUSSIAN_CHARSET => "ru",
+                (int)FontCharsetEnum.THAI_CHARSET => "th",
+                (int)FontCharsetEnum.EASTEUROPE_CHARSET => null,
+                (int)FontCharsetEnum.OEM_CHARSET => null,
+                _ => null,
+            };
         }
 
 
@@ -165,21 +127,15 @@ namespace WMFConverter.Gdi
         /// <returns></returns>
         public static int[,] GetFirstByteArea(int charset)
         {
-            switch (charset)
+            return charset switch
             {
-                case (int)FontCharsetEnum.SHIFTJIS_CHARSET:
-                    return FBA_SHIFT_JIS;
-                case (int)FontCharsetEnum.HANGUL_CHARSET:
-                    return FBA_HANGUL_CHARSET;
-                case (int)FontCharsetEnum.JOHAB_CHARSET:
-                    return FBA_JOHAB_CHARSET;
-                case (int)FontCharsetEnum.GB2312_CHARSET:
-                    return FBA_GB2312_CHARSET;
-                case (int)FontCharsetEnum.CHINESEBIG5_CHARSET:
-                    return FBA_CHINESEBIG5_CHARSET;
-                default:
-                    return null;
-            }
+                (int)FontCharsetEnum.SHIFTJIS_CHARSET => FBA_SHIFT_JIS,
+                (int)FontCharsetEnum.HANGUL_CHARSET => FBA_HANGUL_CHARSET,
+                (int)FontCharsetEnum.JOHAB_CHARSET => FBA_JOHAB_CHARSET,
+                (int)FontCharsetEnum.GB2312_CHARSET => FBA_GB2312_CHARSET,
+                (int)FontCharsetEnum.CHINESEBIG5_CHARSET => FBA_CHINESEBIG5_CHARSET,
+                _ => null,
+            };
         }
 
         #endregion

TEAMModelOS.SDK/Helper/Common/WMFConverter/IO/DataInput.cs

@@ -15,9 +15,9 @@ namespace WMFConverter.IO
 
         private System.IO.Stream _inputStream;
         private bool _isLittleEndian = BitConverter.IsLittleEndian;
-	
-	    private byte[] _buf = new byte[4];
-	    private int _count = 0;
+
+        private byte[] _buf = new byte[4];
+        private int _count = 0;
 
         #endregion
 
@@ -47,23 +47,23 @@ namespace WMFConverter.IO
         /// Create a DataInput instance using native order.
         /// </summary>
         /// <param name="inputStream"></param>
-	    public DataInput(System.IO.Stream inputStream) 
+	    public DataInput(System.IO.Stream inputStream)
         {
             _isLittleEndian = BitConverter.IsLittleEndian;
-		    _inputStream = inputStream;
-	    }
+            _inputStream = inputStream;
+        }
 
-	    /// <summary>
-	    /// Default contructor.
+        /// <summary>
+        /// Default contructor.
         /// Create a DataInput instance receving the order.
-	    /// </summary>
-	    /// <param name="inputStream"></param>
-	    /// <param name="endian"></param>
-	    public DataInput(System.IO.Stream inputStream, bool endian) 
+        /// </summary>
+        /// <param name="inputStream"></param>
+        /// <param name="endian"></param>
+        public DataInput(System.IO.Stream inputStream, bool endian)
         {
-		    _inputStream = inputStream;
+            _inputStream = inputStream;
             _isLittleEndian = endian;
-	    }
+        }
 
         #endregion 
 
@@ -73,152 +73,154 @@ namespace WMFConverter.IO
         /// Reads the next one byte of this input stream as a signed 8-bit integer.
 	    /// </summary>
 	    /// <returns></returns>
-	    public int ReadByte() 
+	    public int ReadByte()
         {
-		    if (_inputStream.Read(_buf, 0, 1) == 1) 
+            if (_inputStream.Read(_buf, 0, 1) == 1)
             {
-			    _count += 1;
-			    return (0xff & _buf[0]);
-		    }
-		    throw new System.IO.EndOfStreamException();
-	    }
+                _count += 1;
+                return (0xff & _buf[0]);
+            }
+            throw new System.IO.EndOfStreamException();
+        }
 
-	   /// <summary>
+        /// <summary>
         /// Reads the next two bytes of this input stream as a signed 16-bit integer.
-	   /// </summary>
-	   /// <returns></returns>
-	    public int ReadInt16()  
+        /// </summary>
+        /// <returns></returns>
+        public int ReadInt16()
         {
-		    if (_inputStream.Read(_buf, 0, 2) == 2) 
+            if (_inputStream.Read(_buf, 0, 2) == 2)
             {
-			    short value = 0;
-			    if (_isLittleEndian==false) 
+                short value = 0;
+                if (_isLittleEndian == false)
+                {
+                    value |= (short)(0xff & _buf[1]);
+                    value |= (short)((0xff & _buf[0]) << 8);
+                }
+                else
                 {
-				    value |= (short)(0xff & _buf[1]);
-				    value |= (short)((0xff & _buf[0]) << 8);
-			    } 
-                else 
-                { 
-				    value |= (short)(0xff & _buf[0]);
-				    value |= (short)((0xff & _buf[1]) << 8);
-			    }
-			    _count += 2;
-			    return value;
-		    }
-		    throw new System.IO.EndOfStreamException();
-	    }
+                    value |= (short)(0xff & _buf[0]);
+                    value |= (short)((0xff & _buf[1]) << 8);
+                }
+                _count += 2;
+                return value;
+            }
+            throw new System.IO.EndOfStreamException();
+        }
 
         /// <summary>
         /// Reads the next four bytes of this input stream as a signed 32-bit integer.
         /// </summary>
         /// <returns></returns>
-	    public int ReadInt32() 
+	    public int ReadInt32()
         {
-		    if (_inputStream.Read(_buf, 0, 4) == 4) 
+            if (_inputStream.Read(_buf, 0, 4) == 4)
             {
-			    int value = 0;
-			    if (_isLittleEndian==false) 
+                int value = 0;
+                if (_isLittleEndian == false)
                 {
-				    value |= (0xff & _buf[3]);
-				    value |= (0xff & _buf[2]) << 8;
-				    value |= (0xff & _buf[1]) << 16;
-				    value |= (0xff & _buf[0]) << 24;
-			    } 
-                else 
+                    value |= (0xff & _buf[3]);
+                    value |= (0xff & _buf[2]) << 8;
+                    value |= (0xff & _buf[1]) << 16;
+                    value |= (0xff & _buf[0]) << 24;
+                }
+                else
                 {
-				    value |= (0xff & _buf[0]);
-				    value |= (0xff & _buf[1]) << 8;
-				    value |= (0xff & _buf[2]) << 16;
-				    value |= (0xff & _buf[3]) << 24;
-			    }
-			    _count += 4;
-			    return value;
-		    }
-		    throw new System.IO.EndOfStreamException();
-	    }
-
-	    /// <summary>
+                    value |= (0xff & _buf[0]);
+                    value |= (0xff & _buf[1]) << 8;
+                    value |= (0xff & _buf[2]) << 16;
+                    value |= (0xff & _buf[3]) << 24;
+                }
+                _count += 4;
+                return value;
+            }
+            throw new System.IO.EndOfStreamException();
+        }
+
+        /// <summary>
         /// Reads the next two bytes of this input stream as a unsigned 16-bit integer.
-	    /// </summary>
-	    /// <returns></returns>
-	    public int ReadUint16() 
+        /// </summary>
+        /// <returns></returns>
+        public int ReadUint16()
         {
-		    if (_inputStream.Read(_buf, 0, 2) == 2) 
+            if (_inputStream.Read(_buf, 0, 2) == 2)
             {
-			    int value = 0;
-			    if (_isLittleEndian==false) 
+                int value = 0;
+                if (_isLittleEndian == false)
+                {
+                    value |= (0xff & _buf[1]);
+                    value |= (0xff & _buf[0]) << 8;
+                }
+                else
                 {
-				    value |= (0xff & _buf[1]);
-				    value |= (0xff & _buf[0]) << 8;
-			    } else {
-				    value |= (0xff & _buf[0]);
-				    value |= (0xff & _buf[1]) << 8;
-			    }
-			    _count += 2;
-			    return value;
-		    }
-		    throw new System.IO.EndOfStreamException();
-	    }
-	    
+                    value |= (0xff & _buf[0]);
+                    value |= (0xff & _buf[1]) << 8;
+                }
+                _count += 2;
+                return value;
+            }
+            throw new System.IO.EndOfStreamException();
+        }
+
         /// <summary>
         /// Reads the next four bytes of this input stream as a unsigned 32-bit integer.
         /// </summary>
         /// <returns></returns>
-	    public long ReadUint32()  
+        public long ReadUint32()
         {
-		    if (_inputStream.Read(_buf, 0, 4) == 4) 
+            if (_inputStream.Read(_buf, 0, 4) == 4)
             {
-			    long value = 0;
-			    if (_isLittleEndian ==false) 
+                Int32 value = 0;
+                if (_isLittleEndian == false)
                 {
-				    value |= (0xff & _buf[3]);
-				    value |= (0xff & _buf[2]) << 8;
-				    value |= (0xff & _buf[1]) << 16;
-				    value |= (0xff & _buf[0]) << 24;
-			    } 
-                else 
+                    value |= (0xff & _buf[3]);
+                    value |= (0xff & _buf[2]) << 8;
+                    value |= (0xff & _buf[1]) << 16;
+                    value |= (0xff & _buf[0]) << 24;
+                }
+                else
                 {
-				    value |= (0xff & _buf[0]);
-				    value |= (0xff & _buf[1]) << 8;
-				    value |= (0xff & _buf[2]) << 16;
-				    value |= (0xff & _buf[3]) << 24;
-			    }
-			    _count += 4;
-			    return value;
-		    }
-		    throw new System.IO.EndOfStreamException();
-	    }
+                    value |= (0xff & _buf[0]);
+                    value |= (0xff & _buf[1]) << 8;
+                    value |= (0xff & _buf[2]) << 16;
+                    value |= (0xff & _buf[3]) << 24;
+                }
+                _count += 4;
+                return value;
+            }
+            throw new System.IO.EndOfStreamException();
+        }
 
         /// <summary>
         /// Reads the next n bytes.
         /// </summary>
         /// <param name="n"></param>
         /// <returns></returns>
-	    public byte[] ReadBytes(int n) 
+	    public byte[] ReadBytes(int n)
         {
-		    byte[] array = new byte[n];
-		    if (_inputStream.Read(array,0,array.Length) == n) 
+            byte[] array = new byte[n];
+            if (_inputStream.Read(array, 0, array.Length) == n)
             {
-			    _count += n;
-			    return array;
-		    }
-		    throw new System.IO.EndOfStreamException();
-	    }
+                _count += n;
+                return array;
+            }
+            throw new System.IO.EndOfStreamException();
+        }
+
 
-	
         /// <summary>
         /// Close the input stream.
         /// </summary>
-	    public void Close() 
+        public void Close()
         {
-		    try 
+            try
             {
-			    _inputStream.Close();
-		    } 
-            catch(System.IO.IOException ex) 
+                _inputStream.Close();
+            }
+            catch (System.IO.IOException ex)
             {
                 Console.Write(ex.Message);
-		    }
+            }
         }
 
         #endregion 

TEAMModelOS.SDK/Helper/Common/WMFConverter/Wmf/WmfPen.cs

@@ -13,9 +13,9 @@ namespace WMFConverter.Wmf
     {
         #region Local Variables
 
-        private int _style;
-        private int _width;
-        private int _color;
+        private int _style { get; set; }
+        private int _width { get; set; }
+        private int _color { get; set; }
 
         #endregion
 

TEAMModelOS.SDK/Helper/Common/XmlHelper/XmlAndJson.cs

@@ -16,19 +16,17 @@ namespace TEAMModelOS.SDK.Helper.Common.XmlHelper
        /// <returns></returns>
         public static string XML2Json(string str, string nodename)
         {
-            string result = null;
             XmlDocument xmldoc = new XmlDocument();
             xmldoc.LoadXml(str);
             XmlNode node = xmldoc.SelectSingleNode(nodename);
-            result = Newtonsoft.Json.JsonConvert.SerializeXmlNode(node);
+            string result = System.Text.Json.JsonSerializer.Serialize(node);
             return result;
         }
 
         public static string Json2XML(string str)
         {
-            string result = null;
-            XmlDocument xml = Newtonsoft.Json.JsonConvert.DeserializeXmlNode(str);
-            result = xml.OuterXml;
+            XmlDocument xml = System.Text.Json.JsonSerializer.Deserialize<XmlDocument>(str);
+            string result = xml.OuterXml;
             return result;
         }
         public static string GetCustomItemSpecifics(string str)

TEAMModelOS.SDK/Helper/Query/LinqHelper/DynamicQueryable.cs

@@ -1370,7 +1370,7 @@ namespace TEAMModelOS.SDK.Helper.Query.LinqHelper
             if (FindMethod(typeof(IEnumerableSignatures), methodName, false, args, out signature) != 1)
                 throw ParseError(errorPos, Res.NoApplicableAggregate, methodName);
             Type[] typeArgs;
-            if (signature.Name .Equals( "Min") || signature.Name.Equals( "Max"))
+            if (signature.Name.Equals("Min") || signature.Name.Equals("Max"))
             {
                 typeArgs = new Type[] { elementType, args[0].Type };
             }

TEAMModelOS.SDK/Helper/Security/BCryptHelper/BCryptHelper.cs

@@ -1,29 +0,0 @@
-
-namespace TEAMModelOS.SDK.Helper.Security.BCryptHelper
-{
-    /// <summary>
-    /// BCrypt散列加密算法
-    /// </summary>
-    public class BCryptHelper
-    {
-        /// <summary>
-        /// 加密
-        /// </summary>
-        /// <param name="code"></param>
-        /// <returns></returns>
-        public static string Ecrypt(string code)
-        {
-            return BCrypt.Net.BCrypt.EnhancedHashPassword(code);
-        }
-        /// <summary>
-        /// 验证
-        /// </summary>
-        /// <param name="code"></param>
-        /// <param name="encode"></param>
-        /// <returns></returns>
-        public static bool Verify(string code, string encode)
-        {
-            return BCrypt.Net.BCrypt.EnhancedVerify(code, encode);
-        }
-    }
-}

TEAMModelOS.SDK/Helper/Security/RSACrypt/RsaHelper.cs

@@ -61,9 +61,9 @@ namespace TEAMModelOS.SDK.Helper.Security.RSACrypt
             // --------- Set up stream to decode the asn.1 encoded RSA private key ------
             MemoryStream mem = new MemoryStream(privkey);
             BinaryReader binr = new BinaryReader(mem);  //wrap Memory Stream with BinaryReader for easy reading
-            byte bt = 0;
-            ushort twobytes = 0;
-            int elems = 0;
+            byte bt  ;
+            ushort twobytes  ;
+            int elems  ;
             try
             {
                 twobytes = binr.ReadUInt16();

TEAMModelOS.SDK/Module/AzureBlob/Container/AzureBlobModel.cs

@@ -1,5 +1,4 @@
-using MessagePack;
-using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http;
 using Microsoft.WindowsAzure.Storage.Table;
 using System;
 using System.ComponentModel.DataAnnotations;
@@ -8,7 +7,6 @@ using TEAMModelOS.SDK.Helper.Common.DateTimeHelper;
 
 namespace TEAMModelOS.SDK.Module.AzureBlob.Container
 {
-    [MessagePackObject(keyAsPropertyName: true)]
     public class AzureBlobModel : TableEntity
     {
 

TEAMModelOS.SDK/Module/AzureBlob/Implements/AzureBlobDBRepository.cs

@@ -8,7 +8,6 @@ using System.Collections.Generic;
 using System.IO;
 using System.Net.Http.Headers;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Http.Internal;
 using TEAMModelOS.SDK.Helper.Security.AESCrypt;
 using TEAMModelOS.SDK.Context.Exception;
 using Microsoft.AspNetCore.Http;

TEAMModelOS.SDK/Module/AzureCosmosDB/Implements/AzureCosmosDBRepository.cs

@@ -547,17 +547,17 @@ namespace TEAMModelOS.SDK.Module.AzureCosmosDB.Implements
             {
                 Type s = obj.GetType();
                 TypeCode typeCode = Type.GetTypeCode(s);
-                switch (typeCode)
-                {
-                    case TypeCode.String: return new SetUpdateOperation<string>(key, obj.ToString());
-                    case TypeCode.Int32: return new SetUpdateOperation<Int32>(key, (Int32)obj);
-                    case TypeCode.Double: return new SetUpdateOperation<Double>(key, (Double)obj);
-                    case TypeCode.Byte: return new SetUpdateOperation<Byte>(key, (Byte)obj);
-                    case TypeCode.Boolean: return new SetUpdateOperation<Boolean>(key, (Boolean)obj);
-                    case TypeCode.DateTime: return new SetUpdateOperation<DateTime>(key, (DateTime)obj);
-                    case TypeCode.Int64: return new SetUpdateOperation<Int64>(key, (Int64)obj);
-                    default: return null;
-                }
-            }
+            return typeCode switch
+            {
+                TypeCode.String => new SetUpdateOperation<string>(key, obj.ToString()),
+                TypeCode.Int32 => new SetUpdateOperation<Int32>(key, (Int32)obj),
+                TypeCode.Double => new SetUpdateOperation<Double>(key, (Double)obj),
+                TypeCode.Byte => new SetUpdateOperation<Byte>(key, (Byte)obj),
+                TypeCode.Boolean => new SetUpdateOperation<Boolean>(key, (Boolean)obj),
+                TypeCode.DateTime => new SetUpdateOperation<DateTime>(key, (DateTime)obj),
+                TypeCode.Int64 => new SetUpdateOperation<Int64>(key, (Int64)obj),
+                _ => null,
+            };
+        }
         }
     }

TEAMModelOS.SDK/Module/AzureTable/Configuration/HaBookTableContinuationToken.cs

@@ -1,5 +1,4 @@
-using MessagePack;
-using Microsoft.WindowsAzure.Storage;
+using Microsoft.WindowsAzure.Storage;
 using Microsoft.WindowsAzure.Storage.Table;
 using System;
 using System.ComponentModel.DataAnnotations;
@@ -8,7 +7,6 @@ using TEAMModelOS.SDK.Helper.Common.ValidateHelper;
 
 namespace TEAMModelOS.SDK.Module.AzureTable.Configuration
 {
-    [MessagePackObject(keyAsPropertyName: true)]
     public class HaBookTableContinuationToken
     {
         [Required]