refact(deprecated): update these deprecated methods

ArtisanCloud · Jul 7, 2024 · 0b35b35 · 0b35b35
1 parent fb8ade5
commit 0b35b35
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 26 deletions.
diff --git a/src/kernel/baseClient.go b/src/kernel/baseClient.go
@@ -559,8 +559,8 @@ func (client *BaseClient) CheckTokenNeedRefresh(req *http.Request, rs *http.Resp
 			}
 
 			return res2, err
-			//b, err := ioutil.ReadAll(res2.Body)
-			//rs.Body = ioutil.NopCloser(bytes.NewBuffer(b))
+			//b, err := io.ReadAll(res2.Body)
+			//rs.Body = io.NopCloser(bytes.NewBuffer(b))
 			//content := string(b)
 			//fmt2.Dump(content)
 		}

diff --git a/src/kernel/support/responseCastable.go b/src/kernel/support/responseCastable.go
@@ -8,7 +8,7 @@ import (
 	"github.com/ArtisanCloud/PowerLibs/v3/object"
 	response2 "github.com/ArtisanCloud/PowerWeChat/v3/src/kernel/response"
 	"go/types"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"reflect"
 )
@@ -25,7 +25,7 @@ func (responseCastable *ResponseCastable) CastResponseToType(response *http.Resp
 	switch castType {
 
 	case response2.TYPE_ARRAY:
-		body, err := ioutil.ReadAll(response.Body)
+		body, err := io.ReadAll(response.Body)
 		if err != nil {
 			return nil, err
 		}
@@ -34,7 +34,7 @@ func (responseCastable *ResponseCastable) CastResponseToType(response *http.Resp
 
 		return data, err
 	case response2.TYPE_MAP:
-		body, err := ioutil.ReadAll(response.Body)
+		body, err := io.ReadAll(response.Body)
 		if err != nil {
 			return nil, err
 		}
@@ -67,22 +67,22 @@ func (responseCastable *ResponseCastable) DetectAndCastResponseToType(response i
 	case types.Array:
 
 		postBodyBuf, _ := json.Marshal(response.(types.Array))
-		returnResponse.Body = ioutil.NopCloser(bytes.NewBuffer(postBodyBuf))
+		returnResponse.Body = io.NopCloser(bytes.NewBuffer(postBodyBuf))
 
 		break
 	case object.HashMap:
 		postBodyBuf, _ := json.Marshal(response.(object.HashMap))
-		returnResponse.Body = ioutil.NopCloser(bytes.NewBuffer(postBodyBuf))
+		returnResponse.Body = io.NopCloser(bytes.NewBuffer(postBodyBuf))
 
 		break
 	case *object.HashMap:
 		postBodyBuf, _ := json.Marshal(response.(*object.HashMap))
-		returnResponse.Body = ioutil.NopCloser(bytes.NewBuffer(postBodyBuf))
+		returnResponse.Body = io.NopCloser(bytes.NewBuffer(postBodyBuf))
 
 		break
 	case string:
 		postBodyBuf, _ := json.Marshal(response.(string))
-		returnResponse.Body = ioutil.NopCloser(bytes.NewBuffer(postBodyBuf))
+		returnResponse.Body = io.NopCloser(bytes.NewBuffer(postBodyBuf))
 
 		break
 	default:

diff --git a/src/kernel/support/rsa_oaep.go b/src/kernel/support/rsa_oaep.go
@@ -8,7 +8,7 @@ import (
 	"encoding/pem"
 	"fmt"
 	"hash"
-	"io/ioutil"
+	"os"
 )
 
 type RSAOaep struct {
@@ -42,7 +42,7 @@ func (r *RSAOaep) EncryptOAEP(text []byte) ([]byte, error) {
 	return cipherData, nil
 }
 
-func (r *RSAOaep) DecryptOAEP(hash hash.Hash,cipherMsg []byte) ([]byte, error) {
+func (r *RSAOaep) DecryptOAEP(hash hash.Hash, cipherMsg []byte) ([]byte, error) {
 	if r.PrivateKey == nil && r.PrivateKeyPath == "" {
 		return nil, fmt.Errorf("you must set privatekey to use EncryptOAEP")
 	}
@@ -67,7 +67,7 @@ func (r *RSAOaep) DecryptOAEP(hash hash.Hash,cipherMsg []byte) ([]byte, error) {
 }
 
 func (r *RSAOaep) getPublicKey() (*rsa.PublicKey, error) {
-	keyStr, err := ioutil.ReadFile(r.PublicKeyPath)
+	keyStr, err := os.ReadFile(r.PublicKeyPath)
 
 	if err != nil {
 		return nil, err
@@ -90,7 +90,7 @@ func (r *RSAOaep) getPublicKey() (*rsa.PublicKey, error) {
 }
 
 func (r *RSAOaep) getPrivateKey() (*rsa.PrivateKey, error) {
-	keyStr, err := ioutil.ReadFile(r.PrivateKeyPath)
+	keyStr, err := os.ReadFile(r.PrivateKeyPath)
 
 	if err != nil {
 		return nil, err

diff --git a/src/kernel/support/signer.go b/src/kernel/support/signer.go
@@ -13,7 +13,6 @@ import (
 	"errors"
 	"fmt"
 	"github.com/ArtisanCloud/PowerLibs/v3/object"
-	"io/ioutil"
 	"os"
 	"strings"
 	"time"
@@ -133,7 +132,7 @@ func (s *SHA256WithRSASigner) getPrivateKey() (*rsa.PrivateKey, error) {
 
 	if fileInfo, err := os.Stat(s.PrivateKeyPath); err == nil && !fileInfo.IsDir() {
 		// 读取私钥文件
-		keyBytes, err = ioutil.ReadFile(s.PrivateKeyPath)
+		keyBytes, err = os.ReadFile(s.PrivateKeyPath)
 		if err != nil {
 			return nil, err
 		}

diff --git a/src/miniProgram/wxaCode/client.go b/src/miniProgram/wxaCode/client.go
@@ -6,9 +6,10 @@ import (
 	"github.com/ArtisanCloud/PowerWeChat/v3/src/kernel"
 	"github.com/ArtisanCloud/PowerWeChat/v3/src/kernel/power"
 	response4 "github.com/ArtisanCloud/PowerWeChat/v3/src/work/media/response"
+	"io"
 	"io/fs"
-	"io/ioutil"
 	"net/http"
+	"os"
 )
 
 type Client struct {
@@ -76,8 +77,8 @@ func (comp *Client) SaveAs(ctx context.Context, savedPath string, perm fs.FileMo
 		return err
 	}
 
-	body, err := ioutil.ReadAll(rs.Body)
-	err = ioutil.WriteFile(savedPath, body, perm) //保存图片地址
+	body, err := io.ReadAll(rs.Body)
+	err = os.WriteFile(savedPath, body, perm) //保存图片地址
 
 	return err
 }

diff --git a/src/officialAccount/server/guard.go b/src/officialAccount/server/guard.go
@@ -4,7 +4,7 @@ import (
 	"bytes"
 	logger2 "github.com/ArtisanCloud/PowerLibs/v3/logger"
 	"github.com/ArtisanCloud/PowerWeChat/v3/src/kernel"
-	"io/ioutil"
+	"io"
 	"net/http"
 )
 
@@ -33,7 +33,7 @@ func (guard *Guard) VerifyURL(request *http.Request) (httpRS *http.Response, err
 		return nil, err
 	}
 
-	bodyData := ioutil.NopCloser(bytes.NewBufferString(request.URL.Query().Get("echostr")))
+	bodyData := io.NopCloser(bytes.NewBufferString(request.URL.Query().Get("echostr")))
 	rs := &http.Response{
 		Body:       bodyData,
 		StatusCode: http.StatusOK,

diff --git a/src/openPlatform/server/guard.go b/src/openPlatform/server/guard.go
@@ -5,7 +5,6 @@ import (
 	"encoding/xml"
 	"errors"
 	"io"
-	"io/ioutil"
 	"net/http"
 
 	"github.com/ArtisanCloud/PowerLibs/v3/object"
@@ -137,7 +136,7 @@ func (guard *Guard) OverrideResolve() {
 
 		httpRS = &http.Response{
 			StatusCode: http.StatusOK,
-			Body:       ioutil.NopCloser(bytes.NewBuffer([]byte(kernel.SUCCESS_EMPTY_RESPONSE))),
+			Body:       io.NopCloser(bytes.NewBuffer([]byte(kernel.SUCCESS_EMPTY_RESPONSE))),
 		}
 
 		return httpRS, nil
@@ -160,7 +159,7 @@ func (guard *Guard) GetMessage(request *http.Request) (verifyTicket *response2.R
 		if err != nil || b == nil {
 			return nil, err
 		}
-		request.Body = ioutil.NopCloser(bytes.NewBuffer(b))
+		request.Body = io.NopCloser(bytes.NewBuffer(b))
 	}
 	verifyTicket = &response2.ResponseVerifyTicket{}
 	err = guard.parseMessage(string(b), verifyTicket)

diff --git a/src/payment/notify/handler.go b/src/payment/notify/handler.go
@@ -10,7 +10,7 @@ import (
 	base2 "github.com/ArtisanCloud/PowerWeChat/v3/src/payment/base"
 	"github.com/ArtisanCloud/PowerWeChat/v3/src/payment/kernel"
 	"github.com/ArtisanCloud/PowerWeChat/v3/src/payment/notify/request"
-	"io/ioutil"
+	"io"
 	"net/http"
 )
 
@@ -84,7 +84,7 @@ func (handler *Handler) ToResponse() (response *http.Response, err error) {
 	rs := &http.Response{
 		StatusCode: http.StatusOK,
 	}
-	rs.Body = ioutil.NopCloser(bytes.NewBuffer(bodyBuffer))
+	rs.Body = io.NopCloser(bytes.NewBuffer(bodyBuffer))
 
 	return rs, err
 }
@@ -97,7 +97,7 @@ func (handler *Handler) GetMessage() (notify *request.RequestNotify, err error)
 
 	externalRequest := handler.ExternalRequest
 
-	requestBody, err := ioutil.ReadAll(externalRequest.Body)
+	requestBody, err := io.ReadAll(externalRequest.Body)
 	if err != nil {
 		return nil, err
 	}