Index: ssts-web/src/main/webapp/personalSetting/modifyPWDByExt.js =================================================================== diff -u -r40885 -r40889 --- ssts-web/src/main/webapp/personalSetting/modifyPWDByExt.js (.../modifyPWDByExt.js) (revision 40885) +++ ssts-web/src/main/webapp/personalSetting/modifyPWDByExt.js (.../modifyPWDByExt.js) (revision 40889) @@ -29,7 +29,8 @@ }, 1000); } -function saveByVerification(){ +//保存 +function save() { if (!formObj.form.isValid()) { showResult('请正确填写表单各值。'); return false; @@ -43,23 +44,6 @@ showResult('新密码与确认新密码不一致,请重新填写!'); return false; } - if (sstsConfig.needBeStrongPwdWhenModifyPwd && sstsConfig.enableTwoFactorAuthentication == 1) { - var smsVerificationCode = Ext4.getCmp('smsVerificationCode').getValue(); - var encryptedUserCode = encrypt.encrypt(smsVerificationCode); - validateAuthenticationCode(encryptedUserName, encryptedUserCode, function (res) { - if (res.success) { - save(); - } else { - showResult(res.message); - } - }) - } else { - save(); - } -} - -//保存 -function save() { formObj.form.submit({ url: WWWROOT + '/personalSetting/modifyPWDByExt/save.do', method: 'POST', @@ -178,7 +162,7 @@ buttons: [{ id: 'saveBtn', text: '确认', - handler: saveByVerification + handler: save }, { text: '取消', handler: gohistory Index: ssts-web/src/main/webapp/logon.jsp =================================================================== diff -u -r40886 -r40889 --- ssts-web/src/main/webapp/logon.jsp (.../logon.jsp) (revision 40886) +++ ssts-web/src/main/webapp/logon.jsp (.../logon.jsp) (revision 40889) @@ -508,14 +508,14 @@ buttons : [{ id : 'saveBtn', text : '确认', - handler : saveByVerification + handler : save }, { text : '取消', handler : function(){top.Ext.getCmp('modifyPWDWindow').close();} }] }); - function saveByVerification(){ + function save() { if (!formObj.form.isValid()) { top.Ext.MessageBox.show({ title : '错误提示', @@ -545,24 +545,6 @@ }); return false; } - if (sstsConfig.needBeStrongPwdWhenModifyPwd && sstsConfig.enableTwoFactorAuthentication == 1) { - var smsVerificationCode = Ext.getCmp('smsVerificationCode').getValue(); - var encryptedUserCode = encrypt.encrypt(smsVerificationCode); - var userName = document.getElementById("j_username_display").value; - var encryptedUserName = encrypt.encrypt(userName); - validateAuthenticationCode(encryptedUserName, encryptedUserCode, function (res) { - if (res.success) { - save(); - } else { - showResult(res.message); - } - }) - } else { - save(); - } - } - - function save() { formObj.form.submit({ url : WWWROOT + '/personalSetting/modifyPWDByExt/save.do', method : 'POST', Index: ssts-web/src/main/webapp/personalSetting/showModifyPWDWindowByExt.js =================================================================== diff -u -r40885 -r40889 --- ssts-web/src/main/webapp/personalSetting/showModifyPWDWindowByExt.js (.../showModifyPWDWindowByExt.js) (revision 40885) +++ ssts-web/src/main/webapp/personalSetting/showModifyPWDWindowByExt.js (.../showModifyPWDWindowByExt.js) (revision 40889) @@ -122,14 +122,14 @@ buttons: [{ id: 'saveBtn', text: '确认', - handler: saveByVerification + handler: save }, { text: '取消', handler: function () { Ext.getCmp('modifyPWDWindow').close(); } }] }); - function saveByVerification() { + function save() { if (!formObj.form.isValid()) { Ext.MessageBox.show({ title: '错误提示', @@ -160,22 +160,6 @@ }); return false; } - if (sstsConfig.needBeStrongPwdWhenModifyPwd && sstsConfig.enableTwoFactorAuthentication == 1) { - var smsVerificationCode = Ext.getCmp('smsVerificationCode').getValue(); - var encryptedUserCode = encrypt.encrypt(smsVerificationCode); - validateAuthenticationCode(encryptedUserName, encryptedUserCode, function (res) { - if (res.success) { - save(); - } else { - showResult(res.message); - } - }) - } else { - save(); - } - } - - function save() { formObj.form.submit({ url: WWWROOT + '/personalSetting/modifyPWDByExt/save.do', method: 'POST',