From 8452b38d5f8bd1293feb1a0d5c11c7454540b91d 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 16:37:15 +0800
Subject: [PATCH] xx

---
 environment.sh                                | 11 +++++++++
 nginx/vhosts/oidcservice.conf                 | 23 +++++++++++++++++++
 serviceImageBuilder/gateway.sh                |  4 ++++
 .../{buildOidcAdmin.sh => oidcadmin.sh}       |  0
 .../{buildOidcService.sh => oidcservice.sh}   |  0
 5 files changed, 38 insertions(+)
 create mode 100644 nginx/vhosts/oidcservice.conf
 create mode 100755 serviceImageBuilder/gateway.sh
 rename serviceImageBuilder/{buildOidcAdmin.sh => oidcadmin.sh} (100%)
 rename serviceImageBuilder/{buildOidcService.sh => oidcservice.sh} (100%)

diff --git a/environment.sh b/environment.sh
index 455eb98..b17e223 100644
--- a/environment.sh
+++ b/environment.sh
@@ -8,6 +8,7 @@ export REGISTRY=registry.t-aaron.com
 export SKY_DOMAIN=sky-${DOMAIN}.t-aaron.com
 export CONSUL_DOMAIN=consul-${DOMAIN}.t-aaron.com
 export XXLJOB_DOMAIN=xxljob-${DOMAIN}.t-aaron.com
+export OIDC_SERVER_DOMAIN=oidc-${DOMAIN}.t-aaron.com
 
 
 export REGISTRY_HOST=${REGISTRY}/tuoheng/
@@ -119,6 +120,16 @@ 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
 
+
+export GATEWAY_NAME=GATEWAY_${DOMAIN}
+export GATEWAY_IMAGE=${REGISTRY_HOST}gateway:${DOMAIN}
+export GATEWAY_JAR=tuoheng_gateway.jar
+export GATEWAY_REMOTE_JAR=/home/th/workspace/test/swarm/dockerfile/gateway/${GATEWAY_JAR}
+export GATEWAY_MEMORY=512m
+
+
+
+
 #主机INGRESS_PORT 映射到容器80 INGRESS_SSL_PORT 映射到容器 443
 export INGRESS_PORT=80
 #export INGRESS_SSL_PORT=443
diff --git a/nginx/vhosts/oidcservice.conf b/nginx/vhosts/oidcservice.conf
new file mode 100644
index 0000000..fd755de
--- /dev/null
+++ b/nginx/vhosts/oidcservice.conf
@@ -0,0 +1,23 @@
+ server {
+     listen 80;
+     listen 443 ssl;
+
+     server_name oidc-bazhong.t-aaron.com;
+
+     # SSL证书配置
+     ssl_certificate /etc/nginx/t-aaron.com.pem;
+     ssl_certificate_key /etc/nginx/t-aaron.com.key;
+     ssl_session_timeout 5m;
+     ssl_ciphers ECDHE-RSA-AES128-GCM-SHA256:ECDHE:ECDH:AES:HIGH:!NULL:!aNULL:!MD5:!ADH:!RC4;
+     ssl_protocols TLSv1.1 TLSv1.2 TLSv1.3;
+     ssl_prefer_server_ciphers on;
+
+
+     location / {
+        proxy_pass http://OIDC_SERVER_bazhong:8090;
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+    }
+ }
diff --git a/serviceImageBuilder/gateway.sh b/serviceImageBuilder/gateway.sh
new file mode 100755
index 0000000..5b96ff7
--- /dev/null
+++ b/serviceImageBuilder/gateway.sh
@@ -0,0 +1,4 @@
+source ../environment.sh
+rm $GATEWAY_JAR
+cp $GATEWAY_REMOTE_JAR $GATEWAY_JAR
+./builder.sh $GATEWAY_NAME $GATEWAY_IMAGE $GATEWAY_JAR
\ No newline at end of file
diff --git a/serviceImageBuilder/buildOidcAdmin.sh b/serviceImageBuilder/oidcadmin.sh
similarity index 100%
rename from serviceImageBuilder/buildOidcAdmin.sh
rename to serviceImageBuilder/oidcadmin.sh
diff --git a/serviceImageBuilder/buildOidcService.sh b/serviceImageBuilder/oidcservice.sh
similarity index 100%
rename from serviceImageBuilder/buildOidcService.sh
rename to serviceImageBuilder/oidcservice.sh