diff --git a/OSS.Common.Tests/OSS.Common.Tests.csproj b/OSS.Common.Tests/OSS.Common.Tests.csproj
index c2ec8a2..5bbb38e 100644
--- a/OSS.Common.Tests/OSS.Common.Tests.csproj
+++ b/OSS.Common.Tests/OSS.Common.Tests.csproj
@@ -1,6 +1,6 @@
-
+
Debug
AnyCPU
@@ -39,19 +39,38 @@
4
+
+ ..\packages\Microsoft.Extensions.Caching.Abstractions.2.0.0\lib\netstandard2.0\Microsoft.Extensions.Caching.Abstractions.dll
+
+
+ ..\packages\Microsoft.Extensions.Caching.Memory.2.0.0\lib\netstandard2.0\Microsoft.Extensions.Caching.Memory.dll
+
+
+ ..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.0.0\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll
+
+
+ ..\packages\Microsoft.Extensions.Options.2.0.0\lib\netstandard2.0\Microsoft.Extensions.Options.dll
+
+
+ ..\packages\Microsoft.Extensions.Primitives.2.0.0\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll
+
- ..\packages\MSTest.TestFramework.1.1.18\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll
+ ..\packages\MSTest.TestFramework.1.2.0\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll
- ..\packages\MSTest.TestFramework.1.1.18\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll
+ ..\packages\MSTest.TestFramework.1.2.0\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll
+
+ ..\packages\System.Runtime.CompilerServices.Unsafe.4.4.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll
+
+
@@ -70,8 +89,8 @@
这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。
-
-
+
+
-
+
\ No newline at end of file
diff --git a/OSS.Common.Tests/packages.config b/OSS.Common.Tests/packages.config
index 3226eb3..ec1d31f 100644
--- a/OSS.Common.Tests/packages.config
+++ b/OSS.Common.Tests/packages.config
@@ -1,7 +1,13 @@
-
-
+
+
+
+
+
+
+
+
diff --git a/OSS.Common.sln b/OSS.Common.sln
index b1f211c..8f015d7 100644
--- a/OSS.Common.sln
+++ b/OSS.Common.sln
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
-VisualStudioVersion = 15.0.26730.16
+VisualStudioVersion = 15.0.27004.2006
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OSS.Common.Tests", "OSS.Common.Tests\OSS.Common.Tests.csproj", "{57F08330-95BD-4FBA-8AD0-68DDA6765987}"
EndProject
@@ -34,8 +34,8 @@ Global
{57F08330-95BD-4FBA-8AD0-68DDA6765987}.Release|x64.Build.0 = Release|Any CPU
{57F08330-95BD-4FBA-8AD0-68DDA6765987}.Release|x86.ActiveCfg = Release|Any CPU
{57F08330-95BD-4FBA-8AD0-68DDA6765987}.Release|x86.Build.0 = Release|Any CPU
- {BA733731-2996-4DAF-B7BC-F699B465DB72}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {BA733731-2996-4DAF-B7BC-F699B465DB72}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {BA733731-2996-4DAF-B7BC-F699B465DB72}.Debug|Any CPU.ActiveCfg = Release|Any CPU
+ {BA733731-2996-4DAF-B7BC-F699B465DB72}.Debug|Any CPU.Build.0 = Release|Any CPU
{BA733731-2996-4DAF-B7BC-F699B465DB72}.Debug|x64.ActiveCfg = Debug|Any CPU
{BA733731-2996-4DAF-B7BC-F699B465DB72}.Debug|x64.Build.0 = Debug|Any CPU
{BA733731-2996-4DAF-B7BC-F699B465DB72}.Debug|x86.ActiveCfg = Debug|Any CPU
diff --git a/OSS.Common/Authrization/SysAuthorizeInfo.cs b/OSS.Common/Authrization/SysAuthorizeInfo.cs
index edb96c5..f988e88 100644
--- a/OSS.Common/Authrization/SysAuthorizeInfo.cs
+++ b/OSS.Common/Authrization/SysAuthorizeInfo.cs
@@ -59,7 +59,7 @@ namespace OSS.Common.Authrization
AppClient = val;
break;
case "tenant_id":
- TenantId = val;
+ TenantId = val.ToInt64();
break;
case "sign":
@@ -102,7 +102,10 @@ namespace OSS.Common.Authrization
AddSignDataValue("ip_address", IpAddress, separator, strTicketParas);
AddSignDataValue("pro_code", ProCode, separator, strTicketParas);
- AddSignDataValue("tenant_id", TenantId, separator, strTicketParas);
+ if (TenantId>0)
+ {
+ AddSignDataValue("tenant_id", TenantId.ToString(), separator, strTicketParas);
+ }
AddSignDataValue("timespan", TimeSpan.ToString(), separator, strTicketParas);
AddSignDataValue("token", Token, separator, strTicketParas);
AddSignDataValue("web_browser", WebBrowser, separator, strTicketParas);
@@ -170,7 +173,7 @@ namespace OSS.Common.Authrization
///
/// 租户ID
///
- public string TenantId { get; set; }
+ public long TenantId { get; set; }
///
/// 推广码
@@ -218,7 +221,7 @@ namespace OSS.Common.Authrization
IpAddress = val;
break;
case "tid":
- TenantId = val;
+ TenantId = val.ToInt64();
break;
case "pc":
ProCode = val;
@@ -316,7 +319,10 @@ namespace OSS.Common.Authrization
AddSignDataValue("ip", IpAddress, separator, strTicketParas);
AddSignDataValue("pc", ProCode, separator, strTicketParas);
- AddSignDataValue("tid", TenantId, separator, strTicketParas);
+ if (TenantId>0)
+ {
+ AddSignDataValue("tid", TenantId.ToString(), separator, strTicketParas);
+ }
AddSignDataValue("ts", TimeSpan.ToString(), separator, strTicketParas);
AddSignDataValue("tn", Token, separator, strTicketParas);
AddSignDataValue("wb", WebBrowser, separator, strTicketParas);
diff --git a/OSS.Common/OSS.Common.All.nupkg b/OSS.Common/OSS.Common.All.nupkg
deleted file mode 100644
index ae0a121..0000000
Binary files a/OSS.Common/OSS.Common.All.nupkg and /dev/null differ
diff --git a/OSS.Common/OSS.Common.NET46.csproj b/OSS.Common/OSS.Common.NET46.csproj
index 6dc8509..c1400c2 100644
--- a/OSS.Common/OSS.Common.NET46.csproj
+++ b/OSS.Common/OSS.Common.NET46.csproj
@@ -64,7 +64,6 @@
-
diff --git a/OSS.Common/OSS.Common.csproj b/OSS.Common/OSS.Common.csproj
index e3a629c..2d0989f 100644
--- a/OSS.Common/OSS.Common.csproj
+++ b/OSS.Common/OSS.Common.csproj
@@ -3,7 +3,7 @@
netstandard2.0
False
- 1.2.5.3
+ 1.2.5.6
False
Kevin
OSSCoder
@@ -13,9 +13,10 @@
http://img1.static.osscoder.com/logo.jpg
https://github.com/KevinWG/OSS.Common
-
- 1.2.5.3
- 1.2.5.3
+ 1.优化TenantId至值类型
+2.修复Cache插件在Framework下Get<long>为空时的转化异常
+ 1.2.5.6
+ 1.2.5.6
https://github.com/KevinWG/OSS.Common/blob/master/LICENSE
diff --git a/OSS.Common/Plugs/CachePlug/DefaultCachePlug.cs b/OSS.Common/Plugs/CachePlug/DefaultCachePlug.cs
index b1f3873..d54c50e 100644
--- a/OSS.Common/Plugs/CachePlug/DefaultCachePlug.cs
+++ b/OSS.Common/Plugs/CachePlug/DefaultCachePlug.cs
@@ -90,7 +90,8 @@ namespace OSS.Common.Plugs.CachePlug
public T Get(string key)
{
#if NETFW
- return (T)MemoryCache.Default.Get(key);
+ var val= MemoryCache.Default.Get(key) ;
+ return val == null ? default(T) : (T) val;
#else
return m_Cache.Get(key);
#endif
@@ -105,9 +106,9 @@ namespace OSS.Common.Plugs.CachePlug
public bool Remove(string key)
{
#if NETFW
- return MemoryCache.Default.Remove(key)!=null;
+ return MemoryCache.Default.Remove(key) != null;
#else
- m_Cache.Remove(key);
+ m_Cache.Remove(key);
return true;
#endif
}
diff --git a/OSS.Common/Properties/AssemblyInfo.cs b/OSS.Common/Properties/AssemblyInfo.cs
index a35f3fa..a12f028 100644
--- a/OSS.Common/Properties/AssemblyInfo.cs
+++ b/OSS.Common/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号
//通过使用 "*"，如下所示:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.2.5.6")]
+[assembly: AssemblyFileVersion("1.2.5.6")]