From b3e8b275685a8bac9f7142a9555dbdc7350c42a0 Mon Sep 17 00:00:00 2001
From: zgcwkj <zgcwkj@139.com>
Date: Mon, 30 Jan 2023 10:43:42 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=F0=9F=A7=85=20=E8=BF=90=E8=A1=8C=E6=A1=86?=
=?UTF-8?q?=E6=9E=B6=E5=8D=87=E8=87=B3net6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../YiSha.Business.AutoJob.csproj | 2 +-
.../YiSha.Business.Cache.csproj | 2 +-
YiSha.Business/YiSha.Business/YiSha.Business.csproj | 2 +-
YiSha.Business/YiSha.Service/YiSha.Service.csproj | 2 +-
.../YiSha.Cache.Factory/YiSha.Cache.Factory.csproj | 2 +-
.../YiSha.Cache.Interface.csproj | 2 +-
.../YiSha.MemoryCache/YiSha.MemoryCache.csproj | 2 +-
.../YiSha.RedisCache/YiSha.RedisCache.csproj | 2 +-
YiSha.Data/YiSha.Data.EF/YiSha.Data.EF.csproj | 2 +-
.../YiSha.Data.Repository.csproj | 2 +-
YiSha.Data/YiSha.Data/YiSha.Data.csproj | 2 +-
YiSha.Entity/YiSha.Entity/YiSha.Entity.csproj | 2 +-
YiSha.Entity/YiSha.Enum/YiSha.Enum.csproj | 2 +-
YiSha.Entity/YiSha.Model/YiSha.Model.csproj | 2 +-
YiSha.Test/YiSha.CacheTest/YiSha.CacheTest.csproj | 8 ++++----
YiSha.Test/YiSha.DataTest/YiSha.DataTest.csproj | 13 ++++++++-----
YiSha.Test/YiSha.UtilTest/YiSha.UtilTest.csproj | 8 ++++----
.../YiSha.CodeGenerator/YiSha.CodeGenerator.csproj | 2 +-
.../YiSha.IdGenerator/YiSha.IdGenerator.csproj | 2 +-
YiSha.Util/YiSha.Util/YiSha.Util.csproj | 2 +-
YiSha.Web/YiSha.Admin.Web/YiSha.Admin.Web.csproj | 6 +++---
.../YiSha.Admin.WebApi/YiSha.Admin.WebApi.csproj | 6 +++---
YiSha.Web/YiSha.Web.Code/YiSha.Web.Code.csproj | 2 +-
23 files changed, 40 insertions(+), 37 deletions(-)
diff --git a/YiSha.Business/YiSha.Business.AutoJob/YiSha.Business.AutoJob.csproj b/YiSha.Business/YiSha.Business.AutoJob/YiSha.Business.AutoJob.csproj
index 8ff76818..265e9499 100644
--- a/YiSha.Business/YiSha.Business.AutoJob/YiSha.Business.AutoJob.csproj
+++ b/YiSha.Business/YiSha.Business.AutoJob/YiSha.Business.AutoJob.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>netcoreapp3.1</TargetFramework>
+ <TargetFramework>net6.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
diff --git a/YiSha.Business/YiSha.Business.Cache/YiSha.Business.Cache.csproj b/YiSha.Business/YiSha.Business.Cache/YiSha.Business.Cache.csproj
index 8a797e05..3633b71f 100644
--- a/YiSha.Business/YiSha.Business.Cache/YiSha.Business.Cache.csproj
+++ b/YiSha.Business/YiSha.Business.Cache/YiSha.Business.Cache.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>netcoreapp3.1</TargetFramework>
+ <TargetFramework>net6.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
diff --git a/YiSha.Business/YiSha.Business/YiSha.Business.csproj b/YiSha.Business/YiSha.Business/YiSha.Business.csproj
index 8f7f4085..a8d689a7 100644
--- a/YiSha.Business/YiSha.Business/YiSha.Business.csproj
+++ b/YiSha.Business/YiSha.Business/YiSha.Business.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>netcoreapp3.1</TargetFramework>
+ <TargetFramework>net6.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
diff --git a/YiSha.Business/YiSha.Service/YiSha.Service.csproj b/YiSha.Business/YiSha.Service/YiSha.Service.csproj
index 2e31850b..62371380 100644
--- a/YiSha.Business/YiSha.Service/YiSha.Service.csproj
+++ b/YiSha.Business/YiSha.Service/YiSha.Service.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>netcoreapp3.1</TargetFramework>
+ <TargetFramework>net6.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
diff --git a/YiSha.Cache/YiSha.Cache.Factory/YiSha.Cache.Factory.csproj b/YiSha.Cache/YiSha.Cache.Factory/YiSha.Cache.Factory.csproj
index 1de8c3b9..53bd5062 100644
--- a/YiSha.Cache/YiSha.Cache.Factory/YiSha.Cache.Factory.csproj
+++ b/YiSha.Cache/YiSha.Cache.Factory/YiSha.Cache.Factory.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>netcoreapp3.1</TargetFramework>
+ <TargetFramework>net6.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
diff --git a/YiSha.Cache/YiSha.Cache.Interface/YiSha.Cache.Interface.csproj b/YiSha.Cache/YiSha.Cache.Interface/YiSha.Cache.Interface.csproj
index cb631906..efc79faf 100644
--- a/YiSha.Cache/YiSha.Cache.Interface/YiSha.Cache.Interface.csproj
+++ b/YiSha.Cache/YiSha.Cache.Interface/YiSha.Cache.Interface.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>netcoreapp3.1</TargetFramework>
+ <TargetFramework>net6.0</TargetFramework>
</PropertyGroup>
</Project>
diff --git a/YiSha.Cache/YiSha.MemoryCache/YiSha.MemoryCache.csproj b/YiSha.Cache/YiSha.MemoryCache/YiSha.MemoryCache.csproj
index 25e99e28..7d8e148a 100644
--- a/YiSha.Cache/YiSha.MemoryCache/YiSha.MemoryCache.csproj
+++ b/YiSha.Cache/YiSha.MemoryCache/YiSha.MemoryCache.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>netcoreapp3.1</TargetFramework>
+ <TargetFramework>net6.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
diff --git a/YiSha.Cache/YiSha.RedisCache/YiSha.RedisCache.csproj b/YiSha.Cache/YiSha.RedisCache/YiSha.RedisCache.csproj
index 5c2d6f64..3093d380 100644
--- a/YiSha.Cache/YiSha.RedisCache/YiSha.RedisCache.csproj
+++ b/YiSha.Cache/YiSha.RedisCache/YiSha.RedisCache.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>netcoreapp3.1</TargetFramework>
+ <TargetFramework>net6.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
diff --git a/YiSha.Data/YiSha.Data.EF/YiSha.Data.EF.csproj b/YiSha.Data/YiSha.Data.EF/YiSha.Data.EF.csproj
index 47a68c94..6aebde8c 100644
--- a/YiSha.Data/YiSha.Data.EF/YiSha.Data.EF.csproj
+++ b/YiSha.Data/YiSha.Data.EF/YiSha.Data.EF.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>netcoreapp3.1</TargetFramework>
+ <TargetFramework>net6.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
diff --git a/YiSha.Data/YiSha.Data.Repository/YiSha.Data.Repository.csproj b/YiSha.Data/YiSha.Data.Repository/YiSha.Data.Repository.csproj
index f9a16b47..10e786ae 100644
--- a/YiSha.Data/YiSha.Data.Repository/YiSha.Data.Repository.csproj
+++ b/YiSha.Data/YiSha.Data.Repository/YiSha.Data.Repository.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>netcoreapp3.1</TargetFramework>
+ <TargetFramework>net6.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
diff --git a/YiSha.Data/YiSha.Data/YiSha.Data.csproj b/YiSha.Data/YiSha.Data/YiSha.Data.csproj
index c09f6f18..87da2263 100644
--- a/YiSha.Data/YiSha.Data/YiSha.Data.csproj
+++ b/YiSha.Data/YiSha.Data/YiSha.Data.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>netcoreapp3.1</TargetFramework>
+ <TargetFramework>net6.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
diff --git a/YiSha.Entity/YiSha.Entity/YiSha.Entity.csproj b/YiSha.Entity/YiSha.Entity/YiSha.Entity.csproj
index c077374f..7bcd5f15 100644
--- a/YiSha.Entity/YiSha.Entity/YiSha.Entity.csproj
+++ b/YiSha.Entity/YiSha.Entity/YiSha.Entity.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>netcoreapp3.1</TargetFramework>
+ <TargetFramework>net6.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
diff --git a/YiSha.Entity/YiSha.Enum/YiSha.Enum.csproj b/YiSha.Entity/YiSha.Enum/YiSha.Enum.csproj
index cb631906..efc79faf 100644
--- a/YiSha.Entity/YiSha.Enum/YiSha.Enum.csproj
+++ b/YiSha.Entity/YiSha.Enum/YiSha.Enum.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>netcoreapp3.1</TargetFramework>
+ <TargetFramework>net6.0</TargetFramework>
</PropertyGroup>
</Project>
diff --git a/YiSha.Entity/YiSha.Model/YiSha.Model.csproj b/YiSha.Entity/YiSha.Model/YiSha.Model.csproj
index 0f4ec7df..b0d30029 100644
--- a/YiSha.Entity/YiSha.Model/YiSha.Model.csproj
+++ b/YiSha.Entity/YiSha.Model/YiSha.Model.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>netcoreapp3.1</TargetFramework>
+ <TargetFramework>net6.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
diff --git a/YiSha.Test/YiSha.CacheTest/YiSha.CacheTest.csproj b/YiSha.Test/YiSha.CacheTest/YiSha.CacheTest.csproj
index 2ad902df..15c5e147 100644
--- a/YiSha.Test/YiSha.CacheTest/YiSha.CacheTest.csproj
+++ b/YiSha.Test/YiSha.CacheTest/YiSha.CacheTest.csproj
@@ -1,18 +1,18 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>netcoreapp3.1</TargetFramework>
+ <TargetFramework>net6.0</TargetFramework>
<IsPackable>false</IsPackable>
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="nunit" Version="3.12.0" />
- <PackageReference Include="NUnit3TestAdapter" Version="3.16.1">
+ <PackageReference Include="nunit" Version="3.13.3" />
+ <PackageReference Include="NUnit3TestAdapter" Version="4.3.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
- <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
+ <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
</ItemGroup>
<ItemGroup>
diff --git a/YiSha.Test/YiSha.DataTest/YiSha.DataTest.csproj b/YiSha.Test/YiSha.DataTest/YiSha.DataTest.csproj
index 482c6b37..c972335e 100644
--- a/YiSha.Test/YiSha.DataTest/YiSha.DataTest.csproj
+++ b/YiSha.Test/YiSha.DataTest/YiSha.DataTest.csproj
@@ -1,15 +1,18 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>netcoreapp3.1</TargetFramework>
+ <TargetFramework>net6.0</TargetFramework>
<IsPackable>false</IsPackable>
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="nunit" Version="3.12.0" />
- <PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
- <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
+ <PackageReference Include="nunit" Version="3.13.3" />
+ <PackageReference Include="NUnit3TestAdapter" Version="4.3.1">
+ <PrivateAssets>all</PrivateAssets>
+ <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+ </PackageReference>
+ <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
</ItemGroup>
<ItemGroup>
diff --git a/YiSha.Test/YiSha.UtilTest/YiSha.UtilTest.csproj b/YiSha.Test/YiSha.UtilTest/YiSha.UtilTest.csproj
index 9c0a9620..23bdc397 100644
--- a/YiSha.Test/YiSha.UtilTest/YiSha.UtilTest.csproj
+++ b/YiSha.Test/YiSha.UtilTest/YiSha.UtilTest.csproj
@@ -1,18 +1,18 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>netcoreapp3.1</TargetFramework>
+ <TargetFramework>net6.0</TargetFramework>
<IsPackable>false</IsPackable>
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="nunit" Version="3.12.0" />
- <PackageReference Include="NUnit3TestAdapter" Version="3.16.1">
+ <PackageReference Include="nunit" Version="3.13.3" />
+ <PackageReference Include="NUnit3TestAdapter" Version="4.3.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
- <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
+ <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
</ItemGroup>
<ItemGroup>
diff --git a/YiSha.Util/YiSha.CodeGenerator/YiSha.CodeGenerator.csproj b/YiSha.Util/YiSha.CodeGenerator/YiSha.CodeGenerator.csproj
index 5ed26c42..46a5fc1e 100644
--- a/YiSha.Util/YiSha.CodeGenerator/YiSha.CodeGenerator.csproj
+++ b/YiSha.Util/YiSha.CodeGenerator/YiSha.CodeGenerator.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>netcoreapp3.1</TargetFramework>
+ <TargetFramework>net6.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
diff --git a/YiSha.Util/YiSha.IdGenerator/YiSha.IdGenerator.csproj b/YiSha.Util/YiSha.IdGenerator/YiSha.IdGenerator.csproj
index 9bc5667f..065798b6 100644
--- a/YiSha.Util/YiSha.IdGenerator/YiSha.IdGenerator.csproj
+++ b/YiSha.Util/YiSha.IdGenerator/YiSha.IdGenerator.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>netcoreapp3.1</TargetFramework>
+ <TargetFramework>net6.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
diff --git a/YiSha.Util/YiSha.Util/YiSha.Util.csproj b/YiSha.Util/YiSha.Util/YiSha.Util.csproj
index 4271ba26..8d183668 100644
--- a/YiSha.Util/YiSha.Util/YiSha.Util.csproj
+++ b/YiSha.Util/YiSha.Util/YiSha.Util.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>netcoreapp3.1</TargetFramework>
+ <TargetFramework>net6.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
diff --git a/YiSha.Web/YiSha.Admin.Web/YiSha.Admin.Web.csproj b/YiSha.Web/YiSha.Admin.Web/YiSha.Admin.Web.csproj
index aa73d6bc..da6f49a0 100644
--- a/YiSha.Web/YiSha.Admin.Web/YiSha.Admin.Web.csproj
+++ b/YiSha.Web/YiSha.Admin.Web/YiSha.Admin.Web.csproj
@@ -1,9 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
- <TargetFramework>netcoreapp3.1</TargetFramework>
- <AssemblyVersion>3.1.0.0</AssemblyVersion>
- <FileVersion>3.1.0.0</FileVersion>
+ <TargetFramework>net6.0</TargetFramework>
+ <AssemblyVersion>6.0.0.0</AssemblyVersion>
+ <FileVersion>6.0.0.0</FileVersion>
<Company>YiSha.Admin.Web</Company>
<Authors>YiSha.Admin.Web</Authors>
<Product>YiShaAdmin</Product>
diff --git a/YiSha.Web/YiSha.Admin.WebApi/YiSha.Admin.WebApi.csproj b/YiSha.Web/YiSha.Admin.WebApi/YiSha.Admin.WebApi.csproj
index 03bb4b79..7830bfdd 100644
--- a/YiSha.Web/YiSha.Admin.WebApi/YiSha.Admin.WebApi.csproj
+++ b/YiSha.Web/YiSha.Admin.WebApi/YiSha.Admin.WebApi.csproj
@@ -1,9 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
- <TargetFramework>netcoreapp3.1</TargetFramework>
- <AssemblyVersion>3.1.0.0</AssemblyVersion>
- <FileVersion>3.1.0.0</FileVersion>
+ <TargetFramework>net6.0</TargetFramework>
+ <AssemblyVersion>6.0.0.0</AssemblyVersion>
+ <FileVersion>6.0.0.0</FileVersion>
<Copyright>YiShaAdmin</Copyright>
</PropertyGroup>
diff --git a/YiSha.Web/YiSha.Web.Code/YiSha.Web.Code.csproj b/YiSha.Web/YiSha.Web.Code/YiSha.Web.Code.csproj
index 65a5cfc7..590cc933 100644
--- a/YiSha.Web/YiSha.Web.Code/YiSha.Web.Code.csproj
+++ b/YiSha.Web/YiSha.Web.Code/YiSha.Web.Code.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>netcoreapp3.1</TargetFramework>
+ <TargetFramework>net6.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
From 6ff7e01efc364c08ddaabc15b94fa70ddc120228 Mon Sep 17 00:00:00 2001
From: liukuo362573 <liukuo.lk@163.com>
Date: Sat, 4 Mar 2023 00:58:54 +0800
Subject: [PATCH 2/5] Update README.md
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index a38d6e85..32e59619 100644
--- a/README.md
+++ b/README.md
@@ -50,7 +50,7 @@
2. 创建开发分支 (`git checkout -b dev`)
3. 提交更改 (`git commit -m 'Add something'`)
4. 推送到分支 (`git push origin dev`)
-5. 提[Pull Request](https://github.com/liukuo362573/YiShaAdmin/compare)
+5. 提[Pull Request](https://github.com/liukuo362573/YiShaAdmin/compare)，建议每一个小功能提一个 PR
## License
From ab04c606d3483685ee82dcc14a3addf2a2e845e6 Mon Sep 17 00:00:00 2001
From: dingfs <shoucao@vip.qq.com>
Date: Tue, 4 Apr 2023 15:21:17 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E6=A1=86=E6=9E=B6?=
=?UTF-8?q?=E4=B8=BANet7,=E5=B9=B6=E6=9B=B4=E6=96=B0=E6=89=80=E6=9C=89?=
=?UTF-8?q?=E5=BC=95=E7=94=A8=E4=B8=BA=E6=9C=80=E6=96=B0=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../YiSha.Business.AutoJob.csproj | 4 ++--
.../YiSha.Business.Cache/YiSha.Business.Cache.csproj | 2 +-
YiSha.Business/YiSha.Business/YiSha.Business.csproj | 2 +-
YiSha.Business/YiSha.Service/YiSha.Service.csproj | 2 +-
.../YiSha.Cache.Factory/YiSha.Cache.Factory.csproj | 2 +-
.../YiSha.Cache.Interface.csproj | 2 +-
.../YiSha.MemoryCache/YiSha.MemoryCache.csproj | 4 ++--
YiSha.Cache/YiSha.RedisCache/YiSha.RedisCache.csproj | 4 ++--
YiSha.Data/YiSha.Data.EF/YiSha.Data.EF.csproj | 8 ++++----
.../YiSha.Data.Repository.csproj | 2 +-
YiSha.Data/YiSha.Data/DbHelper.cs | 8 ++++----
YiSha.Data/YiSha.Data/YiSha.Data.csproj | 10 +++++-----
YiSha.Entity/YiSha.Entity/YiSha.Entity.csproj | 2 +-
YiSha.Entity/YiSha.Enum/YiSha.Enum.csproj | 2 +-
YiSha.Entity/YiSha.Model/YiSha.Model.csproj | 2 +-
YiSha.Test/YiSha.CacheTest/YiSha.CacheTest.csproj | 6 +++---
YiSha.Test/YiSha.DataTest/YiSha.DataTest.csproj | 6 +++---
YiSha.Test/YiSha.UtilTest/YiSha.UtilTest.csproj | 6 +++---
.../YiSha.CodeGenerator/YiSha.CodeGenerator.csproj | 4 ++--
.../YiSha.IdGenerator/YiSha.IdGenerator.csproj | 2 +-
YiSha.Util/YiSha.Util/YiSha.Util.csproj | 12 ++++++------
YiSha.Web/YiSha.Admin.Web/YiSha.Admin.Web.csproj | 12 ++++++------
.../YiSha.Admin.WebApi/YiSha.Admin.WebApi.csproj | 8 ++++----
YiSha.Web/YiSha.Web.Code/YiSha.Web.Code.csproj | 2 +-
24 files changed, 57 insertions(+), 57 deletions(-)
diff --git a/YiSha.Business/YiSha.Business.AutoJob/YiSha.Business.AutoJob.csproj b/YiSha.Business/YiSha.Business.AutoJob/YiSha.Business.AutoJob.csproj
index 265e9499..e94a6739 100644
--- a/YiSha.Business/YiSha.Business.AutoJob/YiSha.Business.AutoJob.csproj
+++ b/YiSha.Business/YiSha.Business.AutoJob/YiSha.Business.AutoJob.csproj
@@ -1,11 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFramework>net7.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="Quartz" Version="3.0.7" />
+ <PackageReference Include="Quartz" Version="3.6.2" />
</ItemGroup>
<ItemGroup>
diff --git a/YiSha.Business/YiSha.Business.Cache/YiSha.Business.Cache.csproj b/YiSha.Business/YiSha.Business.Cache/YiSha.Business.Cache.csproj
index 3633b71f..cb0ec96f 100644
--- a/YiSha.Business/YiSha.Business.Cache/YiSha.Business.Cache.csproj
+++ b/YiSha.Business/YiSha.Business.Cache/YiSha.Business.Cache.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFramework>net7.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
diff --git a/YiSha.Business/YiSha.Business/YiSha.Business.csproj b/YiSha.Business/YiSha.Business/YiSha.Business.csproj
index a8d689a7..7d747e49 100644
--- a/YiSha.Business/YiSha.Business/YiSha.Business.csproj
+++ b/YiSha.Business/YiSha.Business/YiSha.Business.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFramework>net7.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
diff --git a/YiSha.Business/YiSha.Service/YiSha.Service.csproj b/YiSha.Business/YiSha.Service/YiSha.Service.csproj
index 62371380..b4dbbe8e 100644
--- a/YiSha.Business/YiSha.Service/YiSha.Service.csproj
+++ b/YiSha.Business/YiSha.Service/YiSha.Service.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFramework>net7.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
diff --git a/YiSha.Cache/YiSha.Cache.Factory/YiSha.Cache.Factory.csproj b/YiSha.Cache/YiSha.Cache.Factory/YiSha.Cache.Factory.csproj
index 53bd5062..2b90cbc8 100644
--- a/YiSha.Cache/YiSha.Cache.Factory/YiSha.Cache.Factory.csproj
+++ b/YiSha.Cache/YiSha.Cache.Factory/YiSha.Cache.Factory.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFramework>net7.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
diff --git a/YiSha.Cache/YiSha.Cache.Interface/YiSha.Cache.Interface.csproj b/YiSha.Cache/YiSha.Cache.Interface/YiSha.Cache.Interface.csproj
index efc79faf..f7882473 100644
--- a/YiSha.Cache/YiSha.Cache.Interface/YiSha.Cache.Interface.csproj
+++ b/YiSha.Cache/YiSha.Cache.Interface/YiSha.Cache.Interface.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFramework>net7.0</TargetFramework>
</PropertyGroup>
</Project>
diff --git a/YiSha.Cache/YiSha.MemoryCache/YiSha.MemoryCache.csproj b/YiSha.Cache/YiSha.MemoryCache/YiSha.MemoryCache.csproj
index 7d8e148a..7ab6e0c3 100644
--- a/YiSha.Cache/YiSha.MemoryCache/YiSha.MemoryCache.csproj
+++ b/YiSha.Cache/YiSha.MemoryCache/YiSha.MemoryCache.csproj
@@ -1,11 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFramework>net7.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="3.1.0" />
+ <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="7.0.0" />
</ItemGroup>
<ItemGroup>
diff --git a/YiSha.Cache/YiSha.RedisCache/YiSha.RedisCache.csproj b/YiSha.Cache/YiSha.RedisCache/YiSha.RedisCache.csproj
index 3093d380..04b7ca6c 100644
--- a/YiSha.Cache/YiSha.RedisCache/YiSha.RedisCache.csproj
+++ b/YiSha.Cache/YiSha.RedisCache/YiSha.RedisCache.csproj
@@ -1,11 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFramework>net7.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="StackExchange.Redis" Version="2.0.600" />
+ <PackageReference Include="StackExchange.Redis" Version="2.6.104" />
</ItemGroup>
<ItemGroup>
diff --git a/YiSha.Data/YiSha.Data.EF/YiSha.Data.EF.csproj b/YiSha.Data/YiSha.Data.EF/YiSha.Data.EF.csproj
index 6aebde8c..76acd859 100644
--- a/YiSha.Data/YiSha.Data.EF/YiSha.Data.EF.csproj
+++ b/YiSha.Data/YiSha.Data.EF/YiSha.Data.EF.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFramework>net7.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
@@ -10,9 +10,9 @@
</ItemGroup>
<ItemGroup>
- <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.5" />
- <PackageReference Include="Oracle.ManagedDataAccess.Core" Version="3.21.1" />
- <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="5.0.0" />
+ <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.4" />
+ <PackageReference Include="Oracle.ManagedDataAccess.Core" Version="3.21.90" />
+ <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="7.0.0" />
</ItemGroup>
<ItemGroup>
diff --git a/YiSha.Data/YiSha.Data.Repository/YiSha.Data.Repository.csproj b/YiSha.Data/YiSha.Data.Repository/YiSha.Data.Repository.csproj
index 10e786ae..d7674752 100644
--- a/YiSha.Data/YiSha.Data.Repository/YiSha.Data.Repository.csproj
+++ b/YiSha.Data/YiSha.Data.Repository/YiSha.Data.Repository.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFramework>net7.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
diff --git a/YiSha.Data/YiSha.Data/DbHelper.cs b/YiSha.Data/YiSha.Data/DbHelper.cs
index 15243b5d..09819b9f 100644
--- a/YiSha.Data/YiSha.Data/DbHelper.cs
+++ b/YiSha.Data/YiSha.Data/DbHelper.cs
@@ -101,7 +101,7 @@ public async Task<IDataReader> ExecuteReadeAsync(CommandType cmdType, string str
dbContext,
Guid.NewGuid(),
connection.ConnectionId,
- startTime);
+ startTime,CommandSource.ExecuteSqlRaw);
var reader = interceptionResult.HasResult
? interceptionResult.Result
@@ -117,7 +117,7 @@ public async Task<IDataReader> ExecuteReadeAsync(CommandType cmdType, string str
connection.ConnectionId,
reader,
startTime,
- stopwatch.Elapsed);
+ stopwatch.Elapsed,CommandSource.ExecuteSqlRaw);
}
return reader;
}
@@ -169,7 +169,7 @@ public async Task<object> ExecuteScalarAsync(CommandType cmdType, string strSql,
dbContext,
Guid.NewGuid(),
connection.ConnectionId,
- startTime);
+ startTime, CommandSource.ExecuteSqlRaw);
var obj = interceptionResult.HasResult
? interceptionResult.Result
@@ -185,7 +185,7 @@ public async Task<object> ExecuteScalarAsync(CommandType cmdType, string strSql,
connection.ConnectionId,
obj,
startTime,
- stopwatch.Elapsed);
+ stopwatch.Elapsed, CommandSource.ExecuteSqlRaw);
}
return obj;
}
diff --git a/YiSha.Data/YiSha.Data/YiSha.Data.csproj b/YiSha.Data/YiSha.Data/YiSha.Data.csproj
index 87da2263..91026bf6 100644
--- a/YiSha.Data/YiSha.Data/YiSha.Data.csproj
+++ b/YiSha.Data/YiSha.Data/YiSha.Data.csproj
@@ -1,14 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFramework>net7.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="5.0.5" />
- <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.5" />
- <PackageReference Include="MySqlConnector" Version="1.3.8" />
- <PackageReference Include="Oracle.ManagedDataAccess.Core" Version="3.21.1" />
+ <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.4" />
+ <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.4" />
+ <PackageReference Include="MySqlConnector" Version="2.2.5" />
+ <PackageReference Include="Oracle.ManagedDataAccess.Core" Version="3.21.90" />
</ItemGroup>
<ItemGroup>
diff --git a/YiSha.Entity/YiSha.Entity/YiSha.Entity.csproj b/YiSha.Entity/YiSha.Entity/YiSha.Entity.csproj
index 7bcd5f15..35c884a9 100644
--- a/YiSha.Entity/YiSha.Entity/YiSha.Entity.csproj
+++ b/YiSha.Entity/YiSha.Entity/YiSha.Entity.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFramework>net7.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
diff --git a/YiSha.Entity/YiSha.Enum/YiSha.Enum.csproj b/YiSha.Entity/YiSha.Enum/YiSha.Enum.csproj
index efc79faf..f7882473 100644
--- a/YiSha.Entity/YiSha.Enum/YiSha.Enum.csproj
+++ b/YiSha.Entity/YiSha.Enum/YiSha.Enum.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFramework>net7.0</TargetFramework>
</PropertyGroup>
</Project>
diff --git a/YiSha.Entity/YiSha.Model/YiSha.Model.csproj b/YiSha.Entity/YiSha.Model/YiSha.Model.csproj
index b0d30029..d80b1c14 100644
--- a/YiSha.Entity/YiSha.Model/YiSha.Model.csproj
+++ b/YiSha.Entity/YiSha.Model/YiSha.Model.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFramework>net7.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
diff --git a/YiSha.Test/YiSha.CacheTest/YiSha.CacheTest.csproj b/YiSha.Test/YiSha.CacheTest/YiSha.CacheTest.csproj
index 15c5e147..74160554 100644
--- a/YiSha.Test/YiSha.CacheTest/YiSha.CacheTest.csproj
+++ b/YiSha.Test/YiSha.CacheTest/YiSha.CacheTest.csproj
@@ -1,18 +1,18 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFramework>net7.0</TargetFramework>
<IsPackable>false</IsPackable>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="nunit" Version="3.13.3" />
- <PackageReference Include="NUnit3TestAdapter" Version="4.3.1">
+ <PackageReference Include="NUnit3TestAdapter" Version="4.4.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
- <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
+ <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
</ItemGroup>
<ItemGroup>
diff --git a/YiSha.Test/YiSha.DataTest/YiSha.DataTest.csproj b/YiSha.Test/YiSha.DataTest/YiSha.DataTest.csproj
index c972335e..7f57f234 100644
--- a/YiSha.Test/YiSha.DataTest/YiSha.DataTest.csproj
+++ b/YiSha.Test/YiSha.DataTest/YiSha.DataTest.csproj
@@ -1,18 +1,18 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFramework>net7.0</TargetFramework>
<IsPackable>false</IsPackable>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="nunit" Version="3.13.3" />
- <PackageReference Include="NUnit3TestAdapter" Version="4.3.1">
+ <PackageReference Include="NUnit3TestAdapter" Version="4.4.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
- <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
+ <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
</ItemGroup>
<ItemGroup>
diff --git a/YiSha.Test/YiSha.UtilTest/YiSha.UtilTest.csproj b/YiSha.Test/YiSha.UtilTest/YiSha.UtilTest.csproj
index 23bdc397..91f03040 100644
--- a/YiSha.Test/YiSha.UtilTest/YiSha.UtilTest.csproj
+++ b/YiSha.Test/YiSha.UtilTest/YiSha.UtilTest.csproj
@@ -1,18 +1,18 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFramework>net7.0</TargetFramework>
<IsPackable>false</IsPackable>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="nunit" Version="3.13.3" />
- <PackageReference Include="NUnit3TestAdapter" Version="4.3.1">
+ <PackageReference Include="NUnit3TestAdapter" Version="4.4.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
- <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
+ <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
</ItemGroup>
<ItemGroup>
diff --git a/YiSha.Util/YiSha.CodeGenerator/YiSha.CodeGenerator.csproj b/YiSha.Util/YiSha.CodeGenerator/YiSha.CodeGenerator.csproj
index 46a5fc1e..a5a70524 100644
--- a/YiSha.Util/YiSha.CodeGenerator/YiSha.CodeGenerator.csproj
+++ b/YiSha.Util/YiSha.CodeGenerator/YiSha.CodeGenerator.csproj
@@ -1,11 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFramework>net7.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.0" />
+ <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.4" />
</ItemGroup>
<ItemGroup>
diff --git a/YiSha.Util/YiSha.IdGenerator/YiSha.IdGenerator.csproj b/YiSha.Util/YiSha.IdGenerator/YiSha.IdGenerator.csproj
index 065798b6..ca58f64d 100644
--- a/YiSha.Util/YiSha.IdGenerator/YiSha.IdGenerator.csproj
+++ b/YiSha.Util/YiSha.IdGenerator/YiSha.IdGenerator.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFramework>net7.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
diff --git a/YiSha.Util/YiSha.Util/YiSha.Util.csproj b/YiSha.Util/YiSha.Util/YiSha.Util.csproj
index 8d183668..9105b7e2 100644
--- a/YiSha.Util/YiSha.Util/YiSha.Util.csproj
+++ b/YiSha.Util/YiSha.Util/YiSha.Util.csproj
@@ -1,19 +1,19 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFramework>net7.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<FrameworkReference Include="Microsoft.AspNetCore.App" />
- <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.0" />
- <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8">
+ <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.4" />
+ <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
- <PackageReference Include="NLog.Web.AspNetCore" Version="4.9.2" />
- <PackageReference Include="NPOI" Version="2.4.1" />
- <PackageReference Include="System.Drawing.Common" Version="4.7.0" />
+ <PackageReference Include="NLog.Web.AspNetCore" Version="5.2.3" />
+ <PackageReference Include="NPOI" Version="2.6.0" />
+ <PackageReference Include="System.Drawing.Common" Version="7.0.0" />
</ItemGroup>
<ItemGroup>
diff --git a/YiSha.Web/YiSha.Admin.Web/YiSha.Admin.Web.csproj b/YiSha.Web/YiSha.Admin.Web/YiSha.Admin.Web.csproj
index da6f49a0..c22692e4 100644
--- a/YiSha.Web/YiSha.Admin.Web/YiSha.Admin.Web.csproj
+++ b/YiSha.Web/YiSha.Admin.Web/YiSha.Admin.Web.csproj
@@ -1,9 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
- <AssemblyVersion>6.0.0.0</AssemblyVersion>
- <FileVersion>6.0.0.0</FileVersion>
+ <TargetFramework>net7.0</TargetFramework>
+ <AssemblyVersion>7.0.0.0</AssemblyVersion>
+ <FileVersion>7.0.0.0</FileVersion>
<Company>YiSha.Admin.Web</Company>
<Authors>YiSha.Admin.Web</Authors>
<Product>YiShaAdmin</Product>
@@ -18,9 +18,9 @@
</ItemGroup>
<ItemGroup>
- <PackageReference Include="BuildBundlerMinifier" Version="3.2.435" />
- <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.0" />
- <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="3.1.0" />
+ <PackageReference Include="BuildBundlerMinifier" Version="3.2.449" />
+ <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.4" />
+ <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="7.0.4" />
</ItemGroup>
<ItemGroup>
diff --git a/YiSha.Web/YiSha.Admin.WebApi/YiSha.Admin.WebApi.csproj b/YiSha.Web/YiSha.Admin.WebApi/YiSha.Admin.WebApi.csproj
index 7830bfdd..cdfe84df 100644
--- a/YiSha.Web/YiSha.Admin.WebApi/YiSha.Admin.WebApi.csproj
+++ b/YiSha.Web/YiSha.Admin.WebApi/YiSha.Admin.WebApi.csproj
@@ -1,9 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
- <AssemblyVersion>6.0.0.0</AssemblyVersion>
- <FileVersion>6.0.0.0</FileVersion>
+ <TargetFramework>net7.0</TargetFramework>
+ <AssemblyVersion>7.0.0.0</AssemblyVersion>
+ <FileVersion>7.0.0.0</FileVersion>
<Copyright>YiShaAdmin</Copyright>
</PropertyGroup>
@@ -18,7 +18,7 @@
</ItemGroup>
<ItemGroup>
- <PackageReference Include="Swashbuckle.AspNetCore" Version="6.1.4" />
+ <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
</ItemGroup>
<ItemGroup>
diff --git a/YiSha.Web/YiSha.Web.Code/YiSha.Web.Code.csproj b/YiSha.Web/YiSha.Web.Code/YiSha.Web.Code.csproj
index 590cc933..af513a6c 100644
--- a/YiSha.Web/YiSha.Web.Code/YiSha.Web.Code.csproj
+++ b/YiSha.Web/YiSha.Web.Code/YiSha.Web.Code.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFramework>net7.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
From bbc0ff532574cbfe83b13c544778b5729a662750 Mon Sep 17 00:00:00 2001
From: "Fusheng.ding" <shoucao_66@hotmail.com>
Date: Wed, 15 Nov 2023 19:36:11 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E4=B8=BA=20.net=208=20?=
=?UTF-8?q?=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../YiSha.Business.AutoJob/YiSha.Business.AutoJob.csproj | 2 +-
YiSha.Business/YiSha.Business.Cache/YiSha.Business.Cache.csproj | 2 +-
YiSha.Business/YiSha.Business/YiSha.Business.csproj | 2 +-
YiSha.Business/YiSha.Service/YiSha.Service.csproj | 2 +-
YiSha.Cache/YiSha.Cache.Factory/YiSha.Cache.Factory.csproj | 2 +-
YiSha.Cache/YiSha.Cache.Interface/YiSha.Cache.Interface.csproj | 2 +-
YiSha.Cache/YiSha.MemoryCache/YiSha.MemoryCache.csproj | 2 +-
YiSha.Cache/YiSha.RedisCache/YiSha.RedisCache.csproj | 2 +-
YiSha.Data/YiSha.Data.EF/YiSha.Data.EF.csproj | 2 +-
YiSha.Data/YiSha.Data.Repository/YiSha.Data.Repository.csproj | 2 +-
YiSha.Data/YiSha.Data/YiSha.Data.csproj | 2 +-
YiSha.Entity/YiSha.Entity/YiSha.Entity.csproj | 2 +-
YiSha.Entity/YiSha.Enum/YiSha.Enum.csproj | 2 +-
YiSha.Entity/YiSha.Model/YiSha.Model.csproj | 2 +-
YiSha.Test/YiSha.CacheTest/YiSha.CacheTest.csproj | 2 +-
YiSha.Test/YiSha.DataTest/YiSha.DataTest.csproj | 2 +-
YiSha.Test/YiSha.UtilTest/YiSha.UtilTest.csproj | 2 +-
YiSha.Util/YiSha.CodeGenerator/YiSha.CodeGenerator.csproj | 2 +-
YiSha.Util/YiSha.IdGenerator/YiSha.IdGenerator.csproj | 2 +-
YiSha.Util/YiSha.Util/YiSha.Util.csproj | 2 +-
YiSha.Web/YiSha.Admin.Web/YiSha.Admin.Web.csproj | 2 +-
YiSha.Web/YiSha.Admin.Web/wwwroot/yisha/js/yisha.min.js | 2 +-
YiSha.Web/YiSha.Admin.WebApi/YiSha.Admin.WebApi.csproj | 2 +-
YiSha.Web/YiSha.Web.Code/YiSha.Web.Code.csproj | 2 +-
24 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/YiSha.Business/YiSha.Business.AutoJob/YiSha.Business.AutoJob.csproj b/YiSha.Business/YiSha.Business.AutoJob/YiSha.Business.AutoJob.csproj
index e94a6739..fedbad7d 100644
--- a/YiSha.Business/YiSha.Business.AutoJob/YiSha.Business.AutoJob.csproj
+++ b/YiSha.Business/YiSha.Business.AutoJob/YiSha.Business.AutoJob.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net7.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
diff --git a/YiSha.Business/YiSha.Business.Cache/YiSha.Business.Cache.csproj b/YiSha.Business/YiSha.Business.Cache/YiSha.Business.Cache.csproj
index cb0ec96f..e07b8f0f 100644
--- a/YiSha.Business/YiSha.Business.Cache/YiSha.Business.Cache.csproj
+++ b/YiSha.Business/YiSha.Business.Cache/YiSha.Business.Cache.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net7.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
diff --git a/YiSha.Business/YiSha.Business/YiSha.Business.csproj b/YiSha.Business/YiSha.Business/YiSha.Business.csproj
index 7d747e49..a1d86972 100644
--- a/YiSha.Business/YiSha.Business/YiSha.Business.csproj
+++ b/YiSha.Business/YiSha.Business/YiSha.Business.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net7.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
diff --git a/YiSha.Business/YiSha.Service/YiSha.Service.csproj b/YiSha.Business/YiSha.Service/YiSha.Service.csproj
index b4dbbe8e..a65b539e 100644
--- a/YiSha.Business/YiSha.Service/YiSha.Service.csproj
+++ b/YiSha.Business/YiSha.Service/YiSha.Service.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net7.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
diff --git a/YiSha.Cache/YiSha.Cache.Factory/YiSha.Cache.Factory.csproj b/YiSha.Cache/YiSha.Cache.Factory/YiSha.Cache.Factory.csproj
index 2b90cbc8..d2c71eeb 100644
--- a/YiSha.Cache/YiSha.Cache.Factory/YiSha.Cache.Factory.csproj
+++ b/YiSha.Cache/YiSha.Cache.Factory/YiSha.Cache.Factory.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net7.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
diff --git a/YiSha.Cache/YiSha.Cache.Interface/YiSha.Cache.Interface.csproj b/YiSha.Cache/YiSha.Cache.Interface/YiSha.Cache.Interface.csproj
index f7882473..95ce5f9a 100644
--- a/YiSha.Cache/YiSha.Cache.Interface/YiSha.Cache.Interface.csproj
+++ b/YiSha.Cache/YiSha.Cache.Interface/YiSha.Cache.Interface.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net7.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
</PropertyGroup>
</Project>
diff --git a/YiSha.Cache/YiSha.MemoryCache/YiSha.MemoryCache.csproj b/YiSha.Cache/YiSha.MemoryCache/YiSha.MemoryCache.csproj
index 7ab6e0c3..527c1a08 100644
--- a/YiSha.Cache/YiSha.MemoryCache/YiSha.MemoryCache.csproj
+++ b/YiSha.Cache/YiSha.MemoryCache/YiSha.MemoryCache.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net7.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
diff --git a/YiSha.Cache/YiSha.RedisCache/YiSha.RedisCache.csproj b/YiSha.Cache/YiSha.RedisCache/YiSha.RedisCache.csproj
index 04b7ca6c..c07877be 100644
--- a/YiSha.Cache/YiSha.RedisCache/YiSha.RedisCache.csproj
+++ b/YiSha.Cache/YiSha.RedisCache/YiSha.RedisCache.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net7.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
diff --git a/YiSha.Data/YiSha.Data.EF/YiSha.Data.EF.csproj b/YiSha.Data/YiSha.Data.EF/YiSha.Data.EF.csproj
index 76acd859..dd6f8e14 100644
--- a/YiSha.Data/YiSha.Data.EF/YiSha.Data.EF.csproj
+++ b/YiSha.Data/YiSha.Data.EF/YiSha.Data.EF.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net7.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
diff --git a/YiSha.Data/YiSha.Data.Repository/YiSha.Data.Repository.csproj b/YiSha.Data/YiSha.Data.Repository/YiSha.Data.Repository.csproj
index d7674752..96a66c3a 100644
--- a/YiSha.Data/YiSha.Data.Repository/YiSha.Data.Repository.csproj
+++ b/YiSha.Data/YiSha.Data.Repository/YiSha.Data.Repository.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net7.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
diff --git a/YiSha.Data/YiSha.Data/YiSha.Data.csproj b/YiSha.Data/YiSha.Data/YiSha.Data.csproj
index 91026bf6..6ddf8d9e 100644
--- a/YiSha.Data/YiSha.Data/YiSha.Data.csproj
+++ b/YiSha.Data/YiSha.Data/YiSha.Data.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net7.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
diff --git a/YiSha.Entity/YiSha.Entity/YiSha.Entity.csproj b/YiSha.Entity/YiSha.Entity/YiSha.Entity.csproj
index 35c884a9..72e5a391 100644
--- a/YiSha.Entity/YiSha.Entity/YiSha.Entity.csproj
+++ b/YiSha.Entity/YiSha.Entity/YiSha.Entity.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net7.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
diff --git a/YiSha.Entity/YiSha.Enum/YiSha.Enum.csproj b/YiSha.Entity/YiSha.Enum/YiSha.Enum.csproj
index f7882473..95ce5f9a 100644
--- a/YiSha.Entity/YiSha.Enum/YiSha.Enum.csproj
+++ b/YiSha.Entity/YiSha.Enum/YiSha.Enum.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net7.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
</PropertyGroup>
</Project>
diff --git a/YiSha.Entity/YiSha.Model/YiSha.Model.csproj b/YiSha.Entity/YiSha.Model/YiSha.Model.csproj
index d80b1c14..1d879b6c 100644
--- a/YiSha.Entity/YiSha.Model/YiSha.Model.csproj
+++ b/YiSha.Entity/YiSha.Model/YiSha.Model.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net7.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
diff --git a/YiSha.Test/YiSha.CacheTest/YiSha.CacheTest.csproj b/YiSha.Test/YiSha.CacheTest/YiSha.CacheTest.csproj
index 74160554..10ebfdcc 100644
--- a/YiSha.Test/YiSha.CacheTest/YiSha.CacheTest.csproj
+++ b/YiSha.Test/YiSha.CacheTest/YiSha.CacheTest.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net7.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
<IsPackable>false</IsPackable>
</PropertyGroup>
diff --git a/YiSha.Test/YiSha.DataTest/YiSha.DataTest.csproj b/YiSha.Test/YiSha.DataTest/YiSha.DataTest.csproj
index 7f57f234..0249f232 100644
--- a/YiSha.Test/YiSha.DataTest/YiSha.DataTest.csproj
+++ b/YiSha.Test/YiSha.DataTest/YiSha.DataTest.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net7.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
<IsPackable>false</IsPackable>
</PropertyGroup>
diff --git a/YiSha.Test/YiSha.UtilTest/YiSha.UtilTest.csproj b/YiSha.Test/YiSha.UtilTest/YiSha.UtilTest.csproj
index 91f03040..4aa964de 100644
--- a/YiSha.Test/YiSha.UtilTest/YiSha.UtilTest.csproj
+++ b/YiSha.Test/YiSha.UtilTest/YiSha.UtilTest.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net7.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
<IsPackable>false</IsPackable>
</PropertyGroup>
diff --git a/YiSha.Util/YiSha.CodeGenerator/YiSha.CodeGenerator.csproj b/YiSha.Util/YiSha.CodeGenerator/YiSha.CodeGenerator.csproj
index a5a70524..96d0ac9f 100644
--- a/YiSha.Util/YiSha.CodeGenerator/YiSha.CodeGenerator.csproj
+++ b/YiSha.Util/YiSha.CodeGenerator/YiSha.CodeGenerator.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net7.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
diff --git a/YiSha.Util/YiSha.IdGenerator/YiSha.IdGenerator.csproj b/YiSha.Util/YiSha.IdGenerator/YiSha.IdGenerator.csproj
index ca58f64d..6ffde92c 100644
--- a/YiSha.Util/YiSha.IdGenerator/YiSha.IdGenerator.csproj
+++ b/YiSha.Util/YiSha.IdGenerator/YiSha.IdGenerator.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net7.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
diff --git a/YiSha.Util/YiSha.Util/YiSha.Util.csproj b/YiSha.Util/YiSha.Util/YiSha.Util.csproj
index 9105b7e2..7683aa4c 100644
--- a/YiSha.Util/YiSha.Util/YiSha.Util.csproj
+++ b/YiSha.Util/YiSha.Util/YiSha.Util.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net7.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
diff --git a/YiSha.Web/YiSha.Admin.Web/YiSha.Admin.Web.csproj b/YiSha.Web/YiSha.Admin.Web/YiSha.Admin.Web.csproj
index c22692e4..66d623f1 100644
--- a/YiSha.Web/YiSha.Admin.Web/YiSha.Admin.Web.csproj
+++ b/YiSha.Web/YiSha.Admin.Web/YiSha.Admin.Web.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
- <TargetFramework>net7.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
<AssemblyVersion>7.0.0.0</AssemblyVersion>
<FileVersion>7.0.0.0</FileVersion>
<Company>YiSha.Admin.Web</Company>
diff --git a/YiSha.Web/YiSha.Admin.Web/wwwroot/yisha/js/yisha.min.js b/YiSha.Web/YiSha.Admin.Web/wwwroot/yisha/js/yisha.min.js
index 4cc18626..827dbaa6 100644
--- a/YiSha.Web/YiSha.Admin.Web/wwwroot/yisha/js/yisha.min.js
+++ b/YiSha.Web/YiSha.Admin.Web/wwwroot/yisha/js/yisha.min.js
@@ -1 +1 @@
-window.ys={},function(n,t){"use strict";n.extend(t,{openDialog:function(i){t.isMobile()?(i.width="auto",i.height="auto"):i.height||(i.height=n(window).height()-50+"px");var r=n.extend({type:2,title:"",width:"768px",content:"",maxmin:!0,shade:.4,btn:["确认","关闭"],callback:null,shadeClose:!1,fix:!1,closeBtn:1},i);layer.open({type:r.type,area:[r.width,r.height],maxmin:r.maxmin,shade:r.shade,title:r.title,content:r.content,btn:r.btn,shadeClose:r.shadeClose,fix:r.fix,closeBtn:r.closeBtn,yes:r.callback,cancel:function(){return!0}})},openDialogContent:function(i){t.isMobile()?(i.width="auto",i.height="auto"):i.height||(i.height=n(window).height()-50+"px");var r=n.extend({type:1,title:!1,width:"768px",content:"",maxmin:!1,shade:.4,btn:null,callback:null,shadeClose:!0,fix:!0,closeBtn:0},i);layer.open({type:r.type,area:[r.width,r.height],maxmin:r.maxmin,shade:r.shade,title:r.title,content:r.content,btn:r.btn,shadeClose:r.shadeClose,fix:r.fix,closeBtn:r.closeBtn,yes:r.callback,cancel:function(){return!0}})},closeDialog:function(){var n=parent.layer.getFrameIndex(window.name);parent.layer.close(n)},msgWarning:function(n){layer.msg(n,{icon:0,time:1e3,shift:5})},msgSuccess:function(n){t.isNullOrEmpty(n)&&(n="操作成功");top.layer.msg(n,{icon:1,time:1e3,shift:5})},msgError:function(n){t.isNullOrEmpty(n)&&(n="操作失败");layer.msg(n,{icon:2,time:3e3,shift:5})},alertWarning:function(n){layer.alert(n,{icon:0,title:"系统提示",btn:["确认"],btnclass:["btn btn-primary"]})},alertSuccess:function(n){layer.alert(n,{icon:1,title:"系统提示",btn:["确认"],btnclass:["btn btn-primary"]})},alertError:function(n){layer.alert(n,{icon:2,title:"系统提示",btn:["确认"],btnclass:["btn btn-primary"]})},confirm:function(n,t){layer.confirm(n,{icon:3,title:"系统提示",btn:["确认","取消"],btnclass:["btn btn-primary","btn btn-danger"]},function(n){layer.close(n);t(!0)})},showLoading:function(t){n.blockUI({message:'<div class="loaderbox"><div class="loading-activity"><\/div> '+t+"<\/div>",css:{border:"none",backgroundColor:"transparent"}})},closeLoading:function(){setTimeout(function(){n.unblockUI()},50)},getIds:function(t){var i="";return n.each(t,function(n,t){n==0?i=t.Id:i+=","+t.Id}),i},checkRowEdit:function(n){if(n.length==0)t.msgError("您没有选择任何行！");else if(n.length>1)t.msgError("您的选择大于1行！");else if(n.length==1)return!0;return!1},checkRowDelete:function(n){if(n.length==0)t.msgError("您没有选择任何行！");else if(n.length>0)return!0;return!1},ajax:function(i){var r=n.extend({url:i.url,"async":!0,type:"get",data:i.data||{},dataType:i.dataType||"json",error:function(){t.alertError("系统出错了")},success:function(){t.msgSuccess()},beforeSend:function(){t.showLoading("正在处理中...")},complete:function(){t.closeLoading()}},i);if(t.isNullOrEmpty(r.url)){t.alertError("url 参数不能为空");return}n.ajax({url:r.url,"async":r.async,type:r.type,data:r.data,dataType:r.dataType,error:r.error,success:r.success,beforeSend:r.beforeSend,complete:r.complete})},ajaxUploadFile:function(i){var r=n.extend({url:i.url,data:i.data||{},error:function(){t.alertError("系统出错了")},success:function(){t.msgSuccess()},beforeSend:function(){t.showLoading("正在处理中...")},complete:function(){t.closeLoading()}},i);if(t.isNullOrEmpty(r.url)){t.alertError("url 参数不能为空");return}if(t.isNullOrEmpty(r.data)){t.alertError("data 参数不能为空");return}n.ajax({url:r.url,data:r.data,type:"post",processData:!1,contentType:!1,error:r.error,success:r.success,beforeSend:r.beforeSend,complete:r.complete})},exportExcel:function(n,i){t.ajax({url:n,type:"post",data:i,success:function(n){n.Tag==1?window.location.href=ctx+"File/DownloadFile?filePath="+n.Data+"&delete=1":t.msgError(n.Message)},beforeSend:function(){t.showLoading("正在导出数据，请稍后...")}})},request:function(n){var i=decodeURI(window.location.search),r=new RegExp("(^|&)"+n+"=([^&]*)(&|$)"),t=i.substr(1).match(r);return t!=null?unescape(t[2]):null},getHttpFileName:function(n){if(n==null||n=="")return n;var t=n.lastIndexOf("/");return t>0?n.substring(t+1):n},getFileNameWithoutExtension:function(n){if(n==null||n=="")return n;var t=n.indexOf(".");return t>0?n.substring(0,t):n},changeURLParam:function(n,t,i){var e=t+"=([^&]*)",r=t+"="+i,f,u;return n.match(e)?(f="/("+t+"=)([^&]*)/gi",n.replace(eval(f),r)):n.match("[?]")?(u=n.split("#"),u.length>1?u[0]+"&"+r+"#"+u[1]:n+"&"+r):n+"?"+r},isNullOrEmpty:function(n){return typeof n=="string"&&n==""||n==null||n==undefined?!0:!1},getJson:function(n){return n},getGuid:function(){for(var i,t="",n=1;n<=32;n++)i=Math.floor(Math.random()*16).toString(16),t+=i,(n==8||n==12||n==16||n==20)&&(t+="-");return t},getValueByKey:function(t,i){var r="";return n.each(t,function(n,t){t.Key==i&&(r=t.Value)}),r},getLastValue:function(n){if(!t.isNullOrEmpty(n)){var i=n.toString().split(",");return i[i.length-1]}return""},formatDate:function(n,t){var i,r,u;if(!n)return"";i=n;typeof n=="string"&&(i=n.indexOf("/Date(")>-1?new Date(parseInt(n.replace("/Date(","").replace(")/",""),10)):new Date(Date.parse(n.replace(/-/g,"/").replace("T"," ").split(".")[0])));r={"M+":i.getMonth()+1,"d+":i.getDate(),"H+":i.getHours(),"m+":i.getMinutes(),"s+":i.getSeconds(),"q+":Math.floor((i.getMonth()+3)/3),S:i.getMilliseconds()};/(y+)/.test(t)&&(t=t.replace(RegExp.$1,(i.getFullYear()+"").substr(4-RegExp.$1.length)));for(u in r)new RegExp("("+u+")").test(t)&&(t=t.replace(RegExp.$1,RegExp.$1.length==1?r[u]:("00"+r[u]).substr((""+r[u]).length)));return t},trimStart:function(n,t){var r,i;return t==null||t==""?n.replace(/^s*/,""):(r=new RegExp("^"+t+"*"),i=n.replace(r,""),i)},trimEnd:function(n,t){var r,i;if(t==null||t==""){for(r=/s/,i=n.length;r.test(n.charAt(--i)););return n.slice(0,i+1)}for(r=new RegExp(t),i=n.length;r.test(n.charAt(--i)););return n.slice(0,i+1)},toString:function(n){return n==null?"":n.toString()},openLink:function(n,t){var i=document.createElement("a");i.target=t?t:"_blank";i.href=n;i.click()},recursion:function(n,i,r,u,f){u||(u="id");f||(f="parentId");for(var e in n)if(n[e][u]==i)return r.push(n[e]),t.recursion(n,n[e][f],r,u,f)},isMobile:function(){return navigator.userAgent.match(/(Android|iPhone|SymbianOS|Windows Phone|iPad|iPod)/i)}})}(window.jQuery,window.ys),function(n){"use strict";n.fn.ysRadioBox=function(t,i){var u,f,r,e;return typeof t=="string"?n.fn.ysRadioBox.methods[t](this,i):(u=n(this),f=u.attr("id"),!f)?!1:(r=n.extend({url:null,key:"Key",value:"Value",data:null,dataName:"Data","default":undefined},t),e={loadData:function(){r.url&&n.ajax({url:r.url,type:"get",dataType:"json","async":!1,cache:!1,success:function(n){r.data=n;r.dataName&&r.data!=null&&(r.data=r.data[r.dataName])},error:function(){throw exception;}})},render:function(t){if(t.data&&t.data.length>=0){var r=u.attr("ref"),e=f+"_radiobox",i="";n.each(t.data,function(n){var u=t.data[n];i+="<label class='radio-box'>";i+="<input type='radio' name='"+e+"' value='"+u[t.key]+"' ref='"+r+"' /> "+u[t.value];i+="<\/label>";u.IsDefault==1&&(t.default=u[t.key])});u.append(i)}t.default!=undefined&&u.ysRadioBox("setValue",t.default)}},e.loadData(),e.render(r),u)};n.fn.ysRadioBox.methods={getValue:function(t){var i="";return n(t).find("div.checked").each(function(t,r){i+=n(r).find("input[type=radio]").val();i+=","}),i.indexOf(",")>=0&&(i=i.substring(0,i.length-1)),i},setValue:function(t,i){if(!ys.isNullOrEmpty(i)){typeof i!="string"&&(i=i.toString());n(t).find("div").each(function(t,i){n(i).removeClass("checked")});var r=i.split(",");n.each(r,function(i,r){var u=n(t).find("input[type=radio][value="+r+"]");u.attr("checked",!0);u.parent().addClass("checked")})}}};n.fn.ysCheckBox=function(t,i){var u,f,r,e;return typeof t=="string"?n.fn.ysCheckBox.methods[t](this,i):(u=n(this),f=u.attr("id"),!f)?!1:(r=n.extend({url:null,key:"Key",value:"Value",data:null,dataName:"Data","default":undefined},t),e={loadData:function(){r.url&&(n.ajax({url:r.url,type:"get",dataType:"json","async":!1,cache:!1,success:function(n){r.data=n},error:function(){throw exception;}}),r.dataName&&r.data!=null&&(r.data=r.data[r.dataName]))},render:function(t){if(t.data&&t.data.length>=0){var r=f+"_checkbox",i="";n.each(t.data,function(n){var u=t.data[n];i+="<label class='check-box'>";i+="<input name='"+r+"' type='checkbox' value='"+u[t.key]+"'>"+u[t.value]+"<\/input>";i+="<\/label>";u.IsDefault==1&&(t.default=u[t.key])});u.append(i)}t.default!=undefined&&u.ysCheckBox("setValue",t.default)}},e.loadData(),e.render(r),u)};n.fn.ysCheckBox.methods={getValue:function(t){var i="";return n(t).find("div.checked").each(function(t,r){i+=n(r).find("input[type=checkbox]").val();i+=","}),i.indexOf(",")>=0&&(i=i.substring(0,i.length-1)),i},setValue:function(t,i){if(!ys.isNullOrEmpty(i)){typeof i!="string"&&(i=i.toString());var r=i.split(",");n.each(r,function(i,r){var u=n(t).find("input[type=checkbox][value="+r+"]");u.attr("checked",!0);u.parent().addClass("checked")})}}};n.fn.ysComboBox=function(t,i){var u,f,r,e;return typeof t=="string"?n.fn.ysComboBox.methods[t](this,i):(u=n(this),f=u.attr("id"),!f)?!1:(r=n.extend({url:null,key:"Key",value:"Value",maxHeight:"160px","class":null,multiple:!1,data:null,dataName:"Data",onChange:null,"default":undefined},t),e={loadData:function(){r.url&&(n.ajax({url:r.url,type:"get",dataType:"json","async":!1,cache:!1,success:function(n){r.data=n},error:function(){throw exception;}}),r.dataName&&r.data!=null&&(r.data=r.data[r.dataName]))},render:function(t){var r,o,e,s,i,h;t.data&&t.data.length>=0&&(r=f+"_select",o="",t.multiple&&(o='multiple=""'),e="<select id='"+r+"' name='"+r+"' class='"+ys.toString(t.class)+" select2' "+o+" maxheight="+t.maxHeight+">",s=n("#"+r).length>0,s&&n("#"+r).empty(),i="",h=!1,t.data.length>0&&(h=t.data[0][t.value]instanceof Array),h||(t.class?t.multiple||(i+="<option value='' selected='selected'>请选择<\/option>"):i+="<option value='-1'>全部<\/option>"),n.each(t.data,function(r){var u=t.data[r];typeof u=="string"?i+="<option value='"+u+"'>"+u+"<\/option>":u[t.value]instanceof Array?(i+="<optgroup label='--"+u[t.key]+"--'>",n.each(u[t.value],function(n){var r=u[t.value][n];i+="<option value='"+r[t.key]+"'>"+r[t.value]+"<\/option>";u.IsDefault==1&&(t.default=u[t.key])})):(i+="<option value='"+u[t.key]+"'>"+u[t.value]+"<\/option>",u.IsDefault==1&&(t.default=u[t.key]))}),s?n("#"+r).append(i):(e+=i,e+="<\/select>",u.append(e),t.onChange&&n("#"+r).change(t.onChange)),n("#"+r).select2(),t.class||n("#"+f).find(".select2-container").width(280),t.default!=undefined&&u.ysComboBox("setValue",t.default))}},e.loadData(),e.render(r),u)};n.fn.ysComboBox.methods={getValue:function(t){var i=n("#"+n(t).attr("id")+"_select").select2("val");return i==null?"":i.toString()},setValue:function(t,i){ys.isNullOrEmpty(i)||(typeof i!="string"&&(i=i.toString()),n("#"+n(t).attr("id")+"_select").val(i.split(",")).trigger("change"))}};n.fn.getWebControls=function(t){var i={};return t&&typeof t=="object"&&(i=t),n(this).find("[col]").each(function(t,r){var f=n(r).attr("id"),u=n(r).attr("col");r.tagName=="INPUT"?r.type=="checkbox"?n(r).prop("checked")&&(i[u]=i[u]?i[u]+","+n(r).val():n(r).val()):r.type=="radio"?n(r).prop("checked")&&(i[u]=n(r).val()):i[u]=n(r).val():r.tagName=="SELECT"?i[u]=n(r).val():r.tagName=="DIV"?i[u]=n(r).find("#"+f+"_tree").length>0?n(r).ysComboBoxTree("getValue"):n(r).find("#"+f+"_select").length>0?n(r).ysComboBox("getValue"):n(r).find("input[type=checkbox]").length>0?n(r).ysCheckBox("getValue"):n(r).find("input[type=radio]").length>0?n(r).ysRadioBox("getValue"):n(r).html():r.tagName=="IMG"?i[u]=n(r).prop("src"):r.tagName=="SPAN"?i[u]=n(r).find("#"+f+"_select").length>0?n(r).ysComboBox("getValue"):n(r).html():r.tagName=="TEXTAREA"&&(i[u]=n(r).val())}),i};n.fn.setWebControls=function(t){return n(this).find("[col]").each(function(i,r){var f=n(r).attr("id"),u=n(r).attr("col");r.tagName=="INPUT"?r.type=="checkbox"?n(r).val()==t[u]&&n(r).prop("checked","checked"):r.type=="radio"?n(r).val()==t[u]&&(n(r).iCheck?n(r).iCheck("check"):n(r).prop("checked",!0)):n(r).val(t[u]):r.tagName=="SELECT"?n(r).val(t[u]):r.tagName=="DIV"?n(r).find("#"+f+"_tree").length>0?n(r).ysComboBoxTree("setValue",t[u]):n(r).find("#"+f+"_select").length>0?n(r).ysComboBox("setValue",t[u]):n(r).find("input[type=checkbox]").length>0?n(r).ysCheckBox("setValue",t[u]):n(r).find("input[type=radio]").length>0?n(r).ysRadioBox("setValue",t[u]):n(r).html(t[u]):r.tagName=="SPAN"?n(r).html(t[u]):r.tagName=="TEXTAREA"&&n(r).val(t[u])}),t}}(window.jQuery);
\ No newline at end of file
+window.ys={},function(n,t){"use strict";n.extend(t,{openDialog:function(i){t.isMobile()?(i.width="auto",i.height="auto"):i.height||(i.height=n(window).height()-50+"px");var r=n.extend({type:2,title:"",width:"768px",content:"",maxmin:!0,shade:.4,btn:["确认","关闭"],callback:null,shadeClose:!1,fix:!1,closeBtn:1},i);layer.open({type:r.type,area:[r.width,r.height],maxmin:r.maxmin,shade:r.shade,title:r.title,content:r.content,btn:r.btn,shadeClose:r.shadeClose,fix:r.fix,closeBtn:r.closeBtn,yes:r.callback,cancel:function(){return!0}})},openDialogContent:function(i){t.isMobile()?(i.width="auto",i.height="auto"):i.height||(i.height=n(window).height()-50+"px");var r=n.extend({type:1,title:!1,width:"768px",content:"",maxmin:!1,shade:.4,btn:null,callback:null,shadeClose:!0,fix:!0,closeBtn:0},i);layer.open({type:r.type,area:[r.width,r.height],maxmin:r.maxmin,shade:r.shade,title:r.title,content:r.content,btn:r.btn,shadeClose:r.shadeClose,fix:r.fix,closeBtn:r.closeBtn,yes:r.callback,cancel:function(){return!0}})},closeDialog:function(){var n=parent.layer.getFrameIndex(window.name);parent.layer.close(n)},msgWarning:function(n){layer.msg(n,{icon:0,time:1e3,shift:5})},msgSuccess:function(n){t.isNullOrEmpty(n)&&(n="操作成功");top.layer.msg(n,{icon:1,time:1e3,shift:5})},msgError:function(n){t.isNullOrEmpty(n)&&(n="操作失败");layer.msg(n,{icon:2,time:3e3,shift:5})},alertWarning:function(n){layer.alert(n,{icon:0,title:"系统提示",btn:["确认"],btnclass:["btn btn-primary"]})},alertSuccess:function(n){layer.alert(n,{icon:1,title:"系统提示",btn:["确认"],btnclass:["btn btn-primary"]})},alertError:function(n){layer.alert(n,{icon:2,title:"系统提示",btn:["确认"],btnclass:["btn btn-primary"]})},confirm:function(n,t){layer.confirm(n,{icon:3,title:"系统提示",btn:["确认","取消"],btnclass:["btn btn-primary","btn btn-danger"]},function(n){layer.close(n);t(!0)})},showLoading:function(t){n.blockUI({message:'<div class="loaderbox"><div class="loading-activity"><\/div> '+t+"<\/div>",css:{border:"none",backgroundColor:"transparent"}})},closeLoading:function(){setTimeout(function(){n.unblockUI()},50)},getIds:function(t){var i="";return n.each(t,function(n,t){n==0?i=t.Id:i+=","+t.Id}),i},checkRowEdit:function(n){if(n.length==0)t.msgError("您没有选择任何行！");else if(n.length>1)t.msgError("您的选择大于1行！");else if(n.length==1)return!0;return!1},checkRowDelete:function(n){if(n.length==0)t.msgError("您没有选择任何行！");else if(n.length>0)return!0;return!1},ajax:function(i){var r=n.extend({url:i.url,"async":!0,type:"get",data:i.data||{},dataType:i.dataType||"json",error:function(){t.alertError("系统出错了")},success:function(){t.msgSuccess()},beforeSend:function(){t.showLoading("正在处理中...")},complete:function(){t.closeLoading()}},i);if(t.isNullOrEmpty(r.url)){t.alertError("url 参数不能为空");return}n.ajax({url:r.url,"async":r.async,type:r.type,data:r.data,dataType:r.dataType,error:r.error,success:r.success,beforeSend:r.beforeSend,complete:r.complete})},ajaxUploadFile:function(i){var r=n.extend({url:i.url,data:i.data||{},error:function(){t.alertError("系统出错了")},success:function(){t.msgSuccess()},beforeSend:function(){t.showLoading("正在处理中...")},complete:function(){t.closeLoading()}},i);if(t.isNullOrEmpty(r.url)){t.alertError("url 参数不能为空");return}if(t.isNullOrEmpty(r.data)){t.alertError("data 参数不能为空");return}n.ajax({url:r.url,data:r.data,type:"post",processData:!1,contentType:!1,error:r.error,success:r.success,beforeSend:r.beforeSend,complete:r.complete})},exportExcel:function(n,i){t.ajax({url:n,type:"post",data:i,success:function(n){n.Tag==1?window.location.href=ctx+"File/DownloadFile?filePath="+n.Data+"&delete=1":t.msgError(n.Message)},beforeSend:function(){t.showLoading("正在导出数据，请稍后...")}})},request:function(n){var i=decodeURI(window.location.search),r=new RegExp("(^|&)"+n+"=([^&]*)(&|$)"),t=i.substr(1).match(r);return t!=null?unescape(t[2]):null},getHttpFileName:function(n){if(n==null||n=="")return n;var t=n.lastIndexOf("/");return t>0?n.substring(t+1):n},getFileNameWithoutExtension:function(n){if(n==null||n=="")return n;var t=n.indexOf(".");return t>0?n.substring(0,t):n},changeURLParam:function(n,t,i){var e=t+"=([^&]*)",r=t+"="+i,f,u;return n.match(e)?(f="/("+t+"=)([^&]*)/gi",n.replace(eval(f),r)):n.match("[?]")?(u=n.split("#"),u.length>1?u[0]+"&"+r+"#"+u[1]:n+"&"+r):n+"?"+r},isNullOrEmpty:function(n){return typeof n=="string"&&n==""||n==null||n==undefined?!0:!1},getJson:function(n){return n},getGuid:function(){for(var i,t="",n=1;n<=32;n++)i=Math.floor(Math.random()*16).toString(16),t+=i,(n==8||n==12||n==16||n==20)&&(t+="-");return t},getValueByKey:function(t,i){var r="";return n.each(t,function(n,t){t.Key==i&&(r=t.Value)}),r},getLastValue:function(n){if(!t.isNullOrEmpty(n)){var i=n.toString().split(",");return i[i.length-1]}return""},formatDate:function(n,t){var i,r,u;if(!n)return"";i=n;typeof n=="string"&&(i=n.indexOf("/Date(")>-1?new Date(parseInt(n.replace("/Date(","").replace(")/",""),10)):new Date(Date.parse(n.replace(/-/g,"/").replace("T"," ").split(".")[0])));r={"M+":i.getMonth()+1,"d+":i.getDate(),"H+":i.getHours(),"m+":i.getMinutes(),"s+":i.getSeconds(),"q+":Math.floor((i.getMonth()+3)/3),S:i.getMilliseconds()};/(y+)/.test(t)&&(t=t.replace(RegExp.$1,(i.getFullYear()+"").substr(4-RegExp.$1.length)));for(u in r)new RegExp("("+u+")").test(t)&&(t=t.replace(RegExp.$1,RegExp.$1.length==1?r[u]:("00"+r[u]).substr((""+r[u]).length)));return t},trimStart:function(n,t){var r,i;return t==null||t==""?n.replace(/^s*/,""):(r=new RegExp("^"+t+"*"),i=n.replace(r,""),i)},trimEnd:function(n,t){var r,i;if(t==null||t==""){for(r=/s/,i=n.length;r.test(n.charAt(--i)););return n.slice(0,i+1)}for(r=new RegExp(t),i=n.length;r.test(n.charAt(--i)););return n.slice(0,i+1)},toString:function(n){return n==null?"":n.toString()},openLink:function(n,t){var i=document.createElement("a");i.target=t?t:"_blank";i.href=n;i.click()},recursion:function(n,i,r,u,f){u||(u="id");f||(f="parentId");for(var e in n)if(n[e][u]==i)return r.push(n[e]),t.recursion(n,n[e][f],r,u,f)},isMobile:function(){return navigator.userAgent.match(/(Android|iPhone|SymbianOS|Windows Phone|iPad|iPod)/i)}})}(window.jQuery,window.ys),function(n){"use strict";n.fn.ysRadioBox=function(t,i){var u,f,r,e;return typeof t=="string"?n.fn.ysRadioBox.methods[t](this,i):(u=n(this),f=u.attr("id"),!f)?!1:(r=n.extend({url:null,key:"Key",value:"Value",data:null,dataName:"Data","default":undefined},t),e={loadData:function(){r.url&&n.ajax({url:r.url,type:"get",dataType:"json","async":!1,cache:!1,success:function(n){r.data=n;r.dataName&&r.data!=null&&(r.data=r.data[r.dataName])},error:function(){throw exception;}})},render:function(t){if(t.data&&t.data.length>=0){var r=u.attr("ref"),e=f+"_radiobox",i="";n.each(t.data,function(n){var u=t.data[n];i+="<label class='radio-box'>";i+="<input type='radio' name='"+e+"' value='"+u[t.key]+"' ref='"+r+"' /> "+u[t.value];i+="<\/label>";u.IsDefault==1&&(t.default=u[t.key])});u.append(i)}t.default!=undefined&&u.ysRadioBox("setValue",t.default)}},e.loadData(),e.render(r),u)};n.fn.ysRadioBox.methods={getValue:function(t){var i="";return n(t).find("div.checked").each(function(t,r){i+=n(r).find("input[type=radio]").val();i+=","}),i.indexOf(",")>=0&&(i=i.substring(0,i.length-1)),i},setValue:function(t,i){if(!ys.isNullOrEmpty(i)){typeof i!="string"&&(i=i.toString());n(t).find("div").each(function(t,i){n(i).removeClass("checked")});var r=i.split(",");n.each(r,function(i,r){var u=n(t).find("input[type=radio][value="+r+"]");u.attr("checked",!0);u.parent().addClass("checked")})}}};n.fn.ysCheckBox=function(t,i){var u,f,r,e;return typeof t=="string"?n.fn.ysCheckBox.methods[t](this,i):(u=n(this),f=u.attr("id"),!f)?!1:(r=n.extend({url:null,key:"Key",value:"Value",data:null,dataName:"Data","default":undefined},t),e={loadData:function(){r.url&&(n.ajax({url:r.url,type:"get",dataType:"json","async":!1,cache:!1,success:function(n){r.data=n},error:function(){throw exception;}}),r.dataName&&r.data!=null&&(r.data=r.data[r.dataName]))},render:function(t){if(t.data&&t.data.length>=0){var r=f+"_checkbox",i="";n.each(t.data,function(n){var u=t.data[n];i+="<label class='check-box'>";i+="<input name='"+r+"' type='checkbox' value='"+u[t.key]+"'>"+u[t.value]+"<\/input>";i+="<\/label>";u.IsDefault==1&&(t.default=u[t.key])});u.append(i)}t.default!=undefined&&u.ysCheckBox("setValue",t.default)}},e.loadData(),e.render(r),u)};n.fn.ysCheckBox.methods={getValue:function(t){var i="";return n(t).find("div.checked").each(function(t,r){i+=n(r).find("input[type=checkbox]").val();i+=","}),i.indexOf(",")>=0&&(i=i.substring(0,i.length-1)),i},setValue:function(t,i){if(!ys.isNullOrEmpty(i)){typeof i!="string"&&(i=i.toString());var r=i.split(",");n.each(r,function(i,r){var u=n(t).find("input[type=checkbox][value="+r+"]");u.attr("checked",!0);u.parent().addClass("checked")})}}};n.fn.ysComboBox=function(t,i){var u,f,r,e;return typeof t=="string"?n.fn.ysComboBox.methods[t](this,i):(u=n(this),f=u.attr("id"),!f)?!1:(r=n.extend({url:null,key:"Key",value:"Value",maxHeight:"160px","class":null,multiple:!1,data:null,dataName:"Data",onChange:null,"default":undefined},t),e={loadData:function(){r.url&&(n.ajax({url:r.url,type:"get",dataType:"json","async":!1,cache:!1,success:function(n){r.data=n},error:function(){throw exception;}}),r.dataName&&r.data!=null&&(r.data=r.data[r.dataName]))},render:function(t){var r,o,e,s,i,h;t.data&&t.data.length>=0&&(r=f+"_select",o="",t.multiple&&(o='multiple=""'),e="<select id='"+r+"' name='"+r+"' class='"+ys.toString(t.class)+" select2' "+o+" maxheight="+t.maxHeight+">",s=n("#"+r).length>0,s&&n("#"+r).empty(),i="",h=!1,t.data.length>0&&(h=t.data[0][t.value]instanceof Array),h||(t.class?t.multiple||(i+="<option value='' selected='selected'>请选择<\/option>"):i+="<option value='-1'>全部<\/option>"),n.each(t.data,function(r){var u=t.data[r];typeof u=="string"?i+="<option value='"+u+"'>"+u+"<\/option>":u[t.value]instanceof Array?(i+="<optgroup label='--"+u[t.key]+"--'>",n.each(u[t.value],function(n){var r=u[t.value][n];i+="<option value='"+r[t.key]+"'>"+r[t.value]+"<\/option>";u.IsDefault==1&&(t.default=u[t.key])})):(i+="<option value='"+u[t.key]+"'>"+u[t.value]+"<\/option>",u.IsDefault==1&&(t.default=u[t.key]))}),s?n("#"+r).append(i):(e+=i,e+="<\/select>",u.append(e),t.onChange&&n("#"+r).change(t.onChange)),n("#"+r).select2(),t.class||n("#"+f).find(".select2-container").width(280),t.default!=undefined&&t.class&&u.ysComboBox("setValue",t.default))}},e.loadData(),e.render(r),u)};n.fn.ysComboBox.methods={getValue:function(t){var i=n("#"+n(t).attr("id")+"_select").select2("val");return i==null?"":i.toString()},setValue:function(t,i){ys.isNullOrEmpty(i)||(typeof i!="string"&&(i=i.toString()),n("#"+n(t).attr("id")+"_select").val(i.split(",")).trigger("change"))}};n.fn.getWebControls=function(t){var i={};return t&&typeof t=="object"&&(i=t),n(this).find("[col]").each(function(t,r){var f=n(r).attr("id"),u=n(r).attr("col");r.tagName=="INPUT"?r.type=="checkbox"?n(r).prop("checked")&&(i[u]=i[u]?i[u]+","+n(r).val():n(r).val()):r.type=="radio"?n(r).prop("checked")&&(i[u]=n(r).val()):i[u]=n(r).val():r.tagName=="SELECT"?i[u]=n(r).val():r.tagName=="DIV"?i[u]=n(r).find("#"+f+"_tree").length>0?n(r).ysComboBoxTree("getValue"):n(r).find("#"+f+"_select").length>0?n(r).ysComboBox("getValue"):n(r).find("input[type=checkbox]").length>0?n(r).ysCheckBox("getValue"):n(r).find("input[type=radio]").length>0?n(r).ysRadioBox("getValue"):n(r).html():r.tagName=="IMG"?i[u]=n(r).prop("src"):r.tagName=="SPAN"?i[u]=n(r).find("#"+f+"_select").length>0?n(r).ysComboBox("getValue"):n(r).html():r.tagName=="TEXTAREA"&&(i[u]=n(r).val())}),i};n.fn.setWebControls=function(t){return n(this).find("[col]").each(function(i,r){var f=n(r).attr("id"),u=n(r).attr("col");r.tagName=="INPUT"?r.type=="checkbox"?n(r).val()==t[u]&&n(r).prop("checked","checked"):r.type=="radio"?n(r).val()==t[u]&&(n(r).iCheck?n(r).iCheck("check"):n(r).prop("checked",!0)):n(r).val(t[u]):r.tagName=="SELECT"?n(r).val(t[u]):r.tagName=="DIV"?n(r).find("#"+f+"_tree").length>0?n(r).ysComboBoxTree("setValue",t[u]):n(r).find("#"+f+"_select").length>0?n(r).ysComboBox("setValue",t[u]):n(r).find("input[type=checkbox]").length>0?n(r).ysCheckBox("setValue",t[u]):n(r).find("input[type=radio]").length>0?n(r).ysRadioBox("setValue",t[u]):n(r).html(t[u]):r.tagName=="SPAN"?n(r).html(t[u]):r.tagName=="TEXTAREA"&&n(r).val(t[u])}),t}}(window.jQuery);
\ No newline at end of file
diff --git a/YiSha.Web/YiSha.Admin.WebApi/YiSha.Admin.WebApi.csproj b/YiSha.Web/YiSha.Admin.WebApi/YiSha.Admin.WebApi.csproj
index cdfe84df..d11c41c7 100644
--- a/YiSha.Web/YiSha.Admin.WebApi/YiSha.Admin.WebApi.csproj
+++ b/YiSha.Web/YiSha.Admin.WebApi/YiSha.Admin.WebApi.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
- <TargetFramework>net7.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
<AssemblyVersion>7.0.0.0</AssemblyVersion>
<FileVersion>7.0.0.0</FileVersion>
<Copyright>YiShaAdmin</Copyright>
diff --git a/YiSha.Web/YiSha.Web.Code/YiSha.Web.Code.csproj b/YiSha.Web/YiSha.Web.Code/YiSha.Web.Code.csproj
index af513a6c..1e6db65d 100644
--- a/YiSha.Web/YiSha.Web.Code/YiSha.Web.Code.csproj
+++ b/YiSha.Web/YiSha.Web.Code/YiSha.Web.Code.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net7.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
From e71cb0d1aade48f4a79eb5687e09574a2a9e8750 Mon Sep 17 00:00:00 2001
From: "Fusheng.ding" <shoucao_66@hotmail.com>
Date: Fri, 17 Nov 2023 22:36:56 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E6=89=80=E6=9C=89?=
=?UTF-8?q?=E5=BC=95=E7=94=A8=E5=8C=85=E4=B8=BA=E6=9C=80=E6=96=B0=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../YiSha.Business.AutoJob/YiSha.Business.AutoJob.csproj | 2 +-
YiSha.Cache/YiSha.MemoryCache/YiSha.MemoryCache.csproj | 2 +-
YiSha.Cache/YiSha.RedisCache/YiSha.RedisCache.csproj | 2 +-
YiSha.Data/YiSha.Data.EF/YiSha.Data.EF.csproj | 4 ++--
YiSha.Data/YiSha.Data/YiSha.Data.csproj | 8 ++++----
YiSha.Test/YiSha.CacheTest/YiSha.CacheTest.csproj | 6 +++---
YiSha.Test/YiSha.DataTest/YiSha.DataTest.csproj | 6 +++---
YiSha.Test/YiSha.UtilTest/YiSha.UtilTest.csproj | 6 +++---
YiSha.Util/YiSha.CodeGenerator/YiSha.CodeGenerator.csproj | 2 +-
YiSha.Util/YiSha.Util/YiSha.Util.csproj | 8 ++++----
YiSha.Web/YiSha.Admin.Web/YiSha.Admin.Web.csproj | 4 ++--
11 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/YiSha.Business/YiSha.Business.AutoJob/YiSha.Business.AutoJob.csproj b/YiSha.Business/YiSha.Business.AutoJob/YiSha.Business.AutoJob.csproj
index fedbad7d..66c0bfe8 100644
--- a/YiSha.Business/YiSha.Business.AutoJob/YiSha.Business.AutoJob.csproj
+++ b/YiSha.Business/YiSha.Business.AutoJob/YiSha.Business.AutoJob.csproj
@@ -5,7 +5,7 @@
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="Quartz" Version="3.6.2" />
+ <PackageReference Include="Quartz" Version="3.7.0" />
</ItemGroup>
<ItemGroup>
diff --git a/YiSha.Cache/YiSha.MemoryCache/YiSha.MemoryCache.csproj b/YiSha.Cache/YiSha.MemoryCache/YiSha.MemoryCache.csproj
index 527c1a08..e0619113 100644
--- a/YiSha.Cache/YiSha.MemoryCache/YiSha.MemoryCache.csproj
+++ b/YiSha.Cache/YiSha.MemoryCache/YiSha.MemoryCache.csproj
@@ -5,7 +5,7 @@
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="7.0.0" />
+ <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.0" />
</ItemGroup>
<ItemGroup>
diff --git a/YiSha.Cache/YiSha.RedisCache/YiSha.RedisCache.csproj b/YiSha.Cache/YiSha.RedisCache/YiSha.RedisCache.csproj
index c07877be..b3de8e9d 100644
--- a/YiSha.Cache/YiSha.RedisCache/YiSha.RedisCache.csproj
+++ b/YiSha.Cache/YiSha.RedisCache/YiSha.RedisCache.csproj
@@ -5,7 +5,7 @@
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="StackExchange.Redis" Version="2.6.104" />
+ <PackageReference Include="StackExchange.Redis" Version="2.7.4" />
</ItemGroup>
<ItemGroup>
diff --git a/YiSha.Data/YiSha.Data.EF/YiSha.Data.EF.csproj b/YiSha.Data/YiSha.Data.EF/YiSha.Data.EF.csproj
index dd6f8e14..5d44c47e 100644
--- a/YiSha.Data/YiSha.Data.EF/YiSha.Data.EF.csproj
+++ b/YiSha.Data/YiSha.Data.EF/YiSha.Data.EF.csproj
@@ -10,8 +10,8 @@
</ItemGroup>
<ItemGroup>
- <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.4" />
- <PackageReference Include="Oracle.ManagedDataAccess.Core" Version="3.21.90" />
+ <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0" />
+ <PackageReference Include="Oracle.ManagedDataAccess.Core" Version="3.21.120" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="7.0.0" />
</ItemGroup>
diff --git a/YiSha.Data/YiSha.Data/YiSha.Data.csproj b/YiSha.Data/YiSha.Data/YiSha.Data.csproj
index 6ddf8d9e..aec4af48 100644
--- a/YiSha.Data/YiSha.Data/YiSha.Data.csproj
+++ b/YiSha.Data/YiSha.Data/YiSha.Data.csproj
@@ -5,10 +5,10 @@
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.4" />
- <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.4" />
- <PackageReference Include="MySqlConnector" Version="2.2.5" />
- <PackageReference Include="Oracle.ManagedDataAccess.Core" Version="3.21.90" />
+ <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.0" />
+ <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0" />
+ <PackageReference Include="MySqlConnector" Version="2.3.1" />
+ <PackageReference Include="Oracle.ManagedDataAccess.Core" Version="3.21.120" />
</ItemGroup>
<ItemGroup>
diff --git a/YiSha.Test/YiSha.CacheTest/YiSha.CacheTest.csproj b/YiSha.Test/YiSha.CacheTest/YiSha.CacheTest.csproj
index 10ebfdcc..38e9e575 100644
--- a/YiSha.Test/YiSha.CacheTest/YiSha.CacheTest.csproj
+++ b/YiSha.Test/YiSha.CacheTest/YiSha.CacheTest.csproj
@@ -7,12 +7,12 @@
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="nunit" Version="3.13.3" />
- <PackageReference Include="NUnit3TestAdapter" Version="4.4.2">
+ <PackageReference Include="nunit" Version="3.14.0" />
+ <PackageReference Include="NUnit3TestAdapter" Version="4.5.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
- <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
+ <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
</ItemGroup>
<ItemGroup>
diff --git a/YiSha.Test/YiSha.DataTest/YiSha.DataTest.csproj b/YiSha.Test/YiSha.DataTest/YiSha.DataTest.csproj
index 0249f232..3fcaf577 100644
--- a/YiSha.Test/YiSha.DataTest/YiSha.DataTest.csproj
+++ b/YiSha.Test/YiSha.DataTest/YiSha.DataTest.csproj
@@ -7,12 +7,12 @@
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="nunit" Version="3.13.3" />
- <PackageReference Include="NUnit3TestAdapter" Version="4.4.2">
+ <PackageReference Include="nunit" Version="3.14.0" />
+ <PackageReference Include="NUnit3TestAdapter" Version="4.5.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
- <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
+ <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
</ItemGroup>
<ItemGroup>
diff --git a/YiSha.Test/YiSha.UtilTest/YiSha.UtilTest.csproj b/YiSha.Test/YiSha.UtilTest/YiSha.UtilTest.csproj
index 4aa964de..b81d0d4e 100644
--- a/YiSha.Test/YiSha.UtilTest/YiSha.UtilTest.csproj
+++ b/YiSha.Test/YiSha.UtilTest/YiSha.UtilTest.csproj
@@ -7,12 +7,12 @@
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="nunit" Version="3.13.3" />
- <PackageReference Include="NUnit3TestAdapter" Version="4.4.2">
+ <PackageReference Include="nunit" Version="3.14.0" />
+ <PackageReference Include="NUnit3TestAdapter" Version="4.5.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
- <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
+ <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
</ItemGroup>
<ItemGroup>
diff --git a/YiSha.Util/YiSha.CodeGenerator/YiSha.CodeGenerator.csproj b/YiSha.Util/YiSha.CodeGenerator/YiSha.CodeGenerator.csproj
index 96d0ac9f..1c52a057 100644
--- a/YiSha.Util/YiSha.CodeGenerator/YiSha.CodeGenerator.csproj
+++ b/YiSha.Util/YiSha.CodeGenerator/YiSha.CodeGenerator.csproj
@@ -5,7 +5,7 @@
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.4" />
+ <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.0" />
</ItemGroup>
<ItemGroup>
diff --git a/YiSha.Util/YiSha.Util/YiSha.Util.csproj b/YiSha.Util/YiSha.Util/YiSha.Util.csproj
index 7683aa4c..17359aab 100644
--- a/YiSha.Util/YiSha.Util/YiSha.Util.csproj
+++ b/YiSha.Util/YiSha.Util/YiSha.Util.csproj
@@ -6,14 +6,14 @@
<ItemGroup>
<FrameworkReference Include="Microsoft.AspNetCore.App" />
- <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.4" />
+ <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.0" />
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
- <PackageReference Include="NLog.Web.AspNetCore" Version="5.2.3" />
- <PackageReference Include="NPOI" Version="2.6.0" />
- <PackageReference Include="System.Drawing.Common" Version="7.0.0" />
+ <PackageReference Include="NLog.Web.AspNetCore" Version="5.3.5" />
+ <PackageReference Include="NPOI" Version="2.6.2" />
+ <PackageReference Include="System.Drawing.Common" Version="8.0.0" />
</ItemGroup>
<ItemGroup>
diff --git a/YiSha.Web/YiSha.Admin.Web/YiSha.Admin.Web.csproj b/YiSha.Web/YiSha.Admin.Web/YiSha.Admin.Web.csproj
index 66d623f1..5c1a84c9 100644
--- a/YiSha.Web/YiSha.Admin.Web/YiSha.Admin.Web.csproj
+++ b/YiSha.Web/YiSha.Admin.Web/YiSha.Admin.Web.csproj
@@ -19,8 +19,8 @@
<ItemGroup>
<PackageReference Include="BuildBundlerMinifier" Version="3.2.449" />
- <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.4" />
- <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="7.0.4" />
+ <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.0" />
+ <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="8.0.0" />
</ItemGroup>
<ItemGroup>