yly
/
NewGaoKaoApi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat:升级代码版本

develop
old易 2023-11-17 13:35:40 +08:00
parent 81980f6035
commit 3430d2b3bb
23 changed files with 332 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
.editorconfig
View File

@ -2,3 +2,86 @@
# IDE0005: Using 指令是不需要的。
dotnet_diagnostic.IDE0005.severity = warning
csharp_using_directive_placement = outside_namespace:silent
csharp_prefer_simple_using_statement = true:suggestion
csharp_prefer_braces = true:silent
csharp_style_namespace_declarations = block_scoped:silent
csharp_style_prefer_method_group_conversion = true:silent
csharp_style_prefer_top_level_statements = true:silent
csharp_style_prefer_primary_constructors = true:suggestion
csharp_style_expression_bodied_methods = false:silent
csharp_style_expression_bodied_constructors = false:silent
csharp_style_expression_bodied_operators = false:silent
csharp_style_expression_bodied_properties = true:silent
csharp_style_expression_bodied_indexers = true:silent
csharp_style_expression_bodied_accessors = true:silent
csharp_style_expression_bodied_lambdas = true:silent
csharp_style_expression_bodied_local_functions = false:silent
csharp_indent_labels = one_less_than_current
[*.{cs,vb}]
#### Naming styles ####
# Naming rules
dotnet_naming_rule.interface_should_be_begins_with_i.severity = suggestion
dotnet_naming_rule.interface_should_be_begins_with_i.symbols = interface
dotnet_naming_rule.interface_should_be_begins_with_i.style = begins_with_i
dotnet_naming_rule.types_should_be_pascal_case.severity = suggestion
dotnet_naming_rule.types_should_be_pascal_case.symbols = types
dotnet_naming_rule.types_should_be_pascal_case.style = pascal_case
dotnet_naming_rule.non_field_members_should_be_pascal_case.severity = suggestion
dotnet_naming_rule.non_field_members_should_be_pascal_case.symbols = non_field_members
dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case
# Symbol specifications
dotnet_naming_symbols.interface.applicable_kinds = interface
dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
dotnet_naming_symbols.interface.required_modifiers =
dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum
dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
dotnet_naming_symbols.types.required_modifiers =
dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method
dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
dotnet_naming_symbols.non_field_members.required_modifiers =
# Naming styles
dotnet_naming_style.begins_with_i.required_prefix = I
dotnet_naming_style.begins_with_i.required_suffix =
dotnet_naming_style.begins_with_i.word_separator =
dotnet_naming_style.begins_with_i.capitalization = pascal_case
dotnet_naming_style.pascal_case.required_prefix =
dotnet_naming_style.pascal_case.required_suffix =
dotnet_naming_style.pascal_case.word_separator =
dotnet_naming_style.pascal_case.capitalization = pascal_case
dotnet_naming_style.pascal_case.required_prefix =
dotnet_naming_style.pascal_case.required_suffix =
dotnet_naming_style.pascal_case.word_separator =
dotnet_naming_style.pascal_case.capitalization = pascal_case
dotnet_style_coalesce_expression = true:suggestion
dotnet_style_null_propagation = true:suggestion
dotnet_style_prefer_is_null_check_over_reference_equality_method = true:suggestion
dotnet_style_prefer_auto_properties = true:silent
dotnet_style_object_initializer = true:suggestion
dotnet_style_prefer_collection_expression = true:suggestion
dotnet_style_collection_initializer = true:suggestion
dotnet_style_prefer_simplified_boolean_expressions = true:suggestion
dotnet_style_prefer_conditional_expression_over_assignment = true:silent
dotnet_style_prefer_conditional_expression_over_return = true:silent
dotnet_style_explicit_tuple_names = true:suggestion
dotnet_style_prefer_inferred_tuple_names = true:suggestion
dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
dotnet_style_prefer_compound_assignment = true:suggestion
dotnet_style_prefer_simplified_interpolation = true:suggestion
dotnet_style_operator_placement_when_wrapping = beginning_of_line
tab_width = 4
indent_size = 4
end_of_line = crlf

2
New_College.AdminMvc/New_College.AdminMvc.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>
</Project>

19
New_College.Api/Controllers/Front/LibraryController.cs
View File

@ -399,6 +399,25 @@ namespace New_College.Api.Controllers.Front
};
}
/// <summary>
/// PC版本院校排名
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
[HttpGet]
public async Task<MessageModel<List<UniversityPcRankList>>> GetPcUniversityRank([FromQuery] UniversityRankQuery query)
{
var result = await iD_LongIdMapServices.GetPcUniversityRank(query);
return new MessageModel<List<UniversityPcRankList>>()
{
success = result.Count > 0,
msg = result.Count > 0 ? "获取成功" : "获取失败",
response = result
};
}
/// <summary>
/// 专业搜索
/// </summary>

2
New_College.Api/Dockerfile
View File

@ -1,4 +1,4 @@
FROM swr.cn-south-1.myhuaweicloud.com/mcr/aspnet:3.1-alpine
FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
RUN echo 'Asia/Shanghai' >/etc/timezone

36
New_College.Api/Dockerfile.original Normal file
View File

@ -0,0 +1,36 @@
FROM swr.cn-south-1.myhuaweicloud.com/mcr/aspnet:3.1-alpine
RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
RUN echo 'Asia/Shanghai' >/etc/timezone
#RUN apk add --no-cache ca-certificates python3 bash openssh git openssl-dev uwsgi uwsgi-python3
#RUN apk add --no-cache --virtual .build-deps python3-dev gcc musl-dev libffi-dev make \
#&& pip3 install --no-cache-dir --trusted-host mirrors.aliyun.com -i http://mirrors.aliyun.com/pypi/simple/ \
#pymysql==0.8.1 \
#Flask==1.0.2 \
#Flask-RESTful==0.3.6 \
#Flask-Script==2.0.6 \
#Flask-SQLAlchemy==2.3.2 \
#Flask-WTF==0.14.2 \
#SQLAlchemy==1.2.7 \
#simplejson==3.16.0 \
#six==1.11.0 \
#celery==4.2.1 \
#xlrd==1.1.0 \
#xlwt==1.3.0 \
#msgpack==0.5.0 \
#&& apk del .build-deps
#
#RUN git clone https://github.com/Supervisor/supervisor.git \
#&& cd supervisor \
#&& python3 setup.py install \
#&& cd .. \
#&& rm -rf supervisor \
#&& cd /etc/ \
#&& echo_supervisord_conf > supervisord.conf \
#&& echo '[include]' >> supervisord.conf \
#&& echo 'files = /code/supervisor/*.ini' >> supervisord.conf \
#&& supervisord -c /etc/supervisord.conf
WORKDIR /app
COPY . .
EXPOSE 8083
ENTRYPOINT ["dotnet", "New_College.Api.dll","-b","0.0.0.0"]

6
New_College.Api/New_College.Api.csproj
View File

@ -4,7 +4,7 @@
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<!--<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>-->
<AspNetCoreHostingModel>OutOfProcess</AspNetCoreHostingModel>
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
@ -52,7 +52,9 @@
<PackageReference Include="Microsoft.Graph.Core" Version="1.23.0" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.9.10" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>
<ItemGroup>

50
New_College.Api/New_College.Model.xml
View File

@ -4410,6 +4410,16 @@
院校类型 （0，校友会 1,武书连 2,软科 3,QS 4,U.S.News）
</summary>
</member>
<member name="P:New_College.Model.ViewModels.UniversityRankQuery.Name">
<summary>
院校名称
</summary>
</member>
<member name="P:New_College.Model.ViewModels.UniversityRankQuery.SubjectType">
<summary>
院校类别
</summary>
</member>
<member name="P:New_College.Model.ViewModels.AutoVipInfoQuery.VipCardTypeId">
<summary>
vip卡类型id
@ -5740,6 +5750,46 @@
排名 最新
</summary>
</member>
<member name="P:New_College.Model.ViewModels.UniversityPcRankList.Name">
<summary>
院校名称
</summary>
</member>
<member name="P:New_College.Model.ViewModels.UniversityPcRankList.Nhef">
<summary>
是否985
</summary>
</member>
<member name="P:New_College.Model.ViewModels.UniversityPcRankList.Sff">
<summary>
是否211
</summary>
</member>
<member name="P:New_College.Model.ViewModels.UniversityPcRankList.Syl">
<summary>
是否双一流
</summary>
</member>
<member name="P:New_College.Model.ViewModels.UniversityPcRankList.Logo">
<summary>
学校logo
</summary>
</member>
<member name="P:New_College.Model.ViewModels.UniversityPcRankList.AreaName">
<summary>
省市区名称
</summary>
</member>
<member name="P:New_College.Model.ViewModels.UniversityPcRankList.SubjectLevel">
<summary>
学科层次
</summary>
</member>
<member name="P:New_College.Model.ViewModels.UniversityPcRankList.Sort">
<summary>
排名 最新
</summary>
</member>
<member name="T:New_College.Model.ViewModels.UniversityProbabilityResult">
<summary>
录取概率分析结果

