Merge branch 'master' of http://git.quantgroup.cn/QA/qa-deploy-utils

	修改：     qa_shell_script/config_server/get_project_config.js

qa_shell_script/2_get_code_by_name.sh

@@ -54,6 +54,12 @@ else
 	git_path=`node $config_server/get_project_config.js  -name $project_name -attr git_path`
 	echo "git clone $git_path"
 	git clone $git_path
+	if [ $? = 0 ];then
+		echo "clone project $project_name ok"
+	else
+		echo "Fail to clone project $project_name"
+		exit -1
+	fi
 	cd ./$project_name
 	if [ -n "$git_branch" ]; then
 		echo "checkout specified branch $git_branch"

qa_shell_script/app/XyqbAndroidBuild.sh

@@ -26,18 +26,17 @@ cd ${project_path}
 function info(){
 
     echo ">>>>>>>>>>>>>>>>> [ info ] <<<<<<<<<<<<<<<"
-    echo "PROJECT_PATH      : $project_path"
-    echo ":ADNROID_HOME     : $ANDROID_HOME"
-    echo ":PATH             : $PATH"
-    echo ":USER             : $USER"
+    echo "|PROJECT_PATH     : $project_path"
+    echo "|PATH             : $PATH"
+    echo "|USER             : $USER"
     echo "------------------------------------------"
-    echo ":apk_version      : $apk_version"
-    echo ":git_branch       : $git_branch"
-    echo ":product_flavors  : $product_flavors"
-    echo ":build_time       : $build_time"
-    echo ":test_server      : $test_server"
-    echo ":apk_type         : $apk_type"
-    echo ":need_upload      : $need_upload"
+    echo "|apk_version      : $apk_version"
+    echo "|git_branch       : $git_branch"
+    echo "|product_flavors  : $product_flavors"
+    echo "|build_time       : $build_time"
+    echo "|test_server      : $test_server"
+    echo "|apk_type         : $apk_type"
+    echo "|need_upload      : $need_upload"
     echo "^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^"
 }
 
