diff --git a/jsowell-admin/src/main/resources/application-dev.yml b/jsowell-admin/src/main/resources/application-dev.yml index 7b9372a13..9e1bf715f 100644 --- a/jsowell-admin/src/main/resources/application-dev.yml +++ b/jsowell-admin/src/main/resources/application-dev.yml @@ -106,7 +106,7 @@ minio: aliyunoss: # 地域节点 - endpoint: oss-cn-shanghai.aliyuncs.com + endpoint: http://oss-cn-shanghai.aliyuncs.com # AccessKey accessKeyId: LTAI5tBgCN4xuxQF1HV9rf7t # AccessKey 秘钥 diff --git a/jsowell-admin/src/main/resources/application-prd.yml b/jsowell-admin/src/main/resources/application-prd.yml index b1f4a584c..01a297b48 100644 --- a/jsowell-admin/src/main/resources/application-prd.yml +++ b/jsowell-admin/src/main/resources/application-prd.yml @@ -108,7 +108,7 @@ minio: aliyunoss: # 地域节点 - endpoint: oss-cn-shanghai.aliyuncs.com + endpoint: http://oss-cn-shanghai.aliyuncs.com # AccessKey accessKeyId: LTAI5tBgCN4xuxQF1HV9rf7t # AccessKey 秘钥 diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java index d3d8227da..92850c7ac 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java @@ -129,6 +129,10 @@ public class PileStationInfoServiceImpl implements IPileStationInfoService { // vo.setOrganizationCode(pileStationInfo.getor); vo.setPublicFlag(pileStationInfo.getPublicFlag()); vo.setOpenFlag(pileStationInfo.getOpenFlag()); + if (StringUtils.isNotBlank(pileStationInfo.getPictures())) { + vo.setPictures(pileStationInfo.getPictures()); + vo.setPictureList(Lists.newArrayList(pileStationInfo.getPictures().split(","))); + } } return vo; } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/PileStationVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/PileStationVO.java index 5459dfda1..7eb515ac7 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/PileStationVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/PileStationVO.java @@ -142,6 +142,8 @@ public class PileStationVO { */ private String pictures; + private List pictureList; + /** * 电费 */ diff --git a/jsowell-ui/src/components/MapContainer/MapContainer.vue b/jsowell-ui/src/components/MapContainer/MapContainer.vue index 1b810f6f6..2c8a8100e 100644 --- a/jsowell-ui/src/components/MapContainer/MapContainer.vue +++ b/jsowell-ui/src/components/MapContainer/MapContainer.vue @@ -87,6 +87,7 @@ export default { handleSuccess(res, file) { this.imageUrl = URL.createObjectURL(file.raw); console.log("图片上传成功 url:", this.imageUrl); + console.log("图片上传成功 res:", res); }, handleRemove(file, fileList) { console.log(file, fileList);