Commit 09a1672d authored by 吴春's avatar 吴春

提交代码

parent 5e286859
...@@ -80,5 +80,10 @@ namespace Edu.Model.Entity.Web ...@@ -80,5 +80,10 @@ namespace Edu.Model.Entity.Web
/// 学校编号 /// 学校编号
/// </summary> /// </summary>
public int School_Id { get; set; } public int School_Id { get; set; }
public string BgImg { get; set; }
public string LinkUrl { get; set; }
public string NavType { get; set; }
} }
} }
...@@ -40,5 +40,8 @@ namespace Edu.Model.ViewModel.Web ...@@ -40,5 +40,8 @@ namespace Edu.Model.ViewModel.Web
/// 处理时间字符串 /// 处理时间字符串
/// </summary> /// </summary>
public string DealTimeStr { get { return Common.ConvertHelper.FormatTime(this.DealTime); } } public string DealTimeStr { get { return Common.ConvertHelper.FormatTime(this.DealTime); } }
} }
} }
...@@ -245,7 +245,7 @@ namespace Edu.Module.User ...@@ -245,7 +245,7 @@ namespace Edu.Module.User
{ {
Dictionary<string, object> fileds = new Dictionary<string, object>() Dictionary<string, object> fileds = new Dictionary<string, object>()
{ {
{nameof(RB_Student_ViewModel.Interest),model.Interest.Trim() }, {nameof(RB_Student_ViewModel.Interest),model.Interest },
{nameof(RB_Student_ViewModel.JapanBaseInfo),(int)model.JapanBaseInfo }, {nameof(RB_Student_ViewModel.JapanBaseInfo),(int)model.JapanBaseInfo },
{nameof(RB_Student_ViewModel.StuIcon),model.StuIcon.Trim() }, {nameof(RB_Student_ViewModel.StuIcon),model.StuIcon.Trim() },
{nameof(RB_Student_ViewModel.StuSex),model.StuSex }, {nameof(RB_Student_ViewModel.StuSex),model.StuSex },
......
...@@ -76,6 +76,7 @@ namespace Edu.ThirdCore.Message ...@@ -76,6 +76,7 @@ namespace Edu.ThirdCore.Message
if (!sendSmsResponse.Code.Equals("OK")) if (!sendSmsResponse.Code.Equals("OK"))
{ {
var data = new { phoneNumber = obj["phoneNumber"].ToString(), templateParam = obj["templateParam"].ToString(), code = sendSmsResponse.Code, message = sendSmsResponse.Message }; var data = new { phoneNumber = obj["phoneNumber"].ToString(), templateParam = obj["templateParam"].ToString(), code = sendSmsResponse.Code, message = sendSmsResponse.Message };
Common.Plugin.LogHelper.WriteInfo( string.Format("SendSMS0_{0}", Common.Plugin.JsonHelper.Serialize(data)));
} }
var datatst = new { phoneNumber = obj["phoneNumber"].ToString(), templateParam = obj["templateParam"].ToString(), code = sendSmsResponse.Code, message = sendSmsResponse.Message }; var datatst = new { phoneNumber = obj["phoneNumber"].ToString(), templateParam = obj["templateParam"].ToString(), code = sendSmsResponse.Code, message = sendSmsResponse.Message };
} }
......
...@@ -179,13 +179,12 @@ namespace Edu.WebApi.Controllers.APP ...@@ -179,13 +179,12 @@ namespace Edu.WebApi.Controllers.APP
} }
else if (model.ActivationStatus == 0) else if (model.ActivationStatus == 0)
{ {
//暂时去掉
// string mobileNumber = customerInfo.ContactNumber; //bool canSendCode = Cache.App.MsgUserRedisCache.CheckCanSendCode(account, out string message);
bool canSendCode = Cache.App.MsgUserRedisCache.CheckCanSendCode(account, out string message); //if (!canSendCode)
if (!canSendCode) //{
{ // return ApiResult.Failed(message);
return ApiResult.Failed(message); //}
}
string code = StringHelper.CreateRandomCode(4); string code = StringHelper.CreateRandomCode(4);
//新增短信记录信息 //新增短信记录信息
var msgLogModel = new Model.Entity.System.RB_Msg_Log var msgLogModel = new Model.Entity.System.RB_Msg_Log
......
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