From f79ef7c15b087b117ad43ba6d6a0373299250ae2 Mon Sep 17 00:00:00 2001
From: Meng Sen <qyg2297248353@gmail.com>
Date: Mon, 2 Dec 2024 17:37:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E5=B8=83=E5=BA=94=E7=94=A8=EF=BC=9ATo?=
 =?UTF-8?q?piam?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Meng Sen <qyg2297248353@gmail.com>
---
 apps/topiam-ce/2.0.0/data.yml           | 17 -----------------
 apps/topiam-ce/2.0.0/docker-compose.yml |  2 --
 apps/topiam-ce/2.0.0/scripts/init.sh    |  5 +++++
 3 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/apps/topiam-ce/2.0.0/data.yml b/apps/topiam-ce/2.0.0/data.yml
index 1439fbf7..af45c5a5 100644
--- a/apps/topiam-ce/2.0.0/data.yml
+++ b/apps/topiam-ce/2.0.0/data.yml
@@ -47,23 +47,6 @@ additionalProperties:
       required: true
       rule: paramPort
       type: number
-    - default: "admin"
-      edit: true
-      key: admin
-      envKey: ADMIN_USERNAME
-      labelZh: 管理员 用户名
-      labelEn: Admin Username
-      required: true
-      rule: paramCommon
-      type: text
-    - default: "topiam.cn"
-      edit: true
-      key: ADMIN_PASSWORD
-      envKey: topiam.cn
-      labelZh: 管理员 密码
-      labelEn: Admin Password
-      required: true
-      type: password
     - default: "127.0.0.1"
       edit: true
       envKey: DB_HOST
diff --git a/apps/topiam-ce/2.0.0/docker-compose.yml b/apps/topiam-ce/2.0.0/docker-compose.yml
index b10ae429..0769c264 100644
--- a/apps/topiam-ce/2.0.0/docker-compose.yml
+++ b/apps/topiam-ce/2.0.0/docker-compose.yml
@@ -17,10 +17,8 @@ services:
       - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env}
       - ${ENV_FILE:-/etc/1panel/envs/default.env}
     volumes:
-      - ${TOPIAM_CE_ROOT_PATH}/conf:/opt/topiam/conf
       - ${TOPIAM_CE_ROOT_PATH}/logs:/opt/topiam/logs
     environment:
-      - INITIAL_PASSWORD_VALUE=ADMIN_PASSWORD
       - spring.datasource.url=jdbc:mysql://${DB_HOST}:${DB_PORT}/${DB_NAME}?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&allowPublicKeyRetrieval=true&rewriteBatchedStatements=true
       - spring.datasource.username=${DB_USER}
       - spring.datasource.password=${DB_USER_PASSWORD}
diff --git a/apps/topiam-ce/2.0.0/scripts/init.sh b/apps/topiam-ce/2.0.0/scripts/init.sh
index 07fb8c3f..935d95e4 100644
--- a/apps/topiam-ce/2.0.0/scripts/init.sh
+++ b/apps/topiam-ce/2.0.0/scripts/init.sh
@@ -10,6 +10,11 @@ if [ -f .env ]; then
   echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env
   echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env
 
+  # setup-2 create directories
+  mkdir -p "$TOPIAM_CE_ROOT_PATH"
+  mkdir -p "$TOPIAM_CE_ROOT_PATH/logs"
+  chmod -R 777 "$TOPIAM_CE_ROOT_PATH"
+
   echo "Check Finish."
 
 else