From 412ce58360947509c72b6ac77236c7132b6e437b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=90=8C=E6=A3=AE?= <qyg2297248353@163.com>
Date: Wed, 21 Aug 2024 15:54:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=BA=94=E7=94=A8=20?=
 =?UTF-8?q?=E7=8B=AC=E8=A7=92=E6=95=B0=E5=8D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 萌森 <qyg2297248353@163.com>
---
 apps/dujiaoka/2.0.7/data.yml           | 134 ++++++++++++++++++++++++-
 apps/dujiaoka/2.0.7/docker-compose.yml |  19 +++-
 2 files changed, 148 insertions(+), 5 deletions(-)

diff --git a/apps/dujiaoka/2.0.7/data.yml b/apps/dujiaoka/2.0.7/data.yml
index efdeb2f9..3ae759f0 100644
--- a/apps/dujiaoka/2.0.7/data.yml
+++ b/apps/dujiaoka/2.0.7/data.yml
@@ -1,8 +1,41 @@
 additionalProperties:
   formFields:
-    - default: "/home/acg-faka"
+    - child:
+        default: ""
+        envKey: PANEL_REDIS_SERVICE
+        required: true
+        type: service
+      default: redis
+      envKey: PANEL_REDIS_TYPE
+      labelZh: Redis 服务 (前置检查)
+      labelEn: Redis Service (Pre-check)
+      required: false
+      type: apps
+      values:
+        - label: Redis
+          value: redis
+    - child:
+        default: ""
+        envKey: PANEL_DB_HOST
+        required: true
+        type: service
+      default: mysql
       edit: true
-      envKey: ACG_FAKA_ROOT_PATH
+      envKey: PANEL_DB_TYPE
+      labelZh: MySQL 服务 (前置检查)
+      labelEn: Database Service (Pre-check)
+      required: true
+      type: apps
+      values:
+        - label: MySQL
+          value: mysql
+        - label: MariaDB
+          value: mariadb
+        - label: Percona
+          value: percona
+    - default: "/home/dujiaoka"
+      edit: true
+      envKey: DUJIAOKA_ROOT_PATH
       labelZh: 数据持久化路径
       labelEn: Data persistence path
       required: true
@@ -15,3 +48,100 @@ additionalProperties:
       required: true
       rule: paramPort
       type: number
+    - default: 9000
+      edit: true
+      envKey: PANEL_APP_PORT_API
+      labelZh: API 端口
+      labelEn: API port
+      required: true
+      rule: paramPort
+      type: number
+    - default: "/admin"
+      edit: true
+      envKey: ADMIN_ROUTE_PREFIX
+      labelZh: 后台路径
+      labelEn: Admin path
+      required: true
+      type: text
+    - default: "redis"
+      edit: true
+      envKey: QUEUE_CONNECTION
+      labelZh: 异步消息队列模式
+      labelEn: Asynchronous message queue mode
+      required: true
+      type: select
+      values:
+        - label: 异步模式 (Redis)
+          value: "redis"
+        - label: 同步模式
+          value: "sync"
+    - default: "redis"
+      edit: true
+      envKey: CACHE_DRIVER
+      labelZh: 缓存驱动
+      labelEn: Cache driver
+      required: true
+      type: select
+      values:
+        - label: Redis 缓存
+          value: "redis"
+        - label: 文件缓存
+          value: "file"
+    - default: "127.0.0.1"
+      edit: true
+      envKey: DB_HOST
+      labelZh: 数据库 主机
+      labelEn: Database Host
+      required: true
+      type: text
+    - default: 3306
+      edit: true
+      envKey: DB_PORT
+      labelZh: 数据库 端口
+      labelEn: Database Port
+      required: true
+      rule: paramPort
+      type: number
+    - default: "dujiaoka"
+      edit: true
+      envKey: DB_USERNAME
+      labelZh: 数据库 用户名
+      labelEn: Database Username
+      required: true
+      type: text
+    - default: ""
+      edit: true
+      envKey: DB_PASSWORD
+      labelZh: 数据库 密码
+      labelEn: Database Password
+      required: true
+      type: password
+    - default: "dujiaoka"
+      edit: true
+      envKey: DB_DATABASE
+      labelZh: 数据库 名称
+      labelEn: Database Name
+      required: true
+      type: text
+    - default: "127.0.0.1"
+      edit: true
+      envKey: REDIS_HOST
+      labelZh: Redis 主机
+      labelEn: Redis Host
+      required: true
+      type: text
+    - default: 6379
+      edit: true
+      envKey: REDIS_PORT
+      labelZh: Redis 端口
+      labelEn: Redis Port
+      required: true
+      rule: paramPort
+      type: number
+    - default: ""
+      edit: true
+      envKey: REDIS_PASSWORD
+      labelZh: Redis 密码
+      labelEn: Redis Password
+      required: false
+      type: password
diff --git a/apps/dujiaoka/2.0.7/docker-compose.yml b/apps/dujiaoka/2.0.7/docker-compose.yml
index f41e0296..d0fe7c5a 100644
--- a/apps/dujiaoka/2.0.7/docker-compose.yml
+++ b/apps/dujiaoka/2.0.7/docker-compose.yml
@@ -5,18 +5,31 @@ networks:
     external: true
 
 services:
-  acg-faka:
-    image: qyg2297248353/acg-faka:v1.3.1
+  dujiaoka:
+    image: qyg2297248353/dujiaoka:v2.0.7
     container_name: ${CONTAINER_NAME}
     labels:
       createdBy: "Apps"
     restart: always
+    tty: true
     networks:
       - 1panel-network
     ports:
       - ${PANEL_APP_PORT_HTTP}:80
+      - ${PANEL_APP_PORT_API}:9000
     env_file:
       - /etc/1panel/envs/global.env
       - ${ENV_FILE:-/etc/1panel/envs/default.env}
     volumes:
-      - ${ACG_FAKA_ROOT_PATH}/data:/var/www/html
+      - ${DUJIAOKA_ROOT_PATH}/uploads:/app/public/uploads
+      - ${DUJIAOKA_ROOT_PATH}/install.lock:/app/install.lock
+    environment:
+      - WEB_DOCUMENT_ROOT=/app/public
+      - DUJIAO_ADMIN_LANGUAGE=zh_CN
+      - BROADCAST_DRIVER=log
+      - SESSION_DRIVER=file
+      - SESSION_LIFETIME=120
+      - LOG_CHANNEL=stack
+      - APP_DEBUG=false
+      - APP_ENV=local
+      - DB_CONNECTION=mysql