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

rk

4 天以前 8c4dfb07d551ceb372887ff8f22bd1f574d0347b

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/common/PublicCloudController.java

@@ -166,9 +166,7 @@
        }
        InputStream inputStream = HttpsUtil.connectionInputsteam(param.getUrl(),"GET",null,null);
        if(inputStream == null){
            if(StringUtils.isBlank(param.getUrl())){
                throw  new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"文件下载失败，请检查文件路径是否合法！");
            }
            throw  new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"文件下载失败，请检查文件路径是否合法！");
        }
        if(StringUtils.isBlank(param.getFileName())){
            param.setFileName(System.currentTimeMillis()+"");
@@ -234,6 +232,7 @@
                    String fileName = folder+"/"+fName;
                    boolean r = ftp.uploadInputstream(is,fileName);
                    if(r){
                        isFace = null;
                         if(Objects.nonNull(isFace) && Constants.equalsInteger(isFace,Constants.ZERO)){
                            //验证人脸评分
                            //人脸评分