用户登录、信息方面，移除了以前写死的逻辑，对接了user微服务

project-order/src/main/java/com/dituhui/pea/order/controller/UserController.java

@@ -2,6 +2,7 @@ package com.dituhui.pea.order.controller;
 
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
 
 
+import com.dituhui.pea.pojo.UserLoginParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -12,7 +13,6 @@ import org.springframework.web.bind.annotation.RestController;
 
 
 import com.dituhui.pea.common.Result;
 import com.dituhui.pea.common.Result;
 import com.dituhui.pea.order.dto.UserLoginDTO;
 import com.dituhui.pea.order.dto.UserLoginDTO;
-import com.dituhui.pea.order.service.UserService;
 import com.dituhui.pea.pojo.UserInfo;
 import com.dituhui.pea.pojo.UserInfo;
 import com.dituhui.pea.pojo.WebResult;
 import com.dituhui.pea.pojo.WebResult;
 import com.dituhui.pea.user.IUser;
 import com.dituhui.pea.user.IUser;
@@ -24,31 +24,32 @@ import lombok.extern.slf4j.Slf4j;
 @RequestMapping("/pea-order")
 @RequestMapping("/pea-order")
 public class UserController {
 public class UserController {
 
 
-	@Autowired
-	private UserService userService;
-
-	@Autowired
-	private IUser user;
-	
-	@Autowired
-	private HttpServletRequest request;
-
-	@PostMapping("/user/login")
-	public Result<?> userLogin(@RequestBody UserLoginDTO user) {
-		return userService.userLogin(user.getAccount(), user.getAccount());
-	}
-
-	@GetMapping("/user/userInfo")
-	public Result<?> getUserInfo(@RequestHeader(name = "Authorization", required = true) String authorization) {
-		return userService.getUserInfo(authorization, true);
-	}
-
-	@GetMapping("/user/test")
-	public Result<?> getUserRole(@RequestHeader(name = "userId", required = true) String userId) {
-		log.info("{} {} {}", "HttpServletRequest", request.getHeader("userId"), request.getHeader("Authorization"));
-
-		WebResult<UserInfo> result = user.queryUserById(userId);
-		return Result.success(result.getResult());
-	}
+    @Autowired
+    private IUser user;
+
+    @Autowired
+    private HttpServletRequest request;
+
+    @PostMapping("/user/login")
+    public Result<?> userLogin(@RequestBody UserLoginDTO userLoginDTO) {
+        UserLoginParam userLoginParam = new UserLoginParam();
+        userLoginParam.setAccount(userLoginDTO.getAccount());
+        userLoginParam.setPassword(userLoginDTO.getPassword());
+        return user.userLogin(userLoginParam);
+    }
+
+    @GetMapping("/user/userInfo")
+    public Result<?> getUserInfo(@RequestHeader(name = "Authorization", required = true) String authorization) {
+        String userId = request.getHeader("userId");
+        return user.getUserInfo(userId);
+    }
+
+    @GetMapping("/user/test")
+    public Result<?> getUserRole(@RequestHeader(name = "userId", required = true) String userId) {
+        log.info("{} {} {}", "HttpServletRequest", request.getHeader("userId"), request.getHeader("Authorization"));
+
+        WebResult<UserInfo> result = user.queryUserById(userId);
+        return Result.success(result.getResult());
+    }
 
 
 }
 }

project-order/src/main/java/com/dituhui/pea/order/service/UserService.java

-package com.dituhui.pea.order.service;
-
-import com.dituhui.pea.common.Result;
-
-public interface UserService {
-
-	Result<?> userLogin(String account, String password);
-	Result<?> getUserInfo(String token, boolean needTeamInfo);
-
-}

project-order/src/main/java/com/dituhui/pea/order/service/impl/UserServiceImpl.java

-package com.dituhui.pea.order.service.impl;
-
-import com.dituhui.pea.common.Result;
-import com.dituhui.pea.order.service.UserService;
-import org.springframework.stereotype.Service;
-
-import java.util.HashMap;
-
-@Service
-public class UserServiceImpl implements UserService {
-	@Override
-	public Result<?> userLogin(String account, String password) {
-		HashMap<String, String> map = new HashMap<>();
-		map.put("token", "88d89f379a634867b1c7274a8b86bba6");  //TODO
-		return Result.success(map);
-	}
-
-	@Override
-	public Result<?> getUserInfo(String token, boolean needTeamInfo) {
-		HashMap<String, String> map = new HashMap<>();
-		map.put("account", "ID9192");
-		map.put("nickname", "测试用户");
-		map.put("clusterId", "csuzhou");
-		map.put("branchId", "bsuzhou");
-		map.put("groupId", "gsuzhou");
-		map.put("levelType", "branch");
-		map.put("levelValue", "bsuzhou");
-		return Result.success(map);
-	}
-}