diff --git a/src/main/java/com/ai/da/python/PythonService.java b/src/main/java/com/ai/da/python/PythonService.java index 4ba86ce3..1604936b 100644 --- a/src/main/java/com/ai/da/python/PythonService.java +++ b/src/main/java/com/ai/da/python/PythonService.java @@ -77,7 +77,7 @@ public class PythonService { @Value("${access.python.generate_sr_port}") private String srServicePort; - @Value("${design.callback.url}") + @Value("${design.callback.url.aida}") private String callbackUrl; @Resource diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index ef976e1c..b4e9290d 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -20,14 +20,6 @@ spring: jwtTokenPrefix: Bearer- jwtExpiration: 8640000000 -# ---------- Python 服务 ---------- -access: - python: - ip: http://18.167.251.121 - port: 9994 - generate_sr_port: 9994 - address: http://18.167.251.121:9994 - # ---------- MinIO Buckets ---------- minio: bucketName: @@ -101,10 +93,6 @@ google: redirect: uri: https://develop.api.aida.com.hk/api/third/party/auth/google_callback -design: - callback: - url: https://darkish-copied-sprinkler.ngrok-free.dev/api/third/party/receiveDesignResults - redirect: url: http://18.167.251.121:7788 diff --git a/src/main/resources/bootstrap.yml b/src/main/resources/bootstrap.yml index 7ca2c057..9a30129d 100644 --- a/src/main/resources/bootstrap.yml +++ b/src/main/resources/bootstrap.yml @@ -4,22 +4,27 @@ # 示例:docker run -e NACOS_NAMESPACE=prod ... # ============================================================ +nacos: + namespace: dev + host: 18.167.251.121:28848 + username: nacos + password: Aidlab123123! + spring: application: - name: aida-back + name: aida-seller config: - import: optional:nacos:aida-public-${NACOS_NAMESPACE:test}.yml + import: optional:nacos:aida-public-${nacos.namespace}.yml cloud: nacos: discovery: - server-addr: ${NACOS_HOST:18.167.251.121:28848} - namespace: ${NACOS_NAMESPACE:ltx} - username: nacos - password: Aidlab123123! + server-addr: ${nacos.host} + namespace: ${nacos.namespace} + username: ${nacos.username} + password: ${nacos.password} config: - server-addr: ${NACOS_HOST:18.167.251.121:28848} - namespace: ${NACOS_NAMESPACE:ltx} - group: ${NACOS_GROUP:DEFAULT_GROUP} + server-addr: ${nacos.host} + namespace: ${nacos.namespace} file-extension: yaml - username: nacos - password: Aidlab123123! + username: ${nacos.username} + password: ${nacos.password}