Merge branch 'master' of gitee.com:qiwen-cloud/qiwen-file into develop

This commit is contained in:
MAC 2022-05-08 16:33:52 +00:00 committed by Gitee
commit a23d099b84
3 changed files with 73 additions and 10 deletions

61
install.sh Normal file
View File

@ -0,0 +1,61 @@
#/*************************************************
#* install.sh write by echo at Changsha. Hunan, 2021年 05月 24日 星期一 11:33:25 CST
#*************************************************/
#!/bin/sh
function echo_dbg_p(){
echo "echo_dbg, $@"
}
function usage(){
echo -e "usages: $0 [H|h|help] [-h] [-s]
[H|h|help]: check the usages\n
[]"
}
#main
#maven install check
cmd_package=yum
if ! mvn -v >/dev/null;then
sudo $cmd_package install -y maven
fi
#java install check
if ! java -version &>/dev/null;then
sudo $cmd_package install -y java
fi
if ! mysql -V>/dev/null;then
sudo wget https://dev.mysql.com/get/mysql57-community-release-el7-9.noarch.rpm;
sudo rpm -ivh mysql57-community-release-el7-9.noarch.rpm
sudo yum install -y mysql-server
fi
#build path check
#build_root_path=./
settingDir=file-common/src/main/resources/conf/settings.xml
mvn clean install -s $settingDir
sed -i "s#D:/temp_db#/tmp/#g" release/conf/config/application-dev.properties
echo_dbg_p "warning, PLS create mysql with name file, and set the password follow the file qiwen-file/file-web/src/main/resources/config/application-prod.properties"
case $1 in
H|h|help)
usage
;;
*)
# getopts :s:h表示这个命令接受2个带参数选项分别是-h和-s
while getopts :s:h opt
do
case $opt in
s)
echo "-s=$OPTARG"
;;
:)
echo "-$OPTARG needs an argument"
;;
h)
echo "-h is set"
;;
*)
echo "-$opt not recognized"
;;
esac
done
;;
esac

View File

@ -31,6 +31,7 @@ import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
import java.util.concurrent.Executor;

View File

@ -34,15 +34,16 @@ STDOUT_FILE=${LOG_PATH}/nohup.out
#if use self jdk,modify
#JAVA_HOME="/usr/lib/jvm/jdk1.8.0_191"
if [ "${JAVA_HOME}" != "" ] ; then
export JAVA_HOME
export PATH=$PATH:JAVA_HOME/bin
echo JAVA_HOME:${JAVA_HOME}
else
echo "JAVA_HOME not set!!!"
exit 1
if ! java -version &>/dev/null;then
if [ "${JAVA_HOME}" != "" ] ; then
export JAVA_HOME
export PATH=$PATH:JAVA_HOME/bin
echo JAVA_HOME:${JAVA_HOME}
else
echo "JAVA_HOME not set!!!"
exit 1
fi
fi
USER_VMARGS="-D64 -server -Xmx1g -Xms1g -Xmn521m -Xss256k "
GC_OPTS=""
@ -84,7 +85,7 @@ echo "Using CONF_DIR: $CONF_DIR"
CLASSPATH=".:$CONF_DIR:$LIB_JARS"
EXEC_CMDLINE="${JAVA_HOME}/bin/java -classpath ${CLASSPATH} ${USER_VMARGS} ${GC_OPTS} ${JAVA_JMX_OPTS} ${JAVA_DEBUG} ${JAVA_OPTS} com.qiwenshare.file.FileApplication"
EXEC_CMDLINE="java -classpath ${CLASSPATH} ${USER_VMARGS} ${GC_OPTS} ${JAVA_JMX_OPTS} ${JAVA_DEBUG} ${JAVA_OPTS} com.qiwenshare.file.FileApplication"
echo "Start app command line: ${EXEC_CMDLINE}" >> $STDOUT_FILE
echo "Starting $SERVER_NAME ..."
@ -104,4 +105,4 @@ while [ $COUNT -lt 120 ]; do
done
echo "Console File: $STDOUT_FILE"
echo "--------start app $SERVER_NAME on $(uname -n) (pid=$$)--------"
echo "--------start app $SERVER_NAME on $(uname -n) (pid=$$)--------"