From 0f736c810f1cc962c5c7c161c0e75abff0fdd320 Mon Sep 17 00:00:00 2001 From: Celeter <48249130+Celeter@users.noreply.github.com> Date: Sat, 27 Feb 2021 21:39:26 +0800 Subject: [PATCH 1/4] Update legado.yml --- .github/workflows/legado.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/legado.yml b/.github/workflows/legado.yml index f16a37d33..f9f81b192 100644 --- a/.github/workflows/legado.yml +++ b/.github/workflows/legado.yml @@ -72,14 +72,15 @@ 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 }} LANZOU_PSD: ${{ env.LANZOU_PSD }} + From 2999d8aabf6e12e9ba1325b4d133d12751cf668a Mon Sep 17 00:00:00 2001 From: Celeter <48249130+Celeter@users.noreply.github.com> Date: Sat, 27 Feb 2021 21:47:34 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E6=94=B9=E6=88=90=E4=B8=9C=E5=85=AB=E5=8C=BA=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/scripts/lzy.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/scripts/lzy.sh b/.github/scripts/lzy.sh index ae4848bdb..037e0610a 100644 --- a/.github/scripts/lzy.sh +++ b/.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')]" } From 253dde8374b7e4c217872f85a6ba7aa53d44bcba Mon Sep 17 00:00:00 2001 From: Celeter <48249130+Celeter@users.noreply.github.com> Date: Sat, 27 Feb 2021 21:50:39 +0800 Subject: [PATCH 3/4] Update legado.yml --- .github/workflows/legado.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/legado.yml b/.github/workflows/legado.yml index f9f81b192..c5de90a93 100644 --- a/.github/workflows/legado.yml +++ b/.github/workflows/legado.yml @@ -77,10 +77,10 @@ jobs: fi done - bash $GITHUB_WORKSPACE/.github/scripts/lzy.sh "$file" "$GITHUB_WORKSPACE/app/build/outputs/apk/app/release/$file" "${{ 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 }} LANZOU_PSD: ${{ env.LANZOU_PSD }} - From 491f7175d3c04de9dd3bcc1bf4a424671e960a72 Mon Sep 17 00:00:00 2001 From: Celeter <48249130+Celeter@users.noreply.github.com> Date: Sat, 27 Feb 2021 22:36:35 +0800 Subject: [PATCH 4/4] Update updateLog.md --- app/src/main/assets/updateLog.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/assets/updateLog.md b/app/src/main/assets/updateLog.md index f3d844c9d..73f65c705 100644 --- a/app/src/main/assets/updateLog.md +++ b/app/src/main/assets/updateLog.md @@ -5,7 +5,7 @@ **2021/02/26** * 添加反转内容功能 -* 更新章节是如果没有目录url自动加载详情页 +* 更新章节时若无目录url将自动加载详情页 * 添加变量nextChapterUrl * 订阅跳转外部应用时提示 * 修复恢复bug @@ -301,4 +301,4 @@ getTxtInFolder(unzipPath: String): String **2020/09/10** * 修复自动换源的bug * 修复保存主题的bug -* 书源排序，分享，注释优化 by [h11128](https://github.com/h11128) \ No newline at end of file +* 书源排序，分享，注释优化 by [h11128](https://github.com/h11128)