From 00d31a237937512c8be54f3b3b6aa08386feaace Mon Sep 17 00:00:00 2001
From: RockYang <yangjian102621@gmail.com>
Date: Tue, 21 May 2024 11:03:11 +0800
Subject: [PATCH] update docker image url

---
 build/build.sh             | 12 ++++++------
 deploy/.gitignore          |  3 ++-
 deploy/conf/config.toml    |  4 ++--
 deploy/docker-compose.yaml |  8 ++++----
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/build/build.sh b/build/build.sh
index 6505f9f3..f73d8c01 100755
--- a/build/build.sh
+++ b/build/build.sh
@@ -14,15 +14,15 @@ npm run build
 cd ../build
 
 # remove docker image if exists
-docker rmi -f registry.cn-shenzhen.aliyuncs.com/geekmaster/geekai-api:$version-$arch
+docker rmi -f registry.cn-shenzhen.aliyuncs.com/geekmaster/geekai-plus-api:$version-$arch
 # build docker image for Geek-AI API
-docker build -t registry.cn-shenzhen.aliyuncs.com/geekmaster/geekai-api:$version-$arch -f dockerfile-api-go ../
+docker build -t registry.cn-shenzhen.aliyuncs.com/geekmaster/geekai-plus-api:$version-$arch -f dockerfile-api-go ../
 
 # build docker image for Geek-AI-web
-docker rmi -f registry.cn-shenzhen.aliyuncs.com/geekmaster/geekai-web:$version-$arch
-docker build -t registry.cn-shenzhen.aliyuncs.com/geekmaster/geekai-web:$version-$arch -f dockerfile-vue ../
+docker rmi -f registry.cn-shenzhen.aliyuncs.com/geekmaster/geekai-plus-web:$version-$arch
+docker build -t registry.cn-shenzhen.aliyuncs.com/geekmaster/geekai-plus-web:$version-$arch -f dockerfile-vue ../
 
 if [ "$3" = "push" ];then
-  docker push registry.cn-shenzhen.aliyuncs.com/geekmaster/geekai-api:$version-$arch
-  docker push registry.cn-shenzhen.aliyuncs.com/geekmaster/geekai-web:$version-$arch
+  docker push registry.cn-shenzhen.aliyuncs.com/geekmaster/geekai-plus-api:$version-$arch
+  docker push registry.cn-shenzhen.aliyuncs.com/geekmaster/geekai-plus-web:$version-$arch
 fi
diff --git a/deploy/.gitignore b/deploy/.gitignore
index 20efd31f..d8b2bbf6 100644
--- a/deploy/.gitignore
+++ b/deploy/.gitignore
@@ -1,4 +1,5 @@
 data/mysql/data
+data/leveldb
 logs
 static/*
-redis/redis
\ No newline at end of file
+redis/redis
diff --git a/deploy/conf/config.toml b/deploy/conf/config.toml
index b76bc26f..f005f7e2 100644
--- a/deploy/conf/config.toml
+++ b/deploy/conf/config.toml
@@ -70,7 +70,7 @@ WeChatBot = false
 
 [[MjProxyConfigs]]
   Enabled = false
-  ApiURL = "http://midjourney-proxy:8082"
+  ApiURL = "http://geekai-midjourney-proxy:8082"
   Mode = ""
   ApiKey = "sk-geekmaster"
 
@@ -88,7 +88,7 @@ WeChatBot = false
 
 [XXLConfig]   # xxl-job 配置，需要你部署 XXL-JOB 定时任务工具，用来定期清理未支付订单和清理过期 VIP，如果你没有启用支付服务，则该服务也无需启动
   Enabled = true  # 是否启用 XXL JOB 服务
-  ServerAddr = "http://xxl-job-admin:8080/xxl-job-admin"  # xxl-job-admin 管理地址
+  ServerAddr = "http://geekai-xxl-job-admin:8080/xxl-job-admin"  # xxl-job-admin 管理地址
   ExecutorIp = "geekai-api"  # 执行器 IP 地址
   ExecutorPort = "9999" # 执行器服务端口
   AccessToken = "GeekMaster"  # 执行器 API 通信 token
diff --git a/deploy/docker-compose.yaml b/deploy/docker-compose.yaml
index 860baffe..6fe64a2c 100644
--- a/deploy/docker-compose.yaml
+++ b/deploy/docker-compose.yaml
@@ -28,7 +28,7 @@ services:
       - "6380:6379"
 
   xxl-job-admin:
-    container_name: xxl-job-admin
+    container_name: geekai-xxl-job-admin
     image: xuxueli/xxl-job-admin:2.4.0
     restart: always
     ports:
@@ -42,7 +42,7 @@ services:
 
   midjourney-proxy:
     image: novicezk/midjourney-proxy:2.6.0
-    container_name: midjourney-proxy
+    container_name: geekai-midjourney-proxy
     restart: always
     ports:
       - "8082:8080"
@@ -53,7 +53,7 @@ services:
 
   # 后端 API 程序
   geekai-api:
-    image: registry.cn-shenzhen.aliyuncs.com/geekmaster/geekai-api:v4.0.7-amd64
+    image: registry.cn-shenzhen.aliyuncs.com/geekmaster/geekai-plus-api:v4.0.7-amd64
     container_name: geekai-api
     restart: always
     depends_on:
@@ -75,7 +75,7 @@ services:
 
   # 前端应用
   geekai-web:
-    image: registry.cn-shenzhen.aliyuncs.com/geekmaster/geekai-web:v4.0.7-amd64
+    image: registry.cn-shenzhen.aliyuncs.com/geekmaster/geekai-plus-web:v4.0.7-amd64
     container_name: geekai-web
     restart: always
     depends_on: