fix: improve code format (#2665)

* feat: replace io/ioutils pacakage with io/os package

* fix: add missing error handling
This commit is contained in:
dacongda 2024-02-01 23:06:12 +08:00 committed by GitHub
parent 0918757e85
commit e593f5be5b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 26 additions and 9 deletions

View File

@ -19,7 +19,7 @@ import (
"encoding/json" "encoding/json"
"encoding/xml" "encoding/xml"
"fmt" "fmt"
"io/ioutil" "io"
"net/http" "net/http"
"net/url" "net/url"
"strconv" "strconv"
@ -921,7 +921,7 @@ func (c *ApiController) HandleSamlLogin() {
// @router /webhook [POST] // @router /webhook [POST]
// @Success 200 {object} object.Userinfo The Response object // @Success 200 {object} object.Userinfo The Response object
func (c *ApiController) HandleOfficialAccountEvent() { func (c *ApiController) HandleOfficialAccountEvent() {
respBytes, err := ioutil.ReadAll(c.Ctx.Request.Body) respBytes, err := io.ReadAll(c.Ctx.Request.Body)
if err != nil { if err != nil {
c.ResponseError(err.Error()) c.ResponseError(err.Error())
return return

View File

@ -121,6 +121,10 @@ func (c *ApiController) Enforce() {
} }
} else if owner != "" { } else if owner != "" {
permissions, err = object.GetPermissions(owner) permissions, err = object.GetPermissions(owner)
if err != nil {
c.ResponseError(err.Error())
return
}
} else { } else {
c.ResponseError(c.T("general:Missing parameter")) c.ResponseError(c.T("general:Missing parameter"))
return return
@ -235,6 +239,10 @@ func (c *ApiController) BatchEnforce() {
} }
} else if owner != "" { } else if owner != "" {
permissions, err = object.GetPermissions(owner) permissions, err = object.GetPermissions(owner)
if err != nil {
c.ResponseError(err.Error())
return
}
} else { } else {
c.ResponseError(c.T("general:Missing parameter")) c.ResponseError(c.T("general:Missing parameter"))
return return

View File

@ -47,6 +47,11 @@ func (c *ApiController) GetSystemInfo() {
// @router /get-version-info [get] // @router /get-version-info [get]
func (c *ApiController) GetVersionInfo() { func (c *ApiController) GetVersionInfo() {
versionInfo, err := util.GetVersionInfo() versionInfo, err := util.GetVersionInfo()
if err != nil {
c.ResponseError(err.Error())
return
}
if versionInfo.Version != "" { if versionInfo.Version != "" {
c.ResponseOk(versionInfo) c.ResponseOk(versionInfo)
return return

View File

@ -20,7 +20,6 @@ import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"io" "io"
"io/ioutil"
"net/http" "net/http"
"net/url" "net/url"
"strings" "strings"
@ -218,7 +217,7 @@ func GetWechatOfficialAccountAccessToken(clientId string, clientSecret string) (
} }
defer resp.Body.Close() defer resp.Body.Close()
respBytes, err := ioutil.ReadAll(resp.Body) respBytes, err := io.ReadAll(resp.Body)
if err != nil { if err != nil {
return "", err return "", err
} }
@ -255,7 +254,7 @@ func GetWechatOfficialAccountQRCode(clientId string, clientSecret string) (strin
} }
defer resp.Body.Close() defer resp.Body.Close()
respBytes, err := ioutil.ReadAll(resp.Body) respBytes, err := io.ReadAll(resp.Body)
if err != nil { if err != nil {
return "", err return "", err
} }

View File

@ -16,7 +16,6 @@ package util
import ( import (
"fmt" "fmt"
"io/ioutil"
"net/url" "net/url"
"os" "os"
"path/filepath" "path/filepath"
@ -40,7 +39,7 @@ func GetPath(path string) string {
func ListFiles(path string) []string { func ListFiles(path string) []string {
res := []string{} res := []string{}
files, err := ioutil.ReadDir(path) files, err := os.ReadDir(path)
if err != nil { if err != nil {
panic(err) panic(err)
} }

View File

@ -14,10 +14,10 @@
package util package util
import "io/ioutil" import "os"
func GetUploadXlsxPath(fileId string) string { func GetUploadXlsxPath(fileId string) string {
file, err := ioutil.TempFile("", fileId) file, err := os.CreateTemp("", fileId)
if err != nil { if err != nil {
panic(err) panic(err)
} }

View File

@ -119,6 +119,9 @@ func GetVersionInfo() (*VersionInfo, error) {
} }
cIter, err := r.Log(&git.LogOptions{From: ref.Hash()}) cIter, err := r.Log(&git.LogOptions{From: ref.Hash()})
if err != nil {
return res, err
}
commitOffset := 0 commitOffset := 0
version := "" version := ""

View File

@ -70,6 +70,9 @@ func TestGetVersion(t *testing.T) {
testHash := plumbing.NewHash("f8bc87eb4e5ba3256424cf14aafe0549f812f1cf") testHash := plumbing.NewHash("f8bc87eb4e5ba3256424cf14aafe0549f812f1cf")
cIter, err := r.Log(&git.LogOptions{From: testHash}) cIter, err := r.Log(&git.LogOptions{From: testHash})
if err != nil {
t.Log(err)
}
aheadCnt := 0 aheadCnt := 0
releaseVersion := "" releaseVersion := ""