ADD: check user null

mooctest-user-server/pom.xml

@@ -24,7 +24,7 @@
         <dependency>
             <groupId>cn.iselab.mooctest</groupId>
             <artifactId>user-dubbo-api</artifactId>
-            <version>1.0.10</version>
+            <version>1.0.8</version>
         </dependency>
         <dependency>
             <groupId>cn.iselab.mooctest</groupId>

mooctest-user-server/src/main/java/cn/iselab/mooctest/user/rpc/UserRPC.java

@@ -2,7 +2,6 @@ package cn.iselab.mooctest.user.rpc;
 
 import cn.iselab.mooctest.rpc.user.api.UserService;
 import cn.iselab.mooctest.rpc.user.data.UserDTO;
-import cn.iselab.mooctest.user.web.exception.HttpBadRequestException;
 import cn.iselab.mooctest.user.web.logic.UserLogic;
 import com.alibaba.dubbo.config.annotation.Service;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -49,18 +48,18 @@ public class UserRPC implements UserService {
         return userLogic.updateUser(userDTO);
     }
 
-    @Override
-    public UserDTO getUserByUsername(String s) {
-        UserDTO userDTO = userLogic.getUserByEmail(s);
-        if (userDTO != null) {
-            return userDTO;
-        } else {
-            userDTO = userLogic.getUserByMobile(s);
-            if (userDTO != null) {
-                return userDTO;
-            } else {
-                throw new HttpBadRequestException("user not exist");
-            }
-        }
-    }
+//    @Override
+//    public UserDTO getUserByUsername(String s) {
+//        UserDTO userDTO = userLogic.getUserByEmail(s);
+//        if (userDTO != null) {
+//            return userDTO;
+//        } else {
+//            userDTO = userLogic.getUserByMobile(s);
+//            if (userDTO != null) {
+//                return userDTO;
+//            } else {
+//                throw new HttpBadRequestException("user not exist");
+//            }
+//        }
+//    }
 }

mooctest-user-server/src/main/java/cn/iselab/mooctest/user/web/ctrl/UserController.java

@@ -23,4 +23,9 @@ public class UserController extends BaseController {
     public UserDTO getUserById(@PathVariable("id") Long id) {
         return userLogic.getUserById(id);
     }
+
+    @RequestMapping(value = UrlConstants.API + "userByEmail/{email}", method = RequestMethod.GET)
+    public UserDTO getUserByEmail(@PathVariable("email") String email) {
+        return userLogic.getUserByEmail(email);
+    }
 }

mooctest-user-server/src/main/java/cn/iselab/mooctest/user/web/logic/impl/UserLogicImpl.java

@@ -26,18 +26,27 @@ public class UserLogicImpl extends BaseLogic implements UserLogic {
     @Override
     public UserDTO getUserByEmail(String s) {
         User user = userService.findByEmail(s);
+        if (user == null) {
+            return null;
+        }
         return userWrapper.wrap(user);
     }
 
     @Override
     public UserDTO getUserByMobile(String s) {
         User user = userService.findByMobile(s);
+        if (user == null) {
+            return null;
+        }
         return userWrapper.wrap(user);
     }
 
     @Override
     public UserDTO getUserById(Long userId) {
         User user = userService.findById(userId);
+        if (user == null) {
+            return null;
+        }
         return userWrapper.wrap(user);
     }