From b8e3a451c36a0dac8392bb383b27646ed42ba823 Mon Sep 17 00:00:00 2001
From: whyour <imwhyour@gmail.com>
Date: Sun, 28 Mar 2021 21:13:23 +0800
Subject: [PATCH] =?UTF-8?q?rebuild=E5=91=BD=E4=BB=A4=E6=B7=BB=E5=8A=A0pm2?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=97=A0=E6=B3=95=E8=87=AA=E5=8A=A8=E5=90=AF?=
 =?UTF-8?q?=E5=8A=A8=E6=97=B6=EF=BC=8C=E8=87=AA=E5=8A=A8=E5=90=AF=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker/docker-entrypoint.sh | 2 +-
 shell/rebuild.sh            | 9 +++++++--
 src/pages/cookie/modal.tsx  | 3 ++-
 3 files changed, 10 insertions(+), 4 deletions(-)
 mode change 100644 => 100755 docker/docker-entrypoint.sh
 mode change 100644 => 100755 shell/rebuild.sh

diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh
old mode 100644
new mode 100755
index db12f2db..51bf73df
--- a/docker/docker-entrypoint.sh
+++ b/docker/docker-entrypoint.sh
@@ -16,7 +16,7 @@ crontab ${QL_DIR}/config/crontab.list
 echo -e "成功添加定时任务...\n"
 
 if [ ! -s ${QL_DIR}/config/cookie.sh ]; then
-  echo -e "检测到config配置目录下不存在config.sh，从示例文件复制一份用于初始化...\n"
+  echo -e "检测到config配置目录下不存在cookie.sh，从示例文件复制一份用于初始化...\n"
   touch ${QL_DIR}/config/cookie.sh
   echo
 fi
diff --git a/shell/rebuild.sh b/shell/rebuild.sh
old mode 100644
new mode 100755
index 67578608..7f05d4ea
--- a/shell/rebuild.sh
+++ b/shell/rebuild.sh
@@ -12,14 +12,19 @@ git reset --mixed
 echo -e "更新shell完成...\n"
 
 echo -e "重新build...\n"
-yarn install --registry=https://registry.npm.taobao.org
 yarn build
 yarn build-back
 echo -e "重新build完成...\n"
 
 echo -e "重启服务...\n"
 
-pm2 restart panel
+PIDS=`ps -ef|grep "app.js"|grep -v grep`
+if [ "$PIDS" != "" ]; then
+  pm2 restart panel
+else
+  pm2 start ${QL_DIR}/build/app.js -n panel
+fi
+
 nginx -s reload
 
 echo -e "重启服务完成...\n"
\ No newline at end of file
diff --git a/src/pages/cookie/modal.tsx b/src/pages/cookie/modal.tsx
index ad07ffae..80d0f677 100644
--- a/src/pages/cookie/modal.tsx
+++ b/src/pages/cookie/modal.tsx
@@ -69,8 +69,9 @@ const CookieModal = ({
           });
       }}
       onCancel={() => handleCancel()}
+      destroyOnClose
     >
-      <Form form={form} layout="vertical" name="form_in_modal">
+      <Form form={form} layout="vertical" name="form_in_modal" preserve={false}>
         <Form.Item
           name="cookie"
           rules={[