页面修改

Edu.Module.Course/ScrollClassCommonModule.cs

@@ -157,10 +157,10 @@ namespace Edu.Module.Course
         {
             //提前时间
             string Scroll_Time = dictvalueRepository.GetList(new Model.ViewModel.User.RB_Dictvalue_Extend() { RB_Group_id = groupId, DictKey = "Scroll_Time" }).FirstOrDefault()?.Content ?? "00:00";
-
             //按照设置的时间来判定
             if (DateTime.Now.Hour == Convert.ToDateTime("2022-01-25 " + Scroll_Time).Hour)
             {
+                Common.Plugin.LogHelper.WriteInfo("CreateScrollAppointment:Start" );
                 //提前几天
                 int AdvanceDay = Convert.ToInt32(dictvalueRepository.GetList(new Model.ViewModel.User.RB_Dictvalue_Extend() { RB_Group_id = groupId, DictKey = "Scroll_AdvanceDay" }).FirstOrDefault()?.Content ?? "1");
                 //看提前几天  这个日期之前的（包含此日期） 都算
@@ -178,6 +178,7 @@ namespace Edu.Module.Course
                         token = WeChatHelper.GetAccessToken(Appid, Secret);
                         Cache.WeChat.WeChatReidsCache2.Set(tokenKey, token);
                     }
+                    Common.Plugin.LogHelper.WriteInfo("Token:" + token);
                     if (string.IsNullOrEmpty(token))
                     {
                         return false;
@@ -189,6 +190,7 @@ namespace Edu.Module.Course
                     //以老师为单位 遍历
                     foreach (var item in tempAppointList)
                     {
+                        Common.Plugin.LogHelper.WriteInfo("tempAppointList:" + tempAppointList.Count());
                         var CourseTimeList = JsonHelper.DeserializeObject<List<CourseTimeModel>>(item.FirstOrDefault().CourseTime);
                         string CourseTime = CourseTimeList.Min(x => x.StartTime) + "~" + CourseTimeList.Max(x => x.EndTime);
                         string StartTime = item.Key.Date.ToString("yyyy-MM-dd") + " " + CourseTimeList.Min(x => x.StartTime);

Edu.WebApi/Controllers/Applet/AppletLoginController.cs

@@ -86,11 +86,18 @@ namespace Edu.WebApi.Controllers.APP
         public ApiResult Login()
         {
             JObject jobj = JObject.Parse(RequestParm.Msg.ToString());
-            string account = jobj.GetStringValue("Account");
-            string password = jobj.GetStringValue("Password");
+            string account = jobj.GetStringValue("Account").Trim();
+            string password = jobj.GetStringValue("Password").Trim();
             string UnionId = jobj.GetStringValue("UnionId");
             string OpenId = jobj.GetStringValue("OpenId");
-
+            if (string.IsNullOrEmpty(account))
+            {
+                return ApiResult.Failed(message: "请输入账号", new { Error = -1 });
+            }
+            if (string.IsNullOrEmpty(password))
+            {
+                return ApiResult.Failed(message: "请输入密码", new { Error = -1 });
+            }
             var model = accountModule.GetStudentExt(new RB_Account_ViewModel()
             {
                 Account = account.Trim(),