回滚sysutil
This commit is contained in:
		
							parent
							
								
									d8e1e09c22
								
							
						
					
					
						commit
						8ea2c80f91
					
				| 
						 | 
				
			
			@ -44,35 +44,29 @@ public class SysUtil {
 | 
			
		|||
 | 
			
		||||
   public static String getCutFileUrl(String fileUrl) {
 | 
			
		||||
      log.info("出参_补图_原路径:{},前缀:{},存储桶:{}", new Object[]{fileUrl, getPrefix(), getBucket()});
 | 
			
		||||
      if (!CharSequenceUtil.isBlank(fileUrl) && !fileUrl.startsWith(getPrefix())) {
 | 
			
		||||
         return getPrefix() + "/" + fileUrl;
 | 
			
		||||
      } else {
 | 
			
		||||
         return fileUrl;
 | 
			
		||||
      String cutFileUrl = null;
 | 
			
		||||
      try {
 | 
			
		||||
         cutFileUrl = getCutFileUrl(fileUrl, getPrefix(), getBucket());
 | 
			
		||||
      } catch (Exception e) {
 | 
			
		||||
         log.error("获取存储桶图片地址失败, " + e.getMessage());
 | 
			
		||||
         cutFileUrl = fileUrl;
 | 
			
		||||
      }
 | 
			
		||||
//      String cutFileUrl = null;
 | 
			
		||||
//      try {
 | 
			
		||||
//         cutFileUrl = getCutFileUrl(fileUrl, getPrefix(), getBucket());
 | 
			
		||||
//      } catch (Exception e) {
 | 
			
		||||
//         log.error("获取存储桶图片地址失败, " + e.getMessage());
 | 
			
		||||
//         cutFileUrl = fileUrl;
 | 
			
		||||
//      }
 | 
			
		||||
//      log.info("出参_补图_补图后路径:{}", cutFileUrl);
 | 
			
		||||
//      return cutFileUrl;
 | 
			
		||||
      log.info("出参_补图_补图后路径:{}", cutFileUrl);
 | 
			
		||||
      return cutFileUrl;
 | 
			
		||||
   }
 | 
			
		||||
 | 
			
		||||
   public static String getCutPath(String fileUrl) {
 | 
			
		||||
      log.info("入参_裁图_原路径:{},前缀:{},存储桶:{}", new Object[]{fileUrl, getPrefix(), getBucket()});
 | 
			
		||||
      if (!CharSequenceUtil.isBlank(fileUrl) && !fileUrl.startsWith(getPrefix())) {
 | 
			
		||||
         return getPrefix() + "/" + fileUrl;
 | 
			
		||||
//         if (Boolean.FALSE.equals(getOssProperties().getUseToken())) {
 | 
			
		||||
//            return fileUrl.replace(getPrefix(), getBucket());
 | 
			
		||||
//         } else {
 | 
			
		||||
//            fileUrl = getUnEncodeUrl(fileUrl);
 | 
			
		||||
//            fileUrl = fileUrl.replace(getPrefix(), getBucket());
 | 
			
		||||
//            fileUrl = getCutSignUrl(fileUrl);
 | 
			
		||||
//            log.info("入参_裁图_裁剪后路径:{}", fileUrl);
 | 
			
		||||
//            return fileUrl;
 | 
			
		||||
//         }
 | 
			
		||||
      if (!CharSequenceUtil.isBlank(fileUrl) && !fileUrl.startsWith(getBucket())) {
 | 
			
		||||
         if (Boolean.FALSE.equals(getOssProperties().getUseToken())) {
 | 
			
		||||
            return fileUrl.replace(getPrefix(), getBucket());
 | 
			
		||||
         } else {
 | 
			
		||||
            fileUrl = getUnEncodeUrl(fileUrl);
 | 
			
		||||
            fileUrl = fileUrl.replace(getPrefix(), getBucket());
 | 
			
		||||
            fileUrl = getCutSignUrl(fileUrl);
 | 
			
		||||
            log.info("入参_裁图_裁剪后路径:{}", fileUrl);
 | 
			
		||||
            return fileUrl;
 | 
			
		||||
         }
 | 
			
		||||
      } else {
 | 
			
		||||
         return fileUrl;
 | 
			
		||||
      }
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -235,7 +235,7 @@ public class FaceRegisterServiceImpl implements FaceRegisterService {
 | 
			
		|||
         if ("1".equals(faceMetadataModel.getIfRainbowSoftFaceUrl())){
 | 
			
		||||
            System.out.println("开始采集虹软人脸");
 | 
			
		||||
            ArcFaceHelper arcFaceHelper = new ArcFaceHelper();
 | 
			
		||||
            FaceResult faceResult = arcFaceHelper.getFaceFeatures(registerParamDTO.getMinioPicPath());
 | 
			
		||||
            FaceResult faceResult = arcFaceHelper.getFaceFeatures("http://192.168.0.14:9090" + registerParamDTO.getMinioPicPath());
 | 
			
		||||
            System.err.println("采集结束");
 | 
			
		||||
            if (faceResult != null){
 | 
			
		||||
               MultiModelFaceVO faceVO = new MultiModelFaceVO();
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue