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

feat:bug fixed

develop
old易 2024-02-02 18:21:39 +08:00
parent 424e8d7d29
commit 198b7c5841
13 changed files with 235 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
New_College.Api/Controllers/Front/CustomerController.cs
View File

@ -315,6 +315,10 @@ namespace New_College.Api.Controllers.Front
var result = await _services.UpdateCustomer(query);
if (result.Id > 0)
{
if (query.Expectedscore >= 0)
{
await _userSetting.UpdateSingleCustomerSetting(new UserBaseSettingUpdateDTO() { UType = 0, CustomerId = query.StudentId });//修改参数次数
}
var token = JwtHelper.IssueJwt(new TokenModelJwt() { Uid = result.Id, Role = "学生" });
result.Token = token;
}

41
New_College.Api/Controllers/OAuthController.cs
View File

@ -28,7 +28,42 @@ namespace New_College.Controllers
/// <summary>
///三方登录
/// </summary>
/// <param name="dto"></param>
/// <returns></returns>
[Route("login")]
public async Task<MessageModel<string>> Login([FromQuery] ThridLoginRequestDto dto)
{
string token = string.Empty;
if (dto == null)
{
return new MessageModel<string>()
{
success = false,
msg = "参数错误",
};
}
if (ThridConfig.secretKey != dto.secretKey)
{
return new MessageModel<string>()
{
success = false,
msg = "密钥错误",
};
}
//首先判断是否存在账户|不存在则创建新的账户，存在则直接登录
return new MessageModel<string>()
{
msg = "ok",
success = true,
response = token
};
}
/// <summary>
/// Oauth2验证回调
@ -44,7 +79,7 @@ namespace New_College.Controllers
var response = new CasDoorToken();
string jwtStr = string.Empty;
bool suc = false;
var getaccesstoken = CasdoorHttpHelper.Http_Post<CasdoorGetTokenResponse>("api/login/oauth/access_token",null, new StringContent(Newtonsoft.Json.JsonConvert.SerializeObject(new CasdoorRequest() { code = code, grant_type = "authorization_code", client_id = CasdoorConfig.ClientId, client_secret = CasdoorConfig.ClientSecret }), Encoding.UTF8, "application/json"));//获取access_token
var getaccesstoken = CasdoorHttpHelper.Http_Post<CasdoorGetTokenResponse>("api/login/oauth/access_token", null, new StringContent(Newtonsoft.Json.JsonConvert.SerializeObject(new CasdoorRequest() { code = code, grant_type = "authorization_code", client_id = CasdoorConfig.ClientId, client_secret = CasdoorConfig.ClientSecret }), Encoding.UTF8, "application/json"));//获取access_token
var headers = new System.Collections.Generic.Dictionary<string, string>
{
{ "Authorization", string.Format("Bearer {0}", getaccesstoken.access_token) }
@ -69,7 +104,7 @@ namespace New_College.Controllers
var single = await _CustomerInfoServices.QueryById(user.Item2.Id);
if (!string.IsNullOrWhiteSpace(user.Item2.Phone))
{
single.NickName= user.Item2.Phone;
single.NickName = user.Item2.Phone;
}
if (!string.IsNullOrWhiteSpace(user.Item2.UserCode))
{
@ -88,7 +123,7 @@ namespace New_College.Controllers
return new MessageModel<CasDoorToken>()
{
success = false,
msg="该账户不存在或已注销"
msg = "该账户不存在或已注销"
};
}

7
New_College.Api/New_College.xml
View File

@ -1382,6 +1382,13 @@
</summary>
<returns></returns>
</member>
<member name="M:New_College.Controllers.OauthController.Login(New_College.Model.ThridLoginRequestDto)">
<summary>
三方登录
</summary>
<param name="dto"></param>
<returns></returns>
</member>
<member name="M:New_College.Controllers.OauthController.Callback(System.String,System.String,System.String)">
<summary>
Oauth2验证回调

13
New_College.Api/Startup.cs
View File

@ -66,7 +66,7 @@ namespace New_College
WeixinConfig.KEY = Appsettings.app(new string[] { "Weixin", "KEY" }).ObjToString();
WeixinConfig.NotifyUrl = Appsettings.app(new string[] { "WeChatPay", "NotifyUrl" }).ObjToString();
WeixinConfig.APIv3Key = Appsettings.app(new string[] { "WeChatPay", "APIv3Key" }).ObjToString();
WeixinConfig.SerialNumber= Appsettings.app(new string[] { "WeChatPay", "SerialNumber" }).ObjToString();
WeixinConfig.SerialNumber = Appsettings.app(new string[] { "WeChatPay", "SerialNumber" }).ObjToString();
WeixinConfig.PrivateKey = Appsettings.app(new string[] { "WeChatPay", "PrivateKey" }).ObjToString();
//阿里云oss配置
@ -85,6 +85,11 @@ namespace New_College
CasdoorConfig.CallbackPath = Appsettings.app(new string[] { "Casdoor", "CallbackPath" });
//三方验证
ThridConfig.secretKey = Appsettings.app(new string[] { "ThridConfig", "secretKey" });
services.AddMemoryCacheSetup();
services.AddSqlsugarSetup();
services.AddDbSetup();
@ -120,7 +125,7 @@ namespace New_College
services.Configure<KestrelServerOptions>(x => x.AllowSynchronousIO = true)
.Configure<IISServerOptions>(x => x.AllowSynchronousIO = true);
services.AddSession();
services.AddSession();
services.AddControllers(o =>
{
// 全局异常过滤
@ -141,11 +146,11 @@ namespace New_College
//取消Unicode编码
options.JsonSerializerOptions.Encoder = JavaScriptEncoder.Create(UnicodeRanges.All);
//忽略空值
// options.JsonSerializerOptions.IgnoreNullValues = true;
// options.JsonSerializerOptions.IgnoreNullValues = true;
//允许额外符号
options.JsonSerializerOptions.AllowTrailingCommas = true;
//反序列化过程中属性名称是否使用不区分大小写的比较
// options.JsonSerializerOptions.PropertyNameCaseInsensitive = false;
// options.JsonSerializerOptions.PropertyNameCaseInsensitive = false;
////将long类型转为string
//options.SerializerSettings.Converters.Add(new NumberConverter(NumberConverterShip.Int64));
});

3
New_College.Api/appsettings.Development.json
View File

@ -244,6 +244,9 @@
"NotifyUrl": "https://zytb.ycymedu.com/api/front/WeixinPay/PayNotify",
"PrivateKey": "/cert/apiclient_cert.p12", //（新）证书私钥
"SerialNumber": "1B304596B953D156B37863FF52FCAE40B458C9F2" //（新）证书序列号
},
"ThridConfig": {
"secretKey": "01eb9ee95ba00e440ece83f904ef9640"
}
}

5
New_College.Common/GlobalVar/WeiXinConfig.cs
View File

@ -1,6 +1,11 @@
namespace New_College
{
public static class ThridConfig
{
public static string secretKey { get; set; }
}
public static class WeixinConfig
{
/// <summary>

70
New_College.Common/Helper/YZYSignCrypt.cs Normal file
View File

@ -0,0 +1,70 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace New_College.Common
{
public class YZYSignCrypt
{
public static string GetCryptCode(DateTime dt)
{
string datestring = dt.ToString("yyyy-MM-dd HH:mm:ss");
StringBuilder sb = new StringBuilder();
var rnd = new Random();
int k = rnd.Next(0, 18);
for (int i = 0; i < datestring.Length; i++)
{
if (k == i)
{
sb.Append("A");
}
switch (datestring[i])
{
case '0':
sb.Append("Z");
break;
case '1':
sb.Append("0");
break;
case '2':
sb.Append("T");
break;
case '3':
sb.Append("t");
break;
case '4':
sb.Append("F");
break;
case '5':
sb.Append("f");
break;
case '6':
sb.Append("S");
break;
case '7':
sb.Append("s");
break;
case '8':
sb.Append("E");
break;
case '9':
sb.Append("N");
break;
case '-':
sb.Append("L");
break;
case ':':
sb.Append("D");
break;
case ' ':
sb.Append("a");
break;
}
}
return sb.ToString();
}
}
}

26
New_College.Model/Request/ThridLoginRequestDto.cs Normal file
View File

@ -0,0 +1,26 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace New_College.Model
{
public class ThridLoginRequestDto
{
public string secretKey { get; set; }
public string sign { get; set; }
public string openUserId { get; set; }
public string openUsername { get; set; }
public string openUserProvince { get; set; }
public string openUserSchool { get; set; }
public string openNickName { get; set; }
public string operType { get; set; }
public string isH5 { get; set; }
public string redirectUrl { get; set; }
}
}

2
New_College.Repository/BASE/D_PlanMajorDescProRepository.cs
View File

@ -28,7 +28,7 @@ namespace New_College.Repository
{
RefAsync<int> totalCount = 0;
var pageresult = new PageModel<UniversityPlanProView>();
request.Year = request.Year > DateTime.Now.Year - 1 ? DateTime.Now.Year - 1 : request.Year;
var pagelist = await this.Db.Queryable<D_PlanMajorDescPro>().Where(c => c.Location == request.Location)
.Where(c => c.Years == request.Year)
.WhereIF(request.Sff.HasValue, c => c._211 == (request.Sff == 1 ? "是" : "否"))

52
New_College.Services/D_LongIdMapServices.cs
View File

@ -1998,32 +1998,32 @@ namespace New_College.Services
#region 院校专业关联
var models = new List<D_MajorMapUniversity>();
tbinfo.ForEach(a =>
{
if (universitylist.Where(e => e.Name == a.UniversityName).Any())
{
if (majorlist.Where(e => a.MajorName.Contains(e.Name)).Any())
{
var mid = majorlist.Where(e => a.MajorName.Contains(e.Name)).FirstOrDefault().Id;
var uid = universitylist.Where(e => e.Name == a.UniversityName).FirstOrDefault().Id;
if (!models.Where(e => e.Universityid == uid && e.MajorId == mid).Any())
{
models.Add(new D_MajorMapUniversity()
{
CreateTime = DateTime.UtcNow,
IsDelete = false,
ModifyTime = DateTime.UtcNow,
OrderSort = 0,
sp = 0,
MajorId = majorlist.Where(e => a.MajorName.Contains(e.Name)).FirstOrDefault().Id,
Universityid = universitylist.Where(e => e.Name == a.UniversityName).FirstOrDefault().Id
});
}
}
}
});
await d_MajorMapUniversityRepository.Add(models);
//var models = new List<D_MajorMapUniversity>();
//tbinfo.ForEach(a =>
//{
// if (universitylist.Where(e => e.Name == a.UniversityName).Any())
// {
// if (majorlist.Where(e => a.MajorName.Contains(e.Name)).Any())
// {
// var mid = majorlist.Where(e => a.MajorName.Contains(e.Name)).FirstOrDefault().Id;
// var uid = universitylist.Where(e => e.Name == a.UniversityName).FirstOrDefault().Id;
// if (!models.Where(e => e.Universityid == uid && e.MajorId == mid).Any())
// {
// models.Add(new D_MajorMapUniversity()
// {
// CreateTime = DateTime.UtcNow,
// IsDelete = false,
// ModifyTime = DateTime.UtcNow,
// OrderSort = 0,
// sp = 0,
// MajorId = majorlist.Where(e => a.MajorName.Contains(e.Name)).FirstOrDefault().Id,
// Universityid = universitylist.Where(e => e.Name == a.UniversityName).FirstOrDefault().Id
// });
// }
// }
// }
//});
//await d_MajorMapUniversityRepository.Add(models);
#endregion

1
New_College.Services/D_PlanMajorDescProServices.cs
View File

@ -38,6 +38,7 @@ namespace New_College.Services
/// <returns></returns>
public async Task<MajorPlanProView> GetMajorPlanPro(MajorPlanProViewQuery request)
{
request.Year = request.Year > (DateTime.Now.Year - 1) ? (DateTime.Now.Year - 1) : request.Year;
var majorview = new MajorPlanProView();
Expression<Func<D_PlanMajorDescPro, bool>> expression = Expressionable.Create<D_PlanMajorDescPro>()
.And(c => c.UId == request.UId)

2
New_College.Services/D_PlanMajorDescServices.cs
View File

@ -169,7 +169,7 @@ namespace New_College.Services
int startscore = request.Score - 25;
int endscore = request.Score + 15;
int qyear = request.Year >= 2023 ? 2023 : request.Year;
var batlist = await _batchlineRepository.Query(c => c.Year == request.Year && c.Type_name == "综合");
var batlist = await _batchlineRepository.Query(c => c.Year == qyear && c.Type_name == "综合");
request.BatchName = batlist.Where(c => c.Average <= request.Score && c.Batch_name == "普通类一段").Any() ? "普通类一段" : "普通类二段";
Expression<Func<D_QualificationLine, bool>> expression = Expressionable.Create<D_QualificationLine>()
.And(c => c.Years == qyear)

62
New_College.Services/D_UserSettingBaseServices.cs
View File

@ -43,31 +43,45 @@ namespace New_College.Services
{
return false;
}
var basesettinginfo = new D_UserSettingBase()
var usersettinglist = await _dal.Query(e => e.CustomerId == request.CustomerId);
if (usersettinglist.Any())
{
CustomerId = request.CustomerId,
CreateTime = DateTime.Now,
IsDelete = false,
OrderSort = 0,
PType = 0,
ScoreCount = customerinfo.FirstOrDefault().IsVIP ? 10 : 3,
SearchCount = customerinfo.FirstOrDefault().IsVIP ? 9999 : 10,
ShowCount = customerinfo.FirstOrDefault().IsVIP ? 9999 : 10,
};
usersettinglist.ForEach(a =>
{
a.ScoreCount = 10;
a.SearchCount = 9999;
a.ShowCount = 9999;
});
await _dal.Update(usersettinglist);
}
else
{
var basesettinginfo = new D_UserSettingBase()
{
CustomerId = request.CustomerId,
CreateTime = DateTime.Now,
IsDelete = false,
OrderSort = 0,
PType = 0,
ScoreCount = customerinfo.FirstOrDefault().IsVIP ? 10 : 3,
SearchCount = customerinfo.FirstOrDefault().IsVIP ? 9999 : 10,
ShowCount = customerinfo.FirstOrDefault().IsVIP ? 9999 : 10,
};
var basesettingtypeinfo = new D_UserSettingBase()
{
CustomerId = request.CustomerId,
CreateTime = DateTime.Now,
IsDelete = false,
OrderSort = 0,
PType = 1,
ScoreCount = customerinfo.FirstOrDefault().IsVIP ? 10 : 3,
SearchCount = customerinfo.FirstOrDefault().IsVIP ? 9999 : 10,
ShowCount = customerinfo.FirstOrDefault().IsVIP ? 9999 : 10,
};
await _dal.Add(basesettinginfo);
await _dal.Add(basesettingtypeinfo);
var basesettingtypeinfo = new D_UserSettingBase()
{
CustomerId = request.CustomerId,
CreateTime = DateTime.Now,
IsDelete = false,
OrderSort = 0,
PType = 1,
ScoreCount = customerinfo.FirstOrDefault().IsVIP ? 10 : 3,
SearchCount = customerinfo.FirstOrDefault().IsVIP ? 9999 : 10,
ShowCount = customerinfo.FirstOrDefault().IsVIP ? 9999 : 10,
};
await _dal.Add(basesettinginfo);
await _dal.Add(basesettingtypeinfo);
}
return true;
}
@ -88,7 +102,7 @@ namespace New_College.Services
var models = userbaselist.FirstOrDefault();
models.ScoreCount = c.IsVIP ? 10 : 3;
models.SearchCount = c.IsVIP ? 9999 : 10;
models.ShowCount= c.IsVIP ? 9999 : 10;
models.ShowCount = c.IsVIP ? 9999 : 10;
modelslist.Add(models);
}
});