diff --git a/apps/dujiaonext/0.1.1/config/config.yml b/apps/dujiaonext/0.1.1/config/config.yml index f5d0712de..ff3e3ade3 100644 --- a/apps/dujiaonext/0.1.1/config/config.yml +++ b/apps/dujiaonext/0.1.1/config/config.yml @@ -13,7 +13,7 @@ log: database: driver: sqlite - dsn: ./db/dujiao.db + dsn: ./db/dujiao.db?_busy_timeout=5000&_journal_mode=WAL&_synchronous=NORMAL pool: max_open_conns: 1 max_idle_conns: 1 @@ -21,20 +21,17 @@ database: conn_max_idle_time_seconds: 0 jwt: - secret: your-secret-key-change-in-production-please + secret: "dev-admin-jwt-secret-change-me-please-32chars" expire_hours: 24 user_jwt: - secret: user-secret-key-change-in-production-please + secret: "dev-user-jwt-secret-change-me-please-32chars" expire_hours: 24 remember_me_expire_hours: 168 -telegram_auth: - enabled: false - bot_username: "" - bot_token: "" - login_expire_seconds: 300 - replay_ttl_seconds: 300 +bootstrap: + default_admin_username: "" + default_admin_password: "" redis: enabled: true @@ -104,6 +101,13 @@ security: require_number: true require_special: false +telegram_auth: + enabled: false + bot_username: "" + bot_token: "" + login_expire_seconds: 300 + replay_ttl_seconds: 300 + email: enabled: true host: smtp.xxx.com diff --git a/apps/dujiaonext/0.1.1/data.yml b/apps/dujiaonext/0.1.1/data.yml index 37121984e..53148f87e 100644 --- a/apps/dujiaonext/0.1.1/data.yml +++ b/apps/dujiaonext/0.1.1/data.yml @@ -94,10 +94,3 @@ additionalProperties: labelEn: Redis Connection Password required: false type: password - - default: 0 - edit: true - envKey: REDIS_DB - labelZh: Redis 数据库索引 - labelEn: Redis Database Index - required: true - type: number diff --git a/apps/dujiaonext/0.1.1/docker-compose.yml b/apps/dujiaonext/0.1.1/docker-compose.yml index 1a9ea31d6..f465c64ee 100644 --- a/apps/dujiaonext/0.1.1/docker-compose.yml +++ b/apps/dujiaonext/0.1.1/docker-compose.yml @@ -28,7 +28,6 @@ services: - QUEUE_HOST=${REDIS_HOST:-} - QUEUE_PORT=${REDIS_PORT:-} - QUEUE_PASSWORD=${REDIS_PASSWORD:-} - - QUEUE_DB=${REDIS_DB:-} healthcheck: test: [ "CMD", "wget", "-qO-", "http://127.0.0.1:8080/health" ] interval: 10s @@ -46,9 +45,6 @@ services: - dujiao-net ports: - ${PANEL_APP_PORT_ADMIN}:80 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} environment: - TZ=Asia/Shanghai @@ -63,8 +59,5 @@ services: - dujiao-net ports: - ${PANEL_APP_PORT_HTTP}:80 - env_file: - - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - - ${ENV_FILE:-/etc/1panel/envs/default.env} environment: - TZ=Asia/Shanghai diff --git a/apps/dujiaonext/0.1.1/scripts/init.sh b/apps/dujiaonext/0.1.1/scripts/init.sh index 9949f675a..e875889bd 100644 --- a/apps/dujiaonext/0.1.1/scripts/init.sh +++ b/apps/dujiaonext/0.1.1/scripts/init.sh @@ -21,7 +21,7 @@ if [ -f .env ]; then cp ./config/config.yml "$DUJIAONEXT_ROOT_PATH/config/config.yml" - chmod -R 777 "$DUJIAONEXT_ROOT_PATH/data" + chmod -R 0777 "$DUJIAONEXT_ROOT_PATH" echo "Check Finish."