From 1ca5737e1ee3f1fb68f8e2531f261937086c8a27 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:36:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0OIDC=20ADMIN=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 environment.sh                          | 12 +++++++++--
 server/oidcservice.sh                   | 28 +++++++++++++++++++++++++
 serviceImageBuilder/buildOidcAdmin.sh   |  4 ++++
 serviceImageBuilder/buildOidcService.sh |  2 +-
 4 files changed, 43 insertions(+), 3 deletions(-)
 mode change 100644 => 100755 server/oidcservice.sh
 create mode 100755 serviceImageBuilder/buildOidcAdmin.sh

diff --git a/environment.sh b/environment.sh
index 82528ce..95aaac5 100644
--- a/environment.sh
+++ b/environment.sh
@@ -94,11 +94,19 @@ export XXLJOB_ACCESS_TOKEN=default_token
 #SKY_AOP 配置
 export SKY_AOP=${SKYWALKING_OAP_NAME}:11800
 
-#OIDC 配置
+#OIDCServer 配置
 export OIDC_SERVER_NAME=OIDC_SERVER_${DOMAIN} 
 export OIDC_SERVER_IMAGE=${REGISTRY_HOST}oidcserver:${DOMAIN} 
 export OIDC_SERVER_JAR=tuoheng_oidc_server.jar
-export OIDC_REMOTE_JAR=/home/th/workspace/test/swarm/dockerfile/oidcservice/${OIDC_SERVER_JAR}
+export OIDC_SERVER_REMOTE_JAR=/home/th/workspace/test/swarm/dockerfile/oidcservice/${OIDC_SERVER_JAR}
+export OIDC_SERVER_MEMORY=512m
+
+#OIDCAdmin 配置
+export OIDC_ADMIN_NAME=OIDC_ADMIN_${DOMAIN} 
+export OIDC_ADMIN_IMAGE=${REGISTRY_HOST}oidcadmin:${DOMAIN} 
+export OIDC_ADMIN_JAR=tuoheng_oidc_admin.jar
+export OIDC_ADMIN_REMOTE_JAR=/home/th/workspace/test/swarm/dockerfile/oidcadmin/${OIDC_ADMIN_JAR}
+export OIDC_ADMIN_MEMORY=512m
 
 #主机INGRESS_PORT 映射到容器80 INGRESS_SSL_PORT 映射到容器 443
 export INGRESS_PORT=80
diff --git a/server/oidcservice.sh b/server/oidcservice.sh
old mode 100644
new mode 100755
index e69de29..b3c3f5c
--- a/server/oidcservice.sh
+++ b/server/oidcservice.sh
@@ -0,0 +1,28 @@
+source ../environment.sh
+ 
+
+if docker ps -a | grep -q ${OIDC_SERVER_NAME}; then
+    echo "停止并删除已存在的 OIDC_SERVER_NAME 容器..."
+    docker stop ${OIDC_SERVER_NAME} >/dev/null 2>&1
+    docker rm ${OIDC_SERVER_NAME} >/dev/null 2>&1
+fi
+
+
+docker run -d \
+--name ${OIDC_SERVER_NAME} \
+--network ${NETWORK} \
+--env SPRING_CLOUD_CONSUL_HOST=${CONSUL_NAME} \
+--env SPRING_CLOUD_CONSUL_PORT=${CONSUL_PORT} \
+--env SPRING_CLOUD_CONSUL_DISCOVERY_HOSTNAME=${OIDC_SERVER_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 TZ=Asia/Shanghai \
+--mount type=bind,source=/etc/localtime,target=/etc/localtime,readonly \
+--memory ${OIDC_SERVER_MEMORY} \
+--restart unless-stopped \
+${OIDC_SERVER_IMAGE}
+
+docker ps
\ No newline at end of file
diff --git a/serviceImageBuilder/buildOidcAdmin.sh b/serviceImageBuilder/buildOidcAdmin.sh
new file mode 100755
index 0000000..b688c13
--- /dev/null
+++ b/serviceImageBuilder/buildOidcAdmin.sh
@@ -0,0 +1,4 @@
+source ../environment.sh
+rm $OIDC_ADMIN_JAR
+cp $OIDC_ADMIN_REMOTE_JAR $OIDC_ADMIN_JAR
+./builder.sh $OIDC_ADMIN_NAME $OIDC_ADMIN_IMAGE $OIDC_ADMIN_JAR
\ No newline at end of file
diff --git a/serviceImageBuilder/buildOidcService.sh b/serviceImageBuilder/buildOidcService.sh
index 4c7e4f2..3cc012a 100755
--- a/serviceImageBuilder/buildOidcService.sh
+++ b/serviceImageBuilder/buildOidcService.sh
@@ -1,4 +1,4 @@
 source ../environment.sh
 rm $OIDC_SERVER_JAR
-cp $OIDC_REMOTE_JAR $OIDC_SERVER_JAR
+cp $OIDC_SERVER_REMOTE_JAR $OIDC_SERVER_JAR
 ./builder.sh $OIDC_SERVER_NAME $OIDC_SERVER_IMAGE $OIDC_SERVER_JAR
\ No newline at end of file