Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitafe7e8a

Browse files
authored
Merge pull requestliaozb#14 from haptear/master
1：增加FrameWork461的解决方案
2 parentse40782e +075d6f1 commitafe7e8a

File tree

11 files changed

+582
-125
lines changed

11 files changed

+582
-125
lines changed

‎APIJSON.NET/APIJSONCommon/ApiJson.Common.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
<PropertyGroup>
44
<TargetFramework>netstandard2.0</TargetFramework>
5+
<Version>0.0.1</Version>
6+
<Description>通用查询组件</Description>
57
</PropertyGroup>
68

79
<ItemGroup>
Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<ProjectToolsVersion="15.0"xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ImportProject="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
4+
<PropertyGroup>
5+
<ConfigurationCondition=" '$(Configuration)' == ''">Debug</Configuration>
6+
<PlatformCondition=" '$(Platform)' == ''">AnyCPU</Platform>
7+
<ProjectGuid>{DC07586E-7241-4BB5-9200-CE57A81C5E27}</ProjectGuid>
8+
<OutputType>Library</OutputType>
9+
<AppDesignerFolder>Properties</AppDesignerFolder>
10+
<RootNamespace>APIJSON.NET</RootNamespace>
11+
<AssemblyName>ApiJson.Common</AssemblyName>
12+
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
13+
<FileAlignment>512</FileAlignment>
14+
<Deterministic>true</Deterministic>
15+
<TargetFrameworkProfile />
16+
</PropertyGroup>
17+
<PropertyGroupCondition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
18+
<DebugSymbols>true</DebugSymbols>
19+
<DebugType>full</DebugType>
20+
<Optimize>false</Optimize>
21+
<OutputPath>bin\Debug\</OutputPath>
22+
<DefineConstants>DEBUG;TRACE</DefineConstants>
23+
<ErrorReport>prompt</ErrorReport>
24+
<WarningLevel>4</WarningLevel>
25+
<Prefer32Bit>false</Prefer32Bit>
26+
</PropertyGroup>
27+
<PropertyGroupCondition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
28+
<DebugType>pdbonly</DebugType>
29+
<Optimize>true</Optimize>
30+
<OutputPath>bin\Release\</OutputPath>
31+
<DefineConstants>TRACE</DefineConstants>
32+
<ErrorReport>prompt</ErrorReport>
33+
<WarningLevel>4</WarningLevel>
34+
<Prefer32Bit>false</Prefer32Bit>
35+
</PropertyGroup>
36+
<ItemGroup>
37+
<ReferenceInclude="AspectCore.Extensions.Reflection, Version=1.2.0.0, Culture=neutral, PublicKeyToken=2ab7daa5defcf11f, processorArchitecture=MSIL">
38+
<HintPath>packages\AspectCore.Extensions.Reflection.1.2.0\lib\net45\AspectCore.Extensions.Reflection.dll</HintPath>
39+
</Reference>
40+
<ReferenceInclude="Microsoft.CSharp" />
41+
<ReferenceInclude="Microsoft.Extensions.DependencyInjection.Abstractions">
42+
<HintPath>packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
43+
</Reference>
44+
<ReferenceInclude="Microsoft.Extensions.Options">
45+
<HintPath>packages\Microsoft.Extensions.Options.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Options.dll</HintPath>
46+
</Reference>
47+
<ReferenceInclude="Microsoft.Extensions.Primitives">
48+
<HintPath>packages\Microsoft.Extensions.Primitives.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll</HintPath>
49+
</Reference>
50+
<ReferenceInclude="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
51+
<HintPath>packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
52+
</Reference>
53+
<ReferenceInclude="SqlSugar, Version=4.9.9.10, Culture=neutral, processorArchitecture=MSIL">
54+
<HintPath>packages\sqlSugar.4.9.9.10\lib\SqlSugar.dll</HintPath>
55+
</Reference>
56+
<ReferenceInclude="System" />
57+
<ReferenceInclude="System.Buffers, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
58+
<HintPath>packages\System.Buffers.4.4.0\lib\netstandard2.0\System.Buffers.dll</HintPath>
59+
</Reference>
60+
<ReferenceInclude="System.ComponentModel.Annotations, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
61+
<HintPath>packages\System.ComponentModel.Annotations.4.5.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
62+
</Reference>
63+
<ReferenceInclude="System.ComponentModel.DataAnnotations" />
64+
<ReferenceInclude="System.Core" />
65+
<ReferenceInclude="System.Memory, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
66+
<HintPath>packages\System.Memory.4.5.1\lib\netstandard2.0\System.Memory.dll</HintPath>
67+
</Reference>
68+
<ReferenceInclude="System.Numerics" />
69+
<ReferenceInclude="System.Numerics.Vectors, Version=4.1.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
70+
<HintPath>packages\System.Numerics.Vectors.4.4.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
71+
</Reference>
72+
<ReferenceInclude="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
73+
<HintPath>packages\System.Runtime.CompilerServices.Unsafe.4.5.1\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
74+
</Reference>
75+
<ReferenceInclude="System.Xml.Linq" />
76+
<ReferenceInclude="System.Data.DataSetExtensions" />
77+
<ReferenceInclude="System.Data" />
78+
<ReferenceInclude="System.Net.Http" />
79+
<ReferenceInclude="System.Xml" />
80+
</ItemGroup>
81+
<ItemGroup>
82+
<CompileInclude="FuncList.cs" />
83+
<CompileInclude="Infrastructure\StringExtensions.cs" />
84+
<CompileInclude="Models\DbOptions.cs" />
85+
<CompileInclude="Models\RoleItem.cs" />
86+
<CompileInclude="Properties\AssemblyInfo.cs" />
87+
<CompileInclude="SelectTable.cs" />
88+
<CompileInclude="Services\IIdentityService.cs" />
89+
<CompileInclude="Services\ITableMapper.cs" />
90+
<CompileInclude="Services\TableMapper.cs" />
91+
</ItemGroup>
92+
<ItemGroup>
93+
<NoneInclude="app.config" />
94+
<NoneInclude="packages.config" />
95+
</ItemGroup>
96+
<ImportProject="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
97+
</Project>
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio Version 16
4+
VisualStudioVersion =16.0.28803.202
5+
MinimumVisualStudioVersion =10.0.40219.1
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") ="ApiJson.Common_461","ApiJson.Common_461.csproj","{DC07586E-7241-4BB5-9200-CE57A81C5E27}"
7+
EndProject
8+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") ="APIJSON.NET.Test","..\APIJSON.NET.Test\APIJSON.NET.Test.csproj","{3F99B6A8-3A58-4714-A0FF-186BE2874A68}"
9+
EndProject
10+
Global
11+
GlobalSection(SolutionConfigurationPlatforms) =preSolution
12+
Debug|Any CPU=Debug|Any CPU
13+
Release|Any CPU=Release|Any CPU
14+
EndGlobalSection
15+
GlobalSection(ProjectConfigurationPlatforms) =postSolution
16+
{DC07586E-7241-4BB5-9200-CE57A81C5E27}.Debug|Any CPU.ActiveCfg=Debug|Any CPU
17+
{DC07586E-7241-4BB5-9200-CE57A81C5E27}.Debug|Any CPU.Build.0=Debug|Any CPU
18+
{DC07586E-7241-4BB5-9200-CE57A81C5E27}.Release|Any CPU.ActiveCfg=Release|Any CPU
19+
{DC07586E-7241-4BB5-9200-CE57A81C5E27}.Release|Any CPU.Build.0=Release|Any CPU
20+
{3F99B6A8-3A58-4714-A0FF-186BE2874A68}.Debug|Any CPU.ActiveCfg=Debug|Any CPU
21+
{3F99B6A8-3A58-4714-A0FF-186BE2874A68}.Debug|Any CPU.Build.0=Debug|Any CPU
22+
{3F99B6A8-3A58-4714-A0FF-186BE2874A68}.Release|Any CPU.ActiveCfg=Release|Any CPU
23+
{3F99B6A8-3A58-4714-A0FF-186BE2874A68}.Release|Any CPU.Build.0=Release|Any CPU
24+
EndGlobalSection
25+
GlobalSection(SolutionProperties) =preSolution
26+
HideSolutionNode =FALSE
27+
EndGlobalSection
28+
GlobalSection(ExtensibilityGlobals) =postSolution
29+
SolutionGuid ={53F36702-3FD9-4AF5-A4C3-E3C30C943492}
30+
EndGlobalSection
31+
EndGlobal

