Skip to content

E
Education
Commit d320abfc authored by 吴春's avatar 吴春
Browse files
Options

提交代码

parent f1863477
Hide whitespace changes
Inline Side-by-side
Showing with 98 additions and 89 deletions
Edu.Cache/App/MsgUserRedisCache.cs
View file @ d320abfc
......@@ -21,7 +21,7 @@ namespace Edu.Cache.App
/// <param name="mobileNumber">手机号码</param>
public static bool AddUserSendCodeHistory(string mobileNumber)
{
string key = Cache.CacheKey.MsgStudent_Login_Key + mobileNumber;
string key = Cache.CacheKey.MsgStudent_Send_Code_List + mobileNumber;
List<DateTime> codeTimeList = redis.StringGet<List<DateTime>>(key);
if (codeTimeList == null)
{
......@@ -72,7 +72,7 @@ namespace Edu.Cache.App
{
message = "";
//Monitor.Enter和Monitor.Exit
string key = string.Concat(CacheKey.MsgStudent_Login_Key, mobileNumber);
string key = string.Concat(CacheKey.MsgStudent_Send_Code_List, mobileNumber);
List<DateTime> codeTimeList = redis.StringGet<List<DateTime>>(key);
if (codeTimeList != null)
{
......@@ -117,7 +117,7 @@ namespace Edu.Cache.App
string code = string.Empty;
if (Id != null)
{
string cacheKey = Cache.CacheKey.MsgStudent_Login_Key + Id.ToString();
string cacheKey = Id.ToString();
try
{
code = redis.StringGet<string>(cacheKey);
......
Edu.Cache/CacheKey.cs
View file @ d320abfc
......@@ -21,5 +21,9 @@ namespace Edu.Cache
/// 短信号码缓存Key
/// </summary>
public static string MsgStudent_Login_Key = "Msg_Student_Login_";
public static string MsgStudent_Send_Code_List = "Msg_Student_Code_List_";
}
}
Edu.Common/API/IAppStudentInfoToken.cs
View file @ d320abfc
......@@ -24,23 +24,23 @@ namespace Edu.Common.API
/// <summary>
/// API请求token携带的用户信息
/// </summary>
public class AppStudentInfoToken : IAppStudentInfoToken
{
/// <summary>
/// 用户ID
/// </summary>
public string uid { get; set; }
/// <summary>
/// 请求消息来源
/// </summary>
public ApiRequestFromEnum requestFrom { get; set; }
/// <summary>
/// 集团id
/// </summary>
public int groupId { get; set; }
}
//public class AppStudentInfoToken : IAppStudentInfoToken
//{
// /// <summary>
// /// 用户ID
// /// </summary>
// public string uid { get; set; }
// /// <summary>
// /// 请求消息来源
// /// </summary>
// public ApiRequestFromEnum requestFrom { get; set; }
// /// <summary>
// /// 集团id
// /// </summary>
// public int groupId { get; set; }
//}
......
Edu.Common/API/IUserInfoToken.cs
View file @ d320abfc
......@@ -54,4 +54,24 @@ namespace Edu.Common.API
/// </summary>
public ApiRequestFromEnum requestFrom { get; set; }
}
public class AppStudentInfoToken : IUserInfoToken
{
/// <summary>
/// 用户ID
/// </summary>
public string uid { get; set; }
/// <summary>
/// 请求消息来源
/// </summary>
public ApiRequestFromEnum requestFrom { get; set; }
/// <summary>
/// 集团id
/// </summary>
public int groupId { get; set; }
}
}
Edu.Model/CacheModel/UserInfo.cs
View file @ d320abfc
......@@ -126,5 +126,8 @@ namespace Edu.Model.CacheModel
/// 留学就业审核对象
/// </summary>
public object StudyAbroadObj { get; set; }
public int ActivationStatus { get; set; }
}
}
\ No newline at end of file
Edu.Module.User/StudentModule.cs
View file @ d320abfc
......@@ -247,8 +247,8 @@ namespace Edu.Module.User
{
{nameof(RB_Student_ViewModel.Interest),model.Interest.Trim() },
{nameof(RB_Student_ViewModel.JapanBaseInfo),(int)model.JapanBaseInfo },
{nameof(RB_Student_ViewModel.StuIcon),model.StuIcon.Trim() },
{nameof(RB_Student_ViewModel.StuSex),model.StuSex },
// {nameof(RB_Student_ViewModel.StuIcon),model.StuIcon.Trim() },
// {nameof(RB_Student_ViewModel.StuSex),model.StuSex },
{nameof(RB_Student_ViewModel.UpdateTime),System.DateTime.Now }
};
return studentRepository.Update(fileds, new WhereHelper(nameof(RB_Student_ViewModel.StuId), model.StuId));
......
Edu.WebApi/Controllers/APP/APPStudentLoginController.cs
View file @ d320abfc
......@@ -112,32 +112,16 @@ namespace Edu.WebApi.Controllers.APP
return ApiResult.Failed(message: $"此账号【{ account }】已禁用", new { Error = 2 });
}
//生成教育token
IAppStudentInfoToken eduStudentInfo = new AppStudentInfoToken()
EduUserInfoToken eduUserInfo = new EduUserInfoToken()
{
requestFrom = Common.Enum.ApiRequestFromEnum.AppStudent,
uid = model.Id.ToString()
};
#region JWT
IDateTimeProvider provider = new UtcDateTimeProvider();
var now = provider.GetNow().AddMinutes(-1);
var unixEpoch = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc); // or use JwtValidator.UnixEpoch
var secondsSinceEpoch = Math.Round((now - unixEpoch).TotalSeconds);
var payload = new Dictionary<string, object>
{
{"iat",secondsSinceEpoch },
{"exp",secondsSinceEpoch + Config.JwtExpirTime},
{"app_stundentInfo",eduStudentInfo }
};
IJwtAlgorithm algorithm = new HMACSHA256Algorithm();
IJsonSerializer serializer = new JsonNetSerializer();
IBase64UrlEncoder urlEncoder = new JwtBase64UrlEncoder();
IJwtEncoder encoder = new JwtEncoder(algorithm, serializer, urlEncoder);
string secret = Config.JwtSecretKey;
string token = encoder.Encode(payload, secret);
#endregion
//上传配置
var uploadConfig = publicModule.GetFileStoreList(new Model.Public.RB_File_Store() { Group_Id = model.Group_Id, IsDefault = 1 })?.FirstOrDefault();
// string token = APPApiTokenHelper.CreateToken(Common.GlobalKey.JWT_App_Student_Key, eduUserInfo);
string token = WebApiTokenHelper.CreateToken(Common.GlobalKey.JWT_User_Key, eduUserInfo);
AppStudentInfo obj = new AppStudentInfo
{
Id = model.Id,
......@@ -163,7 +147,7 @@ namespace Edu.WebApi.Controllers.APP
uploadConfig?.UploadDomain
}
};
Cache.User.AppStudentReidsCache.UserInfoSet(Cache.CacheKey.AppStudent_Login_Key + model.Id, obj, Common.Config.JwtExpirTime);
Cache.User.AppStudentReidsCache.UserInfoSet(Cache.CacheKey.User_Login_Key + model.Id, obj, Common.Config.JwtExpirTime);
return ApiResult.Success(data: obj);
}
}
......@@ -218,7 +202,7 @@ namespace Edu.WebApi.Controllers.APP
ReceiverPhone = model.Account
};
new Module.System.MsgLogModule().SendCode(code, Common.Enum.System.BaseTemplateTypeEnum.SendCode, msgLogModel);
Cache.App.MsgUserRedisCache.SetSendCode(Cache.CacheKey.MsgStudent_Login_Key + account, code, 600);
Cache.App.MsgUserRedisCache.SetSendCode(Cache.CacheKey.MsgStudent_Login_Key + account, code, 600000);
Cache.App.MsgUserRedisCache.AddUserSendCodeHistory(account);
return ApiResult.Success("验证码已发送，请注意查收", data: null);
}
......@@ -290,14 +274,14 @@ namespace Edu.WebApi.Controllers.APP
bool ss = accountModule.SetResetPwdAndAtatus(new RB_Account_ViewModel { ActivationStatus = 1, AccountId = model.AccountId, AccountType = model.AccountType, Group_Id = model.Group_Id }, password = Common.DES.Encrypt(password));
//生成教育token
IAppStudentInfoToken eduUserInfo = new AppStudentInfoToken()
EduUserInfoToken eduUserInfo = new EduUserInfoToken()
{
requestFrom = Common.Enum.ApiRequestFromEnum.AppStudent,
uid = model.Id.ToString()
};
//上传配置
var uploadConfig = publicModule.GetFileStoreList(new Model.Public.RB_File_Store() { Group_Id = model.Group_Id, IsDefault = 1 })?.FirstOrDefault();
string token = APPApiTokenHelper.CreateToken(Common.GlobalKey.JWT_App_Student_Key, eduUserInfo);
string token = WebApiTokenHelper.CreateToken(Common.GlobalKey.JWT_User_Key, eduUserInfo);
AppStudentInfo obj = new AppStudentInfo
{
Id = model.Id,
......@@ -323,7 +307,7 @@ namespace Edu.WebApi.Controllers.APP
uploadConfig?.UploadDomain
}
};
Cache.User.AppStudentReidsCache.UserInfoSet(Cache.CacheKey.AppStudent_Login_Key + model.Id, obj, Common.Config.JwtExpirTime);
Cache.User.AppStudentReidsCache.UserInfoSet(Cache.CacheKey.User_Login_Key + model.Id, obj, Common.Config.JwtExpirTime);
return ApiResult.Success("", new { obj, model.ActivationStatus });
}
......@@ -363,14 +347,14 @@ namespace Edu.WebApi.Controllers.APP
else
{
//生成教育token
IAppStudentInfoToken eduUserInfo = new AppStudentInfoToken()
EduUserInfoToken eduUserInfo = new EduUserInfoToken()
{
requestFrom = Common.Enum.ApiRequestFromEnum.AppStudent,
uid = model.Id.ToString()
};
//上传配置
var uploadConfig = publicModule.GetFileStoreList(new Model.Public.RB_File_Store() { Group_Id = model.Group_Id, IsDefault = 1 })?.FirstOrDefault();
string token = APPApiTokenHelper.CreateToken(Common.GlobalKey.JWT_App_Student_Key, eduUserInfo);
string token = WebApiTokenHelper.CreateToken(Common.GlobalKey.JWT_User_Key, eduUserInfo);
AppStudentInfo obj = new AppStudentInfo
{
Id = model.Id,
......@@ -396,7 +380,7 @@ namespace Edu.WebApi.Controllers.APP
uploadConfig?.UploadDomain
}
};
Cache.User.AppStudentReidsCache.UserInfoSet(Cache.CacheKey.AppStudent_Login_Key + model.Id, obj, Common.Config.JwtExpirTime);
Cache.User.AppStudentReidsCache.UserInfoSet(Cache.CacheKey.User_Login_Key + model.Id, obj, Common.Config.JwtExpirTime);
return ApiResult.Success("", new { obj, model.ActivationStatus });
}
}
......@@ -449,7 +433,7 @@ namespace Edu.WebApi.Controllers.APP
}
else
{
var modelWeiXin = accountModule.GetAccountListExtModule(new RB_Account_ViewModel()
var modelWeiXin = accountModule.GetStudentExt(new RB_Account_ViewModel()
{
OpenId = openid.Trim(),
AccountType = Common.Enum.User.AccountTypeEnum.Student
......@@ -462,22 +446,19 @@ namespace Edu.WebApi.Controllers.APP
{
return ApiResult.Failed(message: $"此账号【{ account }】已禁用", new { Error = 2 });
}
if (!string.IsNullOrWhiteSpace(model.OpenId))
{
return ApiResult.Failed(message: "账户已绑定其他微信号", new { Error = 3 });
}
//更新用户的密码
bool ss = accountModule.SetResetPwdAndAtatus(new RB_Account_ViewModel { OpenId = openid, ActivationStatus = 1, AccountId = model.AccountId, AccountType = model.AccountType, Group_Id = model.Group_Id }, password = Common.DES.Encrypt(password));
//生成教育token
IAppStudentInfoToken eduUserInfo = new AppStudentInfoToken()
EduUserInfoToken eduUserInfo = new EduUserInfoToken()
{
requestFrom = Common.Enum.ApiRequestFromEnum.AppStudent,
uid = model.Id.ToString()
};
//上传配置
var uploadConfig = publicModule.GetFileStoreList(new Model.Public.RB_File_Store() { Group_Id = model.Group_Id, IsDefault = 1 })?.FirstOrDefault();
string token = APPApiTokenHelper.CreateToken(Common.GlobalKey.JWT_App_Student_Key, eduUserInfo);
string token = WebApiTokenHelper.CreateToken(Common.GlobalKey.JWT_User_Key, eduUserInfo);
AppStudentInfo obj = new AppStudentInfo
{
Id = model.Id,
......@@ -504,7 +485,7 @@ namespace Edu.WebApi.Controllers.APP
uploadConfig?.UploadDomain
}
};
Cache.User.AppStudentReidsCache.UserInfoSet(Cache.CacheKey.AppStudent_Login_Key + model.Id, obj, Common.Config.JwtExpirTime);
Cache.User.AppStudentReidsCache.UserInfoSet(Cache.CacheKey.User_Login_Key + model.Id, obj, Common.Config.JwtExpirTime);
return ApiResult.Success("", new { obj, model.ActivationStatus });
}
}
......
Edu.WebApi/Controllers/APP/AppIndexController.cs
View file @ d320abfc
......@@ -39,12 +39,12 @@ namespace Edu.WebApi.Controllers.APP
var query = new RB_Student_ViewModel()
{
Interest = base.ParmJObj.GetStringValue("Interest"),
JapanBaseInfo = base.ParmJObj.GetInt("ClassId"),
StuSex = base.ParmJObj.GetInt("StuSex"),
StuIcon = base.ParmJObj.GetStringValue("StuIcon"),
Group_Id = base.AppStudentInfo.Group_Id,
School_Id = base.AppStudentInfo.School_Id,
StuId = base.AppStudentInfo.AccountId,
JapanBaseInfo = base.ParmJObj.GetInt("JapanBaseInfo"),
// StuSex = base.ParmJObj.GetInt("StuSex"),
//StuIcon = base.ParmJObj.GetStringValue("StuIcon"),
Group_Id = base.AppUserInfo.Group_Id,
School_Id = base.AppUserInfo.School_Id,
StuId = base.AppUserInfo.AccountId,
};
bool result = studentModule.SetStudentInterest(query);
if (result)
......@@ -65,12 +65,12 @@ namespace Edu.WebApi.Controllers.APP
{
var query = new RB_HomePage_Banner()
{
Group_Id = base.AppStudentInfo.Group_Id,
Group_Id = base.AppUserInfo.Group_Id,
};
var list = appHomePageModule.GetHomePageBannerList(query).OrderBy(x => x.Sort);//banner图
var teacherList = teacherModule.GetListByStudentId(base.AppStudentInfo.AccountId, base.AppStudentInfo.Group_Id);//老师
var teacherList = teacherModule.GetListByStudentId(base.AppUserInfo.AccountId, base.AppUserInfo.Group_Id);//老师
//课程信息
var planList = classModule.GetListByStudentId(base.AppStudentInfo.AccountId, base.AppStudentInfo.Group_Id);
var planList = classModule.GetListByStudentId(base.AppUserInfo.AccountId, base.AppUserInfo.Group_Id);
DateTime NextClassTime = System.DateTime.Now;
foreach (var item in planList)
{
......@@ -83,7 +83,7 @@ namespace Edu.WebApi.Controllers.APP
var result = new
{
BannerList = list.Select(x => new { x.BannerId, x.BannerPic, x.BannerUrl }),
TeacherList = teacherList.Select(x => new { x.TeacherName, x.TId, x.TeacherIcon, x.TeachTag, x.Nationality, x.ForeignersUrl }),
TeacherList = teacherList.Select(x => new { x.TeacherName, x.TId, x.TeacherIcon, TeachTag=string.IsNullOrWhiteSpace(x.TeachTag)?new List<string>(): JsonHelper.DeserializeObject<List<string>>(x.TeachTag), x.Nationality, x.ForeignersUrl }),
ClassName = (planList != null && planList.Any()) ? planList.FirstOrDefault()?.ClassName : "",
CompleteProgress = (planList != null && planList.Any()) ? planList.FirstOrDefault()?.CompleteProgress ?? 0 : 0,
NextClassTime = (planList != null && planList.Any()) ? NextClassTime.ToString("yyyy-MM-dd HH:mm:ss") : ""
......@@ -99,7 +99,7 @@ namespace Edu.WebApi.Controllers.APP
{
var query = new RB_HomePage_Lable()
{
Group_Id = base.AppStudentInfo.Group_Id,
Group_Id = base.AppUserInfo.Group_Id,
};
var list = appHomePageModule.GetHomePageLableList(query).OrderBy(x => x.Sort);
return ApiResult.Success("", list);
......
Edu.WebApi/Controllers/APP/SystemLogController.cs
View file @ d320abfc
......@@ -33,8 +33,8 @@ namespace Edu.WebApi.Controllers.APP
{
SelectSendState = 1
};
query.Group_Id = base.AppStudentInfo.Group_Id;
query.Student_Id = base.AppStudentInfo.AccountId;
query.Group_Id = base.AppUserInfo.Group_Id;
query.Student_Id = base.AppUserInfo.AccountId;
List<object> result = new List<object>();
var list = msgLogModule.GetSystemLogPageListRepository(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
foreach (var item in list)
......@@ -79,8 +79,8 @@ namespace Edu.WebApi.Controllers.APP
{
SelectSendState = 1
};
query.Group_Id = base.AppStudentInfo.Group_Id;
query.Student_Id = base.AppStudentInfo.AccountId;
query.Group_Id = base.AppUserInfo.Group_Id;
query.Student_Id = base.AppUserInfo.AccountId;
var msgCount = msgLogModule.GetSystemLogListRepository(query).Count();
......
Edu.WebApi/Controllers/AppBaseController.cs
View file @ d320abfc
......@@ -17,25 +17,24 @@ namespace Edu.WebApi.Controllers
[ApiFilter]
[EnableCors("AllowCors")]
public class AppBaseController : ControllerBase
{
/// <summary>
/// 整理前端传递的post参数
/// </summary>
/// <param name="requestMsg"></param>
/// <returns></returns>
{ /// <summary>
/// 整理前端传递的post参数
/// </summary>
/// <param name="requestMsg"></param>
/// <returns></returns>
public RequestParm RequestParm
{
get
{
var requestParm = new RequestParm();
#region 读取post参数
var requestMsg = Request.HttpContext.Items[GlobalKey.JWT_App_Student_Key];
var requestMsg = Request.HttpContext.Items[GlobalKey.UserPostInfo];
if (requestMsg != null)
{
requestParm = JsonConvert.DeserializeObject<RequestParm>(requestMsg.ToString());
if (Request.HttpContext.Items[GlobalKey.JWT_App_Student_Key] != null)
if (Request.HttpContext.Items[GlobalKey.TokenUserInfo] != null)
{
JObject parms = JObject.Parse(Request.HttpContext.Items[GlobalKey.JWT_App_Student_Key].ToString());
JObject parms = JObject.Parse(Request.HttpContext.Items[GlobalKey.TokenUserInfo].ToString());
requestParm.Uid = parms.GetStringValue("uid");
}
}
......@@ -63,13 +62,13 @@ namespace Edu.WebApi.Controllers
/// <summary>
/// 用户缓存
/// </summary>
public AppStudentInfo AppStudentInfo
public UserInfo AppUserInfo
{
get
{
var parm = this.RequestParm;
AppStudentInfo appStudentInfo = AppStudentReidsCache.GetUserLoginInfo(parm.Uid);
return AppStudentInfo;
UserInfo userInfo = UserReidsCache.GetUserLoginInfo(parm.Uid);
return userInfo;
}
}
......@@ -78,12 +77,12 @@ namespace Edu.WebApi.Controllers
/// </summary>
/// <param name="Id"></param>
/// <returns></returns>
public AppStudentInfo GetAppStudentInfo(object Id)
public UserInfo GetAppUserInfo(object Id)
{
AppStudentInfo appStudentInfo = AppStudentReidsCache.GetUserLoginInfo(Id);
return AppStudentInfo;
UserInfo userInfo = UserReidsCache.GetUserLoginInfo(Id);
return userInfo;
}
}
}
\ No newline at end of file
Edu.WebApi/Controllers/Public/AppPublicController.cs
View file @ d320abfc
......@@ -67,6 +67,7 @@ namespace Edu.WebApi.Controllers.Public
list.ForEach(x => x.UpdateTime = System.DateTime.Now);
list.ForEach(x => x.UpdateBy = base.UserInfo.Id);
list.ForEach(x => x.School_Id = base.UserInfo.School_Id);
list.ForEach(x => x.Group_Id = base.UserInfo.Group_Id);
list.ForEach(x => x.Status = Common.Enum.DateStateEnum.Normal);
bool flag = appHomePageModule.SetHomePage(list);
return flag ? ApiResult.Success() : ApiResult.Failed();
......@@ -111,6 +112,7 @@ namespace Edu.WebApi.Controllers.Public
list.ForEach(x => x.UpdateTime = System.DateTime.Now);
list.ForEach(x => x.UpdateBy = base.UserInfo.Id);
list.ForEach(x => x.School_Id = base.UserInfo.School_Id);
list.ForEach(x => x.Group_Id = base.UserInfo.Group_Id);
list.ForEach(x => x.Status = Common.Enum.DateStateEnum.Normal);
bool flag = appHomePageModule.SetHomePageLable(list);
return flag ? ApiResult.Success() : ApiResult.Failed();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment