diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ce5117e4..6087f863 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -32,8 +32,8 @@ jobs: rm -rf dist git pull bash ./gradlew build -x test - cd dist - export DBPWD=${{secrets.SPRING_DATASOURCE_PASSWORD}} +# cd dist +# export DBPWD=${{secrets.SPRING_DATASOURCE_PASSWORD}} bash stop.sh bash start.sh diff --git a/start.sh b/start.sh index 8371ce1f..1c90ecd3 100644 --- a/start.sh +++ b/start.sh @@ -6,8 +6,7 @@ CURRENT_DIR=$(pwd)/ LOG_DIR=${CURRENT_DIR}log CONF_DIR=${CURRENT_DIR}conf DBPWD=$SPRING_DATASOURCE_PASSWORD -echo "dbpwd $DBPWD" -sed "s/\${SPRING_DATASOURCE_PASSWORD}/$DBPWD/g" conf/application.yml > conf/application.yml +#sed "s/\${SPRING_DATASOURCE_PASSWORD}/$DBPWD/g" conf/application.yml > conf/application.yml SERVER_PORT=$(cat $CONF_DIR/application.yml | grep "server:" -A 3 | grep "port" | awk '{print $2}'| sed 's/\r//') if [ ${SERVER_PORT}"" = "" ];then echo "$CONF_DIR/application.yml server port has not been configured"