ak/file
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!7 代码合并

Browse Source 
Merge pull request !7 from MAC/develop
This commit is contained in:
MAC 2021-02-12 21:57:13 +08:00 committed by Gitee
commit 29dbc455b0
3 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
file-web/src/main/resources/config/application.properties
View File

@ -1,4 +1,5 @@
server.port=8080 server.port=8080
eureka.client.register-with-eureka=false eureka.client.register-with-eureka=false
eureka.client.fetchRegistry=false eureka.client.fetchRegistry=false
#eureka.client.server.waitTimeInMsWhenSyncEmpty=0 #eureka.client.server.waitTimeInMsWhenSyncEmpty=0

14
file-web/src/main/script/start.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
. /etc/profile #. /etc/profile
. ~/.bashrc #. ~/.bashrc
. ~/.bash_profile #. ~/.bash_profile
#support jsch commons #support jsch commons
cd `dirname $0` cd `dirname $0`
@ -18,12 +18,12 @@ echo "--------start app ${DEPLOY_DIR}--------"
PARENT_DIR=$(dirname "$PWD") PARENT_DIR=$(dirname "$PWD")
CONF_DIR=$DEPLOY_DIR/conf CONF_DIR=$DEPLOY_DIR/conf
LIB_DIR=$DEPLOY_DIR/lib LIB_DIR=$DEPLOY_DIR/lib
SERVER_NAME=`cat $CONF_DIR/config/application.yml | grep -w "name:" | grep -v "#" | awk 'NR==1{print $2}' | tr -d '\r'` SERVER_NAME=`cat $CONF_DIR/config/application.properties | grep -w "spring.application.name" | grep -v "#" | awk -F= 'NR==1{print $2}'`
SERVER_PORT=`cat $CONF_DIR/config/application.yml | grep -w "port:" | grep -v "#" | awk 'NR==1{print $2}' | tr -d '\r'` SERVER_PORT=`cat $CONF_DIR/config/application.properties | grep -w "server.port" | grep -v "#" | awk -F= 'NR==1{print $2}'`
#REM ********************************************************************************************** #REM **********************************************************************************************
LOG_PATH="/export/log/qiwen-file" LOG_PATH=$DEPLOY_DIR/log/qiwen-file
GC_LOG_PATH="/export/log/qiwen-file/gc" GC_LOG_PATH=$DEPLOY_DIR/log/qiwen-file/gc
if [ "${LOG_PATH}" == "" ] ; then if [ "${LOG_PATH}" == "" ] ; then
LOG_PATH=$PARENT_DIR/logs/${SERVER_NAME} LOG_PATH=$PARENT_DIR/logs/${SERVER_NAME}
fi fi

13
file-web/src/main/script/stop.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
. /etc/profile #. /etc/profile
. ~/.bashrc #. ~/.bashrc
. ~/.bash_profile #. ~/.bash_profile
#support jsch commons #support jsch commons
cd `dirname $0` cd `dirname $0`
@ -13,11 +13,12 @@ echo "========stop app ${DEPLOY_DIR}========"
PARENT_DIR=$(dirname "$PWD") PARENT_DIR=$(dirname "$PWD")
CONF_DIR=$DEPLOY_DIR/conf CONF_DIR=$DEPLOY_DIR/conf
LIB_DIR=$DEPLOY_DIR/lib LIB_DIR=$DEPLOY_DIR/lib
SERVER_NAME=`cat $CONF_DIR/config/application.yml | grep -w "name:" | grep -v "#" | awk 'NR==1{print $2}' | tr -d '\r'` SERVER_NAME=`cat $CONF_DIR/config/application.properties | grep -w "spring.application.name" | grep -v "#" | awk -F= 'NR==1{print $2}'`
SERVER_PORT=`cat $CONF_DIR/config/application.yml | grep -w "port:" | grep -v "#" | awk 'NR==1{print $2}' | tr -d '\r'` SERVER_PORT=`cat $CONF_DIR/config/application.properties | grep -w "server.port" | grep -v "#" | awk -F= 'NR==1{print $2}'`
#REM ********************************************************************************************** #REM **********************************************************************************************
LOG_PATH="/export/log/qiwen-file" LOG_PATH=$DEPLOY_DIR/log/qiwen-file
if [ "${LOG_PATH}" == "" ] ; then if [ "${LOG_PATH}" == "" ] ; then
LOG_PATH=$PARENT_DIR/logs/${SERVER_NAME} LOG_PATH=$PARENT_DIR/logs/${SERVER_NAME}
fi fi