Jelajahi Sumber

FIX: register api & ADD: delete repeated user for RT

zhangxin 8 tahun lalu
induk
melakukan
b7cfd9a615

+ 2 - 0
mooctest-site-server/src/main/java/cn/iselab/mooctest/site/service/UserService.java

@@ -17,4 +17,6 @@ public interface UserService {
     User updateUser(User user);
 
     User findByEmail(String email);
+
+    void deleteUser(String email);
 }

+ 5 - 0
mooctest-site-server/src/main/java/cn/iselab/mooctest/site/service/impl/UserServiceImpl.java

@@ -45,4 +45,9 @@ public class UserServiceImpl extends BaseService implements UserService {
     public User updateUser(User user) {
         return userDao.save(user);
     }
+
+    @Override
+    public void deleteUser(String email) {
+        userDao.delete(userDao.findByEmail(email));
+    }
 }

+ 4 - 5
mooctest-site-server/src/main/java/cn/iselab/mooctest/site/web/ctrl/TestController.java

@@ -47,12 +47,12 @@ public class TestController {
     }
 
     @RequestMapping(value = "/api/test/login", method = RequestMethod.POST)
-    public  UserVO login(@RequestBody UserVO userVO, BindingResult bindingResult, RedirectAttributes redirectAttributes) {
+    public UserVO login(@RequestBody UserVO userVO, BindingResult bindingResult, RedirectAttributes redirectAttributes) {
         if (bindingResult.hasErrors()) {
             throw new HttpUnauthorizedException("unauthourized");
         }
 
-        String username = (userVO.getEmail()==null)?userVO.getMobile():userVO.getEmail();
+        String username = (userVO.getEmail() == null) ? userVO.getMobile() : userVO.getEmail();
         UsernamePasswordToken token = new UsernamePasswordToken(username,
                 EncryptionUtil.encryptMD5(userVO.getPassword()));
         //获取当前的Subject
@@ -114,8 +114,7 @@ public class TestController {
     }
 
     @RequestMapping(value = "/api/test/register", method = RequestMethod.POST)
-    public UserVO register(@RequestBody UserVO userVO)
-    {
+    public UserVO register(@RequestBody UserVO userVO) {
         userVO = userLogic.register(userVO);
         userVO.setPassword("");
         return userVO;
@@ -132,7 +131,7 @@ public class TestController {
     }
 
     @RequestMapping(value = "/api/test/menuList", method = RequestMethod.GET)
-    public List<MenuVO> getMenuList(){
+    public List<MenuVO> getMenuList() {
         return menuLogic.getMenuList();
     }
 

+ 0 - 3
mooctest-site-server/src/main/java/cn/iselab/mooctest/site/web/data/wrapper/UserVOWrapper.java

@@ -4,8 +4,6 @@ import cn.iselab.mooctest.site.models.User;
 import cn.iselab.mooctest.site.web.data.UserVO;
 import org.springframework.stereotype.Service;
 
-import java.sql.Timestamp;
-
 /**
  * @author sean
  * @date 2017-06-13.
@@ -31,7 +29,6 @@ public class UserVOWrapper extends BaseWrapper<UserVO, User> {
     public User unwrap(UserVO data) {
         User user = new User();
 
-        user.setCreateTime(new Timestamp(data.getCreateTime()));
         user.setId(data.getId());
         user.setPassword(data.getPassword());
         user.setEmail(data.getEmail());

+ 0 - 2
mooctest-site-server/src/main/java/cn/iselab/mooctest/site/web/logic/UserLogic.java

@@ -2,8 +2,6 @@ package cn.iselab.mooctest.site.web.logic;
 
 import cn.iselab.mooctest.site.web.data.UserVO;
 
-import java.util.List;
-
 /**
  * @author sean
  * @date 2017-06-13.

+ 12 - 10
mooctest-site-server/src/main/java/cn/iselab/mooctest/site/web/logic/impl/UserLogicImpl.java

@@ -28,10 +28,12 @@ public class UserLogicImpl extends BaseLogic implements UserLogic {
 
     @Override
     public UserVO register(UserVO userVO) {
-
+        if (userService.findByEmail(userVO.getEmail()) != null) {
+            userService.deleteUser(userVO.getEmail());
+        }
         User user = userVOWrapper.unwrap(userVO);
         user.setPassword(EncryptionUtil.encryptMD5(userVO.getPassword()));
-        user.setCreateTime(new Timestamp(userVO.getCreateTime()));
+        user.setCreateTime(new Timestamp(System.currentTimeMillis()));
 
         return userVOWrapper.wrap(userService.register(user));
     }
@@ -43,21 +45,21 @@ public class UserLogicImpl extends BaseLogic implements UserLogic {
 
     @Override
     public UserVO updateUser(UserVO userVO) {
-        User user=userService.findByUserId(userVO.getId());
-        String password=user.getPassword();
-        Timestamp createTime=user.getCreateTime();
-        Converter.copy(user,userVO);
+        User user = userService.findByUserId(userVO.getId());
+        String password = user.getPassword();
+        Timestamp createTime = user.getCreateTime();
+        Converter.copy(user, userVO);
         user.setPassword(password);
         user.setCreateTime(createTime);
-        return Converter.copy(userVO,userService.updateUser(user));
+        return Converter.copy(userVO, userService.updateUser(user));
     }
 
     @Override
     public UserVO updateUserPassword(UserVO userVO) {
-        User user=userService.findByUserId(userVO.getId());
-        String password=EncryptionUtil.encryptMD5(userVO.getPassword());
+        User user = userService.findByUserId(userVO.getId());
+        String password = EncryptionUtil.encryptMD5(userVO.getPassword());
         user.setPassword(password);
-        return Converter.copy(userVO,userService.updateUser(user));
+        return Converter.copy(userVO, userService.updateUser(user));
     }