第一次部署前

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/TokenValidator.java

@@ -0,0 +1,16 @@
+package com.management.platform.controller;
+
+import com.management.platform.mapper.UserMapper;
+import com.management.platform.util.HttpRespMsg;
+
+import javax.annotation.Resource;
+
+public class TokenValidator {
+
+    @Resource
+    private UserMapper userMapper;
+
+    public HttpRespMsg validator(HttpRespMsg httpRespMsg, String token) {
+        return new HttpRespMsg();
+    }
+}

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/UserController.java

@@ -8,6 +8,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * <p>
  * 前端控制器
@@ -22,6 +24,9 @@ public class UserController {
     @Autowired
     private UserService userService;
 
+    @Autowired
+    private HttpServletRequest request;
+
     /**
      * 管理员登录网页端
      * username 用户名
@@ -40,7 +45,7 @@ public class UserController {
     @RequestMapping("/loginEmployee")
     public HttpRespMsg loginEmployee(@RequestParam String username, @RequestParam String password) {
         String property = System.getProperty("java.io.tmpdir");
-        System.out.println("tomcat临时目录=="+property);
+        System.out.println("tomcat临时目录==" + property);
         return userService.loginEmployee(username, password);
     }
 
@@ -49,14 +54,14 @@ public class UserController {
      */
     @RequestMapping("/getEmployeeList")
     public HttpRespMsg getEmployeeList() {
-        return userService.getEmployeeList();
+        return userService.getEmployeeList(request);
     }
 
     /**
      * 删除用户
      */
     @RequestMapping("/deleteUser")
-    public HttpRespMsg deleteUser(@RequestParam String userId){
+    public HttpRespMsg deleteUser(@RequestParam String userId) {
         return userService.deleteUser(userId);
     }
 }

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/UserService.java

@@ -4,6 +4,8 @@ import com.management.platform.entity.User;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.management.platform.util.HttpRespMsg;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * <p>
  * 服务类
@@ -17,7 +19,7 @@ public interface UserService extends IService<User> {
 
     HttpRespMsg loginEmployee(String username, String password);
 
-    HttpRespMsg getEmployeeList();
+    HttpRespMsg getEmployeeList(HttpServletRequest request);
 
     HttpRespMsg deleteUser(String userId);
 }

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ScreenshotServiceImpl.java

@@ -187,6 +187,8 @@ public class ScreenshotServiceImpl extends ServiceImpl<ScreenshotMapper, Screens
                 screenshot.setPicType(7);
             }
         }
+        //将获取到的截图进行时间计算
+        calculateTime(screenshot);
         screenshotMapper.insert(screenshot);
         return new HttpRespMsg();
     }

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/UserServiceImpl.java

@@ -10,6 +10,7 @@ import com.management.platform.util.MD5Util;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -39,7 +40,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         } else if (userList.size() > 1) {
             //检索到两个及以上账号时
             httpRespMsg.setError("账号重名");
-        } else if (userList.get(0).getRole() != 1) {
+        } else if (userList.get(0).getRole() == 0) {
             //检索的账号role不是1 即不是管理员时
             httpRespMsg.setError("非管理员不能登陆系统");
         } else if (MD5Util.getPassword(password).equals(userList.get(0).getPassword())) {
@@ -77,8 +78,10 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
 
     //获取员工的列表
     @Override
-    public HttpRespMsg getEmployeeList() {
+    public HttpRespMsg getEmployeeList(HttpServletRequest request) {
         HttpRespMsg httpRespMsg = new HttpRespMsg();
+        //先不检查身份了
+        String token = request.getHeader("Token");
         httpRespMsg.data = userMapper.selectList(new QueryWrapper<User>().eq("role", 0));
         return httpRespMsg;
     }

fhKeeper/formulahousekeeper/management-platform/src/main/resources/application-prod.yml

@@ -79,7 +79,7 @@ mybatis:
   mapper-locations: mappers/*Mapper.xml
 #####配置图片上传路径####
 upload:
-  path: E:/staticproject/manhourhousekeeper/upload/
+  path: E:/staticproject/timesheet/upload/
 
 
 

fhKeeper/formulahousekeeper/management-platform/src/main/resources/application.yml

@@ -3,7 +3,7 @@ server:
   tomcat:
     uri-encoding: utf-8
     max-http-form-post-size: -1
-    connection-timeout: 18000000
+    connection-timeout: 18000000s
 spring:
   servlet:
     multipart:

fhKeeper/formulahousekeeper/timesheet/src/http.js

@@ -38,8 +38,8 @@ export default {
     post (url, data, response, exception) {
         var user = sessionStorage.getItem('user') , token = "";
         if(user != null){
-            token = JSON.parse(user).headImgurl
-            data.token = token
+            token = JSON.parse(user).id
+            // data.token = token
         }
         axios({
             method: 'post',
@@ -49,6 +49,7 @@ export default {
             headers: {
                 //'Content-Type': 'application/json; charset=UTF-8'
                 'Content-type': ' application/x-www-form-urlencoded; charset=UTF-8',
+                'Token': token
             }
         }).then(
             (result) => {