From 726e4e3dc1291a9fb7713e3fafa98c05f489eb4c Mon Sep 17 00:00:00 2001 From: Eng Zer Jun Date: Mon, 13 Dec 2021 09:49:43 +0800 Subject: [PATCH] refactor: move from io/ioutil to io and os packages (#366) * chore: format code by running `go fmt ./...` Signed-off-by: Eng Zer Jun * refactor: move from io/ioutil to io and os packages The io/ioutil package has been deprecated as of Go 1.16, see https://golang.org/doc/go1.16#ioutil. This commit replaces the existing io/ioutil functions with their new definitions in io and os packages. Signed-off-by: Eng Zer Jun --- controllers/verification.go | 2 +- idp/dingtalk.go | 5 ++--- idp/gitee.go | 3 +-- idp/github.go | 4 ++-- idp/gitlab.go | 10 +++++----- idp/google.go | 4 ++-- idp/lark.go | 5 ++--- idp/linkedin.go | 5 ++--- idp/qq.go | 8 ++++---- idp/wecom.go | 3 +-- idp/weibo.go | 3 +-- object/avatar.go | 2 +- object/record.go | 2 +- util/path.go | 2 +- util/string.go | 10 +++++----- 15 files changed, 31 insertions(+), 37 deletions(-) diff --git a/controllers/verification.go b/controllers/verification.go index 5729b715..fc33df7a 100644 --- a/controllers/verification.go +++ b/controllers/verification.go @@ -37,7 +37,7 @@ func (c *ApiController) getCurrentUser() *object.User { // SendVerificationCode ... // @Title SendVerificationCode // @Tag Verification API -// @router /send-verification-code [post] +// @router /send-verification-code [post] func (c *ApiController) SendVerificationCode() { destType := c.Ctx.Request.Form.Get("type") dest := c.Ctx.Request.Form.Get("dest") diff --git a/idp/dingtalk.go b/idp/dingtalk.go index a48ef3bd..1ad340ae 100644 --- a/idp/dingtalk.go +++ b/idp/dingtalk.go @@ -22,7 +22,6 @@ import ( "encoding/json" "fmt" "io" - "io/ioutil" "net/http" "net/url" "strconv" @@ -132,7 +131,7 @@ func (idp *DingTalkIdProvider) GetToken(code string) (*oauth2.Token, error) { } }(resp.Body) - body, _ := ioutil.ReadAll(resp.Body) + body, _ := io.ReadAll(resp.Body) info := InfoResp{} _ = json.Unmarshal(body, &info) errCode := info.Errcode @@ -148,7 +147,7 @@ func (idp *DingTalkIdProvider) GetToken(code string) (*oauth2.Token, error) { return } }(resp.Body) - body, _ = ioutil.ReadAll(resp.Body) + body, _ = io.ReadAll(resp.Body) tokenResp := DingTalkAccessToken{} _ = json.Unmarshal(body, &tokenResp) if tokenResp.ErrCode != 0 { diff --git a/idp/gitee.go b/idp/gitee.go index a150a6fe..da15a7cc 100644 --- a/idp/gitee.go +++ b/idp/gitee.go @@ -19,7 +19,6 @@ import ( "encoding/json" "fmt" "io" - "io/ioutil" "net/http" "net/url" "strconv" @@ -93,7 +92,7 @@ func (idp *GiteeIdProvider) GetToken(code string) (*oauth2.Token, error) { if err != nil { return nil, err } - rbs, err := ioutil.ReadAll(resp.Body) + rbs, err := io.ReadAll(resp.Body) if err != nil { return nil, err } diff --git a/idp/github.go b/idp/github.go index 36c78c80..4dc29716 100644 --- a/idp/github.go +++ b/idp/github.go @@ -17,7 +17,7 @@ package idp import ( "context" "encoding/json" - "io/ioutil" + "io" "net/http" "strconv" "time" @@ -172,7 +172,7 @@ func (idp *GithubIdProvider) GetUserInfo(token *oauth2.Token) (*UserInfo, error) defer resp.Body.Close() - body, err := ioutil.ReadAll(resp.Body) + body, err := io.ReadAll(resp.Body) if err != nil { return nil, err } diff --git a/idp/gitlab.go b/idp/gitlab.go index 60521450..fc592010 100644 --- a/idp/gitlab.go +++ b/idp/gitlab.go @@ -17,7 +17,7 @@ package idp import ( "encoding/json" "fmt" - "io/ioutil" + "io" "net/http" "net/url" "strconv" @@ -85,7 +85,7 @@ func (idp *GitlabIdProvider) GetToken(code string) (*oauth2.Token, error) { return nil, err } - data, err := ioutil.ReadAll(resp.Body) + data, err := io.ReadAll(resp.Body) if err != nil { return nil, err } @@ -204,18 +204,18 @@ type GitlabUserInfo struct { // GetUserInfo use GitlabProviderToken gotten before return GitlabUserInfo func (idp *GitlabIdProvider) GetUserInfo(token *oauth2.Token) (*UserInfo, error) { - resp, err := idp.Client.Get("https://gitlab.com/api/v4/user?access_token="+token.AccessToken) + resp, err := idp.Client.Get("https://gitlab.com/api/v4/user?access_token=" + token.AccessToken) if err != nil { return nil, err } - data, err := ioutil.ReadAll(resp.Body) + data, err := io.ReadAll(resp.Body) if err != nil { return nil, err } guser := GitlabUserInfo{} - if err = json.Unmarshal(data, &guser);err != nil { + if err = json.Unmarshal(data, &guser); err != nil { return nil, err } diff --git a/idp/google.go b/idp/google.go index a0c84275..58fc7705 100644 --- a/idp/google.go +++ b/idp/google.go @@ -19,7 +19,7 @@ import ( "encoding/json" "errors" "fmt" - "io/ioutil" + "io" "net/http" "golang.org/x/oauth2" @@ -95,7 +95,7 @@ func (idp *GoogleIdProvider) GetUserInfo(token *oauth2.Token) (*UserInfo, error) } defer resp.Body.Close() - body, err := ioutil.ReadAll(resp.Body) + body, err := io.ReadAll(resp.Body) if err != nil { return nil, err } diff --git a/idp/lark.go b/idp/lark.go index dcf18551..ea8028e2 100644 --- a/idp/lark.go +++ b/idp/lark.go @@ -17,7 +17,6 @@ package idp import ( "encoding/json" "io" - "io/ioutil" "net/http" "strings" "time" @@ -169,7 +168,7 @@ func (idp *LarkIdProvider) GetUserInfo(token *oauth2.Token) (*UserInfo, error) { req.Header.Set("Authorization", "Bearer "+token.AccessToken) resp, err := idp.Client.Do(req) - data, err = ioutil.ReadAll(resp.Body) + data, err = io.ReadAll(resp.Body) err = resp.Body.Close() if err != nil { return nil, err @@ -201,7 +200,7 @@ func (idp *LarkIdProvider) postWithBody(body interface{}, url string) ([]byte, e if err != nil { return nil, err } - data, err := ioutil.ReadAll(resp.Body) + data, err := io.ReadAll(resp.Body) if err != nil { return nil, err } diff --git a/idp/linkedin.go b/idp/linkedin.go index 110893b7..0899b18a 100644 --- a/idp/linkedin.go +++ b/idp/linkedin.go @@ -18,7 +18,6 @@ import ( "encoding/json" "fmt" "io" - "io/ioutil" "net/http" "net/url" "strings" @@ -85,7 +84,7 @@ func (idp *LinkedInIdProvider) GetToken(code string) (*oauth2.Token, error) { if err != nil { return nil, err } - rbs, err := ioutil.ReadAll(resp.Body) + rbs, err := io.ReadAll(resp.Body) if err != nil { return nil, err } @@ -323,7 +322,7 @@ func (idp *LinkedInIdProvider) GetUrlRespWithAuthorization(url, token string) ([ } }(resp.Body) - bs, err := ioutil.ReadAll(resp.Body) + bs, err := io.ReadAll(resp.Body) if err != nil { return nil, err } diff --git a/idp/qq.go b/idp/qq.go index 1a894e94..1056fdfb 100644 --- a/idp/qq.go +++ b/idp/qq.go @@ -18,7 +18,7 @@ import ( "encoding/json" "errors" "fmt" - "io/ioutil" + "io" "net/http" "net/url" "regexp" @@ -75,7 +75,7 @@ func (idp *QqIdProvider) GetToken(code string) (*oauth2.Token, error) { } defer resp.Body.Close() - tokenContent, err := ioutil.ReadAll(resp.Body) + tokenContent, err := io.ReadAll(resp.Body) re := regexp.MustCompile("token=(.*?)&") matched := re.FindAllStringSubmatch(string(tokenContent), -1) @@ -145,7 +145,7 @@ func (idp *QqIdProvider) GetUserInfo(token *oauth2.Token) (*UserInfo, error) { } defer resp.Body.Close() - openIdBody, err := ioutil.ReadAll(resp.Body) + openIdBody, err := io.ReadAll(resp.Body) re := regexp.MustCompile("\"openid\":\"(.*?)\"}") matched := re.FindAllStringSubmatch(string(openIdBody), -1) @@ -161,7 +161,7 @@ func (idp *QqIdProvider) GetUserInfo(token *oauth2.Token) (*UserInfo, error) { } defer resp.Body.Close() - userInfoBody, err := ioutil.ReadAll(resp.Body) + userInfoBody, err := io.ReadAll(resp.Body) if err != nil { return nil, err } diff --git a/idp/wecom.go b/idp/wecom.go index f422d39b..872ff049 100644 --- a/idp/wecom.go +++ b/idp/wecom.go @@ -18,7 +18,6 @@ import ( "encoding/json" "fmt" "io" - "io/ioutil" "net/http" "strings" "time" @@ -195,7 +194,7 @@ func (idp *WeComIdProvider) postWithBody(body interface{}, url string) ([]byte, if err != nil { return nil, err } - data, err := ioutil.ReadAll(resp.Body) + data, err := io.ReadAll(resp.Body) if err != nil { return nil, err } diff --git a/idp/weibo.go b/idp/weibo.go index 191642b0..20c4d9f6 100644 --- a/idp/weibo.go +++ b/idp/weibo.go @@ -19,7 +19,6 @@ import ( "encoding/json" "fmt" "io" - "io/ioutil" "net/http" "net/url" "strconv" @@ -92,7 +91,7 @@ func (idp *WeiBoIdProvider) GetToken(code string) (*oauth2.Token, error) { return } }(resp.Body) - bs, err := ioutil.ReadAll(resp.Body) + bs, err := io.ReadAll(resp.Body) if err != nil { return nil, err } diff --git a/object/avatar.go b/object/avatar.go index 3dfdd73f..6e94eb4f 100644 --- a/object/avatar.go +++ b/object/avatar.go @@ -26,7 +26,7 @@ import ( var defaultStorageProvider *Provider = nil func InitDefaultStorageProvider() { - defaultStorageProviderStr := beego.AppConfig.String("defaultStorageProvider") + defaultStorageProviderStr := beego.AppConfig.String("defaultStorageProvider") if defaultStorageProviderStr != "" { defaultStorageProvider = getProvider("admin", defaultStorageProviderStr) } diff --git a/object/record.go b/object/record.go index 27475eac..691facbc 100644 --- a/object/record.go +++ b/object/record.go @@ -53,7 +53,7 @@ type Record struct { func NewRecord(ctx *context.Context) *Record { ip := strings.Replace(util.GetIPFromRequest(ctx.Request), ": ", "", -1) action := strings.Replace(ctx.Request.URL.Path, "/api/", "", -1) - requestUri := util.FilterQuery(ctx.Request.RequestURI, []string{ "accessToken" }) + requestUri := util.FilterQuery(ctx.Request.RequestURI, []string{"accessToken"}) if len(requestUri) > 1000 { requestUri = requestUri[0:1000] } diff --git a/util/path.go b/util/path.go index 550b3daa..ce3f83d8 100644 --- a/util/path.go +++ b/util/path.go @@ -69,4 +69,4 @@ func FilterQuery(urlString string, blackList []string) string { } else { return urlData.Path } -} \ No newline at end of file +} diff --git a/util/string.go b/util/string.go index 62fd2cdb..ab64d7a9 100644 --- a/util/string.go +++ b/util/string.go @@ -19,7 +19,7 @@ import ( "encoding/hex" "errors" "fmt" - "io/ioutil" + "os" "strconv" "strings" @@ -98,7 +98,7 @@ func GetMinLenStr(strs ...string) string { } func ReadStringFromPath(path string) string { - data, err := ioutil.ReadFile(path) + data, err := os.ReadFile(path) if err != nil { panic(err) } @@ -107,14 +107,14 @@ func ReadStringFromPath(path string) string { } func WriteStringToPath(s string, path string) { - err := ioutil.WriteFile(path, []byte(s), 0644) + err := os.WriteFile(path, []byte(s), 0644) if err != nil { panic(err) } } func ReadBytesFromPath(path string) []byte { - data, err := ioutil.ReadFile(path) + data, err := os.ReadFile(path) if err != nil { panic(err) } @@ -123,7 +123,7 @@ func ReadBytesFromPath(path string) []byte { } func WriteBytesToPath(b []byte, path string) { - err := ioutil.WriteFile(path, b, 0644) + err := os.WriteFile(path, b, 0644) if err != nil { panic(err) }