liuchang/biz_service_ebtp_extend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'uat' into 'master'

Browse Source 
From uat into master

See merge request eshop/biz_service_ebtp_extend!68
This commit is contained in:
付庆吉
2021-10-29 16:00:45 +08:00
parent cc88da3659 7580d91910
commit cb6aeae472
3 changed files with 42 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
pom.xml
View File

@ -7,7 +7,7 @@
<parent>
<groupId>com.chinaunicom.ebtp</groupId>
<artifactId>mall-ebtp-cloud-parent</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>2.0.0-SNAPSHOT</version>
</parent>
<groupId>com.chinaunicom.mall.ebtp</groupId>
@ -20,52 +20,16 @@
<dependency>
<groupId>com.chinaunicom.mall.ebtp</groupId>
<artifactId>uboot-core</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>2.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.chinaunicom.ebtp</groupId>
<artifactId>mall-ebtp-cloud-attachment-sdk</artifactId>
</dependency>
<dependency>
<groupId>com.chinaunicom.ebtp</groupId>
<artifactId>mall-ebtp-cloud-apollo-starter</artifactId>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
</dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
<artifactId>sharding-jdbc-spring-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>com.deepoove</groupId>
<artifactId>poi-tl</artifactId>
<version>1.9.1</version>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
<version>4.1.2</version>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
<version>4.1.2</version>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml-schemas</artifactId>
<version>4.1.2</version>
</dependency>
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>

2
src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/TenderFeignService.java
View File

@ -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<List<BizSupplierRegister>> queryRoomTenderCount(@ApiParam(value = "评审室id", required = true) @PathVariable String roomId);
}

39
src/main/java/com/chinaunicom/mall/ebtp/extend/userinfo/controller/UserInfoController.java Normal file
View File

@ -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<BaseCacheUser> 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));
}
}