Index: ssts-web/src/main/webapp/homepage/portalPage.js =================================================================== diff -u -r31143 -r31390 --- ssts-web/src/main/webapp/homepage/portalPage.js (.../portalPage.js) (revision 31143) +++ ssts-web/src/main/webapp/homepage/portalPage.js (.../portalPage.js) (revision 31390) @@ -516,25 +516,28 @@ }); store.load(); windowOnLoaded = true; - /** * ajax异步请求后台,当前用户是否已经修改密码 */ /*simon:update添加条件判断,needForceModifyPwdWhenFirstTime第一次登陆时是否需要强制修改密码*/ if(sstsConfig.needForceModifyPwdWhenFirstTime){ + var loginPassword = sessionStorage.getItem('loginPassword') || ''; + var loginUserName = sessionStorage.getItem('loginUserName') || ''; Ext.Ajax.request({ - url : WWWROOT + '/systemmanage/user/userAction!isModifiedPwdByUser.do', + url : WWWROOT + '/systemmanage/user/userAction!isModifiedPwdByUser.do', + method: 'POST', + async:true, + params : { + "password":loginPassword, + "userName":loginUserName + }, success : function(response, options){ - var result = Ext.decode(response.responseText, true); + var result = Ext.decode(response.responseText, true); //没有修改 if(!result){ showModifyPWDWindowByUnmodified(); } - }, - failure : function(response, options){ - }, - method : 'POST', - params : {} + } }); } }); Index: ssts-web/src/main/webapp/logon.jsp =================================================================== diff -u -r30940 -r31390 --- ssts-web/src/main/webapp/logon.jsp (.../logon.jsp) (revision 30940) +++ ssts-web/src/main/webapp/logon.jsp (.../logon.jsp) (revision 31390) @@ -326,7 +326,6 @@ //用户名与密码传rsa密文 document.loginForm.j_username.value = encryptedUserName; document.loginForm.j_password.value = encryptedPassword; - // Decrypt with the private key... /*var decrypt = new JSEncrypt(); //此处为RSA私钥 @@ -357,6 +356,8 @@ // 提交之前,将用户名补0并且设置到隐藏域 // 设置到隐藏域 autoFillUserName(); + sessionStorage.setItem('loginPassword',encryptedPassword); + sessionStorage.setItem('loginUserName',encryptedUserName); document.loginForm.submit(); }