提交修改

api-mapper/src/main/java/com/heyu/api/data/config/RabbitConfig.java

@@ -10,14 +10,13 @@ import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 
 /**
  * @author wutao
  * @description mq配置
  * @date 2020-12-25
  */
-@Configuration
+// @Configuration
 @Slf4j
 public class RabbitConfig {
 

api-mapper/src/main/java/com/heyu/api/data/utils/Base64Utils.java

@@ -7,9 +7,7 @@ import lombok.extern.slf4j.Slf4j;
 
 import javax.imageio.ImageIO;
 import java.awt.image.BufferedImage;
-import java.io.ByteArrayInputStream;
+import java.io.*;
-import java.io.IOException;
-import java.io.InputStream;
 import java.net.URL;
 import java.util.Base64;
 
@@ -109,4 +107,26 @@ public class Base64Utils {
     }
 
 
+    public static String encodeImageToBase64(String imagePath) {
+        File file = new File(imagePath);
+        try (FileInputStream imageInFile = new FileInputStream(file)) {
+            byte[] imageData = new byte[(int) file.length()];
+            imageInFile.read(imageData);
+            return Base64.getEncoder().encodeToString(imageData);
+        } catch (IOException e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+
+    public static void main(String[] args) {
+        String imagePath = "/Users/quyixiao/Desktop/ocr/testxxx.jpg";
+        String base64Image = encodeImageToBase64(imagePath);
+        System.out.println("Base64 Image String:");
+        System.out.println(base64Image);
+    }
+
+
+
 }

api-third/src/main/java/com/heyu/api/baidu/BaiduBaseHandle.java

@@ -134,13 +134,17 @@ public abstract class BaiduBaseHandle<P, Result> {
     /**
      * 获取百度token
      *
+     *
+     *     ak: zs9oN4gSuoS3eK8dVJg6jyKh
+     *     sk: uHIRXkj6rbW1eXy8eRVCeP1e3cRQKXay
      * @return
      */
     public String getBaiduAccessToken() {
         try {
             RedisUtils redisUtils = SpringContextUtils.getBean(RedisUtils.class);
-            String baiduApiKey = SpringContextUtils.getProperty("baidu.api_key");
+
-            String baiduSecretKey = SpringContextUtils.getProperty("baidu.secret_key");
+            String baiduApiKey = "zs9oN4gSuoS3eK8dVJg6jyKh";
+            String baiduSecretKey = "uHIRXkj6rbW1eXy8eRVCeP1e3cRQKXay";
 
             String accessTokenKey = baiduApiKey + ":" + baiduSecretKey + ":token";
             String accessToken = redisUtils.get(accessTokenKey);

api-third/src/main/java/com/heyu/api/baidu/request/common/BDocAnalysisOfficeRequest.java

@@ -76,7 +76,7 @@ public class BDocAnalysisOfficeRequest extends BaiduOfdRequest {
     /**
      * 是否返回每行的四角点坐标。默认为false
      */
-    private String dispLinePoly;
+    private String dispLinePoly = "false";
 
 
     /**

api-web/api-interface/src/main/java/com/heyu/api/controller/ocr/GeneralBasicOcrController.java

@@ -36,10 +36,23 @@ public class GeneralBasicOcrController extends BaseController {
     private BGeneralBasicHandle bGeneralBasicHandle;
 
 
-    // http://localhost:8888/bank/card/3/verify?bankCard=6214855713516769&realName=瞿贻晓&idCardNumber=430529199209255030
+    // http://localhost:8888/general/text/orc/recognize?imageBase64=3232
     @EbAuthentication(tencent = ApiConstants.TENCENT_AUTH)
     @RequestMapping("/recognize")
-    public R recognize(GeneralBasicOcrRequest generalBasicOcrRequest) {
+    public R recognize(GeneralBasicOcrRequest generalBasicOcrRequest) throws Exception {
+
+
+        //读取文件内容到Stream流中，按行读取
+        //Stream<String> lines = Files.lines(Paths.get("/Users/quyixiao/gitb/eb-service-api/api-web/api-interface/src/main/resources/filebase64.txt"));
+
+
+        //String a = lines.collect(Collectors.joining());
+
+
+        //log.info("imagebase64:{}", a);
+        //generalBasicOcrRequest.setImageBase64(a);
+
+
         BGeneralBasicRequest bGeneralBasicRequest = new BGeneralBasicRequest();
 
         bGeneralBasicRequest.setImageBase64(generalBasicOcrRequest.getImageBase64());
@@ -52,13 +65,15 @@ public class GeneralBasicOcrController extends BaseController {
         ApiR<BGeneralBasicResp> aR = bGeneralBasicHandle.handle(bGeneralBasicRequest);
         List<String> list = new ArrayList<>();
 
-        if(aR.isSuccess()){
+        if (aR.isSuccess()) {
-            BGeneralBasicResp bGeneralBasicResp  = aR.getData();
+            BGeneralBasicResp bGeneralBasicResp = aR.getData();
-            if(CollectionUtils.isNotEmpty(bGeneralBasicResp.getWordsResult())){
+            if (CollectionUtils.isNotEmpty(bGeneralBasicResp.getWordsResult())) {
                 for (BGeneralBasicResp.WordsResultDTO wordsResultDTO : bGeneralBasicResp.getWordsResult()) {
                     list.add(wordsResultDTO.getWords());
                 }
+                return R.ok().setData(list);
             }
+
         }
         return R.ok();
 
@@ -66,5 +81,4 @@ public class GeneralBasicOcrController extends BaseController {
     }
 
 
-
 }

api-web/api-interface/src/main/java/com/heyu/api/controller/ocr/HighPrecisionOcrController.java

@@ -31,10 +31,23 @@ public class HighPrecisionOcrController {
     private BDocAnalysisOfficeHandle bDocAnalysisOfficeHandle;
 
 
-    // http://localhost:8888/bank/card/3/verify?bankCard=6214855713516769&realName=瞿贻晓&idCardNumber=430529199209255030
+    //  http://localhost:8888/high/precision/orc/recognize?imageBase64=3232
     @EbAuthentication(tencent = ApiConstants.TENCENT_AUTH)
     @RequestMapping("/recognize")
-    public R recognize(HighPrecisionOcrRequest generalBasicOcrRequest) {
+    public R recognize(HighPrecisionOcrRequest generalBasicOcrRequest) throws Exception {
+
+
+        // 读取文件内容到Stream流中，按行读取
+        //Stream<String> lines = Files.lines(Paths.get("/Users/quyixiao/gitb/eb-service-api/api-web/api-interface/src/main/resources/filebase64.txt"));
+
+
+        //String a = lines.collect(Collectors.joining());
+
+
+        //log.info("imagebase64:{}", a);
+        //generalBasicOcrRequest.setImageBase64(a);
+
+
 
         BDocAnalysisOfficeRequest bGeneralBasicRequest = new BDocAnalysisOfficeRequest();
         bGeneralBasicRequest.setImageBase64(generalBasicOcrRequest.getImageBase64());
@@ -81,6 +94,7 @@ public class HighPrecisionOcrController {
                     }
                 }
             }
+            return R.ok().setData(list);
         }
         return R.error("识别错误");
     }

api-web/api-interface/src/main/java/com/heyu/api/listener/PostCodeQueueSimpleRabbitListener.java

@@ -12,12 +12,11 @@ import org.springframework.amqp.support.AmqpHeaders;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.messaging.handler.annotation.Header;
 import org.springframework.messaging.handler.annotation.Payload;
-import org.springframework.stereotype.Component;
 
 import java.io.IOException;
 
 
-@Component
+// @Component
 @Slf4j
 public class PostCodeQueueSimpleRabbitListener {
 

api-web/api-interface/src/test/java/com/api/test/test2.java

@@ -0,0 +1,23 @@
+package com.api.test;
+
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+public class test2 {
+
+    public static void main(String[] args)  throws Exception{
+
+        // 读取文件内容到Stream流中，按行读取
+        Stream<String> lines = Files.lines(Paths.get("/Users/quyixiao/gitb/eb-service-api/api-web/api-interface/src/main/resources/filebase64.txt"));
+
+
+
+        String a = lines.collect(Collectors.joining());
+
+        System.out.println(a);
+    }
+
+
+}