GithubStar/OSS.Common
1
0
Fork 0
mirror of https://github.com/KevinWG/OSS.Common.git synced 2026-10-18 22:44:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

1.优化TenantId至值类型

Browse Source 
2.修复Cache插件在Framework下Get<long>为空时的转化异常
This commit is contained in:
Kevin
2017-11-03 15:36:00 +08:00
parent 63840d4175
commit 669b8b401b
9 changed files with 58 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
OSS.Common.Tests/OSS.Common.Tests.csproj
+25 -6
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\MSTest.TestAdapter.1.1.18\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\packages\MSTest.TestAdapter.1.1.18\build\net45\MSTest.TestAdapter.props')" />
<Import Project="..\packages\MSTest.TestAdapter.1.2.0\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\packages\MSTest.TestAdapter.1.2.0\build\net45\MSTest.TestAdapter.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -39,19 +39,38 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.Extensions.Caching.Abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Extensions.Caching.Abstractions.2.0.0\lib\netstandard2.0\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Extensions.Caching.Memory, Version=2.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Extensions.Caching.Memory.2.0.0\lib\netstandard2.0\Microsoft.Extensions.Caching.Memory.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.0.0\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Extensions.Options, Version=2.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Extensions.Options.2.0.0\lib\netstandard2.0\Microsoft.Extensions.Options.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Extensions.Primitives, Version=2.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Extensions.Primitives.2.0.0\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll</HintPath>
</Reference>
<Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\MSTest.TestFramework.1.1.18\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
<HintPath>..\packages\MSTest.TestFramework.1.2.0\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
</Reference>
<Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\MSTest.TestFramework.1.1.18\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
<HintPath>..\packages\MSTest.TestFramework.1.2.0\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.4.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference>
<Reference Include="System.Security" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="EncryptTests.cs" />
<Compile Include="CacheTests.cs" />
<Compile Include="ExtentionTests.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
@@ -70,8 +89,8 @@
<PropertyGroup>
<ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\MSTest.TestAdapter.1.1.18\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.1.1.18\build\net45\MSTest.TestAdapter.props'))" />
<Error Condition="!Exists('..\packages\MSTest.TestAdapter.1.1.18\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.1.1.18\build\net45\MSTest.TestAdapter.targets'))" />
<Error Condition="!Exists('..\packages\MSTest.TestAdapter.1.2.0\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.1.2.0\build\net45\MSTest.TestAdapter.props'))" />
<Error Condition="!Exists('..\packages\MSTest.TestAdapter.1.2.0\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.1.2.0\build\net45\MSTest.TestAdapter.targets'))" />
</Target>
<Import Project="..\packages\MSTest.TestAdapter.1.1.18\build\net45\MSTest.TestAdapter.targets" Condition="Exists('..\packages\MSTest.TestAdapter.1.1.18\build\net45\MSTest.TestAdapter.targets')" />
<Import Project="..\packages\MSTest.TestAdapter.1.2.0\build\net45\MSTest.TestAdapter.targets" Condition="Exists('..\packages\MSTest.TestAdapter.1.2.0\build\net45\MSTest.TestAdapter.targets')" />
</Project>
OSS.Common.Tests/packages.config
+8 -2
View File
@@ -1,7 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="MSTest.TestAdapter" version="1.1.18" targetFramework="net461" />
<package id="MSTest.TestFramework" version="1.1.18" targetFramework="net461" />
<package id="Microsoft.Extensions.Caching.Abstractions" version="2.0.0" targetFramework="net461" />
<package id="Microsoft.Extensions.Caching.Memory" version="2.0.0" targetFramework="net461" />
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="2.0.0" targetFramework="net461" />
<package id="Microsoft.Extensions.Options" version="2.0.0" targetFramework="net461" />
<package id="Microsoft.Extensions.Primitives" version="2.0.0" targetFramework="net461" />
<package id="MSTest.TestAdapter" version="1.2.0" targetFramework="net461" />
<package id="MSTest.TestFramework" version="1.2.0" targetFramework="net461" />
<package id="System.Runtime.CompilerServices.Unsafe" version="4.4.0" targetFramework="net461" />
<package id="System.Security.Cryptography.Algorithms" version="4.3.0" targetFramework="net46" requireReinstallation="true" />
<package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net46" />
<package id="System.Xml.XmlSerializer" version="4.3.0" targetFramework="net46" />
OSS.Common.sln
+3 -3
View File
@@ -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
OSS.Common/Authrization/SysAuthorizeInfo.cs
+11 -5
View File
@@ -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
/// <summary>
/// 租户ID
/// </summary>
public string TenantId { get; set; }
public long TenantId { get; set; }
/// <summary>
/// 推广码
@@ -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);
OSS.Common/OSS.Common.All.nupkg
BIN
View File
Binary file not shown.
OSS.Common/OSS.Common.NET46.csproj
-1
View File
@@ -64,7 +64,6 @@
<Compile Include="Extention\ConvertExtention.cs" />
<Compile Include="Extention\DateTimeExtention.cs" />
<Compile Include="Extention\DTO\ColumnAliasAttribute.cs" />
<Compile Include="Extention\DTO\DTOExtetion.cs" />
<Compile Include="Extention\EnumExtention.cs" />
<Compile Include="Extention\ListExtention.cs" />
<Compile Include="Extention\TaskExtention.cs" />
OSS.Common/OSS.Common.csproj
+5 -4
View File
@@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<PackageRequireLicenseAcceptance>False</PackageRequireLicenseAcceptance>
<Version>1.2.5.3</Version>
<Version>1.2.5.6</Version>
<GeneratePackageOnBuild>False</GeneratePackageOnBuild>
<Authors>Kevin</Authors>
<Company>OSSCoder</Company>
@@ -13,9 +13,10 @@
<PackageIconUrl>http://img1.static.osscoder.com/logo.jpg</PackageIconUrl>
<RepositoryUrl>https://github.com/KevinWG/OSS.Common</RepositoryUrl>
<PackageReleaseNotes></PackageReleaseNotes>
<AssemblyVersion>1.2.5.3</AssemblyVersion>
<FileVersion>1.2.5.3</FileVersion>
<PackageReleaseNotes>1.优化TenantId至值类型
2.修复Cache插件在Framework下Get&lt;long&gt;为空时的转化异常</PackageReleaseNotes>
<AssemblyVersion>1.2.5.6</AssemblyVersion>
<FileVersion>1.2.5.6</FileVersion>
<PackageLicenseUrl>https://github.com/KevinWG/OSS.Common/blob/master/LICENSE</PackageLicenseUrl>
</PropertyGroup>
OSS.Common/Plugs/CachePlug/DefaultCachePlug.cs
+4 -3
View File
@@ -90,7 +90,8 @@ namespace OSS.Common.Plugs.CachePlug
public T Get<T>(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<T>(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
}
OSS.Common/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -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")]