update rabbitmq

qa_shell_script/rabbitmq/initial_mq.sh

@@ -2,21 +2,31 @@
 pwd_path_0="/home/qa-deploy-utils"
 pwd_path="/home/qa-deploy-utils/qa_shell_script"
 config_server="$pwd_path/config_server"
-project_path=`cat $config_server/get_env_ip.sh`
+env_ip=`cat $config_server/get_env_ip.sh`
+env_ip='12 13 14 15 16 17 22 23 24 25 26 28'
+
+scriptname=$(basename $0)
+echo -e "\033[32m使用方法：sh $scriptname 14 （同步192.168.4.14环境的MQ）\033[0m"
+echo -e "\033[32m使用方法：sh $scriptname 192.168.4.14 （同步192.168.4.14环境的MQ）\033[0m"
+echo -e "\033[32m使用方法：sh $scriptname （同步ip小于40环境的MQ）\033[0m"
 
 if [ -n "$1" ];then
-	project_path=$1
+	env_ip=$1
 fi
 
-response=$(curl -X GET -H "Authorization: Basic cmFiYml0X2FkbWluOmFiYzEyMzQ=" "http://172.16.1.231:15672/api/definitions")
+response=$(curl -s -X GET -H "Authorization: Basic cmFiYml0X2FkbWluOmFiYzEyMzQ=" "http://172.16.1.231:15672/api/definitions")
+if [ $? != 0 ];then
+	echo curl -X GET -H "Authorization: Basic cmFiYml0X2FkbWluOmFiYzEyMzQ=" "http://172.16.1.231:15672/api/definitions" failed !!!
+	exit -1
+fi
 
-for ip_last_num in $project_path
+for ip_last_num in $env_ip
 do
 	IP_host=`sh $pwd_path_0/get-ip.sh $ip_last_num`
-	echo curl -X POST -H "Content-Type: application/json" -H "Authorization: Basic cWE6cWF0ZXN0" -d $response "http://$IP_host:15672/api/definitions"
+	#echo curl -X POST -H "Content-Type: application/json" -H "Authorization: Basic cWE6cWF0ZXN0" -d $response "http://$IP_host:15672/api/definitions"
+	echo curl $IP_host ...
 	curl -X POST -H "Content-Type: application/json" -H "Authorization: Basic cWE6cWF0ZXN0" -d $response "http://$IP_host:15672/api/definitions"
 	if [ $? != 0 ];then
 		echo "curl $IP_host failed"
-		exit -1
 	fi
 done

qa_shell_script/rabbitmq/initial_mq_bak.sh

@@ -54,6 +54,7 @@ add_vhost /user_register
 add_vhost notify
 add_vhost SILKROAD
 add_vhost bt_data_visualization
+add_vhost /trade_account
 #add_vhost baitiao_zhitou
 #add exchange
 add_exchange /  hello-exchange  direct
@@ -88,6 +89,7 @@ add_exchange /user_register user_register_exchange direct
 add_exchange notify notify-control direct
 add_exchange /clotho clotho_exchange direct
 add_exchange bt_data_visualization  bt_data_visualization_exchange direct
+add_exchange /trade_account trade_account_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
@@ -134,7 +136,7 @@ add_queues mall deliver
 add_queues mall mallOrder
 add_queues mall refund
 add_queues mall refundFeed
-add_queues msg_center_op notify_task 'arguments={"durable":true, "x-message-ttl":2592000000}'
+add_queues msg_center_op notify_task 'arguments={"x-message-ttl":2592000000}'
 add_queues mall appbackend_refresh 'arguments={"x-message-ttl":120000}'
 add_queues mall h5_refresh 'arguments={"x-message-ttl":120000}'
 add_queues mall refundFailedQueue
@@ -176,6 +178,7 @@ add_queues /user_register user_register_queue
 add_queues notify notify
 add_queues /clotho clotho_notify_record
 add_queues bt_data_visualization bt_data_visualization_queue
+add_queues /trade_account trade_account_queue
 #add_queues baitiao_zhitou btzt_orderStatus_queue
 #add_queues baitiao_zhitou btzt_repay_rewrite_queue
 #add_queues baitiao_zhitou btzt_sendfund_queue
@@ -213,6 +216,7 @@ add_binding /loan_order loan_repay_status repay_status_urge repayment_status
 add_binding /loan_order loan_repay_status push_urge push_urge
 add_binding notify notify-control notify notify
 add_binding bt_data_visualization  bt_data_visualization_exchange  bt_data_visualization_queue  bt_data_visualization_queue
+add_binding /trade_account trade_account_exchange trade_account_queue tradeAccount-routing-key
 #add_binding baitiao_zhitou btzt_repay_rewrite_exc order_approval_query_queue btzt_repay_rewrite_route
 #add_binding baitiao_zhitou order_approval_query_exchange  order_approval_query_queue order_approval_query_routing
 #add_binding baitiao_zhitou delay_order_approval_query_exchange delay_order_approval_query_queue delay_order_approval_query_routing

qa_shell_script/rabbitmq/restart_mq.sh

 #/bin/bash
 /usr/lib/rabbitmq/bin/rabbitmqctl stop
-sleep 10
+sleep 2
 /usr/lib/rabbitmq/bin/rabbitmq-server -detached