fix

vesoft-inc · Mar 16, 2022 · 8c92c9b · 8c92c9b
1 parent cad4e3d
commit 8c92c9b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/server/config/example-config.yaml b/server/config/example-config.yaml
@@ -4,4 +4,4 @@ web:
 #  tasks_dir:
 #  sqlitedb_file_path:
 #  ip:
-#  port: 7001 (production env), defaut is 9000 (test env)
+#  port: 7001 # (production env), defaut is 9000 (test env)
diff --git a/server/pkg/webserver/base/scheme.go b/server/pkg/webserver/base/scheme.go
@@ -37,7 +37,7 @@ func WrapHandler(handler Handler) iris.Handler {
 		result := handler(ctx)
 		ctx.StatusCode(iris.StatusOK)
 		if result != nil {
-			ctx.JSON(&result)
+			_, _ = ctx.JSON(&result)
 		}
 	}
 }

diff --git a/server/pkg/webserver/controller/files.go b/server/pkg/webserver/controller/files.go
@@ -160,6 +160,7 @@ func changeFileCharset2UTF8(filePath string, charSet string) error {
 		zap.L().Warn("open file fail", zap.Error(err))
 		return err
 	}
+	defer file.Close()
 	reader := bufio.NewReader(file)
 	decoder := mahonia.NewDecoder(charSet)
 	decodeReader := decoder.NewReader(reader)
@@ -168,12 +169,11 @@ func changeFileCharset2UTF8(filePath string, charSet string) error {
 	if err != nil {
 		return err
 	}
+	defer fileUTF8.Close()
 	writer := bufio.NewWriter(fileUTF8)
 	if _, err = writer.ReadFrom(decodeReader); err != nil {
 		return err
 	}
-	file.Close()
-	fileUTF8.Close()
 	if err = os.Rename(fileUTF8Path, filePath); err != nil {
 		return err
 	}