From 1197e8d1b6c778fdd01317453641c8e11e7814ee Mon Sep 17 00:00:00 2001
From: dudaodong <lanliddd.2007@163.com>
Date: Sat, 10 Dec 2022 16:53:41 +0800
Subject: [PATCH] fix: fix lint issue

---
 cryptor/rsa.go                            |  1 -
 datastructure/queue/circularqueue_test.go | 35 ++++++++++++-----------
 fileutil/file_test.go                     |  8 ++++--
 netutil/http_client.go                    |  4 +--
 netutil/http_client_test.go               |  6 ++--
 netutil/http_test.go                      |  5 +---
 6 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/cryptor/rsa.go b/cryptor/rsa.go
index 27a43e4..dfc75e2 100644
--- a/cryptor/rsa.go
+++ b/cryptor/rsa.go
@@ -114,7 +114,6 @@ func RsaDecrypt(data []byte, privateKeyFileName string) []byte {
 	buf := make([]byte, fileInfo.Size())
 	defer file.Close()
 
-	file.Read(buf)
 	_, err = file.Read(buf)
 	if err != nil {
 		panic(err)
diff --git a/datastructure/queue/circularqueue_test.go b/datastructure/queue/circularqueue_test.go
index e030b26..5179db0 100644
--- a/datastructure/queue/circularqueue_test.go
+++ b/datastructure/queue/circularqueue_test.go
@@ -10,17 +10,18 @@ func TestCircularQueue_Enqueue(t *testing.T) {
 	assert := internal.NewAssert(t, "TestCircularQueue_Enqueue")
 
 	queue := NewCircularQueue[int](6)
-	queue.Enqueue(1)
-	queue.Enqueue(2)
-	queue.Enqueue(3)
-	queue.Enqueue(4)
-	queue.Enqueue(5)
+	err := queue.Enqueue(1)
+	err = queue.Enqueue(2)
+	err = queue.Enqueue(3)
+	err = queue.Enqueue(4)
+	err = queue.Enqueue(5)
+
+	assert.IsNil(err)
 
-	queue.Print()
 	assert.Equal([]int{1, 2, 3, 4, 5}, queue.Data())
 	assert.Equal(5, queue.Size())
 
-	err := queue.Enqueue(6)
+	err = queue.Enqueue(6)
 	assert.IsNotNil(err)
 }
 
@@ -43,7 +44,6 @@ func TestCircularQueue_Dequeue(t *testing.T) {
 	assert.Equal(false, queue.IsFull())
 
 	val, _ = queue.Dequeue()
-	queue.Print()
 	assert.Equal(2, *val)
 
 	queue.Enqueue(6)
@@ -55,22 +55,23 @@ func TestCircularQueue_Front(t *testing.T) {
 	assert := internal.NewAssert(t, "TestCircularQueue_Front")
 
 	queue := NewCircularQueue[int](6)
-	queue.Enqueue(1)
-	queue.Enqueue(2)
-	queue.Enqueue(3)
-	queue.Enqueue(4)
-	queue.Enqueue(5)
+	err := queue.Enqueue(1)
+	err = queue.Enqueue(2)
+	err = queue.Enqueue(3)
+	err = queue.Enqueue(4)
+	err = queue.Enqueue(5)
 
 	queue.Print()
 
-	queue.Dequeue()
-	queue.Dequeue()
-	queue.Enqueue(6)
-	queue.Enqueue(7)
+	_, err = queue.Dequeue()
+	_, err = queue.Dequeue()
+	err = queue.Enqueue(6)
+	err = queue.Enqueue(7)
 
 	queue.Print()
 
 	val := queue.Front()
+	assert.IsNil(err)
 	assert.Equal(3, val)
 	assert.Equal(5, queue.Size())
 }
diff --git a/fileutil/file_test.go b/fileutil/file_test.go
index 6530a5a..98e7233 100644
--- a/fileutil/file_test.go
+++ b/fileutil/file_test.go
@@ -179,10 +179,14 @@ func TestZipAndUnZip(t *testing.T) {
 
 	file, _ := os.OpenFile(srcFile, os.O_WRONLY|os.O_TRUNC, 0777)
 	defer file.Close()
-	file.WriteString("hello\nworld")
+
+	_, err := file.WriteString("hello\nworld")
+	if err != nil {
+		t.Fail()
+	}
 
 	zipFile := "./text.zip"
-	err := Zip(srcFile, zipFile)
+	err = Zip(srcFile, zipFile)
 	assert.IsNil(err)
 
 	unZipPath := "./unzip"
diff --git a/netutil/http_client.go b/netutil/http_client.go
index 5bf71cf..25f14d8 100644
--- a/netutil/http_client.go
+++ b/netutil/http_client.go
@@ -6,7 +6,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"net/url"
 	"reflect"
@@ -181,7 +181,7 @@ func (client *HttpClient) setQueryParam(req *http.Request, reqUrl string, queryP
 
 func (client *HttpClient) setFormData(req *http.Request, values url.Values) {
 	formData := []byte(values.Encode())
-	req.Body = ioutil.NopCloser(bytes.NewReader(formData))
+	req.Body = io.NopCloser(bytes.NewReader(formData))
 	req.ContentLength = int64(len(formData))
 }
 
diff --git a/netutil/http_client_test.go b/netutil/http_client_test.go
index 97f436d..41d9fb8 100644
--- a/netutil/http_client_test.go
+++ b/netutil/http_client_test.go
@@ -1,7 +1,7 @@
 package netutil
 
 import (
-	"io/ioutil"
+	"io"
 	"log"
 	"net/http"
 	"net/url"
@@ -61,7 +61,7 @@ func TestHttpClent_Post(t *testing.T) {
 		log.Fatal(err)
 	}
 
-	body, _ := ioutil.ReadAll(resp.Body)
+	body, _ := io.ReadAll(resp.Body)
 	t.Log("response: ", resp.StatusCode, string(body))
 }
 
@@ -93,6 +93,6 @@ func TestStructToUrlValues(t *testing.T) {
 		log.Fatal(err)
 	}
 
-	body, _ := ioutil.ReadAll(resp.Body)
+	body, _ := io.ReadAll(resp.Body)
 	t.Log("response: ", string(body))
 }
diff --git a/netutil/http_test.go b/netutil/http_test.go
index b530bea..0f230c4 100644
--- a/netutil/http_test.go
+++ b/netutil/http_test.go
@@ -51,10 +51,7 @@ func TestHttpPostFormData(t *testing.T) {
 		// "Content-Type": "application/x-www-form-urlencoded",
 		"Content-Type": "multipart/form-data",
 	}
-	type Todo struct {
-		UserId int    `json:"userId"`
-		Title  string `json:"title"`
-	}
+
 	postData := url.Values{}
 	postData.Add("userId", "1")
 	postData.Add("title", "TestToDo")