Merge branch 'test'
This commit is contained in:
commit
ed46e3c435
|
|
@ -143,7 +143,7 @@ eino_tools:
|
||||||
# == 通用工具 ==
|
# == 通用工具 ==
|
||||||
# 表格转图片
|
# 表格转图片
|
||||||
excel2pic:
|
excel2pic:
|
||||||
base_url: "http://192.168.6.109:8010/api/v1/convert"
|
base_url: "http://excel2pic:8000/api/v1/convert"
|
||||||
|
|
||||||
dingtalk:
|
dingtalk:
|
||||||
api_key: "dingsbbntrkeiyazcfdg"
|
api_key: "dingsbbntrkeiyazcfdg"
|
||||||
|
|
|
||||||
|
|
@ -138,7 +138,7 @@ eino_tools:
|
||||||
# == 通用工具 ==
|
# == 通用工具 ==
|
||||||
# 表格转图片
|
# 表格转图片
|
||||||
excel2pic:
|
excel2pic:
|
||||||
base_url: "http://192.168.6.109:8010/api/v1/convert"
|
base_url: "http://excel2pic:8000/api/v1/convert"
|
||||||
|
|
||||||
dingtalk:
|
dingtalk:
|
||||||
api_key: "dingsbbntrkeiyazcfdg"
|
api_key: "dingsbbntrkeiyazcfdg"
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,7 @@
|
||||||
#export GOPATH=/root/go
|
#export GOPATH=/root/go
|
||||||
#export GOCACHE=/root/.cache/go-build
|
#export GOCACHE=/root/.cache/go-build
|
||||||
export CONTAINER_NAME=ai_scheduler
|
export CONTAINER_NAME=ai_scheduler
|
||||||
|
export NETWORK_NAME=ai_scheduler_network
|
||||||
#export CGO_ENABLED='0'
|
#export CGO_ENABLED='0'
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -29,10 +30,17 @@ git pull origin "$BRANCH"
|
||||||
docker build -t ${CONTAINER_NAME} .
|
docker build -t ${CONTAINER_NAME} .
|
||||||
docker stop ${CONTAINER_NAME}
|
docker stop ${CONTAINER_NAME}
|
||||||
docker rm -f ${CONTAINER_NAME}
|
docker rm -f ${CONTAINER_NAME}
|
||||||
|
|
||||||
|
# 依赖服务绑定同一网络,以便相互通信
|
||||||
|
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 \
|
docker run -itd \
|
||||||
--name "${CONTAINER_NAME}" \
|
--name "${CONTAINER_NAME}" \
|
||||||
--restart=always \
|
--restart=always \
|
||||||
--add-host=host.docker.internal:host-gateway \
|
--add-host=host.docker.internal:host-gateway \
|
||||||
|
--network="${NETWORK_NAME}" \
|
||||||
-e "OLLAMA_BASE_URL=${OLLAMA_BASE_URL:-http://host.docker.internal:11434}" \
|
-e "OLLAMA_BASE_URL=${OLLAMA_BASE_URL:-http://host.docker.internal:11434}" \
|
||||||
-e "MODE=${MODE}" \
|
-e "MODE=${MODE}" \
|
||||||
-p 8090:8090 \
|
-p 8090:8090 \
|
||||||
|
|
|
||||||
|
|
@ -21,7 +21,7 @@ type Uploader struct {
|
||||||
ossClient *utils_oss.Client
|
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 {
|
func NewUploader(oss *utils_oss.Client) *Uploader {
|
||||||
return &Uploader{
|
return &Uploader{
|
||||||
|
|
@ -63,7 +63,7 @@ func (u *Uploader) Run(report *ReportRes) (err error) {
|
||||||
|
|
||||||
// excel2picPy 将excel转换为图片python
|
// excel2picPy 将excel转换为图片python
|
||||||
// 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' \
|
// --header 'Content-Type: multipart/form-data; boundary=--------------------------952147881043913664015069' \
|
||||||
// --form 'file=@"C:\\Users\\Administrator\\Downloads\\销售同比分析2025-12-29 0-12点.xlsx"' \
|
// --form 'file=@"C:\\Users\\Administrator\\Downloads\\销售同比分析2025-12-29 0-12点.xlsx"' \
|
||||||
// --form 'sheet_name="销售同比分析"'
|
// --form 'sheet_name="销售同比分析"'
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue