From c3c9240fdabc341868943df6b2f964491ff7cbe1 Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Wed, 17 Jul 2024 17:13:29 +0800
Subject: [PATCH 1/9] =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=BA=93=E7=AE=A1=E5=91=98=E4=B8=BA=E9=9D=9E?=
 =?UTF-8?q?=E5=BF=85=E5=A1=AB=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sgzb-ui/src/views/warehouseManage/machinery/type/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sgzb-ui/src/views/warehouseManage/machinery/type/index.vue b/sgzb-ui/src/views/warehouseManage/machinery/type/index.vue
index 0939a569..7b3bbc61 100644
--- a/sgzb-ui/src/views/warehouseManage/machinery/type/index.vue
+++ b/sgzb-ui/src/views/warehouseManage/machinery/type/index.vue
@@ -420,7 +420,7 @@
                     </el-col>
 
                     <el-col :span="12">
-                        <el-form-item label="库管员" prop="keeperUserId">
+                        <el-form-item label="库管员">
                             <el-select
                                 v-model="form.keeperUserId"
                                 filterable

From f0ec406f044af364e5d7a1d3d74ba9d1155c925c Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Fri, 19 Jul 2024 12:08:21 +0800
Subject: [PATCH 2/9] deploy

---
 scripts/deploy.sh   | 87 +++++++++++++++++++++++++++++++++++++++++++++
 scripts/moveFile.sh |  4 +++
 scripts/pipeline.sh | 79 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 170 insertions(+)
 create mode 100644 scripts/deploy.sh
 create mode 100644 scripts/moveFile.sh
 create mode 100644 scripts/pipeline.sh

diff --git a/scripts/deploy.sh b/scripts/deploy.sh
new file mode 100644
index 00000000..f892751e
--- /dev/null
+++ b/scripts/deploy.sh
@@ -0,0 +1,87 @@
+#!/bin/sh
+export deploy_path=/opt/builds/${JOB_NAME}/${BUILD_NUMBER}
+echo "--------moveFile start--------------"
+rm -rf $deploy_path
+mkdir -p $deploy_path
+cd $deploy_path
+rm -rf *.jar
+echo "workspace is ${WORKSPACE}"
+mv ${WORKSPACE}/sgzb-auth/target/sgzb-auth.jar $deploy_path
+mv ${WORKSPACE}/sgzb-gateway/target/sgzb-gateway.jar $deploy_path
+mv ${WORKSPACE}/sgzb-modules/sgzb-system/target/sgzb-modules-system.jar $deploy_path
+chmod 777 *.jar
+echo "--------moveFile end--------------"
+export sgzb_auth_enable=true
+export sgzb_gateway_enable=true
+export sgzb_modules_system_enable=true
+ 
+export sgzb_auth_jar=sgzb-auth.jar
+export sgzb_gateway_jar=sgzb-gateway.jar
+export sgzb_modules_system_jar=sgzb-modules-system.jar
+
+export sgzb_auth_port=29200
+export sgzb_gateway_port=28080
+export sgzb_modules_system_port=29201
+
+if($auth_service_enable);then
+	## 启动authservice
+	echo "--------auth开始启动--------------"
+	echo "--------删除auth开始--------------"
+	 P_ID=`ps -ef | grep -w $sgzb_auth_jar | grep -v "grep" | awk '{print $2}'`
+		if [ "$P_ID" == "" ]; then
+			echo "===auth service process not exists or stop success"
+		else
+			kill -9 $P_ID
+			echo "auth service killed success"
+		fi
+	nohup /usr/lib/jvm/jdk1.8.0_381/bin/java  -jar $sgzb_auth_jar >/dev/null 2>&1 &
+	sgzb_auth_pid=`lsof -i:$sgzb_auth_port|grep "LISTEN"|awk '{print $2}'`
+	until [ -n "$auth_service_pid" ]
+		do
+		  auth_service_pid=`lsof -i:$sgzb_auth_port|grep "LISTEN"|awk '{print $2}'`
+		done
+	echo "auth service pid is $sgzb_auth_pid"
+	echo "--------auth_service 启动成功--------------"
+fi
+
+if($sgzb_gateway_enable);then
+	echo "--------gateway 开始启动--------------"
+	echo "--------删除gateway开始--------------"
+	 P_ID=`ps -ef | grep -w $sgzb_gateway_jar | grep -v "grep" | awk '{print $2}'`
+		if [ "$P_ID" == "" ]; then
+			echo "===gateway process not exists or stop success"
+		else
+			kill -9 $P_ID
+			echo "gateway killed success"
+		fi
+	nohup /usr/lib/jvm/jdk1.8.0_381/bin/java  -jar $sgzb_gateway_jar >/dev/null 2>&1 &
+	sgzb_gateway_pid=`lsof -i:$sgzb_gateway_port|grep "LISTEN"|awk '{print $2}'`
+	until [ -n "$sgzb_gateway_pid" ]
+		do
+		  sgzb_gateway_pid=`lsof -i:$sgzb_gateway_port|grep "LISTEN"|awk '{print $2}'`
+		done
+	echo "gateway pid is $sgzb_gateway_pid"
+	echo "--------gateway 启动成功--------------"
+fi
+
+if($sgzb-modules-system_enable);then
+	## 启动system service
+	echo "--------modules system service 开始启动--------------"
+	echo "--------删除modules system service开始--------------"
+	 P_ID=`ps -ef | grep -w $sgzb_modules_system_jar | grep -v "grep" | awk '{print $2}'`
+		if [ "$P_ID" == "" ]; then
+			echo "===modules system service process not exists or stop success"
+		else
+			kill -9 $P_ID
+			echo "modules system service killed success"
+		fi
+	nohup /usr/lib/jvm/jdk1.8.0_381/bin/java  -jar $sgzb_modules_system_jar >/dev/null 2>&1 &
+	sgzb_modules_system_pid=`lsof -i:$sgzb_modules_system_port|grep "LISTEN"|awk '{print $2}'`
+	until [ -n "$sgzb_modules_system_pid" ]
+		do
+		  sgzb-modules-system_pid=`lsof -i:$sgzb_modules_system_port|grep "LISTEN"|awk '{print $2}'`
+		done
+	echo "modules system service pid is $sgzb_modules_system_pid"
+	echo "--------modules system service 启动成功--------------"
+fi
+
diff --git a/scripts/moveFile.sh b/scripts/moveFile.sh
new file mode 100644
index 00000000..ad320d50
--- /dev/null
+++ b/scripts/moveFile.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+echo "--------moveFile start--------------"
+#cp -rf ${WORKSPACE}/scripts/sonar-project.properties ${WORKSPACE}
diff --git a/scripts/pipeline.sh b/scripts/pipeline.sh
new file mode 100644
index 00000000..325d253b
--- /dev/null
+++ b/scripts/pipeline.sh
@@ -0,0 +1,79 @@
+pipeline {
+    agent any 
+    environment {
+        // 设置自定义JDK路径，因为每个项目可能需要不同版本的jdk
+        JAVA_HOME = '/usr/lib/jvm/jdk1.8.0_381'
+        JOBNAME="${JOB_NAME}"
+        JENKINS_NODE_COOKIE = "dontKillMe"
+    }
+    stages {
+        stage('Check out') {
+            steps {
+                withCredentials([usernamePassword(credentialsId: 'your-git-credentials', passwordVariable: 'Max@2023', usernameVariable: 'bonus')]) {
+                    checkout([
+                        $class: 'GitSCM',
+                        branches: [[name: '*/dev-cq']],
+                        doGenerateSubmoduleConfigurations: false,
+                        extensions: [[$class: 'RelativeTargetDirectory', relativeTargetDir: '']],
+                        submoduleCfg: [],
+                        userRemoteConfigs: [[url: 'http://192.168.0.56:3000/bonus/devicesmgt.git']]
+                    ])
+                }
+            }
+        }
+        stage('Move file') {
+             steps {
+                echo 'move file start!'
+                sh 'chmod 777 ${WORKSPACE}/scripts/*'
+                // 如果需要拷贝文件，打开并编写以下脚本
+                // sh '${WORKSPACE}/scripts/moveFile.sh'
+            }
+        }
+        stage('Build') {
+            steps {
+                echo 'build start!'
+                sh 'env JAVA_HOME=$JAVA_HOME  /usr/local/src/apache-maven-3.9.4/bin/mvn  clean package'
+            }
+        }
+        stage('Sonar scan') {
+            steps {
+                script {
+                    echo 'sonar scan start!'
+                    def scannerHome = tool 'sonar-scanner'
+                    withSonarQubeEnv('sonarqube-server') {
+                        sh "/usr/local/sonar-scanner-5.0.1.3006-linux/bin/sonar-scanner " +
+                           "-Dsonar.projectKey=${JOB_NAME} " +
+                           "-Dsonar.projectName=${JOB_NAME} " +
+                           "-Dsonar.sourceEncoding=UTF-8 " +
+                           "-Dsonar.language=java " +
+                           "-Dsonar.projectVersion=1.0 " +
+                           "-Dsonar.sources=. " +
+                           "-Dsonar.java.source=1.8 " +
+                           "-Dsonar.java.target=1.8 " +
+                           "-Dsonar.scm.disabled=true " +
+                           "-Dsonar.exclusions=test/**,node_modules/**,static/**,**/*.js,**/*.html,**/*.css,**/*.jar " +
+                           "-Dsonar.java.binaries=**/target/classes"
+                    }
+                }
+            }
+		    }
+        stage('Deploy') {
+              steps {
+                  echo 'deploy start!'
+                  sh '''BUILD_ID=DONTKILLME  sh ${WORKSPACE}/scripts/deploy.sh'''
+              }
+        }
+#        stage('Dingding') {
+#              steps {
+#                  echo 'Dingding start!'
+#                  script {
+#                      def webhookUrl = 'https://oapi.dingtalk.com/robot/send?access_token=eae0af98514a0db9a9a0d5cd8e337d13e7c16cd81d4a90b503e465a573020add' //替换为你自己的钉钉机器人Webhook地址
+#                      def message = "${JOB_NAME} TEST已完成: ${env.BUILD_URL}  \n 到Sonarqube查看问题：http://192.168.0.56:9000/dashboard?id=${JOB_NAME} \n 查看新包： http://192.168.0.56/${JOB_NAME}/${BUILD_NUMBER}   \n 现在访问测试站点： http://192.168.0.56:2911/bmw/index.html   \n 用户名：ysExamAdmin  密码：Zys0825.  "
+#                      echo "${message}"
+#                      sh "curl -H 'Content-Type: application/json' -d '{\"msgtype\": \"text\", \"text\": {\"content\": \"${message}\"}, \"at\": {\"atMobiles\": [\"张三，李四\"], \"isAtAll\": true}}' ${webhookUrl}"
+#                   }
+#              }
+#        }
+    }
+}
+

