Merge remote-tracking branch 'origin/develop' into develop

project-order/src/main/java/com/alibaba/cloud/integration/order/controller/EngineerController.java

@@ -39,7 +39,7 @@ public class EngineerController {
 		return res;
 		return res;
 	}
 	}
 
 
-	@GetMapping("/engineer/skill/update")
+	@PostMapping("/engineer/skill/update")
 	public Result<?> engineerSkillUpdate(@RequestBody String engineerCode, @RequestBody List<String> categoryIds) {
 	public Result<?> engineerSkillUpdate(@RequestBody String engineerCode, @RequestBody List<String> categoryIds) {
 		// 获取工程师技能信息修改
 		// 获取工程师技能信息修改
 		try {
 		try {

project-order/src/main/java/com/alibaba/cloud/integration/order/controller/UserController.java

+package com.alibaba.cloud.integration.order.controller;
+
+import com.alibaba.cloud.integration.common.Result;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/pea-order")
+public class UserController {
+
+	@PostMapping("/user/login")
+	public Result<?> userLogin(@RequestBody String account, @RequestBody String password) {
+		return null;
+	}
+
+	@GetMapping("/user/userInfo")
+	public Result<?> getUserInfo(@RequestBody String userToken, @RequestBody boolean needTeamInfo) {
+		return null;
+	}
+}

project-order/src/main/java/com/alibaba/cloud/integration/order/service/UserService.java

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

project-order/src/main/java/com/alibaba/cloud/integration/order/service/impl/UserServiceImpl.java

+package com.alibaba.cloud.integration.order.service.impl;
+
+import com.alibaba.cloud.integration.common.Result;
+import com.alibaba.cloud.integration.order.service.UserService;
+import com.sun.xml.bind.v2.TODO;
+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("levelId", "bsuzhou");
+		return Result.success(map);
+	}
+}