diff --git a/appstore/ani-rss/3.0.8/.env b/appstore/ani-rss/3.0.9/.env similarity index 100% rename from appstore/ani-rss/3.0.8/.env rename to appstore/ani-rss/3.0.9/.env diff --git a/appstore/ani-rss/3.0.8/data.yml b/appstore/ani-rss/3.0.9/data.yml similarity index 100% rename from appstore/ani-rss/3.0.8/data.yml rename to appstore/ani-rss/3.0.9/data.yml diff --git a/appstore/ani-rss/3.0.8/docker-compose.yml b/appstore/ani-rss/3.0.9/docker-compose.yml similarity index 95% rename from appstore/ani-rss/3.0.8/docker-compose.yml rename to appstore/ani-rss/3.0.9/docker-compose.yml index ded3b5a5e..b09ec631a 100644 --- a/appstore/ani-rss/3.0.8/docker-compose.yml +++ b/appstore/ani-rss/3.0.9/docker-compose.yml @@ -14,7 +14,7 @@ services: - PORT=7789 - CONFIG=/config - TZ=Asia/Shanghai - image: wushuo894/ani-rss:v3.0.8 + image: wushuo894/ani-rss:v3.0.9 labels: createdBy: Apps networks: diff --git a/appstore/ani-rss/3.0.8/envs/default.env b/appstore/ani-rss/3.0.9/envs/default.env similarity index 100% rename from appstore/ani-rss/3.0.8/envs/default.env rename to appstore/ani-rss/3.0.9/envs/default.env diff --git a/appstore/ani-rss/3.0.8/envs/global.env b/appstore/ani-rss/3.0.9/envs/global.env similarity index 100% rename from appstore/ani-rss/3.0.8/envs/global.env rename to appstore/ani-rss/3.0.9/envs/global.env diff --git a/appstore/ani-rss/3.0.8/scripts/init.sh b/appstore/ani-rss/3.0.9/scripts/init.sh similarity index 100% rename from appstore/ani-rss/3.0.8/scripts/init.sh rename to appstore/ani-rss/3.0.9/scripts/init.sh diff --git a/appstore/ani-rss/3.0.8/scripts/uninstall.sh b/appstore/ani-rss/3.0.9/scripts/uninstall.sh similarity index 100% rename from appstore/ani-rss/3.0.8/scripts/uninstall.sh rename to appstore/ani-rss/3.0.9/scripts/uninstall.sh diff --git a/appstore/ani-rss/3.0.8/scripts/upgrade.sh b/appstore/ani-rss/3.0.9/scripts/upgrade.sh similarity index 100% rename from appstore/ani-rss/3.0.8/scripts/upgrade.sh rename to appstore/ani-rss/3.0.9/scripts/upgrade.sh diff --git a/appstore/astrbot-napcat/4.17.46/.env b/appstore/astrbot-napcat/4.17.47/.env similarity index 100% rename from appstore/astrbot-napcat/4.17.46/.env rename to appstore/astrbot-napcat/4.17.47/.env diff --git a/appstore/astrbot-napcat/4.17.46/data.yml b/appstore/astrbot-napcat/4.17.47/data.yml similarity index 100% rename from appstore/astrbot-napcat/4.17.46/data.yml rename to appstore/astrbot-napcat/4.17.47/data.yml diff --git a/appstore/astrbot-napcat/4.17.46/docker-compose.yml b/appstore/astrbot-napcat/4.17.47/docker-compose.yml similarity index 96% rename from appstore/astrbot-napcat/4.17.46/docker-compose.yml rename to appstore/astrbot-napcat/4.17.47/docker-compose.yml index a786409d8..d23cc0aa3 100644 --- a/appstore/astrbot-napcat/4.17.46/docker-compose.yml +++ b/appstore/astrbot-napcat/4.17.47/docker-compose.yml @@ -36,7 +36,7 @@ services: - MODE=astrbot - NAPCAT_UID=${NAPCAT_UID:-1000} - NAPCAT_GID=${NAPCAT_GID:-1000} - image: mlikiowa/napcat-docker:v4.17.46 + image: mlikiowa/napcat-docker:v4.17.47 mac_address: ${NAPCAT_MAC_ADDRESS:-02:42:ac:11:00:02} networks: - 1panel-network diff --git a/appstore/astrbot-napcat/4.17.46/envs/default.env b/appstore/astrbot-napcat/4.17.47/envs/default.env similarity index 100% rename from appstore/astrbot-napcat/4.17.46/envs/default.env rename to appstore/astrbot-napcat/4.17.47/envs/default.env diff --git a/appstore/astrbot-napcat/4.17.46/envs/global.env b/appstore/astrbot-napcat/4.17.47/envs/global.env similarity index 100% rename from appstore/astrbot-napcat/4.17.46/envs/global.env rename to appstore/astrbot-napcat/4.17.47/envs/global.env diff --git a/appstore/astrbot-napcat/4.17.46/scripts/init.sh b/appstore/astrbot-napcat/4.17.47/scripts/init.sh similarity index 100% rename from appstore/astrbot-napcat/4.17.46/scripts/init.sh rename to appstore/astrbot-napcat/4.17.47/scripts/init.sh diff --git a/appstore/astrbot-napcat/4.17.46/scripts/uninstall.sh b/appstore/astrbot-napcat/4.17.47/scripts/uninstall.sh similarity index 100% rename from appstore/astrbot-napcat/4.17.46/scripts/uninstall.sh rename to appstore/astrbot-napcat/4.17.47/scripts/uninstall.sh diff --git a/appstore/astrbot-napcat/4.17.46/scripts/upgrade.sh b/appstore/astrbot-napcat/4.17.47/scripts/upgrade.sh similarity index 100% rename from appstore/astrbot-napcat/4.17.46/scripts/upgrade.sh rename to appstore/astrbot-napcat/4.17.47/scripts/upgrade.sh diff --git a/appstore/dujiaonext/0.1.0/.env b/appstore/dujiaonext/0.1.0/.env new file mode 100644 index 000000000..e77160ab5 --- /dev/null +++ b/appstore/dujiaonext/0.1.0/.env @@ -0,0 +1,39 @@ +# 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= + +# 管理员密码 [必填] +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= + +# Redis 数据库索引 [必填] +REDIS_DB=0 + diff --git a/appstore/dujiaonext/0.1.0/config/config.yml b/appstore/dujiaonext/0.1.0/config/config.yml new file mode 100644 index 000000000..f5d0712de --- /dev/null +++ b/appstore/dujiaonext/0.1.0/config/config.yml @@ -0,0 +1,124 @@ +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 + pool: + max_open_conns: 1 + max_idle_conns: 1 + conn_max_lifetime_seconds: 0 + conn_max_idle_time_seconds: 0 + +jwt: + secret: your-secret-key-change-in-production-please + expire_hours: 24 + +user_jwt: + secret: user-secret-key-change-in-production-please + expire_hours: 24 + remember_me_expire_hours: 168 + +telegram_auth: + enabled: false + bot_username: "" + bot_token: "" + login_expire_seconds: 300 + replay_ttl_seconds: 300 + +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 + +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.0/data.yml b/appstore/dujiaonext/0.1.0/data.yml new file mode 100644 index 000000000..37121984e --- /dev/null +++ b/appstore/dujiaonext/0.1.0/data.yml @@ -0,0 +1,103 @@ +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: "" + 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 + - default: 0 + edit: true + envKey: REDIS_DB + labelZh: Redis 数据库索引 + labelEn: Redis Database Index + required: true + type: number diff --git a/appstore/dujiaonext/0.1.0/docker-compose.yml b/appstore/dujiaonext/0.1.0/docker-compose.yml new file mode 100644 index 000000000..d7e4b1832 --- /dev/null +++ b/appstore/dujiaonext/0.1.0/docker-compose.yml @@ -0,0 +1,71 @@ +networks: + 1panel-network: + external: true + dujiao-net: + driver: bridge +services: + dujiaonext-admin: + container_name: admin-dujiaonext + depends_on: + dujiaonext-api: + condition: service_healthy + env_file: + - ./envs/global.env + - .env + environment: + - TZ=Asia/Shanghai + image: dujiaonext/admin:v0.1.0 + 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:-} + - QUEUE_DB=${REDIS_DB:-} + healthcheck: + interval: 10s + retries: 10 + test: + - CMD + - wget + - -qO- + - http://127.0.0.1:8080/health + timeout: 3s + image: dujiaonext/api:v0.1.0 + 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 + env_file: + - ./envs/global.env + - .env + environment: + - TZ=Asia/Shanghai + image: dujiaonext/user:v0.1.0 + networks: + - dujiao-net + ports: + - ${PANEL_APP_PORT_HTTP}:80 + restart: always diff --git a/appstore/napcat/4.17.46/envs/default.env b/appstore/dujiaonext/0.1.0/envs/default.env similarity index 100% rename from appstore/napcat/4.17.46/envs/default.env rename to appstore/dujiaonext/0.1.0/envs/default.env diff --git a/appstore/napcat/4.17.46/envs/global.env b/appstore/dujiaonext/0.1.0/envs/global.env similarity index 100% rename from appstore/napcat/4.17.46/envs/global.env rename to appstore/dujiaonext/0.1.0/envs/global.env diff --git a/appstore/dujiaonext/0.1.0/scripts/init.sh b/appstore/dujiaonext/0.1.0/scripts/init.sh new file mode 100644 index 000000000..9949f675a --- /dev/null +++ b/appstore/dujiaonext/0.1.0/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 777 "$DUJIAONEXT_ROOT_PATH/data" + + echo "Check Finish." + +else + echo "Error: .env file not found." +fi diff --git a/appstore/napcat/4.17.46/scripts/uninstall.sh b/appstore/dujiaonext/0.1.0/scripts/uninstall.sh similarity index 100% rename from appstore/napcat/4.17.46/scripts/uninstall.sh rename to appstore/dujiaonext/0.1.0/scripts/uninstall.sh diff --git a/appstore/napcat/4.17.46/scripts/upgrade.sh b/appstore/dujiaonext/0.1.0/scripts/upgrade.sh similarity index 100% rename from appstore/napcat/4.17.46/scripts/upgrade.sh rename to appstore/dujiaonext/0.1.0/scripts/upgrade.sh diff --git a/appstore/dujiaonext/README.md b/appstore/dujiaonext/README.md new file mode 100644 index 000000000..b032da9a2 --- /dev/null +++ b/appstore/dujiaonext/README.md @@ -0,0 +1,81 @@ +# 独角Dujiao-Next + +拥抱现代化开源数字商品销售系统 + +![独角Dujiao-Next](https://file.lifebus.top/imgs/dujiaonext_cover.png) + +![](https://img.shields.io/badge/%E6%96%B0%E7%96%86%E8%90%8C%E6%A3%AE%E8%BD%AF%E4%BB%B6%E5%BC%80%E5%8F%91%E5%B7%A5%E4%BD%9C%E5%AE%A4-%E6%8F%90%E4%BE%9B%E6%8A%80%E6%9C%AF%E6%94%AF%E6%8C%81-blue) + +## 简介 + +### 完整业务闭环 + +覆盖商品、订单、支付、交付、用户中心、后台管理等核心流程。 + +### 多支付接入 + +支持支付宝、微信、PayPal、Stripe 等渠道,统一支付抽象与回调处理。 + +### 可扩展可维护 + +API/User/Admin 三端分层清晰,便于二开与替换前台模板。 + +## 安装 + +JWT 推荐使用 `openssl` 生成密钥: + +```bash +openssl rand -hex 32 +``` + +## 反向代理 + +```nginx +server { + listen 80; + server_name shop.example.com; + + # 前台 User + location / { + proxy_pass http://127.0.0.1:8081; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + } + + # 后台 Admin + location = /admin { + return 301 /admin/; + } + + location /admin/ { + proxy_pass http://127.0.0.1:8082/; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + } + + location /api/ { + proxy_pass http://127.0.0.1:8080/api/; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + } + + location /uploads/ { + proxy_pass http://127.0.0.1:8080/uploads/; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + } +} +``` + +--- + +![Ms Studio](https://file.lifebus.top/imgs/ms_blank_001.png) +![Ms Studio](https://analytics.lifebus.top/p/wJix5nI1W) diff --git a/appstore/dujiaonext/data.yml b/appstore/dujiaonext/data.yml new file mode 100644 index 000000000..de13ebd20 --- /dev/null +++ b/appstore/dujiaonext/data.yml @@ -0,0 +1,17 @@ +additionalProperties: + key: dujiaonext + name: 独角Dujiao-Next + tags: + - WebSite + - Local + shortDescZh: 拥抱现代化开源数字商品销售系统 + shortDescEn: Embrace the Modern Open-Source Digital Goods Sales System + type: website + crossVersionUpdate: true + limit: 0 + website: https://dujiao-next.com/ + github: https://github.com/dujiao-next/ + document: https://dujiao-next.com/ + architectures: + - amd64 + - arm64 diff --git a/appstore/dujiaonext/logo.png b/appstore/dujiaonext/logo.png new file mode 100644 index 000000000..2e5992eb3 Binary files /dev/null and b/appstore/dujiaonext/logo.png differ diff --git a/appstore/dujiaonext/logo.svg b/appstore/dujiaonext/logo.svg new file mode 100644 index 000000000..cab3f4c98 --- /dev/null +++ b/appstore/dujiaonext/logo.svg @@ -0,0 +1,602 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/appstore/napcat/4.17.46/.env b/appstore/napcat/4.17.47/.env similarity index 100% rename from appstore/napcat/4.17.46/.env rename to appstore/napcat/4.17.47/.env diff --git a/appstore/napcat/4.17.46/data.yml b/appstore/napcat/4.17.47/data.yml similarity index 100% rename from appstore/napcat/4.17.46/data.yml rename to appstore/napcat/4.17.47/data.yml diff --git a/appstore/napcat/4.17.46/docker-compose.yml b/appstore/napcat/4.17.47/docker-compose.yml similarity index 93% rename from appstore/napcat/4.17.46/docker-compose.yml rename to appstore/napcat/4.17.47/docker-compose.yml index 6f7a953ee..e2b416514 100644 --- a/appstore/napcat/4.17.46/docker-compose.yml +++ b/appstore/napcat/4.17.47/docker-compose.yml @@ -11,7 +11,7 @@ services: - TZ=Asia/Shanghai - NAPCAT_UID=${NAPCAT_UID:-0} - NAPCAT_GID=${NAPCAT_GID:-0} - image: mlikiowa/napcat-docker:v4.17.46 + image: mlikiowa/napcat-docker:v4.17.47 labels: createdBy: Apps networks: diff --git a/appstore/napcat/4.17.47/envs/default.env b/appstore/napcat/4.17.47/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/appstore/napcat/4.17.47/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/appstore/napcat/4.17.47/envs/global.env b/appstore/napcat/4.17.47/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/appstore/napcat/4.17.47/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/appstore/napcat/4.17.46/scripts/init.sh b/appstore/napcat/4.17.47/scripts/init.sh similarity index 100% rename from appstore/napcat/4.17.46/scripts/init.sh rename to appstore/napcat/4.17.47/scripts/init.sh diff --git a/appstore/napcat/4.17.47/scripts/uninstall.sh b/appstore/napcat/4.17.47/scripts/uninstall.sh new file mode 100644 index 000000000..c86c4fbca --- /dev/null +++ b/appstore/napcat/4.17.47/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/napcat/4.17.47/scripts/upgrade.sh b/appstore/napcat/4.17.47/scripts/upgrade.sh new file mode 100644 index 000000000..07fb8c3fe --- /dev/null +++ b/appstore/napcat/4.17.47/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/ani-rss/docker-compose.yml b/dockge/ani-rss/docker-compose.yml index ded3b5a5e..b09ec631a 100644 --- a/dockge/ani-rss/docker-compose.yml +++ b/dockge/ani-rss/docker-compose.yml @@ -14,7 +14,7 @@ services: - PORT=7789 - CONFIG=/config - TZ=Asia/Shanghai - image: wushuo894/ani-rss:v3.0.8 + image: wushuo894/ani-rss:v3.0.9 labels: createdBy: Apps networks: diff --git a/dockge/astrbot-napcat/docker-compose.yml b/dockge/astrbot-napcat/docker-compose.yml index a786409d8..d23cc0aa3 100644 --- a/dockge/astrbot-napcat/docker-compose.yml +++ b/dockge/astrbot-napcat/docker-compose.yml @@ -36,7 +36,7 @@ services: - MODE=astrbot - NAPCAT_UID=${NAPCAT_UID:-1000} - NAPCAT_GID=${NAPCAT_GID:-1000} - image: mlikiowa/napcat-docker:v4.17.46 + image: mlikiowa/napcat-docker:v4.17.47 mac_address: ${NAPCAT_MAC_ADDRESS:-02:42:ac:11:00:02} networks: - 1panel-network diff --git a/dockge/dujiaonext/.env b/dockge/dujiaonext/.env new file mode 100644 index 000000000..e77160ab5 --- /dev/null +++ b/dockge/dujiaonext/.env @@ -0,0 +1,39 @@ +# 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= + +# 管理员密码 [必填] +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= + +# Redis 数据库索引 [必填] +REDIS_DB=0 + diff --git a/dockge/dujiaonext/config/config.yml b/dockge/dujiaonext/config/config.yml new file mode 100644 index 000000000..f5d0712de --- /dev/null +++ b/dockge/dujiaonext/config/config.yml @@ -0,0 +1,124 @@ +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 + pool: + max_open_conns: 1 + max_idle_conns: 1 + conn_max_lifetime_seconds: 0 + conn_max_idle_time_seconds: 0 + +jwt: + secret: your-secret-key-change-in-production-please + expire_hours: 24 + +user_jwt: + secret: user-secret-key-change-in-production-please + expire_hours: 24 + remember_me_expire_hours: 168 + +telegram_auth: + enabled: false + bot_username: "" + bot_token: "" + login_expire_seconds: 300 + replay_ttl_seconds: 300 + +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 + +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/docker-compose.yml b/dockge/dujiaonext/docker-compose.yml new file mode 100644 index 000000000..d7e4b1832 --- /dev/null +++ b/dockge/dujiaonext/docker-compose.yml @@ -0,0 +1,71 @@ +networks: + 1panel-network: + external: true + dujiao-net: + driver: bridge +services: + dujiaonext-admin: + container_name: admin-dujiaonext + depends_on: + dujiaonext-api: + condition: service_healthy + env_file: + - ./envs/global.env + - .env + environment: + - TZ=Asia/Shanghai + image: dujiaonext/admin:v0.1.0 + 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:-} + - QUEUE_DB=${REDIS_DB:-} + healthcheck: + interval: 10s + retries: 10 + test: + - CMD + - wget + - -qO- + - http://127.0.0.1:8080/health + timeout: 3s + image: dujiaonext/api:v0.1.0 + 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 + env_file: + - ./envs/global.env + - .env + environment: + - TZ=Asia/Shanghai + image: dujiaonext/user:v0.1.0 + networks: + - dujiao-net + ports: + - ${PANEL_APP_PORT_HTTP}:80 + restart: always diff --git a/dockge/dujiaonext/envs/default.env b/dockge/dujiaonext/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/dockge/dujiaonext/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/dockge/dujiaonext/envs/global.env b/dockge/dujiaonext/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/dockge/dujiaonext/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/dockge/napcat/docker-compose.yml b/dockge/napcat/docker-compose.yml index 6f7a953ee..e2b416514 100644 --- a/dockge/napcat/docker-compose.yml +++ b/dockge/napcat/docker-compose.yml @@ -11,7 +11,7 @@ services: - TZ=Asia/Shanghai - NAPCAT_UID=${NAPCAT_UID:-0} - NAPCAT_GID=${NAPCAT_GID:-0} - image: mlikiowa/napcat-docker:v4.17.46 + image: mlikiowa/napcat-docker:v4.17.47 labels: createdBy: Apps networks: