Merge branch '金隅分支' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 金隅分支

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

@@ -427,12 +427,17 @@ namespace Learun.Application.Web.Controllers
         [HttpGet]
         public ActionResult Index()
         {
-            //授权验证
-            var lc = LicenseChecker.CheckLicense();
-            if (!lc.Result)
+            //判断当前ip是否是123服务器，如果是123服务器，跳过授权验证
+            if (Net.GetLanIp() != "172.17.3.181")
             {
-                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

@@ -185,11 +185,15 @@ namespace Learun.Application.Web.Controllers
         [HttpGet]
         public ActionResult Index()
         {
-            //授权验证
-            var lc = LicenseChecker.CheckLicense();
-            if (!lc.Result)
+            //判断当前ip是否是123服务器，如果是123服务器，跳过授权验证
+            if (Net.GetLanIp() != "172.17.3.181")
             {
-                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();
@@ -1170,7 +1174,7 @@ namespace Learun.Application.Web.Controllers
                     {
                         return Fail("账户被系统锁定,请联系管理员!");
                     }
-                    
+
                     userBll.setPassword(userEntity.F_UserId, newPassword);
 
                     //删除验证码

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Util/Learun.Util/Web/Net.cs

@@ -55,7 +55,7 @@ namespace Learun.Util
         /// 获取局域网IP
         /// </summary>
         /// <returns></returns>
-        private static string GetLanIp()
+        public static string GetLanIp()
         {
             foreach (var hostAddress in Dns.GetHostAddresses(Dns.GetHostName()))
             {