From 21aa8425b4b9489470fdd05c293338123874f1da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=95=B8=E9=9D=9E?= <8153694@qq.com>
Date: Mon, 26 Feb 2024 11:43:11 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B2=BE=E7=AE=80pom.xml=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
portal-manager/pom.xml | 20 ++++++++++++++++++--
portal-manager/src/main/bin/deploy.sh | 15 ++++++++-------
2 files changed, 26 insertions(+), 9 deletions(-)
diff --git a/portal-manager/pom.xml b/portal-manager/pom.xml
index 819827b2..c899052d 100644
--- a/portal-manager/pom.xml
+++ b/portal-manager/pom.xml
@@ -19,11 +19,11 @@
<id>develop</id>
<properties>
<profiles.active>develop</profiles.active>
+ <profiles.server.port>17212</profiles.server.port>
+ <profiles.log.path>/home/mortals/app/logs</profiles.log.path>
<profiles.nacos.server-addr>127.0.0.1:8848</profiles.nacos.server-addr>
<profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
<profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
- <profiles.log.level>INFO</profiles.log.level>
- <profiles.log.path>/mortals/app/logs</profiles.log.path>
<package.environment>test</package.environment>
<skipUi>false</skipUi>
</properties>
@@ -35,6 +35,8 @@
</activation>
<properties>
<profiles.active>test</profiles.active>
+ <profiles.server.port>17212</profiles.server.port>
+ <profiles.log.path>/home/mortals/app/logs</profiles.log.path>
<profiles.nacos.server-addr>192.168.0.252:8848</profiles.nacos.server-addr>
<profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
<profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
@@ -47,6 +49,8 @@
<id>product</id>
<properties>
<profiles.active>product</profiles.active>
+ <profiles.server.port>17212</profiles.server.port>
+ <profiles.log.path>/home/mortals/app/logs</profiles.log.path>
<profiles.nacos.server-addr>192.168.0.250:8848</profiles.nacos.server-addr>
<profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
<profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
@@ -58,6 +62,8 @@
<id>yibin</id>
<properties>
<profiles.active>yibin</profiles.active>
+ <profiles.server.port>17212</profiles.server.port>
+ <profiles.log.path>/home/mortals/app/logs</profiles.log.path>
<profiles.nacos.server-addr>172.15.28.120:8848</profiles.nacos.server-addr>
<profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
<profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
@@ -70,6 +76,8 @@
<id>sngx</id>
<properties>
<profiles.active>sngx</profiles.active>
+ <profiles.server.port>17212</profiles.server.port>
+ <profiles.log.path>/home/mortals/app/logs</profiles.log.path>
<profiles.nacos.server-addr>127.0.0.1:8848</profiles.nacos.server-addr>
<profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
<profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
@@ -82,6 +90,8 @@
<id>regtest</id>
<properties>
<profiles.active>regtest</profiles.active>
+ <profiles.server.port>17212</profiles.server.port>
+ <profiles.log.path>/home/mortals/app/logs</profiles.log.path>
<profiles.nacos.server-addr>127.0.0.1:8848</profiles.nacos.server-addr>
<profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
<profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
@@ -94,6 +104,8 @@
<id>reg</id>
<properties>
<profiles.active>reg</profiles.active>
+ <profiles.server.port>17212</profiles.server.port>
+ <profiles.log.path>/home/mortals/app/logs</profiles.log.path>
<profiles.nacos.server-addr>127.0.0.1:8848</profiles.nacos.server-addr>
<profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
<profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
@@ -106,6 +118,8 @@
<id>yanyuan</id>
<properties>
<profiles.active>yanyuan</profiles.active>
+ <profiles.server.port>17212</profiles.server.port>
+ <profiles.log.path>/home/mortals/app/logs</profiles.log.path>
<profiles.nacos.server-addr>172.16.30.245:8848</profiles.nacos.server-addr>
<profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
<profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
@@ -118,6 +132,8 @@
<id>pengxi</id>
<properties>
<profiles.active>pengxi</profiles.active>
+ <profiles.server.port>17212</profiles.server.port>
+ <profiles.log.path>/home/mortals/app/logs</profiles.log.path>
<profiles.nacos.server-addr>192.168.106.6:8848</profiles.nacos.server-addr>
<profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
<profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
diff --git a/portal-manager/src/main/bin/deploy.sh b/portal-manager/src/main/bin/deploy.sh
index bd21a043..26ea3d3e 100644
--- a/portal-manager/src/main/bin/deploy.sh
+++ b/portal-manager/src/main/bin/deploy.sh
@@ -80,7 +80,9 @@ start_service() {
systemctl enable ${PROJECT_NAME}
systemctl daemon-reload
writelog "${PROJECT_NAME}鏈嶅姟鍚姩..."
- systemctl stop ${PROJECT_NAME} && systemctl start ${PROJECT_NAME}
+ systemctl stop ${PROJECT_NAME}
+ sleep 5
+ systemctl start ${PROJECT_NAME}
project_status=$(systemctl status "${PROJECT_NAME}"|grep Active |awk '{print $2}')
jcpid=$(ps -ef | grep -v "grep" | grep "${PROJECT_NAME} " | awk '{print $2}')
writelog "${PROJECT_NAME}鏈嶅姟鍚姩,PID is ${jcpid} ,status:${project_status}"
@@ -107,14 +109,13 @@ project_ui_deploy() {
#涓诲嚱鏁�
main() {
- if [ ! -d $PUBLISH_PATH/backup ];
- then
- mkdir -p $$PUBLISH_PATH/backup;
- fi
echo "鍚庡彴鏈嶅姟閮ㄧ讲"
project_deploy
- echo "鍓嶇鏈嶅姟閮ㄧ讲"
- project_ui_deploy
+ #鍒ゆ柇鏄惁闇€瑕侀儴缃瞮i
+ if [ "@skipUi@" == "false" ];then
+ echo "鍓嶇鏈嶅姟閮ㄧ讲"
+ project_ui_deploy
+ fi;
exit ${RETVAL}
}
--
2.24.3