修改测试bug

knowledge-base/src/main/bin/deploy.sh

@@ -14,7 +14,7 @@ SHELL_LOG="${BASEDIR}/${SHELL_NAME}.log"
 
 JAVA_HOME="/usr/local/java/jdk1.8"
 SERVICE_PATH="/usr/lib/systemd/system"
-PUBLISH_PATH="@profiles.publish.path@"
+PUBLISH_PATH="/home/publish"
 PROJECT_NAME="@project.artifactId@"
 
 PROJECT_EXECPATH="${PUBLISH_PATH}/${PROJECT_NAME}"
@@ -35,18 +35,11 @@ clear_deploy() {
   SERVICE=$1
   EXECPATH=$2
   #清理后台自启服务
-  rm -rf ${SERVICE}
+  rm -f ${SERVICE}
   #清理执行文件目录
   rm -rf ${EXECPATH}
 }
 
-#清理ui
-clear_ui_deploy() {
-  EXEC_UI_PATH=$1
-  rm -rf ${EXEC_UI_PATH}
-  mkdir -p ${EXEC_UI_PATH}
-}
-
 build_service() {
   SERVICE=$1
   EXECPATH=$2
@@ -81,6 +74,8 @@ start_service() {
 #部署后台服务
 project_deploy() {
   writelog "${PROJECT_NAME}_deploy"
+  systemctl stop ${PROJECT_NAME}
+  sleep 5
   clear_deploy ${PROJECT_SERVICE} ${PROJECT_EXECPATH}
   writelog "${PROJECT_NAME}_clear_finish"
   tar -zvxf ./${PROJECT_FILENAME} -C ${PUBLISH_PATH}
@@ -89,22 +84,13 @@ project_deploy() {
   writelog "${PROJECT_NAME}_deploy_finish"
 }
 
-#部署前台服务
-project_ui_deploy() {
-  writelog "${PROJECT_NAME}_ui_deploy"
-  clear_ui_deploy ${PROJECT_UI_EXECPATH}
-  tar -zvxf ./${PROJECT_UI_FILENAME} -C ${PUBLISH_PATH}
-  writelog "${PROJECT_NAME}_ui_deploy_finish"
 
-}
 
 #主函数
 main() {
   echo "后台服务部署"
   project_deploy
-  echo "前端服务部署"
-  project_ui_deploy
   exit ${RETVAL}
 }
 
-main $1
+main $1
\ No newline at end of file

single-matter/src/main/bin/deploy.sh

@@ -14,7 +14,7 @@ SHELL_LOG="${BASEDIR}/${SHELL_NAME}.log"
 
 JAVA_HOME="/usr/local/java/jdk1.8"
 SERVICE_PATH="/usr/lib/systemd/system"
-PUBLISH_PATH="@profiles.publish.path@"
+PUBLISH_PATH="/home/publish"
 PROJECT_NAME="@project.artifactId@"
 
 PROJECT_EXECPATH="${PUBLISH_PATH}/${PROJECT_NAME}"
@@ -35,18 +35,11 @@ clear_deploy() {
   SERVICE=$1
   EXECPATH=$2
   #清理后台自启服务
-  rm -rf ${SERVICE}
+  rm -f ${SERVICE}
   #清理执行文件目录
   rm -rf ${EXECPATH}
 }
 
-#清理ui
-clear_ui_deploy() {
-  EXEC_UI_PATH=$1
-  rm -rf ${EXEC_UI_PATH}
-  mkdir -p ${EXEC_UI_PATH}
-}
-
 build_service() {
   SERVICE=$1
   EXECPATH=$2
@@ -81,6 +74,8 @@ start_service() {
 #部署后台服务
 project_deploy() {
   writelog "${PROJECT_NAME}_deploy"
+  systemctl stop ${PROJECT_NAME}
+  sleep 5
   clear_deploy ${PROJECT_SERVICE} ${PROJECT_EXECPATH}
   writelog "${PROJECT_NAME}_clear_finish"
   tar -zvxf ./${PROJECT_FILENAME} -C ${PUBLISH_PATH}
@@ -89,22 +84,13 @@ project_deploy() {
   writelog "${PROJECT_NAME}_deploy_finish"
 }
 
-#部署前台服务
-project_ui_deploy() {
-  writelog "${PROJECT_NAME}_ui_deploy"
-  clear_ui_deploy ${PROJECT_UI_EXECPATH}
-  tar -zvxf ./${PROJECT_UI_FILENAME} -C ${PUBLISH_PATH}
-  writelog "${PROJECT_NAME}_ui_deploy_finish"
 
-}
 
 #主函数
 main() {
   echo "后台服务部署"
   project_deploy
-  echo "前端服务部署"
-  project_ui_deploy
   exit ${RETVAL}
 }
 
-main $1
+main $1
\ No newline at end of file