Index: ssts-web/src/main/webapp/js/common.js =================================================================== diff -u -r40888 -r40911 --- ssts-web/src/main/webapp/js/common.js (.../common.js) (revision 40888) +++ ssts-web/src/main/webapp/js/common.js (.../common.js) (revision 40911) @@ -2338,15 +2338,15 @@ } //ZSYY-438:发送短信验证 -function sendAuthenticationCodeSms(loginName, callback) { +function sendAuthenticationCodeSms(loginName, scene, callback) { Ext.Ajax.request({ url: WWWROOT + '/disinfectSystem/verification/verificationCodeAction!sendAuthenticationCodeSms.do', - params: { loginName: loginName }, + params: { loginName: loginName, scene: scene }, success: function (response, options) { var result = Ext.decode(response.responseText); - if(result.success){ + if (result.success) { callback(result); - }else { + } else { showResult(result.message) } } @@ -2355,7 +2355,7 @@ //ZSYY-438:验证码校验接口 function validateAuthenticationCode(loginName, verificationCode, callback) { - if(verificationCode == ''){ + if (verificationCode == '') { showResult('验证码不能为空!'); return } Index: ssts-web/src/main/webapp/logon.jsp =================================================================== diff -u -r40895 -r40911 --- ssts-web/src/main/webapp/logon.jsp (.../logon.jsp) (revision 40895) +++ ssts-web/src/main/webapp/logon.jsp (.../logon.jsp) (revision 40911) @@ -374,7 +374,7 @@ // Encrypt with the public key... var userName = document.getElementById("j_username_display").value; var encryptedUserName = encrypt.encrypt(userName); - sendAuthenticationCodeSms(encryptedUserName, function (res) { + sendAuthenticationCodeSms(encryptedUserName, 'login', function (res) { if (res.success) { setCodeTimeoutByModify(); } Index: ssts-web/src/main/webapp/personalSetting/showModifyPWDWindowByExt.js =================================================================== diff -u -r40889 -r40911 --- ssts-web/src/main/webapp/personalSetting/showModifyPWDWindowByExt.js (.../showModifyPWDWindowByExt.js) (revision 40889) +++ ssts-web/src/main/webapp/personalSetting/showModifyPWDWindowByExt.js (.../showModifyPWDWindowByExt.js) (revision 40911) @@ -1,7 +1,7 @@ //ZSYY-438:短信验证码 function sendCodeByModify() { // Encrypt with the public key... - sendAuthenticationCodeSms(encryptedUserName, function (res) { + sendAuthenticationCodeSms(encryptedUserName, 'resetPwd', function (res) { if (res.success) { setCodeTimeoutByModify(); } Index: ssts-web/src/main/webapp/personalSetting/modifyPWDByExt.js =================================================================== diff -u -r40889 -r40911 --- ssts-web/src/main/webapp/personalSetting/modifyPWDByExt.js (.../modifyPWDByExt.js) (revision 40889) +++ ssts-web/src/main/webapp/personalSetting/modifyPWDByExt.js (.../modifyPWDByExt.js) (revision 40911) @@ -4,7 +4,7 @@ //ZSYY-438:短信验证码 function sendCodeByModify() { // Encrypt with the public key... - sendAuthenticationCodeSms(encryptedUserName, function (res) { + sendAuthenticationCodeSms(encryptedUserName, 'resetPwd', function (res) { if (res.success) { setCodeTimeoutByModify(); } @@ -73,7 +73,7 @@ //ZSRY-72:增加密码设置要求提示语 var msg = getModifyPwdMsg(); var hideSenCode = true; - if(msg !== '' && sstsConfig.enableTwoFactorAuthentication == 1){ + if (msg !== '' && sstsConfig.enableTwoFactorAuthentication == 1) { hideSenCode = false; } @@ -120,37 +120,37 @@ blankText: '请输入确认新密码!', msgTarget: 'side' }, { - hidden: hideSenCode, - layout: 'column', - border:0, - items: [{ - layout: 'form', - columnWidth: .75, - border:0, - items: [{ - xtype: 'textfield', - fieldLabel: '验证码', - name: 'smsVerificationCode', - id: 'smsVerificationCode', - anchor: '95%', - msgTarget: 'side', - allowBlank: true - }] - }, { - layout: 'form', - columnWidth: .25, - border:0, - items: [{ - id: 'senCode', - xtype: 'button', - text: '发送验证码', - disabled: false, - handler: function () { - sendCodeByModify(); - } - }] - }] - }, { + hidden: hideSenCode, + layout: 'column', + border: 0, + items: [{ + layout: 'form', + columnWidth: .75, + border: 0, + items: [{ + xtype: 'textfield', + fieldLabel: '验证码', + name: 'smsVerificationCode', + id: 'smsVerificationCode', + anchor: '95%', + msgTarget: 'side', + allowBlank: true + }] + }, { + layout: 'form', + columnWidth: .25, + border: 0, + items: [{ + id: 'senCode', + xtype: 'button', + text: '发送验证码', + disabled: false, + handler: function () { + sendCodeByModify(); + } + }] + }] + }, { id: 'showPwdMessage', xtype: 'displayfield', hidden: msg == '' ? true : false,