diff --git a/pom.xml b/pom.xml
index 31bcbf8..90ddf40 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
com.chinaunicom.ebtp
mall-ebtp-cloud-parent
- 0.0.1-SNAPSHOT
+ 2.0.0-SNAPSHOT
com.chinaunicom.mall.ebtp
@@ -20,52 +20,16 @@
com.chinaunicom.mall.ebtp
uboot-core
- 0.0.1-SNAPSHOT
+ 2.0.0-SNAPSHOT
-
- com.chinaunicom.ebtp
- mall-ebtp-cloud-attachment-sdk
-
-
-
- com.chinaunicom.ebtp
- mall-ebtp-cloud-apollo-starter
-
-
- mysql
- mysql-connector-java
-
-
-
- org.apache.shardingsphere
- sharding-jdbc-spring-boot-starter
-
-
com.deepoove
poi-tl
1.9.1
-
-
- org.apache.poi
- poi
- 4.1.2
-
-
- org.apache.poi
- poi-ooxml
- 4.1.2
-
-
-
- org.apache.poi
- poi-ooxml-schemas
- 4.1.2
-
commons-httpclient
commons-httpclient
diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/TenderFeignService.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/TenderFeignService.java
index 753aeab..9c288bf 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/TenderFeignService.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/TenderFeignService.java
@@ -18,7 +18,7 @@ import java.util.List;
public interface TenderFeignService {
@ApiOperation("查询评审室下初审投标状态")
- @GetMapping("/v1/supplier_register/room/tender/{roomId}")
+ @GetMapping("v1/supplier_register/room/downloaded/{roomId}")
BaseResponse> queryRoomTenderCount(@ApiParam(value = "评审室id", required = true) @PathVariable String roomId);
}
diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/userinfo/controller/UserInfoController.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/userinfo/controller/UserInfoController.java
new file mode 100644
index 0000000..0489224
--- /dev/null
+++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/userinfo/controller/UserInfoController.java
@@ -0,0 +1,39 @@
+package com.chinaunicom.mall.ebtp.extend.userinfo.controller;
+
+import com.chinaunicom.mall.ebtp.cloud.userinfo.starter.service.UserInfoService;
+import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Slf4j
+@RestController
+@RequestMapping("/v1/userinfo/")
+public class UserInfoController {
+
+ @Autowired
+ private UserInfoService service;
+
+ /**
+ * 获取用户信息
+ *
+ * @param token (认证token)
+ * @return
+ */
+ @GetMapping("get")
+ public ResponseEntity getUserInfo(
+ @RequestHeader(name = "Authorization", required = false) String token) {
+ if (StringUtils.isEmpty(token)) {
+ log.error("access token is empty");
+ return ResponseEntity.status(HttpStatus.UNAUTHORIZED).build();
+ }
+ return ResponseEntity.ok(service.getUserInfo(token));
+ }
+
+}