From 3522cc78037c43ee778d7dfdf51755531c5bf447 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= <sunpengchina85@gmail.com>
Date: Wed, 11 Jun 2025 12:31:33 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bazhong.sh                  |  5 +++--
 kafka-test/requirements.txt |  2 ++
 start/airport.sh            |  6 ++++--
 start/oidcservice.sh        |  3 +++
 巴中部署文档.md       | 11 ++++++++---
 5 files changed, 20 insertions(+), 7 deletions(-)
 create mode 100644 kafka-test/requirements.txt

diff --git a/bazhong.sh b/bazhong.sh
index c6c3e37..f903385 100644
--- a/bazhong.sh
+++ b/bazhong.sh
@@ -30,8 +30,9 @@ export BUSINESS_WEB_DIST=/home/th/workspace/dockerbuilder/webs/bazhong/business_
 
 
 #域名证书位置写在这边
-#export PEM_PATH=/opt/tuoheng/jocloud/jouavcloud.com.pem
-#export KEY_PATH=/opt/tuoheng/jocloud/jouavcloud.com.key
+#域名证书位置写在这边
+export PEM_PATH=/Users/sunpeng/workspace/remote/docker/nginx/vhosts/cert/t-aaron.com.pem
+export KEY_PATH=/Users/sunpeng/workspace/remote/docker/nginx/vhosts/cert/t-aaron.com.key
 
 
 export SKYWALKING_UI_DOMAIN=sky-${DOMAIN}.${DOMAIN_END}
diff --git a/kafka-test/requirements.txt b/kafka-test/requirements.txt
new file mode 100644
index 0000000..ad89b8f
--- /dev/null
+++ b/kafka-test/requirements.txt
@@ -0,0 +1,2 @@
+confluent-kafka>=2.3.0
+six>=1.15.0 
\ No newline at end of file
diff --git a/start/airport.sh b/start/airport.sh
index db1c313..3eaef18 100755
--- a/start/airport.sh
+++ b/start/airport.sh
@@ -13,7 +13,8 @@ if [ "$USEDAJIANG" = "true" ]; then
     --name ${AIRPORT_NAME} \
     --network ${NETWORK} \
     --env SW_APP_NAME=${AIRPORT_NAME} \
-    --env SW_SKY_AOP=http://${SKYWALKING_OAP_NAME}:12800 \
+    --env SW_AGENT_NAME=${AIRPORT_NAME} \
+    --env SW_AGENT_COLLECTOR_BACKEND_SERVICES=${SKYWALKING_OAP_NAME}:11800 \
     --env SPRING_CLOUD_CONSUL_HOST=${CONSUL_NAME} \
     --env SPRING_CLOUD_CONSUL_PORT=8500 \
     --env SPRING_CLOUD_CONSUL_DISCOVERY_HOSTNAME=${AIRPORT_NAME} \
@@ -44,7 +45,8 @@ else
     --name ${AIRPORT_NAME} \
     --network ${NETWORK} \
     --env SW_APP_NAME=${AIRPORT_NAME} \
-    --env SW_SKY_AOP=http://${SKYWALKING_OAP_NAME}:12800 \
+    --env SW_AGENT_NAME=${AIRPORT_NAME} \
+    --env SW_AGENT_COLLECTOR_BACKEND_SERVICES=${SKYWALKING_OAP_NAME}:11800 \
     --env SPRING_CLOUD_CONSUL_HOST=${CONSUL_NAME} \
     --env SPRING_CLOUD_CONSUL_PORT=8500 \
     --env SPRING_CLOUD_CONSUL_DISCOVERY_HOSTNAME=${AIRPORT_NAME} \
diff --git a/start/oidcservice.sh b/start/oidcservice.sh
index f02cdce..ad8874a 100755
--- a/start/oidcservice.sh
+++ b/start/oidcservice.sh
@@ -17,6 +17,9 @@ fi
 docker run --pull always -d \
 --name ${OIDC_SERVER_NAME} \
 --network ${NETWORK} \
+--env SW_APP_NAME=${OIDC_SERVER_NAME} \
+--env SW_AGENT_NAME=${OIDC_SERVER_NAME} \
+--env SW_AGENT_COLLECTOR_BACKEND_SERVICES=${SKYWALKING_OAP_NAME}:11800 \
 --env SPRING_CLOUD_CONSUL_HOST=${CONSUL_NAME} \
 --env SPRING_CLOUD_CONSUL_PORT=8500 \
 --env SPRING_CLOUD_CONSUL_DISCOVERY_HOSTNAME=${OIDC_SERVER_NAME} \
diff --git a/巴中部署文档.md b/巴中部署文档.md
index 1f56ff9..66ccbf6 100644
--- a/巴中部署文档.md
+++ b/巴中部署文档.md
@@ -10,7 +10,12 @@ host 文件中添加以下内容
 2.3 联系拓恒提供mysql刷数脚本
 3: 将修改后的 bazhong.sh 文件提供给 拓恒
 4: 拓恒打镜像
-5: 依次执行 start文件夹下的启动脚本; 
-   5.1  nginx.sh 启动脚本最后执行
-   5.2  网关的启动脚本上 startGateWay.sh （replace_vars.sh 不需要手动执行）
+5: 依次执行 start文件夹下的启动脚本; 采用 ./xxx.sh 的方式执行，不要使用 sh ./xxx.sh 的方式执行; 执行前需要 source bazhong.sh
+   5.1 oidcservice
+   5.2 hhzadmin 
+   5.3 hhzapi 
+   5.4 dspapi 
+   5.5 网关的启动脚本上 startGateWay.sh （replace_vars.sh 不需要手动执行）
+   5.6 ginx.sh 启动脚本最后执行
+ 
       
\ No newline at end of file