remove deprecated io/ioutil packages

app/demo/customize_lalserver/customize_lalserver.go

@@ -11,7 +11,6 @@ package main
 import (
 	"flag"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"time"
 
@@ -139,7 +138,7 @@ func showHowToCustomizePub(lals logic.ILalServer) {
 // readAudioPacketsFromFile 从aac es流文件读取所有音频包
 func readAudioPacketsFromFile(filename string) (audioContent []byte, audioPackets []base.AvPacket) {
 	var err error
-	audioContent, err = ioutil.ReadFile(filename)
+	audioContent, err = os.ReadFile(filename)
 	nazalog.Assert(nil, err)
 
 	pos := 0
@@ -170,7 +169,7 @@ func readAudioPacketsFromFile(filename string) (audioContent []byte, audioPacket
 // readVideoPacketsFromFile 从h264 es流文件读取所有视频包
 func readVideoPacketsFromFile(filename string) (videoContent []byte, videoPackets []base.AvPacket) {
 	var err error
-	videoContent, err = ioutil.ReadFile(filename)
+	videoContent, err = os.ReadFile(filename)
 	nazalog.Assert(nil, err)
 
 	timestamp := float32(0)

app/demo/dispatch/dispatch.go

@@ -10,7 +10,7 @@ package main
 
 import (
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net"
 	"net/http"
 	"strings"
@@ -195,7 +195,7 @@ func OnUpdateHandler(w http.ResponseWriter, r *http.Request) {
 }
 
 func logHandler(w http.ResponseWriter, r *http.Request) {
-	b, _ := ioutil.ReadAll(r.Body)
+	b, _ := io.ReadAll(r.Body)
 	nazalog.Infof("r=%+v, body=%s", r, b)
 }
 

pkg/gb28181/unpack_test.go

@@ -10,12 +10,12 @@ package gb28181
 
 import (
 	"encoding/hex"
+	"os"
+	"testing"
+
 	"github.com/q191201771/lal/pkg/base"
 	"github.com/q191201771/lal/pkg/hevc"
 	"github.com/q191201771/naza/pkg/nazamd5"
-	"io/ioutil"
-	"os"
-	"testing"
 
 	"github.com/q191201771/lal/pkg/avc"
 	"github.com/q191201771/naza/pkg/nazabytes"
@@ -120,8 +120,8 @@ func test1() {
 	nazalog.Debugf("[test1] > test1")
 	// 读取raw文件(包连在一起，不包含rtp header)，存取h264文件
 
-	//b, err := ioutil.ReadFile("/tmp/udp.raw")
-	b, err := ioutil.ReadFile("/Volumes/T7/new/avfile/ka_at_13sec.ps")
+	//b, err := os.ReadFile("/tmp/udp.raw")
+	b, err := os.ReadFile("/Volumes/T7/new/avfile/ka_at_13sec.ps")
 	nazalog.Assert(nil, err)
 
 	fp, err := os.Create("/tmp/udp.h264")
@@ -154,7 +154,7 @@ func test1() {
 	unpacker.FeedRtpBody(b, 0)
 
 	fp.Close()
-	out, err := ioutil.ReadFile("/tmp/udp.h264")
+	out, err := os.ReadFile("/tmp/udp.h264")
 	nazalog.Assert(nil, err)
 	nazalog.Assert("fd8dbe365152e212bf8cbabb7a99c1aa", nazamd5.Md5(out))
 }

pkg/innertest/dump_ps_test.go

@@ -9,13 +9,14 @@
 package innertest
 
 import (
+	"net"
+	"os"
+	"testing"
+
 	"github.com/q191201771/lal/pkg/base"
 	"github.com/q191201771/naza/pkg/bele"
 	"github.com/q191201771/naza/pkg/nazalog"
 	"github.com/q191201771/naza/pkg/nazanet"
-	"io/ioutil"
-	"net"
-	"testing"
 )
 
 // TestRe_PsPubSession
@@ -37,7 +38,7 @@ func TestDump_PsPub(t *testing.T) {
 	filename := "/tmp/record.psdata"
 	isTcpFlag := 1
 
-	b, err := ioutil.ReadFile(filename)
+	b, err := os.ReadFile(filename)
 	if len(b) == 0 || err != nil {
 		return
 	}

pkg/innertest/innertest.go

@@ -10,7 +10,7 @@ package innertest
 
 import (
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"os"
 	"runtime"
@@ -247,7 +247,7 @@ func entry() {
 
 	go func() {
 		b, _ := getHttpts()
-		_ = ioutil.WriteFile(wTsPullFileName, b, 0666)
+		_ = os.WriteFile(wTsPullFileName, b, 0666)
 		assert.Equal(t, goldenHttptsLenList[mode], len(b))
 		assert.Equal(t, goldenHttptsMd5List[mode], nazamd5.Md5(b))
 
@@ -327,27 +327,27 @@ func entry() {
 }
 
 func compareFile() {
-	r, err := ioutil.ReadFile(rFlvFileName)
+	r, err := os.ReadFile(rFlvFileName)
 	assert.Equal(t, nil, err)
 	Log.Debugf("%s filesize:%d", rFlvFileName, len(r))
 
 	// 检查httpflv
-	w, err := ioutil.ReadFile(wFlvPullFileName)
+	w, err := os.ReadFile(wFlvPullFileName)
 	assert.Equal(t, nil, err)
 	assert.Equal(t, goldenHttpflvLenList[mode], len(w))
 	assert.Equal(t, goldenHttpflvMd5List[mode], nazamd5.Md5(w))
 
 	// 检查rtmp
-	w, err = ioutil.ReadFile(wRtmpPullFileName)
+	w, err = os.ReadFile(wRtmpPullFileName)
 	assert.Equal(t, nil, err)
 	assert.Equal(t, goldenRtmpLenList[mode], len(w))
 	assert.Equal(t, goldenRtmpMd5List[mode], nazamd5.Md5(w))
 
 	// 检查hls的m3u8文件
-	playListM3u8, err := ioutil.ReadFile(wPlaylistM3u8FileName)
+	playListM3u8, err := os.ReadFile(wPlaylistM3u8FileName)
 	assert.Equal(t, nil, err)
 	assert.Equal(t, goldenPlaylistM3u8List[mode], string(playListM3u8))
-	recordM3u8, err := ioutil.ReadFile(wRecordM3u8FileName)
+	recordM3u8, err := os.ReadFile(wRecordM3u8FileName)
 	assert.Equal(t, nil, err)
 	assert.Equal(t, goldenRecordM3u8List[mode], string(recordM3u8))
 
@@ -431,7 +431,7 @@ func httpGet(url string) ([]byte, error) {
 		return nil, err
 	}
 	defer resp.Body.Close()
-	return ioutil.ReadAll(resp.Body)
+	return io.ReadAll(resp.Body)
 }
 
 func httpPost(url string, info interface{}) ([]byte, error) {
@@ -440,7 +440,7 @@ func httpPost(url string, info interface{}) ([]byte, error) {
 		return nil, err
 	}
 	defer resp.Body.Close()
-	return ioutil.ReadAll(resp.Body)
+	return io.ReadAll(resp.Body)
 }
 
 // ---------------------------------------------------------------------------------------------------------------------

pkg/logic/http_api.go

@@ -12,7 +12,7 @@ import (
 	_ "embed"
 	"encoding/json"
 	"html/template"
-	"io/ioutil"
+	"io"
 	"net"
 	"net/http"
 	"strings"
@@ -261,7 +261,7 @@ func feedback(v interface{}, w http.ResponseWriter) {
 //
 // TODO(chef): [refactor] 搬到naza中 202205
 func unmarshalRequestJsonBody(r *http.Request, info interface{}, keyFieldList ...string) (nazajson.Json, error) {
-	body, err := ioutil.ReadAll(r.Body)
+	body, err := io.ReadAll(r.Body)
 	if err != nil {
 		return nazajson.Json{}, err
 	}

pkg/logic/server_manager__.go

@@ -11,7 +11,6 @@ package logic
 import (
 	"flag"
 	"fmt"
-	"io/ioutil"
 	"net/http"
 	_ "net/http/pprof"
 	"os"
@@ -87,7 +86,7 @@ Doc: %s
 			}
 		}
 		var err error
-		rawContent, err = ioutil.ReadFile(confFile)
+		rawContent, err = os.ReadFile(confFile)
 		if err != nil {
 			_, _ = fmt.Fprintf(os.Stderr, "read conf file failed. file=%s err=%+v", confFile, err)
 			base.OsExitAndWaitPressIfWindows(1)