提交个人兴趣爱好

Edu.Model/Entity/User/RB_Student.cs

@@ -107,7 +107,7 @@ namespace Edu.Model.Entity.User
         /// <summary>
         /// 兴趣爱好
         /// </summary>
-        public string Interest { get; set; }
+        public int Interest { get; set; }
 
 
         /// <summary>

Edu.Module.System/MsgLogModule.cs

@@ -296,8 +296,9 @@ namespace Edu.Module.System
         }
 
 
-        public void SendCode(string code, Common.Enum.System.BaseTemplateTypeEnum BaseTemplateType, RB_Msg_Log msgLogModel)
+        public bool SendCode(string code, Common.Enum.System.BaseTemplateTypeEnum BaseTemplateType, RB_Msg_Log msgLogModel)
         {
+            bool flag = false;
             //查询当前集团的短信基础配置
             var msgBaseList = msgBaseRepository.GetListRepository(new RB_Msg_Base_Function_ViewModel { Group_Id = msgLogModel.Group_Id });
             //查询当前下面是否有模板
@@ -330,6 +331,7 @@ namespace Edu.Module.System
                                 if (Common.Config.IsSendMsg == 1)
                                 {
                                     ThirdCore.Message.SMSService.SendCode(msgLogModel.ReceiverPhone, code, msgBaseTemplateModel.TemplateId, msgBaseTemplateModel.Sign, model.MsgBase.Domain, model.MsgBase.AccessKeyId, model.MsgBase.AccessSecret, model.MsgBase.RegionId, id.ToString());
+                                    flag = true;
                                 }
 
                             }
@@ -337,7 +339,8 @@ namespace Edu.Module.System
                     }
                 }
             }
-            // ThirdCore.Message.SMSService.SendMsg("13551132417", PhoneMessage, "SMS_201722097", "印象之旅", "dysmsapi.aliyuncs.com", "LTAIwE7l9dImZSa3", "j47Ajn0d0WzUCIX8Biyj3P2r8QDltI", "cn-hangzhou");
+            return flag;
+
         }
         #endregion
 

Edu.Module.User/StudentModule.cs

@@ -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

@@ -119,8 +119,8 @@ namespace Edu.WebApi.Controllers.APP
                 };
                 //上传配置
                 var uploadConfig = publicModule.GetFileStoreList(new Model.Public.RB_File_Store() { Group_Id = model.Group_Id, IsDefault = 1 })?.FirstOrDefault();
-               
-                           
+
+
                 string token = WebApiTokenHelper.CreateToken(Common.GlobalKey.JWT_User_Key, eduUserInfo);
                 AppStudentInfo obj = new AppStudentInfo
                 {
@@ -201,10 +201,18 @@ namespace Edu.WebApi.Controllers.APP
                     ReceiverName = model.AccountName,
                     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, 600000);
-                Cache.App.MsgUserRedisCache.AddUserSendCodeHistory(account);
-                return ApiResult.Success("验证码已发送，请注意查收", data: null);
+                var result = new Module.System.MsgLogModule().SendCode(code, Common.Enum.System.BaseTemplateTypeEnum.SendCode, msgLogModel);
+                if (result)
+                {
+                    Cache.App.MsgUserRedisCache.SetSendCode(Cache.CacheKey.MsgStudent_Login_Key + account, code, 600);
+                    Cache.App.MsgUserRedisCache.AddUserSendCodeHistory(account);
+                    return ApiResult.Success("验证码已发送，请注意查收", data: null);
+                }
+                else
+                {
+                    return ApiResult.Failed("发送短信失败，请稍后再试");
+                }
+
             }
             else
             {
@@ -213,20 +221,20 @@ namespace Edu.WebApi.Controllers.APP
         }
 
 
+
         /// <summary>
-        /// 激活并登陆
+        /// 判断输入的验证码是否正确
         /// </summary>
-        /// <param name="request">获取信息</param>
         /// <returns></returns>
+
         [HttpPost]
         [AllowAnonymous]
