95549

apk_script/auto_package_apk.sh

@@ -34,8 +34,8 @@ echo_log "======================================="
 
 
 # 打包命令
 # 打包命令
 cd ${PROJECT_DIR}
 cd ${PROJECT_DIR}
-# gradle clean
-# gradle assemble${BUILD_ENV}${BUILD_TYPE}
+gradle clean
+gradle assemble${BUILD_ENV}${BUILD_TYPE}
 
 
 JKS_PATH=($(find ${PROJECT_DIR} -name *.jks))
 JKS_PATH=($(find ${PROJECT_DIR} -name *.jks))
 APK_PATH=($(find ${PROJECT_DIR}/app/build -name *.apk))
 APK_PATH=($(find ${PROJECT_DIR}/app/build -name *.apk))

apk_script/auto_upload_pgy.sh

@@ -36,7 +36,7 @@ if [ "$?" -ne "0" ]; then
     exit 1
     exit 1
 fi
 fi
 
 
-PGY_UPLOAD_SERVER="https://qiniu-storage.pgyer.com/apiv1/app/upload"
+PGY_UPLOAD_SERVER="https://api.pgyer.com/apiv2/app/upload"
 # PGY_password="$(($RANDOM%9999+1111))"
 # PGY_password="$(($RANDOM%9999+1111))"
 PGY_password="95549"
 PGY_password="95549"
 PGY_upload_log="${EBIZ_ENV}_${NOW},${DD_MESSAGE}"
 PGY_upload_log="${EBIZ_ENV}_${NOW},${DD_MESSAGE}"
@@ -57,11 +57,12 @@ EBIZ_Version="${VERSION}(${EBIZ_APP_Build_Version})"
 # echo_log ${PGY_password}
 # echo_log ${PGY_password}
 
 
 # 上传到蒲公英，并接收 Response
 # 上传到蒲公英，并接收 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}`
+PGY_RESPONSE=`curl -F "file=@/${EBIZ_APK_PATH}" -F _api_key=${PGY_API_KEY} -F buildType=apk -F buildInstallType=2 -F buildPassword=${PGY_password} -F "buildUpdateDescription=${PGY_upload_log}" ${PGY_UPLOAD_SERVER}`
 RESPONSE=${PGY_RESPONSE//\\n/}
 RESPONSE=${PGY_RESPONSE//\\n/}
 
 
+echo_log "${RESPONSE}"
 RESPONSE_CODE=$(echo $RESPONSE | jq '.code')
 RESPONSE_CODE=$(echo $RESPONSE | jq '.code')
-DD_ICON_URL=$(echo $RESPONSE | jq '.data.appIcon')/120
+DD_ICON_URL=$(echo $RESPONSE | jq '.data.appIcon')
 DD_DOWN_URL=$(echo $RESPONSE | jq '.data.appShortcutUrl')
 DD_DOWN_URL=$(echo $RESPONSE | jq '.data.appShortcutUrl')
 
 
 if [ $RESPONSE_CODE -ne 0 ]; then
 if [ $RESPONSE_CODE -ne 0 ]; then