From 546ac8d62b04a11d20e08d10437bbed565615326 Mon Sep 17 00:00:00 2001
From: 180909 <734461790@qq.com>
Date: Sat, 21 Oct 2023 23:49:19 +0800
Subject: [PATCH] Remove ioutil import

---
 main.go              | 4 ++--
 server/server.go     | 6 +++---
 server/ws_wrapper.go | 4 ++--
 utils/flags.go       | 3 +--
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/main.go b/main.go
index 2212b8f..54c2856 100644
--- a/main.go
+++ b/main.go
@@ -3,7 +3,7 @@ package main
 import (
 	"context"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"log"
 	"os"
 	"os/signal"
@@ -68,7 +68,7 @@ func main() {
 
 		if appOptions.Quiet {
 			log.SetFlags(0)
-			log.SetOutput(ioutil.Discard)
+			log.SetOutput(io.Discard)
 		}
 
 		if c.IsSet("credential") {
diff --git a/server/server.go b/server/server.go
index c2c1a86..c70cb9f 100644
--- a/server/server.go
+++ b/server/server.go
@@ -6,10 +6,10 @@ import (
 	"crypto/x509"
 	"html/template"
 	"io/fs"
-	"io/ioutil"
 	"log"
 	"net"
 	"net/http"
+	"os"
 	"regexp"
 	"strings"
 	noesctmpl "text/template"
@@ -45,7 +45,7 @@ func New(factory Factory, options *Options) (*Server, error) {
 	}
 	if options.IndexFile != "" {
 		path := homedir.Expand(options.IndexFile)
-		indexData, err = ioutil.ReadFile(path)
+		indexData, err = os.ReadFile(path)
 		if err != nil {
 			return nil, errors.Wrapf(err, "failed to read custom index file at `%s`", path)
 		}
@@ -253,7 +253,7 @@ func (server *Server) setupHTTPServer(handler http.Handler) (*http.Server, error
 
 func (server *Server) tlsConfig() (*tls.Config, error) {
 	caFile := homedir.Expand(server.options.TLSCACrtFile)
-	caCert, err := ioutil.ReadFile(caFile)
+	caCert, err := os.ReadFile(caFile)
 	if err != nil {
 		return nil, errors.New("could not open CA crt file " + caFile)
 	}
diff --git a/server/ws_wrapper.go b/server/ws_wrapper.go
index aa3816f..36b494d 100644
--- a/server/ws_wrapper.go
+++ b/server/ws_wrapper.go
@@ -1,7 +1,7 @@
 package server
 
 import (
-	"io/ioutil"
+	"io"
 
 	"github.com/gorilla/websocket"
 	"github.com/pkg/errors"
@@ -31,7 +31,7 @@ func (wsw *wsWrapper) Read(p []byte) (n int, err error) {
 			continue
 		}
 
-		b, err := ioutil.ReadAll(reader)
+		b, err := io.ReadAll(reader)
 		if len(b) > len(p) {
 			return 0, errors.Wrapf(err, "Client message exceeded buffer size")
 		}
diff --git a/utils/flags.go b/utils/flags.go
index f33fec4..12777cf 100644
--- a/utils/flags.go
+++ b/utils/flags.go
@@ -1,7 +1,6 @@
 package utils
 
 import (
-	"io/ioutil"
 	"log"
 	"os"
 	"reflect"
@@ -114,7 +113,7 @@ func ApplyConfigFile(filePath string, options ...interface{}) error {
 
 	fileString := []byte{}
 	log.Printf("Loading config file at: %s", filePath)
-	fileString, err := ioutil.ReadFile(filePath)
+	fileString, err := os.ReadFile(filePath)
 	if err != nil {
 		return err
 	}