chenzihao/sac
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

配置及订单接口调整

Browse Source
This commit is contained in:
akun 2024-04-30 15:33:00 +08:00
parent 6a7eaa8229
commit 3ef81c28a4
4 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sf-admin/src/main/resources/application-druid.yml
View File

@ -6,9 +6,9 @@ spring:
druid: druid:
# 主库数据源 # 主库数据源
master: 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 username: root
password: abc&^321 password: 82^hsgGHbs^2
# 从库数据源 # 从库数据源
slave: slave:
# 从数据源开关/默认关闭 # 从数据源开关/默认关闭

7
sf-admin/src/main/resources/application.yml
View File

@ -70,9 +70,9 @@ spring:
# redis 配置 # redis 配置
redis: redis:
# 地址 # 地址
host: 192.168.1.23 host: 47.108.66.163
# 端口，默认为6379 # 端口，默认为6379
port: 22002 port: 6379
# 数据库索引 # 数据库索引
database: 0 database: 0
# 密码 # 密码
@ -132,8 +132,7 @@ xss:
file: file:
ceph: ceph:
#endpoint: http://127.0.0.1:9000 #endpoint: http://127.0.0.1:9000
upload: http://192.168.1.23:9000 endpoint: http://47.108.66.163:9000
endpoint: http://118.114.160.245
# 50M # 50M
defaultMaxSize: 52428800 defaultMaxSize: 52428800
access: access:

2
sf-file/src/main/java/com/sf/file/config/AmazonConfig.java
View File

@ -19,7 +19,7 @@ import lombok.extern.slf4j.Slf4j;
@Configuration @Configuration
@Slf4j @Slf4j
public class AmazonConfig { public class AmazonConfig {
@Value("${file.ceph.upload}") @Value("${file.ceph.endpoint}")
private String FILE_CEPH_POINT; private String FILE_CEPH_POINT;
@Value("${file.ceph.access.key}") @Value("${file.ceph.access.key}")

13
sf-order/src/main/java/com/sf/order/controller/OrderInfoController.java
View File

@ -43,6 +43,19 @@ public class OrderInfoController extends BaseController {
return getDataTable(list); 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);
}
/** /**
* 导出订单基础信息列表 * 导出订单基础信息列表