@@ -65,10 +64,11 @@ function get_code()
 
 function replace_config()
 {
+    echo ">>>>>>>>>>>>>>>>> [ replace_config ] <<<<<<<<<<<<<<<"
     if [ -f ${BuildGradle_file} ];then
-        echo "正在替换配置文件，请稍后......"
-        sed -i "s/apply plugin\: 'newlens'/\/\/apply plugin\: 'newlens'/g" ${BuildGradle_file}
-        sed -i "s/artifact = 'com.tencent.mm:SevenZip:1.1.13'/\/\/artifact = 'com.tencent.mm:SevenZip:1.1.13'/g" ${BuildGradle_file}
+        echo "|正在替换配置文件，请稍后......"
+        #sed -i "s/apply plugin\: 'newlens'/\/\/apply plugin\: 'newlens'/g" ${BuildGradle_file}
+        #sed -i "s/artifact = 'com.tencent.mm:SevenZip:1.1.13'/\/\/artifact = 'com.tencent.mm:SevenZip:1.1.13'/g" ${BuildGradle_file}
         #sed -i "s/\/\/path = \"\/usr\/local\/bin\/7za\"/path = \"\/usr\/local\/p7zip_9.20.1\/bin\/7za\"/g" ${BuildGradle_file}
         sed -i "s#https://sappbackend.xyqb.com/#http://${test_server}/#g" ${Constant_file}
         

qa_shell_script/config_server/get_project_config.js

@@ -141,9 +141,9 @@ new pClass().init(1,true, "ui", "7070", "", "customer-op-ui", "ui", null, "src/c
 new pClass().init(1,true, "ui", "7075", "", "business-op-ui", "ui", null, "src/config/env.config.js", "npm run build", "node7", 1, "商城结算系统-ui", "王丽英", "", "");
 new pClass().init(1,true, "ui", "7077", "", "cuishou-ui-new", "data", null, "src/Config/config.jsx", "npm run dist", "node7", 1, "催收系统-ui", "李斌", "", "");
 new pClass().init(1,true, "ui", "7078", "", "ka-factory-ui", "ui", null, "src/config/env.config.js", "npm run build", "node7", 1, "KA工厂-ui", "张振武", "", "");
-new pClass().init(1,true, "ui", "7080", "", "new-mall-ui", "ui", null, "src/app/config/env.config.js", "npm run qa", "node7", 1, "微信商城-ui", "郑少文，周珊", "", "");
 new pClass().init(1,true, "ui", "7064", "statistics-op", "statistics-op-ui", "ui", null, "src/app/config/env.config.js", "npm run qa", "node7", 1, "流量统计平台-ui", "刘威", "", "");
 
+new pClass().init(1,true, "ui", "7080", "", "new-mall-ui", "ui", null, "src/config/env.config.js", "npm run qa", "node7", 1, "微信商城-ui", "郑少文，周珊", "", "");
 // node
 new pClass().init(1,true, "node", "7018", "sappbackend", "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(1,true, "node", "7041", "", "activity-op", "QG", null, "src/dev.config.js", "sh start.sh", null, 1, "优惠券中心-server", "", "sh stop.sh", "");

qa_shell_script/script_by_Contorller/baitiao_delete_order.sh

@@ -18,33 +18,33 @@ else
 user_id_sql="select id from user where phone_no='${phone_no}'"
 echo $user_id_sql
 user_id=`mysql -N $mysqld xyqb_user -e "${user_id_sql}"`
-echo "user_id=$user_id"
+#echo "user_id=$user_id"
 order_id_sql="select id  from baitiao_order where user_id=${user_id} LIMIT 1";
-echo $order_id_sql
+#echo $order_id_sql
 order_id=`mysql -N $mysqld xyqb -e "${order_id_sql}"`
-echo "order_id=${order_id}"
+#echo "order_id=${order_id}"
 fund_id_sql="SELECT id from xyqb.baitiao_fund_order WHERE order_id=${order_id} limit 1";
-echo $fund_id_sql
+#echo $fund_id_sql
 fund_id=`mysql -N $mysqld xyqb -e "${fund_id_sql}"`
-echo "fund_id=$fund_id"
+#echo "fund_id=$fund_id"
 
 delete1="delete from baitiao_order where xyqb.baitiao_order.user_id=${user_id}";
-echo $delete1;
+#echo $delete1;
 mysql -N $mysqld xyqb -e "${delete1}"
 delete2="delete from baitiao_fund_order where xyqb.baitiao_fund_order.order_id=${order_id}";
-echo $delete2;
+#echo $delete2;
 mysql -N $mysqld xyqb -e "${delete2}"
 delete3="delete from baitiao_bill where xyqb.baitiao_bill.user_id=${user_id}";
-echo $delete3;
+#echo $delete3;
 mysql -N $mysqld xyqb -e "${delete3}"
 delete4="delete from baitiao_bill_repayment_plan where xyqb.baitiao_bill_repayment_plan.user_id=${user_id}";
-echo $delete4;
+#echo $delete4;
 mysql -N $mysqld xyqb -e "${delete4}"
 delete5="delete from baitiao_fund_repayment_plan where baitiao_fund_repayment_plan.fund_order_id=${fund_id}";
-echo $delete5
+#echo $delete5
 mysql -N $mysqld xyqb -e "${delete5}"
 delete6="delete from baitiao_consume_history where baitiao_consume_history.user_id=${user_id} and baitiao_consume_history.order_id !=-1";
-echo $delete6;
+#echo $delete6;
 mysql -N $mysqld xyqb -e "${delete6}"
 
 echo "done!!! `date`" 

qa_shell_script/script_by_Contorller/baitiao_zhangdan.sh

@@ -105,6 +105,6 @@ date_now=`date "+%Y-%m-%d %H:%M:%S"`
 
 			done
 		fi;
-
+     echo "done ! successful ! `date`"
   }
  baitiao_bill $ip $phone_no $bill_num

qa_shell_script/script_by_Contorller/redpacket_coupon.sh

 #!/bin/bash
+set -e
 ip=$1
 phone_no=$2
 coupon_type=$3 # 1-友宝满减券;2-商城购物满减券;3-商城购物折扣券;4-商城购物实物折扣券;5-商城购物实物满减券;6-商城购物充值折扣券;7-现金贷还款折扣券;8-现金贷还款抵扣券;9-现金贷还款免息券;10-白条购物满减券;11-外部白条满减券（深圳通）
@@ -26,78 +27,134 @@ case "$coupon_type" in
 coupon_1="INSERT INTO redpacket.tb_coupon ( unique_business_id, phone, group_id, name, category, category_info, category_type, category_type_info, valid_start_date, valid_end_date, sms_reminder_on_invalid, status, created_at, used_at, updated_at, mark, uid)
 VALUES (concat('MALL20170626111210457af1ec45g',NOW()), '$phone_no', '10000572', '友宝优惠券', '9', '{\"firstChannel\":\"2\"}', '1', '{\"full\":200,\"cut\":5}', NOW(),'2028-09-24 23:59:00', '0', '2', NOW(), NULL, NOW(), '2', '26364792')"
 mysql -h${HOSTNAME} -p${PORT} -u${USERNAME} -p${PASSWORD}  ${DBNAME} -e"set names utf8; ${coupon_1}"
-
-echo "友宝满减券新增成功！！！"
+return=$?
+if [ "$return" = "0" ];then
+	echo "友宝满减券新增成功！！！"
+else
+	echo "友宝满减券新增失败！！！"
+fi
 ;;
 
 2)
 coupon_2="INSERT INTO redpacket.tb_coupon (unique_business_id, phone, group_id, name, category, category_info, category_type, category_type_info, valid_start_date, valid_end_date, sms_reminder_on_invalid, status, created_at, used_at, updated_at, mark, uid) 
 VALUES ( concat('MALL20171109161159417a4d41cg1',NOW()), '$phone_no', '10000669', '商城购物满减券', '6', '{\"firstChannel\":1,\"channelId\":[]}', '1', '{\"full\":\"100\",\"cut\":\"5\"}', NOW(), '2028-09-24 23:59:00','0', '2', NOW(), NULL, NOW(), NULL, '1000033')"
 mysql -h${HOSTNAME} -p${PORT} -u${USERNAME} -p${PASSWORD}  ${DBNAME} -e"set names utf8; ${coupon_2}" 
-echo "商城购物满减券增加成功"
+return=$?
+if [ "$return" = "0" ];then
+	echo "商城购物满减券增加成功！！！"
+else
+	echo "商城购物满减券增加失败！！！"
+fi
 ;;
 
  3)
 coupon_3="INSERT INTO redpacket.tb_coupon (unique_business_id, phone, group_id, name, category, category_info, category_type, category_type_info, valid_start_date, valid_end_date, sms_reminder_on_invalid, status, created_at, used_at, updated_at, mark, uid) 
 VALUES ( concat('MALL20171109161216046a1f635gd',NOW()), '$phone_no', '10000670', '商城购物折扣券', '6', '{\"firstChannel\":1,\"channelId\":[]}', '2', '{\"discount\":\"5\"}', NOW(),'2028-09-24 23:59:00', '0', '2', NOW(), NULL, NOW(), NULL, '1000033')"
 mysql -h${HOSTNAME} -p${PORT} -u${USERNAME} -p${PASSWORD}  ${DBNAME} -e"set names utf8; ${coupon_3}" 
