merge v4.1.1 and fixed conflicts

deploy/conf/config.toml

@@ -21,7 +21,7 @@ TikaHost = "http://tika:9998"
   DB = 0
 
 [ApiConfig]
-  ApiURL = "http://service.r9it.com:9001"
+  ApiURL = "http://sapi.geekai.me"
   AppId = ""
   Token = ""
 

deploy/docker-compose.yaml

@@ -45,7 +45,7 @@ services:
     restart: always
     ports:
       - "9998:9998"
-  
+
   midjourney-proxy:
     image: registry.cn-shenzhen.aliyuncs.com/geekmaster/midjourney-proxy:2.6.2
     container_name: geekai-midjourney-proxy
@@ -56,9 +56,9 @@ services:
       - ./conf/mj-proxy:/home/spring/config
 
 
-  # 后端 API 程序
+    # 后端 API 程序
   geekai-api:
-    image: registry.cn-shenzhen.aliyuncs.com/geekmaster/geekai-api:v4.1.0-amd64
+    image: registry.cn-shenzhen.aliyuncs.com/geekmaster/geekai-api:v4.1.1-amd64
     container_name: geekai-api
     restart: always
     depends_on:
@@ -80,7 +80,7 @@ services:
 
   # 前端应用
   geekai-web:
-    image: registry.cn-shenzhen.aliyuncs.com/geekmaster/geekai-web:v4.1.0-amd64
+    image: registry.cn-shenzhen.aliyuncs.com/geekmaster/geekai-web:v4.1.1-amd64
     container_name: geekai-web
     restart: always
     depends_on:
@@ -91,5 +91,4 @@ services:
       - ./logs/nginx:/var/log/nginx
       - ./conf/nginx/conf.d:/etc/nginx/conf.d
       - ./conf/nginx/nginx.conf:/etc/nginx/nginx.conf
-      - ./conf/nginx/ssl:/etc/nginx/ssl
-
+      - ./conf/nginx/ssl:/etc/nginx/ssl