ewide/number_zj
22
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

升级furion 至 4.5

Browse Source
This commit is contained in:
范露尧
2022-10-18 15:11:12 +08:00
parent dd71325ea8
commit 535e602e41
12 changed files with 11919 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
20220330_Vote/Ewide.Core/Ewide.Core.csproj
View File

@@ -32,18 +32,19 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="aliyun-net-sdk-core" Version="1.5.10" /> <PackageReference Include="aliyun-net-sdk-core" Version="1.5.10" />
<PackageReference Include="CSRedisCore" Version="3.6.6" /> <PackageReference Include="CSRedisCore" Version="3.6.6" />
<PackageReference Include="Furion.Extras.DatabaseAccessor.SqlSugar" Version="2.20.7" /> <PackageReference Include="Furion.Extras.DatabaseAccessor.SqlSugar" Version="4.5.0" />
<PackageReference Include="Kendo.DynamicLinqCore" Version="3.1.1" /> <PackageReference Include="MySql.Data" Version="8.0.29" />
<PackageReference Include="Portable.BouncyCastle" Version="1.8.10" /> <PackageReference Include="Portable.BouncyCastle" Version="1.8.10" />
<PackageReference Include="Quartz" Version="3.3.2" /> <PackageReference Include="Quartz" Version="3.3.2" />
<PackageReference Include="System.Drawing.Common" Version="5.0.2" /> <PackageReference Include="System.Drawing.Common" Version="5.0.2" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="5.0.0" /> <PackageReference Include="System.Linq.Dynamic.Core" Version="1.2.20" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0" />
<PackageReference Include="UAParser" Version="3.1.46" /> <PackageReference Include="UAParser" Version="3.1.46" />
<PackageReference Include="Furion" Version="2.20.7" /> <PackageReference Include="Furion" Version="4.5.0" />
<PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="2.20.7" /> <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.5.0" />
<PackageReference Include="Furion.Extras.DatabaseAccessor.Dapper" Version="2.20.7" /> <PackageReference Include="Furion.Extras.DatabaseAccessor.Dapper" Version="4.5.0" />
<PackageReference Include="Furion.Extras.Logging.Serilog" Version="2.20.7" /> <PackageReference Include="Furion.Extras.Logging.Serilog" Version="4.5.0" />
<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="2.20.7" /> <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.5.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
20220330_Vote/Ewide.Core/Ewide.Core.xml
View File

@@ -2755,7 +2755,7 @@
规范化RESTful风格返回值 规范化RESTful风格返回值
</summary> </summary>
</member> </member>
<member name="M:Ewide.Core.RestfulResultProvider.OnException(Microsoft.AspNetCore.Mvc.Filters.ExceptionContext,Furion.UnifyResult.Internal.ExceptionMetadata)"> <member name="M:Ewide.Core.RestfulResultProvider.OnException(Microsoft.AspNetCore.Mvc.Filters.ExceptionContext,Furion.FriendlyException.ExceptionMetadata)">
<summary> <summary>
异常返回值 异常返回值
</summary> </summary>

2
20220330_Vote/Ewide.Core/Extension/RestfulResultProvider.cs
View File

@@ -8,7 +8,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Threading.Tasks; using System.Threading.Tasks;
using Newtonsoft.Json; using Newtonsoft.Json;
using Furion.UnifyResult.Internal; using Furion.FriendlyException;
namespace Ewide.Core namespace Ewide.Core
{ {

6
20220330_Vote/Ewide.Core/Util/MachineUtil.cs
View File

@@ -150,10 +150,10 @@ namespace Ewide.Core
.Select(p => System.Text.RegularExpressions.Regex.Replace(p.Trim(), @"\s+", ",").Split(',')); .Select(p => System.Text.RegularExpressions.Regex.Replace(p.Trim(), @"\s+", ",").Split(','));
var keyArray = strArray.First(); var keyArray = strArray.First();
var valueArray = strArray.Where((p, i) => i > 0).ToArray(); var valueArray = strArray.Where((p, i) => i > 0).ToArray();
foreach(var value in valueArray) foreach (var value in valueArray)
{ {
var dict = new Dictionary<string, string>(); var dict = new Dictionary<string, string>();
for(var i = 0;i<keyArray.Length;i++) for (var i = 0; i < keyArray.Length; i++)
{ {
dict.Add(keyArray[i], value[i]); dict.Add(keyArray[i], value[i]);
} }
@@ -265,7 +265,7 @@ namespace Ewide.Core
var url = "http://whois.pconline.com.cn/ipJson.jsp"; var url = "http://whois.pconline.com.cn/ipJson.jsp";
var stream = await url.GetAsStreamAsync(); var stream = await url.GetAsStreamAsync();
var streamReader = new StreamReader(stream, Encoding.GetEncoding("GBK")); var streamReader = new StreamReader(stream.Stream, stream.Encoding);
var html = streamReader.ReadToEnd(); var html = streamReader.ReadToEnd();
var tmp = html[(html.IndexOf("({") + 2)..].Split(","); var tmp = html[(html.IndexOf("({") + 2)..].Split(",");
var ipAddr = tmp[0].Split(":")[1] + "【" + tmp[7].Split(":")[1] + "】"; var ipAddr = tmp[0].Split(":")[1] + "【" + tmp[7].Split(":")[1] + "】";

2
20220330_Vote/Ewide.EntityFramework.Core/Ewide.EntityFramework.Core.csproj
View File

@@ -22,7 +22,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.Data.SqlClient" Version="3.0.0" /> <PackageReference Include="Microsoft.Data.SqlClient" Version="3.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.5" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.5" />
<PackageReference Include="MySql.Data" Version="8.0.25" /> <PackageReference Include="MySql.Data" Version="8.0.29" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="5.0.0-alpha.2" /> <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="5.0.0-alpha.2" />
</ItemGroup> </ItemGroup>

2
20220330_Vote/Ewide.Web.Entry/Contents/axios.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
20220330_Vote/Ewide.Web.Entry/Contents/index.css Normal file
View File

File diff suppressed because one or more lines are too long

1
20220330_Vote/Ewide.Web.Entry/Contents/index.js Normal file
View File

File diff suppressed because one or more lines are too long

1
20220330_Vote/Ewide.Web.Entry/Contents/qs.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

11894
20220330_Vote/Ewide.Web.Entry/Contents/vue.js Normal file
View File

File diff suppressed because it is too large Load Diff

1
20220330_Vote/Ewide.Web.Entry/Ewide.Web.Entry.csproj
View File

@@ -76,6 +76,7 @@
<ItemGroup> <ItemGroup>
<Folder Include="wwwroot\Upload\Default\" /> <Folder Include="wwwroot\Upload\Default\" />
<Folder Include="Contents\" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

4
20220330_Vote/Vote.Services/Vote.Services.csproj
View File

@@ -8,6 +8,10 @@
<DocumentationFile>D:\temp_task\20220313\gitcode\number_zj\20220330_Vote\Vote.Services\Vote.Services.xml</DocumentationFile> <DocumentationFile>D:\temp_task\20220313\gitcode\number_zj\20220330_Vote\Vote.Services\Vote.Services.xml</DocumentationFile>
</PropertyGroup> </PropertyGroup>
<ItemGroup>
<PackageReference Include="Furion" Version="4.5.0" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Ewide.Core\Ewide.Core.csproj" /> <ProjectReference Include="..\Ewide.Core\Ewide.Core.csproj" />
</ItemGroup> </ItemGroup>