Commit 59d2bf12 authored by alex yao's avatar alex yao

fix

parent 85a60e5b
...@@ -59,7 +59,7 @@ public class OcrConsumerServiceImpl implements OcrConsumerService { ...@@ -59,7 +59,7 @@ public class OcrConsumerServiceImpl implements OcrConsumerService {
@Override @Override
@Consumer(topic = OCRTopic.PARSE_PDF) @Consumer(topic = OCRTopic.PARSE_PDF)
public void OCR(OCRMessage message) { public void OCR(OCRMessage message) {
OCRStatusMessage ocrStatusMessage = new OCRStatusMessage(); OCRStatusMessage ocrStatusMessage = new OCRStatusMessage();
ocrStatusMessage.setId(message.getId()); ocrStatusMessage.setId(message.getId());
ocrStatusMessage.setStatus("parsing"); ocrStatusMessage.setStatus("parsing");
...@@ -110,17 +110,18 @@ public class OcrConsumerServiceImpl implements OcrConsumerService { ...@@ -110,17 +110,18 @@ public class OcrConsumerServiceImpl implements OcrConsumerService {
private String createFileAndUploadBos(String content, String suffix) throws IOException { private String createFileAndUploadBos(String content, String suffix) throws IOException {
String fileName = UUIDTool.getUUID(); String fileName = UUIDTool.getUUID();
File tempFile = File.createTempFile(fileName, suffix); File tempFile = File.createTempFile(fileName, suffix);
FileOutputStream fileOutputStream = new FileOutputStream(tempFile); FileOutputStream fileOutputStream = new FileOutputStream(tempFile);
fileOutputStream.write(content.getBytes()); fileOutputStream.write(content.getBytes());
fileOutputStream.flush(); fileOutputStream.flush();
fileOutputStream.close();
BufferedInputStream inputStream = FileUtil.getInputStream(tempFile); BufferedInputStream inputStream = FileUtil.getInputStream(tempFile);
byte[] bytes = new byte[inputStream.available()]; byte[] bytes = new byte[inputStream.available()];
inputStream.read(bytes); inputStream.read(bytes);
String md5 = MD5.create().digestHex(bytes); String md5 = MD5.create().digestHex(bytes);
String upload = bosConfigService.upload(inputStream, suffix, null); String upload = bosConfigService.uploadFileByByteArray2Oss(bytes, fileName, suffix);
BizFileUploadRecordModel bizFileUploadRecordModel = new BizFileUploadRecordModel(); BizFileUploadRecordModel bizFileUploadRecordModel = new BizFileUploadRecordModel();
bizFileUploadRecordModel.setFileName(fileName); bizFileUploadRecordModel.setFileName(fileName);
...@@ -129,10 +130,6 @@ public class OcrConsumerServiceImpl implements OcrConsumerService { ...@@ -129,10 +130,6 @@ public class OcrConsumerServiceImpl implements OcrConsumerService {
bizFileUploadRecordModel.setCoverSheetUrl(""); bizFileUploadRecordModel.setCoverSheetUrl("");
bizFileUploadRecordService.save(bizFileUploadRecordModel); bizFileUploadRecordService.save(bizFileUploadRecordModel);
fileOutputStream.close();
inputStream.close();
tempFile.delete();
return upload; return upload;
} }
......
package cn.com.poc.utils; package cn.com.poc.utils;
import cn.com.poc.common.service.BosConfigService;
import cn.com.poc.common.utils.DocumentLoad; import cn.com.poc.common.utils.DocumentLoad;
import cn.com.poc.common.utils.FileUtils; import cn.com.poc.common.utils.FileUtils;
import cn.com.poc.common.utils.UUIDTool;
import cn.com.yict.framemax.core.spring.SingleContextInitializer; import cn.com.yict.framemax.core.spring.SingleContextInitializer;
import cn.hutool.core.io.FileUtil;
import cn.hutool.crypto.digest.MD5;
import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.text.PDFTextStripper; import org.apache.pdfbox.text.PDFTextStripper;
import org.junit.Test; import org.junit.Test;
...@@ -11,6 +15,7 @@ import org.springframework.test.context.ContextConfiguration; ...@@ -11,6 +15,7 @@ import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.test.context.web.WebAppConfiguration; import org.springframework.test.context.web.WebAppConfiguration;
import javax.annotation.Resource;
import java.io.*; import java.io.*;
/** /**
...@@ -21,11 +26,31 @@ import java.io.*; ...@@ -21,11 +26,31 @@ import java.io.*;
@ContextConfiguration(initializers = SingleContextInitializer.class) @ContextConfiguration(initializers = SingleContextInitializer.class)
@WebAppConfiguration @WebAppConfiguration
public class FileUtilsTest { public class FileUtilsTest {
@Resource
private BosConfigService bosConfigService;
@Test @Test
public void test_wordConvertPDF() throws Exception { public void test_wordConvertPDF() throws Exception {
String content = "hello world";
String suffix = "txt";
String fileName = UUIDTool.getUUID();
File tempFile = File.createTempFile(fileName, suffix);
FileOutputStream fileOutputStream = new FileOutputStream(tempFile);
fileOutputStream.write(content.getBytes());
fileOutputStream.flush();
fileOutputStream.close();
BufferedInputStream inputStream = FileUtil.getInputStream(tempFile);
byte[] bytes = new byte[inputStream.available()];
inputStream.read(bytes);
String md5 = MD5.create().digestHex(bytes);
String upload = bosConfigService.uploadFileByByteArray2Oss(bytes, fileName, suffix);
System.out.println(md5);
System.out.println(upload);
tempFile.delete();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment