From 1eca150309b7a0b00b780d36ef1ddfd7b4493074 Mon Sep 17 00:00:00 2001
From: liangkun <liangkun7173@hotmail.com>
Date: Tue, 13 Jul 2021 16:35:35 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E8=AF=81=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8E=E5=BC=BA=E5=88=B6=E5=AF=86=E7=A0=81?=
 =?UTF-8?q?=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/login/IdCardLogin/IdCardLogin.html  |  2 +-
 .../pages/login/IdCardLogin/IdCardLogin.js    |  8 +--
 .../www/pages/login/login.html                |  2 +-
 .../modifypasswordandnotice.css               |  1 +
 .../modifypasswordandnotice.html              | 34 ++++++++++
 .../modifypasswordandnotice.js                | 67 +++++++++++++++++++
 .../www/pages/workspace/workspace.html        |  3 +
 .../User/UserBLL.cs                           | 10 ++-
 .../Modules/UserApi.cs                        | 15 +++--
 9 files changed, 129 insertions(+), 13 deletions(-)
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/my/modifypasswordandnotice/modifypasswordandnotice.css
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/my/modifypasswordandnotice/modifypasswordandnotice.html
 create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/my/modifypasswordandnotice/modifypasswordandnotice.js

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/login/IdCardLogin/IdCardLogin.html b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/login/IdCardLogin/IdCardLogin.html
index 790d1b681..d71c6f1cf 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/login/IdCardLogin/IdCardLogin.html	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/login/IdCardLogin/IdCardLogin.html	
@@ -7,7 +7,7 @@
         </div>
         <div class="line">
             <i class="iconfont icon-lock"></i>
-            <input id="pwd" type="password" placeholder="密码">
+            <input id="pwd" type="password" placeholder="新生身份证号码后8位">
         </div>
         <button id="loginBtn" type="button" class="lr-btn-primary lr-btn-block">
             登录
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/login/IdCardLogin/IdCardLogin.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/login/IdCardLogin/IdCardLogin.js
index 813d452be..a4f3bdb54 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/login/IdCardLogin/IdCardLogin.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/login/IdCardLogin/IdCardLogin.js	
@@ -40,9 +40,9 @@
                 var password = $('#pwd').val();
                 var up = true;
                 if (account === "") {
-                    learun.layer.warning('用户名不能为空！', function () { }, '提示', '关闭');
+                    learun.layer.warning('身份证号不能为空！', function () { }, '提示', '关闭');
                 }else if(account.length<=6){
-					learun.layer.warning('用户名输入有误！', function () { }, '提示', '关闭');
+                    learun.layer.warning('身份证号输入有误！', function () { }, '提示', '关闭');
 				} else if (password === "") {
                     learun.layer.warning('密码不能为空！', function () { }, '提示', '关闭');
                 } else {
@@ -77,9 +77,9 @@
                             $('#account').val('');
                             $('#password').val('');
                             if (res.data.pwd === true) {
-                                learun.storage.set('pwd', true);
+                                learun.storage.set('pwdandnotice', true);
                             } else {
-                                learun.storage.set('pwd', false);
+                                learun.storage.set('pwdandnotice', false);
                             }
                             learun.tab.go('workspace');
                             if (learun.storage.get("Ip") != null && learun.storage.get("ACIp") != "") {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/login/login.html b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/login/login.html
index 0246c497a..5b253ce8c 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/login/login.html	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/login/login.html	
@@ -16,7 +16,7 @@
             微信登录
         </button>
         <button id="bindidcardBtn" type="button" class="lr-btn-primary lr-btn-block">
-            身份证登录
+            新生首次登录入口
         </button>
         <button id="RegisterBtn" type="button" style="display:none;" class="lr-btn-primary lr-btn-block">
             注册
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/my/modifypasswordandnotice/modifypasswordandnotice.css b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/my/modifypasswordandnotice/modifypasswordandnotice.css
new file mode 100644
index 000000000..e02abfc9b
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/my/modifypasswordandnotice/modifypasswordandnotice.css	
@@ -0,0 +1 @@
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/my/modifypasswordandnotice/modifypasswordandnotice.html b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/my/modifypasswordandnotice/modifypasswordandnotice.html
new file mode 100644
index 000000000..a111c93c9
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/my/modifypasswordandnotice/modifypasswordandnotice.html	
@@ -0,0 +1,34 @@
+<<div style="margin-top:10px;" class="lr-form-container" id="modifypasswordform">
+    <div class="lr-form-row">
+        <label>原密码</label>
+        <input id="oldpassword" type="password" isvalid="yes" checkexpession="NotNull" errormsg="原密码">
+    </div>
+    <div class="lr-form-row">
+        <label>新密码</label>
+        <input id="newpassword" type="password" isvalid="yes" checkexpession="NotNull" errormsg="新密码">
+    </div>
+    <div class="lr-form-row">
+        <label>确认新密码</label>
+        <input id="newpassword1" type="password" isvalid="yes" checkexpession="NotNull" errormsg="确认新密码">
+    </div>
+</div>
+
+<div class="lr-list" style="margin-top: 15px;">
+    <div id="strongpwd" style="display: none;">
+        您的密码不满足强度要求，请您先修改密码后再执行系统其他操作！
+    </div>
+    <div>
+        新密码必须8-20位同时包含1.[大小写字母]、2[数字]、3[特殊符号!@@#$%^&*]
+    </div>
+    <div>
+        学生学号请登录后点击【我的】->点击头像->查看【帐号】
+    </div>
+    <div class="lr-list-item" style="color: red; text-align: center;" id="savepassword">
+        保存
+    </div>
+</div>
+<div class="lr-list" style="margin-top:15px;display: none;" id="strongpwdout" >
+    <div class="lr-list-item" style="color:red;text-align:center;" id="outloginbtn">
+        退出
+    </div>
+</div>
\ No newline at end of file
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/my/modifypasswordandnotice/modifypasswordandnotice.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/my/modifypasswordandnotice/modifypasswordandnotice.js
new file mode 100644
index 000000000..9cd0eff9e
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/my/modifypasswordandnotice/modifypasswordandnotice.js	
@@ -0,0 +1,67 @@
+(function () {
+    var userinfo = null;
+    var page = {
+        isScroll: true,
+        init: function ($page) {
+            userinfo = learun.storage.get('userinfo');
+            //主被动修改密码判断
+            if (learun.storage.get('pwd')===true) {
+                $page.find('#strongpwd').css("display", "block");
+                $page.find('#strongpwdout').css("display", "block");
+            }
+            $page.find('#savepassword').on('tap', function () {
+                if (!$('#modifypasswordform').lrformValid()) {
+                    return false;
+                }
+                var formdata = $('#modifypasswordform').lrformGet();
+                var reg = /^(?=.*[0-9])(?=.*[A-Z])(?=.*[a-z])(?=.*[!@#$%^&*,\.])[0-9a-zA-Z!@#$%^&*,\.]{8,20}$/;
+                if (!reg.test(formdata.newpassword)) {
+                    learun.layer.toast('密码不满足强度要求');
+                    return false;
+                }
+                if (formdata.newpassword1 === formdata.newpassword) {
+
+                    var req = {
+                        newpassword: $.md5(formdata.newpassword),
+                        oldpassword: $.md5(formdata.oldpassword)
+                    };
+                    learun.layer.loading(true);
+                    // 访问后台修改密码
+                    learun.httppost(config.webapi + "learun/adms/user/modifypw", req, (data,info) => {
+                        learun.layer.loading(false);
+                        if (data) {// 表单数据保存成功，发起流程
+                            learun.layer.toast(info);
+                            learun.storage.set('logininfo', null);
+                            learun.storage.set('pwd', false);
+                            learun.nav.go({ path: 'login', isBack: false, isHead: false });
+                        }
+                        return false;
+                    });
+                }
+                else {
+                    learun.layer.toast('二次输入密码不同');
+                }
+            });
+            $page.find('#outloginbtn').on('tap', function () {
+                learun.layer.confirm('确定要退出账号?', function (_index) {
+                    if (_index === '1') {
+                        learun.isOutLogin = true;
+                        if (learun.storage.get("Ip") != null && learun.storage.get("ACIp") != "") {
+                            //Ip上网
+                            sendToAc(learun.storage.get("ACIp"), 'logout', learun.storage.get("Ip"), userinfo.baseinfo.account, '');
+                        }
+                        if (learun.storage.get("Ip") != null && learun.storage.get("ACIp2") != "") {
+                            //Ip上网
+                            sendToAc(learun.storage.get("ACIp2"), 'logout', learun.storage.get("Ip"), userinfo.baseinfo.account, '');
+                        }
+                        learun.storage.set('logininfo', null);
+                        learun.nav.go({ path: 'login', isBack: false, isHead: false });
+                        
+                    }
+
+                }, '', ['取消', '退出']);
+            });
+        }
+    };
+    return page;
+})();
\ No newline at end of file
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/workspace/workspace.html b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/workspace/workspace.html
index f7d954142..0af8b4ab0 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/workspace/workspace.html	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/workspace/workspace.html	
@@ -221,6 +221,9 @@
                     if (learun.storage.get('pwd') === true) {
                         learun.nav.go({ path: 'my/modifypassword', isBack: false, isHead: true, title:'修改密码' });
                     }
+                    if (learun.storage.get('pwdandnotice') === true) {
+                        learun.nav.go({ path: 'my/modifypasswordandnotice', isBack: false, isHead: true, title: '修改密码' });
+                    }
                     var _html = '';
                     //          _html += '<div class="scanner">';
                     //          _html += '<i class="iconfont icon-scan"></i>';
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Organization/User/UserBLL.cs b/Learun.Framework.Ultimate V7/Learun.Application.Organization/User/UserBLL.cs
index a9f018569..839349ae4 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Organization/User/UserBLL.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Organization/User/UserBLL.cs	
@@ -1162,15 +1162,19 @@ namespace Learun.Application.Organization
                     };
                     return userEntity;
                 }
+                else 
+                {
+                    
+                }
 
                 userEntity.LoginOk = false;
                 if (userEntity.F_EnabledMark == 1)
                 {
-                    if (userEntity.F_IdentityCardNo.Length <= 6)
+                    if (userEntity.F_IdentityCardNo.Length <= 8)
                     {
-                        userEntity.LoginMsg = "账户名输入有误!";
+                        userEntity.LoginMsg = "身份证输入有误!";
                     }
-                    else if (password == userEntity.F_IdentityCardNo.Substring(userEntity.F_IdentityCardNo.Length - 6, 6))
+                    else if (password == userEntity.F_IdentityCardNo.Substring(userEntity.F_IdentityCardNo.Length - 8, 8))
                     {
                         userEntity.LoginOk = true;
                     }
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/UserApi.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/UserApi.cs
index 25c815ffd..ed00f0269 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/UserApi.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/UserApi.cs	
@@ -153,6 +153,13 @@ namespace Learun.Application.WebApi
             }
             else
             {
+                //新增新生判断
+                var stuinfobasic = stuInfoBasicIBLL.GetStuInfoBasicEntityByStuNo(userEntity.F_EnCode);
+                if (stuinfobasic!=null&&stuinfobasic.Grade!="21")
+                {
+                    userEntity.LoginMsg = "只有新生支持身份证方式登录";
+                    return Fail(userEntity.LoginMsg);
+                }
                 //记录ip
                 userIBLL.UpdateIp(GetIP(), userEntity.F_UserId);
                 string token = OperatorHelper.Instance.AddLoginUser(userEntity.F_Account, "Learun_ADMS_6.1_App", this.loginMark, false);//写入缓存信息
@@ -179,10 +186,10 @@ namespace Learun.Application.WebApi
                 }
                 //是否强密码验证
                 bool pwd = false;
-                //if (!string.IsNullOrEmpty(ConfigurationManager.AppSettings["verifypwd"]) && ConfigurationManager.AppSettings["verifypwd"] == "true" && loginModel.up == false)
-                //{
-                //    pwd = true;
-                //}
+                if (!string.IsNullOrEmpty(ConfigurationManager.AppSettings["verifypwd"]) && ConfigurationManager.AppSettings["verifypwd"] == "true" && loginModel.up == false)
+                {
+                    pwd = true;
+                }
                 var jsonData = new
                 {
                     baseinfo = res.userInfo,