优化日志录入,解决360极速浏览器无法启用极速模式的问题
This commit is contained in:
2
pom.xml
2
pom.xml
@@ -5,7 +5,7 @@
|
|||||||
|
|
||||||
<groupId>com.fjy</groupId>
|
<groupId>com.fjy</groupId>
|
||||||
<artifactId>spring</artifactId>
|
<artifactId>spring</artifactId>
|
||||||
<version>V2.8.3</version>
|
<version>V2.9.1</version>
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
|
|
||||||
<name>spring</name>
|
<name>spring</name>
|
||||||
|
|||||||
@@ -262,11 +262,13 @@ public class DownLoadController {
|
|||||||
public List<String> getFileString(String fileDir) {
|
public List<String> getFileString(String fileDir) {
|
||||||
List<File> fileList = new ArrayList<File>();
|
List<File> fileList = new ArrayList<File>();
|
||||||
File file = new File(fileDir);
|
File file = new File(fileDir);
|
||||||
File[] files = file.listFiles();// 获取目录下的所有文件或文件夹
|
// 获取目录下的所有文件或文件夹
|
||||||
|
File[] files = file.listFiles();
|
||||||
List<String> path = new ArrayList<String>();
|
List<String> path = new ArrayList<String>();
|
||||||
List<String> name = new ArrayList<String>();
|
List<String> name = new ArrayList<String>();
|
||||||
int i = 0, j = 0;
|
int i = 0, j = 0;
|
||||||
if (files == null) {// 如果目录为空,直接退出
|
// 如果目录为空,直接退出
|
||||||
|
if (files == null) {
|
||||||
path.add("空目录");
|
path.add("空目录");
|
||||||
return path;
|
return path;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -38,75 +38,75 @@ public class NavController {
|
|||||||
|
|
||||||
@GetMapping(value = {"testthymeleaf"})
|
@GetMapping(value = {"testthymeleaf"})
|
||||||
public String toTestPage(){
|
public String toTestPage(){
|
||||||
addVisitLog("测试页面 testthymeleaf");
|
addVisitLog();
|
||||||
return "/dist/thymeleafTest";
|
return "/dist/thymeleafTest";
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping(value = {"axiosTest"})
|
@GetMapping(value = {"axiosTest"})
|
||||||
public String toTestAxiosPage(){
|
public String toTestAxiosPage(){
|
||||||
addVisitLog("测试页面 axiosTest");
|
addVisitLog();
|
||||||
return "/dist/axiosTest";
|
return "/dist/axiosTest";
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping(value = {"/home"})
|
@GetMapping(value = {"/home"})
|
||||||
public String toHomePage(){
|
public String toHomePage(){
|
||||||
addVisitLog("首页 home");
|
addVisitLog();
|
||||||
return "home/home";
|
return "home/home";
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping(value = {"/logout"})
|
@GetMapping(value = {"/logout"})
|
||||||
public String toLogOut(SessionStatus status){
|
public String toLogOut(SessionStatus status){
|
||||||
//request.getSession().getAttribute(USER_SESSION_KEY).invalidate();
|
//request.getSession().getAttribute(USER_SESSION_KEY).invalidate();
|
||||||
addVisitLog("登出 logout");
|
addVisitLog();
|
||||||
status.setComplete();
|
status.setComplete();
|
||||||
return "login";
|
return "login";
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping(value = {"/home/feedback"})
|
@GetMapping(value = {"/home/feedback"})
|
||||||
public String toFeedbackPage(){
|
public String toFeedbackPage(){
|
||||||
addVisitLog("反馈页面 /home/feedback");
|
addVisitLog();
|
||||||
return "home/feedback";
|
return "home/feedback";
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping(value = {"/home/about"})
|
@GetMapping(value = {"/home/about"})
|
||||||
public String toAboutPage(){
|
public String toAboutPage(){
|
||||||
addVisitLog("关于页面 /home/about");
|
addVisitLog();
|
||||||
return "home/about";
|
return "home/about";
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping(value = {"/home/admin"})
|
@GetMapping(value = {"/home/admin"})
|
||||||
public String toAdminPage(){
|
public String toAdminPage(){
|
||||||
addVisitLog("管理员页面 /home/admin");
|
addVisitLog();
|
||||||
return "home/admin";
|
return "home/admin";
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping(value = {"/home/admin/managecourse"})
|
@GetMapping(value = {"/home/admin/managecourse"})
|
||||||
public String toManageCoursePage(){
|
public String toManageCoursePage(){
|
||||||
addVisitLog("课程管理页面 /home/admin/managecourse");
|
addVisitLog();
|
||||||
return "home/managecourse";
|
return "home/managecourse";
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping(value = {"/home/admin/manageuser"})
|
@GetMapping(value = {"/home/admin/manageuser"})
|
||||||
public String toManageUserPage(){
|
public String toManageUserPage(){
|
||||||
addVisitLog("用户管理页面 /home/admin/manageuser");
|
addVisitLog();
|
||||||
return "home/manageuser";
|
return "home/manageuser";
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping(value = {"/home/admin/homework"})
|
@GetMapping(value = {"/home/admin/homework"})
|
||||||
public String toHomeworkPage(){
|
public String toHomeworkPage(){
|
||||||
addVisitLog("作业管理页面 /home/admin/homework");
|
addVisitLog();
|
||||||
return "home/homework";
|
return "home/homework";
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping(value = {"/home/user"})
|
@GetMapping(value = {"/home/user"})
|
||||||
public String toUserPage(){
|
public String toUserPage(){
|
||||||
addVisitLog("个人中心页面 /home/user");
|
addVisitLog();
|
||||||
return "home/user";
|
return "home/user";
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping(value = {"/error"})
|
@GetMapping(value = {"/error"})
|
||||||
public String toErrorPage(){
|
public String toErrorPage(){
|
||||||
addVisitLog("404页面 error");
|
addVisitLog();
|
||||||
return "error";
|
return "error";
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -123,11 +123,10 @@ public class NavController {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 登陆后的访问日志记录
|
* 登陆后的访问日志记录
|
||||||
* @param content
|
|
||||||
*/
|
*/
|
||||||
private void addVisitLog(String content){
|
private void addVisitLog(){
|
||||||
TbUser user =(TbUser)request.getSession().getAttribute(USER_SESSION_KEY);
|
TbUser user =(TbUser)request.getSession().getAttribute(USER_SESSION_KEY);
|
||||||
TbLog log = LogUtil.addLog(user,content,request);
|
TbLog log = LogUtil.addLog(user,request.getHeader("user-agent"),request);
|
||||||
logService.addLogRec(log);
|
logService.addLogRec(log);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -74,7 +74,7 @@ public class RegisterController {
|
|||||||
public boolean doCheckStudent(@RequestParam(value = "studentno") String studentno,
|
public boolean doCheckStudent(@RequestParam(value = "studentno") String studentno,
|
||||||
@RequestParam(value = "realname") String realname){
|
@RequestParam(value = "realname") String realname){
|
||||||
TbStudentlist studentlist = studentService.findByColstudentnoAndColrealname(studentno,realname);
|
TbStudentlist studentlist = studentService.findByColstudentnoAndColrealname(studentno,realname);
|
||||||
if (studentlist!=null&&studentlist.getRegistered()!= RegisteredEnum.REGISTERED.getCode()) {
|
if (studentlist!=null&&studentlist.getRegistered().equals(RegisteredEnum.REGISTERED.getCode()) ) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
|
|||||||
@@ -246,18 +246,11 @@ public class UpLoadController {
|
|||||||
tbFile.setCourseName(courseName);
|
tbFile.setCourseName(courseName);
|
||||||
tbFile.setWorkFolder(folder);
|
tbFile.setWorkFolder(folder);
|
||||||
|
|
||||||
TbLog logs = new TbLog();
|
|
||||||
logs.setUserid(user.getColuserid());
|
|
||||||
logs.setColtime(dateNowStr);
|
|
||||||
logs.setColip(GetIPAddrUtil.getIpAddr(httpServletRequest));
|
|
||||||
logs.setColheader(user.getColname() + "上传了'" + filename + "'文件");
|
|
||||||
logService.addLogRec(logs);
|
|
||||||
|
|
||||||
if (fileService.addFile(tbFile)) {
|
if (fileService.addFile(tbFile)) {
|
||||||
log.info("记录写入数据库成功");
|
log.info("记录写入数据库成功");
|
||||||
|
|
||||||
// 记录上传日志
|
// 记录上传日志
|
||||||
addVisitLog("上传文件" + tbFile.getColrealname() + " " + tbFile.getColfilename());
|
addVisitLog("上传了" + tbFile.getColrealname() + "->" + tbFile.getColfilename());
|
||||||
} else {
|
} else {
|
||||||
log.error("记录写入数据库失败");
|
log.error("记录写入数据库失败");
|
||||||
}
|
}
|
||||||
@@ -284,7 +277,6 @@ public class UpLoadController {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 登陆后的访问日志记录
|
* 登陆后的访问日志记录
|
||||||
*
|
|
||||||
* @param content
|
* @param content
|
||||||
*/
|
*/
|
||||||
private void addVisitLog(String content) {
|
private void addVisitLog(String content) {
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ package com.fjy.spring.untils;
|
|||||||
import com.fjy.spring.domain.TbLog;
|
import com.fjy.spring.domain.TbLog;
|
||||||
import com.fjy.spring.domain.TbUser;
|
import com.fjy.spring.domain.TbUser;
|
||||||
import com.fjy.spring.service.LogService;
|
import com.fjy.spring.service.LogService;
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
|
||||||
import javax.servlet.http.HttpServletRequest;
|
import javax.servlet.http.HttpServletRequest;
|
||||||
@@ -16,6 +17,7 @@ import static com.fjy.spring.constant.GlobalConstant.USER_SESSION_KEY;
|
|||||||
* @date 2018-04-26 12:45
|
* @date 2018-04-26 12:45
|
||||||
* 日志信息填充工具类
|
* 日志信息填充工具类
|
||||||
*/
|
*/
|
||||||
|
@Slf4j
|
||||||
public class LogUtil {
|
public class LogUtil {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -28,14 +30,18 @@ public class LogUtil {
|
|||||||
Date date = new Date();
|
Date date = new Date();
|
||||||
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
||||||
String dateNowStr = sdf.format(date);
|
String dateNowStr = sdf.format(date);
|
||||||
TbLog log = new TbLog();
|
TbLog tbLog = new TbLog();
|
||||||
log.setUserid(user.getColuserid());
|
tbLog.setUserid(user.getColuserid());
|
||||||
log.setColtime(dateNowStr);
|
tbLog.setColtime(dateNowStr);
|
||||||
log.setColheader(user.getColname()+" "+content);
|
tbLog.setColheader(user.getColname()+" "+content);
|
||||||
log.setRequestURL(request.getRequestURL().toString());
|
tbLog.setRequestURL(request.getRequestURL().toString());
|
||||||
|
|
||||||
//解决nginx代理后IP地址获取问题
|
//解决nginx代理后IP地址获取问题
|
||||||
log.setColip(GetIPAddrUtil.getIpAddr(request));
|
tbLog.setColip(GetIPAddrUtil.getIpAddr(request));
|
||||||
return log;
|
|
||||||
|
log.info(tbLog.toString());
|
||||||
|
|
||||||
|
|
||||||
|
return tbLog;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
#控制配置文件调用
|
#控制配置文件调用
|
||||||
spring:
|
spring:
|
||||||
profiles:
|
profiles:
|
||||||
active: dev
|
active: prod
|
||||||
@@ -25,8 +25,8 @@
|
|||||||
<!--滚动策略-->
|
<!--滚动策略-->
|
||||||
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
|
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
|
||||||
<!--路径文件名,文件名包含时间-->
|
<!--路径文件名,文件名包含时间-->
|
||||||
<fileNamePattern>F:\JAVA Workspace\Temp\log\%d\info.%d.log</fileNamePattern>
|
<!--<fileNamePattern>F:\JAVA Workspace\Temp\log\%d\info.%d.log</fileNamePattern>-->
|
||||||
<!--<fileNamePattern>/www/cmsfile/%d/info.%d.log</fileNamePattern>-->
|
<fileNamePattern>/www/cmsfile/%d/info.%d.log</fileNamePattern>
|
||||||
</rollingPolicy>
|
</rollingPolicy>
|
||||||
</appender>
|
</appender>
|
||||||
|
|
||||||
@@ -44,8 +44,8 @@
|
|||||||
<!--滚动策略-->
|
<!--滚动策略-->
|
||||||
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
|
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
|
||||||
<!--路径文件名,文件名包含时间-->
|
<!--路径文件名,文件名包含时间-->
|
||||||
<fileNamePattern>F:\JAVA Workspace\Temp\log\error.%d.log</fileNamePattern>
|
<!--<fileNamePattern>F:\JAVA Workspace\Temp\log\error.%d.log</fileNamePattern>-->
|
||||||
<!--<fileNamePattern>/www/cmsfile/%d/error.%d.log</fileNamePattern>-->
|
<fileNamePattern>/www/cmsfile/%d/error.%d.log</fileNamePattern>
|
||||||
</rollingPolicy>
|
</rollingPolicy>
|
||||||
</appender>
|
</appender>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user