Merge branch 'dev'

zhaoxiaohao

2020-11-17 b7265cdd6f3e1fbb0d428c27e5b5e29e34d56953

 kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-biz/src/main/java/com/kidgrow/filecenter/service/impl/AbstractIFileService.java

@@ -231,7 +231,7 @@
    @Override
    public ResultBody baseDownLoad(Map<String, Object> map) throws Exception {
        String urlDiZhi=MapUtils.getString(map,"url");
        if(!urlDiZhi.contains(DOMAIN)){
        if(!urlDiZhi.contains(DOMAIN)&&!urlDiZhi.contains(DOMAIN.replace("https","http"))){
            ByteArrayOutputStream outPut = new ByteArrayOutputStream();
            byte[] data = new byte[1024];
            try {
@@ -260,7 +260,7 @@
            List<FileInfo> fileInfos = baseMapper.selectByMap(map);
            if (fileInfos.size() > 0) {
                FileInfo fileInfo = fileInfos.get(0);
                OSSObject down = this.down(fileInfo.getUrl().replace(DOMAIN, ""));
                OSSObject down = this.down(fileInfo.getUrl().replace(DOMAIN, "").replace(DOMAIN.replace("https","http"),""));
                InputStream objectContent = down.getObjectContent();
                //返回Base64编码过的字节数组字符串
                byte[] data = null;