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

feat:bug fixed

develop
old易 2024-02-02 14:06:17 +08:00
parent af218c8825
commit 902d0ab015
6 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -483,7 +483,7 @@ namespace New_College.Api.Controllers.Front
if (string.IsNullOrWhiteSpace(query.Year))
{
query.Year = "2023";
query.Year = query.Type==3?"2024":"2023";
}
var result = await iD_LongIdMapServices.GetPcUniversityRank(query);

2
New_College.Api/Controllers/Front/SeVolunteerInitializationController.cs
View File

@ -41,7 +41,7 @@ namespace New_College.Api.Controllers
public async Task<MessageModel<List<SeVolunterInitializationDto>>> Get()
{
var data = new MessageModel<List<SeVolunterInitializationDto>>();
var sevolunterlist = (await _d_SeVolunteerInitializationServices.Query()).Select(c => new SeVolunterInitializationDto()
var sevolunterlist = (await _d_SeVolunteerInitializationServices.Query(E=>E.IsDelete==false)).Select(c => new SeVolunterInitializationDto()
{
AllScore = c.AllScore,
IsOpen = c.IsOpen,

2
New_College.Common/New_College.Common.csproj
View File

@ -25,7 +25,7 @@
<PackageReference Include="QRCoder" Version="1.4.3" />
<PackageReference Include="RestSharp" Version="106.15.0" />
<PackageReference Include="StackExchange.Redis" Version="2.1.30" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.5.0" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.3.0" />
<PackageReference Include="Serilog" Version="2.9.1-dev-01154" />
<PackageReference Include="Serilog.AspNetCore" Version="3.3.0-dev-00152" />

2
New_College.Services/D_LongIdMapServices.cs
View File

@ -912,8 +912,6 @@ namespace New_College.Services
public async Task<List<UniversityPcRankList>> GetPcUniversityRank(UniversityRankQuery query)
{
return await d_UniversityRankRepository.GetPcUniversityRank(query);
}

2
New_College.Services/SysRegionServices.cs
View File

@ -43,7 +43,7 @@ namespace New_College.Services
var info = await _dal.Query(x => x.ParentCode == query.Code);
if (info == null)
return new List<SysRegionResult>() { };
return info.Select(x => new SysRegionResult()
return info.OrderByDescending(e => e.ZipCode).Select(x => new SysRegionResult()
{
Code = x.RegionCode,
Name = x.RegionName,

21
New_College.Services/V_CustomerInfoServices.cs
View File

@ -44,12 +44,13 @@ namespace New_College.Services
{
try
{
DingHookHelper.DingTalkHookMessage("UpdateCasdoorPwd", JsonConvert.SerializeObject(query));
var list = await _casdoorUserRepository.Query(e => e.id == query.openId);
if (list != null && list.Count() > 0)
{
var updatemodels = list.FirstOrDefault();
updatemodels.password = query.newPassword;
await _casdoorUserRepository.Update(updatemodels);
var up = await _casdoorUserRepository.Update(updatemodels);
}
}
catch (Exception ex)
@ -65,6 +66,7 @@ namespace New_College.Services
/// <returns></returns>
public async Task<CustomerInfoResult> UpdateCustomerInfo(UpdateCustomerQuery query)
{
DingHookHelper.DingTalkHookMessage("UpdateCustomerInfo", JsonConvert.SerializeObject(query));
var info = await _dal.QueryById(query.Id);
if (info == null)
return new CustomerInfoResult() { Status = 3 };
@ -73,14 +75,15 @@ namespace New_College.Services
info.Gender = query.Gender;
info.AvatarUrl = query.AvatarUrl;
DingHookHelper.DingTalkHookMessage("CasDoorUpdate", query.service_token);
UpdateCasdoorPwd(new CasDoorUpdatePwdDto()
{
newPassword = query.UserPwd,
openId = info.OpenId,
service_token = query.service_token
});
if (!string.IsNullOrWhiteSpace(query.UserPwd))
{
UpdateCasdoorPwd(new CasDoorUpdatePwdDto()
{
newPassword = query.UserPwd,
openId = info.OpenId,
service_token = query.service_token
});
var salt = RadomHelper.RandCode(6);
info.UserPwd = MD5Helper.MD5Encrypt16(query.UserPwd + salt);
}
@ -167,7 +170,7 @@ namespace New_College.Services
var info = await _dal.QueryById(query.StudentId);
if (info == null)
return new CustomerInfoResult() { Status = 3 };
info.Datainit = true;
if (query.AreaId > 0)
{
info.AreaId = query.AreaId;
@ -199,10 +202,12 @@ namespace New_College.Services
}
if (query.Expectedscore > 0)
{
info.Expectedscore = query.Expectedscore;
}
if (query.Year > 0)
{
info.Datainit = true;
info.Year = query.Year;
}
if (!string.IsNullOrEmpty(query.SchoolName))