From c51306ef27d55c2cd21604ccf30f74ad27a2ed36 Mon Sep 17 00:00:00 2001
From: hanhh <18330117883@163.com>
Date: Tue, 3 Aug 2021 11:07:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dql=20update=E4=B8=ADreset?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 shell/update.sh       | 18 +++++++-----------
 src/layouts/index.tsx |  4 +++-
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/shell/update.sh b/shell/update.sh
index bd52a1b0..faad93e8 100755
--- a/shell/update.sh
+++ b/shell/update.sh
@@ -119,7 +119,7 @@ add_cron() {
             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=$(grep "cron " $file | awk -F "cron \"" '{print $2}' | awk -F "\" " '{print $1}' | xargs) 
+            [[ -z $cron_line ]] && cron_line=$(grep "cron " $file | awk -F "cron \"" '{print $2}' | awk -F "\" " '{print $1}' | xargs)
             [[ -z $cron_line ]] && cron_line="0 6 * * *"
             result=$(add_cron_api "$cron_line:$cmd_task $file:$cron_name")
             echo -e "$result"
@@ -193,7 +193,7 @@ update_raw() {
         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=$(grep "cron:" $raw_file_name | awk -F ":" '{print $2}' | xargs)
-        [[ -z $cron_line ]] && cron_line=$(grep "cron " $raw_file_name | awk -F "cron \"" '{print $2}' | awk -F "\" " '{print $1}' | xargs) 
+        [[ -z $cron_line ]] && cron_line=$(grep "cron " $raw_file_name | awk -F "cron \"" '{print $2}' | awk -F "\" " '{print $1}' | xargs)
         [[ -z $cron_line ]] && cron_line="0 6 * * *"
         if [[ -z $cron_id ]]; then
             result=$(add_cron_api "$cron_line:$cmd_task $filename:$cron_name")
@@ -238,8 +238,8 @@ update_qinglong() {
 
     local no_restart="$1"
     [ -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
+    reset_romote_url ${dir_root} "${github_proxy_url}https://github.com/whyour/qinglong.git" "master"
+    git_pull_scripts $dir_root "master"
 
     if [[ $exit_status -eq 0 ]]; then
         echo -e "\n更新$dir_root成功...\n"
@@ -255,12 +255,8 @@ update_qinglong() {
 
     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}
-        git fetch --all
-        exit_status=$?
-        git reset --hard origin/master
-        cd $dir_root
+        reset_romote_url ${ql_static_repo} ${url} "master"
+        git_pull_scripts ${ql_static_repo} "master"
     else
         git_clone_scripts ${url} ${ql_static_repo}
     fi
@@ -298,7 +294,7 @@ patch_version() {
 
 reload_pm2() {
     pm2 l >/dev/null 2>&1
-    
+
     if [[ $(pm2 info panel 2>/dev/null) ]]; then
         pm2 reload panel --source-map-support --time >/dev/null 2>&1
     else
diff --git a/src/layouts/index.tsx b/src/layouts/index.tsx
index 61890750..deee590a 100644
--- a/src/layouts/index.tsx
+++ b/src/layouts/index.tsx
@@ -29,6 +29,9 @@ export default function (props: any) {
       history.push('/login');
     }
     vhCheck();
+
+    // patch custome layout title as react node [object, object]
+    document.title = '控制面板';
   }, []);
 
   useEffect(() => {
@@ -109,7 +112,6 @@ export default function (props: any) {
           },
         ];
       }}
-      pageTitleRender={() => '控制面板'}
       {...defaultProps}
     >
       {props.children}