-        public ApiResult ActivationLogin()
+        public ApiResult CheckSendCode()
         {
             JObject jobj = JObject.Parse(RequestParm.Msg.ToString());
 
             string account = jobj.GetStringValue("account");
             string sendcode = jobj.GetStringValue("sendcode");
-            string password = jobj.GetStringValue("password");
             if (string.IsNullOrWhiteSpace(sendcode))
             {
                 return ApiResult.Failed("验证码不能为空");
@@ -247,6 +255,47 @@ namespace Edu.WebApi.Controllers.APP
                     }
                 }
             }
+            Cache.App.MsgUserRedisCache.SetSendCode(Cache.CacheKey.MsgStudent_Login_Key + account, sendcode, 1);
+            return ApiResult.Success("验证码输入正确");
+        }
+
+
+
+
+        /// <summary>
+        /// 激活并登陆
+        /// </summary>
+        /// <param name="request">获取信息</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AllowAnonymous]
+        public ApiResult ActivationLogin()
+        {
+            JObject jobj = JObject.Parse(RequestParm.Msg.ToString());
+
+            string account = jobj.GetStringValue("account");
+            // string sendcode = jobj.GetStringValue("sendcode");
+            string password = jobj.GetStringValue("password");
+            //if (string.IsNullOrWhiteSpace(sendcode))
+            //{
+            //    return ApiResult.Failed("验证码不能为空");
+            //}
+            //else
+            //{
+
+            //    object cacheCode = Cache.App.MsgUserRedisCache.GetUserCode(Cache.CacheKey.MsgStudent_Login_Key + account, Common.Enum.ApiRequestFromEnum.AppStudent);
+            //    if (cacheCode == null)
+            //    {
+            //        return ApiResult.Failed("验证码已失效,请重新获取");
+            //    }
+            //    else
+            //    {
+            //        if (!cacheCode.ToString().Equals(sendcode))
+            //        {
+            //            return ApiResult.Failed("验证码不正确，请填写正确的验证码");
+            //        }
+            //    }
+            //}
             var model = accountModule.GetStudentExt(new RB_Account_ViewModel()
             {
                 Account = account.Trim(),
@@ -399,7 +448,7 @@ namespace Edu.WebApi.Controllers.APP
             JObject jobj = JObject.Parse(RequestParm.Msg.ToString());
 
             string account = jobj.GetStringValue("account");
-            string sendcode = jobj.GetStringValue("sendcode");
+             string sendcode = jobj.GetStringValue("sendcode");
             string openid = jobj.GetStringValue("openid");
             string password = jobj.GetStringValue("password");
             if (string.IsNullOrWhiteSpace(sendcode))
@@ -422,6 +471,7 @@ namespace Edu.WebApi.Controllers.APP
                     }
                 }
             }
+            Cache.App.MsgUserRedisCache.SetSendCode(Cache.CacheKey.MsgStudent_Login_Key + account, sendcode, 1);
             var model = accountModule.GetStudentExt(new RB_Account_ViewModel()
             {
                 Account = account.Trim(),
@@ -446,7 +496,7 @@ namespace Edu.WebApi.Controllers.APP
                 {
                     return ApiResult.Failed(message: $"此账号【{ account }】已禁用", new { Error = 2 });
                 }
-              
+
                 //更新用户的密码
                 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));
 

Edu.WebApi/Controllers/APP/AppIndexController.cs

@@ -38,10 +38,10 @@ namespace Edu.WebApi.Controllers.APP
         {
             var query = new RB_Student_ViewModel()
             {
-                Interest = base.ParmJObj.GetStringValue("Interest"),
+                Interest = base.ParmJObj.GetInt("Interest"),
                 JapanBaseInfo = base.ParmJObj.GetInt("JapanBaseInfo"),
-               // StuSex = base.ParmJObj.GetInt("StuSex"),
-                //StuIcon = base.ParmJObj.GetStringValue("StuIcon"),
+                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,