diff --git a/service-ai/service-ai-web/src/main/resources/application-build.yml b/service-ai/service-ai-web/src/main/resources/application-build.yml deleted file mode 100644 index 528bbbd..0000000 --- a/service-ai/service-ai-web/src/main/resources/application-build.yml +++ /dev/null @@ -1,20 +0,0 @@ -spring: - profiles: - include: random-port,common,discovery,metrics,forest - ai: - vectorstore: - qdrant: - host: 132.121.206.65 - port: 29463 - api-key: ENC(0/0UkIKeAvyV17yNqSU3v04wmm8CdWKe4BYSSJa2FuBtK12TcZRJPdwk+ZpYnpISv+KmVTUrrmFBzAYrDR3ysA==) - llm: - base-url: http://132.121.206.65:10086 - api-key: ENC(K+Hff9QGC+fcyi510VIDd9CaeK/IN5WBJ9rlkUsHEdDgIidW+stHHJlsK0lLPUXXREha+ToQZqqDXJrqSE+GUKCXklFhelD8bRHFXBIeP/ZzT2cxhzgKUXgjw3S0Qw2R) - chat: - model: 'Qwen3/qwen3-1.7b' - visual: - model: 'Qwen2.5/qwen2.5-vl-7b' - embedding: - model: 'Qwen3/qwen3-embedding-4b' - reranker: - model: 'Bge-reranker-v2' diff --git a/service-ai/service-ai-web/src/main/resources/application-local.yml b/service-ai/service-ai-web/src/main/resources/application-local.yml deleted file mode 100644 index 18e7027..0000000 --- a/service-ai/service-ai-web/src/main/resources/application-local.yml +++ /dev/null @@ -1,39 +0,0 @@ -server: - port: 8080 -spring: - ai: - vectorstore: - qdrant: - host: 192.168.100.140 - port: 6334 - llm: - base-url: https://api.siliconflow.cn - api-key: sk-xrguybusoqndpqvgzgvllddzgjamksuecyqdaygdwnrnqfwo - chat: - model: 'Qwen/Qwen3-8B' - visual: - base-url: https://open.bigmodel.cn/api/paas/v4 - endpoint: /chat/completions - model: 'glm-4v-flash' - embedding: - model: 'BAAI/bge-m3' - reranker: - model: 'BAAI/bge-reranker-v2-m3' - cloud: - discovery: - enabled: false - zookeeper: - enabled: false - datasource: - url: jdbc:mysql://192.168.100.140:3306/hudi_collect_build_b12?useSSL=false&allowPublicKeyRetrieval=true - username: test - password: test - driver-class-name: com.mysql.cj.jdbc.Driver - security: - meta: - authority: ENC(GXKnbq1LS11U2HaONspvH+D/TkIx13aWTaokdkzaF7HSvq6Z0Rv1+JUWFnYopVXu) - username: ENC(moIO5mO39V1Z+RDwROK9JXY4GfM8ZjDgM6Si7wRZ1MPVjbhTpmLz3lz28rAiw7c2LeCmizfJzHkEXIwGlB280g==) - darkcode: ENC(0jzpQ7T6S+P7bZrENgYsUoLhlqGvw7DA2MN3BRqEOwq7plhtg72vuuiPQNnr3DaYz0CpyTvxInhpx11W3VZ1trD6NINh7O3LN70ZqO5pWXk=) -jasypt: - encryptor: - password: 'r#(R,P"Dp^A47>WSn:Wn].gs/+"v:q_Q*An~zF*g-@j@jtSTv5H/,S-3:R?r9R}.' diff --git a/service-ai/service-ai-web/src/main/resources/application.yml b/service-ai/service-ai-web/src/main/resources/application.yml index ef8a48e..a1cb219 100644 --- a/service-ai/service-ai-web/src/main/resources/application.yml +++ b/service-ai/service-ai-web/src/main/resources/application.yml @@ -1,6 +1,8 @@ spring: application: name: service-ai-web + profiles: + include: random-port,common,discovery,metrics,forest mvc: async: request-timeout: 3600000 @@ -13,6 +15,24 @@ spring: org.springframework.ai.model.openai.autoconfigure.OpenAiEmbeddingAutoConfiguration, org.springframework.ai.model.openai.autoconfigure.OpenAiModerationAutoConfiguration, org.springframework.ai.model.deepseek.autoconfigure.DeepSeekChatAutoConfiguration + ai: + vectorstore: + qdrant: + host: 132.121.206.65 + port: 29463 + api-key: ENC(0/0UkIKeAvyV17yNqSU3v04wmm8CdWKe4BYSSJa2FuBtK12TcZRJPdwk+ZpYnpISv+KmVTUrrmFBzAYrDR3ysA==) + llm: + base-url: http://132.121.206.65:10086 + api-key: ENC(K+Hff9QGC+fcyi510VIDd9CaeK/IN5WBJ9rlkUsHEdDgIidW+stHHJlsK0lLPUXXREha+ToQZqqDXJrqSE+GUKCXklFhelD8bRHFXBIeP/ZzT2cxhzgKUXgjw3S0Qw2R) + chat: + base-url: ${spring.llm.base-url}/v1 + model: 'Qwen3/qwen3-1.7b' + visual: + model: 'Qwen2.5/qwen2.5-vl-7b-q4km' + embedding: + model: 'Qwen3/qwen3-embedding-4b' + reranker: + model: 'BGE/beg-reranker-v2' liteflow: rule-source: liteflow.xml print-banner: false diff --git a/service-cli/service-cli-runner/src/main/resources/application.yml b/service-cli/service-cli-runner/src/main/resources/application.yml index b227b25..7b5abea 100644 --- a/service-cli/service-cli-runner/src/main/resources/application.yml +++ b/service-cli/service-cli-runner/src/main/resources/application.yml @@ -161,22 +161,14 @@ deploy: - "service" source-jar: service-monitor-1.0.0-SNAPSHOT.jar replicas: 1 - service-ai-chat: + service-ai-web: order: 6 groups: - "ai" - source-jar: service-ai-chat-1.0.0-SNAPSHOT.jar - jdk: "jdk17" - replicas: 1 - service-ai-knowledge: - order: 6 - groups: - - "ai" - source-jar: service-ai-knowledge-1.0.0-SNAPSHOT.jar + source-jar: service-ai-web-1.0.0-SNAPSHOT.jar jdk: "jdk17" replicas: 1 arguments: - "[spring.profiles.active]": 'build' "[file-store.download-prefix]": 'http://132.126.207.130:35690/hudi_services/ai_knowledge' "[file-store.upload-path]": ${deploy.runtime.data-path}/knowledge "[spring.datasource.url]": ${deploy.runtime.database.config.url} diff --git a/service-web/client/src/util/amis.tsx b/service-web/client/src/util/amis.tsx index 6771bb4..4b98e6e 100644 --- a/service-web/client/src/util/amis.tsx +++ b/service-web/client/src/util/amis.tsx @@ -10,8 +10,8 @@ import {isEqual} from 'licia' export const commonInfo = { debug: isEqual(import.meta.env.MODE, 'development'), baseUrl: 'http://132.126.207.130:35690/hudi_services/service_web', - // baseAiUrl: 'http://132.126.207.130:35690/hudi_services/service_ai_web', - baseAiUrl: 'http://localhost:8080', + baseAiUrl: 'http://132.126.207.130:35690/hudi_services/service_ai_web', + // baseAiUrl: 'http://localhost:8080', authorizationHeaders: { 'Authorization': 'Basic QXhoRWJzY3dzSkRiWU1IMjpjWXhnM2I0UHRXb1ZENVNqRmF5V3h0blNWc2p6UnNnNA==', 'Content-Type': 'application/json',