From 9335481e1875891d9abd6aede059e4ea4e4eb71e Mon Sep 17 00:00:00 2001
From: osscore <1985088337@qq.com>
Date: Tue, 17 Dec 2019 23:31:31 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=AC=E7=A7=BB=E5=8A=9F=E8=83=BD=E5=90=8C?=
 =?UTF-8?q?=E6=97=B6=E5=A4=87=E6=B3=A8=E8=BF=87=E6=9C=9F=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 OSS.Common/Authrization/AppAuthorizeInfo.cs |  3 ++
 OSS.Common/Authrization/MemberShiper.cs     |  1 +
 OSS.Common/BasicMos/BaseMo.cs               | 57 ++++++++-------------
 OSS.Common/Helpers/IdHelper/NumHelper.cs    |  4 +-
 OSS.Common/OSS.Common.csproj                |  8 +--
 5 files changed, 30 insertions(+), 43 deletions(-)

diff --git a/OSS.Common/Authrization/AppAuthorizeInfo.cs b/OSS.Common/Authrization/AppAuthorizeInfo.cs
index 49c8b21..962fd7e 100644
--- a/OSS.Common/Authrization/AppAuthorizeInfo.cs
+++ b/OSS.Common/Authrization/AppAuthorizeInfo.cs
@@ -21,6 +21,7 @@ namespace OSS.Common.Authrization
     /// <summary>
     ///   应用的授权认证信息
     /// </summary>
+    [Obsolete("转移至OSS.Infrastructuer类库下AppIdentity")]
     public class AppAuthorizeInfo
     {
         #region  参与签名属性
@@ -292,6 +293,7 @@ namespace OSS.Common.Authrization
     /// <summary>
     /// 应用客户端类型
     /// </summary>
+    [Obsolete("转移至OSS.Infrastructuer类库下")]
     public enum AppClientType
     {
         /// <summary>
@@ -329,6 +331,7 @@ namespace OSS.Common.Authrization
     /// <summary>
     ///  应用来源类型
     /// </summary>
+    [Obsolete("转移至OSS.Infrastructuer类库下")]
     public enum AppSourceType
     {
         /// <summary>
diff --git a/OSS.Common/Authrization/MemberShiper.cs b/OSS.Common/Authrization/MemberShiper.cs
index b6e69cc..8ff31e4 100644
--- a/OSS.Common/Authrization/MemberShiper.cs
+++ b/OSS.Common/Authrization/MemberShiper.cs
@@ -20,6 +20,7 @@ namespace OSS.Common.Authrization
     /// <summary>
     /// 当前系统访问上下文信息
     /// </summary>
+    [Obsolete("请使用OSS.Infrastructuer类库下AppContext，MemberContext 分别获取应用和用户上下文信息")]
     public static class MemberShiper
     {
         #region  当前应用授权信息
diff --git a/OSS.Common/BasicMos/BaseMo.cs b/OSS.Common/BasicMos/BaseMo.cs
index 21887f0..25dee00 100644
--- a/OSS.Common/BasicMos/BaseMo.cs
+++ b/OSS.Common/BasicMos/BaseMo.cs
@@ -1,4 +1,4 @@
-#region Copyright (C) 2017 Kevin (OSS开源实验室) 公众号：osscoder
+#region Copyright (C) 2017 Kevin (OSS开源实验室) 公众号：osscore
 
 /***************************************************************************
 *　　	文件功能描述：OSSCore —— 实体基类
@@ -11,29 +11,11 @@
 
 #endregion
 
+using System;
 using OSS.Common.BasicMos.Enums;
 
 namespace OSS.Common.BasicMos
 {
-    #region  和租户相关的基类
-    /// <inheritdoc />
-    public class BaseUIdAndStateMo<IdType> : BaseUIdMo<IdType>
-    {
-        /// <summary>
-        /// 状态信息
-        /// </summary>
-        public CommonStatus status { get; set; }
-    }
-    /// <inheritdoc />
-    public class BaseUIdMo<IdType> : BaseMo<IdType>
-    {
-        /// <summary>
-        ///  用户Id
-        /// </summary>
-        public string u_id { get; set; }
-    }
-
-
     /// <inheritdoc />
     public class BaseStateMo<IdType> : BaseMo<IdType>
     {
@@ -43,33 +25,34 @@ namespace OSS.Common.BasicMos
         public CommonStatus status { get; set; }
     }
 
-    #endregion
-    
+    /// <summary>
+    ///  基础实体
+    /// </summary>
+    /// <typeparam name="IdType"></typeparam>
     public class BaseMo<IdType>
     {
         /// <summary>
         /// 主键Id
         /// </summary>
         public IdType id { get; set; }
+    }
 
-        ///// <summary>
-        /////  租户Id
-        ///// </summary>
-        //public string t_id { get; set; }
-
+    /// <inheritdoc />
+    [Obsolete("转移至 OSS.Infrastructure 类库下")]
+    public class BaseUIdAndStateMo<IdType> : BaseUIdMo<IdType>
+    {
         /// <summary>
-        ///  创建时间
+        /// 状态信息
         /// </summary>
-        public long add_time { get; set; }
-
+        public CommonStatus status { get; set; }
+    }
+    /// <inheritdoc />
+    [Obsolete("转移至 OSS.Infrastructure 类库下")]
+    public class BaseUIdMo<IdType> : BaseMo<IdType>
+    {
         /// <summary>
-        ///  修改时间
+        ///  用户Id
         /// </summary>
-        public long m_time { get; set; }
-
-        /// <summary>
-        ///  应用来源
-        /// </summary>
-        public string app_source { get; set; }
+        public string u_id { get; set; }
     }
 }
\ No newline at end of file
diff --git a/OSS.Common/Helpers/IdHelper/NumHelper.cs b/OSS.Common/Helpers/IdHelper/NumHelper.cs
index 4759b19..6957829 100644
--- a/OSS.Common/Helpers/IdHelper/NumHelper.cs
+++ b/OSS.Common/Helpers/IdHelper/NumHelper.cs
@@ -1,6 +1,6 @@
-using OSS.Common.Extention;
-using System;
+using System;
 using System.Text;
+using OSS.Common.Extention;
 
 namespace OSS.Common.Helpers.IdHelper
 {
diff --git a/OSS.Common/OSS.Common.csproj b/OSS.Common/OSS.Common.csproj
index 1971ca6..1305265 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.2.0.2</Version>
+    <Version>2.2.0.3</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.2.0.2</AssemblyVersion>
-    <FileVersion>2.2.0.2</FileVersion>
+    <PackageReleaseNotes>备注过期转移功能</PackageReleaseNotes>
+    <AssemblyVersion>2.2.0.3</AssemblyVersion>
+    <FileVersion>2.2.0.3</FileVersion>
 
     <PackageLicenseUrl>https://github.com/KevinWG/OSS.Common/blob/master/LICENSE</PackageLicenseUrl>