From 474a562fb8e3bbd5e064857dbc0de08ec14ada8b Mon Sep 17 00:00:00 2001 From: QYG2297248353 Date: Mon, 17 Nov 2025 03:49:46 +0000 Subject: [PATCH] Processed apps directory via GitHub Actions --- .../astrbot-napcat/4.9.70/docker-compose.yml | 2 +- appstore/astrbot/{4.5.7 => 4.5.8}/.env | 0 appstore/astrbot/{4.5.7 => 4.5.8}/data.yml | 0 .../{4.5.7 => 4.5.8}/docker-compose.yml | 2 +- .../astrbot/{4.5.7 => 4.5.8}/envs/default.env | 0 .../astrbot/{4.5.7 => 4.5.8}/envs/global.env | 0 .../astrbot/{4.5.7 => 4.5.8}/scripts/init.sh | 0 .../{4.5.7 => 4.5.8}/scripts/uninstall.sh | 0 .../{4.5.7 => 4.5.8}/scripts/upgrade.sh | 0 appstore/jellyfin/{10.11.2 => 10.11.3}/.env | 0 .../jellyfin/{10.11.2 => 10.11.3}/data.yml | 0 .../{10.11.2 => 10.11.3}/docker-compose.yml | 2 +- .../{10.11.2 => 10.11.3}/envs/default.env | 0 .../{10.11.2 => 10.11.3}/envs/global.env | 0 .../{10.11.2 => 10.11.3}/scripts/init.sh | 0 .../{10.11.2 => 10.11.3}/scripts/uninstall.sh | 0 .../{10.11.2 => 10.11.3}/scripts/upgrade.sh | 0 appstore/nacos/{2.5.1 => 2.5.2}/.env | 0 appstore/nacos/{2.5.1 => 2.5.2}/data.yml | 0 .../nacos/{2.5.1 => 2.5.2}/docker-compose.yml | 2 +- .../nacos/{2.5.1 => 2.5.2}/envs/default.env | 0 .../nacos/{2.5.1 => 2.5.2}/envs/global.env | 0 .../{2.5.1 => 2.5.2}/init/mysql-schema.sql | 0 .../nacos/{2.5.1 => 2.5.2}/scripts/init.sh | 0 .../{2.5.1 => 2.5.2}/scripts/uninstall.sh | 0 .../nacos/{2.5.1 => 2.5.2}/scripts/upgrade.sh | 0 appstore/prowlarr/{2.1.5 => 2.3.0}/.env | 0 appstore/prowlarr/{2.1.5 => 2.3.0}/data.yml | 0 .../{2.1.5 => 2.3.0}/docker-compose.yml | 2 +- .../{2.1.5 => 2.3.0}/envs/default.env | 0 .../prowlarr/{2.1.5 => 2.3.0}/envs/global.env | 0 .../prowlarr/{2.1.5 => 2.3.0}/scripts/init.sh | 0 .../{2.1.5 => 2.3.0}/scripts/uninstall.sh | 0 .../{2.1.5 => 2.3.0}/scripts/upgrade.sh | 0 dockge/astrbot-napcat/docker-compose.yml | 2 +- dockge/astrbot/docker-compose.yml | 2 +- dockge/jellyfin/docker-compose.yml | 2 +- .../.env | 0 .../docker-compose.yml | 2 +- .../envs/default.env | 0 .../envs/global.env | 0 dockge/nacos/.env | 12 +- dockge/nacos/docker-compose.yml | 11 +- dockge/nacos/init/mysql-schema.sql | 127 ++++++----------- dockge/{nacos_3_1_0 => nacos_2_5_2}/.env | 12 +- .../docker-compose.yml | 11 +- .../envs/default.env | 0 .../envs/global.env | 0 .../init/mysql-schema.sql | 129 ++++++++++++------ dockge/prowlarr/docker-compose.yml | 2 +- 50 files changed, 161 insertions(+), 161 deletions(-) rename appstore/astrbot/{4.5.7 => 4.5.8}/.env (100%) rename appstore/astrbot/{4.5.7 => 4.5.8}/data.yml (100%) rename appstore/astrbot/{4.5.7 => 4.5.8}/docker-compose.yml (94%) rename appstore/astrbot/{4.5.7 => 4.5.8}/envs/default.env (100%) rename appstore/astrbot/{4.5.7 => 4.5.8}/envs/global.env (100%) rename appstore/astrbot/{4.5.7 => 4.5.8}/scripts/init.sh (100%) rename appstore/astrbot/{4.5.7 => 4.5.8}/scripts/uninstall.sh (100%) rename appstore/astrbot/{4.5.7 => 4.5.8}/scripts/upgrade.sh (100%) rename appstore/jellyfin/{10.11.2 => 10.11.3}/.env (100%) rename appstore/jellyfin/{10.11.2 => 10.11.3}/data.yml (100%) rename appstore/jellyfin/{10.11.2 => 10.11.3}/docker-compose.yml (96%) rename appstore/jellyfin/{10.11.2 => 10.11.3}/envs/default.env (100%) rename appstore/jellyfin/{10.11.2 => 10.11.3}/envs/global.env (100%) rename appstore/jellyfin/{10.11.2 => 10.11.3}/scripts/init.sh (100%) rename appstore/jellyfin/{10.11.2 => 10.11.3}/scripts/uninstall.sh (100%) rename appstore/jellyfin/{10.11.2 => 10.11.3}/scripts/upgrade.sh (100%) rename appstore/nacos/{2.5.1 => 2.5.2}/.env (100%) rename appstore/nacos/{2.5.1 => 2.5.2}/data.yml (100%) rename appstore/nacos/{2.5.1 => 2.5.2}/docker-compose.yml (94%) rename appstore/nacos/{2.5.1 => 2.5.2}/envs/default.env (100%) rename appstore/nacos/{2.5.1 => 2.5.2}/envs/global.env (100%) rename appstore/nacos/{2.5.1 => 2.5.2}/init/mysql-schema.sql (100%) rename appstore/nacos/{2.5.1 => 2.5.2}/scripts/init.sh (100%) rename appstore/nacos/{2.5.1 => 2.5.2}/scripts/uninstall.sh (100%) rename appstore/nacos/{2.5.1 => 2.5.2}/scripts/upgrade.sh (100%) rename appstore/prowlarr/{2.1.5 => 2.3.0}/.env (100%) rename appstore/prowlarr/{2.1.5 => 2.3.0}/data.yml (100%) rename appstore/prowlarr/{2.1.5 => 2.3.0}/docker-compose.yml (91%) rename appstore/prowlarr/{2.1.5 => 2.3.0}/envs/default.env (100%) rename appstore/prowlarr/{2.1.5 => 2.3.0}/envs/global.env (100%) rename appstore/prowlarr/{2.1.5 => 2.3.0}/scripts/init.sh (100%) rename appstore/prowlarr/{2.1.5 => 2.3.0}/scripts/uninstall.sh (100%) rename appstore/prowlarr/{2.1.5 => 2.3.0}/scripts/upgrade.sh (100%) rename dockge/{jellyfin_10_11_2 => jellyfin_10_9_11}/.env (100%) rename dockge/{jellyfin_10_11_2 => jellyfin_10_9_11}/docker-compose.yml (96%) rename dockge/{jellyfin_10_11_2 => jellyfin_10_9_11}/envs/default.env (100%) rename dockge/{jellyfin_10_11_2 => jellyfin_10_9_11}/envs/global.env (100%) rename dockge/{nacos_3_1_0 => nacos_2_5_2}/.env (88%) rename dockge/{nacos_3_1_0 => nacos_2_5_2}/docker-compose.yml (59%) rename dockge/{nacos_3_1_0 => nacos_2_5_2}/envs/default.env (100%) rename dockge/{nacos_3_1_0 => nacos_2_5_2}/envs/global.env (100%) rename dockge/{nacos_3_1_0 => nacos_2_5_2}/init/mysql-schema.sql (59%) diff --git a/appstore/astrbot-napcat/4.9.70/docker-compose.yml b/appstore/astrbot-napcat/4.9.70/docker-compose.yml index 641e4d8ba..961451fc9 100644 --- a/appstore/astrbot-napcat/4.9.70/docker-compose.yml +++ b/appstore/astrbot-napcat/4.9.70/docker-compose.yml @@ -9,7 +9,7 @@ services: - .env environment: - TZ=Asia/Shanghai - image: soulter/astrbot:v4.5.7 + image: soulter/astrbot:v4.5.8 labels: createdBy: Apps networks: diff --git a/appstore/astrbot/4.5.7/.env b/appstore/astrbot/4.5.8/.env similarity index 100% rename from appstore/astrbot/4.5.7/.env rename to appstore/astrbot/4.5.8/.env diff --git a/appstore/astrbot/4.5.7/data.yml b/appstore/astrbot/4.5.8/data.yml similarity index 100% rename from appstore/astrbot/4.5.7/data.yml rename to appstore/astrbot/4.5.8/data.yml diff --git a/appstore/astrbot/4.5.7/docker-compose.yml b/appstore/astrbot/4.5.8/docker-compose.yml similarity index 94% rename from appstore/astrbot/4.5.7/docker-compose.yml rename to appstore/astrbot/4.5.8/docker-compose.yml index 143d67051..9b2c3f00c 100644 --- a/appstore/astrbot/4.5.7/docker-compose.yml +++ b/appstore/astrbot/4.5.8/docker-compose.yml @@ -9,7 +9,7 @@ services: - .env environment: - TZ=Asia/Shanghai - image: soulter/astrbot:v4.5.7 + image: soulter/astrbot:v4.5.8 labels: createdBy: Apps networks: diff --git a/appstore/astrbot/4.5.7/envs/default.env b/appstore/astrbot/4.5.8/envs/default.env similarity index 100% rename from appstore/astrbot/4.5.7/envs/default.env rename to appstore/astrbot/4.5.8/envs/default.env diff --git a/appstore/astrbot/4.5.7/envs/global.env b/appstore/astrbot/4.5.8/envs/global.env similarity index 100% rename from appstore/astrbot/4.5.7/envs/global.env rename to appstore/astrbot/4.5.8/envs/global.env diff --git a/appstore/astrbot/4.5.7/scripts/init.sh b/appstore/astrbot/4.5.8/scripts/init.sh similarity index 100% rename from appstore/astrbot/4.5.7/scripts/init.sh rename to appstore/astrbot/4.5.8/scripts/init.sh diff --git a/appstore/astrbot/4.5.7/scripts/uninstall.sh b/appstore/astrbot/4.5.8/scripts/uninstall.sh similarity index 100% rename from appstore/astrbot/4.5.7/scripts/uninstall.sh rename to appstore/astrbot/4.5.8/scripts/uninstall.sh diff --git a/appstore/astrbot/4.5.7/scripts/upgrade.sh b/appstore/astrbot/4.5.8/scripts/upgrade.sh similarity index 100% rename from appstore/astrbot/4.5.7/scripts/upgrade.sh rename to appstore/astrbot/4.5.8/scripts/upgrade.sh diff --git a/appstore/jellyfin/10.11.2/.env b/appstore/jellyfin/10.11.3/.env similarity index 100% rename from appstore/jellyfin/10.11.2/.env rename to appstore/jellyfin/10.11.3/.env diff --git a/appstore/jellyfin/10.11.2/data.yml b/appstore/jellyfin/10.11.3/data.yml similarity index 100% rename from appstore/jellyfin/10.11.2/data.yml rename to appstore/jellyfin/10.11.3/data.yml diff --git a/appstore/jellyfin/10.11.2/docker-compose.yml b/appstore/jellyfin/10.11.3/docker-compose.yml similarity index 96% rename from appstore/jellyfin/10.11.2/docker-compose.yml rename to appstore/jellyfin/10.11.3/docker-compose.yml index bbaa1214d..02cdff658 100644 --- a/appstore/jellyfin/10.11.2/docker-compose.yml +++ b/appstore/jellyfin/10.11.3/docker-compose.yml @@ -10,7 +10,7 @@ services: - ROC_ENABLE_PRE_VEGA=1 - HTTPS_PROXY=${HTTP_PROXY:-} - NO_PROXY=localhost,127.0.0.1,::1 - image: jellyfin/jellyfin:10.11.2 + image: jellyfin/jellyfin:10.11.3 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/appstore/jellyfin/10.11.2/envs/default.env b/appstore/jellyfin/10.11.3/envs/default.env similarity index 100% rename from appstore/jellyfin/10.11.2/envs/default.env rename to appstore/jellyfin/10.11.3/envs/default.env diff --git a/appstore/jellyfin/10.11.2/envs/global.env b/appstore/jellyfin/10.11.3/envs/global.env similarity index 100% rename from appstore/jellyfin/10.11.2/envs/global.env rename to appstore/jellyfin/10.11.3/envs/global.env diff --git a/appstore/jellyfin/10.11.2/scripts/init.sh b/appstore/jellyfin/10.11.3/scripts/init.sh similarity index 100% rename from appstore/jellyfin/10.11.2/scripts/init.sh rename to appstore/jellyfin/10.11.3/scripts/init.sh diff --git a/appstore/jellyfin/10.11.2/scripts/uninstall.sh b/appstore/jellyfin/10.11.3/scripts/uninstall.sh similarity index 100% rename from appstore/jellyfin/10.11.2/scripts/uninstall.sh rename to appstore/jellyfin/10.11.3/scripts/uninstall.sh diff --git a/appstore/jellyfin/10.11.2/scripts/upgrade.sh b/appstore/jellyfin/10.11.3/scripts/upgrade.sh similarity index 100% rename from appstore/jellyfin/10.11.2/scripts/upgrade.sh rename to appstore/jellyfin/10.11.3/scripts/upgrade.sh diff --git a/appstore/nacos/2.5.1/.env b/appstore/nacos/2.5.2/.env similarity index 100% rename from appstore/nacos/2.5.1/.env rename to appstore/nacos/2.5.2/.env diff --git a/appstore/nacos/2.5.1/data.yml b/appstore/nacos/2.5.2/data.yml similarity index 100% rename from appstore/nacos/2.5.1/data.yml rename to appstore/nacos/2.5.2/data.yml diff --git a/appstore/nacos/2.5.1/docker-compose.yml b/appstore/nacos/2.5.2/docker-compose.yml similarity index 94% rename from appstore/nacos/2.5.1/docker-compose.yml rename to appstore/nacos/2.5.2/docker-compose.yml index 7e925e038..22ee0e33a 100644 --- a/appstore/nacos/2.5.1/docker-compose.yml +++ b/appstore/nacos/2.5.2/docker-compose.yml @@ -12,7 +12,7 @@ services: - NACOS_SERVER_PORT=${PANEL_APP_PORT_HTTP:-8848} - NACOS_AUTH_ENABLE=true - SPRING_DATASOURCE_PLATFORM=mysql - image: nacos/nacos-server:v2.5.1 + image: nacos/nacos-server:v2.5.2 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/appstore/nacos/2.5.1/envs/default.env b/appstore/nacos/2.5.2/envs/default.env similarity index 100% rename from appstore/nacos/2.5.1/envs/default.env rename to appstore/nacos/2.5.2/envs/default.env diff --git a/appstore/nacos/2.5.1/envs/global.env b/appstore/nacos/2.5.2/envs/global.env similarity index 100% rename from appstore/nacos/2.5.1/envs/global.env rename to appstore/nacos/2.5.2/envs/global.env diff --git a/appstore/nacos/2.5.1/init/mysql-schema.sql b/appstore/nacos/2.5.2/init/mysql-schema.sql similarity index 100% rename from appstore/nacos/2.5.1/init/mysql-schema.sql rename to appstore/nacos/2.5.2/init/mysql-schema.sql diff --git a/appstore/nacos/2.5.1/scripts/init.sh b/appstore/nacos/2.5.2/scripts/init.sh similarity index 100% rename from appstore/nacos/2.5.1/scripts/init.sh rename to appstore/nacos/2.5.2/scripts/init.sh diff --git a/appstore/nacos/2.5.1/scripts/uninstall.sh b/appstore/nacos/2.5.2/scripts/uninstall.sh similarity index 100% rename from appstore/nacos/2.5.1/scripts/uninstall.sh rename to appstore/nacos/2.5.2/scripts/uninstall.sh diff --git a/appstore/nacos/2.5.1/scripts/upgrade.sh b/appstore/nacos/2.5.2/scripts/upgrade.sh similarity index 100% rename from appstore/nacos/2.5.1/scripts/upgrade.sh rename to appstore/nacos/2.5.2/scripts/upgrade.sh diff --git a/appstore/prowlarr/2.1.5/.env b/appstore/prowlarr/2.3.0/.env similarity index 100% rename from appstore/prowlarr/2.1.5/.env rename to appstore/prowlarr/2.3.0/.env diff --git a/appstore/prowlarr/2.1.5/data.yml b/appstore/prowlarr/2.3.0/data.yml similarity index 100% rename from appstore/prowlarr/2.1.5/data.yml rename to appstore/prowlarr/2.3.0/data.yml diff --git a/appstore/prowlarr/2.1.5/docker-compose.yml b/appstore/prowlarr/2.3.0/docker-compose.yml similarity index 91% rename from appstore/prowlarr/2.1.5/docker-compose.yml rename to appstore/prowlarr/2.3.0/docker-compose.yml index 1a0dd7541..e7f2783b2 100644 --- a/appstore/prowlarr/2.1.5/docker-compose.yml +++ b/appstore/prowlarr/2.3.0/docker-compose.yml @@ -12,7 +12,7 @@ services: - PGID=1000 - UMASK=022 - TZ=Asia/Shanghai - image: linuxserver/prowlarr:2.1.5 + image: linuxserver/prowlarr:2.3.0 labels: createdBy: Apps networks: diff --git a/appstore/prowlarr/2.1.5/envs/default.env b/appstore/prowlarr/2.3.0/envs/default.env similarity index 100% rename from appstore/prowlarr/2.1.5/envs/default.env rename to appstore/prowlarr/2.3.0/envs/default.env diff --git a/appstore/prowlarr/2.1.5/envs/global.env b/appstore/prowlarr/2.3.0/envs/global.env similarity index 100% rename from appstore/prowlarr/2.1.5/envs/global.env rename to appstore/prowlarr/2.3.0/envs/global.env diff --git a/appstore/prowlarr/2.1.5/scripts/init.sh b/appstore/prowlarr/2.3.0/scripts/init.sh similarity index 100% rename from appstore/prowlarr/2.1.5/scripts/init.sh rename to appstore/prowlarr/2.3.0/scripts/init.sh diff --git a/appstore/prowlarr/2.1.5/scripts/uninstall.sh b/appstore/prowlarr/2.3.0/scripts/uninstall.sh similarity index 100% rename from appstore/prowlarr/2.1.5/scripts/uninstall.sh rename to appstore/prowlarr/2.3.0/scripts/uninstall.sh diff --git a/appstore/prowlarr/2.1.5/scripts/upgrade.sh b/appstore/prowlarr/2.3.0/scripts/upgrade.sh similarity index 100% rename from appstore/prowlarr/2.1.5/scripts/upgrade.sh rename to appstore/prowlarr/2.3.0/scripts/upgrade.sh diff --git a/dockge/astrbot-napcat/docker-compose.yml b/dockge/astrbot-napcat/docker-compose.yml index 641e4d8ba..961451fc9 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.5.7 + image: soulter/astrbot:v4.5.8 labels: createdBy: Apps networks: diff --git a/dockge/astrbot/docker-compose.yml b/dockge/astrbot/docker-compose.yml index 143d67051..9b2c3f00c 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.5.7 + image: soulter/astrbot:v4.5.8 labels: createdBy: Apps networks: diff --git a/dockge/jellyfin/docker-compose.yml b/dockge/jellyfin/docker-compose.yml index 88affa9a4..02cdff658 100644 --- a/dockge/jellyfin/docker-compose.yml +++ b/dockge/jellyfin/docker-compose.yml @@ -10,7 +10,7 @@ services: - ROC_ENABLE_PRE_VEGA=1 - HTTPS_PROXY=${HTTP_PROXY:-} - NO_PROXY=localhost,127.0.0.1,::1 - image: jellyfin/jellyfin:10.9.11 + image: jellyfin/jellyfin:10.11.3 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/jellyfin_10_11_2/.env b/dockge/jellyfin_10_9_11/.env similarity index 100% rename from dockge/jellyfin_10_11_2/.env rename to dockge/jellyfin_10_9_11/.env diff --git a/dockge/jellyfin_10_11_2/docker-compose.yml b/dockge/jellyfin_10_9_11/docker-compose.yml similarity index 96% rename from dockge/jellyfin_10_11_2/docker-compose.yml rename to dockge/jellyfin_10_9_11/docker-compose.yml index bbaa1214d..88affa9a4 100644 --- a/dockge/jellyfin_10_11_2/docker-compose.yml +++ b/dockge/jellyfin_10_9_11/docker-compose.yml @@ -10,7 +10,7 @@ services: - ROC_ENABLE_PRE_VEGA=1 - HTTPS_PROXY=${HTTP_PROXY:-} - NO_PROXY=localhost,127.0.0.1,::1 - image: jellyfin/jellyfin:10.11.2 + image: jellyfin/jellyfin:10.9.11 labels: createdBy: Apps network_mode: ${NETWORK_MODE} diff --git a/dockge/jellyfin_10_11_2/envs/default.env b/dockge/jellyfin_10_9_11/envs/default.env similarity index 100% rename from dockge/jellyfin_10_11_2/envs/default.env rename to dockge/jellyfin_10_9_11/envs/default.env diff --git a/dockge/jellyfin_10_11_2/envs/global.env b/dockge/jellyfin_10_9_11/envs/global.env similarity index 100% rename from dockge/jellyfin_10_11_2/envs/global.env rename to dockge/jellyfin_10_9_11/envs/global.env diff --git a/dockge/nacos/.env b/dockge/nacos/.env index 25c024938..7efde0c9d 100644 --- a/dockge/nacos/.env +++ b/dockge/nacos/.env @@ -2,19 +2,19 @@ PANEL_DB_TYPE=mysql # 网络模式 [必填] -NETWORK_MODE=host +NETWORK_MODE=1panel-network # 数据持久化路径 [必填] NACOS_ROOT_PATH=/home/nacos # WebUI 端口 [必填] -PANEL_APP_PORT_HTTP=8848 +PANEL_APP_PORT_HTTP=8080 -# Nacos gRPC 客户端端口 [必填] -PANEL_APP_PORT_GRPC_CLIENT=9848 +# WebUI API 端口 [必填] +PANEL_APP_PORT_API=8848 -# Nacos gRPC 服务端端口 [必填] -PANEL_APP_PORT_GRPC_SERVER=9849 +# Nacos gRPC 端口 [必填] +PANEL_APP_PORT_GRPC=9848 # IP模式/域名模式 [必填] PREFER_HOST_MODE=ip diff --git a/dockge/nacos/docker-compose.yml b/dockge/nacos/docker-compose.yml index 7e925e038..3fbde1cce 100644 --- a/dockge/nacos/docker-compose.yml +++ b/dockge/nacos/docker-compose.yml @@ -9,17 +9,18 @@ services: - .env environment: - MODE=standalone - - NACOS_SERVER_PORT=${PANEL_APP_PORT_HTTP:-8848} + - NACOS_CONSOLE_PORT=${PANEL_APP_PORT_HTTP:-8080} + - NACOS_SERVER_PORT=${PANEL_APP_PORT_API:-8848} - NACOS_AUTH_ENABLE=true - SPRING_DATASOURCE_PLATFORM=mysql - image: nacos/nacos-server:v2.5.1 + image: nacos/nacos-server:v3.1.0 labels: createdBy: Apps network_mode: ${NETWORK_MODE} ports: - - ${PANEL_APP_PORT_HTTP:-8848}:${PANEL_APP_PORT_HTTP:-8848} - - ${PANEL_APP_PORT_GRPC_CLIENT}:9848 - - ${PANEL_APP_PORT_GRPC_SERVER}:9849 + - ${PANEL_APP_PORT_HTTP:-8080}:${PANEL_APP_PORT_HTTP:-8080} + - ${PANEL_APP_PORT_API:-8848}:${PANEL_APP_PORT_API:-8080} + - ${PANEL_APP_PORT_GRPC}:9848 restart: always volumes: - ${NACOS_ROOT_PATH}/logs:/home/nacos/logs diff --git a/dockge/nacos/init/mysql-schema.sql b/dockge/nacos/init/mysql-schema.sql index 067d67a12..d45ac956b 100644 --- a/dockge/nacos/init/mysql-schema.sql +++ b/dockge/nacos/init/mysql-schema.sql @@ -20,86 +20,50 @@ CREATE TABLE `config_info` ( `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', - `data_id` varchar(255) NOT NULL COMMENT 'data_id', - `group_id` varchar(128) DEFAULT NULL COMMENT 'group_id', - `content` longtext NOT NULL COMMENT 'content', - `md5` varchar(32) DEFAULT NULL COMMENT 'md5', - `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `data_id` varchar(255) NOT NULL COMMENT 'data_id', + `group_id` varchar(128) DEFAULT NULL COMMENT 'group_id', + `content` longtext NOT NULL COMMENT 'content', + `md5` varchar(32) DEFAULT NULL COMMENT 'md5', + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', `src_user` text COMMENT 'source user', - `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', - `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', - `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', - `c_desc` varchar(256) DEFAULT NULL COMMENT 'configuration description', - `c_use` varchar(64) DEFAULT NULL COMMENT 'configuration usage', - `effect` varchar(64) DEFAULT NULL COMMENT '配置生效的描述', - `type` varchar(64) DEFAULT NULL COMMENT '配置的类型', + `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', + `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', + `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', + `c_desc` varchar(256) DEFAULT NULL COMMENT 'configuration description', + `c_use` varchar(64) DEFAULT NULL COMMENT 'configuration usage', + `effect` varchar(64) DEFAULT NULL COMMENT '配置生效的描述', + `type` varchar(64) DEFAULT NULL COMMENT '配置的类型', `c_schema` text COMMENT '配置的模式', - `encrypted_data_key` text NOT NULL COMMENT '密钥', + `encrypted_data_key` varchar(1024) NOT NULL DEFAULT '' COMMENT '密钥', PRIMARY KEY (`id`), UNIQUE KEY `uk_configinfo_datagrouptenant` (`data_id`,`group_id`,`tenant_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_info'; /******************************************/ -/* 表名称 = config_info_aggr */ +/* 表名称 = config_info since 2.5.0 */ /******************************************/ -CREATE TABLE `config_info_aggr` +CREATE TABLE `config_info_gray` ( - `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', - `data_id` varchar(255) NOT NULL COMMENT 'data_id', - `group_id` varchar(128) NOT NULL COMMENT 'group_id', - `datum_id` varchar(255) NOT NULL COMMENT 'datum_id', - `content` longtext NOT NULL COMMENT '内容', - `gmt_modified` datetime NOT NULL COMMENT '修改时间', - `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', - `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', - PRIMARY KEY (`id`), - UNIQUE KEY `uk_configinfoaggr_datagrouptenantdatum` (`data_id`,`group_id`,`tenant_id`,`datum_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='增加租户字段'; - - -/******************************************/ -/* 表名称 = config_info_beta */ -/******************************************/ -CREATE TABLE `config_info_beta` -( - `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', + `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT 'id', `data_id` varchar(255) NOT NULL COMMENT 'data_id', `group_id` varchar(128) NOT NULL COMMENT 'group_id', - `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', `content` longtext NOT NULL COMMENT 'content', - `beta_ips` varchar(1024) DEFAULT NULL COMMENT 'betaIps', `md5` varchar(32) DEFAULT NULL COMMENT 'md5', - `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', - `src_user` text COMMENT 'source user', - `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', - `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', - `encrypted_data_key` text NOT NULL COMMENT '密钥', + `src_user` text COMMENT 'src_user', + `src_ip` varchar(100) DEFAULT NULL COMMENT 'src_ip', + `gmt_create` datetime(3) NOT NULL DEFAULT CURRENT_TIMESTAMP (3) COMMENT 'gmt_create', + `gmt_modified` datetime(3) NOT NULL DEFAULT CURRENT_TIMESTAMP (3) COMMENT 'gmt_modified', + `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', + `tenant_id` varchar(128) DEFAULT '' COMMENT 'tenant_id', + `gray_name` varchar(128) NOT NULL COMMENT 'gray_name', + `gray_rule` text NOT NULL COMMENT 'gray_rule', + `encrypted_data_key` varchar(256) NOT NULL DEFAULT '' COMMENT 'encrypted_data_key', PRIMARY KEY (`id`), - UNIQUE KEY `uk_configinfobeta_datagrouptenant` (`data_id`,`group_id`,`tenant_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_info_beta'; - -/******************************************/ -/* 表名称 = config_info_tag */ -/******************************************/ -CREATE TABLE `config_info_tag` -( - `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', - `data_id` varchar(255) NOT NULL COMMENT 'data_id', - `group_id` varchar(128) NOT NULL COMMENT 'group_id', - `tenant_id` varchar(128) DEFAULT '' COMMENT 'tenant_id', - `tag_id` varchar(128) NOT NULL COMMENT 'tag_id', - `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', - `content` longtext NOT NULL COMMENT 'content', - `md5` varchar(32) DEFAULT NULL COMMENT 'md5', - `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', - `src_user` text COMMENT 'source user', - `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', - PRIMARY KEY (`id`), - UNIQUE KEY `uk_configinfotag_datagrouptenanttag` (`data_id`,`group_id`,`tenant_id`,`tag_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_info_tag'; + UNIQUE KEY `uk_configinfogray_datagrouptenantgray` (`data_id`,`group_id`,`tenant_id`,`gray_name`), + KEY `idx_dataid_gmt_modified` (`data_id`,`gmt_modified`), + KEY `idx_gmt_modified` (`gmt_modified`) +) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='config_info_gray'; /******************************************/ /* 表名称 = config_tags_relation */ @@ -144,18 +108,21 @@ CREATE TABLE `his_config_info` ( `id` bigint(20) unsigned NOT NULL COMMENT 'id', `nid` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT 'nid, 自增标识', - `data_id` varchar(255) NOT NULL COMMENT 'data_id', - `group_id` varchar(128) NOT NULL COMMENT 'group_id', - `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', - `content` longtext NOT NULL COMMENT 'content', - `md5` varchar(32) DEFAULT NULL COMMENT 'md5', - `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `data_id` varchar(255) NOT NULL COMMENT 'data_id', + `group_id` varchar(128) NOT NULL COMMENT 'group_id', + `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', + `content` longtext NOT NULL COMMENT 'content', + `md5` varchar(32) DEFAULT NULL COMMENT 'md5', + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', `src_user` text COMMENT 'source user', - `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', - `op_type` char(10) DEFAULT NULL COMMENT 'operation type', - `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', - `encrypted_data_key` text NOT NULL COMMENT '密钥', + `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', + `op_type` char(10) DEFAULT NULL COMMENT 'operation type', + `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', + `encrypted_data_key` varchar(1024) NOT NULL DEFAULT '' COMMENT '密钥', + `publish_type` varchar(50) DEFAULT 'formal' COMMENT 'publish type gray or formal', + `gray_name` varchar(50) DEFAULT NULL COMMENT 'gray name', + `ext_info` longtext DEFAULT NULL COMMENT 'ext info', PRIMARY KEY (`nid`), KEY `idx_gmt_create` (`gmt_create`), KEY `idx_gmt_modified` (`gmt_modified`), @@ -219,9 +186,3 @@ CREATE TABLE `permissions` `action` varchar(8) NOT NULL COMMENT 'action', UNIQUE INDEX `uk_role_permission` (`role`,`resource`,`action`) USING BTREE ); - -INSERT INTO users (username, password, enabled) -VALUES ('nacos', '$2a$10$EuWPZHzz32dJN7jexM34MOeYirDdFAZm2kuWj7VEOJhhZkDrxfvUu', TRUE); - -INSERT INTO roles (username, role) -VALUES ('nacos', 'ROLE_ADMIN'); diff --git a/dockge/nacos_3_1_0/.env b/dockge/nacos_2_5_2/.env similarity index 88% rename from dockge/nacos_3_1_0/.env rename to dockge/nacos_2_5_2/.env index 7efde0c9d..25c024938 100644 --- a/dockge/nacos_3_1_0/.env +++ b/dockge/nacos_2_5_2/.env @@ -2,19 +2,19 @@ PANEL_DB_TYPE=mysql # 网络模式 [必填] -NETWORK_MODE=1panel-network +NETWORK_MODE=host # 数据持久化路径 [必填] NACOS_ROOT_PATH=/home/nacos # WebUI 端口 [必填] -PANEL_APP_PORT_HTTP=8080 +PANEL_APP_PORT_HTTP=8848 -# WebUI API 端口 [必填] -PANEL_APP_PORT_API=8848 +# Nacos gRPC 客户端端口 [必填] +PANEL_APP_PORT_GRPC_CLIENT=9848 -# Nacos gRPC 端口 [必填] -PANEL_APP_PORT_GRPC=9848 +# Nacos gRPC 服务端端口 [必填] +PANEL_APP_PORT_GRPC_SERVER=9849 # IP模式/域名模式 [必填] PREFER_HOST_MODE=ip diff --git a/dockge/nacos_3_1_0/docker-compose.yml b/dockge/nacos_2_5_2/docker-compose.yml similarity index 59% rename from dockge/nacos_3_1_0/docker-compose.yml rename to dockge/nacos_2_5_2/docker-compose.yml index 3fbde1cce..22ee0e33a 100644 --- a/dockge/nacos_3_1_0/docker-compose.yml +++ b/dockge/nacos_2_5_2/docker-compose.yml @@ -9,18 +9,17 @@ services: - .env environment: - MODE=standalone - - NACOS_CONSOLE_PORT=${PANEL_APP_PORT_HTTP:-8080} - - NACOS_SERVER_PORT=${PANEL_APP_PORT_API:-8848} + - NACOS_SERVER_PORT=${PANEL_APP_PORT_HTTP:-8848} - NACOS_AUTH_ENABLE=true - SPRING_DATASOURCE_PLATFORM=mysql - image: nacos/nacos-server:v3.1.0 + image: nacos/nacos-server:v2.5.2 labels: createdBy: Apps network_mode: ${NETWORK_MODE} ports: - - ${PANEL_APP_PORT_HTTP:-8080}:${PANEL_APP_PORT_HTTP:-8080} - - ${PANEL_APP_PORT_API:-8848}:${PANEL_APP_PORT_API:-8080} - - ${PANEL_APP_PORT_GRPC}:9848 + - ${PANEL_APP_PORT_HTTP:-8848}:${PANEL_APP_PORT_HTTP:-8848} + - ${PANEL_APP_PORT_GRPC_CLIENT}:9848 + - ${PANEL_APP_PORT_GRPC_SERVER}:9849 restart: always volumes: - ${NACOS_ROOT_PATH}/logs:/home/nacos/logs diff --git a/dockge/nacos_3_1_0/envs/default.env b/dockge/nacos_2_5_2/envs/default.env similarity index 100% rename from dockge/nacos_3_1_0/envs/default.env rename to dockge/nacos_2_5_2/envs/default.env diff --git a/dockge/nacos_3_1_0/envs/global.env b/dockge/nacos_2_5_2/envs/global.env similarity index 100% rename from dockge/nacos_3_1_0/envs/global.env rename to dockge/nacos_2_5_2/envs/global.env diff --git a/dockge/nacos_3_1_0/init/mysql-schema.sql b/dockge/nacos_2_5_2/init/mysql-schema.sql similarity index 59% rename from dockge/nacos_3_1_0/init/mysql-schema.sql rename to dockge/nacos_2_5_2/init/mysql-schema.sql index d45ac956b..067d67a12 100644 --- a/dockge/nacos_3_1_0/init/mysql-schema.sql +++ b/dockge/nacos_2_5_2/init/mysql-schema.sql @@ -20,50 +20,86 @@ CREATE TABLE `config_info` ( `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', - `data_id` varchar(255) NOT NULL COMMENT 'data_id', - `group_id` varchar(128) DEFAULT NULL COMMENT 'group_id', - `content` longtext NOT NULL COMMENT 'content', - `md5` varchar(32) DEFAULT NULL COMMENT 'md5', - `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `data_id` varchar(255) NOT NULL COMMENT 'data_id', + `group_id` varchar(128) DEFAULT NULL COMMENT 'group_id', + `content` longtext NOT NULL COMMENT 'content', + `md5` varchar(32) DEFAULT NULL COMMENT 'md5', + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', `src_user` text COMMENT 'source user', - `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', - `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', - `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', - `c_desc` varchar(256) DEFAULT NULL COMMENT 'configuration description', - `c_use` varchar(64) DEFAULT NULL COMMENT 'configuration usage', - `effect` varchar(64) DEFAULT NULL COMMENT '配置生效的描述', - `type` varchar(64) DEFAULT NULL COMMENT '配置的类型', + `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', + `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', + `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', + `c_desc` varchar(256) DEFAULT NULL COMMENT 'configuration description', + `c_use` varchar(64) DEFAULT NULL COMMENT 'configuration usage', + `effect` varchar(64) DEFAULT NULL COMMENT '配置生效的描述', + `type` varchar(64) DEFAULT NULL COMMENT '配置的类型', `c_schema` text COMMENT '配置的模式', - `encrypted_data_key` varchar(1024) NOT NULL DEFAULT '' COMMENT '密钥', + `encrypted_data_key` text NOT NULL COMMENT '密钥', PRIMARY KEY (`id`), UNIQUE KEY `uk_configinfo_datagrouptenant` (`data_id`,`group_id`,`tenant_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_info'; /******************************************/ -/* 表名称 = config_info since 2.5.0 */ +/* 表名称 = config_info_aggr */ /******************************************/ -CREATE TABLE `config_info_gray` +CREATE TABLE `config_info_aggr` ( - `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT 'id', + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', + `data_id` varchar(255) NOT NULL COMMENT 'data_id', + `group_id` varchar(128) NOT NULL COMMENT 'group_id', + `datum_id` varchar(255) NOT NULL COMMENT 'datum_id', + `content` longtext NOT NULL COMMENT '内容', + `gmt_modified` datetime NOT NULL COMMENT '修改时间', + `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', + `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', + PRIMARY KEY (`id`), + UNIQUE KEY `uk_configinfoaggr_datagrouptenantdatum` (`data_id`,`group_id`,`tenant_id`,`datum_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='增加租户字段'; + + +/******************************************/ +/* 表名称 = config_info_beta */ +/******************************************/ +CREATE TABLE `config_info_beta` +( + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', `data_id` varchar(255) NOT NULL COMMENT 'data_id', `group_id` varchar(128) NOT NULL COMMENT 'group_id', - `content` longtext NOT NULL COMMENT 'content', - `md5` varchar(32) DEFAULT NULL COMMENT 'md5', - `src_user` text COMMENT 'src_user', - `src_ip` varchar(100) DEFAULT NULL COMMENT 'src_ip', - `gmt_create` datetime(3) NOT NULL DEFAULT CURRENT_TIMESTAMP (3) COMMENT 'gmt_create', - `gmt_modified` datetime(3) NOT NULL DEFAULT CURRENT_TIMESTAMP (3) COMMENT 'gmt_modified', `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', - `tenant_id` varchar(128) DEFAULT '' COMMENT 'tenant_id', - `gray_name` varchar(128) NOT NULL COMMENT 'gray_name', - `gray_rule` text NOT NULL COMMENT 'gray_rule', - `encrypted_data_key` varchar(256) NOT NULL DEFAULT '' COMMENT 'encrypted_data_key', + `content` longtext NOT NULL COMMENT 'content', + `beta_ips` varchar(1024) DEFAULT NULL COMMENT 'betaIps', + `md5` varchar(32) DEFAULT NULL COMMENT 'md5', + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `src_user` text COMMENT 'source user', + `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', + `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', + `encrypted_data_key` text NOT NULL COMMENT '密钥', PRIMARY KEY (`id`), - UNIQUE KEY `uk_configinfogray_datagrouptenantgray` (`data_id`,`group_id`,`tenant_id`,`gray_name`), - KEY `idx_dataid_gmt_modified` (`data_id`,`gmt_modified`), - KEY `idx_gmt_modified` (`gmt_modified`) -) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='config_info_gray'; + UNIQUE KEY `uk_configinfobeta_datagrouptenant` (`data_id`,`group_id`,`tenant_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_info_beta'; + +/******************************************/ +/* 表名称 = config_info_tag */ +/******************************************/ +CREATE TABLE `config_info_tag` +( + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', + `data_id` varchar(255) NOT NULL COMMENT 'data_id', + `group_id` varchar(128) NOT NULL COMMENT 'group_id', + `tenant_id` varchar(128) DEFAULT '' COMMENT 'tenant_id', + `tag_id` varchar(128) NOT NULL COMMENT 'tag_id', + `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', + `content` longtext NOT NULL COMMENT 'content', + `md5` varchar(32) DEFAULT NULL COMMENT 'md5', + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `src_user` text COMMENT 'source user', + `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', + PRIMARY KEY (`id`), + UNIQUE KEY `uk_configinfotag_datagrouptenanttag` (`data_id`,`group_id`,`tenant_id`,`tag_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_info_tag'; /******************************************/ /* 表名称 = config_tags_relation */ @@ -108,21 +144,18 @@ CREATE TABLE `his_config_info` ( `id` bigint(20) unsigned NOT NULL COMMENT 'id', `nid` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT 'nid, 自增标识', - `data_id` varchar(255) NOT NULL COMMENT 'data_id', - `group_id` varchar(128) NOT NULL COMMENT 'group_id', - `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', - `content` longtext NOT NULL COMMENT 'content', - `md5` varchar(32) DEFAULT NULL COMMENT 'md5', - `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `data_id` varchar(255) NOT NULL COMMENT 'data_id', + `group_id` varchar(128) NOT NULL COMMENT 'group_id', + `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', + `content` longtext NOT NULL COMMENT 'content', + `md5` varchar(32) DEFAULT NULL COMMENT 'md5', + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', `src_user` text COMMENT 'source user', - `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', - `op_type` char(10) DEFAULT NULL COMMENT 'operation type', - `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', - `encrypted_data_key` varchar(1024) NOT NULL DEFAULT '' COMMENT '密钥', - `publish_type` varchar(50) DEFAULT 'formal' COMMENT 'publish type gray or formal', - `gray_name` varchar(50) DEFAULT NULL COMMENT 'gray name', - `ext_info` longtext DEFAULT NULL COMMENT 'ext info', + `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', + `op_type` char(10) DEFAULT NULL COMMENT 'operation type', + `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', + `encrypted_data_key` text NOT NULL COMMENT '密钥', PRIMARY KEY (`nid`), KEY `idx_gmt_create` (`gmt_create`), KEY `idx_gmt_modified` (`gmt_modified`), @@ -186,3 +219,9 @@ CREATE TABLE `permissions` `action` varchar(8) NOT NULL COMMENT 'action', UNIQUE INDEX `uk_role_permission` (`role`,`resource`,`action`) USING BTREE ); + +INSERT INTO users (username, password, enabled) +VALUES ('nacos', '$2a$10$EuWPZHzz32dJN7jexM34MOeYirDdFAZm2kuWj7VEOJhhZkDrxfvUu', TRUE); + +INSERT INTO roles (username, role) +VALUES ('nacos', 'ROLE_ADMIN'); diff --git a/dockge/prowlarr/docker-compose.yml b/dockge/prowlarr/docker-compose.yml index 1a0dd7541..e7f2783b2 100644 --- a/dockge/prowlarr/docker-compose.yml +++ b/dockge/prowlarr/docker-compose.yml @@ -12,7 +12,7 @@ services: - PGID=1000 - UMASK=022 - TZ=Asia/Shanghai - image: linuxserver/prowlarr:2.1.5 + image: linuxserver/prowlarr:2.3.0 labels: createdBy: Apps networks: