From 5bfa3f4aec7d8eaf951108827134f212e8efcc9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= <sunpengchina85@gmail.com>
Date: Thu, 15 May 2025 11:57:13 +0800
Subject: [PATCH] xx

---
 server/oidcadmin.sh   | 31 +++++++++++++++++++++++++++++++
 server/oidcservice.sh |  3 +++
 2 files changed, 34 insertions(+)
 create mode 100755 server/oidcadmin.sh

diff --git a/server/oidcadmin.sh b/server/oidcadmin.sh
new file mode 100755
index 0000000..cea7424
--- /dev/null
+++ b/server/oidcadmin.sh
@@ -0,0 +1,31 @@
+source ../environment.sh
+ 
+
+if docker ps -a | grep -q ${OIDC_ADMIN_NAME}; then
+    echo "停止并删除已存在的 OIDC_ADMIN_NAME 容器..."
+    docker stop ${OIDC_ADMIN_NAME} >/dev/null 2>&1
+    docker rm ${OIDC_ADMIN_NAME} >/dev/null 2>&1
+fi
+
+
+docker run -d \
+--name ${OIDC_ADMIN_NAME} \
+--network ${NETWORK} \
+--env SPRING_CLOUD_CONSUL_HOST=${CONSUL_NAME} \
+--env SPRING_CLOUD_CONSUL_PORT=${CONSUL_PORT} \
+--env SPRING_CLOUD_CONSUL_DISCOVERY_HOSTNAME=${OIDC_ADMIN_NAME} \
+--env XXL_JOB_ADMIN_ADDRESSES=${XXLJOB_NAME}:${XXLJOB_PORT} \
+--env XXL_ENABLE=false \
+--env SPRING_REDIS_HOST=${REDIS_NAME} \
+--env SPRING_REDIS_PORT=6379 \
+--env SPRING_DATASOURCE_URL="jdbc:mysql://${MYSQL_NAME}:3306/tuoheng_airport?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2b8&useSSL=true&tinyInt1isBit=false" \
+--env SPRING_DATASOURCE_USERNAME=root \
+--env SPRING_DATASOURCE_PASSWORD=${MYSQL_ROOT_PASSWORD} \
+--env TZ=Asia/Shanghai \
+--env SPRING_KAFKA_COMMON_BOOTSTRAP-SERVERS=${KAFKA_NAME}:9092 \
+--mount type=bind,source=/etc/localtime,target=/etc/localtime,readonly \
+--memory ${OIDC_ADMIN_MEMORY} \
+--restart unless-stopped \
+${OIDC_ADMIN_IMAGE}
+
+docker ps
\ No newline at end of file
diff --git a/server/oidcservice.sh b/server/oidcservice.sh
index b3c3f5c..b4afca5 100755
--- a/server/oidcservice.sh
+++ b/server/oidcservice.sh
@@ -19,7 +19,10 @@ docker run -d \
 --env SPRING_REDIS_HOST=${REDIS_NAME} \
 --env SPRING_REDIS_PORT=6379 \
 --env SPRING_DATASOURCE_URL="jdbc:mysql://${MYSQL_NAME}:3306/tuoheng_airport?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2b8&useSSL=true&tinyInt1isBit=false" \
+--env SPRING_DATASOURCE_USERNAME=root \
+--env SPRING_DATASOURCE_PASSWORD=${MYSQL_ROOT_PASSWORD} \
 --env TZ=Asia/Shanghai \
+--env SPRING_KAFKA_COMMON_BOOTSTRAP-SERVERS=${KAFKA_NAME}:9092 \
 --mount type=bind,source=/etc/localtime,target=/etc/localtime,readonly \
 --memory ${OIDC_SERVER_MEMORY} \
 --restart unless-stopped \