Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app/src/main/assets/updateLog.md

.github/scripts/lzy.sh

@@ -42,7 +42,7 @@ _UPLOAD() {
 	[[ $(du "${NAME_FILE}"|awk '{print $1}') -gt 100000000 ]] && _NOTICE "ERROR" "${NAME}文件大于 100MB！"
 	HTML_UPLOAD=$(curl --connect-timeout 120 -m 5000 --retry 2 -s -b "ylogin=${COOKIE_YLOGIN};phpdisk_info=${COOKIE_PHPDISK_INFO}" -H "${URL_UPLOAD}" -F "task=1" -F "id=WU_FILE_0" -F "folder_id=${FOLDER_ID}" -F "name=${NAME}" -F "upload_file=@${NAME_FILE}" "${URL_UPLOAD}"|grep '\\u4e0a\\u4f20\\u6210\\u529f')
 	[[ -z "${HTML_UPLOAD}" ]] && _NOTICE "ERROR" "${NAME}文件上传失败！"
-	echo -e "${INFO} 文件上传成功！[$(date '+%Y/%m/%d %H:%M')]"
+	echo -e "${INFO} 文件上传成功！[$(date -u -d '+8 hour' '+%Y-%m-%d %H:%M:%S')]"
 }
 
 

.github/workflows/legado.yml

@@ -72,12 +72,13 @@ jobs:
           do
            if [[ $f == *"apk" ]]; then
             file=$f
+            echo "文件:$file"
+            break
            fi
           done
-          version=${file:0-15:11}
-          echo $version
         
-          bash $GITHUB_WORKSPACE/.github/scripts/lzy.sh "legado_app_$version.apk" "$GITHUB_WORKSPACE/app/build/outputs/apk/app/release/legado_app_$version.apk" "${{ env.LANZOU_FOLDER_ID }}"
+          bash $GITHUB_WORKSPACE/.github/scripts/lzy.sh "$file" \
+          "$GITHUB_WORKSPACE/app/build/outputs/apk/app/release/$file" "${{ env.LANZOU_FOLDER_ID }}"
           echo "分享链接: https://kunfei.lanzous.com/b0f810h4b"
         env:
           LANZOU_ID: ${{ env.LANZOU_ID }}

app/src/main/assets/updateLog.md

@@ -5,7 +5,7 @@
 
 **2021/02/26**
 * 添加反转内容功能
-* 更新章节时如果没有目录url自动加载详情页
+* 更新章节时若无目录url将自动加载详情页
 * 添加变量nextChapterUrl
 * 订阅跳转外部应用时提示
 * 修复恢复bug