Merge branch 'branch-nt-2022-12-27' of https://git.flowbb.cn/RK-Dev/fqgz-server into branch-nt-2022-12-27

eladmin-system/src/main/java/me/zhengjie/base/util/BaiduServiceUtil.java

@@ -4,15 +4,13 @@ package me.zhengjie.base.util;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import me.zhengjie.base.ResultCode;
+import me.zhengjie.base.util.baidu.Base64Util;
+import me.zhengjie.base.util.baidu.FileUtil;
 import me.zhengjie.base.util.baidu.HttpUtil;
-import me.zhengjie.base.util.tencent.utils.Img2Base64Util;
-import me.zhengjie.base.util.tencent.utils.ggg;
 import me.zhengjie.utils.StringUtils;
 
 import java.io.*;
 import java.net.URLEncoder;
-import java.util.Base64;
 
 public class BaiduServiceUtil {
 
@@ -32,10 +30,13 @@ public class BaiduServiceUtil {
             String result = HttpUtil.post(URL, ACCESS_TOKEN, param);
             System.out.println("result" + result);
             JSONObject jsonObj = JSON.parseObject(result);
-            System.out.println(jsonObj.toString());
             JSONArray wordArray = jsonObj.getJSONArray("words_result");
-            JSONObject wordsResult = wordArray.getJSONObject(0);
-            return wordsResult.getString("words");
+            String name = "";
+            for (int i = 0; i < wordArray.size(); i++) {
+                JSONObject wordsResult = wordArray.getJSONObject(i);
+                name += wordsResult.getString("words");
+            }
+            return name;
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -45,7 +46,12 @@ public class BaiduServiceUtil {
 
 
     public static void main(String[] args) throws IOException {
-        //String filePath = "D:\\repository\\fqhz-server-nt-2022-12-27\\fqgz-server\\eladmin-system\\src\\main\\resources\\gld.png";
-        System.out.println("=====================");
+        String filePath = "D:\\repository\\fqhz-server-nt-2022-12-27\\fqgz-server\\eladmin-system\\src\\main\\resources\\gld.png";
+        byte[] bytes = FileUtil.readFileByBytes(filePath);
+        String img = Base64Util.encode(bytes);
+        String imgParam = URLEncoder.encode(img, "UTF-8");
+        System.out.println("base64=====================" + imgParam);
+        String handwritingText = BaiduServiceUtil.getHandwritingText(imgParam);
+        System.out.println("=====================" + handwritingText);
     }
 }