From 31e15aeb714559839a239f45a11c8a0dadbbafc0 Mon Sep 17 00:00:00 2001 From: fuzhongyun <15339891972@163.com> Date: Thu, 8 Jan 2026 10:26:50 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E5=AE=B9?= =?UTF-8?q?=E5=99=A8=E7=BD=91=E7=BB=9C=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- deploy.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/deploy.sh b/deploy.sh index ba9952a..16cab4a 100644 --- a/deploy.sh +++ b/deploy.sh @@ -3,6 +3,7 @@ #export GOPATH=/root/go #export GOCACHE=/root/.cache/go-build export CONTAINER_NAME=ai_scheduler +export NETWORK_NAME=ai_scheduler_network #export CGO_ENABLED='0' @@ -29,10 +30,17 @@ git pull origin "$BRANCH" docker build -t ${CONTAINER_NAME} . docker stop ${CONTAINER_NAME} docker rm -f ${CONTAINER_NAME} + +# 依赖服务绑定同一网络,以便相互通信 +docker network create "${NETWORK_NAME}" || true +docker network connect "${NETWORK_NAME}" excel2pic || true +docker network connect "${NETWORK_NAME}" l_ai_knowledge || true + docker run -itd \ --name "${CONTAINER_NAME}" \ --restart=always \ --add-host=host.docker.internal:host-gateway \ + --network="${NETWORK_NAME}" \ -e "OLLAMA_BASE_URL=${OLLAMA_BASE_URL:-http://host.docker.internal:11434}" \ -e "MODE=${MODE}" \ -p 8090:8090 \ From 41dd5b11f41c04d3b8f545b6218f2110cb66d8f1 Mon Sep 17 00:00:00 2001 From: fuzhongyun <15339891972@163.com> Date: Thu, 8 Jan 2026 11:17:33 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E6=9B=BF=E6=8D=A2=E4=BE=9D=E8=B5=96?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1host?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/config.yaml | 2 +- config/config_test.yaml | 2 +- internal/tools/bbxt/upload.go | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/config.yaml b/config/config.yaml index 33fa025..8eb23e5 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -143,7 +143,7 @@ eino_tools: # == 通用工具 == # 表格转图片 excel2pic: - base_url: "http://192.168.6.109:8010/api/v1/convert" + base_url: "http://excel2pic:8000/api/v1/convert" dingtalk: api_key: "dingsbbntrkeiyazcfdg" diff --git a/config/config_test.yaml b/config/config_test.yaml index ec63488..461b459 100644 --- a/config/config_test.yaml +++ b/config/config_test.yaml @@ -138,7 +138,7 @@ eino_tools: # == 通用工具 == # 表格转图片 excel2pic: - base_url: "http://192.168.6.109:8010/api/v1/convert" + base_url: "http://excel2pic:8000/api/v1/convert" dingtalk: api_key: "dingsbbntrkeiyazcfdg" diff --git a/internal/tools/bbxt/upload.go b/internal/tools/bbxt/upload.go index 897e209..5ca4c3e 100644 --- a/internal/tools/bbxt/upload.go +++ b/internal/tools/bbxt/upload.go @@ -21,7 +21,7 @@ type Uploader struct { ossClient *utils_oss.Client } -const RequestUrl = "http://192.168.6.109:8010/api/v1/convert" +const RequestUrl = "http://excel2pic:8000/api/v1/convert" func NewUploader(oss *utils_oss.Client) *Uploader { return &Uploader{ @@ -63,7 +63,7 @@ func (u *Uploader) Run(report *ReportRes) (err error) { // excel2picPy 将excel转换为图片python // python 接口如下: -// curl --location --request POST 'http://192.168.6.109:8010/api/v1/convert' \ +// curl --location --request POST 'http://excel2pic:8000/api/v1/convert' \ // --header 'Content-Type: multipart/form-data; boundary=--------------------------952147881043913664015069' \ // --form 'file=@"C:\\Users\\Administrator\\Downloads\\销售同比分析2025-12-29 0-12点.xlsx"' \ // --form 'sheet_name="销售同比分析"' From 26b35675655ca98183723d2d575c3e48ab6a2e14 Mon Sep 17 00:00:00 2001 From: fuzhongyun <15339891972@163.com> Date: Thu, 8 Jan 2026 13:38:45 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix=EF=BC=9A=E9=83=A8=E7=BD=B2=E4=B8=8D?= =?UTF-8?q?=E8=BE=93=E5=87=BA=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- deploy.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/deploy.sh b/deploy.sh index 16cab4a..fac3025 100644 --- a/deploy.sh +++ b/deploy.sh @@ -32,9 +32,9 @@ docker stop ${CONTAINER_NAME} docker rm -f ${CONTAINER_NAME} # 依赖服务绑定同一网络,以便相互通信 -docker network create "${NETWORK_NAME}" || true -docker network connect "${NETWORK_NAME}" excel2pic || true -docker network connect "${NETWORK_NAME}" l_ai_knowledge || true +docker network create "${NETWORK_NAME}" 2>/dev/null || true +docker network connect "${NETWORK_NAME}" excel2pic 2>/dev/null || true +docker network connect "${NETWORK_NAME}" l_ai_knowledge 2>/dev/null || true docker run -itd \ --name "${CONTAINER_NAME}" \