diff --git a/docker/Dockerfile b/docker/Dockerfile index 6bc8a2e4..599379c2 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,6 +1,6 @@ FROM node:lts-alpine LABEL maintainer="whyour" -ARG QL_URL=https://ghproxy.com/https://github.com/whyour/qinglong.git +ARG QL_URL=https://github.com/whyour/qinglong.git ARG QL_BRANCH=master ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin \ LANG=zh_CN.UTF-8 \ @@ -16,6 +16,7 @@ RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories moreutils \ git \ curl \ + wget \ tzdata \ perl \ openssl \ diff --git a/sample/config.sample.sh b/sample/config.sample.sh index 354b14fb..9c040605 100644 --- a/sample/config.sample.sh +++ b/sample/config.sample.sh @@ -1,6 +1,6 @@ ## Version: v2.0.0-05302045 ## Date: 2021-05-30 -## Update Content: 增加ql bot命令所需文件提示 +## Update Content: 增加GithubProxyUrl参数，访问github链接不需要代理时，可移除此参数 ## 上面版本号中，如果第2位数字有变化，那么代表增加了新的参数，如果只有第3位数字有变化，仅代表更新了注释，没有增加新的参数，可更新可不更新 @@ -10,6 +10,9 @@ AutoDelCron="true" ## 在运行 ql repo 命令时，是否自动增加新的本地定时任务 AutoAddCron="true" +## 由于github仓库拉取较慢，所以会默认添加代理前缀，如不需要请移除 +GithubProxyUrl="https://ghproxy.com/" + ## 设置定时任务执行的超时时间，默认1h，后缀"s"代表秒(默认值), "m"代表分, "h"代表小时, "d"代表天 CommandTimeoutTime="1h" diff --git a/shell/share.sh b/shell/share.sh index aaeaec99..9df6d354 100755 --- a/shell/share.sh +++ b/shell/share.sh @@ -60,6 +60,7 @@ import_config() { done command_timeout_time=${CommandTimeoutTime:-"1h"} + github_proxy_url=${GithubProxyUrl:-""} } ## 创建目录，$1：目录的绝对路径 diff --git a/shell/test.sh b/shell/test.sh new file mode 100644 index 00000000..817ae298 --- /dev/null +++ b/shell/test.sh @@ -0,0 +1,3 @@ +url="https://ghproxy.com/https://github.com/zooPanda/zoo.git" +github_proxy_url="https://ghproxy.com/" +echo "${github_proxy_url}${url/https:\/\/ghproxy.com\//}" \ No newline at end of file diff --git a/shell/update.sh b/shell/update.sh index 830a5cce..5eba4e96 100755 --- a/shell/update.sh +++ b/shell/update.sh @@ -96,7 +96,7 @@ del_cron() { fi cron_file="$dir_scripts/${cron}" if [[ -f $cron_file ]]; then - cron_name=$(grep "new Env" $cron_file | awk -F "'|\"" '{print $2}' | head -1) + cron_name=$(grep "new Env" $cron_file | awk -F "\(" '{print $2}' | awk -F "\)" '{print $1}' | sed 's:^.\(.*\).$:\1:' | head -1) rm -f $cron_file fi [[ -z $cron_name ]] && cron_name="$cron" @@ -129,11 +129,13 @@ add_cron() { }" $file | perl -pe "{ s|[^\d\*]*(([\d\*]*[\*-\/,\d]*[\d\*] ){4,5}[\d\*]*[\*-\/,\d]*[\d\*])( \|,\|\").*/?$file_name.*|\1|g; - s| | |g + s|\*([\d\*])(.*)|\1\2|g; + s| | |g; }" | sort -u | head -1 ) - cron_name=$(grep "new Env" $file | awk -F "'|\"" '{print $2}' | head -1) + cron_name=$(grep "new Env" $file | awk -F "\(" '{print $2}' | awk -F "\)" '{print $1}' | sed 's:^.\(.*\).$:\1:' | head -1) [[ -z $cron_name ]] && cron_name="$file_name" + [[ -z $cron_line ]] && cron_line=$(grep "cron:" $file | awk -F ":" '{print $2}' | xargs) [[ -z $cron_line ]] && cron_line="0 6 * * *" result=$(add_cron_api "$cron_line:$cmd_task $file:$cron_name") echo -e "$result" @@ -164,7 +166,7 @@ update_repo() { local repo_path="${dir_repo}/${author}_${repo}" if [ -d ${repo_path}/.git ]; then - reset_romote_url ${repo_path} ${url} + reset_romote_url ${repo_path} "${github_proxy_url}${url/https:\/\/ghproxy.com\//}" git_pull_scripts ${repo_path} else git_clone_scripts ${url} ${repo_path} @@ -197,10 +199,11 @@ update_raw() { }" $raw_file_name | perl -pe "{ s|[^\d\*]*(([\d\*]*[\*-\/,\d]*[\d\*] ){4,5}[\d\*]*[\*-\/,\d]*[\d\*])( \|,\|\").*/?$raw_file_name.*|\1|g; - s| | |g + s|\*([\d\*])(.*)|\1\2|g; + s| | |g; }" | sort -u | head -1 ) - cron_name=$(grep "new Env" $raw_file_name | awk -F "'|\"" '{print $2}' | head -1) + cron_name=$(grep "new Env" $raw_file_name | awk -F "\(" '{print $2}' | awk -F "\)" '{print $1}' | sed 's:^.\(.*\).$:\1:' | head -1) [[ -z $cron_name ]] && cron_name="$raw_file_name" [[ -z $cron_line ]] && cron_line="0 6 * * *" if [[ -z $cron_id ]]; then @@ -244,6 +247,7 @@ usage() { update_qinglong() { echo -e "--------------------------------------------------------------\n" [ -f $dir_root/package.json ] && ql_depend_old=$(cat $dir_root/package.json) + reset_romote_url ${dir_root} "${github_proxy_url}https://github.com/whyour/qinglong.git" git_pull_scripts $dir_root if [[ $exit_status -eq 0 ]]; then @@ -258,7 +262,7 @@ update_qinglong() { echo -e "\n更新$dir_root失败，请检查原因...\n" fi - local url="https://ghproxy.com/https://github.com/whyour/qinglong-static.git" + local url="${github_proxy_url}https://github.com/whyour/qinglong-static.git" if [ -d ${ql_static_repo}/.git ]; then reset_romote_url ${ql_static_repo} ${url} cd ${ql_static_repo} diff --git a/src/pages/log/index.module.less b/src/pages/log/index.module.less index fb59c15c..6eed1ad4 100644 --- a/src/pages/log/index.module.less +++ b/src/pages/log/index.module.less @@ -4,7 +4,6 @@ &-container { overflow: hidden; position: relative; - // padding: 16px 0; background-color: #fff; height: calc(100vh - 128px); height: calc(100vh - var(--vh-offset, 0px) - 128px); @@ -18,10 +17,6 @@ } &-search { margin-bottom: 16px; - // position: absolute; - // top: 0; - // left: 0; - // padding-bottom: 16px; } } diff --git a/src/pages/log/index.tsx b/src/pages/log/index.tsx index 532594c4..a18840d8 100644 --- a/src/pages/log/index.tsx +++ b/src/pages/log/index.tsx @@ -10,10 +10,10 @@ function getFilterData(keyword: string, data: any) { const expandedKeys: string[] = []; if (keyword) { const tree: any = []; - data.forEach((item) => { + data.forEach((item: any) => { if (item.title.includes(keyword)) { tree.push(item); - expandedKeys.push(...item.children.map((x) => x.key)); + expandedKeys.push(...item.children.map((x: any) => x.key)); } else { const children: any[] = []; (item.children || []).forEach((subItem: any) => { @@ -95,7 +95,7 @@ const Log = () => { const onSearch = useCallback( (e) => { const keyword = e.target.value; - const { tree, expandedKeys } = getFilterData(keyword, data); + const { tree } = getFilterData(keyword, data); setFilterData(tree); }, [data, setFilterData],