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

bingbing

2020-10-27 1d5345f92dbd4aac2b5f68265921bb2529a71b8e

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

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

@@ -6,6 +6,7 @@
import com.kidgrow.filecenter.model.FileInfo;
import org.springframework.web.multipart.MultipartFile;

import java.io.IOException;
import java.io.InputStream;
import java.util.Map;

@@ -43,7 +44,7 @@
     */
    ResultBody baseDownLoad(Map<String, Object> map) throws Exception;

    FileInfo byteUplaod(String fileName, InputStream inputStream, int size);
    FileInfo byteUplaod(String fileName, InputStream inputStream, int size) throws IOException;
    /**
     * 文件上传 根据fileType选择上传方式 hospitalId  departmentId
     * @param file

 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;
    }


 kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/controller/FileController.java

@@ -100,7 +100,7 @@
     * byte[]上传
     */
    @PostMapping(value="byteUplaod")
    public FileInfo byteUplaod(@RequestParam("fileName") String fileName,@RequestBody byte[] bytes){
    public FileInfo byteUplaod(@RequestParam("fileName") String fileName,@RequestBody byte[] bytes) throws IOException{
        if(bytes.length == 0){
            return null;
        }

 kidgrow-uaa/kidgrow-uaa-server/src/main/resources/application.yml

@@ -56,7 +56,7 @@
  security:
    code:
      # 忽略验证码的应用编号
      ignoreClientCode: app,hospital,webApp,readxapp
      ignoreClientCode: app,hospital,readxapp

encrypt:
  key-store: