From b0f2d15a0f2264e56cb5246d2389c27a03e01424 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=90=8C=E6=A3=AE?= <qyg2297248353@163.com>
Date: Sat, 20 Jul 2024 10:45:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20casdoor?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 萌森 <qyg2297248353@163.com>
---
 casdoor/1.645.0/docker-compose.yml | 9 ++-------
 casdoor/1.645.0/scripts/init.sh    | 8 ++++----
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/casdoor/1.645.0/docker-compose.yml b/casdoor/1.645.0/docker-compose.yml
index 80297eae3..7e0ec08a5 100644
--- a/casdoor/1.645.0/docker-compose.yml
+++ b/casdoor/1.645.0/docker-compose.yml
@@ -15,11 +15,6 @@ services:
       - 1panel-network
     ports:
       - ${PANEL_APP_PORT_HTTP}:8000
-    build:
-      context: ./
-      dockerfile: Dockerfile
-      target: STANDARD
-    entrypoint: /bin/sh -c './server --createDatabase=true'
     env_file:
       - /etc/1panel/envs/global.env
       - /etc/1panel/envs/casdoor/casdoor.env
@@ -31,5 +26,5 @@ services:
       - dbName=${DB_NAME}
       - redisEndpoint=${REDIS_HOSTNAME}:${REDIS_PORT}
       - verificationCodeTimeout=10
-      - appname="casdoor"
-      - authState="casdoor"
+      - appname=casdoor
+      - authState=casdoor
diff --git a/casdoor/1.645.0/scripts/init.sh b/casdoor/1.645.0/scripts/init.sh
index ca375e4a2..687fe1ac6 100644
--- a/casdoor/1.645.0/scripts/init.sh
+++ b/casdoor/1.645.0/scripts/init.sh
@@ -8,17 +8,17 @@ if [ -f .env ]; then
   echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env
 
   if [ "$DB_TYPE" == "mysql" ]; then
-    echo "dataSourceName=\"$DB_USER:$DB_PASSWD@tcp($DB_HOSTNAME:$DB_PORT)/\"" >> .env
+    echo "dataSourceName=$DB_USER:$DB_PASSWD@tcp($DB_HOSTNAME:$DB_PORT)/" >> .env
   fi
 
   if [ "$DB_TYPE" == "postgres" ]; then
-    echo "dataSourceName=\"user=$DB_USER password=$DB_PASSWD host=$DB_HOSTNAME port=$DB_PORT sslmode=disable dbname=$DB_NAME\"" >> .env
+    echo "dataSourceName=user=$DB_USER password=$DB_PASSWD host=$DB_HOSTNAME port=$DB_PORT sslmode=disable dbname=$DB_NAME" >> .env
   fi
 
   if [ -n "$REDIS_PASSWORD" ]; then
-    echo "redisEndpoint=\"$REDIS_HOSTNAME:$REDIS_PORT,$REDIS_DBINDEX,$REDIS_PASSWORD\"" >> .env
+    echo "redisEndpoint=$REDIS_HOSTNAME:$REDIS_PORT,$REDIS_DBINDEX,$REDIS_PASSWORD" >> .env
   else
-    echo "redisEndpoint=\"$REDIS_HOSTNAME:$REDIS_PORT,$REDIS_DBINDEX\"" >> .env
+    echo "redisEndpoint=$REDIS_HOSTNAME:$REDIS_PORT,$REDIS_DBINDEX" >> .env
   fi
 
   echo "Check Finish."