diff --git a/appstore/dujiaonext/0.1.1/.env b/appstore/dujiaonext/0.1.2/.env similarity index 95% rename from appstore/dujiaonext/0.1.1/.env rename to appstore/dujiaonext/0.1.2/.env index 19fc5f516..912e69ae7 100644 --- a/appstore/dujiaonext/0.1.1/.env +++ b/appstore/dujiaonext/0.1.2/.env @@ -14,7 +14,7 @@ PANEL_APP_PORT_ADMIN=8081 PANEL_APP_PORT_API=8082 # 管理员用户名 [必填] -DJ_DEFAULT_ADMIN_USERNAME= +DJ_DEFAULT_ADMIN_USERNAME=admin # 管理员密码 [必填] DJ_DEFAULT_ADMIN_PASSWORD= diff --git a/appstore/dujiaonext/0.1.1/config/config.yml b/appstore/dujiaonext/0.1.2/config/config.yml similarity index 100% rename from appstore/dujiaonext/0.1.1/config/config.yml rename to appstore/dujiaonext/0.1.2/config/config.yml diff --git a/appstore/dujiaonext/0.1.1/data.yml b/appstore/dujiaonext/0.1.2/data.yml similarity index 99% rename from appstore/dujiaonext/0.1.1/data.yml rename to appstore/dujiaonext/0.1.2/data.yml index 53148f87e..dcec017d2 100644 --- a/appstore/dujiaonext/0.1.1/data.yml +++ b/appstore/dujiaonext/0.1.2/data.yml @@ -45,7 +45,7 @@ additionalProperties: required: true rule: paramPort type: number - - default: "" + - default: "admin" edit: true envKey: DJ_DEFAULT_ADMIN_USERNAME labelZh: 管理员用户名 diff --git a/appstore/dujiaonext/0.1.1/docker-compose.yml b/appstore/dujiaonext/0.1.2/docker-compose.yml similarity index 93% rename from appstore/dujiaonext/0.1.1/docker-compose.yml rename to appstore/dujiaonext/0.1.2/docker-compose.yml index 4135cd21e..22f4087e2 100644 --- a/appstore/dujiaonext/0.1.1/docker-compose.yml +++ b/appstore/dujiaonext/0.1.2/docker-compose.yml @@ -11,7 +11,7 @@ services: condition: service_healthy environment: - TZ=Asia/Shanghai - image: dujiaonext/admin:v0.1.1 + image: dujiaonext/admin:v0.1.2 networks: - dujiao-net ports: @@ -36,7 +36,7 @@ services: - -qO- - http://127.0.0.1:8080/health timeout: 3s - image: dujiaonext/api:v0.1.1 + image: dujiaonext/api:v0.1.2 labels: createdBy: Apps networks: @@ -56,7 +56,7 @@ services: condition: service_healthy environment: - TZ=Asia/Shanghai - image: dujiaonext/user:v0.1.1 + image: dujiaonext/user:v0.1.2 networks: - dujiao-net ports: diff --git a/appstore/dujiaonext/0.1.1/envs/default.env b/appstore/dujiaonext/0.1.2/envs/default.env similarity index 100% rename from appstore/dujiaonext/0.1.1/envs/default.env rename to appstore/dujiaonext/0.1.2/envs/default.env diff --git a/appstore/dujiaonext/0.1.1/envs/global.env b/appstore/dujiaonext/0.1.2/envs/global.env similarity index 100% rename from appstore/dujiaonext/0.1.1/envs/global.env rename to appstore/dujiaonext/0.1.2/envs/global.env diff --git a/appstore/dujiaonext/0.1.1/scripts/init.sh b/appstore/dujiaonext/0.1.2/scripts/init.sh similarity index 100% rename from appstore/dujiaonext/0.1.1/scripts/init.sh rename to appstore/dujiaonext/0.1.2/scripts/init.sh diff --git a/appstore/dujiaonext/0.1.1/scripts/uninstall.sh b/appstore/dujiaonext/0.1.2/scripts/uninstall.sh similarity index 100% rename from appstore/dujiaonext/0.1.1/scripts/uninstall.sh rename to appstore/dujiaonext/0.1.2/scripts/uninstall.sh diff --git a/appstore/dujiaonext/0.1.1/scripts/upgrade.sh b/appstore/dujiaonext/0.1.2/scripts/upgrade.sh similarity index 100% rename from appstore/dujiaonext/0.1.1/scripts/upgrade.sh rename to appstore/dujiaonext/0.1.2/scripts/upgrade.sh diff --git a/appstore/dujiaonext/README.md b/appstore/dujiaonext/README.md index b032da9a2..99427e29d 100644 --- a/appstore/dujiaonext/README.md +++ b/appstore/dujiaonext/README.md @@ -22,6 +22,8 @@ API/User/Admin 三端分层清晰，便于二开与替换前台模板。 ## 安装 +> 请注意 `管理员用户名` 为 `admin`，请勿修改。否则将无法登录后台管理。 + JWT 推荐使用 `openssl` 生成密钥： ```bash @@ -30,6 +32,78 @@ openssl rand -hex 32 ## 反向代理 +### 多域名部署 + +```nginx +# 前台 User +server { + listen 80; + server_name user.example.com; + + 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; + } + + 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; + } +} + +# 后台 Admin +server { + listen 80; + server_name admin.example.com; + + location / { + 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; + } +} +``` + +### 单域名部署 + +不推荐 + +> 由于前台 User 与 Admin 分别部署在不同端口，因此需要配置反向代理。 +> +> 但是后台 /admin 属于 `/admin/` 路径，需要特殊处理。(否则无法正常访问资源，导致无法登录) + ```nginx server { listen 80; @@ -75,6 +149,20 @@ server { } ``` +#### 补充规则 + +```nginx +location /assets/ { + + if ($http_referer ~* "/admin/") { + proxy_pass http://127.0.0.1:57143; + break; + } + + proxy_pass http://127.0.0.1:57142; +} +``` + --- ![Ms Studio](https://file.lifebus.top/imgs/ms_blank_001.png) diff --git a/appstore/jackett/0.24.1385/.env b/appstore/jackett/0.24.1392/.env similarity index 100% rename from appstore/jackett/0.24.1385/.env rename to appstore/jackett/0.24.1392/.env diff --git a/appstore/jackett/0.24.1385/data.yml b/appstore/jackett/0.24.1392/data.yml similarity index 100% rename from appstore/jackett/0.24.1385/data.yml rename to appstore/jackett/0.24.1392/data.yml diff --git a/appstore/jackett/0.24.1385/docker-compose.yml b/appstore/jackett/0.24.1392/docker-compose.yml similarity index 91% rename from appstore/jackett/0.24.1385/docker-compose.yml rename to appstore/jackett/0.24.1392/docker-compose.yml index 38f912a35..93109ae59 100644 --- a/appstore/jackett/0.24.1385/docker-compose.yml +++ b/appstore/jackett/0.24.1392/docker-compose.yml @@ -11,7 +11,7 @@ services: - TZ=Asia/Shanghai - PUID=1000 - PGID=1000 - image: linuxserver/jackett:0.24.1385 + image: linuxserver/jackett:0.24.1392 labels: createdBy: Apps networks: diff --git a/appstore/jackett/0.24.1385/envs/default.env b/appstore/jackett/0.24.1392/envs/default.env similarity index 100% rename from appstore/jackett/0.24.1385/envs/default.env rename to appstore/jackett/0.24.1392/envs/default.env diff --git a/appstore/jackett/0.24.1385/envs/global.env b/appstore/jackett/0.24.1392/envs/global.env similarity index 100% rename from appstore/jackett/0.24.1385/envs/global.env rename to appstore/jackett/0.24.1392/envs/global.env diff --git a/appstore/jackett/0.24.1385/scripts/init.sh b/appstore/jackett/0.24.1392/scripts/init.sh similarity index 100% rename from appstore/jackett/0.24.1385/scripts/init.sh rename to appstore/jackett/0.24.1392/scripts/init.sh diff --git a/appstore/jackett/0.24.1385/scripts/uninstall.sh b/appstore/jackett/0.24.1392/scripts/uninstall.sh similarity index 100% rename from appstore/jackett/0.24.1385/scripts/uninstall.sh rename to appstore/jackett/0.24.1392/scripts/uninstall.sh diff --git a/appstore/jackett/0.24.1385/scripts/upgrade.sh b/appstore/jackett/0.24.1392/scripts/upgrade.sh similarity index 100% rename from appstore/jackett/0.24.1385/scripts/upgrade.sh rename to appstore/jackett/0.24.1392/scripts/upgrade.sh diff --git a/appstore/nocodb/0.301.3/.env b/appstore/nocodb/0.301.4/.env similarity index 100% rename from appstore/nocodb/0.301.3/.env rename to appstore/nocodb/0.301.4/.env diff --git a/appstore/nocodb/0.301.3/data.yml b/appstore/nocodb/0.301.4/data.yml similarity index 100% rename from appstore/nocodb/0.301.3/data.yml rename to appstore/nocodb/0.301.4/data.yml diff --git a/appstore/nocodb/0.301.3/docker-compose.yml b/appstore/nocodb/0.301.4/docker-compose.yml similarity index 95% rename from appstore/nocodb/0.301.3/docker-compose.yml rename to appstore/nocodb/0.301.4/docker-compose.yml index 7904fe589..c706ce4fa 100644 --- a/appstore/nocodb/0.301.3/docker-compose.yml +++ b/appstore/nocodb/0.301.4/docker-compose.yml @@ -17,7 +17,7 @@ services: - NC_SMTP_SECURE=true - NC_SMTP_IGNORE_TLS=false - NC_DB=${DB_TYPE}://${DB_HOSTNAME}:${DB_PORT}?u=${DB_USER}&p=${DB_PASSWD}&d=${DB_NAME} - image: nocodb/nocodb:0.301.3 + image: nocodb/nocodb:0.301.4 labels: createdBy: Apps networks: diff --git a/appstore/nocodb/0.301.3/envs/default.env b/appstore/nocodb/0.301.4/envs/default.env similarity index 100% rename from appstore/nocodb/0.301.3/envs/default.env rename to appstore/nocodb/0.301.4/envs/default.env diff --git a/appstore/nocodb/0.301.3/envs/global.env b/appstore/nocodb/0.301.4/envs/global.env similarity index 100% rename from appstore/nocodb/0.301.3/envs/global.env rename to appstore/nocodb/0.301.4/envs/global.env diff --git a/appstore/nocodb/0.301.3/scripts/init.sh b/appstore/nocodb/0.301.4/scripts/init.sh similarity index 100% rename from appstore/nocodb/0.301.3/scripts/init.sh rename to appstore/nocodb/0.301.4/scripts/init.sh diff --git a/appstore/nocodb/0.301.3/scripts/uninstall.sh b/appstore/nocodb/0.301.4/scripts/uninstall.sh similarity index 100% rename from appstore/nocodb/0.301.3/scripts/uninstall.sh rename to appstore/nocodb/0.301.4/scripts/uninstall.sh diff --git a/appstore/nocodb/0.301.3/scripts/upgrade.sh b/appstore/nocodb/0.301.4/scripts/upgrade.sh similarity index 100% rename from appstore/nocodb/0.301.3/scripts/upgrade.sh rename to appstore/nocodb/0.301.4/scripts/upgrade.sh diff --git a/dockge/dujiaonext/.env b/dockge/dujiaonext/.env index 19fc5f516..912e69ae7 100644 --- a/dockge/dujiaonext/.env +++ b/dockge/dujiaonext/.env @@ -14,7 +14,7 @@ PANEL_APP_PORT_ADMIN=8081 PANEL_APP_PORT_API=8082 # 管理员用户名 [必填] -DJ_DEFAULT_ADMIN_USERNAME= +DJ_DEFAULT_ADMIN_USERNAME=admin # 管理员密码 [必填] DJ_DEFAULT_ADMIN_PASSWORD= diff --git a/dockge/dujiaonext/docker-compose.yml b/dockge/dujiaonext/docker-compose.yml index 4135cd21e..22f4087e2 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.1 + image: dujiaonext/admin:v0.1.2 networks: - dujiao-net ports: @@ -36,7 +36,7 @@ services: - -qO- - http://127.0.0.1:8080/health timeout: 3s - image: dujiaonext/api:v0.1.1 + image: dujiaonext/api:v0.1.2 labels: createdBy: Apps networks: @@ -56,7 +56,7 @@ services: condition: service_healthy environment: - TZ=Asia/Shanghai - image: dujiaonext/user:v0.1.1 + image: dujiaonext/user:v0.1.2 networks: - dujiao-net ports: diff --git a/dockge/jackett/docker-compose.yml b/dockge/jackett/docker-compose.yml index 38f912a35..93109ae59 100644 --- a/dockge/jackett/docker-compose.yml +++ b/dockge/jackett/docker-compose.yml @@ -11,7 +11,7 @@ services: - TZ=Asia/Shanghai - PUID=1000 - PGID=1000 - image: linuxserver/jackett:0.24.1385 + image: linuxserver/jackett:0.24.1392 labels: createdBy: Apps networks: diff --git a/dockge/nocodb/docker-compose.yml b/dockge/nocodb/docker-compose.yml index 7904fe589..c706ce4fa 100644 --- a/dockge/nocodb/docker-compose.yml +++ b/dockge/nocodb/docker-compose.yml @@ -17,7 +17,7 @@ services: - NC_SMTP_SECURE=true - NC_SMTP_IGNORE_TLS=false - NC_DB=${DB_TYPE}://${DB_HOSTNAME}:${DB_PORT}?u=${DB_USER}&p=${DB_PASSWD}&d=${DB_NAME} - image: nocodb/nocodb:0.301.3 + image: nocodb/nocodb:0.301.4 labels: createdBy: Apps networks: