From 8ff8a7480fa7a2eacc5e17a83ca19f491dc0cbe6 Mon Sep 17 00:00:00 2001 From: xupei Date: Mon, 17 Jun 2024 11:21:54 +0800 Subject: [PATCH] =?UTF-8?q?slogan=20=E6=81=A2=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/ai/da/python/PythonService.java | 4 +++- .../java/com/ai/da/service/impl/GenerateServiceImpl.java | 6 +++++- src/main/resources/application-dev.properties | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/ai/da/python/PythonService.java b/src/main/java/com/ai/da/python/PythonService.java index 9ab7c05c..7eb77e1a 100644 --- a/src/main/java/com/ai/da/python/PythonService.java +++ b/src/main/java/com/ai/da/python/PythonService.java @@ -67,6 +67,8 @@ public class PythonService { private String fastApiPythonAddress; @Value("${minio.bucketName.gradient}") private String gradientBucketName; + @Value("${access.python.generate_sr_port}") + private String srServicePort; @Resource private PythonTAllInfoService pythonTAllInfoService; @@ -3222,7 +3224,7 @@ public class PythonService { String jsonString = JSON.toJSONString(content, SerializerFeature.WriteNullStringAsEmpty); RequestBody body = RequestBody.create(mediaType, jsonString); Request request = new Request.Builder() - .url(fastApiPythonAddress + "/api/super_resolution") + .url(accessPythonIp + srServicePort + "/api/super_resolution") .method("POST", body) .addHeader("Content-Type", "application/json") .build(); diff --git a/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java b/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java index fbbb9800..f937235f 100644 --- a/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java @@ -88,6 +88,10 @@ public class GenerateServiceImpl extends ServiceImpl i @Value("${redis.key.toProductImageResultKey}") private String toProductImageResultKey; + @Value("${access.python.generate_sr_port}") + private String generateServicePort; + + @Override public GenerateCaptionVO generateCaption(Long sketchElementId) { CollectionElement collectionElement = collectionElementMapper.selectById(sketchElementId); @@ -143,7 +147,7 @@ public class GenerateServiceImpl extends ServiceImpl i String category = generateThroughImageTextDTO.getLevel1Type().equals(SKETCH_BOARD.getRealName()) ? "sketch" : generateThroughImageTextDTO.getLevel1Type().equals(PRINT_BOARD.getRealName()) ? "print" : "moodboard"; String path = CommonConstant.GENERATE_PATH; - String port = CommonConstant.PYTHON_PORT_9996; + String port = generateServicePort; String jsonString = ""; HashMap params = new HashMap<>(); // 3.1 确定不同类型的印花分别调哪个接口 diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index 70ba01a1..f6224ea9 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -44,7 +44,7 @@ spring.servlet.multipart.max-request-size= 10MB #访问python服务的ip(对应环境) access.python.ip=http://18.167.251.121 access.python.port=9992 -access.python.sr=http://18.167.251.121:9994 +access.python.generate_sr_port=9994 access.python.address=http://18.167.251.121:9996 minio.endpoint=https://www.minio.aida.com.hk:9000