Ver código fonte

优化业主小程序广告栏图片不显示,兼容FTP和OSS(配置时需加上 /)

shane 3 anos atrás
pai
commit
def58c1f57

+ 0 - 1
service-api/src/main/java/com/java110/api/listener/advert/ListAdvertPhotoListener.java

@@ -119,7 +119,6 @@ public class ListAdvertPhotoListener extends AbstractServiceApiListener {
     private void getAdvertItem(List<AdvertDto> advertDtos, JSONArray advertPhotoAndVideos) {
     private void getAdvertItem(List<AdvertDto> advertDtos, JSONArray advertPhotoAndVideos) {
         JSONObject photoAndVideo = null;
         JSONObject photoAndVideo = null;
         String imgUrl = MappingCache.getValue("IMG_PATH");
         String imgUrl = MappingCache.getValue("IMG_PATH");
-        imgUrl += (!StringUtil.isEmpty(imgUrl) && imgUrl.endsWith("/") ? "" : "/");
         for (AdvertDto advertDto : advertDtos) {
         for (AdvertDto advertDto : advertDtos) {
 
 
             AdvertItemDto advertItemDto = new AdvertItemDto();
             AdvertItemDto advertItemDto = new AdvertItemDto();

+ 0 - 1
service-api/src/main/java/com/java110/api/listener/ownerRepair/ListOwnerRepairsListener.java

@@ -166,7 +166,6 @@ public class ListOwnerRepairsListener extends AbstractServiceApiListener {
         List<PhotoVo> afterPhotos = null;  //维修后图片
         List<PhotoVo> afterPhotos = null;  //维修后图片
         PhotoVo photoVo = null;
         PhotoVo photoVo = null;
         String imgUrl = MappingCache.getValue("IMG_PATH");
         String imgUrl = MappingCache.getValue("IMG_PATH");
-        imgUrl += (!StringUtil.isEmpty(imgUrl) && imgUrl.endsWith("/") ? "" : "/");
         for (RepairDto repairDto : ownerRepairs) {
         for (RepairDto repairDto : ownerRepairs) {
             FileRelDto fileRelDto = new FileRelDto();
             FileRelDto fileRelDto = new FileRelDto();
             fileRelDto.setObjId(repairDto.getRepairId());
             fileRelDto.setObjId(repairDto.getRepairId());

+ 0 - 1
service-job/src/main/java/com/java110/job/adapt/Repair/MachineDistributeLeaflets.java

@@ -372,7 +372,6 @@ public class MachineDistributeLeaflets extends DatabusAdaptImpl {
         }
         }
 
 
         String imgUrl = MappingCache.getValue("IMG_PATH");
         String imgUrl = MappingCache.getValue("IMG_PATH");
-        imgUrl += (!StringUtil.isEmpty(imgUrl) && imgUrl.endsWith("/") ? "" : "/");
         FileRelDto fileRelDto = new FileRelDto();
         FileRelDto fileRelDto = new FileRelDto();
         fileRelDto.setObjId(paramIn.getString("repairId"));
         fileRelDto.setObjId(paramIn.getString("repairId"));
         List<FileRelDto> fileRelDtos = fileRelInnerServiceSMOImpl.queryFileRels(fileRelDto);
         List<FileRelDto> fileRelDtos = fileRelInnerServiceSMOImpl.queryFileRels(fileRelDto);

+ 0 - 1
service-job/src/main/java/com/java110/job/adapt/hcGov/inoutRecord/AddInoutRecordToHcGovAdapt.java

@@ -119,7 +119,6 @@ public class AddInoutRecordToHcGovAdapt extends DatabusAdaptImpl {
         List<FileRelDto> fileRelDtos = fileRelInnerServiceSMOImpl.queryFileRels(fileRelDto);
         List<FileRelDto> fileRelDtos = fileRelInnerServiceSMOImpl.queryFileRels(fileRelDto);
         String url = "";
         String url = "";
         String imgUrl = MappingCache.getValue("IMG_PATH");
         String imgUrl = MappingCache.getValue("IMG_PATH");
-        imgUrl += (!StringUtil.isEmpty(imgUrl) && imgUrl.endsWith("/") ? "" : "/");
         if (fileRelDtos != null && fileRelDtos.size() > 0) {
         if (fileRelDtos != null && fileRelDtos.size() > 0) {
             url = imgUrl + fileRelDtos.get(0).getFileRealName();
             url = imgUrl + fileRelDtos.get(0).getFileRealName();
         }
         }

+ 0 - 1
service-job/src/main/java/com/java110/job/adapt/hcToTianchuang/PersonToTianchuangAdapt.java

@@ -221,7 +221,6 @@ public class PersonToTianchuangAdapt extends DatabusAdaptImpl {
         List<FileRelDto> fileRelDtos = fileRelInnerServiceSMOImpl.queryFileRels(fileRelDto);
         List<FileRelDto> fileRelDtos = fileRelInnerServiceSMOImpl.queryFileRels(fileRelDto);
         String url = "";
         String url = "";
         String imgUrl = MappingCache.getValue("IMG_PATH");
         String imgUrl = MappingCache.getValue("IMG_PATH");
-        imgUrl += (!StringUtil.isEmpty(imgUrl) && imgUrl.endsWith("/") ? "" : "/");
         if (fileRelDtos != null && fileRelDtos.size() > 0) {
         if (fileRelDtos != null && fileRelDtos.size() > 0) {
             url = imgUrl + fileRelDtos.get(0).getFileRealName();
             url = imgUrl + fileRelDtos.get(0).getFileRealName();
         }
         }

+ 0 - 1
service-oa/src/main/java/com/java110/oa/bmo/oaWorkflowForm/impl/GetOaWorkflowFormBMOImpl.java

@@ -141,7 +141,6 @@ public class GetOaWorkflowFormBMOImpl implements IGetOaWorkflowFormBMO {
             return;
             return;
         }
         }
         String imgUrl = MappingCache.getValue("IMG_PATH");
         String imgUrl = MappingCache.getValue("IMG_PATH");
-        imgUrl += (!StringUtil.isEmpty(imgUrl) && imgUrl.endsWith("/") ? "" : "/");
         for(WorkflowDataFileDto tmpWorkflowDataFileDto: workflowDataFileDtos){
         for(WorkflowDataFileDto tmpWorkflowDataFileDto: workflowDataFileDtos){
             tmpWorkflowDataFileDto.setRealFileName(imgUrl + tmpWorkflowDataFileDto.getRealFileName());
             tmpWorkflowDataFileDto.setRealFileName(imgUrl + tmpWorkflowDataFileDto.getRealFileName());
         }
         }

+ 0 - 1
service-store/src/main/java/com/java110/store/bmo/storeAds/impl/GetStoreAdsBMOImpl.java

@@ -46,7 +46,6 @@ public class GetStoreAdsBMOImpl implements IGetStoreAdsBMO {
 
 
     private void freshAdsUrl(List<StoreAdsDto> storeAdsDtos) {
     private void freshAdsUrl(List<StoreAdsDto> storeAdsDtos) {
         String imgUrl = MappingCache.getValue("IMG_PATH");
         String imgUrl = MappingCache.getValue("IMG_PATH");
-        imgUrl += (!StringUtil.isEmpty(imgUrl) && imgUrl.endsWith("/") ? "" : "/");
         for (StoreAdsDto tmpStoreAdsDto : storeAdsDtos) {
         for (StoreAdsDto tmpStoreAdsDto : storeAdsDtos) {
             tmpStoreAdsDto.setUrl(imgUrl + tmpStoreAdsDto.getUrl());
             tmpStoreAdsDto.setUrl(imgUrl + tmpStoreAdsDto.getUrl());
         }
         }

+ 1 - 0
service-user/src/main/java/com/java110/user/cmd/owner/EditOwnerCmd.java

@@ -205,6 +205,7 @@ public class EditOwnerCmd extends AbstractServiceCmdListener {
         }
         }
         OwnerAppUserDto ownerAppUserDto = new OwnerAppUserDto();
         OwnerAppUserDto ownerAppUserDto = new OwnerAppUserDto();
         ownerAppUserDto.setMemberId(paramInJson.getString("ownerId"));
         ownerAppUserDto.setMemberId(paramInJson.getString("ownerId"));
+
         //查询app用户表
         //查询app用户表
         List<OwnerAppUserDto> ownerAppUserDtos = ownerAppUserInnerServiceSMOImpl.queryOwnerAppUsers(ownerAppUserDto);
         List<OwnerAppUserDto> ownerAppUserDtos = ownerAppUserInnerServiceSMOImpl.queryOwnerAppUsers(ownerAppUserDto);
         if (ownerAppUserDtos != null && ownerAppUserDtos.size() > 0) {
         if (ownerAppUserDtos != null && ownerAppUserDtos.size() > 0) {