diff --git a/pom.xml b/pom.xml
index 01ff629..a79a490 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
com.fjy
spring
- V2.8.3
+ V2.9.1
jar
spring
diff --git a/src/main/java/com/fjy/spring/controller/DownLoadController.java b/src/main/java/com/fjy/spring/controller/DownLoadController.java
index 3a142eb..7a4d760 100644
--- a/src/main/java/com/fjy/spring/controller/DownLoadController.java
+++ b/src/main/java/com/fjy/spring/controller/DownLoadController.java
@@ -262,11 +262,13 @@ public class DownLoadController {
public List getFileString(String fileDir) {
List fileList = new ArrayList();
File file = new File(fileDir);
- File[] files = file.listFiles();// 获取目录下的所有文件或文件夹
+ // 获取目录下的所有文件或文件夹
+ File[] files = file.listFiles();
List path = new ArrayList();
List name = new ArrayList();
int i = 0, j = 0;
- if (files == null) {// 如果目录为空，直接退出
+ // 如果目录为空，直接退出
+ if (files == null) {
path.add("空目录");
return path;
}
diff --git a/src/main/java/com/fjy/spring/controller/NavController.java b/src/main/java/com/fjy/spring/controller/NavController.java
index d50a79a..49daa9d 100644
--- a/src/main/java/com/fjy/spring/controller/NavController.java
+++ b/src/main/java/com/fjy/spring/controller/NavController.java
@@ -38,75 +38,75 @@ public class NavController {
@GetMapping(value = {"testthymeleaf"})
public String toTestPage(){
- addVisitLog("测试页面 testthymeleaf");
+ addVisitLog();
return "/dist/thymeleafTest";
}
@GetMapping(value = {"axiosTest"})
public String toTestAxiosPage(){
- addVisitLog("测试页面 axiosTest");
+ addVisitLog();
return "/dist/axiosTest";
}
@GetMapping(value = {"/home"})
public String toHomePage(){
- addVisitLog("首页 home");
+ addVisitLog();
return "home/home";
}
@GetMapping(value = {"/logout"})
public String toLogOut(SessionStatus status){
//request.getSession().getAttribute(USER_SESSION_KEY).invalidate();
- addVisitLog("登出 logout");
+ addVisitLog();
status.setComplete();
return "login";
}
@GetMapping(value = {"/home/feedback"})
public String toFeedbackPage(){
- addVisitLog("反馈页面 /home/feedback");
+ addVisitLog();
return "home/feedback";
}
@GetMapping(value = {"/home/about"})
public String toAboutPage(){
- addVisitLog("关于页面 /home/about");
+ addVisitLog();
return "home/about";
}
@GetMapping(value = {"/home/admin"})
public String toAdminPage(){
- addVisitLog("管理员页面 /home/admin");
+ addVisitLog();
return "home/admin";
}
@GetMapping(value = {"/home/admin/managecourse"})
public String toManageCoursePage(){
- addVisitLog("课程管理页面 /home/admin/managecourse");
+ addVisitLog();
return "home/managecourse";
}
@GetMapping(value = {"/home/admin/manageuser"})
public String toManageUserPage(){
- addVisitLog("用户管理页面 /home/admin/manageuser");
+ addVisitLog();
return "home/manageuser";
}
@GetMapping(value = {"/home/admin/homework"})
public String toHomeworkPage(){
- addVisitLog("作业管理页面 /home/admin/homework");
+ addVisitLog();
return "home/homework";
}
@GetMapping(value = {"/home/user"})
public String toUserPage(){
- addVisitLog("个人中心页面 /home/user");
+ addVisitLog();
return "home/user";
}
@GetMapping(value = {"/error"})
public String toErrorPage(){
- addVisitLog("404页面 error");
+ addVisitLog();
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);
- TbLog log = LogUtil.addLog(user,content,request);
+ TbLog log = LogUtil.addLog(user,request.getHeader("user-agent"),request);
logService.addLogRec(log);
}
}
diff --git a/src/main/java/com/fjy/spring/controller/RegisterController.java b/src/main/java/com/fjy/spring/controller/RegisterController.java
index 33cb1c0..0115358 100644
--- a/src/main/java/com/fjy/spring/controller/RegisterController.java
+++ b/src/main/java/com/fjy/spring/controller/RegisterController.java
@@ -74,7 +74,7 @@ public class RegisterController {
public boolean doCheckStudent(@RequestParam(value = "studentno") String studentno,
@RequestParam(value = "realname") String 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 false;
diff --git a/src/main/java/com/fjy/spring/controller/UpLoadController.java b/src/main/java/com/fjy/spring/controller/UpLoadController.java
index c8fb9b4..3809589 100644
--- a/src/main/java/com/fjy/spring/controller/UpLoadController.java
+++ b/src/main/java/com/fjy/spring/controller/UpLoadController.java
@@ -246,18 +246,11 @@ public class UpLoadController {
tbFile.setCourseName(courseName);
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)) {
log.info("记录写入数据库成功");
// 记录上传日志
- addVisitLog("上传文件" + tbFile.getColrealname() + " " + tbFile.getColfilename());
+ addVisitLog("上传了" + tbFile.getColrealname() + "->" + tbFile.getColfilename());
} else {
log.error("记录写入数据库失败");
}
@@ -284,7 +277,6 @@ public class UpLoadController {
/**
* 登陆后的访问日志记录
- *
* @param content
*/
private void addVisitLog(String content) {
diff --git a/src/main/java/com/fjy/spring/untils/LogUtil.java b/src/main/java/com/fjy/spring/untils/LogUtil.java
index 8f090a9..d7543d1 100644
--- a/src/main/java/com/fjy/spring/untils/LogUtil.java
+++ b/src/main/java/com/fjy/spring/untils/LogUtil.java
@@ -3,6 +3,7 @@ package com.fjy.spring.untils;
import com.fjy.spring.domain.TbLog;
import com.fjy.spring.domain.TbUser;
import com.fjy.spring.service.LogService;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
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
* 日志信息填充工具类
*/
+@Slf4j
public class LogUtil {
/**
@@ -28,14 +30,18 @@ public class LogUtil {
Date date = new Date();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String dateNowStr = sdf.format(date);
- TbLog log = new TbLog();
- log.setUserid(user.getColuserid());
- log.setColtime(dateNowStr);
- log.setColheader(user.getColname()+" "+content);
- log.setRequestURL(request.getRequestURL().toString());
+ TbLog tbLog = new TbLog();
+ tbLog.setUserid(user.getColuserid());
+ tbLog.setColtime(dateNowStr);
+ tbLog.setColheader(user.getColname()+" "+content);
+ tbLog.setRequestURL(request.getRequestURL().toString());
//解决nginx代理后IP地址获取问题
- log.setColip(GetIPAddrUtil.getIpAddr(request));
- return log;
+ tbLog.setColip(GetIPAddrUtil.getIpAddr(request));
+
+ log.info(tbLog.toString());
+
+
+ return tbLog;
}
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 9efaa1c..7ef289a 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,4 +1,4 @@
#控制配置文件调用
spring:
profiles:
- active: dev
\ No newline at end of file
+ active: prod
\ No newline at end of file
diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml
index 02d1ae7..272ad8e 100644
--- a/src/main/resources/logback-spring.xml
+++ b/src/main/resources/logback-spring.xml
@@ -25,8 +25,8 @@
- F:\JAVA Workspace\Temp\log\%d\info.%d.log
-
+
+ /www/cmsfile/%d/info.%d.log
@@ -44,8 +44,8 @@
- F:\JAVA Workspace\Temp\log\error.%d.log
-
+
+ /www/cmsfile/%d/error.%d.log