7
New_College.Api/New_College.xml
View File

@ -418,6 +418,13 @@
<param name="query"></param>
<returns></returns>
</member>
<member name="M:New_College.Api.Controllers.Front.LibraryController.GetPcUniversityRank(New_College.Model.ViewModels.UniversityRankQuery)">
<summary>
PC版本院校排名
</summary>
<param name="query"></param>
<returns></returns>
</member>
<member name="M:New_College.Api.Controllers.Front.LibraryController.uniGetSearchMajor(New_College.Model.ViewModels.NameBaseQuery)">
<summary>
专业搜索

2
New_College.Api/appsettings.json
View File

@ -26,7 +26,7 @@
"Name": "New_College"
}
},
"urls": "http://*:8082", // IIS 部署，注释掉
"urls": "http://*:8083", // IIS 部署，注释掉
"AllowedHosts": "*",
"AppSettings": {
"RedisCachingAOP": {

13
New_College.Common/New_College.Common.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
@ -15,12 +15,13 @@
<PackageReference Include="Essensoft.AspNetCore.Payment.Alipay" Version="3.1.8" />
<PackageReference Include="Essensoft.AspNetCore.Payment.Security" Version="3.1.8" />
<PackageReference Include="Essensoft.AspNetCore.Payment.WeChatPay" Version="3.1.5" />
<PackageReference Include="log4net" Version="2.0.8" />
<PackageReference Include="Microsoft.AspNetCore.SignalR" Version="1.1.0" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="5.0.0-preview.2.20160.3" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0-preview.2.20160.3" />
<PackageReference Include="log4net" Version="2.0.15" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
<PackageReference Include="NodaTime" Version="3.0.1" />
<PackageReference Include="NPOI" Version="2.5.1" />
<PackageReference Include="NPOI" Version="2.6.0" />
<PackageReference Include="RestSharp" Version="106.10.2-alpha.0.8" />
<PackageReference Include="StackExchange.Redis" Version="2.1.30" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.5.0" />

6
New_College.Extensions/New_College.Extensions.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
@ -12,9 +12,7 @@
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="7.0.0" />
<PackageReference Include="Consul" Version="1.6.1.1" />
<PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
<PackageReference Include="Microsoft.AspNetCore.SignalR" Version="1.1.0" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="5.0.0-preview.2.20167.3" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="5.0.0-preview.2.20160.3" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Log4Net.AspNetCore" Version="3.1.0" />
<PackageReference Include="MiniProfiler.AspNetCore.Mvc" Version="4.1.0" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="5.3.3" />

2
New_College.FrameWork/New_College.FrameWork.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>
<ItemGroup>

3
New_College.IServices/ID_LongIdMapServices.cs
View File

@ -71,6 +71,9 @@ namespace New_College.IServices
Task<List<UniversityRankList>> GetUniversityRank(UniversityRankQuery query);
Task<List<UniversityPcRankList>> GetPcUniversityRank(UniversityRankQuery query);
/// <summary>
/// 专业搜索
/// </summary>

2
New_College.IServices/New_College.IServices.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>
<ItemGroup>

2
New_College.Model/New_College.Model.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

11
New_College.Model/ViewModels/Query/UniversityQuery.cs
View File

@ -53,6 +53,17 @@ namespace New_College.Model.ViewModels
/// 院校类型 （0，校友会 1,武书连 2,软科 3,QS 4,U.S.News）
/// </summary>
public int Type { get; set; }
/// <summary>
/// 院校名称
/// </summary>
public string Name { get; set; }
/// <summary>
/// 院校类别
/// </summary>
public int? SubjectType { get; set;}
}
public class UniversityIdQuery : BasePageRequest

47
New_College.Model/ViewModels/Result/UniversityResult.cs
View File

@ -214,6 +214,53 @@ namespace New_College.Model.ViewModels
}
public class UniversityPcRankList
{
/// <summary>
/// 院校名称
/// </summary>
public string Name { get; set; }
/// <summary>
/// 是否985
/// </summary>
public bool? Nhef { get; set; }
/// <summary>
/// 是否211
/// </summary>
public bool? Sff { get; set; }
/// <summary>
/// 是否双一流
/// </summary>
public bool? Syl { get; set; }
/// <summary>
/// 学校logo
/// </summary>
public string Logo { get; set; }
/// <summary>
/// 省市区名称
/// </summary>
public string AreaName { get; set; }
/// <summary>
/// 学科层次
/// </summary>
public int? SubjectLevel { get; set; }
/// <summary>
/// 排名 最新
/// </summary>
public int Sort { get; set; }
}
/// <summary>
/// 录取概率分析结果
/// </summary>

