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

@@ -8,6 +8,7 @@ import me.zhengjie.base.ResultCode;
 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;
@@ -22,15 +23,19 @@ public class BaiduServiceUtil {
 
     public static String getHandwritingText(String imgParam) {
         try {
-            String param = "image=" + imgParam;
+            String param = "";
+            if (StringUtils.startsWith(imgParam, "image=")) {
+                param = imgParam;
+            } else {
+                param = "image=" + imgParam;
+            }
             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);
-            String name = wordsResult.getString("words");
-            return name;
+            return wordsResult.getString("words");
         } catch (Exception e) {
             e.printStackTrace();
         }

eladmin-system/src/main/resources/config/application.yml

@@ -59,7 +59,7 @@ fqgz:
   bank:
     app:
       url-prefix: /api/bank-app
-    handwriting: baidu
+    handwriting: tencent
   user:
     app:
       url-prefix: /api/user-app