update--脚本更新

build.sh

@@ -1,27 +1,33 @@
 #!/bin/bash
 
-#判断node.js mvn是否存在
+echo "判断node.js mvn是否存在"
-command -v npm >/dev/null 2>&1 || { echo >&2 "I require node.js v14.16.0+ but it's not installed.  Aborting."; sleep 5; exit 1; }
+command -v npm || { echo >&2 "I require node.js v14.16.0+ but it's not installed.  Aborting."; sleep 5; exit 1; }
-command -v mvn >/dev/null 2>&1 || { echo >&2 "I require maven 3.5 + but it's not installed.  Aborting."; sleep 5; exit 1; }
+command -v mvn || { echo >&2 "I require maven 3.5 + but it's not installed.  Aborting."; sleep 5; exit 1; }
 
 cd `dirname $0`
 BuildDir=`pwd` #工程根目录
 
 echo "build web"
 cd $BuildDir/report-ui
-npm install >/dev/null 2>&1
+echo "npm install"
-npm run build:prod >/dev/null 2>&1
+npm install
+echo ""
+echo "npm run build"
+npm run build:prod
 
 echo "publish web to springboot src/main/resources/static"
 
 mkdir -p $BuildDir/report-core/src/main/resources/static
 mv $BuildDir/report-ui/dist/* $BuildDir/report-core/src/main/resources/static/
 
-
+echo ""
 echo "build springboot"
 cd $BuildDir/report-core
-mvn clean >/dev/null 2>&1
+echo "mvn clean"
-mvn package -Dmaven.test.skip=true >/dev/null 2>&1
+mvn clean
+echo ""
+echo "mvn package"
+mvn package -Dmaven.test.skip=true
 
 echo "zip finish in build dir"
 if [ ! -d "$BuildDir/build" ]; then
@@ -29,4 +35,4 @@ if [ ! -d "$BuildDir/build" ]; then
 fi
 mv $BuildDir/report-core/target/aj-report-*.zip $BuildDir/build/
 rm -rf $BuildDir/report-core/src/main/resources/static/*
-
+echo "Finish"

report-core/src/main/assembly/bin/start.sh

@@ -23,4 +23,4 @@ fi
 JAVA_OPTS=" -server -Xms1g -Xmx2g -Xmn256m -XX:PermSize=128m -Xss256k "
 nohup java $JAVA_OPTS -Xbootclasspath/a:$LIB_JARS -jar -Dspring.config.location=$CONF_DIR/bootstrap.yml $LIB_DIR/aj-report-*.jar >/dev/null 2>&1 &
 
-echo "AJ-Report 正在后台执行，请查看aj-report.log日志(tail -F ../logs/aj-report.log)，确定软件运行情况"
+echo "AJ-Report 正在后台执行，请查看aj-report.log日志(${DEPLOY_DIR}/logs/aj-report.log)，确定软件运行情况"