Refactor UserService

src/main/java/cc/ryanc/halo/service/UserService.java

@@ -1,6 +1,7 @@
 package cc.ryanc.halo.service;
 
 import cc.ryanc.halo.model.domain.User;
+import cc.ryanc.halo.service.base.CrudService;
 
 import java.util.Date;
 
@@ -12,14 +13,7 @@ import java.util.Date;
  * @author : RYAN0UP
  * @date : 2017/11/14
  */
-public interface UserService {
-
-    /**
-     * 保存个人资料
-     *
-     * @param user user
-     */
-    void save(User user);
+public interface UserService extends CrudService<User, Long> {
 
     /**
      * 根据用户名和密码查询，用于登录

src/main/java/cc/ryanc/halo/service/impl/UserServiceImpl.java

@@ -4,7 +4,7 @@ import cc.ryanc.halo.model.domain.User;
 import cc.ryanc.halo.model.enums.TrueFalseEnum;
 import cc.ryanc.halo.repository.UserRepository;
 import cc.ryanc.halo.service.UserService;
-import org.springframework.beans.factory.annotation.Autowired;
+import cc.ryanc.halo.service.base.AbstractCrudService;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;
@@ -19,19 +19,13 @@ import java.util.List;
  * @date : 2017/11/14
  */
 @Service
-public class UserServiceImpl implements UserService {
+public class UserServiceImpl extends AbstractCrudService<User, Long> implements UserService {
 
-    @Autowired
-    private UserRepository userRepository;
+    private final UserRepository userRepository;
 
-    /**
-     * 保存个人资料
-     *
-     * @param user user
-     */
-    @Override
-    public void save(User user) {
-        userRepository.save(user);
+    public UserServiceImpl(UserRepository userRepository) {
+        super(userRepository);
+        this.userRepository = userRepository;
     }
 
     /**
@@ -95,7 +89,9 @@ public class UserServiceImpl implements UserService {
         final User user = this.findUser();
         user.setLoginError(0);
         user.setLoginEnable(enable);
-        userRepository.save(user);
+
+        // Update user
+        update(user);
     }
 
     /**
@@ -108,8 +104,9 @@ public class UserServiceImpl implements UserService {
     public User updateUserLoginLast(Date lastDate) {
         final User user = this.findUser();
         user.setLoginLast(lastDate);
-        userRepository.save(user);
-        return user;
+
+        // Update user
+        return update(user);
     }
 
     /**
@@ -121,7 +118,11 @@ public class UserServiceImpl implements UserService {
     public Integer updateUserLoginError() {
         final User user = this.findUser();
         user.setLoginError((user.getLoginError() == null ? 0 : user.getLoginError()) + 1);
-        userRepository.save(user);
+
+        // Update user
+        update(user);
+
+        // Return login error times
         return user.getLoginError();
     }
 
@@ -136,7 +137,7 @@ public class UserServiceImpl implements UserService {
         user.setLoginEnable(TrueFalseEnum.TRUE.getDesc());
         user.setLoginError(0);
         user.setLoginLast(new Date());
-        userRepository.save(user);
-        return user;
+
+        return update(user);
     }
-}
+}

src/main/java/cc/ryanc/halo/web/controller/admin/UserController.java

@@ -67,7 +67,7 @@ public class UserController {
                     return new JsonResult(ResultCodeEnum.FAIL.getCode(), error.getDefaultMessage());
                 }
             }
-            userService.save(user);
+            userService.create(user);
             configuration.setSharedVariable("user", userService.findUser());
             session.removeAttribute(USER_SESSION_KEY);
         } catch (Exception e) {
@@ -96,7 +96,7 @@ public class UserController {
             final User user = userService.findByUserIdAndUserPass(userId, SecureUtil.md5(beforePass));
             if (null != user) {
                 user.setUserPass(SecureUtil.md5(newPass));
-                userService.save(user);
+                userService.update(user);
                 session.removeAttribute(USER_SESSION_KEY);
             } else {
                 return new JsonResult(ResultCodeEnum.FAIL.getCode(), localeMessageUtil.getMessage("code.admin.user.old-password-error"));

src/main/java/cc/ryanc/halo/web/controller/core/InstallController.java

@@ -116,7 +116,7 @@ public class InstallController {
             user.setUserDisplayName(userDisplayName);
             user.setUserEmail(userEmail);
             user.setUserPass(SecureUtil.md5(userPwd));
-            userService.save(user);
+            userService.create(user);
 
             //默认分类
             final Category category = new Category();