From ee36909fc3748fd2079e1b7feb1c0c5d7e41d381 Mon Sep 17 00:00:00 2001
From: sunchenliang <2532527871@qq.com>
Date: Sun, 17 Mar 2024 19:04:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=BE=E7=89=87=E7=9B=B8?=
 =?UTF-8?q?=E4=BC=BC=E5=BA=A6=E6=A3=80=E6=B5=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xiaoyao/ocr/service/impl/OcrPictureServiceImpl.java    | 7 +++++--
 .../main/java/cn/jyjz/xiaoyao/ocr/util/ImageClassUtil.java | 6 ++++--
 runstart/src/main/resources/application-dev.yml            | 2 ++
 runstart/src/main/resources/application-pro.yml            | 3 ++-
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPictureServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPictureServiceImpl.java
index dad4b615..116af2b7 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPictureServiceImpl.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPictureServiceImpl.java
@@ -54,6 +54,9 @@ public class OcrPictureServiceImpl extends BaseServiceImpl<OcrPictureMybatisDao,
 
     @Value("${ocr.api.wly.localImagePath}")
     private String localImagePath;
+
+    @Value("${image.similarityPath}")
+    private String similarityPath;
     @Resource
     private OcrPictureMybatisDao ocrpicturemybatisdao;
 
@@ -152,7 +155,7 @@ public class OcrPictureServiceImpl extends BaseServiceImpl<OcrPictureMybatisDao,
 
                     JSONObject jsonObjectSimi = ImageClassUtil.getSimilarity(ocrPicture.getImgurl(),
                             ocrPictureNext.getImgurl(),
-                            null);
+                            similarityPath);
                     System.out.println("responseDataXs--code = [" + jsonObjectSimi.get("code") + "]");
                     System.out.println("responseDataXs--similarity = [" + jsonObjectSimi.get("similarity") + "]");
 
@@ -319,7 +322,7 @@ public class OcrPictureServiceImpl extends BaseServiceImpl<OcrPictureMybatisDao,
                     logService.addLog(103, "AI获取图片相似度接口", sysUser, "sendParams");
                     JSONObject jsonObjectSimi = ImageClassUtil.getSimilarity(StringUtils.isBlank(ocrPicture.getLocalpictrueurl()) ? ocrPicture.getImgurl() : ocrPicture.getLocalpictrueurl(),
                             StringUtils.isBlank(ocrPictureNext.getLocalpictrueurl()) ? ocrPictureNext.getImgurl() : ocrPictureNext.getLocalpictrueurl(),
-                            null);
+                            similarityPath);
                     System.out.println("responseDataXs--code = [" + jsonObjectSimi.get("code") + "]");
                     System.out.println("responseDataXs--similarity = [" + jsonObjectSimi.get("similarity") + "]");
                     String resultValue = "";
diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/util/ImageClassUtil.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/util/ImageClassUtil.java
index ef9c9f0c..61fde268 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/util/ImageClassUtil.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/util/ImageClassUtil.java
@@ -9,9 +9,11 @@ import com.alibaba.fastjson.JSONObject;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
 
 public class ImageClassUtil {
     private static Logger logger = LoggerFactory.getLogger(ImageClassUtil.class);
+
     /**
      * 相似度检查
      * 接口文档
@@ -22,7 +24,7 @@ public class ImageClassUtil {
      */
     public static JSONObject getSimilarity(String imgurl,String baseurl,String serverurl){
         if(StringUtils.isBlank(serverurl)){
-            serverurl = "http://47.93.3.37/api/similarity/";
+            serverurl = "http://47.93.59.251/ai/api/classify/";
         }
 
         JSONObject jsonObjectXs = new JSONObject();
@@ -53,7 +55,7 @@ public class ImageClassUtil {
      */
     public static JSONObject getClassify(String imgurl,String taskId,String serverurl){
         if(StringUtils.isBlank(serverurl)){
-            serverurl = "http://47.93.3.37/api/classify/";
+            serverurl = "http://47.93.59.251/ai/api/classify/";
         }
     
         //类型检查
diff --git a/runstart/src/main/resources/application-dev.yml b/runstart/src/main/resources/application-dev.yml
index be927527..3d0a9a1e 100644
--- a/runstart/src/main/resources/application-dev.yml
+++ b/runstart/src/main/resources/application-dev.yml
@@ -282,3 +282,5 @@ ocr:
       connectTimeout: 5000 #请求超时时间 毫秒
       readTimeout: 60000 #接收超时时间 毫秒
       localImagePath: /server/data/images #图片本地存储地址
+image:
+  similarityPath: http://127.0.0.1:8000/api/classify/
\ No newline at end of file
diff --git a/runstart/src/main/resources/application-pro.yml b/runstart/src/main/resources/application-pro.yml
index 3dd19518..6503a177 100644
--- a/runstart/src/main/resources/application-pro.yml
+++ b/runstart/src/main/resources/application-pro.yml
@@ -286,4 +286,5 @@ ocr:
       connectTimeout: 5000 #请求超时时间 毫秒
       readTimeout: 60000 #接收超时时间 毫秒
       localImagePath: /server/data/images #图片本地存储地址
-
+image:
+  similarityPath: http://127.0.0.1:8000/api/classify/
\ No newline at end of file