30
New_College.Repository/BASE/D_UniversityRankRepository.cs
View File

@ -1,7 +1,13 @@
using New_College.IRepository;
using Essensoft.AspNetCore.Payment.Alipay.Domain;
using New_College.IRepository;
using New_College.IRepository.UnitOfWork;
using New_College.Model.Models;
using New_College.Model.ViewModels;
using New_College.Repository.Base;
using NPOI.SS.Formula.Functions;
using SqlSugar;
using System.Collections.Generic;
using System.Threading.Tasks;
namespace New_College.Repository
{
@ -13,5 +19,27 @@ namespace New_College.Repository
public D_UniversityRankRepository(IUnitOfWork unitOfWork) : base(unitOfWork)
{
}
public async Task<List<UniversityPcRankList>> GetPcUniversityRank(UniversityRankQuery query)
{
var response = await this.Db.Queryable<D_UniversityRank, D_University>((rank, u) => new object[] { JoinType.Left, rank.UniversityName == u.Name })
.Where((rank, u) => rank.UniversityType == query.Type)
.WhereIF(!string.IsNullOrWhiteSpace(query.Name), (rank, u) => SqlFunc.Contains(rank.UniversityName, query.Name))
.WhereIF(query.SubjectType.HasValue, (rank, u) => u.Subject_Level == query.SubjectType)
.OrderBy((rank, u) => rank.Rank, OrderByType.Asc)
.Select((rank, u) => new UniversityPcRankList
{
AreaName = u.Area_Name,
Logo = u.Logo,
Name = u.Name,
Syl = u.Syl == 1 ? true : false,
Nhef = u.Nhef == 1 ? true : false,
Sff = u.Sff == 1 ? true : false,
Sort = rank.Rank,
SubjectLevel = u.Subject_Level,
}).ToListAsync();
return response;
}
}
}

6
New_College.Repository/BASE/ID_UniversityRankRepository.cs
View File

@ -1,5 +1,8 @@
using New_College.IRepository.Base;
using New_College.Model.Models;
using New_College.Model.ViewModels;
using System.Collections.Generic;
using System.Threading.Tasks;
namespace New_College.IRepository
{
@ -8,5 +11,8 @@ namespace New_College.IRepository
/// </summary>
public interface ID_UniversityRankRepository : IBaseRepository<D_UniversityRank>
{
Task<List<UniversityPcRankList>> GetPcUniversityRank(UniversityRankQuery query);
}
}

2
New_College.Repository/New_College.Repository.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

16
New_College.Services/D_LongIdMapServices.cs
View File

@ -20,6 +20,9 @@ using System.Text;
using SqlSugar;
using System.Linq.Expressions;
using Org.BouncyCastle.Asn1.Ocsp;
using Essensoft.AspNetCore.Payment.Alipay.Domain;
using StackExchange.Redis;
using New_College.Repository;
namespace New_College.Services
{
@ -799,6 +802,18 @@ namespace New_College.Services
return info.OrderBy(x => x.OrderSort).Select(x => new UniversityRankList() { Name = x.UniversityName, Sort = x.Rank }).ToList();
}
/// <summary>
///
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
public async Task<List<UniversityPcRankList>> GetPcUniversityRank(UniversityRankQuery query)
{
return await d_UniversityRankRepository.GetPcUniversityRank(query);
}
/// <summary>
/// 专业搜索
/// </summary>
@ -1725,6 +1740,7 @@ namespace New_College.Services
// #region 院校排序
/// <summary>
/// 院校排序

2
New_College.Services/New_College.Services.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

2
New_College.Tasks/New_College.Tasks.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>
<ItemGroup>