|
|
@@ -12,7 +12,7 @@ import com.railway.common.exception.ServiceException;
|
|
|
import com.railway.common.exception.user.CaptchaException;
|
|
|
import com.railway.common.exception.user.CaptchaExpireException;
|
|
|
import com.railway.common.exception.user.UserPasswordNotMatchException;
|
|
|
-import com.railway.common.utils.DateUtils;
|
|
|
+import com.railway.common.utils.LocalDateUtil;
|
|
|
import com.railway.common.utils.MessageUtils;
|
|
|
import com.railway.common.utils.SecurityUtils;
|
|
|
import com.railway.common.utils.ServletUtils;
|
|
|
@@ -25,7 +25,7 @@ import com.railway.system.enums.ConfigEnum;
|
|
|
import com.railway.system.service.ISysConfigService;
|
|
|
import com.railway.system.service.ISysDeptService;
|
|
|
import com.railway.system.service.ISysUserService;
|
|
|
-import java.util.Date;
|
|
|
+import java.time.LocalDateTime;
|
|
|
import java.util.List;
|
|
|
import org.apache.commons.collections4.CollectionUtils;
|
|
|
import org.springframework.security.authentication.AuthenticationManager;
|
|
|
@@ -126,7 +126,7 @@ public class SysLoginService {
|
|
|
if(null == user){
|
|
|
return true;
|
|
|
}
|
|
|
- Date pwdSetDate = user.getPwdSetDate();
|
|
|
+ LocalDateTime pwdSetDate = user.getPwdSetDate();
|
|
|
if (null == pwdSetDate) {
|
|
|
return true;
|
|
|
}
|
|
|
@@ -141,7 +141,7 @@ public class SysLoginService {
|
|
|
configService.insertConfig(config);
|
|
|
}
|
|
|
int days = Integer.parseInt(pwdExpired);
|
|
|
- return DateUtils.differentDaysByMillisecond(new Date(), pwdSetDate) > days;
|
|
|
+ return LocalDateUtil.getDaysBetween(LocalDateTime.now(), pwdSetDate) > days;
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -176,7 +176,7 @@ public class SysLoginService {
|
|
|
SysUser sysUser = new SysUser();
|
|
|
sysUser.setUserId(userId);
|
|
|
sysUser.setLoginIp(IpUtils.getIpAddr(ServletUtils.getRequest()));
|
|
|
- sysUser.setLoginDate(DateUtils.getNowDate());
|
|
|
+ sysUser.setLoginDate(LocalDateTime.now());
|
|
|
if (StringUtils.isNotEmpty(mobileId)) {
|
|
|
sysUser.setMobileId(mobileId);
|
|
|
}
|