test pom

src/main/java/common/controller/UserController.java

@@ -8,13 +8,16 @@ import common.repository.RoleTypeRepository;
 import common.repository.UserRepository;
 import common.service.MenuService;
 import common.service.UserService;
+import dic.OperateObjectTypeEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 import security.annotation.CurrentAccount;
 import util.CipherUtil;
 import util.ResultModel;
+import util.UserLogThread;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
@@ -47,9 +50,11 @@ public class UserController {
 
     @RequestMapping(value = "/create", method = RequestMethod.POST)
     @ResponseBody
-    public ResultModel create(@CurrentAccount User loginAccount, @RequestBody User resource) {
+    public ResultModel create(@CurrentAccount User loginAccount, @RequestBody User resource, HttpServletRequest request) {
         if(userService.validEmail(resource.getEmail())){
             userService.create(loginAccount, resource);
+            UserLogThread userlog = new UserLogThread(loginAccount.getEmail(), loginAccount.getName(), OperateObjectTypeEnum.INNERUSER.getKey(), resource.getEmail(), "创建系统账号", request);
+            userlog.start();
             return ResultModel.OK(true);
         }else{
             return ResultModel.OK(false);
@@ -58,7 +63,9 @@ public class UserController {
 
     @RequestMapping(value = "/update", method = RequestMethod.PUT)
     @ResponseBody
-    public ResultModel update(@CurrentAccount User loginAccount, @RequestBody User resource) {
+    public ResultModel update(@CurrentAccount User loginAccount, @RequestBody User resource, HttpServletRequest request) {
+        UserLogThread userlog = new UserLogThread(loginAccount.getEmail(), loginAccount.getName(), OperateObjectTypeEnum.INNERUSER.getKey(), resource.getEmail(), "修改系统账号", request);
+        userlog.start();
         return ResultModel.OK(userService.update(loginAccount, resource));
     }
 
@@ -88,28 +95,39 @@ public class UserController {
 
     @RequestMapping(value = "/delete/{id}", method = RequestMethod.DELETE)
     @ResponseBody
-    public ResultModel delete(@CurrentAccount User loginAccount, @PathVariable Long id) {
-        return ResultModel.OK(userService.delete(loginAccount, id));
+    public ResultModel delete(@CurrentAccount User loginAccount, @PathVariable Long id, HttpServletRequest request) {
+        User user = userService.delete(loginAccount, id);
+        UserLogThread userlog = new UserLogThread(loginAccount.getEmail(), loginAccount.getName(), OperateObjectTypeEnum.INNERUSER.getKey(), user.getEmail(), "删除系统账号", request);
+        userlog.start();
+        return ResultModel.OK(user);
     }
 
     @RequestMapping(value = "/enable/{id}", method = RequestMethod.PUT)
     @ResponseBody
-    public ResultModel enable(@CurrentAccount User loginAccount, @PathVariable Long id) {
-        return ResultModel.OK(userService.enable(loginAccount, id));
+    public ResultModel enable(@CurrentAccount User loginAccount, @PathVariable Long id, HttpServletRequest request) {
+        User user = userService.enable(loginAccount, id);
+        UserLogThread userlog = new UserLogThread(loginAccount.getEmail(), loginAccount.getName(), OperateObjectTypeEnum.INNERUSER.getKey(), user.getEmail(), "启用系统账号", request);
+        userlog.start();
+        return ResultModel.OK(user);
     }
 
     @RequestMapping(value = "/forbiden/{id}", method = RequestMethod.PUT)
     @ResponseBody
-    public ResultModel forbiden(@CurrentAccount User loginAccount, @PathVariable Long id) {
-        return ResultModel.OK(userService.forbiden(loginAccount, id));
+    public ResultModel forbiden(@CurrentAccount User loginAccount, @PathVariable Long id, HttpServletRequest request) {
+        User user = userService.forbiden(loginAccount, id);
+        UserLogThread userlog = new UserLogThread(loginAccount.getEmail(), loginAccount.getName(), OperateObjectTypeEnum.INNERUSER.getKey(), user.getEmail(), "停用系统账号", request);
+        userlog.start();
+        return ResultModel.OK(user);
     }
 
     @RequestMapping(value = "/update/name", method = RequestMethod.PUT)
     @ResponseBody
-    public ResultModel updateName(@CurrentAccount User loginAccount, @RequestParam String name) {
+    public ResultModel updateName(@CurrentAccount User loginAccount, @RequestParam String name, HttpServletRequest request) {
         User login = userRepository.login(name);
         if(null == login){
-            userService.updateName(loginAccount, name);
+            User user = userService.updateName(loginAccount, name);
+            UserLogThread userlog = new UserLogThread(loginAccount.getEmail(), loginAccount.getName(), OperateObjectTypeEnum.INNERUSER.getKey(), user.getEmail(), "修改系统账号名字", request);
+            userlog.start();
             return ResultModel.OK(true);
         }else{
             return ResultModel.OK(false);
@@ -119,10 +137,12 @@ public class UserController {
 
     @RequestMapping(value = "/update/password", method = RequestMethod.PUT)
     @ResponseBody
-    public ResultModel updatePwd(@CurrentAccount User loginAccount, @RequestParam String pwd, @RequestParam String oldpwd) {
+    public ResultModel updatePwd(@CurrentAccount User loginAccount, @RequestParam String pwd, @RequestParam String oldpwd, HttpServletRequest request) {
         User login = userRepository.login(loginAccount.getEmail(), CipherUtil.generatePassword(oldpwd));
         if(null != login){
-            userService.updatePwd(loginAccount, pwd);
+            User user = userService.updatePwd(loginAccount, pwd);
+            UserLogThread userlog = new UserLogThread(loginAccount.getEmail(), loginAccount.getName(), OperateObjectTypeEnum.INNERUSER.getKey(), user.getEmail(), "修改系统账号密码", request);
+            userlog.start();
             return ResultModel.OK(true);
         }else{
             return ResultModel.OK(false);
@@ -132,8 +152,9 @@ public class UserController {
     //忘记密码时，修改密码
     @RequestMapping(value = "/update/pwd", method = RequestMethod.PUT)
     @ResponseBody
-    public ResultModel updatePwd(@RequestParam String email, @RequestParam String pwd) {
-
+    public ResultModel updatePwd(@RequestParam String email, @RequestParam String pwd, HttpServletRequest request) {
+        UserLogThread userlog = new UserLogThread(email, email, OperateObjectTypeEnum.INNERUSER.getKey(), email, "修改系统账号密码", request);
+        userlog.start();
         return ResultModel.OK(userService.updatePwd(email, pwd));
     }