修改和优化

android_package.sh

@@ -4,7 +4,7 @@ BUILD_ENV=$(echo $1 | tr '[a-z]' '[A-Z]')
 BUILD_TYPE="$(echo ${2:0:1} | tr '[a-z]' '[A-Z]')$(echo ${2:1} | tr '[A-Z]' '[a-z]')"
 
 # yes or no
-DD_MESSAGE=$(echo $3 | tr '[A-Z]' '[a-z]')
+DD_PUSH=$(echo $3 | tr '[A-Z]' '[a-z]')
 
 if [ ! -n "${BUILD_ENV}" ] ;then
     echo "入参 'BUILD_ENV' 有误！"
@@ -16,8 +16,8 @@ if [ ! -n "${BUILD_TYPE}" ] ;then
     exit 1
 fi
 
-if [ ! -n "${DD_MESSAGE}" ] ;then
-    echo "入参 'DD_MESSAGE' 有误！"
+if [ ! -n "${DD_PUSH}" ] ;then
+    echo "入参 'DD_PUSH' 有误！"
     exit 1
 fi
 
@@ -50,4 +50,4 @@ cp -r ${SCRIPT_PATH}/apk_script ${WORKSPACE}
 # 修改环境文件
 cp -r ${WORKSPACE}/app/src/main/res/values/ccbpi_env/${BUILD_ENV}.xml ${WORKSPACE}/app/src/main/res/values/ccbpi.xml
 
-sh ${WORKSPACE}/apk_script/auto_package_apk.sh ${BUILD_ENV} ${BUILD_TYPE} ${PGY_API_KEY} ${PGY_USER_KEY} ${DD_HOST_URL} ${DD_MESSAGE}
+sh ${WORKSPACE}/apk_script/auto_package_apk.sh ${BUILD_ENV} ${BUILD_TYPE} ${PGY_API_KEY} ${PGY_USER_KEY} ${DD_HOST_URL} ${DD_PUSH}

apk_script/auto_push_ding_talk.py

@@ -33,13 +33,19 @@ def get_pgy_pwd():
     return sys.argv[7]
     pass
 
+def get_pgy_message():
+    return sys.argv[8]
+    pass
+
 def get_request_params_str():
     
     app_env = get_app_env()
 
     app_pwd = get_pgy_pwd()
 
-    message = app_env + " 已更新" + " 密码:" + app_pwd
+    app_message = get_pgy_message()
+
+    message = app_env + " 已更新" + " 密码:" + app_pwd + " " + app_message
     
     print message
 

apk_script/auto_upload_pgy.sh

@@ -23,6 +23,7 @@ EBIZ_APP_Build_Version=$3
 PGY_API_KEY=$4
 PGY_USER_KEY=$5
 DD_HOST_URL=$6
+DD_MESSAGE=$7"."
 CURRENT_DIR=$(cd "$(dirname "$0")"; pwd)
 PROJECT_PATH=$(dirname $(cd "$(dirname "$0")"; pwd))
 
@@ -38,7 +39,7 @@ fi
 
 PGY_UPLOAD_SERVER="https://qiniu-storage.pgyer.com/apiv1/app/upload"
 PGY_password="$(($RANDOM%9999+1111))"
-PGY_upload_log="${EBIZ_ENV}_${NOW}"
+PGY_upload_log="${EBIZ_ENV}_${NOW},${DD_MESSAGE}"
 
 # 推送到钉钉机器人时显示打包的版本号
 APK_INFO=$(aapt d badging $EBIZ_APK_PATH | grep package)
@@ -70,7 +71,7 @@ fi
 
 # (以上调试完成后，再打开以下注释)
 if [ $# -eq 6 ]; then    
-    python ${CURRENT_DIR}/auto_push_ding_talk.py ${EBIZ_Version} ${EBIZ_APP_Name} ${EBIZ_ENV} ${DD_ICON_URL//\"/} ${DD_DOWN_URL//\"/} ${DD_HOST_URL} ${PGY_password}
+    python ${CURRENT_DIR}/auto_push_ding_talk.py ${EBIZ_Version} ${EBIZ_APP_Name} ${EBIZ_ENV} ${DD_ICON_URL//\"/} ${DD_DOWN_URL//\"/} ${DD_HOST_URL} ${PGY_password} ${DD_MESSAGE}
 fi