diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh index 99631094..467e5fd2 100755 --- a/docker/docker-entrypoint.sh +++ b/docker/docker-entrypoint.sh @@ -10,7 +10,7 @@ cp -fv $dir_root/docker/front.conf /etc/nginx/conf.d/front.conf echo echo -e "======================2. 更新源代码========================\n" -ql update +ql update "no-restart" echo echo -e "======================3. 启动nginx========================\n" diff --git a/shell/update.sh b/shell/update.sh index bdc31cbc..2aeaae48 100755 --- a/shell/update.sh +++ b/shell/update.sh @@ -251,10 +251,10 @@ usage() { ## 更新qinglong update_qinglong() { + local no_restart="$1" echo -e "--------------------------------------------------------------\n" [ -f $dir_root/package.json ] && ql_depend_old=$(cat $dir_root/package.json) - url=https://github.com/whyour/qinglong.git - reset_romote_url ${dir_root} "${github_proxy_url}${url/https:\/\/ghproxy.com\//}" + 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 @@ -288,10 +288,12 @@ update_qinglong() { cd $dir_root rm -rf $dir_root/build && rm -rf $dir_root/dist cp -rf $ql_static_repo/* $dir_root - echo -e "重启面板中..." - nginx -s reload 2>/dev/null || nginx -c /etc/nginx/nginx.conf - sleep 1 - reload_pm2 + if [[ $no_restart != "no-restart" ]]; then + echo -e "重启面板中..." + nginx -s reload 2>/dev/null || nginx -c /etc/nginx/nginx.conf + sleep 1 + reload_pm2 + fi else echo -e "\n更新$dir_root失败,请检查原因...\n" fi @@ -401,7 +403,7 @@ main() { log_path="$dir_log/update/${log_time}_$p1.log" case $p1 in update) - update_qinglong | tee $log_path + update_qinglong "$2" | tee $log_path ;; extra) run_extra_shell | tee -a $log_path diff --git a/src/layouts/index.tsx b/src/layouts/index.tsx index d7008868..85911186 100644 --- a/src/layouts/index.tsx +++ b/src/layouts/index.tsx @@ -68,7 +68,9 @@ export default function (props: any) { <> 控制面板 - + {version} diff --git a/src/pages/config/index.tsx b/src/pages/config/index.tsx index 5118c6bd..a0842325 100644 --- a/src/pages/config/index.tsx +++ b/src/pages/config/index.tsx @@ -71,7 +71,6 @@ const Config = () => { value={value} options={{ lineNumbers: true, - lineWrapping: true, styleActiveLine: true, matchBrackets: true, mode: 'shell',