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

Merge remote-tracking branch 'origin/dev/dev' into dev/dev

Browse Source
This commit is contained in:
shahaibo
2024-06-25 10:57:22 +08:00
parent 5b3a668ce7 57ab6c64ef
commit ba4388b87d
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3326,7 +3326,8 @@ public class PythonService {
RequestBody body = RequestBody.create(mediaType, param); RequestBody body = RequestBody.create(mediaType, param);
Request request = new Request.Builder() Request request = new Request.Builder()
// .url(accessPythonIp + ":" + accessPythonPort + "/api/generate_product_image") // .url(accessPythonIp + ":" + accessPythonPort + "/api/generate_product_image")
.url(accessPythonIp + ":9996/api/generate_product_image") // .url(accessPythonIp + ":9996/api/generate_product_image")
.url(accessPythonIp + ":9994/api/generate_product_image")
.method("POST", body) .method("POST", body)
.addHeader("Authorization", "Basic YWlkbGFiOjEyMw==") .addHeader("Authorization", "Basic YWlkbGFiOjEyMw==")
.addHeader("Content-Type", "application/json") .addHeader("Content-Type", "application/json")

3
src/main/java/com/ai/da/service/impl/ChatRobotServiceImpl.java
View File

@@ -152,7 +152,8 @@ public class ChatRobotServiceImpl implements ChatRobotService {
RequestBody body = RequestBody.create(mediaType, param); RequestBody body = RequestBody.create(mediaType, param);
Request request = new Request.Builder() Request request = new Request.Builder()
// .url("http://127.0.0.1:5000/api/chat_stream_test") // .url("http://127.0.0.1:5000/api/chat_stream_test")
.url(accessPythonIp + ":" + accessPythonPort + "/api/chat_stream_test") // .url(accessPythonIp + ":" + accessPythonPort + "/api/chat_stream_test")
.url(accessPythonIp + ":" + accessPythonPort + "/api/chat_robot")
// .url(fastApiPythonAddress + "/api/chat_robot") // .url(fastApiPythonAddress + "/api/chat_robot")
// .url(accessPythonIp + ":10200/aifda/api/v1.0/generate") // .url(accessPythonIp + ":10200/aifda/api/v1.0/generate")
.method("POST", body) .method("POST", body)

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

@@ -43,7 +43,7 @@ spring.servlet.multipart.max-file-size = 10MB
spring.servlet.multipart.max-request-size= 10MB 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=9994
access.python.generate_sr_port=9994 access.python.generate_sr_port=9994
access.python.address=http://18.167.251.121:9994 access.python.address=http://18.167.251.121:9994