登录返回必要的信息

user-service/src/main/java/com/diagbot/dto/LoginDTO.java

@@ -16,7 +16,7 @@ import java.util.List;
 @Getter
 @Setter
 public class LoginDTO {
-    private User user;
+    private UserLoginDTO userLoginDTO;
     private String token;
     private Organization organization;
     private List<MenuWrapper> menuWrappers;

user-service/src/main/java/com/diagbot/dto/UserLoginDTO.java

@@ -0,0 +1,35 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description: 登录返回的用户信息
+ * @author: gaodm
+ * @time: 2018/9/28 15:10
+ */
+@Getter
+@Setter
+public class UserLoginDTO {
+
+    /**
+     * 用户名
+     */
+    private String username;
+
+
+    /**
+     * 联系人
+     */
+    private String linkman;
+
+    /**
+     * 邮箱
+     */
+    private String email;
+
+    /**
+     * 用户类型
+     */
+    private Integer type;
+}

user-service/src/main/java/com/diagbot/facade/UserFacade.java

@@ -11,6 +11,7 @@ import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.UserAndProdutUDTO;
 import com.diagbot.dto.UserInfoDTO;
 import com.diagbot.dto.UserInfoExportDTO;
+import com.diagbot.dto.UserLoginDTO;
 import com.diagbot.dto.UserOrgDTO;
 import com.diagbot.entity.JWT;
 import com.diagbot.entity.Organization;
@@ -89,7 +90,7 @@ public class UserFacade extends UserServiceImpl {
      * @param userSaveVO 参数
      * @return 用户信息
      */
-    public User createUser(UserSaveVO userSaveVO) {
+    public Boolean createUser(UserSaveVO userSaveVO) {
         User user = new User();
         BeanUtil.copyProperties(userSaveVO, user);
         user.setGmtCreate(new Date());
@@ -119,7 +120,7 @@ public class UserFacade extends UserServiceImpl {
 
         //用户认证业务
         doUserAuthentication(userSaveVO, user);
-        return user;
+        return true;
     }
 
 
@@ -245,7 +246,9 @@ public class UserFacade extends UserServiceImpl {
         }
         LoginDTO loginDTO = new LoginDTO();
         //添加用户
-        loginDTO.setUser(user);
+        UserLoginDTO userLoginDTO = new UserLoginDTO();
+        BeanUtil.copyProperties(user, userLoginDTO);
+        loginDTO.setUserLoginDTO(userLoginDTO);
         //添加token
         loginDTO.setToken(jwt.getAccess_token());
         //添加机构信息

user-service/src/main/java/com/diagbot/web/UserController.java

@@ -61,9 +61,9 @@ public class UserController {
     @PostMapping("/registry")
     @SysLogger("registry")
     @Transactional
-    public RespDTO<User> createUser(@RequestBody @Valid UserSaveVO userSaveVO) {
-        User user = userFacade.createUser(userSaveVO);
-        return RespDTO.onSuc(user);
+    public RespDTO<Boolean> createUser(@RequestBody @Valid UserSaveVO userSaveVO) {
+        Boolean res = userFacade.createUser(userSaveVO);
+        return RespDTO.onSuc(res);
     }