cxc/yshopb2c
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修改直播间返回参数

Browse Source
This commit is contained in:
xuwenbo
2020-08-31 11:11:25 +08:00
parent 610cce7aa7
commit 4a5b00e8aa
6 changed files with 30 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
yshop-app/src/main/java/co/yixiang/modules/wechat/rest/controller/WechatLiveController.java
View File

@ -15,6 +15,7 @@ import co.yixiang.modules.wechat.domain.YxWechatLive;
import co.yixiang.modules.wechat.service.YxWechatLiveService;
import co.yixiang.modules.wechat.service.dto.YxWechatLiveDto;
import co.yixiang.modules.wechat.service.dto.YxWechatLiveQueryCriteria;
import co.yixiang.modules.wechat.vo.WechatLiveVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
@ -44,7 +45,7 @@ public class WechatLiveController {
@GetMapping("yxWechatLive")
@ApiOperation("查询所有直播间")
public ApiResult<Map<String,Object>> getYxWechatLives(YxWechatLiveQueryCriteria criteria, Pageable pageable){
public ApiResult<WechatLiveVo> getYxWechatLives(YxWechatLiveQueryCriteria criteria, Pageable pageable){
return ApiResult.ok(yxWechatLiveService.queryAll(criteria,pageable));
}

6
yshop-app/src/main/resources/config/application-prod.yml
View File

@ -5,9 +5,9 @@ spring:
druid:
# 主库数据源
master:
url: jdbc:mysql://localhost:3306/yshop3?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: yshop3
password:
url: jdbc:mysql://localhost:3306/yshopb2c?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
password: xxcs@!2019
# 从库数据源
slave:
# 从数据源开关/默认关闭