merge v4.2.1

docker/docker-compose.yaml

@@ -1,4 +1,4 @@
-version: "3"
+version: '3'
 services:
   # mysql
   geekai-mysql:
@@ -9,14 +9,14 @@ services:
     environment:
       - MYSQL_ROOT_PASSWORD=mhSCk0NheGhmtsha
     ports:
-      - "3307:3306"
+      - '3307:3306'
     volumes:
       - ./conf/mysql/my.cnf:/etc/mysql/my.cnf
       - ./data/mysql/data:/var/lib/mysql
       - ./logs/mysql:/var/log/mysql
       - ./data/mysql/init.d:/docker-entrypoint-initdb.d/
     healthcheck:
-      test: ["CMD", "mysqladmin", "ping", "-h", "localhost"]
+      test: ['CMD', 'mysqladmin', 'ping', '-h', 'localhost']
       interval: 5s
       timeout: 10s
       retries: 10
@@ -30,44 +30,23 @@ services:
     volumes:
       - ./data/redis:/data
     ports:
-      - "6380:6379"
+      - '6380:6379'
     healthcheck:
-      test: ["CMD", "redis-cli", "ping"]
+      test: ['CMD', 'redis-cli', 'ping']
       interval: 3s
       timeout: 10s
       retries: 5
 
-  #  xxl-job-admin:
-  #    container_name: geekai-xxl-job-admin
-  #    image: registry.cn-shenzhen.aliyuncs.com/geekmaster/xxl-job-admin:2.4.0
-  #    restart: always
-  #    ports:
-  #      - "8081:8080"
-  #    environment:
-  #      - PARAMS=--spring.config.location=/application.properties
-  #    volumes:
-  #      - ./logs/xxl-job:/data/applogs
-  #      - ./conf/xxl-job/application.properties:/application.properties
-
-  tika:
+  geekai-tika:
     image: registry.cn-shenzhen.aliyuncs.com/geekmaster/tika:latest
     container_name: geekai-tika
     restart: always
     ports:
-      - "9999:9998"
-
-  #  midjourney-proxy:
-  #    image: registry.cn-shenzhen.aliyuncs.com/geekmaster/midjourney-proxy:2.6.2
-  #    container_name: geekai-midjourney-proxy
-  #    restart: always
-  #    ports:
-  #      - "8082:8080"
-  #    volumes:
-  #      - ./conf/mj-proxy:/home/spring/config
+      - '9999:9998'
 
   # 后端 API 程序
   geekai-api:
-    image: registry.cn-shenzhen.aliyuncs.com/geekmaster/geekai-api:v4.2.0-amd64
+    image: registry.cn-shenzhen.aliyuncs.com/geekmaster/geekai-api:v4.2.1-amd64
     container_name: geekai-api
     restart: always
     depends_on:
@@ -80,7 +59,7 @@ services:
       - LOG_LEVEL=info
       - CONFIG_FILE=config.toml
     ports:
-      - "5678:5678"
+      - '5678:5678'
     volumes:
       - /usr/share/zoneinfo/Asia/Shanghai:/etc/localtime
       - ./conf/config.toml:/var/www/app/config.toml
@@ -90,13 +69,13 @@ services:
 
   # 前端应用
   geekai-web:
-    image: registry.cn-shenzhen.aliyuncs.com/geekmaster/geekai-web:v4.2.0-amd64
+    image: registry.cn-shenzhen.aliyuncs.com/geekmaster/geekai-web:v4.2.1-amd64
     container_name: geekai-web
     restart: always
     depends_on:
       - geekai-api
     ports:
-      - "8080:8080"
+      - '8080:8080'
     volumes:
       - ./logs/nginx:/var/log/nginx
       - ./conf/nginx/conf.d:/etc/nginx/conf.d