Index: ssts-web/src/main/webapp/logon.jsp
===================================================================
diff -u -r40854 -r40881
--- ssts-web/src/main/webapp/logon.jsp	(.../logon.jsp)	(revision 40854)
+++ ssts-web/src/main/webapp/logon.jsp	(.../logon.jsp)	(revision 40881)
@@ -244,26 +244,31 @@
 	<!-- alertDiv样式 -->
 	<div id="idBox1" class="lightbox">
 		<div class="title">
-			<span>获取验证码</span>
+			<span>短信验证提醒</span>
 			<span class="close"><a href="javascript:void(0)" onclick="hideBox1();">关闭</a></span>
 		</div>
 		<div class="showForm">
-			<div class="userItem">
+			<div class="userItem" id="userNameItem">
 				<span>用户名：</span>
 				<input type="text" id="userName" disabled />
 			</div>
+			<div class="userItem" id="labelNameItem" style="display: none;">
+				<span>本次登录需要进行短信验证：</span>
+			</div>
 			<div class="userItem">
 				<span>手机号：</span>
 				<input type="text" id="userPhone" disabled />
 			</div>
 			<div class="userItem">
 				<span>验证码：</span>
 				<input type="text" id="userCode" />
-				<button type="button" class="button" onclick="sendCode(this)" >发送验证码</button>
+				<button type="button" class="button" onclick="sendCode(this)" id="sendCodeBtn">发送验证码</button>
+				<button type="button" class="button" onclick="sendCodeBySms(this)" id="sendCodeBtnBySms">发送验证码</button>
 			</div>
 			<input type="hidden" id="hiddenUserCode" />
 			<div class="userItem buttonItem">
-				<button type="button" class="button next" onclick="next()">下一步</button>
+				<button type="button" class="button next" onclick="next()" id="nextBtn">下一步</button>
+				<button type="button" class="button next" onclick="loginForCode()" id="loginBtn" style="display: none;">确定</button>
 			</div>
 		</div>
 	</div>
@@ -699,8 +704,19 @@
 		return
 	}
 
-	needModifyPwd();
 	hideBox3();
+	//ZSYY-438：短信验证
+	if(sstsConfig.needBeStrongPwdWhenModifyPwd && sstsConfig.enableTwoFactorAuthentication){
+		var checkPasswordResult = testPasswordReg(j_password_display.value,j_username_display.value);
+		if (checkPasswordResult.success) {
+			needModifyPwd();
+		}else {
+			showResult(checkPasswordResult.msg);
+			isBindPhone(j_username_display.value, 'login')
+		}
+	}else {
+		needModifyPwd();
+	}
 }
 
 //GZSZYY-121：强制修改密码
@@ -770,7 +786,7 @@
 	if(userName == ''){
 		alert('请输入用户名');
 	}else {
-		isBindPhone(userName);
+		isBindPhone(userName, 'resetPwd');
 	}
 }
 
@@ -799,6 +815,28 @@
     ab2.show();
 }
 
+//ZSYY-438：短信验证登录
+function loginForCode(){
+	//GZSZYY-83：登录二次验证类型
+	var userName = document.getElementById("j_username_display").value;
+	var userCode = document.getElementById("userCode").value;
+	var publicKey = "<%=logonRSAPublicKey %>";
+	// Encrypt with the public key...
+	var encrypt = new JSEncrypt();
+	encrypt.setPublicKey(publicKey);
+	var encryptedUserName = encrypt.encrypt(userName);
+	var encryptedUserCode = encrypt.encrypt(userCode);
+	validateAuthenticationCode(encryptedUserName, encryptedUserCode, function(res){
+		if(res.success){
+			ab1.close();
+			//GZSZYY-83：登录二次验证类型
+			needModifyPwd();
+		}else {
+			showResult(res.message);
+		}
+	})
+}
+
 if((sstsConfig.enablePrintLabelsOutputPrinterSettingsFunction || sstsConfig.enableOperationReservationShippedToTraysOfKardexContainer) && clientComputerName !== ''){
 	sessionStorage.setItem('clientComputerName',clientComputerName)
 }
@@ -862,6 +900,7 @@
 				document.getElementById('hiddenUserCode').value = result.verificationCode;
 				that.innerHTML = time + ' s';
 				that.disabled = true;
+				time = 60;
 				setCodeTimeout(that);
 			}else {
 				alert(result.message);
@@ -871,12 +910,33 @@
     });
 }
 
+function sendCodeBySms(that){
+	var userName = document.getElementById("j_username_display").value;
+	if(userName == ''){
+		alert('用户名不存在');
+		return;
+	}
+	var publicKey = "<%=logonRSAPublicKey %>";
+	// Encrypt with the public key...
+	var encrypt = new JSEncrypt();
+	encrypt.setPublicKey(publicKey);
+	var encryptedUserName = encrypt.encrypt(userName);
+	sendAuthenticationCodeSms(encryptedUserName,function(res){
+		if(res.success){
+			showResult(res.message);
+			time = 60;
+			setCodeTimeout(that);
+		}
+	})
+}
+
 //倒计时
 function setCodeTimeout(that){
 	var t = setTimeout(function() {
 		if(time > 0){
 			time--;
 			that.innerHTML = time + ' s';
+			that.disabled = true;
 			setCodeTimeout(that);
 		}else {
 			clearTimeout(t);
@@ -888,7 +948,7 @@
 }
 
 //验证是否绑定手机号
-function isBindPhone(userName){
+function isBindPhone(userName, type){
 	//对用户名进行rsa加密
 	var publicKey = "<%=logonRSAPublicKey %>";
     var encrypt = new JSEncrypt();
@@ -903,6 +963,21 @@
 		},
         success : function(result) {
        		if(result.success){
+				if(type == 'login'){
+					$('#labelNameItem').show();
+					$('#loginBtn').show();
+					$('#sendCodeBtnBySms').show();
+					$('#userNameItem').hide();
+					$('#nextBtn').hide();
+					$('#sendCodeBtn').hide();
+				}else {
+					$('#labelNameItem').hide();
+					$('#loginBtn').hide();
+					$('#sendCodeBtnBySms').hide();
+					$('#userNameItem').show();
+					$('#nextBtn').show();
+					$('#sendCodeBtn').show();
+				}
 				alertBox1(userName,result.phoneNumber);
 			}else {
 				alert(result.message);
@@ -1041,7 +1116,18 @@
 		if(sstsConfig.loginTwoFactorAuthenticationType == 1){
 			alertBox3()
 		}else {
-			needModifyPwd();
+			//ZSYY-438：短信验证
+			if(sstsConfig.needBeStrongPwdWhenModifyPwd && sstsConfig.enableTwoFactorAuthentication){
+				var checkPasswordResult = testPasswordReg(j_password_display.value,j_username_display.value);
+				if (checkPasswordResult.success) {
+					needModifyPwd();
+				}else {
+					showResult(checkPasswordResult.msg);
+					isBindPhone(j_username_display.value, 'login')
+				}
+			}else {
+				needModifyPwd();
+			}
 		}
 	}