From 8d40216b01e307449c289836a91034a3f63de7d0 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Fri, 19 Jul 2024 12:34:22 +0800
Subject: [PATCH 3/9] deploy

---
 scripts/deploy.sh   | 86 ++++++++++++++++++++++++++++++++++++++++-----
 scripts/pipeline.sh | 24 ++++++-------
 2 files changed, 90 insertions(+), 20 deletions(-)

diff --git a/scripts/deploy.sh b/scripts/deploy.sh
index f892751e..3b0b9d9e 100644
--- a/scripts/deploy.sh
+++ b/scripts/deploy.sh
@@ -9,19 +9,31 @@ echo "workspace is ${WORKSPACE}"
 mv ${WORKSPACE}/sgzb-auth/target/sgzb-auth.jar $deploy_path
 mv ${WORKSPACE}/sgzb-gateway/target/sgzb-gateway.jar $deploy_path
 mv ${WORKSPACE}/sgzb-modules/sgzb-system/target/sgzb-modules-system.jar $deploy_path
+mv ${WORKSPACE}/sgzb-modules/sgzb-base/target/sgzb-modules-base.jar $deploy_path
+mv ${WORKSPACE}/sgzb-modules/sgzb-file/target/sgzb-modules-file.jar $deploy_path
+mv ${WORKSPACE}/sgzb-modules/sgzb-material/target/sgzb-modules-material.jar $deploy_path
 chmod 777 *.jar
 echo "--------moveFile end--------------"
 export sgzb_auth_enable=true
 export sgzb_gateway_enable=true
 export sgzb_modules_system_enable=true
+export sgzb_modules_base_enable=true
+export sgzb_modules_file_enable=true
+export sgzb_modules_material_enable=true
  
 export sgzb_auth_jar=sgzb-auth.jar
 export sgzb_gateway_jar=sgzb-gateway.jar
 export sgzb_modules_system_jar=sgzb-modules-system.jar
+export sgzb_modules_base_jar=sgzb_modules_base.jar
+export sgzb_modules_file_jar=sgzb-modules-file.jar
+export sgzb_modules_material_jar=sgzb-modules-material.jar
 
 export sgzb_auth_port=29200
 export sgzb_gateway_port=28080
 export sgzb_modules_system_port=29201
+export sgzb_modules_base_port=29301
+export sgzb_modules_file_port=9300
+export sgzb_modules_material_port=29302
 
 if($auth_service_enable);then
 	## 启动authservice
