diff --git a/appstore/astrbot-napcat/4.17.53/docker-compose.yml b/appstore/astrbot-napcat/4.17.53/docker-compose.yml index ae96d91a0..389aade1c 100644 --- a/appstore/astrbot-napcat/4.17.53/docker-compose.yml +++ b/appstore/astrbot-napcat/4.17.53/docker-compose.yml @@ -9,7 +9,7 @@ services: - .env environment: - TZ=Asia/Shanghai - image: soulter/astrbot:v4.22.1 + image: soulter/astrbot:v4.22.2 labels: createdBy: Apps networks: diff --git a/appstore/astrbot/4.22.1/.env b/appstore/astrbot/4.22.2/.env similarity index 100% rename from appstore/astrbot/4.22.1/.env rename to appstore/astrbot/4.22.2/.env diff --git a/appstore/astrbot/4.22.1/data.yml b/appstore/astrbot/4.22.2/data.yml similarity index 100% rename from appstore/astrbot/4.22.1/data.yml rename to appstore/astrbot/4.22.2/data.yml diff --git a/appstore/astrbot/4.22.1/docker-compose.yml b/appstore/astrbot/4.22.2/docker-compose.yml similarity index 94% rename from appstore/astrbot/4.22.1/docker-compose.yml rename to appstore/astrbot/4.22.2/docker-compose.yml index b844faee4..d67d20e93 100644 --- a/appstore/astrbot/4.22.1/docker-compose.yml +++ b/appstore/astrbot/4.22.2/docker-compose.yml @@ -9,7 +9,7 @@ services: - .env environment: - TZ=Asia/Shanghai - image: soulter/astrbot:v4.22.1 + image: soulter/astrbot:v4.22.2 labels: createdBy: Apps networks: diff --git a/appstore/astrbot/4.22.1/envs/default.env b/appstore/astrbot/4.22.2/envs/default.env similarity index 100% rename from appstore/astrbot/4.22.1/envs/default.env rename to appstore/astrbot/4.22.2/envs/default.env diff --git a/appstore/astrbot/4.22.1/envs/global.env b/appstore/astrbot/4.22.2/envs/global.env similarity index 100% rename from appstore/astrbot/4.22.1/envs/global.env rename to appstore/astrbot/4.22.2/envs/global.env diff --git a/appstore/astrbot/4.22.1/scripts/init.sh b/appstore/astrbot/4.22.2/scripts/init.sh similarity index 100% rename from appstore/astrbot/4.22.1/scripts/init.sh rename to appstore/astrbot/4.22.2/scripts/init.sh diff --git a/appstore/astrbot/4.22.1/scripts/uninstall.sh b/appstore/astrbot/4.22.2/scripts/uninstall.sh similarity index 100% rename from appstore/astrbot/4.22.1/scripts/uninstall.sh rename to appstore/astrbot/4.22.2/scripts/uninstall.sh diff --git a/appstore/astrbot/4.22.1/scripts/upgrade.sh b/appstore/astrbot/4.22.2/scripts/upgrade.sh similarity index 100% rename from appstore/astrbot/4.22.1/scripts/upgrade.sh rename to appstore/astrbot/4.22.2/scripts/upgrade.sh diff --git a/appstore/bonita/0.22.2/.env b/appstore/bonita/0.23.2/.env similarity index 100% rename from appstore/bonita/0.22.2/.env rename to appstore/bonita/0.23.2/.env diff --git a/appstore/bonita/0.22.2/data.yml b/appstore/bonita/0.23.2/data.yml similarity index 100% rename from appstore/bonita/0.22.2/data.yml rename to appstore/bonita/0.23.2/data.yml diff --git a/appstore/bonita/0.22.2/docker-compose.yml b/appstore/bonita/0.23.2/docker-compose.yml similarity index 93% rename from appstore/bonita/0.22.2/docker-compose.yml rename to appstore/bonita/0.23.2/docker-compose.yml index 3bcff7b9c..41781ccad 100644 --- a/appstore/bonita/0.22.2/docker-compose.yml +++ b/appstore/bonita/0.23.2/docker-compose.yml @@ -11,7 +11,7 @@ services: - PUID=0 - PGID=0 - TZ=Asia/Shanghai - image: suwmlee/bonita:0.22.2 + image: suwmlee/bonita:0.23.2 labels: createdBy: Apps networks: diff --git a/appstore/bonita/0.22.2/envs/default.env b/appstore/bonita/0.23.2/envs/default.env similarity index 100% rename from appstore/bonita/0.22.2/envs/default.env rename to appstore/bonita/0.23.2/envs/default.env diff --git a/appstore/bonita/0.22.2/envs/global.env b/appstore/bonita/0.23.2/envs/global.env similarity index 100% rename from appstore/bonita/0.22.2/envs/global.env rename to appstore/bonita/0.23.2/envs/global.env diff --git a/appstore/bonita/0.22.2/scripts/init.sh b/appstore/bonita/0.23.2/scripts/init.sh similarity index 100% rename from appstore/bonita/0.22.2/scripts/init.sh rename to appstore/bonita/0.23.2/scripts/init.sh diff --git a/appstore/bonita/0.22.2/scripts/uninstall.sh b/appstore/bonita/0.23.2/scripts/uninstall.sh similarity index 100% rename from appstore/bonita/0.22.2/scripts/uninstall.sh rename to appstore/bonita/0.23.2/scripts/uninstall.sh diff --git a/appstore/bonita/0.22.2/scripts/upgrade.sh b/appstore/bonita/0.23.2/scripts/upgrade.sh similarity index 100% rename from appstore/bonita/0.22.2/scripts/upgrade.sh rename to appstore/bonita/0.23.2/scripts/upgrade.sh diff --git a/appstore/dujiaonext/0.1.6/docker-compose.yml b/appstore/dujiaonext/0.1.6/docker-compose.yml index 71e94f2e4..41f5224d4 100644 --- a/appstore/dujiaonext/0.1.6/docker-compose.yml +++ b/appstore/dujiaonext/0.1.6/docker-compose.yml @@ -11,7 +11,7 @@ services: condition: service_healthy environment: - TZ=Asia/Shanghai - image: dujiaonext/admin:v0.1.5 + image: dujiaonext/admin:v0.1.6 networks: - dujiao-net ports: @@ -56,7 +56,7 @@ services: condition: service_healthy environment: - TZ=Asia/Shanghai - image: dujiaonext/user:v0.1.6 + image: dujiaonext/user:v0.1.5 networks: - dujiao-net ports: diff --git a/appstore/dujiaonext/0.1.7/.env b/appstore/dujiaonext/0.1.7/.env new file mode 100644 index 000000000..912e69ae7 --- /dev/null +++ b/appstore/dujiaonext/0.1.7/.env @@ -0,0 +1,36 @@ +# Redis 服务 (前置检查) [必填] +PANEL_REDIS_TYPE=redis + +# 数据持久化路径 [必填] +DUJIAONEXT_ROOT_PATH=/home/dujiaonext + +# WebUI 端口 [必填] +PANEL_APP_PORT_HTTP=8080 + +# WebUI 后台端口 [必填] +PANEL_APP_PORT_ADMIN=8081 + +# API 端口 [必填] +PANEL_APP_PORT_API=8082 + +# 管理员用户名 [必填] +DJ_DEFAULT_ADMIN_USERNAME=admin + +# 管理员密码 [必填] +DJ_DEFAULT_ADMIN_PASSWORD= + +# JWT 密钥 [必填] +JWT_SECRET=efd8bd2b3ecdca06dba6b6213bf46e7a16b9045bda6420828eeeb8f7e36c755f + +# 用户 JWT 密钥 [必填] +USER_JWT_SECRET=d13e38a2b2d582a4f5bcfda44ae5aa9c4bd93643ff308f0e5b45833aec28af20 + +# Redis 主机 [必填] +REDIS_HOST=127.0.0.1 + +# Redis 端口 [必填] +REDIS_PORT=6379 + +# Redis 连接密码 +REDIS_PASSWORD= + diff --git a/appstore/dujiaonext/0.1.7/config/config.yml b/appstore/dujiaonext/0.1.7/config/config.yml new file mode 100644 index 000000000..ff3e3ade3 --- /dev/null +++ b/appstore/dujiaonext/0.1.7/config/config.yml @@ -0,0 +1,128 @@ +server: + host: 0.0.0.0 + port: 8080 + mode: debug + +log: + dir: "" + filename: app.log + max_size_mb: 100 + max_backups: 7 + max_age_days: 30 + compress: true + +database: + driver: sqlite + dsn: ./db/dujiao.db?_busy_timeout=5000&_journal_mode=WAL&_synchronous=NORMAL + pool: + max_open_conns: 1 + max_idle_conns: 1 + conn_max_lifetime_seconds: 0 + conn_max_idle_time_seconds: 0 + +jwt: + secret: "dev-admin-jwt-secret-change-me-please-32chars" + expire_hours: 24 + +user_jwt: + secret: "dev-user-jwt-secret-change-me-please-32chars" + expire_hours: 24 + remember_me_expire_hours: 168 + +bootstrap: + default_admin_username: "" + default_admin_password: "" + +redis: + enabled: true + host: 127.0.0.1 + port: 6379 + password: "" + db: 0 + prefix: "dj" + +queue: + enabled: true + host: 127.0.0.1 + port: 6379 + password: "" + db: 1 + concurrency: 10 + queues: + default: 10 + critical: 5 + +upload: + max_size: 10485760 + allowed_types: + - image/jpeg + - image/png + - image/gif + - image/webp + allowed_extensions: + - .jpg + - .jpeg + - .png + - .gif + - .webp + max_width: 4096 + max_height: 4096 + +cors: + allowed_origins: + - "*" + allowed_methods: + - GET + - POST + - PUT + - PATCH + - DELETE + - OPTIONS + allowed_headers: + - Content-Type + - Content-Length + - Accept-Encoding + - Authorization + - Cache-Control + - X-Requested-With + - X-CSRF-Token + allow_credentials: true + max_age: 600 + +security: + login_rate_limit: + window_seconds: 300 + max_attempts: 5 + block_seconds: 900 + password_policy: + min_length: 8 + require_upper: true + require_lower: true + 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 + port: 465 + username: your-username + password: your-password + from: your-email + from_name: your-name + use_tls: false + use_ssl: true + verify_code: + expire_minutes: 10 + send_interval_seconds: 60 + max_attempts: 5 + length: 6 + +order: + payment_expire_minutes: 15 diff --git a/appstore/dujiaonext/0.1.7/data.yml b/appstore/dujiaonext/0.1.7/data.yml new file mode 100644 index 000000000..dcec017d2 --- /dev/null +++ b/appstore/dujiaonext/0.1.7/data.yml @@ -0,0 +1,96 @@ +additionalProperties: + formFields: + - child: + default: "" + envKey: PANEL_REDIS_SERVICE + required: true + type: service + default: redis + envKey: PANEL_REDIS_TYPE + labelZh: Redis 服务 (前置检查) + labelEn: Redis Service (Pre-check) + required: true + type: apps + values: + - label: Redis + value: redis + - default: "/home/dujiaonext" + edit: true + envKey: DUJIAONEXT_ROOT_PATH + labelZh: 数据持久化路径 + labelEn: Data persistence path + required: true + type: text + - default: 8080 + edit: true + envKey: PANEL_APP_PORT_HTTP + labelZh: WebUI 端口 + labelEn: WebUI port + required: true + rule: paramPort + type: number + - default: 8081 + edit: true + envKey: PANEL_APP_PORT_ADMIN + labelZh: WebUI 后台端口 + labelEn: WebUI Admin Port + required: true + rule: paramPort + type: number + - default: 8082 + edit: true + envKey: PANEL_APP_PORT_API + labelZh: API 端口 + labelEn: API Port + required: true + rule: paramPort + type: number + - default: "admin" + edit: true + envKey: DJ_DEFAULT_ADMIN_USERNAME + labelZh: 管理员用户名 + labelEn: Admin Username + required: true + type: text + - default: "" + edit: true + envKey: DJ_DEFAULT_ADMIN_PASSWORD + labelZh: 管理员密码 + labelEn: Admin Password + required: true + type: password + - default: "efd8bd2b3ecdca06dba6b6213bf46e7a16b9045bda6420828eeeb8f7e36c755f" + edit: true + envKey: JWT_SECRET + labelZh: JWT 密钥 + labelEn: JWT Secret + required: true + type: text + - default: "d13e38a2b2d582a4f5bcfda44ae5aa9c4bd93643ff308f0e5b45833aec28af20" + edit: true + envKey: USER_JWT_SECRET + labelZh: 用户 JWT 密钥 + labelEn: User JWT Secret + 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 + type: number + - default: "" + edit: true + envKey: REDIS_PASSWORD + labelZh: Redis 连接密码 + labelEn: Redis Connection Password + required: false + type: password diff --git a/appstore/dujiaonext/0.1.7/docker-compose.yml b/appstore/dujiaonext/0.1.7/docker-compose.yml new file mode 100644 index 000000000..03ddf81bc --- /dev/null +++ b/appstore/dujiaonext/0.1.7/docker-compose.yml @@ -0,0 +1,64 @@ +networks: + 1panel-network: + external: true + dujiao-net: + driver: bridge +services: + dujiaonext-admin: + container_name: admin-dujiaonext + depends_on: + dujiaonext-api: + condition: service_healthy + environment: + - TZ=Asia/Shanghai + image: dujiaonext/admin:v0.1.5 + networks: + - dujiao-net + ports: + - ${PANEL_APP_PORT_ADMIN}:80 + restart: always + dujiaonext-api: + container_name: dujiaonext + env_file: + - ./envs/global.env + - .env + environment: + - TZ=Asia/Shanghai + - QUEUE_HOST=${REDIS_HOST:-} + - QUEUE_PORT=${REDIS_PORT:-} + - QUEUE_PASSWORD=${REDIS_PASSWORD:-} + healthcheck: + interval: 10s + retries: 10 + test: + - CMD + - wget + - -qO- + - http://127.0.0.1:8080/health + timeout: 3s + image: dujiaonext/api:v0.1.7 + labels: + createdBy: Apps + networks: + - dujiao-net + ports: + - ${PANEL_APP_PORT_API}:8080 + restart: always + volumes: + - ${DUJIAONEXT_ROOT_PATH}/config/config.yml:/app/config.yml:ro + - ${DUJIAONEXT_ROOT_PATH}/data/db:/app/db + - ${DUJIAONEXT_ROOT_PATH}/data/uploads:/app/uploads + - ${DUJIAONEXT_ROOT_PATH}/data/logs:/app/logs + dujiaonext-user: + container_name: user-dujiaonext + depends_on: + dujiaonext-api: + condition: service_healthy + environment: + - TZ=Asia/Shanghai + image: dujiaonext/user:v0.1.7 + networks: + - dujiao-net + ports: + - ${PANEL_APP_PORT_HTTP}:80 + restart: always diff --git a/appstore/ech0/4.2.2/envs/default.env b/appstore/dujiaonext/0.1.7/envs/default.env similarity index 100% rename from appstore/ech0/4.2.2/envs/default.env rename to appstore/dujiaonext/0.1.7/envs/default.env diff --git a/appstore/ech0/4.2.2/envs/global.env b/appstore/dujiaonext/0.1.7/envs/global.env similarity index 100% rename from appstore/ech0/4.2.2/envs/global.env rename to appstore/dujiaonext/0.1.7/envs/global.env diff --git a/appstore/dujiaonext/0.1.7/scripts/init.sh b/appstore/dujiaonext/0.1.7/scripts/init.sh new file mode 100644 index 000000000..e875889bd --- /dev/null +++ b/appstore/dujiaonext/0.1.7/scripts/init.sh @@ -0,0 +1,30 @@ +#!/bin/bash + +if [ -f .env ]; then + source .env + + # setup-1 add default values + CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env + echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env + + mkdir -p "$DUJIAONEXT_ROOT_PATH" + mkdir -p "$DUJIAONEXT_ROOT_PATH/config" + mkdir -p "$DUJIAONEXT_ROOT_PATH/data" + mkdir -p "$DUJIAONEXT_ROOT_PATH/data/db" + mkdir -p "$DUJIAONEXT_ROOT_PATH/data/uploads" + mkdir -p "$DUJIAONEXT_ROOT_PATH/data/logs" + mkdir -p "$DUJIAONEXT_ROOT_PATH/data/redis" + mkdir -p "$DUJIAONEXT_ROOT_PATH/data/postgres" + + cp ./config/config.yml "$DUJIAONEXT_ROOT_PATH/config/config.yml" + + chmod -R 0777 "$DUJIAONEXT_ROOT_PATH" + + echo "Check Finish." + +else + echo "Error: .env file not found." +fi diff --git a/appstore/ech0/4.2.2/scripts/uninstall.sh b/appstore/dujiaonext/0.1.7/scripts/uninstall.sh similarity index 100% rename from appstore/ech0/4.2.2/scripts/uninstall.sh rename to appstore/dujiaonext/0.1.7/scripts/uninstall.sh diff --git a/appstore/ech0/4.2.2/scripts/upgrade.sh b/appstore/dujiaonext/0.1.7/scripts/upgrade.sh similarity index 100% rename from appstore/ech0/4.2.2/scripts/upgrade.sh rename to appstore/dujiaonext/0.1.7/scripts/upgrade.sh diff --git a/appstore/ech0/4.2.2/.env b/appstore/ech0/4.2.3/.env similarity index 100% rename from appstore/ech0/4.2.2/.env rename to appstore/ech0/4.2.3/.env diff --git a/appstore/ech0/4.2.2/data.yml b/appstore/ech0/4.2.3/data.yml similarity index 100% rename from appstore/ech0/4.2.2/data.yml rename to appstore/ech0/4.2.3/data.yml diff --git a/appstore/ech0/4.2.2/docker-compose.yml b/appstore/ech0/4.2.3/docker-compose.yml similarity index 93% rename from appstore/ech0/4.2.2/docker-compose.yml rename to appstore/ech0/4.2.3/docker-compose.yml index 90d581c9d..b4b463144 100644 --- a/appstore/ech0/4.2.2/docker-compose.yml +++ b/appstore/ech0/4.2.3/docker-compose.yml @@ -10,7 +10,7 @@ services: environment: - TZ=Asia/Shanghai - HTTPS_PROXY=${HTTP_PROXY} - image: sn0wl1n/ech0:v4.2.2 + image: sn0wl1n/ech0:v4.2.3 labels: createdBy: Apps networks: diff --git a/appstore/mdc-ng/1.35.1/envs/default.env b/appstore/ech0/4.2.3/envs/default.env similarity index 100% rename from appstore/mdc-ng/1.35.1/envs/default.env rename to appstore/ech0/4.2.3/envs/default.env diff --git a/appstore/mdc-ng/1.35.1/envs/global.env b/appstore/ech0/4.2.3/envs/global.env similarity index 100% rename from appstore/mdc-ng/1.35.1/envs/global.env rename to appstore/ech0/4.2.3/envs/global.env diff --git a/appstore/ech0/4.2.2/scripts/init.sh b/appstore/ech0/4.2.3/scripts/init.sh similarity index 100% rename from appstore/ech0/4.2.2/scripts/init.sh rename to appstore/ech0/4.2.3/scripts/init.sh diff --git a/appstore/mdc-ng/1.35.1/scripts/uninstall.sh b/appstore/ech0/4.2.3/scripts/uninstall.sh similarity index 100% rename from appstore/mdc-ng/1.35.1/scripts/uninstall.sh rename to appstore/ech0/4.2.3/scripts/uninstall.sh diff --git a/appstore/mdc-ng/1.35.1/scripts/upgrade.sh b/appstore/ech0/4.2.3/scripts/upgrade.sh similarity index 100% rename from appstore/mdc-ng/1.35.1/scripts/upgrade.sh rename to appstore/ech0/4.2.3/scripts/upgrade.sh diff --git a/appstore/mdc-ng/1.35.1/.env b/appstore/mdc-ng/1.36.0/.env similarity index 100% rename from appstore/mdc-ng/1.35.1/.env rename to appstore/mdc-ng/1.36.0/.env diff --git a/appstore/mdc-ng/1.35.1/data.yml b/appstore/mdc-ng/1.36.0/data.yml similarity index 100% rename from appstore/mdc-ng/1.35.1/data.yml rename to appstore/mdc-ng/1.36.0/data.yml diff --git a/appstore/mdc-ng/1.35.1/docker-compose.yml b/appstore/mdc-ng/1.36.0/docker-compose.yml similarity index 95% rename from appstore/mdc-ng/1.35.1/docker-compose.yml rename to appstore/mdc-ng/1.36.0/docker-compose.yml index e0fce2de4..d5e35e956 100644 --- a/appstore/mdc-ng/1.35.1/docker-compose.yml +++ b/appstore/mdc-ng/1.36.0/docker-compose.yml @@ -7,7 +7,7 @@ services: env_file: - ./envs/global.env - .env - image: mdcng/mdc:v1.35.1 + image: mdcng/mdc:v1.36.0 labels: createdBy: Apps networks: diff --git a/appstore/telegram-search/1.2.0/envs/default.env b/appstore/mdc-ng/1.36.0/envs/default.env similarity index 100% rename from appstore/telegram-search/1.2.0/envs/default.env rename to appstore/mdc-ng/1.36.0/envs/default.env diff --git a/appstore/telegram-search/1.2.0/envs/global.env b/appstore/mdc-ng/1.36.0/envs/global.env similarity index 100% rename from appstore/telegram-search/1.2.0/envs/global.env rename to appstore/mdc-ng/1.36.0/envs/global.env diff --git a/appstore/mdc-ng/1.35.1/scripts/init.sh b/appstore/mdc-ng/1.36.0/scripts/init.sh similarity index 100% rename from appstore/mdc-ng/1.35.1/scripts/init.sh rename to appstore/mdc-ng/1.36.0/scripts/init.sh diff --git a/appstore/telegram-search/1.2.0/scripts/uninstall.sh b/appstore/mdc-ng/1.36.0/scripts/uninstall.sh similarity index 100% rename from appstore/telegram-search/1.2.0/scripts/uninstall.sh rename to appstore/mdc-ng/1.36.0/scripts/uninstall.sh diff --git a/appstore/telegram-search/1.2.0/scripts/upgrade.sh b/appstore/mdc-ng/1.36.0/scripts/upgrade.sh similarity index 100% rename from appstore/telegram-search/1.2.0/scripts/upgrade.sh rename to appstore/mdc-ng/1.36.0/scripts/upgrade.sh diff --git a/appstore/telegram-search/1.2.0/.env b/appstore/telegram-search/1.2.1/.env similarity index 100% rename from appstore/telegram-search/1.2.0/.env rename to appstore/telegram-search/1.2.1/.env diff --git a/appstore/telegram-search/1.2.0/config/config.yaml b/appstore/telegram-search/1.2.1/config/config.yaml similarity index 100% rename from appstore/telegram-search/1.2.0/config/config.yaml rename to appstore/telegram-search/1.2.1/config/config.yaml diff --git a/appstore/telegram-search/1.2.0/config/init.sql b/appstore/telegram-search/1.2.1/config/init.sql similarity index 100% rename from appstore/telegram-search/1.2.0/config/init.sql rename to appstore/telegram-search/1.2.1/config/init.sql diff --git a/appstore/telegram-search/1.2.0/data.yml b/appstore/telegram-search/1.2.1/data.yml similarity index 100% rename from appstore/telegram-search/1.2.0/data.yml rename to appstore/telegram-search/1.2.1/data.yml diff --git a/appstore/telegram-search/1.2.0/docker-compose.yml b/appstore/telegram-search/1.2.1/docker-compose.yml similarity index 96% rename from appstore/telegram-search/1.2.0/docker-compose.yml rename to appstore/telegram-search/1.2.1/docker-compose.yml index b5155304c..9b08a8048 100644 --- a/appstore/telegram-search/1.2.0/docker-compose.yml +++ b/appstore/telegram-search/1.2.1/docker-compose.yml @@ -14,7 +14,7 @@ services: - TZ=Asia/Shanghai - DATABASE_TYPE=postgres - DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@telegram_search_pgvector:5432/${POSTGRES_DATABASE} - image: ghcr.io/groupultra/telegram-search:1.2.0 + image: ghcr.io/groupultra/telegram-search:1.2.1 labels: createdBy: Apps networks: diff --git a/dockge/ech0_3_1_4/envs/default.env b/appstore/telegram-search/1.2.1/envs/default.env similarity index 100% rename from dockge/ech0_3_1_4/envs/default.env rename to appstore/telegram-search/1.2.1/envs/default.env diff --git a/dockge/ech0_3_1_4/envs/global.env b/appstore/telegram-search/1.2.1/envs/global.env similarity index 100% rename from dockge/ech0_3_1_4/envs/global.env rename to appstore/telegram-search/1.2.1/envs/global.env diff --git a/appstore/telegram-search/1.2.0/scripts/init.sh b/appstore/telegram-search/1.2.1/scripts/init.sh similarity index 100% rename from appstore/telegram-search/1.2.0/scripts/init.sh rename to appstore/telegram-search/1.2.1/scripts/init.sh diff --git a/appstore/telegram-search/1.2.1/scripts/uninstall.sh b/appstore/telegram-search/1.2.1/scripts/uninstall.sh new file mode 100644 index 000000000..c86c4fbca --- /dev/null +++ b/appstore/telegram-search/1.2.1/scripts/uninstall.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +if [ -f .env ]; then + source .env + + echo "Check Finish." + +else + echo "Error: .env file not found." +fi diff --git a/appstore/telegram-search/1.2.1/scripts/upgrade.sh b/appstore/telegram-search/1.2.1/scripts/upgrade.sh new file mode 100644 index 000000000..07fb8c3fe --- /dev/null +++ b/appstore/telegram-search/1.2.1/scripts/upgrade.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +if [ -f .env ]; then + source .env + + # setup-1 add default values + CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env + echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env + + echo "Check Finish." + +else + echo "Error: .env file not found." +fi diff --git a/dockge/astrbot-napcat/docker-compose.yml b/dockge/astrbot-napcat/docker-compose.yml index ae96d91a0..389aade1c 100644 --- a/dockge/astrbot-napcat/docker-compose.yml +++ b/dockge/astrbot-napcat/docker-compose.yml @@ -9,7 +9,7 @@ services: - .env environment: - TZ=Asia/Shanghai - image: soulter/astrbot:v4.22.1 + image: soulter/astrbot:v4.22.2 labels: createdBy: Apps networks: diff --git a/dockge/astrbot/docker-compose.yml b/dockge/astrbot/docker-compose.yml index b844faee4..d67d20e93 100644 --- a/dockge/astrbot/docker-compose.yml +++ b/dockge/astrbot/docker-compose.yml @@ -9,7 +9,7 @@ services: - .env environment: - TZ=Asia/Shanghai - image: soulter/astrbot:v4.22.1 + image: soulter/astrbot:v4.22.2 labels: createdBy: Apps networks: diff --git a/dockge/bonita/docker-compose.yml b/dockge/bonita/docker-compose.yml index 3bcff7b9c..41781ccad 100644 --- a/dockge/bonita/docker-compose.yml +++ b/dockge/bonita/docker-compose.yml @@ -11,7 +11,7 @@ services: - PUID=0 - PGID=0 - TZ=Asia/Shanghai - image: suwmlee/bonita:0.22.2 + image: suwmlee/bonita:0.23.2 labels: createdBy: Apps networks: diff --git a/dockge/dujiaonext/docker-compose.yml b/dockge/dujiaonext/docker-compose.yml index 71e94f2e4..41f5224d4 100644 --- a/dockge/dujiaonext/docker-compose.yml +++ b/dockge/dujiaonext/docker-compose.yml @@ -11,7 +11,7 @@ services: condition: service_healthy environment: - TZ=Asia/Shanghai - image: dujiaonext/admin:v0.1.5 + image: dujiaonext/admin:v0.1.6 networks: - dujiao-net ports: @@ -56,7 +56,7 @@ services: condition: service_healthy environment: - TZ=Asia/Shanghai - image: dujiaonext/user:v0.1.6 + image: dujiaonext/user:v0.1.5 networks: - dujiao-net ports: diff --git a/dockge/dujiaonext_0_1_7/.env b/dockge/dujiaonext_0_1_7/.env new file mode 100644 index 000000000..912e69ae7 --- /dev/null +++ b/dockge/dujiaonext_0_1_7/.env @@ -0,0 +1,36 @@ +# Redis 服务 (前置检查) [必填] +PANEL_REDIS_TYPE=redis + +# 数据持久化路径 [必填] +DUJIAONEXT_ROOT_PATH=/home/dujiaonext + +# WebUI 端口 [必填] +PANEL_APP_PORT_HTTP=8080 + +# WebUI 后台端口 [必填] +PANEL_APP_PORT_ADMIN=8081 + +# API 端口 [必填] +PANEL_APP_PORT_API=8082 + +# 管理员用户名 [必填] +DJ_DEFAULT_ADMIN_USERNAME=admin + +# 管理员密码 [必填] +DJ_DEFAULT_ADMIN_PASSWORD= + +# JWT 密钥 [必填] +JWT_SECRET=efd8bd2b3ecdca06dba6b6213bf46e7a16b9045bda6420828eeeb8f7e36c755f + +# 用户 JWT 密钥 [必填] +USER_JWT_SECRET=d13e38a2b2d582a4f5bcfda44ae5aa9c4bd93643ff308f0e5b45833aec28af20 + +# Redis 主机 [必填] +REDIS_HOST=127.0.0.1 + +# Redis 端口 [必填] +REDIS_PORT=6379 + +# Redis 连接密码 +REDIS_PASSWORD= + diff --git a/dockge/dujiaonext_0_1_7/config/config.yml b/dockge/dujiaonext_0_1_7/config/config.yml new file mode 100644 index 000000000..ff3e3ade3 --- /dev/null +++ b/dockge/dujiaonext_0_1_7/config/config.yml @@ -0,0 +1,128 @@ +server: + host: 0.0.0.0 + port: 8080 + mode: debug + +log: + dir: "" + filename: app.log + max_size_mb: 100 + max_backups: 7 + max_age_days: 30 + compress: true + +database: + driver: sqlite + dsn: ./db/dujiao.db?_busy_timeout=5000&_journal_mode=WAL&_synchronous=NORMAL + pool: + max_open_conns: 1 + max_idle_conns: 1 + conn_max_lifetime_seconds: 0 + conn_max_idle_time_seconds: 0 + +jwt: + secret: "dev-admin-jwt-secret-change-me-please-32chars" + expire_hours: 24 + +user_jwt: + secret: "dev-user-jwt-secret-change-me-please-32chars" + expire_hours: 24 + remember_me_expire_hours: 168 + +bootstrap: + default_admin_username: "" + default_admin_password: "" + +redis: + enabled: true + host: 127.0.0.1 + port: 6379 + password: "" + db: 0 + prefix: "dj" + +queue: + enabled: true + host: 127.0.0.1 + port: 6379 + password: "" + db: 1 + concurrency: 10 + queues: + default: 10 + critical: 5 + +upload: + max_size: 10485760 + allowed_types: + - image/jpeg + - image/png + - image/gif + - image/webp + allowed_extensions: + - .jpg + - .jpeg + - .png + - .gif + - .webp + max_width: 4096 + max_height: 4096 + +cors: + allowed_origins: + - "*" + allowed_methods: + - GET + - POST + - PUT + - PATCH + - DELETE + - OPTIONS + allowed_headers: + - Content-Type + - Content-Length + - Accept-Encoding + - Authorization + - Cache-Control + - X-Requested-With + - X-CSRF-Token + allow_credentials: true + max_age: 600 + +security: + login_rate_limit: + window_seconds: 300 + max_attempts: 5 + block_seconds: 900 + password_policy: + min_length: 8 + require_upper: true + require_lower: true + 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 + port: 465 + username: your-username + password: your-password + from: your-email + from_name: your-name + use_tls: false + use_ssl: true + verify_code: + expire_minutes: 10 + send_interval_seconds: 60 + max_attempts: 5 + length: 6 + +order: + payment_expire_minutes: 15 diff --git a/dockge/dujiaonext_0_1_7/docker-compose.yml b/dockge/dujiaonext_0_1_7/docker-compose.yml new file mode 100644 index 000000000..03ddf81bc --- /dev/null +++ b/dockge/dujiaonext_0_1_7/docker-compose.yml @@ -0,0 +1,64 @@ +networks: + 1panel-network: + external: true + dujiao-net: + driver: bridge +services: + dujiaonext-admin: + container_name: admin-dujiaonext + depends_on: + dujiaonext-api: + condition: service_healthy + environment: + - TZ=Asia/Shanghai + image: dujiaonext/admin:v0.1.5 + networks: + - dujiao-net + ports: + - ${PANEL_APP_PORT_ADMIN}:80 + restart: always + dujiaonext-api: + container_name: dujiaonext + env_file: + - ./envs/global.env + - .env + environment: + - TZ=Asia/Shanghai + - QUEUE_HOST=${REDIS_HOST:-} + - QUEUE_PORT=${REDIS_PORT:-} + - QUEUE_PASSWORD=${REDIS_PASSWORD:-} + healthcheck: + interval: 10s + retries: 10 + test: + - CMD + - wget + - -qO- + - http://127.0.0.1:8080/health + timeout: 3s + image: dujiaonext/api:v0.1.7 + labels: + createdBy: Apps + networks: + - dujiao-net + ports: + - ${PANEL_APP_PORT_API}:8080 + restart: always + volumes: + - ${DUJIAONEXT_ROOT_PATH}/config/config.yml:/app/config.yml:ro + - ${DUJIAONEXT_ROOT_PATH}/data/db:/app/db + - ${DUJIAONEXT_ROOT_PATH}/data/uploads:/app/uploads + - ${DUJIAONEXT_ROOT_PATH}/data/logs:/app/logs + dujiaonext-user: + container_name: user-dujiaonext + depends_on: + dujiaonext-api: + condition: service_healthy + environment: + - TZ=Asia/Shanghai + image: dujiaonext/user:v0.1.7 + networks: + - dujiao-net + ports: + - ${PANEL_APP_PORT_HTTP}:80 + restart: always diff --git a/dockge/dujiaonext_0_1_7/envs/default.env b/dockge/dujiaonext_0_1_7/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/dockge/dujiaonext_0_1_7/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/dockge/dujiaonext_0_1_7/envs/global.env b/dockge/dujiaonext_0_1_7/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/dockge/dujiaonext_0_1_7/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/dockge/ech0/docker-compose.yml b/dockge/ech0/docker-compose.yml index 90d581c9d..ab7bb4f72 100644 --- a/dockge/ech0/docker-compose.yml +++ b/dockge/ech0/docker-compose.yml @@ -10,7 +10,7 @@ services: environment: - TZ=Asia/Shanghai - HTTPS_PROXY=${HTTP_PROXY} - image: sn0wl1n/ech0:v4.2.2 + image: sn0wl1n/ech0:v3.1.4 labels: createdBy: Apps networks: diff --git a/dockge/ech0_3_1_4/.env b/dockge/ech0_4_2_3/.env similarity index 100% rename from dockge/ech0_3_1_4/.env rename to dockge/ech0_4_2_3/.env diff --git a/dockge/ech0_3_1_4/docker-compose.yml b/dockge/ech0_4_2_3/docker-compose.yml similarity index 93% rename from dockge/ech0_3_1_4/docker-compose.yml rename to dockge/ech0_4_2_3/docker-compose.yml index ab7bb4f72..b4b463144 100644 --- a/dockge/ech0_3_1_4/docker-compose.yml +++ b/dockge/ech0_4_2_3/docker-compose.yml @@ -10,7 +10,7 @@ services: environment: - TZ=Asia/Shanghai - HTTPS_PROXY=${HTTP_PROXY} - image: sn0wl1n/ech0:v3.1.4 + image: sn0wl1n/ech0:v4.2.3 labels: createdBy: Apps networks: diff --git a/dockge/ech0_4_2_3/envs/default.env b/dockge/ech0_4_2_3/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/dockge/ech0_4_2_3/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/dockge/ech0_4_2_3/envs/global.env b/dockge/ech0_4_2_3/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/dockge/ech0_4_2_3/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/dockge/mdc-ng/docker-compose.yml b/dockge/mdc-ng/docker-compose.yml index e0fce2de4..d5e35e956 100644 --- a/dockge/mdc-ng/docker-compose.yml +++ b/dockge/mdc-ng/docker-compose.yml @@ -7,7 +7,7 @@ services: env_file: - ./envs/global.env - .env - image: mdcng/mdc:v1.35.1 + image: mdcng/mdc:v1.36.0 labels: createdBy: Apps networks: diff --git a/dockge/telegram-search/docker-compose.yml b/dockge/telegram-search/docker-compose.yml index b5155304c..9b08a8048 100644 --- a/dockge/telegram-search/docker-compose.yml +++ b/dockge/telegram-search/docker-compose.yml @@ -14,7 +14,7 @@ services: - TZ=Asia/Shanghai - DATABASE_TYPE=postgres - DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@telegram_search_pgvector:5432/${POSTGRES_DATABASE} - image: ghcr.io/groupultra/telegram-search:1.2.0 + image: ghcr.io/groupultra/telegram-search:1.2.1 labels: createdBy: Apps networks: