提交 b0ce735f 作者: bax

更改配置

上级 86137872
流水线 #6898 已通过 于阶段
in 3 分 9 秒
...@@ -21,7 +21,7 @@ variables: ...@@ -21,7 +21,7 @@ variables:
mvn_clean: mvn_clean:
stage: clean stage: clean
script: script:
- echo "理中..." - echo "理中..."
- mvn clean -B -Dmaven.test.skip=true --settings /usr/local/maven/conf/settings.xml - mvn clean -B -Dmaven.test.skip=true --settings /usr/local/maven/conf/settings.xml
docker_build_dev: docker_build_dev:
......
...@@ -74,7 +74,7 @@ public class CompanyInfoVO implements Serializable { ...@@ -74,7 +74,7 @@ public class CompanyInfoVO implements Serializable {
private String content; private String content;
@ApiModelProperty(value = "评分", example = "*****") @ApiModelProperty(value = "评分", example = "*****")
private Integer score; private Integer score;
@ApiModelProperty(value = "背景图", example = "http://pad-video-x.oss-cn-shenzhen.aliyuncs.com/file/3505c402-cbf9-41a5-9d6f-bdb350625bea.jpg") @ApiModelProperty(value = "背景图", example = "http://share-fly.oss-cn-hangzhou.aliyuncs.com/file/3505c402-cbf9-41a5-9d6f-bdb350625bea.jpg")
private String backImg; private String backImg;
@ApiModelProperty(value = "当前距离") @ApiModelProperty(value = "当前距离")
private Double distance; private Double distance;
......
...@@ -50,7 +50,7 @@ public class LeasePriceStockVO implements Serializable { ...@@ -50,7 +50,7 @@ public class LeasePriceStockVO implements Serializable {
@ApiModelProperty(value = "180天租金", example = "1") @ApiModelProperty(value = "180天租金", example = "1")
private BigDecimal maxDaysRental; private BigDecimal maxDaysRental;
@ApiModelProperty(value = "sku图片", example = "https://pad-video-x.oss-cn-shenzhen.aliyuncs.com/file/35bbd044-7cd7-4c85-ba27-69776e03dbb2.jpg") @ApiModelProperty(value = "sku图片", example = "https://share-fly.oss-cn-hangzhou.aliyuncs.com/file/35bbd044-7cd7-4c85-ba27-69776e03dbb2.jpg")
private String skuImage; private String skuImage;
@ApiModelProperty(value = "库存", example = "10") @ApiModelProperty(value = "库存", example = "10")
......
...@@ -36,7 +36,7 @@ public class LeaseOrderVO implements Serializable { ...@@ -36,7 +36,7 @@ public class LeaseOrderVO implements Serializable {
@ApiModelProperty( @ApiModelProperty(
value = "商品图片", value = "商品图片",
example = example =
"https://pad-video-x.oss-cn-shenzhen.aliyuncs.com/file/4edf7f84-1586-4f33-ad79-c37b9f31cbce.jpg") "https://share-fly.oss-cn-hangzhou.aliyuncs.com/file/4edf7f84-1586-4f33-ad79-c37b9f31cbce.jpg")
private String wareImg; private String wareImg;
@ApiModelProperty( @ApiModelProperty(
......
...@@ -30,7 +30,7 @@ public class PriceStockVO implements Serializable { ...@@ -30,7 +30,7 @@ public class PriceStockVO implements Serializable {
@ApiModelProperty(value = "销售价格", example = "1") @ApiModelProperty(value = "销售价格", example = "1")
private BigDecimal salePrice; private BigDecimal salePrice;
@ApiModelProperty(value = "sku图片", example = "https://pad-video-x.oss-cn-shenzhen.aliyuncs.com/file/35bbd044-7cd7-4c85-ba27-69776e03dbb2.jpg") @ApiModelProperty(value = "sku图片", example = "https://share-fly.oss-cn-hangzhou.aliyuncs.com/file/35bbd044-7cd7-4c85-ba27-69776e03dbb2.jpg")
private String skuImage; private String skuImage;
@ApiModelProperty(value = "渠道价格", example = "1") @ApiModelProperty(value = "渠道价格", example = "1")
......
...@@ -1967,7 +1967,7 @@ public class MallOrderServiceImpl implements MallOrderService { ...@@ -1967,7 +1967,7 @@ public class MallOrderServiceImpl implements MallOrderService {
} }
List<OrderExportDTO> orderExportList = listOrderBasicInfo(orderIds); List<OrderExportDTO> orderExportList = listOrderBasicInfo(orderIds);
//确定写出文件的位置 //确定写出文件的位置
InputStream inputStreamFromUrl = ExcelTool.getInputStreamFromUrl("https://pad-video-x.oss-cn-shenzhen.aliyuncs.com/morder/%E5%AF%BC%E5%87%BA%E8%AE%A2%E5%8D%95%E6%A8%A1%E6%9D%BF%E4%BF%AE%E6%94%B9.xlsx"); InputStream inputStreamFromUrl = ExcelTool.getInputStreamFromUrl("https://share-fly.oss-cn-hangzhou.aliyuncs.com/morder/%E5%AF%BC%E5%87%BA%E8%AE%A2%E5%8D%95%E6%A8%A1%E6%9D%BF%E4%BF%AE%E6%94%B9.xlsx");
inputStreamFromUrl = new BufferedInputStream(inputStreamFromUrl); inputStreamFromUrl = new BufferedInputStream(inputStreamFromUrl);
// 获取订单下单账号的信息 // 获取订单下单账号的信息
String[] orderCodes = orderExportList.stream().map(OrderExportDTO::getOrderCode).toArray(String[]::new); String[] orderCodes = orderExportList.stream().map(OrderExportDTO::getOrderCode).toArray(String[]::new);
......
...@@ -33,9 +33,9 @@ springfox: ...@@ -33,9 +33,9 @@ springfox:
aliyun: aliyun:
oss: oss:
endpoint: oss-cn-shenzhen.aliyuncs.com endpoint: oss-cn-shenzhen.aliyuncs.com
access-key-id: LTAI4FzCpyrA33PegnxWS6XV access-key-id: LTAI5tK6UG2LzMkf1FKZBkBU
access-key-secret: ${OSS_ACCESS_KEY_SECRET} access-key-secret: ${OSS_ACCESS_KEY_SECRET}
bucket: pad-video-x bucket: share-fly
mmcflying: mmcflying:
download: download:
......
...@@ -24,10 +24,10 @@ springfox: ...@@ -24,10 +24,10 @@ springfox:
aliyun: aliyun:
oss: oss:
endpoint: oss-cn-shenzhen.aliyuncs.com endpoint: oss-cn-hangzhou.aliyuncs.com
access-key-id: LTAI4FzCpyrA33PegnxWS6XV access-key-id: LTAI5tK6UG2LzMkf1FKZBkBU
access-key-secret: ILuNh3zJfRjg3iARSipMWBKCjglz3u access-key-secret: UrXws5uVH6JMf0jCwipjOug4nHQvAz
bucket: pad-video-x bucket: share-fly
mmcflying: mmcflying:
download: download:
......
...@@ -33,9 +33,9 @@ springfox: ...@@ -33,9 +33,9 @@ springfox:
aliyun: aliyun:
oss: oss:
endpoint: oss-cn-shenzhen.aliyuncs.com endpoint: oss-cn-shenzhen.aliyuncs.com
access-key-id: LTAI4FzCpyrA33PegnxWS6XV access-key-id: LTAI5tK6UG2LzMkf1FKZBkBU
access-key-secret: ${OSS_ACCESS_KEY_SECRET} access-key-secret: ${OSS_ACCESS_KEY_SECRET}
bucket: pad-video-x bucket: share-fly
mmcflying: mmcflying:
download: download:
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论