From 9a3a008ac87e96f309b64dbb33fb8803b6961e57 Mon Sep 17 00:00:00 2001 From: cluntop <85211716+cluntop@users.noreply.github.com> Date: Thu, 12 Mar 2026 03:06:50 +0800 Subject: [PATCH] Update Up --- git.sh | 11 +++++------ js/聚合短剧.js | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/git.sh b/git.sh index 5dbb605b1..f750104f2 100755 --- a/git.sh +++ b/git.sh @@ -159,6 +159,7 @@ branch() { fi } +# 5. 提交 # 5. 提交 submit() { if ! check_git_repo; then return 1; fi @@ -171,13 +172,10 @@ submit() { curr=$(git branch --show-current) [ -z "$curr" ] && curr="main" - info_msg "1. 拉取更新..." - git pull origin "$curr" > /dev/null 2>&1 - - info_msg "2. 添加文件..." + info_msg "1. 添加文件..." git add . - info_msg "3. 提交推送..." + info_msg "2. 提交推送..." msg="Update Up" git commit -m "$msg" @@ -189,6 +187,7 @@ submit() { fi } + # 6. 状态 state() { [ -d ".git" ] && git status @@ -223,7 +222,7 @@ show_menu() { echo -e "位置: ${YELLOW}$(pwd)${NC}" echo -e "固定仓库: ${GREEN}$MY_REPO_URL${NC}" echo "" - echo " 1) 提交 (一键三连)" + echo " 1) 提交 (二连)" echo " 2) 拉取 (Pull)" echo " 3) 绑定远程仓库 (Fix Remote)" echo " 4) 查看状态" diff --git a/js/聚合短剧.js b/js/聚合短剧.js index 1cf08272d..f1f35364f 100755 --- a/js/聚合短剧.js +++ b/js/聚合短剧.js @@ -1,4 +1,4 @@ -import 'assets://js/lib/crypto-js.js'; +import 'assets://lib/crypto-js.js'; const UA = 'Mozilla/5.0 (Linux; Android 9; V2196A Build/PQ3A.190705.08211809; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/91.0.4472.114 Mobile Safari/537.36;webank/h5face;webank/1.0;netType:NETWORK_WIFI;appVersion:416;packageName:com.jp3.xg3'; const aggConfig = { keys: 'd3dGiJc651gSQ8w1',