-echo "商城购物折扣券增加成功"
+return=$?
+if [ "$return" = "0" ];then
+	echo "商城购物折扣券增加成功！！！"
+else
+	echo "商城购物折扣券增加失败！！！"
+fi
 ;;
 
 4)
 coupon_4="INSERT INTO redpacket.tb_coupon (unique_business_id, phone, group_id, name, category, category_info, category_type, category_type_info, valid_start_date, valid_end_date, sms_reminder_on_invalid, status, created_at, used_at, updated_at, mark, uid) 
 VALUES ( concat('MALL20171109161216046a1f635gd',NOW()), '$phone_no', '10000679', '商城购物实物折扣券', '6', '{\"firstChannel\":3,\"channelId\":[]}', '2', '{\"discount\":8}', NOW(), '2028-09-24 23:59:00', '0', '2', NOW(), NULL, NOW(), NULL, '1000033')"
 mysql -h${HOSTNAME} -p${PORT} -u${USERNAME} -p${PASSWORD}  ${DBNAME} -e"set names utf8; ${coupon_4}" 
-echo "商城购物实物折扣券增加成功"
+return=$?
+if [ "$return" = "0" ];then
+	echo "商城购物实物折扣券增加成功！！！"
+else
+	echo "商城购物实物折扣券增加失败！！！"
+fi
 ;;
 
 5)
 coupon_5="INSERT INTO redpacket.tb_coupon ( unique_business_id, phone, group_id, name, category, category_info, category_type, category_type_info, valid_start_date, valid_end_date, sms_reminder_on_invalid, status, created_at, used_at, updated_at, mark, uid) 
 VALUES ( concat('MALL2017110917061815515d71558',NOW()), '$phone_no', '10000678', '商城购物实物满减券', '6', '{\"firstChannel\":3,\"channelId\":[]}', '1', '{\"full\":100,\"cut\":5}',NOW(),'2028-09-24 23:59:00', '0', '2', NOW(), NULL, NOW(), NULL, '1000033');"
 mysql -h${HOSTNAME} -p${PORT} -u${USERNAME} -p${PASSWORD}  ${DBNAME} -e"set names utf8; ${coupon_5}" 
-echo "商城购物实物满减券增加成功"
+return=$?
+if [ "$return" = "0" ];then
+	echo "商城购物实物满减券增加成功！！！"
+else
+	echo "商城购物实物满减券增加失败！！！"
+fi
 ;;
 
 6)
 coupon_6="INSERT INTO redpacket.tb_coupon (unique_business_id, phone, group_id, name, category, category_info, category_type, category_type_info, valid_start_date, valid_end_date, sms_reminder_on_invalid, status, created_at, used_at, updated_at, mark, uid) 
 VALUES ( concat('MALL201711091706293642335f562',NOW()), '$phone_no', '10000677', '商城购物充值折扣券', '6', '{\"firstChannel\":2,\"channelId\":[]}', '2', '{\"discount\":8}', NOW(),'2028-09-24 23:59:00', '0', '2', NOW(), NULL, NOW(), NULL, '1000033')"
 mysql -h${HOSTNAME} -p${PORT} -u${USERNAME} -p${PASSWORD}  ${DBNAME} -e"set names utf8; ${coupon_6}" 
-echo "商城购物充值折扣券增加成功"
+return=$?
+if [ "$return" = "0" ];then
+	echo "商城购物充值折扣券增加成功！！！"
+else
+	echo "商城购物充值折扣券增加失败！！！"
+fi
 ;;
 
 7)
 coupon_7="INSERT INTO redpacket.tb_coupon (unique_business_id, phone, group_id, name, category, category_info, category_type, category_type_info, valid_start_date, valid_end_date, sms_reminder_on_invalid, status, created_at, used_at, updated_at, mark, uid) 
 VALUES ( concat('CASH_LOAN2017102419394902108ea8623',NOW()), '$phone_no', '10000649', '现金贷还款折扣券', '8', '{\"loanTerm\":[1,2,3]}', '2', '{\"discount\":8.8}', NOW(),'2028-09-24 23:59:00','0', '2', NOW(), NULL, NOW(), NULL, '5')"
 mysql -h${HOSTNAME} -p${PORT} -u${USERNAME} -p${PASSWORD}  ${DBNAME} -e"set names utf8; ${coupon_7}" 
-echo "现金贷还款折扣券增加成功"
+return=$?
+if [ "$return" = "0" ];then
+	echo "现金贷还款折扣券增加成功！！！"
+else
+	echo "现金贷还款折扣券增加失败！！！"
+fi
 ;;
 
 8)
 coupon_8="INSERT INTO redpacket.tb_coupon ( unique_business_id, phone, group_id, name, category, category_info, category_type, category_type_info, valid_start_date, valid_end_date, sms_reminder_on_invalid, status, created_at, used_at, updated_at, mark, uid) 
 VALUES ( concat('CASH_LOAN20171109161259004ad216ge3',NOW()), '$phone_no', '10000672', '现金贷抵扣券', '8', '{\"loanTerm\":[1,2]}', '3', '{\"rebate\":\"100\"}', NOW(),'2028-09-24 23:59:00', '0', '2', NOW(), NULL, NOW(), NULL, '1000033')"
 mysql -h${HOSTNAME} -p${PORT} -u${USERNAME} -p${PASSWORD}  ${DBNAME} -e"set names utf8; ${coupon_8}" 
-echo "现金贷抵扣券增加成功"
+return=$?
+if [ "$return" = "0" ];then
+	echo "现金贷抵扣券增加成功！！！"
+else
+	echo "现金贷抵扣券增加失败!!!"
+fi
 ;;
 
 9)
 coupon_9="INSERT INTO redpacket.tb_coupon ( unique_business_id, phone, group_id, name, category, category_info, category_type, category_type_info, valid_start_date, valid_end_date, sms_reminder_on_invalid, status, created_at, used_at, updated_at, mark, uid) 
 VALUES (concat('CASH_LOAN2017110916134482203d783ga',NOW()), '$phone_no', '10000673', '现金贷还款免息券', '8', '{\"loanTerm\":[1,2]}', '4', '{}', NOW(), '2028-09-24 23:59:00', '0', '2', NOW(), NULL, NOW(), NULL, '1000033')"
 mysql -h${HOSTNAME} -p${PORT} -u${USERNAME} -p${PASSWORD}  ${DBNAME} -e"set names utf8; ${coupon_9}" 
-echo "现金贷还款免息券增加成功"
+return=$?
+if [ "$return" = "0" ];then
+	echo "现金贷还款免息券增加成功！！！"
+else
+	echo "现金贷还款免息券增加失败"
+fi
 ;;
 
 10)
 coupon_10="INSERT INTO redpacket.tb_coupon ( unique_business_id, phone, group_id, name, category, category_info, category_type, category_type_info, valid_start_date, valid_end_date, sms_reminder_on_invalid, status, created_at, used_at, updated_at, mark, uid) 
 VALUES (concat('OUT_BAITIAO201711091613599425d5e345g',NOW()), '$phone_no', '10000674', '白条购物券满减券', '9', '{\"firstChannel\":1}', '1', '{\"full\":\"100\",\"cut\":\"50\"}', NOW(),'2028-09-24 23:59:00', '0', '2', NOW(), NULL, NOW(), NULL, '1000033')"
 mysql -h${HOSTNAME} -p${PORT} -u${USERNAME} -p${PASSWORD}  ${DBNAME} -e"set names utf8; ${coupon_10}" 
-echo "白条购物券满减券增加成功"
+return=$?
+if [ "$return" = "0" ];then
+	echo "白条购物券满减券增加成功！！！"
+else
+	echo "白条购物券满减券增加失败！！！"
+fi
 ;;
 
 11)
 coupon_11="INSERT INTO redpacket.tb_coupon ( unique_business_id, phone, group_id, name, category, category_info, category_type, category_type_info, valid_start_date, valid_end_date, sms_reminder_on_invalid, status, created_at, used_at, updated_at, mark, uid) 
 VALUES ( concat('OUT_BAITIAO201711091614166796e01b39g',NOW()), '$phone_no', '10000675', '深圳通白条购物券满减券', '9', '{\"firstChannel\":2}', '1', '{\"full\":\"100\",\"cut\":\"5\"}',NOW(), '2028-09-24 23:59:00', '0', '2', NOW(), NULL, NOW(), NULL, '1000033')"
 mysql -h${HOSTNAME} -p${PORT} -u${USERNAME} -p${PASSWORD}  ${DBNAME} -e"set names utf8; ${coupon_11}" 
-echo "深圳通白条购物券满减券增加成功"
+return=$?
+if [ "$return" = "0" ];then
+	echo "深圳通白条购物券满减券增加成功！！！"
+else
+	echo "深圳通白条购物券满减券增加失败！！1"
+fi
+;;
+*)
+echo "优惠券类型请输入1~11"
 ;;
-
 esac