From 4c157090cbee7f94abcf37496b7df22b4725f3e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=98=E5=BA=86=E5=90=89?= <51312040@qq.com> Date: Thu, 21 Oct 2021 08:36:04 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=84=9A=E6=89=8B=E6=9E=B6v2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 40 ++-------------------------------------- 1 file changed, 2 insertions(+), 38 deletions(-) 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 From 5b6ff0dba3598cf01690a47d4b53cc9e5dff260d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=98=E5=BA=86=E5=90=89?= <51312040@qq.com> Date: Mon, 25 Oct 2021 10:29:03 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E3=80=90=E7=94=9F=E4=BA=A7=E3=80=91?= =?UTF-8?q?=E6=9C=AA=E8=BF=9B=E5=85=A5=E8=AF=84=E5=AE=A1=E5=AE=A4=E7=9A=84?= =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=EF=BC=8C=E4=B8=8D=E5=BA=94=E5=9C=A8?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E6=89=93=E5=8D=B0=E9=87=8C=E5=87=BA=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mall/ebtp/extend/feign/client/TenderFeignService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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..39b0b90 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/tender/count/{roomId}") BaseResponse> queryRoomTenderCount(@ApiParam(value = "评审室id", required = true) @PathVariable String roomId); } From 809caa25e7e3fccd764115bc544926d0dd70fcaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=98=E5=BA=86=E5=90=89?= <51312040@qq.com> Date: Mon, 25 Oct 2021 11:07:57 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=9C=AA=E8=BF=9B=E5=85=A5=E8=AF=84?= =?UTF-8?q?=E5=AE=A1=E5=AE=A4=E7=9A=84=E4=BE=9B=E5=BA=94=E5=95=86=EF=BC=8C?= =?UTF-8?q?=E4=B8=8D=E5=BA=94=E5=9C=A8=E6=8A=A5=E8=A1=A8=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E9=87=8C=E5=87=BA=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mall/ebtp/extend/feign/client/TenderFeignService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 39b0b90..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/tender/count/{roomId}") + @GetMapping("v1/supplier_register/room/downloaded/{roomId}") BaseResponse> queryRoomTenderCount(@ApiParam(value = "评审室id", required = true) @PathVariable String roomId); } From 8d22ec7ef075a7f6a715ea4207bb050e55f6676e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=98=E5=BA=86=E5=90=89?= <51312040@qq.com> Date: Mon, 25 Oct 2021 15:39:23 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=A0=B9=E6=8D=AEtoken?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/UserInfoController.java | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/userinfo/controller/UserInfoController.java 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)); + } + +}