From bf4222bd52d60bf0a0efabcb271040bdcc5dcf2d Mon Sep 17 00:00:00 2001
From: osscore <1985088337@qq.com>
Date: Sun, 16 Feb 2020 22:46:59 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 OSS.Common.Tests/EncryptTests.cs          |  2 +-
 OSS.Common/BasicMos/BaseMo.cs             | 32 -----------------------
 OSS.Common/BasicMos/Enums/CommonStatus.cs |  2 --
 OSS.Common/OSS.Common.csproj              |  8 +++---
 4 files changed, 5 insertions(+), 39 deletions(-)

diff --git a/OSS.Common.Tests/EncryptTests.cs b/OSS.Common.Tests/EncryptTests.cs
index df5f9c2..a4bf836 100644
--- a/OSS.Common.Tests/EncryptTests.cs
+++ b/OSS.Common.Tests/EncryptTests.cs
@@ -2,9 +2,9 @@
 using System.Text;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using OSS.Common.Authrization;
-using OSS.Common.BasicMos.Resp;
 using OSS.Common.Encrypt;
 using OSS.Common.Extention;
+using OSS.Common.Resp;
 
 namespace OSS.Common.Tests
 {
diff --git a/OSS.Common/BasicMos/BaseMo.cs b/OSS.Common/BasicMos/BaseMo.cs
index 992ea1f..ef66261 100644
--- a/OSS.Common/BasicMos/BaseMo.cs
+++ b/OSS.Common/BasicMos/BaseMo.cs
@@ -11,16 +11,12 @@
 
 #endregion
 
-using System;
-using OSS.Common.BasicMos.Enums;
-
 namespace OSS.Common.BasicMos
 {
     /// <summary>
     ///  基础实体
     /// </summary>
     /// <typeparam name="IdType"></typeparam>
-    [Obsolete("转移至 OSS.Infrastructure 类库下")]
     public class BaseMo<IdType>
     {
         /// <summary>
@@ -29,32 +25,4 @@ namespace OSS.Common.BasicMos
         public IdType id { get; set; }
     }
 
-    /// <inheritdoc />
-    [Obsolete("转移至 OSS.Infrastructure 类库下")]
-    public class BaseUIdAndStateMo<IdType> : BaseUIdMo<IdType>
-    {
-        /// <summary>
-        /// 状态信息
-        /// </summary>
-        public CommonStatus status { get; set; }
-    }
-    /// <inheritdoc />
-    [Obsolete("转移至 OSS.Infrastructure 类库下")]
-    public class BaseUIdMo<IdType> : BaseMo<IdType>
-    {
-        /// <summary>
-        ///  用户Id
-        /// </summary>
-        public string u_id { get; set; }
-    }
-
-    /// <inheritdoc />
-    [Obsolete("转移至 OSS.Infrastructure 类库下")]
-    public class BaseStateMo<IdType> : BaseMo<IdType>
-    {
-        /// <summary>
-        /// 状态信息
-        /// </summary>
-        public CommonStatus status { get; set; }
-    }
 }
\ No newline at end of file
diff --git a/OSS.Common/BasicMos/Enums/CommonStatus.cs b/OSS.Common/BasicMos/Enums/CommonStatus.cs
index 6578eb1..cc38acc 100644
--- a/OSS.Common/BasicMos/Enums/CommonStatus.cs
+++ b/OSS.Common/BasicMos/Enums/CommonStatus.cs
@@ -10,7 +10,6 @@
 
 #endregion
 
-
 using System;
 
 namespace OSS.Common.BasicMos.Enums
@@ -19,7 +18,6 @@ namespace OSS.Common.BasicMos.Enums
     ///     通用状态码 （如果需要更多状态需要自定义枚举，此值不再新增）
     ///     不同的领域对象可能会一到多个
     /// </summary>
-    [Obsolete("转移至 OSS.Infrastructure 类库下")]
     public enum CommonStatus
     {
         /// <summary>
diff --git a/OSS.Common/OSS.Common.csproj b/OSS.Common/OSS.Common.csproj
index f3cd1fe..a7680cc 100644
--- a/OSS.Common/OSS.Common.csproj
+++ b/OSS.Common/OSS.Common.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <PackageRequireLicenseAcceptance>False</PackageRequireLicenseAcceptance>
-    <Version>2.3.1</Version>
+    <Version>2.3.1.1</Version>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <Authors>OSSCore</Authors>
     <Company>OSSCore</Company>
@@ -13,9 +13,9 @@
     <PackageIconUrl>http://img1.osscore.cn/static/oss_net.png</PackageIconUrl>
     <RepositoryUrl>https://github.com/KevinWG/OSS.Common</RepositoryUrl>
 
-    <PackageReleaseNotes>清理多余类</PackageReleaseNotes>
-    <AssemblyVersion>2.3.1.0</AssemblyVersion>
-    <FileVersion>2.3.1.0</FileVersion>
+    <PackageReleaseNotes></PackageReleaseNotes>
+    <AssemblyVersion>2.3.1.1</AssemblyVersion>
+    <FileVersion>2.3.1.1</FileVersion>
 
     <PackageLicenseUrl>https://github.com/KevinWG/OSS.Common/blob/master/LICENSE</PackageLicenseUrl>