|
@ -427,8 +427,8 @@ public class WlyyLoginEndpoint extends AbstractEndpoint {
|
|
|
}
|
|
|
} else if("1".equals(parameters.get("pwdAndCaptcha"))){
|
|
|
parameters.put("grant_type", "pwdAndCaptcha");
|
|
|
// KeyPair keyPair = (KeyPair) httpSession.getAttribute("privateKey");
|
|
|
KeyPair keyPair = getKeyPair(httpSession,request);
|
|
|
KeyPair keyPair = (KeyPair) httpSession.getAttribute("privateKey");
|
|
|
// KeyPair keyPair = getKeyPair(httpSession,request);
|
|
|
String password = com.yihu.jw.security.utils.RSAUtils.decryptBase64(parameters.get("password"), keyPair);
|
|
|
parameters.put("password", password);
|
|
|
if (!testPwd(parameters.get("password"))) {
|
|
@ -438,8 +438,8 @@ public class WlyyLoginEndpoint extends AbstractEndpoint {
|
|
|
parameters.put("grant_type", "password");
|
|
|
//解密密码
|
|
|
if (parameters.get("password") != null) {
|
|
|
// KeyPair keyPair = (KeyPair) httpSession.getAttribute("privateKey");
|
|
|
KeyPair keyPair = getKeyPair(httpSession,request);
|
|
|
KeyPair keyPair = (KeyPair) httpSession.getAttribute("privateKey");
|
|
|
// KeyPair keyPair = getKeyPair(httpSession,request);
|
|
|
String password = com.yihu.jw.security.utils.RSAUtils.decryptBase64(parameters.get("password"), keyPair);
|
|
|
parameters.put("password", password);
|
|
|
} else {
|