Merge branch 'master' of http://gitabc.xyqb.com/QA/qa-deploy-utils

qa_shell_script/app/XyqbAndroidBuild.sh

+#!/bin/bash
+
+project_path=/home/quant_group/jenkins/workspace/XyqbAndroidBuild
+target_file=${project_path}/app/build.gradle
+store_path=/home/ganshc/
+source_file=${store_path}/build.gradle
+buildapk_path=/home/quant_group/jenkins/workspace/XyqbAndroidBuild/build/archives
+branch_name=$1
+product_flavors=$2
+
+
+cd ${project_path}
+
+if [ -z ${branch_name} ]; then
+    echo "checkout default branch master"
+    git pull
+else
+    echo "checkout specified branch ${branch_name}"
+    which git
+    git checkout ${branch_name}
+    if [ $? = 0 ]; then
+    	echo "checkout branch $1 is ok".
+        git pull
+    else
+    	echo "Fail to checkout branch ${branch_name}".
+    	exit -1
+    fi 
+fi
+
+echo "copy file to app"
+
+cp -r ${source_file} ${target_file}
+
+echo "gradle build start"
+
+gradle clean resguard  --stacktrace --debug
+
+echo "rename apk"
+
+cd ${buildapk_path}
+
+cp *${product_flavors}.apk /home/quant_group/jenkins/workspace/XyqbAndroidBuild/apk/${branch_name}_${product_flavors}.apk
+
+echo "upload apk to pugongyin"
+
+curl -F "file=@/home/quant_group/jenkins/workspace/XyqbAndroidBuild/apk/${branch_name}_${product_flavors}.apk" -F "uKey=13d17385c02ea9ea994d0c985d87ff32" -F "_api_key=5b09af98d5a8ff43f2f39935fa6bfbc1" https://static.pgyer.com/app/qrcode/lJrv
+

qa_shell_script/config_server/get_project_config.js

@@ -84,10 +84,11 @@ new pClass().init(true, "ui", "7043", "xyqb-user-ui", "head_group", null, "src/a
 new pClass().init(true, "ui", "7039", "merchant-op-ui", "QG", null, "src/js/env.config.js", "npm run build", "node7", 1, "商户系统-ui","");
 new pClass().init(true, "ui", "7004", "di-ting-ui", "QG", null, "client/app/config.js", "grunt build", "node7", 1, "信审-ui","");
 new pClass().init(true, "ui", "7020", "spider-center-ui", "QG", null, "src/app/config/env.config.js", "npm run qa", "node7", 1, "授信中心-ui","");
-new pClass().init(true, "ui", "7002", "qgbc-ui", "QG", null, "src/app/config/env.config.js", "npm run build_production", "node7", 1, "现金贷和白条-白条-ui","");
+new pClass().init(true, "ui", "7002", "qgbc-ui", "QG", null, "src/app/config/env.config.js", "npm run build_production", "node7", 1, "白条-ui","");
 new pClass().init(true, "ui", "7001", "xyqb-ui", "QG", null, "client/app/config.js", "grunt build", "node4", 1, "现金贷和白条-现金贷-ui","");
 new pClass().init(true, "ui", "7046", "activity-op-ui", "QG", null, "src/js/env.config.js", "gulp build", "node7", 1, "优惠券管理后台-ui","");
 new pClass().init(true, "ui", "7048", "order-op-ui", "OP", null, "src/js/env.config.js", "gulp build", "node7", 1, "订单系统-ui","");
+new pClass().init(true, "ui", "7050", "bt-ui", "QG", null, "src/app/config/env.config.js", "npm run qa", "node7", 1, "新版白条-ui","");
 // node
 new pClass().init(true, "node", "7018", "AppBackend", "QG", null, "config/environment/test.js", "forever start -a -s --uid AppBackend bin/www", null, 1, "APP后台服务-server","","forever stop AppBackend");
 new pClass().init(true, "node", "7041", "activity-op", "QG", null, "src/config.js", "forever start -a -s --uid activity-op src/app.js", null, 1, "优惠券中心-server","","forever stop activity-op");

qa_shell_script/rabbitmq/initial_mq.sh

@@ -33,6 +33,7 @@ add_vhost spider_center
 add_vhost xyqb_push
 add_vhost bt_loan
 add_vhost baitiao_qrcode
+add_vhost bt_loan
 
 #add exchange
 add_exchange /  hello-exchange  direct
@@ -50,6 +51,8 @@ add_exchange xyqb_push  events  direct
 add_exchange bt_loan bt_loan_exchange direct
 add_exchange baitiao_debt baitiaodebt_orderinfo direct
 add_exchange baitiao_qrcode qrcode fanout
+add_exchange bt_loan_exchange driect
+
 
 #add queues
 add_queues /black_hole  contractQueue
@@ -87,4 +90,4 @@ add_queues mall refundFeed
 add_queues financial_system refundInfo
 add_queues bt_loan bt_loan_queue
 add_queues baitiao_debt save_redpacket
-
+add_queues bt_loan_queue