From 771cb762770ecc221e64a98d737aeaf0e5cd6a0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=99=AF=E9=98=B3?= <1656488874@qq.com>
Date: Sat, 31 Aug 2019 12:04:12 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=89=8D=E7=AB=AF=E6=8E=A7=E5=88=B6?=
 =?UTF-8?q?=E5=8F=B0=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98=20\=20fi?=
 =?UTF-8?q?x=20=E6=97=A0=E6=B3=95=E6=89=93=E5=8D=B0=E4=B8=AD=E6=96=87?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/services/spider.go                        | 4 ++++
 docker/Dockerfile.master.alpine                   | 2 +-
 docker/Dockerfile.worker.alpine                   | 2 +-
 frontend/src/components/InfoView/NodeInfoView.vue | 2 +-
 frontend/src/views/layout/components/Navbar.vue   | 1 +
 5 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/backend/services/spider.go b/backend/services/spider.go
index 1397e335..ad0c0ae5 100644
--- a/backend/services/spider.go
+++ b/backend/services/spider.go
@@ -20,6 +20,7 @@ import (
 	"path/filepath"
 	"runtime/debug"
 	"strings"
+	"syscall"
 )
 
 type SpiderFileData struct {
@@ -133,6 +134,8 @@ func ZipSpider(spider model.Spider) (filePath string, err error) {
 	// 如果源文件夹不存在，抛错
 	if !utils.Exists(spider.Src) {
 		debug.PrintStack()
+		// 删除该爬虫，否则会一直报错
+		_ = model.RemoveSpider(spider.Id)
 		return "", errors.New("source path does not exist")
 	}
 
@@ -173,6 +176,7 @@ func UploadToGridFs(spider model.Spider, fileName string, filePath string) (fid
 	// 如果存在FileId删除GridFS上的老文件
 	if !utils.IsObjectIdNull(spider.FileId) {
 		if err = gf.RemoveId(spider.FileId); err != nil {
+			log.Error("remove gf file:" + err.Error())
 			debug.PrintStack()
 		}
 	}
diff --git a/docker/Dockerfile.master.alpine b/docker/Dockerfile.master.alpine
index 6979861b..b9dbb742 100644
--- a/docker/Dockerfile.master.alpine
+++ b/docker/Dockerfile.master.alpine
@@ -75,7 +75,7 @@ RUN sed -i 's/#rc_sys=""/rc_sys="lxc"/g' /etc/rc.conf && \
 
 # working directory
 WORKDIR /app/backend
-
+ENV PYTHONIOENCODING utf-8
 # frontend port
 EXPOSE 8080
 
diff --git a/docker/Dockerfile.worker.alpine b/docker/Dockerfile.worker.alpine
index e7a66776..388125a2 100644
--- a/docker/Dockerfile.worker.alpine
+++ b/docker/Dockerfile.worker.alpine
@@ -35,7 +35,7 @@ RUN apk del .build-deps
 
 # working directory
 WORKDIR /app/backend
-
+ENV PYTHONIOENCODING utf-8
 # backend port
 EXPOSE 8000
 
diff --git a/frontend/src/components/InfoView/NodeInfoView.vue b/frontend/src/components/InfoView/NodeInfoView.vue
index 8e350448..e6ffb58a 100644
--- a/frontend/src/components/InfoView/NodeInfoView.vue
+++ b/frontend/src/components/InfoView/NodeInfoView.vue
@@ -22,7 +22,7 @@
       </el-form>
     </el-row>
     <el-row class="button-container" v-if="!isView">
-      <el-button type="success" @click="onSave">{{$t('Save')}}</el-button>
+      <el-button size="small" type="success" @click="onSave">{{$t('Save')}}</el-button>
     </el-row>
   </div>
 </template>
diff --git a/frontend/src/views/layout/components/Navbar.vue b/frontend/src/views/layout/components/Navbar.vue
index f60c0051..3b30c049 100644
--- a/frontend/src/views/layout/components/Navbar.vue
+++ b/frontend/src/views/layout/components/Navbar.vue
@@ -32,6 +32,7 @@
         <font-awesome-icon :icon="['far', 'question-circle']"/>
         <span style="margin-left: 5px;">{{$t('Documentation')}}</span>
       </a>
+      <el-dropdown-menu slot="dropdown"></el-dropdown-menu>
     </el-dropdown>
   </div>
 </template>