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

db-utils/db_gen_config.sh

@@ -64,7 +64,7 @@ elif [[  $database_name = 'dujiangyan'  ]]; then
 	port='3310'
 elif [[  $database_name = 'mall'  ]]; then
 	# 白条商城
-	sys_table_list='mall_config activity_3c_product ad_detail new_3c_product supplier 3c_product 3c_product_spec apix_phone_recharge_detail apix_recharge_project apix_recharge_project_bak category configuration course_detail_info course_info merchant pay19_recharge_project mall_category product product_sku product_sku_image product_spu product_nature nature_value product_category spu_image product_nature_value'
+	sys_table_list='mall_config activity_3c_product ad_detail new_3c_product supplier 3c_product 3c_product_spec apix_phone_recharge_detail apix_recharge_project apix_recharge_project_bak category configuration course_detail_info course_info merchant pay19_recharge_project mall_category product product_sku product_sku_image product_spu product_nature nature_value product_category spu_image product_nature_value goods_after_sale_step goods_after_sale_config'
 	port='3310'
 elif [[  $database_name = 'qinqiong'  ]]; then
 	# qinqiong

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_gradlefile=${store_path}/build.gradle
-source_flavors=${store_path}/markets.txt
-buildapk_path=/home/quant_group/jenkins/workspace/XyqbAndroidBuild/build/archives
-branch_name=$1
-product_flavors=$2
-
-
-cd ${project_path}
-
-function get_code()
-{
-    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
-}
-
-function build_android()
-{
-    echo "拷贝可使用的gradle文件"
-    cp -r ${source_gradlefile} ${target_file}
-    if [[ ! -z ${product_flavors} ]]; then
-        echo "${product_flavors}" > ${project_path}/markets.txt
-    fi
-    rm -rf ${project_path}/apk/*
-    echo "开始使用gradle进行编译该版本的代码"
-    gradle clean resguard  --stacktrace --debug
-    if [ $? = 0 ]; then
-        echo "gradle build is ok".
-        echo "开始重命名对应的渠道包"
-        #apkfile="`find ${buildapk_path} -name "*${product_flavors}.apk"`"
-        #apkfile=`grep "${product_flavors}" *.apk`
-        apkfile=`ls ${buildapk_path} | grep "${product_flavors}"`
-        echo ${apkfile}
-        echo "当前路径"
-	cd ${buildapk_path}
-        pwd
-        mv ${apkfile} ${project_path}/apk/${branch_name}_${product_flavors}.apk
-    else
-        echo "Fail to build android".
-        exit -1
-    fi 
-}
-
-function upload_apk()
-{
-   echo "正在将apk上传到蒲公英，请等待......"
-   curl -F "file=@${project_path}/apk/${branch_name}_${product_flavors}.apk" -F "uKey=13d17385c02ea9ea994d0c985d87ff32" -F "_api_key=5b09af98d5a8ff43f2f39935fa6bfbc1" https://static.pgyer.com/app/qrcode/lJrv 
-}
-
-get_code
-
-build_android
-
-#upload_apk
-

sh-utils/center/database_backup.sh

@@ -45,7 +45,7 @@ elif [[  $database_name = 'dujiangyan'  ]]; then
 	port='3310'
 elif [[  $database_name = 'mall'  ]]; then
 	# 白条商城
-	sys_table_list='mall_config activity_3c_product ad_detail new_3c_product supplier 3c_product 3c_product_spec apix_phone_recharge_detail apix_recharge_project apix_recharge_project_bak category configuration course_detail_info course_info merchant pay19_recharge_project product product_sku product_sku_image product_spu product_nature nature_value'
+	sys_table_list='mall_config activity_3c_product ad_detail new_3c_product supplier 3c_product 3c_product_spec apix_phone_recharge_detail apix_recharge_project apix_recharge_project_bak category configuration course_detail_info course_info merchant pay19_recharge_project product product_sku product_sku_image product_spu product_nature nature_value goods_after_sale_step goods_after_sale_config'
 	port='3310'
 elif [[  $database_name = 'qinqiong'  ]]; then
 	# qinqiong