@@ -64,16 +76,15 @@ if($sgzb_gateway_enable);then
 	echo "--------gateway 启动成功--------------"
 fi
 
-if($sgzb-modules-system_enable);then
-	## 启动system service
-	echo "--------modules system service 开始启动--------------"
-	echo "--------删除modules system service开始--------------"
+if($sgzb_modules_system_enable);then
+	echo "--------sgzb_modules_system service 开始启动--------------"
+	echo "--------删除 sgzb_modules_system service开始--------------"
 	 P_ID=`ps -ef | grep -w $sgzb_modules_system_jar | grep -v "grep" | awk '{print $2}'`
 		if [ "$P_ID" == "" ]; then
-			echo "===modules system service process not exists or stop success"
+			echo "===sgzb_modules_system service process not exists or stop success"
 		else
 			kill -9 $P_ID
-			echo "modules system service killed success"
+			echo "sgzb_modules_system service killed success"
 		fi
 	nohup /usr/lib/jvm/jdk1.8.0_381/bin/java  -jar $sgzb_modules_system_jar >/dev/null 2>&1 &
 	sgzb_modules_system_pid=`lsof -i:$sgzb_modules_system_port|grep "LISTEN"|awk '{print $2}'`
@@ -81,7 +92,66 @@ if($sgzb-modules-system_enable);then
 		do
 		  sgzb-modules-system_pid=`lsof -i:$sgzb_modules_system_port|grep "LISTEN"|awk '{print $2}'`
 		done
-	echo "modules system service pid is $sgzb_modules_system_pid"
-	echo "--------modules system service 启动成功--------------"
+	echo "modules sgzb_modules_system pid is $sgzb_modules_system_pid"
+	echo "--------sgzb_modules_system service 启动成功--------------"
 fi
 
+if($sgzb_modules_base_enable);then
+	echo "--------sgzb_modules_base service 开始启动--------------"
+	echo "--------删除 sgzb_modules_base service开始--------------"
+	 P_ID=`ps -ef | grep -w $sgzb_modules_base_jar | grep -v "grep" | awk '{print $2}'`
+		if [ "$P_ID" == "" ]; then
+			echo "===sgzb_modules_base service process not exists or stop success"
+		else
+			kill -9 $P_ID
+			echo "sgzb_modules_base service killed success"
+		fi
+	nohup /usr/lib/jvm/jdk1.8.0_381/bin/java  -jar $sgzb_modules_base_jar >/dev/null 2>&1 &
+	sgzb_modules_base_pid=`lsof -i:$sgzb_modules_base_port|grep "LISTEN"|awk '{print $2}'`
+	until [ -n "$sgzb_modules_base_pid" ]
+		do
+		  sgzb-modules-system_pid=`lsof -i:$sgzb_modules_base_port|grep "LISTEN"|awk '{print $2}'`
+		done
+	echo "modules sgzb_modules_base pid is $sgzb_modules_base_pid"
+	echo "--------sgzb_modules_base service 启动成功--------------"
+fi
+
+if($sgzb_modules_file_enable);then
+	echo "--------sgzb_modules_file service 开始启动--------------"
+	echo "--------删除 sgzb_modules_file service开始--------------"
+	 P_ID=`ps -ef | grep -w $sgzb_modules_file_jar | grep -v "grep" | awk '{print $2}'`
+		if [ "$P_ID" == "" ]; then
+			echo "===sgzb_modules_file service process not exists or stop success"
+		else
+			kill -9 $P_ID
+			echo "sgzb_modules_file service killed success"
+		fi
+	nohup /usr/lib/jvm/jdk1.8.0_381/bin/java  -jar $sgzb_modules_file_jar >/dev/null 2>&1 &
+	sgzb_modules_file_pid=`lsof -i:$sgzb_modules_file_port|grep "LISTEN"|awk '{print $2}'`
+	until [ -n "$sgzb_modules_file_pid" ]
+		do
+		  sgzb-modules-system_pid=`lsof -i:$sgzb_modules_file_port|grep "LISTEN"|awk '{print $2}'`
+		done
+	echo "modules sgzb_modules_file pid is $sgzb_modules_file_pid"
+	echo "--------sgzb_modules_file service 启动成功--------------"
+fi
+
+if($sgzb_modules_material_enable);then
+	echo "--------sgzb_modules_material service 开始启动--------------"
+	echo "--------删除 sgzb_modules_material service开始--------------"
+	 P_ID=`ps -ef | grep -w $sgzb_modules_material_jar | grep -v "grep" | awk '{print $2}'`
+		if [ "$P_ID" == "" ]; then
+			echo "===sgzb_modules_material service process not exists or stop success"
+		else
+			kill -9 $P_ID
+			echo "sgzb_modules_material service killed success"
+		fi
+	nohup /usr/lib/jvm/jdk1.8.0_381/bin/java  -jar $sgzb_modules_material_jar >/dev/null 2>&1 &
+	sgzb_modules_material_pid=`lsof -i:$sgzb_modules_material_port|grep "LISTEN"|awk '{print $2}'`
+	until [ -n "$sgzb_modules_material_pid" ]
+		do
+		  sgzb-modules-system_pid=`lsof -i:$sgzb_modules_material_port|grep "LISTEN"|awk '{print $2}'`
+		done
+	echo "modules sgzb_modules_material pid is $sgzb_modules_material_pid"
+	echo "--------sgzb_modules_material service 启动成功--------------"
+fi
diff --git a/scripts/pipeline.sh b/scripts/pipeline.sh
index 325d253b..50d138c0 100644
--- a/scripts/pipeline.sh
+++ b/scripts/pipeline.sh
@@ -9,7 +9,7 @@ pipeline {
     stages {
         stage('Check out') {
             steps {
-                withCredentials([usernamePassword(credentialsId: 'your-git-credentials', passwordVariable: 'Max@2023', usernameVariable: 'bonus')]) {
+                withCredentials([usernamePassword(credentialsId: 'f7070987-9b49-4ae1-af6d-53a3bf26799b', passwordVariable: 'Max@2023', usernameVariable: 'bonus')]) {
                     checkout([
                         $class: 'GitSCM',
                         branches: [[name: '*/dev-cq']],
@@ -63,17 +63,17 @@ pipeline {
                   sh '''BUILD_ID=DONTKILLME  sh ${WORKSPACE}/scripts/deploy.sh'''
               }
         }
-#        stage('Dingding') {
-#              steps {
-#                  echo 'Dingding start!'
-#                  script {
-#                      def webhookUrl = 'https://oapi.dingtalk.com/robot/send?access_token=eae0af98514a0db9a9a0d5cd8e337d13e7c16cd81d4a90b503e465a573020add' //替换为你自己的钉钉机器人Webhook地址
-#                      def message = "${JOB_NAME} TEST已完成: ${env.BUILD_URL}  \n 到Sonarqube查看问题：http://192.168.0.56:9000/dashboard?id=${JOB_NAME} \n 查看新包： http://192.168.0.56/${JOB_NAME}/${BUILD_NUMBER}   \n 现在访问测试站点： http://192.168.0.56:2911/bmw/index.html   \n 用户名：ysExamAdmin  密码：Zys0825.  "
-#                      echo "${message}"
-#                      sh "curl -H 'Content-Type: application/json' -d '{\"msgtype\": \"text\", \"text\": {\"content\": \"${message}\"}, \"at\": {\"atMobiles\": [\"张三，李四\"], \"isAtAll\": true}}' ${webhookUrl}"
-#                   }
-#              }
-#        }
+        stage('Dingding') {
+              steps {
+                  echo 'Dingding start!'
+                  script {
+                      def webhookUrl = 'https://oapi.dingtalk.com/robot/send?access_token=eae0af98514a0db9a9a0d5cd8e337d13e7c16cd81d4a90b503e465a573020add' //替换为你自己的钉钉机器人Webhook地址
+                      def message = "${JOB_NAME} TEST已完成: ${env.BUILD_URL}  \n 到Sonarqube查看问题：http://192.168.0.56:9000/dashboard?id=${JOB_NAME} \n 查看新包： http://192.168.0.56/${JOB_NAME}/${BUILD_NUMBER}    "
+                      echo "${message}"
+                      sh "curl -H 'Content-Type: application/json' -d '{\"msgtype\": \"text\", \"text\": {\"content\": \"${message}\"}, \"at\": {\"atMobiles\": [\"张三，李四\"], \"isAtAll\": true}}' ${webhookUrl}"
+                   }
+              }
+        }
     }
 }
 

From 769b4a8c66ed359fec1d54198fcbc1eb6608069a Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Fri, 19 Jul 2024 12:44:07 +0800
Subject: [PATCH 4/9] deploy

---
 scripts/deploy.sh | 78 ++++++-----------------------------------------
 1 file changed, 9 insertions(+), 69 deletions(-)

diff --git a/scripts/deploy.sh b/scripts/deploy.sh
index 3b0b9d9e..6003d981 100644
--- a/scripts/deploy.sh
+++ b/scripts/deploy.sh
@@ -24,7 +24,7 @@ export sgzb_modules_material_enable=true
 export sgzb_auth_jar=sgzb-auth.jar
 export sgzb_gateway_jar=sgzb-gateway.jar
 export sgzb_modules_system_jar=sgzb-modules-system.jar
-export sgzb_modules_base_jar=sgzb_modules_base.jar
+export sgzb_modules_base_jar=sgzb-modules-base.jar
 export sgzb_modules_file_jar=sgzb-modules-file.jar
 export sgzb_modules_material_jar=sgzb-modules-material.jar
 
@@ -36,7 +36,6 @@ export sgzb_modules_file_port=9300
 export sgzb_modules_material_port=29302
 
 if($auth_service_enable);then
-	## 启动authservice
 	echo "--------auth开始启动--------------"
 	echo "--------删除auth开始--------------"
 	 P_ID=`ps -ef | grep -w $sgzb_auth_jar | grep -v "grep" | awk '{print $2}'`
@@ -76,82 +75,23 @@ if($sgzb_gateway_enable);then
 	echo "--------gateway 启动成功--------------"
 fi
 
+
 if($sgzb_modules_system_enable);then
-	echo "--------sgzb_modules_system service 开始启动--------------"
-	echo "--------删除 sgzb_modules_system service开始--------------"
+	echo "--------sgzb_modules_system 开始启动--------------"
+	echo "--------删除sgzb_modules_system开始--------------"
 	 P_ID=`ps -ef | grep -w $sgzb_modules_system_jar | grep -v "grep" | awk '{print $2}'`
 		if [ "$P_ID" == "" ]; then
-			echo "===sgzb_modules_system service process not exists or stop success"
+			echo "===sgzb_modules_system process not exists or stop success"
 		else
 			kill -9 $P_ID
-			echo "sgzb_modules_system service killed success"
+			echo "sgzb_modules_system killed success"
 		fi
 	nohup /usr/lib/jvm/jdk1.8.0_381/bin/java  -jar $sgzb_modules_system_jar >/dev/null 2>&1 &
 	sgzb_modules_system_pid=`lsof -i:$sgzb_modules_system_port|grep "LISTEN"|awk '{print $2}'`
 	until [ -n "$sgzb_modules_system_pid" ]
 		do
-		  sgzb-modules-system_pid=`lsof -i:$sgzb_modules_system_port|grep "LISTEN"|awk '{print $2}'`
+		  sgzb_modules_system_pid=`lsof -i:$sgzb_modules_system_port|grep "LISTEN"|awk '{print $2}'`
 		done
-	echo "modules sgzb_modules_system pid is $sgzb_modules_system_pid"
-	echo "--------sgzb_modules_system service 启动成功--------------"
-fi
-
-if($sgzb_modules_base_enable);then
-	echo "--------sgzb_modules_base service 开始启动--------------"
-	echo "--------删除 sgzb_modules_base service开始--------------"
-	 P_ID=`ps -ef | grep -w $sgzb_modules_base_jar | grep -v "grep" | awk '{print $2}'`
-		if [ "$P_ID" == "" ]; then
-			echo "===sgzb_modules_base service process not exists or stop success"
-		else
-			kill -9 $P_ID
-			echo "sgzb_modules_base service killed success"
-		fi
-	nohup /usr/lib/jvm/jdk1.8.0_381/bin/java  -jar $sgzb_modules_base_jar >/dev/null 2>&1 &
-	sgzb_modules_base_pid=`lsof -i:$sgzb_modules_base_port|grep "LISTEN"|awk '{print $2}'`
-	until [ -n "$sgzb_modules_base_pid" ]
-		do
-		  sgzb-modules-system_pid=`lsof -i:$sgzb_modules_base_port|grep "LISTEN"|awk '{print $2}'`
-		done
-	echo "modules sgzb_modules_base pid is $sgzb_modules_base_pid"
-	echo "--------sgzb_modules_base service 启动成功--------------"
-fi
-
-if($sgzb_modules_file_enable);then
-	echo "--------sgzb_modules_file service 开始启动--------------"
-	echo "--------删除 sgzb_modules_file service开始--------------"
-	 P_ID=`ps -ef | grep -w $sgzb_modules_file_jar | grep -v "grep" | awk '{print $2}'`
-		if [ "$P_ID" == "" ]; then
-			echo "===sgzb_modules_file service process not exists or stop success"
-		else
-			kill -9 $P_ID
-			echo "sgzb_modules_file service killed success"
-		fi
-	nohup /usr/lib/jvm/jdk1.8.0_381/bin/java  -jar $sgzb_modules_file_jar >/dev/null 2>&1 &
-	sgzb_modules_file_pid=`lsof -i:$sgzb_modules_file_port|grep "LISTEN"|awk '{print $2}'`
-	until [ -n "$sgzb_modules_file_pid" ]
-		do
-		  sgzb-modules-system_pid=`lsof -i:$sgzb_modules_file_port|grep "LISTEN"|awk '{print $2}'`
-		done
-	echo "modules sgzb_modules_file pid is $sgzb_modules_file_pid"
-	echo "--------sgzb_modules_file service 启动成功--------------"
-fi
-
-if($sgzb_modules_material_enable);then
-	echo "--------sgzb_modules_material service 开始启动--------------"
-	echo "--------删除 sgzb_modules_material service开始--------------"
-	 P_ID=`ps -ef | grep -w $sgzb_modules_material_jar | grep -v "grep" | awk '{print $2}'`
-		if [ "$P_ID" == "" ]; then
-			echo "===sgzb_modules_material service process not exists or stop success"
-		else
-			kill -9 $P_ID
-			echo "sgzb_modules_material service killed success"
-		fi
-	nohup /usr/lib/jvm/jdk1.8.0_381/bin/java  -jar $sgzb_modules_material_jar >/dev/null 2>&1 &
-	sgzb_modules_material_pid=`lsof -i:$sgzb_modules_material_port|grep "LISTEN"|awk '{print $2}'`
-	until [ -n "$sgzb_modules_material_pid" ]
-		do
-		  sgzb-modules-system_pid=`lsof -i:$sgzb_modules_material_port|grep "LISTEN"|awk '{print $2}'`
-		done
-	echo "modules sgzb_modules_material pid is $sgzb_modules_material_pid"
-	echo "--------sgzb_modules_material service 启动成功--------------"
+	echo "sgzb_modules_system pid is $sgzb_modules_system_pid"
+	echo "--------sgzb_modules_system 启动成功--------------"
 fi

From 575209e88e84e15849c435859a9d5bfa81fa0469 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Fri, 19 Jul 2024 12:59:59 +0800
Subject: [PATCH 5/9] deploy

---
 scripts/deploy.sh | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/scripts/deploy.sh b/scripts/deploy.sh
index 6003d981..60adbd6e 100644
--- a/scripts/deploy.sh
+++ b/scripts/deploy.sh
@@ -47,9 +47,9 @@ if($auth_service_enable);then
 		fi
 	nohup /usr/lib/jvm/jdk1.8.0_381/bin/java  -jar $sgzb_auth_jar >/dev/null 2>&1 &
 	sgzb_auth_pid=`lsof -i:$sgzb_auth_port|grep "LISTEN"|awk '{print $2}'`
-	until [ -n "$auth_service_pid" ]
+	until [ -n "$sgzb_auth_pid" ]
 		do
-		  auth_service_pid=`lsof -i:$sgzb_auth_port|grep "LISTEN"|awk '{print $2}'`
+		  sgzb_auth_pid=`lsof -i:$sgzb_auth_port|grep "LISTEN"|awk '{print $2}'`
 		done
 	echo "auth service pid is $sgzb_auth_pid"
 	echo "--------auth_service 启动成功--------------"
@@ -86,11 +86,16 @@ if($sgzb_modules_system_enable);then
 			kill -9 $P_ID
 			echo "sgzb_modules_system killed success"
 		fi
+	echo "--------sgzb_modules_system开始部署1--------------"
 	nohup /usr/lib/jvm/jdk1.8.0_381/bin/java  -jar $sgzb_modules_system_jar >/dev/null 2>&1 &
+	echo "--------sgzb_modules_system开始部署2--------------"
 	sgzb_modules_system_pid=`lsof -i:$sgzb_modules_system_port|grep "LISTEN"|awk '{print $2}'`
+	echo "--------sgzb_modules_system开始部署3--------------"
 	until [ -n "$sgzb_modules_system_pid" ]
 		do
+		  echo "--------sgzb_modules_system开始部署4--------------"
 		  sgzb_modules_system_pid=`lsof -i:$sgzb_modules_system_port|grep "LISTEN"|awk '{print $2}'`
+		  echo "--------sgzb_modules_system开始部署5--------------"
 		done
 	echo "sgzb_modules_system pid is $sgzb_modules_system_pid"
 	echo "--------sgzb_modules_system 启动成功--------------"

From 3273e4ba9c11c255ba8e5bdd14de25cfed1ef2be Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Fri, 19 Jul 2024 14:31:53 +0800
Subject: [PATCH 6/9] deploy

---
 sgzb-auth/src/main/resources/bootstrap.yml             | 10 +++++-----
 sgzb-gateway/src/main/resources/bootstrap.yml          | 10 +++++-----
 .../sgzb-base/src/main/resources/bootstrap.yml         | 10 +++++-----
 .../sgzb-file/src/main/resources/bootstrap.yml         |  6 +++---
 sgzb-modules/sgzb-gen/src/main/resources/bootstrap.yml |  6 +++---
 sgzb-modules/sgzb-job/src/main/resources/bootstrap.yml |  6 +++---
 .../sgzb-material/src/main/resources/bootstrap.yml     | 10 +++++-----
 .../sgzb-settlement/src/main/resources/bootstrap.yml   |  6 +++---
 .../sgzb-system/src/main/resources/bootstrap.yml       | 10 +++++-----
 .../sgzb-monitor/src/main/resources/bootstrap.yml      |  4 ++--
 10 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/sgzb-auth/src/main/resources/bootstrap.yml b/sgzb-auth/src/main/resources/bootstrap.yml
index e8b1c5d3..84d445a8 100644
--- a/sgzb-auth/src/main/resources/bootstrap.yml
+++ b/sgzb-auth/src/main/resources/bootstrap.yml
@@ -9,17 +9,17 @@ spring:
     name: sgzb-auth
   profiles:
     # 环境配置
-    active: sgzb_cloud_dev
+    active: sgzb_cloud_dev_cq
   cloud:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
-        namespace: sgzb_cloud_dev
+        server-addr: 192.168.0.14:8848
+        namespace: sgzb_cloud_dev_cq
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
-        namespace: sgzb_cloud_dev
+        server-addr: 192.168.0.14:8848
+        namespace: sgzb_cloud_dev_cq
         # 配置文件格式
         file-extension: yml
         # 共享配置
diff --git a/sgzb-gateway/src/main/resources/bootstrap.yml b/sgzb-gateway/src/main/resources/bootstrap.yml
index 2968520f..7b82db9f 100644
--- a/sgzb-gateway/src/main/resources/bootstrap.yml
+++ b/sgzb-gateway/src/main/resources/bootstrap.yml
@@ -15,7 +15,7 @@ spring:
     name: sgzb-gateway
   profiles:
     # 环境配置
-    active: sgzb_cloud_dev
+    active: sgzb_cloud_dev_cq
   cloud:
     loadbalancer:
       # 关闭Ribbon的负载均衡器
@@ -27,12 +27,12 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
-        namespace: sgzb_cloud_dev
+        server-addr: 192.168.0.14:8848
+        namespace: sgzb_cloud_dev_cq
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
-        namespace: sgzb_cloud_dev
+        server-addr: 192.168.0.14:8848
+        namespace: sgzb_cloud_dev_cq
         # 配置文件格式
         file-extension: yml
         # 共享配置
diff --git a/sgzb-modules/sgzb-base/src/main/resources/bootstrap.yml b/sgzb-modules/sgzb-base/src/main/resources/bootstrap.yml
index e778cf56..79972aae 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/bootstrap.yml
+++ b/sgzb-modules/sgzb-base/src/main/resources/bootstrap.yml
@@ -9,7 +9,7 @@ spring:
     name: sgzb-base
   profiles:
     # 环境配置
-    active: sgzb_cloud_dev
+    active: sgzb_cloud_dev_cq
   cloud:
     loadbalancer:
       # 关闭Ribbon的负载均衡器
@@ -21,12 +21,12 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
-        namespace: sgzb_cloud_dev
+        server-addr: 192.168.0.14:8848
+        namespace: sgzb_cloud_dev_cq
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
-        namespace: sgzb_cloud_dev
+        server-addr: 192.168.0.14:8848
+        namespace: sgzb_cloud_dev_cq
         # 配置文件格式
         file-extension: yml
         # 共享配置
diff --git a/sgzb-modules/sgzb-file/src/main/resources/bootstrap.yml b/sgzb-modules/sgzb-file/src/main/resources/bootstrap.yml
index f98b1aee..68d1993b 100644
--- a/sgzb-modules/sgzb-file/src/main/resources/bootstrap.yml
+++ b/sgzb-modules/sgzb-file/src/main/resources/bootstrap.yml
@@ -31,17 +31,17 @@ spring:
     name: sgzb-file
   profiles:
     # 环境配置
-    active: sgzb_cloud_dev
+    active: sgzb_cloud_dev_cq
   cloud:
     nacos:
       discovery:
         # 服务注册地址
         server-addr: 192.168.0.14:8848
-        namespace: sgzb_cloud_dev
+        namespace: sgzb_cloud_dev_cq
       config:
         # 配置中心地址
         server-addr: 192.168.0.14:8848
-        namespace: sgzb_cloud_dev
+        namespace: sgzb_cloud_dev_cq
         # 配置文件格式
         file-extension: yml
         # 共享配置
diff --git a/sgzb-modules/sgzb-gen/src/main/resources/bootstrap.yml b/sgzb-modules/sgzb-gen/src/main/resources/bootstrap.yml
index ad114b94..ef0669e1 100644
--- a/sgzb-modules/sgzb-gen/src/main/resources/bootstrap.yml
+++ b/sgzb-modules/sgzb-gen/src/main/resources/bootstrap.yml
@@ -9,17 +9,17 @@ spring:
     name: sgzb-gen
   profiles:
     # 环境配置
-    active: sgzb_cloud_dev
+    active: sgzb_cloud_dev_cq
   cloud:
     nacos:
       discovery:
         # 服务注册地址
         server-addr: 192.168.0.14:8848
-        namespace: sgzb_cloud_dev
+        namespace: sgzb_cloud_dev_cq
       config:
         # 配置中心地址
         server-addr: 192.168.0.14:8848
-        namespace: sgzb_cloud_dev
+        namespace: sgzb_cloud_dev_cq
         # 配置文件格式
         file-extension: yml
         # 共享配置
diff --git a/sgzb-modules/sgzb-job/src/main/resources/bootstrap.yml b/sgzb-modules/sgzb-job/src/main/resources/bootstrap.yml
index d6921128..8a85e81a 100644
--- a/sgzb-modules/sgzb-job/src/main/resources/bootstrap.yml
+++ b/sgzb-modules/sgzb-job/src/main/resources/bootstrap.yml
@@ -9,17 +9,17 @@ spring:
     name: sgzb-job
   profiles:
     # 环境配置
-    active: sgzb_cloud_dev
+    active: sgzb_cloud_dev_cq
   cloud:
     nacos:
       discovery:
         # 服务注册地址
         server-addr: 192.168.0.14:8848
-        namespace: sgzb_cloud_dev
+        namespace: sgzb_cloud_dev_cq
       config:
         # 配置中心地址
         server-addr: 192.168.0.14:8848
-        namespace: sgzb_cloud_dev
+        namespace: sgzb_cloud_dev_cq
         # 配置文件格式
         file-extension: yml
         # 共享配置
diff --git a/sgzb-modules/sgzb-material/src/main/resources/bootstrap.yml b/sgzb-modules/sgzb-material/src/main/resources/bootstrap.yml
index 5e400e16..9a7f4a81 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/bootstrap.yml
+++ b/sgzb-modules/sgzb-material/src/main/resources/bootstrap.yml
@@ -9,7 +9,7 @@ spring:
     name: sgzb-material
   profiles:
     # 环境配置
-    active: sgzb_cloud_dev
+    active: sgzb_cloud_dev_cq
   cloud:
     loadbalancer:
       # 关闭Ribbon的负载均衡器
@@ -21,12 +21,12 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
-        namespace: sgzb_cloud_dev
+        server-addr: 192.168.0.14:8848
+        namespace: sgzb_cloud_dev_cq
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
-        namespace: sgzb_cloud_dev
+        server-addr: 192.168.0.14:8848
+        namespace: sgzb_cloud_dev_cq
         # 配置文件格式
         file-extension: yml
         # 共享配置
diff --git a/sgzb-modules/sgzb-settlement/src/main/resources/bootstrap.yml b/sgzb-modules/sgzb-settlement/src/main/resources/bootstrap.yml
index bc874092..851409a4 100644
--- a/sgzb-modules/sgzb-settlement/src/main/resources/bootstrap.yml
+++ b/sgzb-modules/sgzb-settlement/src/main/resources/bootstrap.yml
@@ -9,17 +9,17 @@ spring:
     name: sgzb-settlement
   profiles:
     # 环境配置
-    active: sgzb_cloud_dev
+    active: sgzb_cloud_dev_cq
   cloud:
     nacos:
       discovery:
         # 服务注册地址
         server-addr: 192.168.0.14:8848
-        namespace: sgzb_cloud_dev
+        namespace: sgzb_cloud_dev_cq
       config:
         # 配置中心地址
         server-addr: 192.168.0.14:8848
-        namespace: sgzb_cloud_dev
+        namespace: sgzb_cloud_dev_cq
         # 配置文件格式
         file-extension: yml
         # 共享配置
diff --git a/sgzb-modules/sgzb-system/src/main/resources/bootstrap.yml b/sgzb-modules/sgzb-system/src/main/resources/bootstrap.yml
index 13e6331a..0349106c 100644
--- a/sgzb-modules/sgzb-system/src/main/resources/bootstrap.yml
+++ b/sgzb-modules/sgzb-system/src/main/resources/bootstrap.yml
@@ -13,7 +13,7 @@ spring:
     name: sgzb-system
   profiles:
     # 环境配置
-    active: sgzb_cloud_dev
+    active: sgzb_cloud_dev_cq
   cloud:
     loadbalancer:
       # 关闭Ribbon的负载均衡器
@@ -25,12 +25,12 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
-        namespace: sgzb_cloud_dev
+        server-addr: 192.168.0.14:8848
+        namespace: sgzb_cloud_dev_cq
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
-        namespace: sgzb_cloud_dev
+        server-addr: 192.168.0.14:8848
+        namespace: sgzb_cloud_dev_cq
         # 配置文件格式
         file-extension: yml
         # 共享配置
diff --git a/sgzb-visual/sgzb-monitor/src/main/resources/bootstrap.yml b/sgzb-visual/sgzb-monitor/src/main/resources/bootstrap.yml
index 00aade54..2a74104e 100644
--- a/sgzb-visual/sgzb-monitor/src/main/resources/bootstrap.yml
+++ b/sgzb-visual/sgzb-monitor/src/main/resources/bootstrap.yml
@@ -14,10 +14,10 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 192.168.0.14:8848
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 192.168.0.14:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置

From 5ee81e65304ad4ea49d632c5ea8370b4a49397c6 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Fri, 19 Jul 2024 14:37:03 +0800
Subject: [PATCH 7/9] deploy

---
 scripts/deploy.sh | 69 +++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 64 insertions(+), 5 deletions(-)

diff --git a/scripts/deploy.sh b/scripts/deploy.sh
index 60adbd6e..87cac08d 100644
--- a/scripts/deploy.sh
+++ b/scripts/deploy.sh
@@ -86,17 +86,76 @@ if($sgzb_modules_system_enable);then
 			kill -9 $P_ID
 			echo "sgzb_modules_system killed success"
 		fi
-	echo "--------sgzb_modules_system开始部署1--------------"
+	echo "--------sgzb_modules_system开始部署--------------"
 	nohup /usr/lib/jvm/jdk1.8.0_381/bin/java  -jar $sgzb_modules_system_jar >/dev/null 2>&1 &
-	echo "--------sgzb_modules_system开始部署2--------------"
 	sgzb_modules_system_pid=`lsof -i:$sgzb_modules_system_port|grep "LISTEN"|awk '{print $2}'`
-	echo "--------sgzb_modules_system开始部署3--------------"
 	until [ -n "$sgzb_modules_system_pid" ]
 		do
-		  echo "--------sgzb_modules_system开始部署4--------------"
 		  sgzb_modules_system_pid=`lsof -i:$sgzb_modules_system_port|grep "LISTEN"|awk '{print $2}'`
-		  echo "--------sgzb_modules_system开始部署5--------------"
 		done
 	echo "sgzb_modules_system pid is $sgzb_modules_system_pid"
 	echo "--------sgzb_modules_system 启动成功--------------"
 fi
+
+if($sgzb_modules_base_enable);then
+	echo "--------sgzb_modules_base 开始启动--------------"
+	echo "--------删除sgzb_modules_base开始--------------"
+	 P_ID=`ps -ef | grep -w $sgzb_modules_base_jar | grep -v "grep" | awk '{print $2}'`
+		if [ "$P_ID" == "" ]; then
+			echo "===sgzb_modules_base process not exists or stop success"
+		else
+			kill -9 $P_ID
+			echo "sgzb_modules_base killed success"
+		fi
+	echo "--------sgzb_modules_base开始部署--------------"
+	nohup /usr/lib/jvm/jdk1.8.0_381/bin/java  -jar $sgzb_modules_base_jar >/dev/null 2>&1 &
+	sgzb_modules_base_pid=`lsof -i:$sgzb_modules_base_port|grep "LISTEN"|awk '{print $2}'`
+	until [ -n "$sgzb_modules_base_pid" ]
+		do
+		  sgzb_modules_base_pid=`lsof -i:$sgzb_modules_base_port|grep "LISTEN"|awk '{print $2}'`
+		done
+	echo "sgzb_modules_base pid is $sgzb_modules_base_pid"
+	echo "--------sgzb_modules_base 启动成功--------------"
+fi
+
+if($sgzb_modules_file_enable);then
+	echo "--------sgzb_modules_file 开始启动--------------"
+	echo "--------删除sgzb_modules_file开始--------------"
+	 P_ID=`ps -ef | grep -w $sgzb_modules_file_jar | grep -v "grep" | awk '{print $2}'`
+		if [ "$P_ID" == "" ]; then
+			echo "===sgzb_modules_file process not exists or stop success"
+		else
+			kill -9 $P_ID
+			echo "sgzb_modules_file killed success"
+		fi
+	echo "--------sgzb_modules_file开始部署--------------"
+	nohup /usr/lib/jvm/jdk1.8.0_381/bin/java  -jar $sgzb_modules_file_jar >/dev/null 2>&1 &
+	sgzb_modules_file_pid=`lsof -i:$sgzb_modules_file_port|grep "LISTEN"|awk '{print $2}'`
+	until [ -n "$sgzb_modules_file_pid" ]
+		do
+		  sgzb_modules_file_pid=`lsof -i:$sgzb_modules_file_port|grep "LISTEN"|awk '{print $2}'`
+		done
+	echo "sgzb_modules_file pid is $sgzb_modules_file_pid"
+	echo "--------sgzb_modules_file 启动成功--------------"
+fi
+
+if($sgzb_modules_material_enable);then
+	echo "--------sgzb_modules_material 开始启动--------------"
+	echo "--------删除sgzb_modules_material开始--------------"
+	 P_ID=`ps -ef | grep -w $sgzb_modules_material_jar | grep -v "grep" | awk '{print $2}'`
+		if [ "$P_ID" == "" ]; then
+			echo "===sgzb_modules_material process not exists or stop success"
+		else
+			kill -9 $P_ID
+			echo "sgzb_modules_material killed success"
+		fi
+	echo "--------sgzb_modules_material开始部署--------------"
+	nohup /usr/lib/jvm/jdk1.8.0_381/bin/java  -jar $sgzb_modules_material_jar >/dev/null 2>&1 &
+	sgzb_modules_material_pid=`lsof -i:$sgzb_modules_material_port|grep "LISTEN"|awk '{print $2}'`
+	until [ -n "$sgzb_modules_material_pid" ]
+		do
+		  sgzb_modules_material_pid=`lsof -i:$sgzb_modules_material_port|grep "LISTEN"|awk '{print $2}'`
+		done
+	echo "sgzb_modules_material pid is $sgzb_modules_material_pid"
+	echo "--------sgzb_modules_material 启动成功--------------"
+fi
\ No newline at end of file

From ea19ecccc02f5274b527e3c09d0d3ac4f4cbd7cd Mon Sep 17 00:00:00 2001
From: "liang.chao" <1360241448@qq.com>
Date: Mon, 22 Jul 2024 13:52:47 +0800
Subject: [PATCH 8/9] =?UTF-8?q?=E7=AB=AF=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sgzb-auth/src/main/resources/bootstrap.yml                  | 2 +-
 sgzb-gateway/src/main/resources/bootstrap.yml               | 2 +-
 sgzb-modules/sgzb-base/src/main/resources/bootstrap.yml     | 2 +-
 sgzb-modules/sgzb-material/src/main/resources/bootstrap.yml | 2 +-
 sgzb-modules/sgzb-system/src/main/resources/bootstrap.yml   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/sgzb-auth/src/main/resources/bootstrap.yml b/sgzb-auth/src/main/resources/bootstrap.yml
index 84d445a8..6e5cd790 100644
--- a/sgzb-auth/src/main/resources/bootstrap.yml
+++ b/sgzb-auth/src/main/resources/bootstrap.yml
@@ -1,6 +1,6 @@
 # Tomcat
 server: 
-  port: 29200
+  port: 39200
 
 # Spring
 spring: 
diff --git a/sgzb-gateway/src/main/resources/bootstrap.yml b/sgzb-gateway/src/main/resources/bootstrap.yml
index 7b82db9f..9d6221df 100644
--- a/sgzb-gateway/src/main/resources/bootstrap.yml
+++ b/sgzb-gateway/src/main/resources/bootstrap.yml
@@ -1,6 +1,6 @@
 # Tomcat
 server:
-  port: 28080
+  port: 38080
 
 # Spring Boot Actuator V2中风险漏洞处理，禁止远程端口访问
 management:
diff --git a/sgzb-modules/sgzb-base/src/main/resources/bootstrap.yml b/sgzb-modules/sgzb-base/src/main/resources/bootstrap.yml
index 79972aae..2b762079 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/bootstrap.yml
+++ b/sgzb-modules/sgzb-base/src/main/resources/bootstrap.yml
@@ -1,6 +1,6 @@
 # Tomcat
 server:
-  port: 29301
+  port: 39301
 
 # Spring
 spring: 
diff --git a/sgzb-modules/sgzb-material/src/main/resources/bootstrap.yml b/sgzb-modules/sgzb-material/src/main/resources/bootstrap.yml
index 9a7f4a81..9aea71f4 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/bootstrap.yml
+++ b/sgzb-modules/sgzb-material/src/main/resources/bootstrap.yml
@@ -1,6 +1,6 @@
 # Tomcat
 server:
-  port: 29302
+  port: 39302
 
 # Spring
 spring: 
diff --git a/sgzb-modules/sgzb-system/src/main/resources/bootstrap.yml b/sgzb-modules/sgzb-system/src/main/resources/bootstrap.yml
index 0349106c..0774bbd2 100644
--- a/sgzb-modules/sgzb-system/src/main/resources/bootstrap.yml
+++ b/sgzb-modules/sgzb-system/src/main/resources/bootstrap.yml
@@ -1,6 +1,6 @@
 # Tomcat
 server:
-  port: 29201
+  port: 39201
 
 # Spring
 spring:

From 34da1debcd5222e8bc61783355b33839cc18458b Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Mon, 22 Jul 2024 14:15:51 +0800
Subject: [PATCH 9/9] deploy

---
 scripts/deploy.sh                                  | 14 +++++++-------
 .../sgzb-file/src/main/resources/bootstrap.yml     |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/scripts/deploy.sh b/scripts/deploy.sh
index 87cac08d..62c446ac 100644
--- a/scripts/deploy.sh
+++ b/scripts/deploy.sh
@@ -18,7 +18,7 @@ export sgzb_auth_enable=true
 export sgzb_gateway_enable=true
 export sgzb_modules_system_enable=true
 export sgzb_modules_base_enable=true
-export sgzb_modules_file_enable=true
+export sgzb_modules_file_enable=false
 export sgzb_modules_material_enable=true
  
 export sgzb_auth_jar=sgzb-auth.jar
@@ -28,12 +28,12 @@ export sgzb_modules_base_jar=sgzb-modules-base.jar
 export sgzb_modules_file_jar=sgzb-modules-file.jar
 export sgzb_modules_material_jar=sgzb-modules-material.jar
 
-export sgzb_auth_port=29200
-export sgzb_gateway_port=28080
-export sgzb_modules_system_port=29201
-export sgzb_modules_base_port=29301
-export sgzb_modules_file_port=9300
-export sgzb_modules_material_port=29302
+export sgzb_auth_port=39200
+export sgzb_gateway_port=38080
+export sgzb_modules_system_port=39201
+export sgzb_modules_base_port=39301
+export sgzb_modules_file_port=39300
+export sgzb_modules_material_port=39302
 
 if($auth_service_enable);then
 	echo "--------auth开始启动--------------"
diff --git a/sgzb-modules/sgzb-file/src/main/resources/bootstrap.yml b/sgzb-modules/sgzb-file/src/main/resources/bootstrap.yml
index 68d1993b..5edc8420 100644
--- a/sgzb-modules/sgzb-file/src/main/resources/bootstrap.yml
+++ b/sgzb-modules/sgzb-file/src/main/resources/bootstrap.yml
@@ -1,6 +1,6 @@
 # Tomcat
 server:
-  port: 9300
+  port: 39300
 
 # 腾讯云cos
 tencent: