merged v4.0.9 and fixed conflicts

This commit is contained in:
RockYang
2024-09-05 11:02:32 +08:00
47 changed files with 1927 additions and 427 deletions

View File

@@ -49,9 +49,10 @@ services:
volumes:
- ./conf/mj-proxy:/home/spring/config
# 后端 API 程序
geekai-api:
image: registry.cn-shenzhen.aliyuncs.com/geekmaster/geekai-api:v4.0.8-amd64
image: registry.cn-shenzhen.aliyuncs.com/geekmaster/geekai-api:v4.0.9-amd64
container_name: geekai-api
restart: always
depends_on:
@@ -73,7 +74,7 @@ services:
# 前端应用
geekai-web:
image: registry.cn-shenzhen.aliyuncs.com/geekmaster/geekai-web:v4.0.8-amd64
image: registry.cn-shenzhen.aliyuncs.com/geekmaster/geekai-web:v4.0.9-amd64
container_name: geekai-web
restart: always
depends_on: