From dd675c9a9bfad67ff88b7e4b643f2d2c66bee194 Mon Sep 17 00:00:00 2001
From: RockYang <yangjian102621@gmail.com>
Date: Mon, 10 Feb 2025 14:48:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AE=B9=E5=99=A8=E7=9B=B8?=
 =?UTF-8?q?=E4=BA=92=E4=B9=8B=E9=97=B4=E7=9A=84=E4=BE=9D=E8=B5=96=E5=85=B3?=
 =?UTF-8?q?=E7=B3=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 {deploy => docker}/.gitignore                               | 0
 {deploy => docker}/conf/config.toml                         | 2 +-
 {deploy => docker}/conf/mj-proxy/application.yml            | 0
 {deploy => docker}/conf/mysql/my.cnf                        | 0
 {deploy => docker}/conf/nginx/conf.d/geekai.conf            | 0
 {deploy => docker}/conf/nginx/nginx.conf                    | 0
 {deploy => docker}/conf/xxl-job/application.properties      | 0
 {deploy => docker}/data/mysql/init.d/geekai_plus-v4.2.0.sql | 0
 {deploy => docker}/docker-compose.yaml                      | 4 ++--
 web/src/views/ChatPlus.vue                                  | 2 +-
 10 files changed, 4 insertions(+), 4 deletions(-)
 rename {deploy => docker}/.gitignore (100%)
 rename {deploy => docker}/conf/config.toml (98%)
 rename {deploy => docker}/conf/mj-proxy/application.yml (100%)
 rename {deploy => docker}/conf/mysql/my.cnf (100%)
 rename {deploy => docker}/conf/nginx/conf.d/geekai.conf (100%)
 rename {deploy => docker}/conf/nginx/nginx.conf (100%)
 rename {deploy => docker}/conf/xxl-job/application.properties (100%)
 rename {deploy => docker}/data/mysql/init.d/geekai_plus-v4.2.0.sql (100%)
 rename {deploy => docker}/docker-compose.yaml (98%)

diff --git a/deploy/.gitignore b/docker/.gitignore
similarity index 100%
rename from deploy/.gitignore
rename to docker/.gitignore
diff --git a/deploy/conf/config.toml b/docker/conf/config.toml
similarity index 98%
rename from deploy/conf/config.toml
rename to docker/conf/config.toml
index a02628cd..ae9543b5 100644
--- a/deploy/conf/config.toml
+++ b/docker/conf/config.toml
@@ -3,7 +3,7 @@ ProxyURL = ""
 MysqlDns = "root:mhSCk0NheGhmtsha@tcp(geekai-mysql:3306)/geekai_plus?charset=utf8mb4&collation=utf8mb4_unicode_ci&parseTime=True&loc=Local"
 StaticDir = "./static"
 StaticUrl = "/static"
-TikaHost = "http://tika:9998"
+TikaHost = "http://tika-geekai:9998"
 
 [Session]
   SecretKey = "azyehq3ivunjhbntz78isj00i4hz2mt9xtddysfucxakadq4qbfrt0b7q3lnvg80"
diff --git a/deploy/conf/mj-proxy/application.yml b/docker/conf/mj-proxy/application.yml
similarity index 100%
rename from deploy/conf/mj-proxy/application.yml
rename to docker/conf/mj-proxy/application.yml
diff --git a/deploy/conf/mysql/my.cnf b/docker/conf/mysql/my.cnf
similarity index 100%
rename from deploy/conf/mysql/my.cnf
rename to docker/conf/mysql/my.cnf
diff --git a/deploy/conf/nginx/conf.d/geekai.conf b/docker/conf/nginx/conf.d/geekai.conf
similarity index 100%
rename from deploy/conf/nginx/conf.d/geekai.conf
rename to docker/conf/nginx/conf.d/geekai.conf
diff --git a/deploy/conf/nginx/nginx.conf b/docker/conf/nginx/nginx.conf
similarity index 100%
rename from deploy/conf/nginx/nginx.conf
rename to docker/conf/nginx/nginx.conf
diff --git a/deploy/conf/xxl-job/application.properties b/docker/conf/xxl-job/application.properties
similarity index 100%
rename from deploy/conf/xxl-job/application.properties
rename to docker/conf/xxl-job/application.properties
diff --git a/deploy/data/mysql/init.d/geekai_plus-v4.2.0.sql b/docker/data/mysql/init.d/geekai_plus-v4.2.0.sql
similarity index 100%
rename from deploy/data/mysql/init.d/geekai_plus-v4.2.0.sql
rename to docker/data/mysql/init.d/geekai_plus-v4.2.0.sql
diff --git a/deploy/docker-compose.yaml b/docker/docker-compose.yaml
similarity index 98%
rename from deploy/docker-compose.yaml
rename to docker/docker-compose.yaml
index 852eb41d..04b69f92 100644
--- a/deploy/docker-compose.yaml
+++ b/docker/docker-compose.yaml
@@ -67,7 +67,7 @@ services:
 
   # 后端 API 程序
   geekai-api:
-    image: registry.cn-shenzhen.aliyuncs.com/geekmaster/geekai-plus-api:v4.1.8-amd64
+    image: registry.cn-shenzhen.aliyuncs.com/geekmaster/geekai-plus-api:v4.2.0-amd64
     container_name: geekai-api
     restart: always
     depends_on:
@@ -90,7 +90,7 @@ services:
 
   # 前端应用
   geekai-web:
-    image: registry.cn-shenzhen.aliyuncs.com/geekmaster/geekai-plus-web:v4.1.8-amd64
+    image: registry.cn-shenzhen.aliyuncs.com/geekmaster/geekai-plus-web:v4.2.0-amd64
     container_name: geekai-web
     restart: always
     depends_on:
diff --git a/web/src/views/ChatPlus.vue b/web/src/views/ChatPlus.vue
index f10aa790..a151cdc5 100644
--- a/web/src/views/ChatPlus.vue
+++ b/web/src/views/ChatPlus.vue
@@ -1000,7 +1000,7 @@ const realtimeChat = () => {
     }
 
     ul {
-      list-style disc
+      list-style inside
     }
   }
 }