国华

apk_script/auto_package_apk.sh

@@ -26,12 +26,13 @@ PROJECT_DIR=$(dirname $(cd "$(dirname "$0")"; pwd))
 echo_log "============ config list =============="
 echo_log "1 build configuration = ${BUILD_ENV} ${BUILD_TYPE}"
 echo_log "2 workspace path = ${PROJECT_DIR}"
+echo_log "3 gradle assemble${BUILD_ENV}${BUILD_TYPE}"
 echo_log "======================================="
 
 # 打包命令
 cd ${PROJECT_DIR}
-gradle clean
-gradle assemble${BUILD_TYPE}
+# gradle clean
+# gradle assemble${BUILD_ENV}${BUILD_TYPE}
 
 APK_PATH=($(find ${PROJECT_DIR}/app/build -name *.apk))
 
@@ -40,6 +41,7 @@ APK_INFO=(${APK_INFO/ / })
 VERSION=(${APK_INFO[2]/=/ })
 BUILD_NUMBER=${VERSION[1]//\'/}
 
+echo_log "APK_PATH：${APK_PATH}"
 echo_log "===== 打包耗时：${SECONDS}s ====="
 
 # 上传到蒲公英 (以上调试完成后，再打开以下注释)
@@ -47,6 +49,4 @@ if [ "yes" == "$DD_PUSH" ]; then
 	sh ${PROJECT_DIR}/apk_script/auto_upload_pgy.sh ${APK_PATH} ${BUILD_ENV} ${BUILD_NUMBER} ${PGY_API_KEY} ${PGY_USER_KEY} ${DD_HOST_URL}
 else
 	sh ${PROJECT_DIR}/apk_script/auto_upload_pgy.sh ${APK_PATH} ${BUILD_ENV} ${BUILD_NUMBER} ${PGY_API_KEY} ${PGY_USER_KEY}
-fi
-
-
+fi
\ No newline at end of file

apk_script/auto_push_ding_talk.py

 #!/usr/bin/env python
 #-*- coding: utf-8 -*-
 
-import urllib2
+import urllib.request
 import json
 import sys
 
 def get_app_version():
-    return sys.argv[1]
+    return sys.argv[0]
     pass
 
 def get_app_name():
-    return sys.argv[2]
+    return sys.argv[1]
     pass
 
 def get_app_env():
-    return sys.argv[3]
+    return sys.argv[2]
     pass
 
 def get_dd_icon():
-    return sys.argv[4]
+    return sys.argv[3]
     pass
 
 def get_dd_url():
-    return sys.argv[5]
+    return sys.argv[4]
     pass
     
 def get_dd_host():
-    return sys.argv[6]
+    return sys.argv[5]
     pass
 
 def get_pgy_pwd():
-    return sys.argv[7]
+    return sys.argv[6]
     pass
 
 def get_request_params_str():
@@ -40,8 +40,6 @@ def get_request_params_str():
     app_pwd = get_pgy_pwd()
 
     message = app_env + " 已更新" + " 密码:" + app_pwd
-    
-    print message
 
     app_version = get_app_version()
 
@@ -62,22 +60,21 @@ def get_request_params_str():
             "messageUrl": dd_url
         }
     }
-    return json.dumps(params)  #python obj   to json(str)
+    return json.dumps(params)  #python obj to json(str)
     pass
 
 def send_ding_talk_request():
-    # NOTE: host_url 来自钉钉群的设置
-    #host_url = "https://oapi.dingtalk.com/robot/send?access_token=fdbcec56ec4e6066a6ebb76b5c5cb0ba017d3db67adb7d04cdda9d25beea2d56"
     host_url = "https://oapi.dingtalk.com/robot/send?access_token=" + get_dd_host()
-
-    req = urllib2.Request(host_url)
+    req = urllib.request.Request(host_url)
     req.add_header('Content-Type', 'application/json')
-
+    
     params_str = get_request_params_str()
-    # print params_str
+    # print(params_str)
 
-    response = urllib2.urlopen(req, params_str)
-    # print response.read()
+    print(host_url)
+    
+    response = urllib.request.urlopen(req, params_str.encode('utf-8'))
+    print(response.read().decode('utf-8'))
     pass
 
 send_ding_talk_request()

apk_script/auto_upload_pgy.sh

@@ -51,9 +51,9 @@ APK_INFO=(${APK_INFO/:/ })
 EBIZ_APP_Name=${APK_INFO[1]//\'/}
 EBIZ_Version="${VERSION}(${EBIZ_APP_Build_Version})"
 
-echo_log ${EBIZ_APP_Name}
-echo_log ${EBIZ_Version}
-echo_log ${PGY_password}
+# echo_log ${EBIZ_APP_Name}
+# echo_log ${EBIZ_Version}
+# 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}`
@@ -69,8 +69,9 @@ if [ $RESPONSE_CODE -ne 0 ]; then
 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}
+if [ $# -eq 6 ]; then
+    echo "${EBIZ_Version} ${EBIZ_APP_Name} ${EBIZ_ENV} ${DD_ICON_URL//\"/} ${DD_DOWN_URL//\"/} ${DD_HOST_URL} ${PGY_password}"
+    python3 ${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