mirrors2/eiblog
1
0
Fork 0
mirror of https://github.com/eiblog/eiblog.git synced 2026-02-04 13:52:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: replace ioutil -> io

Browse Source
This commit is contained in:
henry.chen
2024-11-04 10:31:28 +08:00
parent 27bc610a31
commit 6e1965a764
8 changed files with 27 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/config/config.go
View File

@@ -2,7 +2,6 @@
package config package config
import ( import (
"io/ioutil"
"os" "os"
"path/filepath" "path/filepath"
"strings" "strings"
@@ -147,7 +146,7 @@ func init() {
WorkDir = workDir() WorkDir = workDir()
path := filepath.Join(WorkDir, "conf", "app.yml") path := filepath.Join(WorkDir, "conf", "app.yml")
data, err := ioutil.ReadFile(path) data, err := os.ReadFile(path)
if err != nil { if err != nil {
panic(err) panic(err)
} }

4
pkg/core/eiblog/page/fe.go
View File

@@ -6,7 +6,7 @@ import (
"context" "context"
"fmt" "fmt"
htemplate "html/template" htemplate "html/template"
"io/ioutil" "io"
"math/rand" "math/rand"
"net/http" "net/http"
"strconv" "strconv"
@@ -370,7 +370,7 @@ func handleBeaconPage(c *gin.Context) {
return return
} }
defer res.Body.Close() defer res.Body.Close()
data, err := ioutil.ReadAll(res.Body) data, err := io.ReadAll(res.Body)
if err != nil { if err != nil {
logrus.Error("HandleBeaconPage.ReadAll: ", err) logrus.Error("HandleBeaconPage.ReadAll: ", err)
return return

2
pkg/core/eiblog/page/page.go
View File

@@ -18,7 +18,7 @@ var htmlTmpl *template.Template
func init() { func init() {
htmlTmpl = template.New("eiblog").Funcs(tools.TplFuncMap) htmlTmpl = template.New("eiblog").Funcs(tools.TplFuncMap)
root := filepath.Join(config.WorkDir, "website") root := filepath.Join(config.WorkDir, "website")
files := tools.ReadDirFiles(root, func(fi fs.FileInfo) bool { files := tools.ReadDirFiles(root, func(fi fs.DirEntry) bool {
name := fi.Name() name := fi.Name()
if name == ".DS_Store" { if name == ".DS_Store" {
return true return true

18
pkg/internal/disqus.go
View File

@@ -5,7 +5,7 @@ import (
"encoding/json" "encoding/json"
"errors" "errors"
"fmt" "fmt"
"io/ioutil" "io"
"net/http" "net/http"
"net/url" "net/url"
"strings" "strings"
@@ -71,7 +71,7 @@ func PostsCount(articles map[string]*model.Article) error {
} }
defer resp.Body.Close() defer resp.Body.Close()
b, err := ioutil.ReadAll(resp.Body) b, err := io.ReadAll(resp.Body)
if err != nil { if err != nil {
return err return err
} }
@@ -91,7 +91,9 @@ func PostsCount(articles map[string]*model.Article) error {
if article := articles[slug]; article != nil { if article := articles[slug]; article != nil {
article.Count = v.Posts article.Count = v.Posts
article.Thread = v.ID if article.Thread == "" && v.ID != "" {
article.Thread = v.ID
}
} }
} }
} }
@@ -144,7 +146,7 @@ func PostsList(article *model.Article, cursor string) (*PostsListResp, error) {
} }
defer resp.Body.Close() defer resp.Body.Close()
b, err := ioutil.ReadAll(resp.Body) b, err := io.ReadAll(resp.Body)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -198,7 +200,7 @@ func PostCreate(pc *PostComment) (*PostCreateResp, error) {
return nil, err return nil, err
} }
defer resp.Body.Close() defer resp.Body.Close()
b, err := ioutil.ReadAll(resp.Body) b, err := io.ReadAll(resp.Body)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -240,7 +242,7 @@ func PostApprove(post string) error {
} }
defer resp.Body.Close() defer resp.Body.Close()
b, err := ioutil.ReadAll(resp.Body) b, err := io.ReadAll(resp.Body)
if err != nil { if err != nil {
return err return err
} }
@@ -282,7 +284,7 @@ func ThreadCreate(article *model.Article, btitle string) error {
return err return err
} }
b, err := ioutil.ReadAll(resp.Body) b, err := io.ReadAll(resp.Body)
if err != nil { if err != nil {
return err return err
} }
@@ -325,7 +327,7 @@ func ThreadDetails(article *model.Article) error {
return err return err
} }
b, err := ioutil.ReadAll(resp.Body) b, err := io.ReadAll(resp.Body)
if err != nil { if err != nil {
return err return err
} }

10
pkg/internal/es.go
View File

@@ -6,7 +6,7 @@ import (
"encoding/json" "encoding/json"
"errors" "errors"
"fmt" "fmt"
"io/ioutil" "io"
"net/http" "net/http"
"regexp" "regexp"
"strings" "strings"
@@ -160,7 +160,7 @@ func createIndexAndMappings(index, typ string, mappings []byte) error {
return err return err
} }
defer resp.Body.Close() defer resp.Body.Close()
data, err := ioutil.ReadAll(resp.Body) data, err := io.ReadAll(resp.Body)
if err != nil { if err != nil {
return err return err
} }
@@ -183,7 +183,7 @@ func indexOrUpdateDocument(index, typ string, id int, doc []byte) (err error) {
return err return err
} }
defer resp.Body.Close() defer resp.Body.Close()
data, err := ioutil.ReadAll(resp.Body) data, err := io.ReadAll(resp.Body)
if err != nil { if err != nil {
return err return err
} }
@@ -220,7 +220,7 @@ func deleteIndexDocument(index, typ string, ids []string) error {
return err return err
} }
defer resp.Body.Close() defer resp.Body.Close()
data, err := ioutil.ReadAll(resp.Body) data, err := io.ReadAll(resp.Body)
if err != nil { if err != nil {
return err return err
} }
@@ -272,7 +272,7 @@ func indexQueryDSL(index, typ string, size, from int, dsl []byte) (*SearchIndexR
return nil, err return nil, err
} }
defer resp.Body.Close() defer resp.Body.Close()
data, err := ioutil.ReadAll(resp.Body) data, err := io.ReadAll(resp.Body)
if err != nil { if err != nil {
return nil, err return nil, err
} }

6
pkg/internal/pinger.go
View File

@@ -5,7 +5,7 @@ import (
"bytes" "bytes"
"encoding/xml" "encoding/xml"
"fmt" "fmt"
"io/ioutil" "io"
"net/http" "net/http"
"net/url" "net/url"
@@ -30,7 +30,7 @@ var feedrPingFunc = func(btitle, slug string) error {
return err return err
} }
defer resp.Body.Close() defer resp.Body.Close()
data, err := ioutil.ReadAll(resp.Body) data, err := io.ReadAll(resp.Body)
if err != nil { if err != nil {
return err return err
} }
@@ -88,7 +88,7 @@ var rpcPingFunc = func(btitle, slug string) error {
continue continue
} }
defer resp.Body.Close() defer resp.Body.Close()
data, err := ioutil.ReadAll(resp.Body) data, err := io.ReadAll(resp.Body)
if err != nil { if err != nil {
logrus.Error("rpcPingFunc.ReadAll: ", err) logrus.Error("rpcPingFunc.ReadAll: ", err)
continue continue

4
tools/tmplfunc.go
View File

@@ -4,7 +4,7 @@ package tools
import ( import (
"encoding/base64" "encoding/base64"
htmpl "html/template" htmpl "html/template"
"io/ioutil" "io"
"log" "log"
"net/http" "net/http"
"strings" "strings"
@@ -62,7 +62,7 @@ func GetAvatar(domain string) string {
} }
defer resp.Body.Close() defer resp.Body.Close()
data, err := ioutil.ReadAll(resp.Body) data, err := io.ReadAll(resp.Body)
if err != nil { if err != nil {
log.Println(err) log.Println(err)
return "" return ""

6
tools/tools.go
View File

@@ -6,7 +6,7 @@ import (
"fmt" "fmt"
"io" "io"
"io/fs" "io/fs"
"io/ioutil" "os"
"path" "path"
"regexp" "regexp"
"time" "time"
@@ -23,8 +23,8 @@ func EncryptPasswd(name, pass string) string {
} }
// ReadDirFiles 读取目录 // ReadDirFiles 读取目录
func ReadDirFiles(dir string, filter func(fi fs.FileInfo) bool) (files []string) { func ReadDirFiles(dir string, filter func(fi fs.DirEntry) bool) (files []string) {
fileInfos, err := ioutil.ReadDir(dir) fileInfos, err := os.ReadDir(dir)
if err != nil { if err != nil {
return return
} }