配置及订单接口调整
This commit is contained in:
parent
6a7eaa8229
commit
3ef81c28a4
@ -6,9 +6,9 @@ spring:
|
||||
druid:
|
||||
# 主库数据源
|
||||
master:
|
||||
url: jdbc:mysql://192.168.1.23:22001/sac_competition?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
|
||||
url: jdbc:mysql://47.108.66.163:3306/sac_competition?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
|
||||
username: root
|
||||
password: abc&^321
|
||||
password: 82^hsgGHbs^2
|
||||
# 从库数据源
|
||||
slave:
|
||||
# 从数据源开关/默认关闭
|
||||
|
@ -70,9 +70,9 @@ spring:
|
||||
# redis 配置
|
||||
redis:
|
||||
# 地址
|
||||
host: 192.168.1.23
|
||||
host: 47.108.66.163
|
||||
# 端口,默认为6379
|
||||
port: 22002
|
||||
port: 6379
|
||||
# 数据库索引
|
||||
database: 0
|
||||
# 密码
|
||||
@ -132,8 +132,7 @@ xss:
|
||||
file:
|
||||
ceph:
|
||||
#endpoint: http://127.0.0.1:9000
|
||||
upload: http://192.168.1.23:9000
|
||||
endpoint: http://118.114.160.245
|
||||
endpoint: http://47.108.66.163:9000
|
||||
# 50M
|
||||
defaultMaxSize: 52428800
|
||||
access:
|
||||
|
@ -19,7 +19,7 @@ import lombok.extern.slf4j.Slf4j;
|
||||
@Configuration
|
||||
@Slf4j
|
||||
public class AmazonConfig {
|
||||
@Value("${file.ceph.upload}")
|
||||
@Value("${file.ceph.endpoint}")
|
||||
private String FILE_CEPH_POINT;
|
||||
|
||||
@Value("${file.ceph.access.key}")
|
||||
|
@ -43,6 +43,19 @@ public class OrderInfoController extends BaseController {
|
||||
return getDataTable(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 我的订单列表(当前用户)
|
||||
*/
|
||||
@GetMapping("/myOrderList")
|
||||
public TableDataInfo myOrderList(OrderListReqVo vo) {
|
||||
vo.setAppCode(RequestUtils.getHeader(RequestHeaderEnums.APP_CODE.getCode()));
|
||||
vo.setUserId(getUserId());
|
||||
// startPage();
|
||||
List<OrderListResVo> list = orderInfoService.queryList(vo);
|
||||
return getDataTable(list);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 导出订单基础信息列表
|
||||
|
Loading…
x
Reference in New Issue
Block a user