URL访问量,用户地址,日志登录,附件上传,下载,配置文件上传
This commit is contained in:
@@ -1,15 +1,18 @@
|
||||
package com.lovenav.controller;
|
||||
|
||||
import com.alibaba.fastjson2.JSONObject;
|
||||
import com.lovenav.entity.LoginLogs;
|
||||
import com.lovenav.entity.UrlList;
|
||||
import com.lovenav.entity.User;
|
||||
import com.lovenav.service.ConfigService;
|
||||
import com.lovenav.service.LoginLogsService;
|
||||
import com.lovenav.service.UserService;
|
||||
import com.lovenav.utils.MD5Utils;
|
||||
import com.lovenav.utils.RandomValidateCode;
|
||||
import com.lovenav.utils.TokenUtils;
|
||||
import com.lovenav.utils.*;
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.boot.autoconfigure.web.ServerProperties;
|
||||
import org.springframework.http.HttpHeaders;
|
||||
import org.springframework.http.HttpRequest;
|
||||
import org.springframework.mail.javamail.JavaMailSenderImpl;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
@@ -34,6 +37,12 @@ public class UserController {
|
||||
UserService userService;
|
||||
@Autowired
|
||||
TokenUtils tokenUtils;
|
||||
@Autowired
|
||||
LoginLogsService loginLogsService;
|
||||
@Autowired
|
||||
ConfigService configService;
|
||||
@Autowired
|
||||
IPutils iPutils;
|
||||
//发送邮箱验证码
|
||||
ScheduledExecutorService scheduledExecutorService = Executors.newScheduledThreadPool(5);
|
||||
//这个是我用户Service实现类可以自行替换
|
||||
@@ -42,8 +51,14 @@ public class UserController {
|
||||
|
||||
@GetMapping("/sendActiveCode")
|
||||
public String sendActiveCode(HttpSession session, User user){
|
||||
|
||||
String activecode=userService.sendEmailActivecode(user);
|
||||
HashMap<String,String> configMap=new HashMap<>();
|
||||
configMap=configService.selectEmailConfig();
|
||||
String activecode=userService.sendEmailActivecode(user,configMap);
|
||||
if (activecode=="配置文件有错误"){
|
||||
return "邮箱配置文件有错误,请重新确认!";
|
||||
} else if (activecode=="该邮箱不存在") {
|
||||
return "将要发送的邮箱不存在!";
|
||||
}
|
||||
session.setAttribute(user.getUserEmail(),activecode);
|
||||
scheduledExecutorService.schedule(new Runnable() {
|
||||
@Override
|
||||
@@ -80,7 +95,7 @@ public class UserController {
|
||||
return "注册成功!";
|
||||
}
|
||||
@RequestMapping(value = "/login",produces = {"application/json;charset=UTF-8"})
|
||||
public Map<String,Object>login(User user,String code,HttpSession session){
|
||||
public Map<String,Object>login(User user, String code, HttpSession session, LoginLogs loginLogs, HttpServletRequest request){
|
||||
Map<String,Object> result=new HashMap<>();
|
||||
Map<String,Object> map=new HashMap<>();
|
||||
|
||||
@@ -99,9 +114,15 @@ public class UserController {
|
||||
return result;
|
||||
}
|
||||
|
||||
User user1 = userService.userLogin(user);
|
||||
|
||||
String ip=IPutils.getIpAddress(request);
|
||||
System.out.println(ip);
|
||||
System.out.println(IPutils.getLocation(ip));
|
||||
User user1 = userService.userLogin(user);
|
||||
|
||||
if(user1!=null){
|
||||
loginLogs.setUserId(user1.getId());
|
||||
loginLogsService.addLoginLogs(loginLogs);
|
||||
result.put("code",200);
|
||||
map.put("userEmail",user1.getUserEmail());
|
||||
map.put("userLogin",user1.getUserLogin());
|
||||
@@ -166,6 +187,9 @@ public class UserController {
|
||||
return map;
|
||||
|
||||
}
|
||||
|
||||
@RequestMapping("/getAllUsers")
|
||||
public HashMap<Integer,Object> getAllUsers(){
|
||||
return userService.getAllUsers();
|
||||
}
|
||||
|
||||
}
|
||||
|
Reference in New Issue
Block a user