Merge remote-tracking branch 'origin/dev' into dev

bingbing

2020-10-27 1d5345f92dbd4aac2b5f68265921bb2529a71b8e

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

@@ -320,7 +320,7 @@
    }

    @Override
    public FileInfo byteUplaod(String fileName, InputStream inputStream,int size) {
    public FileInfo byteUplaod(String fileName, InputStream inputStream,int size) throws IOException {
        String houzhui=fileName.substring(fileName.lastIndexOf(".")+1);
        String newFileName= RandomValueUtils.uuid()+"."+houzhui;
        FileInfo newfileInfo=new FileInfo();
@@ -332,8 +332,9 @@
        newfileInfo.setSource("aliyun");
        newfileInfo.setImgType(houzhui);
        newfileInfo.setCreateTime(new Date());
        this.fileUpLoadOss(newfileInfo,OssPathEn+"pdf/"+newFileName,inputStream);
        this.fileUpLoadOss(newfileInfo,"pdf/"+newFileName,inputStream);
        baseMapper.insert(newfileInfo);
        inputStream.close();
        return newfileInfo;
    }