Index: ssts-web/src/main/webapp/systemmanage/adminModifyPWDByExt.js
===================================================================
diff -u -r37676 -r40881
--- ssts-web/src/main/webapp/systemmanage/adminModifyPWDByExt.js	(.../adminModifyPWDByExt.js)	(revision 37676)
+++ ssts-web/src/main/webapp/systemmanage/adminModifyPWDByExt.js	(.../adminModifyPWDByExt.js)	(revision 40881)
@@ -1,134 +1,206 @@
+//ZSYY-438：短信验证码
+function sendCodeByModify() {
+    // Encrypt with the public key...
+    sendAuthenticationCodeSms(encryptedUserName, function (res) {
+        if (res.success) {
+            setCodeTimeoutByModify();
+        }
+    })
+}
+var time2 = 60;
+//倒计时
+function setCodeTimeoutByModify() {
+    var button = Ext.getCmp('senCode');
+    var t = setTimeout(function () {
+        if (time2 > 0) {
+            time2--;
+            button.setText(time2 + ' s');
+            button.setDisabled(true);
+            setCodeTimeoutByModify();
+        } else {
+            clearTimeout(t);
+            time2 = 60;
+            button.setText('发送验证码');
+            button.setDisabled(false);
+        }
+    }, 1000);
+}
+
 function checkSubmit() {
-	var newPassword = Ext.getCmp('newPassword').getValue();
-	var confirmNewPassword = Ext.getCmp('confirmNewPassword').getValue();
-    
-	if (newPassword == ""){
+    var newPassword = Ext.getCmp('newPassword').getValue();
+    var confirmNewPassword = Ext.getCmp('confirmNewPassword').getValue();
+
+    if (newPassword == "") {
         alert("请输入新密码！");
         return false;
     }
-	var loginUserName = $Id("loginUserName").value;
+    var loginUserName = $Id("loginUserName").value;
     //暂时屏蔽验证复杂密码
-	var checkPasswordResult = testPasswordReg(newPassword, loginUserName);
-	if(!checkPasswordResult.success){
-		alert(checkPasswordResult.msg);
-		return false;
-	}
-    if (confirmNewPassword == ""){
+    var checkPasswordResult = testPasswordReg(newPassword, loginUserName);
+    if (!checkPasswordResult.success) {
+        alert(checkPasswordResult.msg);
+        return false;
+    }
+    if (confirmNewPassword == "") {
         alert('请输入确认新密码！');
         return false;
     }
     if (newPassword != confirmNewPassword) {
-    	alert("新密码与确认新密码不一致！");
+        alert("新密码与确认新密码不一致！");
         return false;
     }
     return true;
 }
 
-function changeUserPassword(thiz){
-	if(checkSubmit()){
-		var newPassword = Ext.getCmp('newPassword').getValue();
-		if(isNeedUpdateResetDate=='true'){
-			alertTitle = "重置";
-			DWREngine.setAsync(false);
-			UserTableManager.resetPWDAndUpdateResetDate(paramId,newPassword,true,showTable);
-			DWREngine.setAsync(true);
-		}else{
-			alertTitle = "修改";
-			DWREngine.setAsync(false);
-			UserTableManager.modifyPWD(paramId,newPassword,showTable);
-			DWREngine.setAsync(true);
-		}
-	}
-	thiz.enable();
-	
+function changeUserPassword(thiz) {
+    if (checkSubmit()) {
+        var newPassword = Ext.getCmp('newPassword').getValue();
+        if (isNeedUpdateResetDate == 'true') {
+            alertTitle = "重置";
+            DWREngine.setAsync(false);
+            UserTableManager.resetPWDAndUpdateResetDate(paramId, newPassword, true, showTable);
+            DWREngine.setAsync(true);
+        } else {
+            alertTitle = "修改";
+            DWREngine.setAsync(false);
+            UserTableManager.modifyPWD(paramId, newPassword, showTable);
+            DWREngine.setAsync(true);
+        }
+    }
+    thiz.enable();
+
 }
 
 function showTable(table) {
-   	if(table){
-		alert(alertTitle+"密码成功！");
-		window.close();
-	}else{
-		alert(alertTitle+"密码失败，请稍候再试！");
-	}
+    if (table) {
+        alert(alertTitle + "密码成功！");
+        window.close();
+    } else {
+        alert(alertTitle + "密码失败，请稍候再试！");
+    }
 }
 
-function showUserName(userName){
-	Ext.getCmp('userName').setValue(userName.split(',')[0]);
-	Ext.getCmp('loginUserName').setValue(userName.split(',')[1]);
+function showUserName(userName) {
+    Ext.getCmp('userName').setValue(userName.split(',')[0]);
+    Ext.getCmp('loginUserName').setValue(userName.split(',')[1]);
 }
-		
 
+
 var formObj;
 
-Ext.onReady(function(){
+Ext.onReady(function () {
     Ext.QuickTips.init();
 
     //ZSRY-72：增加密码设置要求提示语
-	var msg = getModifyPwdMsg();
+    var msg = getModifyPwdMsg();
 
     formObj = new Ext.FormPanel({
-        frame:true,
-        labelWidth:70,
-        height:210,
-        bodyStyle:'padding:5px 10px 0px 10px',
+        frame: true,
+        labelWidth: 70,
+        height: 230,
+        bodyStyle: 'padding:5px 10px 0px 10px',
         items: [{
-        	xtype:'fieldset',
+            xtype: 'fieldset',
             title: '密码修改',
-            height:140,
+            height: 160,
             id: 'regionSet',
-            items :[{
-                xtype:'textfield',
-                fieldLabel :'用户姓名',
-                id :'userName',
-                name :'userName',
-                readOnly : true,
-                cls:'fieldReadOnlyNoRemove'
-            },{
-                xtype:'hidden',
-                id :'loginUserName',
-                name :'loginUserName'
-            },{
-                xtype:'textfield',
-                fieldLabel :'新密码',
-                id :'newPassword',
-                name :'newPassword',
+            items: [{
+                xtype: 'textfield',
+                fieldLabel: '用户姓名',
+                id: 'userName',
+                name: 'userName',
+                readOnly: true,
+                cls: 'fieldReadOnlyNoRemove'
+            }, {
+                xtype: 'hidden',
+                id: 'loginUserName',
+                name: 'loginUserName'
+            }, {
+                xtype: 'textfield',
+                fieldLabel: '新密码',
+                id: 'newPassword',
+                name: 'newPassword',
                 width: 200,
-                inputType:"password"
-        	},{
-                xtype:'textfield',
-                fieldLabel :'确认密码',
-                id :'confirmNewPassword',
-                name :'confirmNewPassword',
+                inputType: "password"
+            }, {
+                xtype: 'textfield',
+                fieldLabel: '确认密码',
+                id: 'confirmNewPassword',
+                name: 'confirmNewPassword',
                 width: 200,
-                inputType:"password"
-        	}, {
-                items:[{
-                    hidden:msg == ''?true:false,
-                    layout:'column', 
-                    items:[{
-                        id:'showPwdMessage',
-                        xtype:'textarea',
-                        width : 320,
-                        allowBlank : true,
-                        labelSeparator:'',
-                        labelWidth:0,
+                inputType: "password"
+            }, {
+                hidden: msg == '' ? true : false,
+                layout: 'column',
+                items: [{
+                    layout: 'form',
+                    columnWidth: .75,
+                    items: [{
+                        xtype: 'textfield',
+                        fieldLabel: '验证码',
+                        name: 'verificationCode',
+                        id: 'verificationCode',
+                        width: 170,
+                        msgTarget: 'side',
+                        allowBlank: true
+                    }]
+                }, {
+                    layout: 'form',
+                    columnWidth: .25,
+                    items: [{
+                        id: 'senCode',
+                        xtype: 'button',
+                        text: '发送验证码',
+                        disabled: false,
+                        handler: function () {
+                            sendCodeByModify();
+                        }
+                    }]
+                }]
+            }, {
+                items: [{
+                    hidden: msg == '' ? true : false,
+                    layout: 'column',
+                    items: [{
+                        id: 'showPwdMessage',
+                        xtype: 'textarea',
+                        width: 320,
+                        allowBlank: true,
+                        labelSeparator: '',
+                        labelWidth: 0,
                         anchor: '99%',
-                        readOnly : true,
-                        cls : 'fieldReadOnlyNoRemove',
+                        readOnly: true,
+                        cls: 'fieldReadOnlyNoRemove',
                         value: msg
                     }]
                 }]
             }]
         }],
         buttons: [{
             text: '确定',
-            handler: function (){
-            	this.disable();
-            	changeUserPassword(this);
+            handler: function () {
+                var that = this;
+                if (sstsConfig.needBeStrongPwdWhenModifyPwd && sstsConfig.enableTwoFactorAuthentication) {
+                    if (checkSubmit()) {
+                        var verificationCode = Ext.getCmp('verificationCode').getValue();
+                        var encryptedUserCode = encrypt.encrypt(verificationCode);
+                        validateAuthenticationCode(encryptedUserName, encryptedUserCode, function (res) {
+                            if (res.success) {
+                                that.disable();
+                                changeUserPassword(that);
+                            } else {
+                                showResult(res.message);
+                            }
+                        })
+                    }
+                } else {
+                    that.disable();
+                    changeUserPassword(that);
+                }
             }
-        },{
+        }, {
             text: '取消',
-            handler:function(){
+            handler: function () {
                 window.close();
             }
         }]
@@ -137,7 +209,7 @@
     formObj.render("formDiv");
     initGetUserNameById();
     Ext.getCmp('newPassword').focus();
-    if(msg !== ''){
-		Ext.getCmp('showPwdMessage').el.dom.style.color = 'red';
-	}
+    if (msg !== '') {
+        Ext.getCmp('showPwdMessage').el.dom.style.color = 'red';
+    }
 });
Index: ssts-web/src/main/webapp/disinfectsystem/config/zsyy/spring/his.xml
===================================================================
diff -u -r39182 -r40881
--- ssts-web/src/main/webapp/disinfectsystem/config/zsyy/spring/his.xml	(.../his.xml)	(revision 39182)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zsyy/spring/his.xml	(.../his.xml)	(revision 40881)
@@ -176,5 +176,20 @@
             </bean>
        </property>
     </bean>
+    
+	<!-- 验证码的dao-->
+	<bean id="verificationCodeDao"
+		class="com.forgon.disinfectsystem.datasynchronization.dao.zsyy.VerificationCodeDaoImpl">
+	</bean>
+	
+	 <!-- 验证码的manager-->
+	<bean id="verificationCodeManager" parent="txProxyTemplate">
+        <property name="target">
+            <ref bean="verificationCodeManagerTarget" />
+        </property>
+    </bean>
+	<bean id="verificationCodeManagerTarget"
+        class="com.forgon.disinfectsystem.verification.VerificationCodeManagerImpl">
+    </bean>
  
 </beans>
\ No newline at end of file
Index: ssts-web/src/main/webapp/js/common.js
===================================================================
diff -u -r40302 -r40881
--- ssts-web/src/main/webapp/js/common.js	(.../common.js)	(revision 40302)
+++ ssts-web/src/main/webapp/js/common.js	(.../common.js)	(revision 40881)
@@ -2237,7 +2237,7 @@
     if (v == '总价' && !record.data.id) { //如果这是最后一行（汇计总金额的）就不给他加修改的链接（陈家儒改）
         return v;
     }
-    if(typeof v == 'string'){
+    if (typeof v == 'string') {
         v = v.replace(/\"/g, "&#34;"); // 双引号转义处理
     }
     return "<a href=\"#\" onclick=\"callModifyFun('" + v + "'," + dataArrStr + ");return false;\">" + v + "</a>";
@@ -2337,6 +2337,30 @@
     return obj;
 }
 
+//ZSYY-438：发送短信验证
+function sendAuthenticationCodeSms(loginName, callback) {
+    Ext.Ajax.request({
+        url: WWWROOT + '/disinfectSystem/verification/verificationCodeAction!sendAuthenticationCodeSms.do',
+        params: { loginName: loginName },
+        success: function (response, options) {
+            var result = Ext.decode(response.responseText);
+            callback(result);
+        }
+    });
+}
+
+//ZSYY-438：验证码校验接口
+function validateAuthenticationCode(loginName, verificationCode, callback) {
+    Ext.Ajax.request({
+        url: WWWROOT + '/disinfectSystem/verification/verificationCodeAction!validateAuthenticationCode.do',
+        params: { loginName: loginName, verificationCode: verificationCode },
+        success: function (response, options) {
+            var result = Ext.decode(response.responseText);
+            callback(result);
+        }
+    });
+}
+
 function isfloat(oNum) {
     if (!oNum) return false;
     var strP = /^\d+(\.\d+)?$/;
@@ -5625,7 +5649,7 @@
     var today = new Date(newDate);
     var targetday_milliseconds = today.getTime();
     if (queryPeriod && queryPeriod > 0 && queryPeriod <= 10000) {
-        targetday_milliseconds = today.getTime() - 1000 * 60 * 60 * 24 * (queryPeriod-1);
+        targetday_milliseconds = today.getTime() - 1000 * 60 * 60 * 24 * (queryPeriod - 1);
         today.setTime(targetday_milliseconds);
     }
     var tYear = today.getFullYear();
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();
+			}
 		}
 	}
 
Index: ssts-web/src/main/webapp/homepage/portalPage.jsp
===================================================================
diff -u -r39038 -r40881
--- ssts-web/src/main/webapp/homepage/portalPage.jsp	(.../portalPage.jsp)	(revision 39038)
+++ ssts-web/src/main/webapp/homepage/portalPage.jsp	(.../portalPage.jsp)	(revision 40881)
@@ -3,6 +3,8 @@
 <%@page import="com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager"%>
 <%@page import="com.forgon.disinfectsystem.entity.basedatamanager.supplyroomconfig.SupplyRoomConfig"%>
 <%@page import="com.forgon.disinfectsystem.entity.systemwarning.SystemWarningItemVO,net.sf.json.JSONObject"%>
+<%@page import="com.forgon.tools.crypto.rsa.RSAEncrypt"%>
+<%@page import="org.apache.commons.lang.StringUtils"%>
 <%@ page contentType="text/html; charset=UTF-8"%>
 <%@page import="com.forgon.disinfectsystem.common.*"%>
 <%@page import="com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan"%>
@@ -85,6 +87,12 @@
 	    boolean ENABLE_SPEECH_RECOGNITION = WebConstants.VALUE_ENABLE.equals(v_ENABLE_SPEECH_RECOGNITION);
 		request.setAttribute("ENABLE_SPEECH_RECOGNITION",ENABLE_SPEECH_RECOGNITION);
 
+		//登录密码的rsa公钥
+		String logonRSAPublicKey = (String)application.getAttribute("logonRSAPublicKey");
+		if(StringUtils.isBlank(logonRSAPublicKey)){
+			logonRSAPublicKey = RSAEncrypt.ENCRYPTPUBLICKEY;
+		}
+
 		HttpOptionManager httpOptionManager = (HttpOptionManager)SpringBeanManger.getBean("httpOptionManager");
 		List<String> sterilerGroupList = httpOptionManager.getSterilizerGroupHttpOption(currentOrgUnitCode);
 		String tem = "[";
@@ -109,7 +117,12 @@
 <link rel="stylesheet" type="text/css" href="${ctx}/common/common.css?version=${svnRevision}"></link>
 <link rel="stylesheet" type="text/css" href="${ctx}/common/commonForExt4.css?version=${svnRevision}"></link>
 <link rel="stylesheet" type="text/css" href="${ctx}/ext/resources/css/multiSelectCombo.css"/>
+<script type="text/javascript" src="${ctx}/js/rsa/jsencrypt.min.js"></script>
 <script>
+	var publicKey = "<%=logonRSAPublicKey %>";
+	var encrypt = new JSEncrypt();
+	encrypt.setPublicKey(publicKey);
+	var encryptedUserName = encrypt.encrypt('${loginUserData.userName}');
 	var isFirstSupplyRoomUser = '${isFirstSupplyRoomUser}';
 	var profile = '${profile}';
 	var quickJumpOperationTousseOp = '${quickJumpOperationTousseOp}';
Index: ssts-web/src/main/webapp/systemmanage/adminModifyPWDByExt.jsp
===================================================================
diff -u -r29513 -r40881
--- ssts-web/src/main/webapp/systemmanage/adminModifyPWDByExt.jsp	(.../adminModifyPWDByExt.jsp)	(revision 29513)
+++ ssts-web/src/main/webapp/systemmanage/adminModifyPWDByExt.jsp	(.../adminModifyPWDByExt.jsp)	(revision 40881)
@@ -1,31 +1,47 @@
 <%@ page contentType="text/html; charset=UTF-8"%>
 <%@ include file="/common/taglibs.jsp"%>
+<%@page import="com.forgon.tools.crypto.rsa.RSAEncrypt"%>
+<%@page import="org.apache.commons.lang.StringUtils"%>
+<%@ page import="com.forgon.tools.SpringBeanManger,com.forgon.directory.vo.LoginUserData,com.forgon.portal.action.PortalPageAction"%>
 <html>
 <head>
 <title>${param.isNeedUpdateResetDate eq 'true' ? '通知重置密码' : '修改密码' }</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 
 <%@ include file="/common/includeExtJsAndCss.jsp"%>
+<%
+    //登录密码的rsa公钥
+    String logonRSAPublicKey = (String)application.getAttribute("logonRSAPublicKey");
+    if(StringUtils.isBlank(logonRSAPublicKey)){
+        logonRSAPublicKey = RSAEncrypt.ENCRYPTPUBLICKEY;
+    }
+%>
 <link rel="stylesheet" href="${ctx}/css/sysmanager/main.css" type="text/css" />
 
 <script type="text/javascript" src="${ctx }/js/common.js?version=${svnRevision}"></script>
-<script type="text/javascript" src="adminModifyPWDByExt.js?version=${svnRevision}"></script>
 
 <script type="text/javascript" src="${ctx }/dwr/interface/UserTableManager.js" ></script>
 <script type="text/javascript" src="${ctx }/dwr/engine.js" ></script>
 <script type="text/javascript" src="${ctx }/dwr/util.js" ></script>
 <script type="text/javascript" src="${ctx}/disinfectsystem/config/${profile}/config.js?version=${svnRevision}"></script>
+<script type="text/javascript" src="${ctx}/js/rsa/jsencrypt.min.js"></script>
 </head>
 <body>
 <script type="text/javascript">
 var paramId;
 var alertTitle = "重置";
 var isNeedUpdateResetDate = '${param.isNeedUpdateResetDate}';
+var publicKey = "<%=logonRSAPublicKey %>";
+var encrypt = new JSEncrypt();
+encrypt.setPublicKey(publicKey);
+var encryptedUserName = encrypt.encrypt('${loginUserData.userName}');
+
 function initGetUserNameById(){
 	paramId = '${param.id}';
 	UserTableManager.getUserNameById(paramId, showUserName);
 }
 </script>
+<script type="text/javascript" src="adminModifyPWDByExt.js?version=${svnRevision}"></script>
 <div id="main">
 <form action="searchresultsByExt.jsp" method="post">
     <input type="hidden" id="query" name="query" value="" />
Index: ssts-web/src/main/webapp/personalSetting/showModifyPWDWindowByExt.js
===================================================================
diff -u -r37676 -r40881
--- ssts-web/src/main/webapp/personalSetting/showModifyPWDWindowByExt.js	(.../showModifyPWDWindowByExt.js)	(revision 37676)
+++ ssts-web/src/main/webapp/personalSetting/showModifyPWDWindowByExt.js	(.../showModifyPWDWindowByExt.js)	(revision 40881)
@@ -1,200 +1,270 @@
+//ZSYY-438：短信验证码
+function sendCodeByModify() {
+	// Encrypt with the public key...
+	sendAuthenticationCodeSms(encryptedUserName, function (res) {
+		if (res.success) {
+			setCodeTimeoutByModify();
+		}
+	})
+}
+var time2 = 60;
+//倒计时
+function setCodeTimeoutByModify() {
+	var button = Ext.getCmp('senCode');
+	var t = setTimeout(function () {
+		if (time2 > 0) {
+			time2--;
+			button.setText(time2 + ' s');
+			button.setDisabled(true);
+			setCodeTimeoutByModify();
+		} else {
+			clearTimeout(t);
+			time2 = 60;
+			button.setText('发送验证码');
+			button.setDisabled(false);
+		}
+	}, 1000);
+}
+
 function showModifyPWDWindow() {
-//	Ext.QuickTips.init();
 
 	//ZSRY-72：增加密码设置要求提示语
 	var msg = getModifyPwdMsg();
 
 	var formObj = new Ext.FormPanel({
-		labelAlign : 'left',
-		frame : true,
-		labelSeparator : '：',
-//		title : '密码设置',
-		bodyStyle : 'padding:5px 5px 0px 25px',
-		width : 400,
-		labelWidth : 80,
-		items : [{
-			xtype : 'textfield',
-			fieldLabel : '旧密码',
-			inputType : 'password',
-			name : 'oldPassword',
-			id : 'oldPassword',
-			width : 280,
-			allowBlank : false,
-			blankText : '请输入旧密码！',
-			msgTarget : 'side'
+		labelAlign: 'left',
+		frame: true,
+		labelSeparator: '：',
+		bodyStyle: 'padding:5px 5px 0px 25px',
+		width: 400,
+		labelWidth: 80,
+		items: [{
+			xtype: 'textfield',
+			fieldLabel: '旧密码',
+			inputType: 'password',
+			name: 'oldPassword',
+			id: 'oldPassword',
+			width: 280,
+			allowBlank: false,
+			blankText: '请输入旧密码！',
+			msgTarget: 'side'
 		}, {
-			xtype : 'textfield',
-			fieldLabel : '新密码',
-			inputType : 'password',
-			name : 'newPassword',
-			id : 'newPassword',
-			width : 280,
-			allowBlank : false,
-			blankText : '请输入新密码！',
-			msgTarget : 'side'
+			xtype: 'textfield',
+			fieldLabel: '新密码',
+			inputType: 'password',
+			name: 'newPassword',
+			id: 'newPassword',
+			width: 280,
+			allowBlank: false,
+			blankText: '请输入新密码！',
+			msgTarget: 'side'
 		}, {
-			xtype : 'textfield',
-			fieldLabel : '确认新密码',
-			inputType : 'password',
-			name : 'confirmNewPassword',
-			id : 'confirmNewPassword',
-			width : 280,
-			allowBlank : false,
-			blankText : '请输入确认新密码！',
-			msgTarget : 'side'
+			xtype: 'textfield',
+			fieldLabel: '确认新密码',
+			inputType: 'password',
+			name: 'confirmNewPassword',
+			id: 'confirmNewPassword',
+			width: 280,
+			allowBlank: false,
+			blankText: '请输入确认新密码！',
+			msgTarget: 'side'
 		}, {
-			items:[{
-				hidden:msg == ''?true:false,
-				layout:'column', 
-				items:[{
-					id:'showPwdMessage',
-					xtype:'textfield',
-					width : 390,
-					allowBlank : true,
-					labelSeparator:'',
-					labelWidth:0,
+			hidden: msg == '' ? true : false,
+			layout: 'column',
+			items: [{
+				layout: 'form',
+				columnWidth: .75,
+				items: [{
+					xtype: 'textfield',
+					fieldLabel: '验证码',
+					name: 'verificationCode',
+					id: 'verificationCode',
+					width: 200,
+					msgTarget: 'side',
+					allowBlank: true
+				}]
+			}, {
+				layout: 'form',
+				columnWidth: .25,
+				items: [{
+					id: 'senCode',
+					xtype: 'button',
+					text: '发送验证码',
+					disabled: false,
+					handler: function () {
+						sendCodeByModify();
+					}
+				}]
+			}]
+		}, {
+			items: [{
+				hidden: msg == '' ? true : false,
+				layout: 'column',
+				items: [{
+					id: 'showPwdMessage',
+					xtype: 'textfield',
+					width: 390,
+					allowBlank: true,
+					labelSeparator: '',
+					labelWidth: 0,
 					anchor: '99%',
-					readOnly : true,
-					cls : 'fieldReadOnlyNoRemove',
+					readOnly: true,
+					cls: 'fieldReadOnlyNoRemove',
 					value: msg
 				}]
 			}]
 		}],
 
-		buttons : [{
-			id : 'saveBtn',
-			text : '确认',
-			handler : save
+		buttons: [{
+			id: 'saveBtn',
+			text: '确认',
+			handler: saveByVerification
 		}, {
-			text : '取消',
-			handler : function(){Ext.getCmp('modifyPWDWindow').close();}
+			text: '取消',
+			handler: function () { Ext.getCmp('modifyPWDWindow').close(); }
 		}]
 	});
 
-	function save() {
+	function saveByVerification() {
 		if (!formObj.form.isValid()) {
 			Ext.MessageBox.show({
-				title : '错误提示',
-				msg : '请正确填写表单各值。',
-				buttons : Ext.Msg.OK,
-				icon : Ext.Msg.ERROR
+				title: '错误提示',
+				msg: '请正确填写表单各值。',
+				buttons: Ext.Msg.OK,
+				icon: Ext.Msg.ERROR
 			});
 			return false;
 		}
+		if (sstsConfig.needBeStrongPwdWhenModifyPwd && sstsConfig.enableTwoFactorAuthentication) {
+			var verificationCode = Ext.getCmp('verificationCode').getValue();
+			var encryptedUserCode = encrypt.encrypt(verificationCode);
+			validateAuthenticationCode(encryptedUserName, encryptedUserCode, function (res) {
+				if (res.success) {
+					save();
+				} else {
+					showResult(res.message);
+				}
+			})
+		} else {
+			save();
+		}
+	}
+
+	function save() {
 		//暂时屏蔽验证复杂密码
-		var checkPasswordResult = testPasswordReg(Ext.getCmp('newPassword').getValue(),userNameID)
+		var checkPasswordResult = testPasswordReg(Ext.getCmp('newPassword').getValue(), userNameID)
 		if (!checkPasswordResult.success) {
 			Ext.MessageBox.show({
-				title : '错误提示',
-				msg : checkPasswordResult.msg,
-				buttons : Ext.Msg.OK,
-				icon : Ext.Msg.ERROR
+				title: '错误提示',
+				msg: checkPasswordResult.msg,
+				buttons: Ext.Msg.OK,
+				icon: Ext.Msg.ERROR
 			});
 			return false;
 		}
 		if (Ext.getCmp('newPassword').getValue() != Ext
-				.getCmp('confirmNewPassword').getValue()) {
+			.getCmp('confirmNewPassword').getValue()) {
 			Ext.MessageBox.show({
-				title : '错误提示',
-				msg : '新密码与确认新密码不一致，请重新填写！',
-				buttons : Ext.Msg.OK,
-				icon : Ext.Msg.ERROR
+				title: '错误提示',
+				msg: '新密码与确认新密码不一致，请重新填写！',
+				buttons: Ext.Msg.OK,
+				icon: Ext.Msg.ERROR
 			});
 			return false;
 		}
 		formObj.form.submit({
-			url : WWWROOT + '/personalSetting/modifyPWDByExt/save.do',
-			method : 'POST',
-			waitMsg : '正在修改密码，请稍候',
-			waitTitle : '修改密码',
-			success : function(form, action) {
+			url: WWWROOT + '/personalSetting/modifyPWDByExt/save.do',
+			method: 'POST',
+			waitMsg: '正在修改密码，请稍候',
+			waitTitle: '修改密码',
+			success: function (form, action) {
 				if (action.result && action.result.success) {
 					alert("修改密码成功，退出返回登录页面！");
 					logout(WWWROOT);
 				} else {
 					Ext.MessageBox.show({
-						title : '错误提示',
-						msg : '修改密码失败！',
-						buttons : Ext.Msg.OK,
-						icon : Ext.Msg.ERROR
+						title: '错误提示',
+						msg: '修改密码失败！',
+						buttons: Ext.Msg.OK,
+						icon: Ext.Msg.ERROR
 					});
 				}
 			},
-			failure : function(form, action) {
-				if(action.result && action.result.message){
+			failure: function (form, action) {
+				if (action.result && action.result.message) {
 					alert(action.result.message);
-				}else{
-					Ext.MessageBox.show({title:'错误提示', msg:'修改密码失败！',buttons:Ext.Msg.OK,icon:Ext.Msg.ERROR});
+				} else {
+					Ext.MessageBox.show({ title: '错误提示', msg: '修改密码失败！', buttons: Ext.Msg.OK, icon: Ext.Msg.ERROR });
 				}
 			}
 		});
 	}
-	
-	var window = new Ext.Window( {
-		id : 'modifyPWDWindow',
-		layout : 'fit',
-		title : '修改密码',
-		width : 440,
-		height : 185,
-		modal : true,
-// autoHeight : true,
-		border : false,
-		plain : true,
-		modal:true,
-		closeAction:'close',
-		items : [ formObj ]
+
+	var window = new Ext.Window({
+		id: 'modifyPWDWindow',
+		layout: 'fit',
+		title: '修改密码',
+		width: 440,
+		height: 210,
+		modal: true,
+		// autoHeight : true,
+		border: false,
+		plain: true,
+		modal: true,
+		closeAction: 'close',
+		items: [formObj]
 	});
-	
+
 	window.show();
 	top.Ext.getCmp("oldPassword").focus(false, 100);
-	if(msg !== ''){
+	if (msg !== '') {
 		Ext.getCmp('showPwdMessage').el.dom.style.color = 'red';
 	}
 }
 
 //DGKHYY-25：显示PDA安装包下载地址的二维码
-function showPDADownloadWindow(){
+function showPDADownloadWindow() {
 	document.getElementById('downloadImage').innerHTML = '';
 	var imagePanel = new top.Ext.Panel({
-		id : 'downloadImagePanel',
-		layout : 'fit',
-		bbar : [{
-			xtype : 'button',
-	    	text : '请在PDA端使用浏览器或下载功能扫描二维码进行下载'
+		id: 'downloadImagePanel',
+		layout: 'fit',
+		bbar: [{
+			xtype: 'button',
+			text: '请在PDA端使用浏览器或下载功能扫描二维码进行下载'
 		}],
-		items : [{
-		    xtype : 'box',
-		    id : 'browseImage',
-		    fieldLabel : "二维码",
-		    autoEl : {
-				id : 'downloadImageBrowse',
-				tag : 'div',
-				complete : 'off'
-		    }
+		items: [{
+			xtype: 'box',
+			id: 'browseImage',
+			fieldLabel: "二维码",
+			autoEl: {
+				id: 'downloadImageBrowse',
+				tag: 'div',
+				complete: 'off'
+			}
 		}]
 	});
-	
+
 	var url = WWWROOT + '/mobileClient/mobileClientAction!downloadPdaInstallPackage.do';
-	var qrcode = new QRCode("downloadImage",url);
-	setTimeout(function(){
+	var qrcode = new QRCode("downloadImage", url);
+	setTimeout(function () {
 		var imgHtml = document.getElementById('downloadImage').innerHTML;
 		var downloadImageBrowse = top.Ext.get('downloadImageBrowse');
-        var image = downloadImageBrowse.dom;
+		var image = downloadImageBrowse.dom;
 		image.innerHTML = imgHtml;
 	}, 1000);
-	var window = new top.Ext.Window( {
-		id : 'PDADownloadWindow',
-		layout : 'fit',
-		title : 'PDA客户端下载',
-		width : 308,
-		height : 350,
-		modal : true,
-		border : false,
-		plain : true,
-		modal:true,
-		closeAction:'close',
-		items : [ imagePanel ]
+	var window = new top.Ext.Window({
+		id: 'PDADownloadWindow',
+		layout: 'fit',
+		title: 'PDA客户端下载',
+		width: 308,
+		height: 350,
+		modal: true,
+		border: false,
+		plain: true,
+		modal: true,
+		closeAction: 'close',
+		items: [imagePanel]
 	});
-	
+
 	window.show();
 }
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js
===================================================================
diff -u -r40562 -r40881
--- ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js	(.../config.js)	(revision 40562)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js	(.../config.js)	(revision 40881)
@@ -444,6 +444,8 @@
 expandFieldsConfigOfRecycling:[{"fieldName":"packageTypeSplit","displayText":"外来器械拆分小包"},{"fieldName":"lastRecyclingTime ","displayText":"上次回收时间"},{"fieldName":"tousseRemark","displayText":"备注"}],
 //启用第三方部门编码的功能
 enableThirdPartyDepartmentCoding:true,
+//启用密码二次验证功能
+enableTwoFactorAuthentication:true,
 //启用第三方账号ID
 enableThirdAccountId:true