完善一部分
This commit is contained in:
parent
fc09de0241
commit
8138b049ec
@ -26,7 +26,11 @@ public class UrlAccessController {
|
|||||||
public HashMap<Date, Object> getUrlAccess(UrlAccess urlAccess){
|
public HashMap<Date, Object> getUrlAccess(UrlAccess urlAccess){
|
||||||
HashMap<Date,Object> map=new HashMap<>();
|
HashMap<Date,Object> map=new HashMap<>();
|
||||||
map=urlAccessService.getUrlAccess(urlAccess);
|
map=urlAccessService.getUrlAccess(urlAccess);
|
||||||
|
if (map.isEmpty()){
|
||||||
|
Date date=new Date();
|
||||||
|
map.put(date,"查不到该数据");
|
||||||
|
return map;
|
||||||
|
}
|
||||||
return map;
|
return map;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -95,33 +95,37 @@ public class UserController {
|
|||||||
return "注册成功!";
|
return "注册成功!";
|
||||||
}
|
}
|
||||||
@RequestMapping(value = "/login",produces = {"application/json;charset=UTF-8"})
|
@RequestMapping(value = "/login",produces = {"application/json;charset=UTF-8"})
|
||||||
public Map<String,Object>login(User user, String code, HttpSession session, LoginLogs loginLogs, HttpServletRequest request){
|
public Map<String,Object>login(User user, String code, HttpSession session, HttpServletRequest request){
|
||||||
|
LoginLogs loginLogs=new LoginLogs();
|
||||||
Map<String,Object> result=new HashMap<>();
|
Map<String,Object> result=new HashMap<>();
|
||||||
Map<String,Object> map=new HashMap<>();
|
Map<String,Object> map=new HashMap<>();
|
||||||
|
|
||||||
String sessionCode = (String) session.getAttribute(RandomValidateCode.RANDOMVALIDATECODE);
|
// String sessionCode = (String) session.getAttribute(RandomValidateCode.RANDOMVALIDATECODE);
|
||||||
if (sessionCode==null){
|
// if (sessionCode==null){
|
||||||
result.put("msg","验证码空的");
|
// result.put("msg","验证码空的");
|
||||||
return result;
|
// return result;
|
||||||
}
|
// }
|
||||||
if (!sessionCode.equals(code)){
|
// if (!sessionCode.equals(code)){
|
||||||
result.put("msg","验证码错误");
|
// result.put("msg","验证码错误");
|
||||||
return result;
|
// return result;
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
if(StringUtils.isEmpty(user.getUserLogin())||StringUtils.isEmpty(user.getUserPassword())){
|
// if(StringUtils.isEmpty(user.getUserLogin())||StringUtils.isEmpty(user.getUserPassword())){
|
||||||
result.put("msg","用户或密码为空!");
|
// result.put("msg","用户或密码为空!");
|
||||||
return result;
|
// return result;
|
||||||
}
|
// }
|
||||||
|
|
||||||
|
|
||||||
String ip=IPutils.getIpAddress(request);
|
String ip=IPutils.getIpAddress(request);
|
||||||
System.out.println(ip);
|
System.out.println(ip);
|
||||||
System.out.println(IPutils.getLocation(ip));
|
|
||||||
|
String locat= String.valueOf(IPutils.getLocation(ip));
|
||||||
User user1 = userService.userLogin(user);
|
User user1 = userService.userLogin(user);
|
||||||
|
|
||||||
if(user1!=null){
|
if(user1!=null){
|
||||||
loginLogs.setUserId(user1.getId());
|
loginLogs.setUserId(user1.getId());
|
||||||
|
loginLogs.setLoginIp(ip);
|
||||||
|
loginLogs.setLocation(locat);
|
||||||
loginLogsService.addLoginLogs(loginLogs);
|
loginLogsService.addLoginLogs(loginLogs);
|
||||||
result.put("code",200);
|
result.put("code",200);
|
||||||
map.put("userEmail",user1.getUserEmail());
|
map.put("userEmail",user1.getUserEmail());
|
||||||
|
Loading…
Reference in New Issue
Block a user