‎APIJSON.NET/APIJSONCommon/FuncList.cs

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,34 @@ namespace APIJSON.NET
88
/// </summary>
99
publicclassFuncList
1010
{
11+
/// <summary>
12+
///
13+
/// </summary>
14+
/// <param name="a"></param>
15+
/// <param name="b"></param>
16+
/// <returns></returns>
1117
publicstringMerge(objecta,objectb)
1218
{
1319
returna.ToString()+b.ToString();
1420
}
21+
22+
/// <summary>
23+
///
24+
/// </summary>
25+
/// <param name="a"></param>
26+
/// <param name="b"></param>
27+
/// <returns></returns>
1528
publicobjectMergeObj(objecta,objectb)
1629
{
1730
returnnew{a,b};
1831
}
32+
33+
/// <summary>
34+
///
35+
/// </summary>
36+
/// <param name="a"></param>
37+
/// <param name="b"></param>
38+
/// <returns></returns>
1939
publicboolisContain(objecta,objectb)
2040
{
2141
returna.ToString().Split(',').Contains(b);

‎APIJSON.NET/APIJSONCommon/Infrastructure/StringExtensions.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,12 @@ public static bool IsValue(this object str)
1414
{
1515
returnstr!=null&&!string.IsNullOrEmpty(str.ToString());
1616
}
17+
18+
/// <summary>
19+
///
20+
/// </summary>
21+
/// <param name="param"></param>
22+
/// <returns></returns>
1723
publicstaticstringGetParamName(thisstringparam)
1824
{
1925
returnparam+newRandom().Next(1,100);

‎APIJSON.NET/APIJSONCommon/Models/DbOptions.cs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,14 @@
33
usingSqlSugar;
44
publicclassDbOptions
55
{
6+
/// <summary>
7+
///
8+
/// </summary>
69
publicDbTypeDbType{get;set;}
10+
11+
/// <summary>
12+
///
13+
/// </summary>
714
publicstringConnectionString{get;set;}
815
}
916
}
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
usingSystem.Reflection;
2+
usingSystem.Runtime.CompilerServices;
3+
usingSystem.Runtime.InteropServices;
4+
5+
// 有关程序集的一般信息由以下
6+
// 控制。更改这些特性值可修改
7+
// 与程序集关联的信息。
8+
[assembly:AssemblyTitle("ApiJson.Common")]
9+
[assembly:AssemblyDescription("单表查询的返回节点指定为Infos")]
10+
[assembly:AssemblyConfiguration("")]
11+
[assembly:AssemblyCompany("")]
12+
[assembly:AssemblyProduct("ApiJson.Common")]
13+
[assembly:AssemblyCopyright("Copyright © 2019")]
14+
[assembly:AssemblyTrademark("")]
15+
[assembly:AssemblyCulture("")]
16+
17+
// 将 ComVisible 设置为 false 会使此程序集中的类型
18+
//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型
19+
//请将此类型的 ComVisible 特性设置为 true。
20+
[assembly:ComVisible(false)]
21+
22+
// 如果此项目向 COM 公开，则下列 GUID 用于类型库的 ID
23+
[assembly:Guid("dc07586e-7241-4bb5-9200-ce57a81c5e27")]
24+
25+
// 程序集的版本信息由下列四个值组成:
26+
//
27+
// 主版本
28+
// 次版本
29+
// 生成号
30+
// 修订号
31+
//
32+
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
33+
//通过使用 "*"，如下所示:
34+
// [assembly: AssemblyVersion("1.0.*")]
35+
[assembly:AssemblyVersion("0.0.4.0")]
36+
[assembly:AssemblyFileVersion("0.0.4.0")]

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp