no message

ios_package.sh

 # PRD or DEV or UAT，与环境文件对应
 BUILD_ENV=$(echo $1 | tr '[a-z]' '[A-Z]')
 # yes or no
-DD_MESSAGE=$(echo $2 | tr '[A-Z]' '[a-z]')
+DD_PUSH=$(echo $2 | tr '[A-Z]' '[a-z]')
 
 
 if [ ! -n "${BUILD_ENV}" ] ;then
@@ -9,8 +9,8 @@ if [ ! -n "${BUILD_ENV}" ] ;then
     exit 1
 fi
 
-if [ ! -n "${DD_MESSAGE}" ] ;then
-    echo "入参 'DD_MESSAGE' 有误！"
+if [ ! -n "${DD_PUSH}" ] ;then
+    echo "入参 'DD_PUSH' 有误！"
     exit 1
 fi
 
@@ -51,4 +51,4 @@ BUILD_NUMBER=`/usr/libexec/PlistBuddy -c "Print CFBundleVersion" ${WORKSPACE}/${
 cp -r ${SCRIPT_PATH}/ipa_script ${WORKSPACE}
 cp -r ${WORKSPACE}/${IOS_SCHEME}/Config/Config-${BUILD_ENV}.plist ${WORKSPACE}/${IOS_SCHEME}/Config/Config.plist
 
-sh ${WORKSPACE}/ipa_script/auto_package_ipa.sh ${BUILD_ENV} ${BUILD_NUMBER} ${PGY_API_KEY} ${PGY_USER_KEY} ${DD_HOST_URL} ${DD_MESSAGE}
+sh ${WORKSPACE}/ipa_script/auto_package_ipa.sh ${BUILD_ENV} ${BUILD_NUMBER} ${PGY_API_KEY} ${PGY_USER_KEY} ${DD_HOST_URL} ${DD_PUSH}

ipa_script/auto_package_ipa.sh

@@ -50,7 +50,8 @@ readonly EBIZ_EXPORT_METHOD="development" # demo 项目没有 app id，打包方
 readonly PGY_API_KEY=$3
 readonly PGY_USER_KEY=$4
 readonly DD_HOST_URL=$5
-readonly DD_MESSAGE=$6
+readonly DD_PUSH=$6
+readonly DD_MESSAGE="更新内容：$7"
 
 function echo_log() {
     echo "${COLOR_Cyan}$1${COLOR_Default}"
@@ -108,8 +109,8 @@ echo "===== 包路径：${EBIZ_IPA_PATH} ====="
 # open ${OUTPUT_DIR}
 
 # 上传到蒲公英 (以上调试完成后，再打开以下注释)
-if [ "yes" == "$DD_MESSAGE" ]; then
-    sh ${PROJECT_DIR}/ipa_script/auto_upload_pgy.sh ${EBIZ_IPA_PATH} ${EBIZ_BUILD_ENV} ${EBIZ_BUILD_NUMBER} ${PGY_API_KEY} ${PGY_USER_KEY} ${DD_HOST_URL}
+if [ "yes" == "$DD_PUSH" ]; then
+    sh ${PROJECT_DIR}/ipa_script/auto_upload_pgy.sh ${EBIZ_IPA_PATH} ${EBIZ_BUILD_ENV} ${EBIZ_BUILD_NUMBER} ${PGY_API_KEY} ${PGY_USER_KEY} ${DD_HOST_URL} ${DD_MESSAGE}
 else
     sh ${PROJECT_DIR}/ipa_script/auto_upload_pgy.sh ${EBIZ_IPA_PATH} ${EBIZ_BUILD_ENV} ${EBIZ_BUILD_NUMBER} ${PGY_API_KEY} ${PGY_USER_KEY}
 fi

ipa_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 + "\n" + app_message
     
     print message
 

ipa_script/auto_upload_pgy.sh

@@ -28,6 +28,7 @@ EBIZ_BUILD_NUMBER=$3
 PGY_API_KEY=$4
 PGY_USER_KEY=$5
 DD_HOST_URL=$6
+DD_MESSAGE=$7
 
 if [ ! -n "${NOW}" ] ;then
     echo_error "auto-upload 入参 'now' 有误！"
@@ -56,7 +57,7 @@ PGY_UPLOAD_SERVER="https://qiniu-storage.pgyer.com/apiv1/app/upload"
 # read -p "请输入蒲公英更新 log:" pgy_upload_log
 # echo_log "更新 log 为：${pgy_upload_log}"
 PGY_password="$(($RANDOM%9999+1111))"
-PGY_upload_log="${EBIZ_ENV}_${NOW}"
+PGY_upload_log="${EBIZ_ENV}_${NOW}\n${DD_MESSAGE}"
 
 # 上传到蒲公英，并接收 Response
 PGY_RESPONSE=`curl -F "file=@/${EBIZ_IPA_PATH}" -F "uKey=${PGY_USER_KEY}" -F "_api_key=${PGY_API_KEY}" -F installType=2 -F password="${PGY_password}" -F "updateDescription=${PGY_upload_log}" ${PGY_UPLOAD_SERVER}`
@@ -83,8 +84,8 @@ echo_log ${PGY_password}
 
 # (以上调试完成后，再打开以下注释)
 
-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}
+if [ $# -ge 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} ${DD_MESSAGE}
 fi