Merge branch '西昌分支' of 123.57.209.16:bjquanjiang/DigitalScholl into 西昌分支

Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/HomeController.cs

@@ -424,12 +424,17 @@ namespace Learun.Application.Web.Controllers
         [HttpGet]
         public ActionResult Index()
         {
-            //授权验证
-            var lc = LicenseChecker.CheckLicense();
-            if (!lc.Result)
+            //判断当前ip是否是123服务器，如果是123服务器，跳过授权验证
+            if (Net.Ip != "183.185.97.88" && Net.Ip != "123.57.209.16")
             {
-                return Content("<script>alert('" + lc.Message + "');location.href='/ShowRegister/Index';</script>");
+                //授权验证
+                var lc = LicenseChecker.CheckLicense();
+                if (!lc.Result)
+                {
+                    return Content("<script>alert('" + lc.Message + "');location.href='/ShowRegister/Index';</script>");
+                }
             }
+
             //return View("AdminTop");
             string learn_UItheme = WebHelper.GetCookie("Learn_ADMS_V6.1_UItheme");
 

Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/LoginController.cs

@@ -177,11 +177,15 @@ namespace Learun.Application.Web.Controllers
         [HttpGet]
         public ActionResult Index()
         {
-            //授权验证
-            var lc = LicenseChecker.CheckLicense();
-            if (!lc.Result)
+            //判断当前ip是否是123服务器，如果是123服务器，跳过授权验证
+            if (Net.Ip != "183.185.97.88" && Net.Ip != "123.57.209.16")
             {
-                return Content("<script>alert('" + lc.Message + "');location.href='/ShowRegister/Index';</script>");
+                //授权验证
+                var lc = LicenseChecker.CheckLicense();
+                if (!lc.Result)
+                {
+                    return Content("<script>alert('" + lc.Message + "');location.href='/ShowRegister/Index';</script>");
+                }
             }
             //获取错误次数
             ViewBag.errornum = OperatorHelper.Instance.GetCurrentErrorNum();
@@ -576,16 +580,16 @@ namespace Learun.Application.Web.Controllers
                 {
                     if (userEntity.F_ModifyPwdDate.HasValue)
                     {
-                        if ((DateTime.Now-userEntity.F_ModifyPwdDate.Value).Days>30)
+                        if ((DateTime.Now - userEntity.F_ModifyPwdDate.Value).Days > 30)
                         {
                             return Success(new { pwdtip = true });
                         }
                     }
                     else
                     {
-                        if (userEntity.F_CreateDate.HasValue && (DateTime.Now-userEntity.F_CreateDate.Value).Days>30)
+                        if (userEntity.F_CreateDate.HasValue && (DateTime.Now - userEntity.F_CreateDate.Value).Days > 30)
                         {
-                            return Success(new { pwdtip=true });
+                            return Success(new { pwdtip = true });
                         }
                     }
                 }