[U] 优化命名

guoguangkun · Jul 10, 2020 · 3512d39 · 3512d39
1 parent b76dee7
commit 3512d39
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 16 deletions.
diff --git a/control/auth.go b/control/auth.go
@@ -117,7 +117,7 @@ func Vcode(ctx echo.Context) error {
 		Vcode string `json:"vcode"`
 		Vreal string `json:"vreal"`
 	}{
-		Vcode: vcode.NewImage(rnd).Bs64(),
+		Vcode: vcode.NewImage(rnd).Base64(),
 		Vreal: hmc(rnd, "v.c.o.d.e"),
 	}
 	return ctx.JSON(utils.Succ("succ", out))

diff --git a/internal/vcode/vcode.go b/internal/vcode/vcode.go
@@ -6,7 +6,6 @@ import (
 	"image"
 	"image/color"
 	"image/png"
-	"io"
 	"math"
 	"math/rand"
 	"time"
@@ -75,23 +74,18 @@ func (m *Image) getRandomPalette() color.Palette {
 	return p
 }
 
-// encodedPNG encodes an image to PNG and returns
+// EncodedPNG encodes an image to PNG and returns
 // the result as a byte slice.
-func (m *Image) encodedPNG() []byte {
+func (m *Image) EncodedPNG() []byte {
 	var buf bytes.Buffer
 	if err := png.Encode(&buf, m.Paletted); err != nil {
 		panic(err.Error())
 	}
 	return buf.Bytes()
 }
 
-// WriteTo writes captcha image in PNG format into the given writer.
-func (m *Image) WriteTo(w io.Writer) (int64, error) {
-	n, err := w.Write(m.encodedPNG())
-	return int64(n), err
-}
-func (m *Image) Bs64() string {
-	return base64.RawStdEncoding.EncodeToString(m.encodedPNG())
+func (m *Image) Base64() string {
+	return base64.RawStdEncoding.EncodeToString(m.EncodedPNG())
 }
 
 func (m *Image) calculateSizes(stdWidth, stdHeight, ncount int) {

diff --git a/internal/vcode/vcode_test.go b/internal/vcode/vcode_test.go
@@ -2,7 +2,6 @@ package vcode
 
 import (
 	"fmt"
-	"os"
 	"testing"
 
 	"github.com/zxysilent/utils"
@@ -13,8 +12,5 @@ func TestVcode(t *testing.T) {
 	for i := 0; i < len(s); i++ {
 		fmt.Println(s[i])
 	}
-	fout, _ := os.Create("out.png")
-	NewImage(utils.RandDigitStr(6)).WriteTo(fout)
-	fmt.Println(NewImage(utils.RandDigitStr(6)).Bs64())
-	fout.Close()
+	fmt.Println(NewImage(utils.RandDigitStr(6)).Base64())
 }