修改和优化

apk_script/auto_upload_pgy.sh

@@ -23,8 +23,6 @@ EBIZ_APP_Build_Version=$3
 PGY_API_KEY=$4
 PGY_USER_KEY=$5
 DD_HOST_URL=$6
-DD_ICON_URL=$7
-DD_DOWN_URL=$8
 CURRENT_DIR=$(cd "$(dirname "$0")"; pwd)
 PROJECT_PATH=$(dirname $(cd "$(dirname "$0")"; pwd))
 
@@ -59,11 +57,21 @@ echo_log ${PGY_password}
 
 # 上传到蒲公英，并接收 Response
 PGY_RESPONSE=`curl -F "file=@/${EBIZ_APK_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}`
+RESPONSE=${PGY_RESPONSE//\n/}
 
-# (以上调试完成后，再打开以下注释)
+RESPONSE_CODE=$(echo $RESPONSE | jq '.code')
+DD_ICON_URL=$(echo $RESPONSE | jq '.data.appIcon')/120
+DD_DOWN_URL=$(echo $RESPONSE | jq '.data.appShortcutUrl')
+
+if [ $RESPONSE_CODE -eq 0 ]; then
     
-if [ $# -eq 8 ]; 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}
+else
+    echo_error "upload error"
+    exit 1
+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}
 fi