|
@@ -60,9 +60,9 @@ public class FormAuthenticationFilter extends org.apache.shiro.web.filter.authc.
|
|
String randomCode = httpRequest.getParameter("randomCode");
|
|
String randomCode = httpRequest.getParameter("randomCode");
|
|
//String sessionType = httpRequest.getParameter("type");
|
|
//String sessionType = httpRequest.getParameter("type");
|
|
User user = UserUtils.getByLoginNameNoSesion(username);
|
|
User user = UserUtils.getByLoginNameNoSesion(username);
|
|
-
|
|
|
|
- if (password==null || user==null){
|
|
|
|
|
|
+ if (password==null || StringUtils.isBlank(user.getId())){
|
|
password = "";
|
|
password = "";
|
|
|
|
+ loginPassword = "";
|
|
}else{
|
|
}else{
|
|
password = SystemService.encrypeString(password);
|
|
password = SystemService.encrypeString(password);
|
|
}
|
|
}
|
|
@@ -77,6 +77,7 @@ public class FormAuthenticationFilter extends org.apache.shiro.web.filter.authc.
|
|
password =user.getPasswordRemake();
|
|
password =user.getPasswordRemake();
|
|
}else{
|
|
}else{
|
|
password = "";
|
|
password = "";
|
|
|
|
+ loginPassword="";
|
|
}
|
|
}
|
|
}else {
|
|
}else {
|
|
password = "";
|
|
password = "";
|