Commit da54462d authored by tywldx's avatar tywldx

remove

parent d6770592
...@@ -29,145 +29,3 @@ elif [ "$project_type" = "python" ]; then ...@@ -29,145 +29,3 @@ elif [ "$project_type" = "python" ]; then
# buildPythonProject $project_name $3 # buildPythonProject $project_name $3
fi fi
# if [[ "$project" = "xyqb" || "$project" = "han-gu-guan" || "$project" = "di-ting" || "$project" = "xyqb-offline" || "$project" = "xyqb-user2" ]]; then
# echo "module is $project, need replace sms jar version from 1.0.x to 1.0.2"
# num=`grep -n -A12 "<id>test</id>" $project_path/$project/pom.xml| grep "<version>" | awk -F- '{print $1}'`
# echo "----$project-----pom.xml file line: $num------------"
# sed -i "${num}s/1.0.[0-9]-SNAPSHOT/1.0.6.3-SNAPSHOT/" $project_path/$project/pom.xml
# fi
#
# if [[ "$project" = "du-jiang-yan" ]]; then
# num=`grep -n -A3 "<artifactId>fund-manage-sdk</artifactId>" $project_path/$project/pom.xml| grep "<version>" | awk -F- '{print $1}'`
# echo "----$project-----pom.xml file line: $num------------"
# sed -i "${num}s/1.0.[0-9]-SNAPSHOT/1.0.0.${suffix}-SNAPSHOT/" $project_path/$project/pom.xml
# sed -i "${num}s/1.0.[0-9].[0-9]/1.0.0.${suffix}-SNAPSHOT/" $project_path/$project/pom.xml
# fi
#
# if [[ "$project" = "finance-api" || "$project" = "financial-system" ]]; then
# num=`grep -n -A1 "<artifactId>quantgroup-sms-sdk</artifactId>" $project_path/$project/pom.xml| grep "<version>" | awk -F- '{print $1}'`
# echo "----$project-----pom.xml file line: $num------------"
# sed -i "${num}s/1.0.6.3/1.0.6.3-SNAPSHOT/" $project_path/$project/pom.xml
# fi
# function buildJavaProject()
# {
# project=$1
# config_server=$2
# project_path=$3
#
# params=`node $config_server/get_project_config.js -name $project -attr desc/target_path/command2`
# params_arry=(${params//|/ })
# desc=${params_arry[0]}
# target_path=${params_arry[1]}
# build_command=${params_arry[2]//\^/ }
# sh $config_server/show_info.sh $project BUILD $desc $2
# cd $project_path/$project
#
# rm -rf $target_path
# rm -rf $project.jar
#
# nums=(`awk '/quantgroup-sms-sdk/ {print NR}' $project_path/$project/pom.xml`)
# for num in ${nums[@]}
# do
# lin=$[ $num+1 ]
# echo "$lin"
# sed -i "${lin}s/^.*$/\<version\>2.0.0.3-SNAPSHOT\<\/version\>/" $project_path/$project/pom.xml
# done
#
# echo "$build_command"
# $build_command
# if [ $? = 0 ]; then
# echo "${project} build ok"
# else
# echo "${project} build fail"
# exit -1
# fi
# echo "$target_path"
# mv $project_path/$project/$target_path/*.jar $project_path/$project/$project.jar
# }
# function buildNodeProject()
# {
# project=$1
# params=`node $config_server/get_project_config.js -name $project -attr desc/config_file/command/node_version`
# params_arry=(${params//|/ })
#
# desc=${params_arry[0]}
# config_file=${params_arry[1]}
# command=${params_arry[2]//\^/ }
# node_version=${params_arry[3]}
#
# sh $config_server/show_info.sh $project BUILD $desc $2
# # 第一步 将nginx项目的所有文件进行打包
# cd $project_path/$project
# #第二步 关联配置文件
# rm -rf ./$config_file
# echo "------ln -s $config_path/node/$project.* ./$config_file"
# ln -s $config_path/node/$project.* ./$config_file
# npm config set "@types:registry" http://registry.npmjs.org/
# npm --registry http://172.16.3.15:4873 install
#
# }
# function buildUiProject()
# {
# project=$1
# params=`node $config_server/get_project_config.js -name $project -attr desc/config_file/command/node_version`
# params_arry=(${params//|/ })
#
# desc=${params_arry[0]}
# config_file=${params_arry[1]}
# command=${params_arry[2]//\^/ }
# node_version=${params_arry[3]}
#
#
# sh $config_server/show_info.sh $project BUILD $desc $2
# # 第一步 将nginx项目的所有文件进行打包
# cd $project_path/$project
#
# if [ "$node_version" = "node4" ] ;then
# echo "----node-V4---${node4_path}/npm install"
# ${node4_path}/npm install
# else
# npm --registry http://172.16.3.15:4873 install
# fi
# bower_json=`find ./ -maxdepth 1 -name "bower.json"`
#
# if [ -n "$bower_json" ];then
# echo "bower install --allow-root"
# bower install --allow-root
# else
# echo "don't have bower.json"
# fi
#
# $command
# # 第二步 不关机使得nginx生效
# nginx -t; nginx -s reload
# }
# function buildPythonProject()
# {
# project=$1
# params=`node $config_server/get_project_config.js -name $project -attr desc/config_file`
# params_arry=(${params//|/ })
# desc=${params_arry[0]}
# config_file=${params_arry[1]}
#
# sh $config_server/show_info.sh $project BUILD $desc $2
#
# cd $project_path/$project
# setup_path_temp=`find ./ -name "setup.py"`
# python ${setup_path_temp} install
# #第四步 关联配置文件
# rm -rf $config_file
# ln -s $config_path/python/$project.* $config_file
# }
...@@ -6,13 +6,7 @@ pwd_path="/home/qa-deploy-utils/qa_shell_script" ...@@ -6,13 +6,7 @@ pwd_path="/home/qa-deploy-utils/qa_shell_script"
config_server="$pwd_path/config_server" config_server="$pwd_path/config_server"
project_path=`cat $config_server/project_path.sh` project_path=`cat $config_server/project_path.sh`
config_path=`cat $config_server/config_path.sh` config_path=`cat $config_server/config_path.sh`
# node4_path=`cat $config_server/node_4_path.sh`
# node7_path=`cat $config_server/node_7_path.sh`
# profile=test
# host=`/sbin/ifconfig -a|grep inet|grep -v 127.0.0.1|grep -v inet6|awk '{print $2}'|tr -d "addr:"`
# hosts=(${host//\./ })
# suffix=${hosts[3]}
function buildNginx() function buildNginx()
...@@ -78,131 +72,3 @@ else ...@@ -78,131 +72,3 @@ else
done done
buildNginx buildNginx
fi fi
#
# function buildJavaProject()
# {
# project=$1
# desc=`node $config_server/get_project_config.js -name $project -attr desc`
# target_path=`node $config_server/get_project_config.js -name $project -attr target_path`
# sh $config_server/show_info.sh $project "打包BUILD" $desc $2
# cd $project_path/$project
#
# rm -rf $target_path
# rm -rf $project.jar
#
# if [[ "$project" = "xyqb" || "$project" = "gu-bei" || "$project" = "han-gu-guan" || "$project" = "di-ting" || "$project" = "xyqb-offline" || "$project" = "xyqb-user2" ]]; then
# echo "module is $project, need replace sms jar version from 1.0.x to 1.0.2"
# num=`grep -n -A12 "<id>test</id>" $project_path/$project/pom.xml| grep "<version>" | awk -F- '{print $1}'`
# sed -i "${num}s/1.0.[0-9]-SNAPSHOT/1.0.6.3-SNAPSHOT/" $project_path/$project/pom.xml
# fi
#
# if [[ "$project" = "du-jiang-yan" ]]; then
# num=`grep -n -A3 "<artifactId>fund-manage-sdk</artifactId>" $project_path/$project/pom.xml| grep "<version>" | awk -F- '{print $1}'`
# sed -i "${num}s/1.0.[0-9]-SNAPSHOT/1.0.0.${suffix}-SNAPSHOT/" $project_path/$project/pom.xml
# sed -i "${num}s/1.0.[0-9].[0-9]/1.0.0.${suffix}-SNAPSHOT/" $project_path/$project/pom.xml
# fi
#
# if [[ "$project" = "finance-api" || "$project" = "financial-system" ]]; then
# num=`grep -n -A1 "<artifactId>quantgroup-sms-sdk</artifactId>" $project_path/$project/pom.xml| grep "<version>" | awk -F- '{print $1}'`
# echo "----$project-----pom.xml file line: $num------------"
# sed -i "${num}s/1.0.6.3/1.0.6.3-SNAPSHOT/" $project_path/$project/pom.xml
# fi
#
# echo "mvn clean package -P${profile} -Dmaven.test.skip=true"
# mvn clean package -P${profile} -Dmaven.test.skip=true
# mv $project_path/$project/$target_path/*.jar $project_path/$project/$project.jar
# }
#
# function buildUiProject()
# {
# project=$1
# desc=`node $config_server/get_project_config.js -name $project -attr desc`
# echo
# sh $config_server/show_info.sh $project "打包BUILD" $desc $2
# config_file=`node $config_server/get_project_config.js -name $project -attr config_file`
# command=`node $config_server/get_project_config.js -name $project -attr command`
# node_version=`node $config_server/get_project_config.js -name $project -attr node_version`
#
# # 第一步 将nginx项目的所有文件进行打包
# cd $project_path/$project
#
# rm -rf ./$config_file
# if $is_public_ip && [ -n "$is_public_ip" ]
# then
# cp $config_path/public/ui/$project.* $project_path/$project/$config_file
# else
# cp $config_path/ui/$project.* $project_path/$project/$config_file
# fi
#
# imagemin_dist=`grep -n -A3 "imagemin" *.js|awk '{print $1}'`
#
# if [ -n "$imagemin_dist" ];then
# echo "npm install gruntjs/grunt-contrib-imagemin"
# #${node4_path}/
# npm install gruntjs/grunt-contrib-imagemin
# #
# else
# echo "dont install imagemin"
# fi
#
# if [ "$node_version" = "node4" ] ;then
# echo "----node-V4---${node4_path}/npm install"
# ${node4_path}/npm install
# else
# npm --registry http://172.16.3.15:4873 install
# fi
# bower_json=`find ./ -maxdepth 1 -name "bower.json"`
#
# if [ -n "$bower_json" ];then
# echo "bower install --allow-root"
# bower install --allow-root
# else
# echo "don't have bower.json"
# fi
#
# $command
# }
#
# function buildNginx()
# {
# # 第二步 不关机使得nginx生效
# sh $config_server/show_info.sh nginx.config_d "打包BUILD" nginx配置文件生效 $2
# nginx -t; nginx -s reload
# }
#
# function buildNodeProject()
# {
# project=$1
# desc=`node $config_server/get_project_config.js -name $project -attr desc`
# echo
# sh $config_server/show_info.sh $project "打包BUILD" $desc $2
# config_file=`node $config_server/get_project_config.js -name $project -attr config_file`
# command=`node $config_server/get_project_config.js -name $project -attr command`
# node_version=`node $config_server/get_project_config.js -name $project -attr node_version`
#
# # 第一步 将nginx项目的所有文件进行打包
# cd $project_path/$project
# #第二步 关联配置文件
# rm -rf ./$config_file
# echo " ------------ln -s $config_path/node/$project.* ./$config_file"
# ln -s $config_path/node/$project.* ./$config_file
# npm config set "@types:registry" http://registry.npmjs.org/
# npm --registry http://172.16.3.15:4873 install
# }
#
# function buildPythonProject()
# {
# project=$1
# desc=`node $config_server/get_project_config.js -name $project -attr desc`
# sh $config_server/show_info.sh $project BUILD $desc $2
# config_file=`node $config_server/get_project_config.js -name $project -attr config_file`
# cd $project_path/$project
# setup_path_temp=`find ./ -name "setup.py"`
# python ${setup_path_temp} install
# #第四步 关联配置文件
# rm -rf $config_file
# ln -s $config_path/python/$project.* $config_file
# }
\ No newline at end of file
...@@ -7,170 +7,6 @@ config_server="$pwd_path/config_server" ...@@ -7,170 +7,6 @@ config_server="$pwd_path/config_server"
project_type=`node $config_server/get_project_config.js -name $project_name -attr type` project_type=`node $config_server/get_project_config.js -name $project_name -attr type`
project_path=`cat $config_server/project_path.sh` project_path=`cat $config_server/project_path.sh`
config_path=`cat $config_server/config_path.sh` config_path=`cat $config_server/config_path.sh`
# node4_path=`cat $config_server/node_4_path.sh`
# node7_path=`cat $config_server/node_7_path.sh`
# profile=test
# time=`date +%Y_%m_%d_%H_%M_%S`
# function restartJavaProject()
# {
# max_wait_log_generate_time=50
# max_wait_ack_time=500
# ack_phrase="Started\ Bootstrap"
# project=$1
# desc=`node $config_server/get_project_config.js -name $project -attr desc`
# run_command_=`node $config_server/get_project_config.js -name $project -attr command`
# run_command=${run_command_//\^/ }
# sh $config_server/show_info.sh $project 重新启动 $desc $2
# cd $project_path/$project
# P_UUID=`ps -ef|grep ${project}.jar |grep -v 'grep'|awk '{print $2}'`
# if [ -n "${P_UUID}" ];then
# echo "-----KILL $project PPID=${P_UUID}"
# echo `kill -9 ${P_UUID}`
# sleep 2s
# fi
#
# config_file=`find ./ -maxdepth 2 -name "application.properties"`
#
# if [ -n "$config_file" ]
# then
# echo "have"
# else
# echo "no have"
# if $is_public_ip && [ -n "$is_public_ip" ]
# then
# rm -rf /home/quant_group/${project}/application.properties
# echo "ln -s $config_path/public/java/${project}.* /home/quant_group/${project}/application.properties"
# ln -s $config_path/public/java/${project}.* /home/quant_group/${project}/application.properties
# else
# rm -rf /home/quant_group/${project}/application.properties
# echo "ln -s $config_path/java/${project}.* /home/quant_group/${project}/application.properties"
# ln -s $config_path/java/${project}.* /home/quant_group/${project}/application.properties
# fi
# fi
#
# echo "-----project:$project while be start"
# log_name=`node $config_server/get_project_config.js -name $project -attr log_name`
#
# mv $project_path/logs/$log_name $project_path/logs/$project.log.$time
#
# echo "$run_command"
#
# if [[ $project == "redpacket" ]]; then
# echo `java -Xmx512m -XX:PermSize64m -Xloggc:/tmp/${project}.log -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -jar ${project}.jar --worker 1 --currentWorker 1 -t -ts > /dev/null 2>&1 &`
# else
# echo `java -Xmx512m -XX:PermSize64m -Xloggc:/tmp/${project}.log -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -jar ${project}.jar --worker 1 --currentWorker 1 -t > /dev/null 2>&1 &`
# fi
#
#
# ack "$ack_phrase" $project_path/logs/$log_name ${max_wait_log_generate_time} ${max_wait_ack_time}
# if [ $? -ne 0 ]
# then
# echo "Fail to start"
# exit -1
# fi
# }
# function restartNodeProject()
# {
# project=$1
# desc=`node $config_server/get_project_config.js -name $project -attr desc`
# stop_command_=`node $config_server/get_project_config.js -name $project -attr command2`
# stop_command=${stop_command_//\^/ }
# sh $config_server/show_info.sh $project 重新启动 $desc $2
# cd $project_path/$project
# $stop_command
# # forever stop $project
# # forever stop $project-www
# # pm2 stop $project
# start_command_=`node $config_server/get_project_config.js -name $project -attr command`
# start_command=${start_command_//\^/ }
# $start_command
# if [ $? -ne 0 ]
# then
# echo "Fail to start"
# exit -1
# fi
# # setup_path_temp=`find ./ -maxdepth 2 -path "./node_modules" -prune -o -type f -name "app.js" -print`
# # echo "------setup_path_temp:$setup_path_temp"
# #
# # echo `forever start -a -s --uid $project ${setup_path_temp}`
# #
# # setup_path_temp_for_appbackent=`find ./ -maxdepth 2 -path "./node_modules" -prune -o -type f -name "www" -print`
# # if [ -n "$setup_path_temp_for_appbackent" ];then
# # echo "-----project:$project while be run command: python $python_project_path --mode=beta --port=$port > /dev/null 2>&1 &"
# # echo `forever start -a -s --uid $project-www ${setup_path_temp_for_appbackent}`
# # fi
# }
# function restartPythonProject()
# {
# project=$1
# desc=`node $config_server/get_project_config.js -name $project -attr desc`
# port=`node $config_server/get_project_config.js -name $project -attr port`
# sh $config_server/show_info.sh $project 重新启动 $desc $2
# cd $project_path/$project
# setup_path_temp=`find ./ -name "run.py"`
# python_project_path=$project_path/$project${setup_path_temp/\.\//\/}
#
# P_UUID=`ps -ef|grep port=$port |grep -v 'grep'|awk '{print $2}'`
# if [[ "${P_UUID}" != "" ]];then
# echo "-----KILL $project PPID=${P_UUID}"
# echo `kill -9 ${P_UUID}`
# sleep 3
# fi
#
# echo "-----project:$project while be run command: python $python_project_path --mode=beta --port=$port > /dev/null 2>&1 &"
# echo `python $python_project_path --mode=beta --port=$port > /dev/null 2>&1 &`
#
# }
# function restartUiProject()
# {
# nginx -t; nginx -s reload
# }
#acknowledge whether the deploy start OK
# function ack()
# {
# ack_phrase="$1"
# log_path="$2"
# max_wait_log_generate_time="$3"
# max_wait_ack_time="$4"
# wait_log_generate_time=0
# wait_ack_time=0
# echo "begin acknowledge whether the deploy start OK, ACK_PHRASE=${ack_phrase}, log_path=${log_path}"
# while [ ! -f ${log_path} ]
# do
# echo "wait_log_generate_time is ${wait_log_generate_time}, max_wait_log_generate_time is ${max_wait_log_generate_time} "
# if ((${wait_log_generate_time}>${max_wait_log_generate_time}))
# then
# echo "the log generated time exceed the limit"
# exit -1
# fi
# echo 'the log does not exist, wait for 5 seconds'
# sleep 5
# let "wait_log_generate_time+=5"
# done
# echo "listen for the log ack..."
# for ((i=0;;))
# do
# bootstrap_flag=`cat ${log_path} |grep "${ack_phrase}"| wc -l`
# if [ "${bootstrap_flag}" = 0 ] && [ "${max_wait_ack_time}" -gt "${wait_ack_time}" ]
# then
# sleep 5
# let "wait_ack_time+=5"
# echo "waiting for bootstrap flag for ${wait_ack_time}"
# elif [ "${bootstrap_flag}" = 1 ]
# then
# echo "server is start~"
# exit 0
# else
# echo "server not startup in ${max_wait_ack_time} seconds..."
# exit -1
# fi
# done
# }
if [ "$project_type" = "java" ]; then if [ "$project_type" = "java" ]; then
sh $pwd_path/base_script/restartJava.sh $project_name $config_server $project_path sh $pwd_path/base_script/restartJava.sh $project_name $config_server $project_path
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment