update

qa_shell_script/2_get_code_by_name.sh

@@ -16,12 +16,13 @@ project_folder=`find ./ -maxdepth 1 -name "$project_name"`
 if [ -n "$project_folder" ];then
 	desc=`node $config_server/get_project_config.js  -name $project_name -attr desc`
 	type=`node $config_server/get_project_config.js  -name $project_name -attr type`
+	sh $config_server/show_info.sh $project_name pull代码 $desc $3
+	cd ./$project_name
 	if [ "$type" = "node" ];then
 		command2=`node $config_server/get_project_config.js  -name $project_name -attr command2`
-		$command2
+		stop_command=${command2//\^/ }
+		$stop_command
 	fi
-	sh $config_server/show_info.sh $project_name pull代码 $desc $3
-	cd ./$project_name
 	git checkout ./
 	git fetch -p
 	

qa_shell_script/3_link_config_file_by_name.sh

@@ -9,8 +9,8 @@ config_path=`cat $config_server/config_path.sh`
 if  [ "$project" = "nginx" ]
 then
 		sh $config_server/show_info.sh nginx.conf_d 连接配置文件 nginx配置文件 $3
-		rm -rf /etc/nginx/conf.d
-		ln -s $config_path/nginx_conf.d /etc/nginx/conf.d
+		rm -rf /usr/local/openresty/nginx/conf/conf.d
+		ln -s $config_path/nginx_conf.d /usr/local/openresty/nginx/conf/conf.d
 		nginx -t;  nginx -s reload
 elif [ -n "$project" ]
 then

qa_shell_script/check/check.sh

@@ -27,7 +27,7 @@ function check(){
 	_status=''
 	_desc_c=''
 	#echo $_name "curl -s ${host}:${_port}"
-	result=`curl -s ${host}:${_port}`
+	result=`curl -m 2 -s ${host}:${_port}`
 	
 	if [[ $? == 0 ]]
     then

qa_shell_script/config_server/get_project_config.js

@@ -104,6 +104,7 @@ new pClass().init(true, "java", "7074", "", "account-center",false, "QG", "accou
 new pClass().init(true, "java", "7079", "", "user_credit",false, "QG", "user_credit.log", "application.properties", " /dev/null 2>&1 &", null, 2, "用户升级-server", "","mvn clean package -Ptest -Dmaven.test.skip=true","");
 new pClass().init(true, "java", "7076", "", "urge_dispatcher", true, "data-riskcontrol", "dispatcher.log", "application.properties", "--worker 1 --currentWorker 1 -t -ts > /dev/null 2>&1 &", null, 2, "催收系统", "", "mvn clean package -Ptest -Dmaven.test.skip=true", "");
 new pClass().init(true, "java", "7081", "", "wechat-config", true, "fund_pay", "wechat-config.log", "application.properties", "--worker 1 --currentWorker 1 -t -ts > /dev/null 2>&1 &", null, 2, "微信消息推送系统", "",     "mvn clean package -Ptest -Dmaven.test.skip=true", "");
+new pClass().init(true, "java", "7082", "", "clotho", true, "funding", "clotho.log", "application.properties", "--worker 1 --currentWorker 1 -t -ts > /dev/null 2>&1 &",     null, 2, "资金方统计相关功能", "",     "mvn clean package -Ptest -Dmaven.test.skip=true", "");
 
 // ui----
 new pClass().init(true, "ui", "7032", "", "op-ui", false, "QG", null, "src/js/env.config.js", "npm run build", "node7", 1, "运营系统-ui", "", "", "");
@@ -199,11 +200,13 @@ configFunction.prototype = {
 		}
 		var list = [];
 		for (var i = 0; i < projects.length; i++) {
-			var li = [projects[i]["name"]];
-			for (var j = 0; j < attrs.length; j++) {
-				li.push(projects[i][attrs[j]]);
+			if (projects[i].is_active){
+				var li = [projects[i]["name"]];
+				for (var j = 0; j < attrs.length; j++) {
+					li.push(projects[i][attrs[j]]);
+				}
+				list.push(li.join("|"));
 			}
-			list.push(li.join("|"));
 		}
 		return list.join(" ");
 	},

qa_shell_script/exception_sub_shell.sh

@@ -50,7 +50,8 @@ tranceConfig java "kamen.customerid=test" "kamen.phone.customerid=803571" "192.1
 tranceConfig java "kamen.secretkey=12345678901234567890" "kamen.secretkey=281383FDF56E65D3FDA88343113B3631" "192.168.4.12" "xyqb-mall.properties"
 tranceConfig java "kamen.customerid=test" "kamen.phone.customerid=803571" "192.168.4.12" "xyqb-mall.properties"
 #tranceConfig java "bt.order.notify.url=http:\/\/192.168.4.12:7019\/ex\/baitiao\/result\/order" "bt.order.notify.url=http:\/\/192.168.4.241\/ex\/baitiao\/result\/order" "192.168.4.12" "xyqb-mall.properties"
-
+tranceConfig java  "xyqb-user.ui=http:\/\/192.168.4.12:7043" "xyqb-user.ui=http:\/\/xyqb-user-ui-12.q-gp.com" "192.168.4.12" "xyqb-user2.properties"
+tranceConfig ui  "192.168.4.12:7043" "xyqb-user-ui-12.q-gp.com" "192.168.4.12" "mall-ui.js"
 
 # tranceConfig node "host: \'http:\/\/192.168.4.12:7013" "host: \'http:\/\/192.168.4.12:7042" "192.168.4.12" "AppBackend.js"
 # tranceConfig node "host.*7042" "host: 'http:\/\/192.168.4.12:7013" "192.168.4.12" "AppBackend.js"

qa_shell_script/log_shell/remove_logs.sh

@@ -13,6 +13,7 @@ echo "清空/home/quant_group/logs"
 cd /home/quant_group/logs
 rm -rf *.log.*
 rm -rf *-2017*.log
+rm -rf *.log-*
 for i in `find . -name "*.log"`; do cat /dev/null >$i; done
 
 echo "清空/var/log/nginx"

qa_shell_script/migrate_ENV/link_nginx_config.sh

+#!/bin/bash
+sh /home/qa-deploy-utils/qa_shell_script/3_link_config_file_by_name.sh nginx
+
+nginx -s reload

qa_shell_script/rabbitmq/initial_mq.sh

@@ -32,6 +32,7 @@ add_vhost /
 add_vhost /black_hole
 add_vhost /funding
 add_vhost /loan_order
+add_vhost /clotho
 add_vhost baitiao_debt
 add_vhost financial_system
 add_vhost feature 
@@ -83,6 +84,7 @@ add_exchange feature feature_save direct
 add_exchange /trans_order trans_order_exchange direct
 add_exchange /user_register user_register_exchange direct
 add_exchange notify notify-control direct
+add_exchange /clotho clotho_exchange direct
 #add_exchange baitiao_zhitou btzt_orderStatus_exc direct
 #add_exchange baitiao_zhitou btzt_repay_rewrite_exc direct
 #add_exchange baitiao_zhitou btzt_sendfund_exc direct
@@ -165,6 +167,7 @@ add_queues feature feature_calculate
 add_queues /trans_order trans_order_queue
 add_queues /user_register user_register_queue
 add_queues notify notify
+add_queues /clotho clotho_notify_record
 #add_queues baitiao_zhitou btzt_orderStatus_queue
 #add_queues baitiao_zhitou btzt_repay_rewrite_queue
 #add_queues baitiao_zhitou btzt_sendfund_queue

qa_shell_script/sub_shell.sh

@@ -39,7 +39,7 @@ do
 done
 
 echo "共要生成$counts个环境的配置文件"
-echo "并发生成3个环境的配置文件，负载最大时为3~"
+echo "并发生成3个环境的配置文件，预计执行时间一分钟左右，负载最大时为3~"
 #for ip_last_num in '15'
 for ip_last_num in ${ips[@]} 
 do