merge v4.1.0 and fixed conflicts

deploy/conf/config.toml

@@ -4,6 +4,7 @@ MysqlDns = "root:12345678@tcp(geekai-mysql:3306)/chatgpt_plus?charset=utf8mb4&co
 StaticDir = "./static"
 StaticUrl = "/static"
 WeChatBot = false
+TikaHost = "http://tika:9998"
 
 [Session]
   SecretKey = "azyehq3ivunjhbntz78isj00i4hz2mt9xtddysfucxakadq4qbfrt0b7q3lnvg80"

deploy/docker-compose.yaml

@@ -39,7 +39,13 @@ services:
       - ./logs/xxl-job:/data/applogs
       - ./conf/xxl-job/application.properties:/application.properties
 
-
+  tika:
+    image: registry.cn-shenzhen.aliyuncs.com/geekmaster/tika:latest
+    container_name: tika
+    restart: always
+    ports:
+      - "9998:9998"
+  
   midjourney-proxy:
     image: registry.cn-shenzhen.aliyuncs.com/geekmaster/midjourney-proxy:2.6.2
     container_name: geekai-midjourney-proxy
@@ -52,7 +58,7 @@ services:
 
   # 后端 API 程序
   geekai-api:
-    image: registry.cn-shenzhen.aliyuncs.com/geekmaster/geekai-api:v4.0.9-amd64
+    image: registry.cn-shenzhen.aliyuncs.com/geekmaster/geekai-api:v4.1.0-amd64
     container_name: geekai-api
     restart: always
     depends_on:
@@ -74,7 +80,7 @@ services:
 
   # 前端应用
   geekai-web:
-    image: registry.cn-shenzhen.aliyuncs.com/geekmaster/geekai-web:v4.0.9-amd64
+    image: registry.cn-shenzhen.aliyuncs.com/geekmaster/geekai-web:v4.1.0-amd64
     container_name: geekai-web
     restart: always
     depends_on: