resolve conflicts

deploy/conf/config.toml

@@ -1,6 +1,6 @@
 Listen = "0.0.0.0:5678"
 ProxyURL = ""
-MysqlDns = "root:12345678@tcp(geekai-mysql:3306)/geekai?charset=utf8mb4&collation=utf8mb4_unicode_ci&parseTime=True&loc=Local"
+MysqlDns = "root:AwkYTv00xU9n@tcp(geekai-mysql:3306)/geekai_plus?charset=utf8mb4&collation=utf8mb4_unicode_ci&parseTime=True&loc=Local"
 StaticDir = "./static"
 StaticUrl = "/static"
 TikaHost = "http://tika:9998"
@@ -16,7 +16,7 @@ TikaHost = "http://tika:9998"
 [Redis]
   Host = "geekai-redis"
   Port = 6379
-  Password = "12345678"
+  Password = "AwkYTv00xU9n"
   DB = 0
 
 [ApiConfig]
@@ -109,4 +109,4 @@ TikaHost = "http://tika:9998"
   AppId = "" # 商户ID
   PrivateKey = "" # 商户私钥
   ApiURL = "https://pay.geekai.cn"
-  Methods = ["alipay", "wxpay", "qqpay", "jdpay", "douyin", "paypal"] # 支持的支付方式
+  Methods = ["alipay", "wxpay", "qqpay", "jdpay", "douyin", "paypal"] # 支持的支付方式

deploy/docker-compose.yaml

@@ -7,7 +7,7 @@ services:
     command: --default-authentication-plugin=mysql_native_password
     restart: always
     environment:
-      - MYSQL_ROOT_PASSWORD=12345678
+      - MYSQL_ROOT_PASSWORD=AwkYTv00xU9n
     ports:
       - "3307:3306"
     volumes :
@@ -21,7 +21,7 @@ services:
     image: registry.cn-shenzhen.aliyuncs.com/geekmaster/redis:6.0.6
     restart: always
     container_name: geekai-redis
-    command: redis-server --requirepass 12345678
+    command: redis-server --requirepass AwkYTv00xU9n
     volumes :
       - ./data/redis:/data
     ports:
@@ -58,7 +58,7 @@ services:
 
     # 后端 API 程序
   geekai-api:
-    image: registry.cn-shenzhen.aliyuncs.com/geekmaster/geekai-plus-api:v4.1.5-amd64
+    image: registry.cn-shenzhen.aliyuncs.com/geekmaster/geekai-api:v4.1.5-amd64
     container_name: geekai-api
     restart: always
     depends_on:
@@ -80,7 +80,7 @@ services:
 
   # 前端应用
   geekai-web:
-    image: registry.cn-shenzhen.aliyuncs.com/geekmaster/geekai-plus-web:v4.1.5-amd64
+    image: registry.cn-shenzhen.aliyuncs.com/geekmaster/geekai-web:v4.1.5-amd64
     container_name: geekai-web
     restart: always
     depends_on: