From ca30c8a7a0f49fdcc77f69edcc6920602cb51dca Mon Sep 17 00:00:00 2001
From: zhengkunwang223 <zhengkun@fit2cloud.com>
Date: Mon, 11 Sep 2023 15:30:51 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=88=A0=E9=99=A4=20halo=20=E7=9A=84?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=90=8D/=E5=AF=86=E7=A0=81=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/halo/2.9.1/data.yml           | 15 ---------------
 apps/halo/2.9.1/docker-compose.yml |  6 ++----
 2 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/apps/halo/2.9.1/data.yml b/apps/halo/2.9.1/data.yml
index 727870d8..351ff2cd 100644
--- a/apps/halo/2.9.1/data.yml
+++ b/apps/halo/2.9.1/data.yml
@@ -40,21 +40,6 @@ additionalProperties:
           required: true
           rule: paramComplexity
           type: password
-        - default: admin
-          envKey: HALO_ADMIN
-          labelEn: Admin Username
-          labelZh: 超级管理员用户名
-          required: true
-          rule: paramSimple
-          type: text
-        - default: halo
-          envKey: HALO_ADMIN_PASSWORD
-          labelEn: Admin Password
-          labelZh: 超级管理员密码
-          random: true
-          required: true
-          rule: paramComplexity
-          type: password
         - default: http://localhost:8080
           edit: true
           envKey: HALO_EXTERNAL_URL
diff --git a/apps/halo/2.9.1/docker-compose.yml b/apps/halo/2.9.1/docker-compose.yml
index 848a203b..ccc9c44c 100644
--- a/apps/halo/2.9.1/docker-compose.yml
+++ b/apps/halo/2.9.1/docker-compose.yml
@@ -17,13 +17,11 @@ services:
       retries: 5
       start_period: 30s
     command:
-      - --spring.r2dbc.url=r2dbc:pool:${HALO_PLATFORM}://${PANEL_DB_HOST}:${PANEL_DB_PORT}/${PANEL_DB_NAME}
+      - --spring.r2dbc.url=r2dbc:pool:${PANEL_DB_TYPE}://${PANEL_DB_HOST}:${PANEL_DB_PORT}/${PANEL_DB_NAME}
       - --spring.r2dbc.username=${PANEL_DB_USER}
       - --spring.r2dbc.password=${PANEL_DB_USER_PASSWORD}
-      - --spring.sql.init.platform=${HALO_PLATFORM}
+      - --spring.sql.init.platform=${PANEL_DB_TYPE}
       - --halo.external-url=${HALO_EXTERNAL_URL}
-      - --halo.security.initializer.superadminusername=${HALO_ADMIN}
-      - --halo.security.initializer.superadminpassword=${HALO_ADMIN_PASSWORD}
     labels:
       createdBy: "Apps"
 networks: