aidlab/aida_back
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

slogan 恢复

Browse Source
This commit is contained in:
xupei
2024-06-17 11:21:54 +08:00
parent 5e1ff16052
commit 8ff8a7480f
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/ai/da/python/PythonService.java
View File

@@ -67,6 +67,8 @@ public class PythonService {
private String fastApiPythonAddress; private String fastApiPythonAddress;
@Value("${minio.bucketName.gradient}") @Value("${minio.bucketName.gradient}")
private String gradientBucketName; private String gradientBucketName;
@Value("${access.python.generate_sr_port}")
private String srServicePort;
@Resource @Resource
private PythonTAllInfoService pythonTAllInfoService; private PythonTAllInfoService pythonTAllInfoService;
@@ -3222,7 +3224,7 @@ public class PythonService {
String jsonString = JSON.toJSONString(content, SerializerFeature.WriteNullStringAsEmpty); String jsonString = JSON.toJSONString(content, SerializerFeature.WriteNullStringAsEmpty);
RequestBody body = RequestBody.create(mediaType, jsonString); RequestBody body = RequestBody.create(mediaType, jsonString);
Request request = new Request.Builder() Request request = new Request.Builder()
.url(fastApiPythonAddress + "/api/super_resolution") .url(accessPythonIp + srServicePort + "/api/super_resolution")
.method("POST", body) .method("POST", body)
.addHeader("Content-Type", "application/json") .addHeader("Content-Type", "application/json")
.build(); .build();

6
src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java
View File

@@ -88,6 +88,10 @@ public class GenerateServiceImpl extends ServiceImpl<GenerateMapper, Generate> i
@Value("${redis.key.toProductImageResultKey}") @Value("${redis.key.toProductImageResultKey}")
private String toProductImageResultKey; private String toProductImageResultKey;
@Value("${access.python.generate_sr_port}")
private String generateServicePort;
@Override @Override
public GenerateCaptionVO generateCaption(Long sketchElementId) { public GenerateCaptionVO generateCaption(Long sketchElementId) {
CollectionElement collectionElement = collectionElementMapper.selectById(sketchElementId); CollectionElement collectionElement = collectionElementMapper.selectById(sketchElementId);
@@ -143,7 +147,7 @@ public class GenerateServiceImpl extends ServiceImpl<GenerateMapper, Generate> i
String category = generateThroughImageTextDTO.getLevel1Type().equals(SKETCH_BOARD.getRealName()) ? "sketch" : String category = generateThroughImageTextDTO.getLevel1Type().equals(SKETCH_BOARD.getRealName()) ? "sketch" :
generateThroughImageTextDTO.getLevel1Type().equals(PRINT_BOARD.getRealName()) ? "print" : "moodboard"; generateThroughImageTextDTO.getLevel1Type().equals(PRINT_BOARD.getRealName()) ? "print" : "moodboard";
String path = CommonConstant.GENERATE_PATH; String path = CommonConstant.GENERATE_PATH;
String port = CommonConstant.PYTHON_PORT_9996; String port = generateServicePort;
String jsonString = ""; String jsonString = "";
HashMap<String, String> params = new HashMap<>(); HashMap<String, String> params = new HashMap<>();
// 3.1 确定不同类型的印花分别调哪个接口 // 3.1 确定不同类型的印花分别调哪个接口

2
src/main/resources/application-dev.properties
View File

@@ -44,7 +44,7 @@ spring.servlet.multipart.max-request-size= 10MB
#访问python服务的ip(对应环境) #访问python服务的ip(对应环境)
access.python.ip=http://18.167.251.121 access.python.ip=http://18.167.251.121
access.python.port=9992 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 access.python.address=http://18.167.251.121:9996
minio.endpoint=https://www.minio.aida.com.hk:9000 minio.endpoint=https://www.minio.aida.com.hk:9000