|
@@ -3,10 +3,12 @@ package com.tofly.auth.oauth;
|
|
|
import com.alibaba.fastjson.JSON;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.tofly.auth.config.LangChaoConfig;
|
|
|
+import com.tofly.auth.utils.RsaUtilClient;
|
|
|
import com.tofly.common.core.constant.CommonConstants;
|
|
|
import com.tofly.common.core.constant.SecurityConstants;
|
|
|
import com.tofly.common.core.entity.ResultRespone;
|
|
|
import com.tofly.common.core.util.IpUtil;
|
|
|
+import com.tofly.common.core.util.PasswordUtil;
|
|
|
import com.tofly.common.core.util.SpringContextHolder;
|
|
|
import com.tofly.common.core.util.StringUtil;
|
|
|
import com.tofly.common.oauth.auth.ToflyUser;
|
|
@@ -71,6 +73,8 @@ public class ToflyAuthenticationProvider implements AuthenticationProvider {
|
|
|
String password = (String)authentication.getCredentials();
|
|
|
if(StringUtil.isEmpty(password)){
|
|
|
throw new MyAuthenticationException("密码不能为空");
|
|
|
+ }else{
|
|
|
+ password= RsaUtilClient.jsencryptDecryptByPrivateKeyLong(password);
|
|
|
}
|
|
|
String userId=null;
|
|
|
if(username.equals("token")){
|
|
@@ -114,7 +118,7 @@ public class ToflyAuthenticationProvider implements AuthenticationProvider {
|
|
|
log.info("数据库查询出来的password:{}",userDetails.getPassword());
|
|
|
|
|
|
BCryptPasswordEncoder bCryptPasswordEncoder = new BCryptPasswordEncoder();
|
|
|
- log.info("用{}加密后的密码为:{}", SecurityConstants.BCRYPT+password,bCryptPasswordEncoder.encode(SecurityConstants.BCRYPT+password));
|
|
|
+
|
|
|
flag = bCryptPasswordEncoder.matches(SecurityConstants.BCRYPT+password, userDetails.getPassword());
|
|
|
if(StringUtil.isEmpty(password) && !flag){
|
|
|
flag=true;
|