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

doum

3 天以前 48d06fac940e6f28d599eb7fbf05c2cce41ecb30

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/WebPublicController.java

@@ -132,6 +132,7 @@
//                    boolean r = ftp.uploadInputstream(compressImg(is),fileName);
                    boolean r = ftp.uploadInputstream(is,fileName);
                    if(r){
                        isFace = null;
                         if(Objects.nonNull(isFace) && Constants.equalsInteger(isFace,Constants.ZERO)){
                            //验证人脸评分
                            //人脸评分
@@ -266,6 +267,7 @@
                    String key = folder + tempFileName;// 文件名
                    ALiYunUtil obs = new ALiYunUtil(endpoint,access_id, access_key);
                    if (obs.uploadOnlineObject(file.getInputStream(),bucketName, key,null)) {
                        isFace = null;
                        // 移动成功,返回文件名
                         if(Objects.nonNull(isFace) && Constants.equalsInteger(isFace,Constants.ZERO)){
                            //验证人脸评分