java/zhihuishenqu.git

			@@ -77,6 +77,8 @@
			private int port;
			@Value("${ftp.url}")
			private String url;
			@Value("${minio.url}")
			private String minUrl;
			@Resource
			private WxMaConfiguration wxMaConfiguration;
			@Resource
			@@ -168,9 +170,11 @@
			String extension = FilenameUtils.getExtension(file.getOriginalFilename());
			String uuid=UUID.randomUUID().toString().replaceAll("-", "");
			String name = uuid + "."+ extension;
			String imageUrl = minioUtil.upload(file, name);
			Thumbnails.of(file.getInputStream()).scale(1).outputQuality(0.01).outputFormat("jpg").toFile(FtpConstants.FTPFILEPATH_IDCARD+uuid+"-compress");
			return R.ok(url + "/idcard/" + uuid+"-compress.jpg");
			minioUtil.upload(file, name);
			Thumbnails.of(file.getInputStream()).scale(0.3).outputQuality(0.51).outputFormat("jpg").toFile(uuid+"_compress");
			File file1=new File(uuid+"_compress.jpg");
			String imageUrl = minioUtil.uploadFile(file1, uuid+"_compress.jpg");
			return R.ok(imageUrl);
			} catch (Exception e) {
			log.error("上传照片失败【{}】", e.getMessage());
			return R.fail();

			@@ -47,7 +47,7 @@
			userData.add(" ");
			}
			//判断是文字描述直接跳过
			if (userAnswers.getOptionType().equals(5) \|\| userAnswers.getOptionType().equals(11)
			if (userAnswers.getOptionType().equals(5)
			\|\| (StringUtils.isNotEmpty(userAnswers.getAnswerContent()) && userAnswers.getAnswerContent().contains(noExport))) {
			continue;
			}
			@@ -94,7 +94,19 @@
			if(userAnswers.getOptionType().equals(11)){
			reserveSubId = userAnswers.getReserveSubId();
			try {
			userData.add(new URL(userAnswers.getAnswerContent()));
			if(StringUtils.isNotEmpty(userAnswers.getAnswerContent())){
			if(userAnswers.getAnswerContent().contains("_compress")){
			userData.add(new URL(userAnswers.getAnswerContent()));
			}
			else {
			userData.add(new URL(userAnswers.getAnswerContent().substring(0,userAnswers.getAnswerContent().lastIndexOf("."))+"_compress.jpg"));
			log.info(userAnswers.getAnswerContent().substring(0,userAnswers.getAnswerContent().lastIndexOf("."))+"_compress.jpg");
			}
			//userData.add(new File("/workspace/minio/data/files/"+userAnswers.getAnswerContent().substring(userAnswers.getAnswerContent().indexOf("files/")+6)));
			}
			else {
			userData.add(" ");
			}
			}catch (Exception e){
			userData.add(" ");
			log.error("导出转换图片失败！");
			@@ -138,7 +150,19 @@
			if(userAnswers.getOptionType().equals(11)){
			reserveSubId = userAnswers.getReserveSubId();
			try {
			userData.add(new URL(userAnswers.getAnswerContent()));
			if(StringUtils.isNotEmpty(userAnswers.getAnswerContent())){
			if(userAnswers.getAnswerContent().contains("_compress")){
			userData.add(new URL(userAnswers.getAnswerContent()));
			log.info(userAnswers.getAnswerContent().substring(0,userAnswers.getAnswerContent().lastIndexOf("."))+"_compress.jpg");
			}
			else {
			userData.add(new URL(userAnswers.getAnswerContent().substring(0,userAnswers.getAnswerContent().lastIndexOf("."))+"_compress.jpg"));
			}
			//userData.add(new File("/workspace/minio/data/files/"+userAnswers.getAnswerContent().substring(userAnswers.getAnswerContent().indexOf("files/")+6)));
			}
			else {
			userData.add(" ");
			}
			}catch (Exception e){
			userData.add(" ");
			log.error("导出转换图片失败！");

	springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/AssemblyUtils.java	30 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史