Update the name of image v2 (#5)

* Update the name of image v2

Author: wenlng

README.md

@@ -1,4 +1,4 @@
-# Golang Assets File of Captcha
+# Golang Assets File Of GoCaptcha
 Go Captcha presets some default embedded resources and stores them in the Go file format. In addition, you can also configure the captcha according to your own needs.
 
 Source Resources File: https://github.com/wenlng/go-captcha-resources
@@ -29,6 +29,15 @@ func Demo() {
 }
 ```
 
+### Alpha Mixin Text Assets
+```go
+import "github.com/wenlng/go-captcha-assets/bindata/chars"
+
+func Demo() {
+ chars := chars.GetMixinAlphaChars()
+}
+```
+
 ### Font Assets
 ```go
 import "github.com/wenlng/go-captcha-assets/resources/fonts/fzshengsksjw"
@@ -44,10 +53,10 @@ func Demo() {
 ### Image Assets
 ```go
 //import "github.com/wenlng/go-captcha-assets/resources/images"
-import "github.com/wenlng/go-captcha-assets/resources/images_v2"
+import "github.com/wenlng/go-captcha-assets/resources/imagesv2"
 
 func Demo() {
- imgs, err := images.GetImages()
+ imgs, err := imagesv2.GetImages()
  if err != nil {
  log.Fatalln(err)
  }

bindata/chars/char.go

@@ -15,3 +15,24 @@ var alphaChars = "abcdefghijklmnopqrstuvwxyz0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ
 func GetAlphaChars() []string {
 return strings.Split(alphaChars, "")
 }
+
+// GetMixinAlphaChars 数字+字母组合(双组合)
+func GetMixinAlphaChars() []string {
+var ret = make([]string, 0)
+letterArr := strings.Split("ABCDEFGHIJKLMNOPQRSTUVWXYZ", "")
+numArr := strings.Split("0123456789", "")
+
+for _, s := range letterArr {
+for _, n := range numArr {
+ret = append(ret, s+n)
+}
+}
+
+for _, s := range numArr {
+for _, n := range letterArr {
+ret = append(ret, s+n)
+}
+}
+
+return ret
+}

resources/images_v2/images.go

@@ -3,206 +3,10 @@ package images
 import (
 "image"
 
-assets_1 "github.com/wenlng/go-captcha-assets/bindata/images/image_v2_1"
-assets_10 "github.com/wenlng/go-captcha-assets/bindata/images/image_v2_10"
-assets_11 "github.com/wenlng/go-captcha-assets/bindata/images/image_v2_11"
-assets_12 "github.com/wenlng/go-captcha-assets/bindata/images/image_v2_12"
-assets_13 "github.com/wenlng/go-captcha-assets/bindata/images/image_v2_13"
-assets_14 "github.com/wenlng/go-captcha-assets/bindata/images/image_v2_14"
-assets_15 "github.com/wenlng/go-captcha-assets/bindata/images/image_v2_15"
-assets_16 "github.com/wenlng/go-captcha-assets/bindata/images/image_v2_16"
-assets_2 "github.com/wenlng/go-captcha-assets/bindata/images/image_v2_2"
-assets_3 "github.com/wenlng/go-captcha-assets/bindata/images/image_v2_3"
-assets_4 "github.com/wenlng/go-captcha-assets/bindata/images/image_v2_4"
-assets_5 "github.com/wenlng/go-captcha-assets/bindata/images/image_v2_5"
-assets_6 "github.com/wenlng/go-captcha-assets/bindata/images/image_v2_6"
-assets_7 "github.com/wenlng/go-captcha-assets/bindata/images/image_v2_7"
-assets_8 "github.com/wenlng/go-captcha-assets/bindata/images/image_v2_8"
-assets_9 "github.com/wenlng/go-captcha-assets/bindata/images/image_v2_9"
-"github.com/wenlng/go-captcha-assets/helper"
+"github.com/wenlng/go-captcha-assets/resources/imagesv2"
 )
 
+// Deprecated: As of 1.1.0, it will be removed, please use [imagesv2.GetImages()]
 func GetImages() ([]image.Image, error) {
-var images []image.Image
-var asset []byte
-var img image.Image
-var err error
-
-//
-asset, err = assets_1.Asset("sourcedata/images/image-v2-1/image.jpg")
-if err != nil {
-return images, err
-}
-img, err = helper.DecodeByteToJpeg(asset)
-if err != nil {
-return images, err
-}
-images = append(images, img)
-
-//
-asset, err = assets_2.Asset("sourcedata/images/image-v2-2/image.jpg")
-if err != nil {
-return images, err
-}
-img, err = helper.DecodeByteToJpeg(asset)
-if err != nil {
-return images, err
-}
-images = append(images, img)
-
-//
-asset, err = assets_3.Asset("sourcedata/images/image-v2-3/image.jpg")
-if err != nil {
-return images, err
-}
-img, err = helper.DecodeByteToJpeg(asset)
-if err != nil {
-return images, err
-}
-images = append(images, img)
-
-//
-asset, err = assets_4.Asset("sourcedata/images/image-v2-4/image.jpg")
-if err != nil {
-return images, err
-}
-img, err = helper.DecodeByteToJpeg(asset)
-if err != nil {
-return images, err
-}
-images = append(images, img)
-
-//
-asset, err = assets_5.Asset("sourcedata/images/image-v2-5/image.jpg")
-if err != nil {
-return images, err
-}
-img, err = helper.DecodeByteToJpeg(asset)
-if err != nil {
-return images, err
-}
-images = append(images, img)
-
-//
-asset, err = assets_6.Asset("sourcedata/images/image-v2-6/image.jpg")
-if err != nil {
-return images, err
-}
-img, err = helper.DecodeByteToJpeg(asset)
-if err != nil {
-return images, err
-}
-images = append(images, img)
-
-//
-asset, err = assets_7.Asset("sourcedata/images/image-v2-7/image.jpg")
-if err != nil {
-return images, err
-}
-img, err = helper.DecodeByteToJpeg(asset)
-if err != nil {
-return images, err
-}
-images = append(images, img)
-
-//
-asset, err = assets_8.Asset("sourcedata/images/image-v2-8/image.jpg")
-if err != nil {
-return images, err
-}
-img, err = helper.DecodeByteToJpeg(asset)
-if err != nil {
-return images, err
-}
-images = append(images, img)
-
-//
-asset, err = assets_9.Asset("sourcedata/images/image-v2-9/image.jpg")
-if err != nil {
-return images, err
-}
-img, err = helper.DecodeByteToJpeg(asset)
-if err != nil {
-return images, err
-}
-images = append(images, img)
-
-//
-asset, err = assets_10.Asset("sourcedata/images/image-v2-10/image.jpg")
-if err != nil {
-return images, err
-}
-img, err = helper.DecodeByteToJpeg(asset)
-if err != nil {
-return images, err
-}
-images = append(images, img)
-
-//
-asset, err = assets_11.Asset("sourcedata/images/image-v2-11/image.jpg")
-if err != nil {
-return images, err
-}
-img, err = helper.DecodeByteToJpeg(asset)
-if err != nil {
-return images, err
-}
-images = append(images, img)
-
-//
-asset, err = assets_12.Asset("sourcedata/images/image-v2-12/image.jpg")
-if err != nil {
-return images, err
-}
-img, err = helper.DecodeByteToJpeg(asset)
-if err != nil {
-return images, err
-}
-images = append(images, img)
-
-//
-asset, err = assets_13.Asset("sourcedata/images/image-v2-13/image.jpg")
-if err != nil {
-return images, err
-}
-img, err = helper.DecodeByteToJpeg(asset)
-if err != nil {
-return images, err
-}
-images = append(images, img)
-
-//
-asset, err = assets_14.Asset("sourcedata/images/image-v2-14/image.jpg")
-if err != nil {
-return images, err
-}
-img, err = helper.DecodeByteToJpeg(asset)
-if err != nil {
-return images, err
-}
-images = append(images, img)
-
-//
-asset, err = assets_15.Asset("sourcedata/images/image-v2-15/image.jpg")
-if err != nil {
-return images, err
-}
-img, err = helper.DecodeByteToJpeg(asset)
-if err != nil {
-return images, err
-}
-images = append(images, img)
-
-//
-asset, err = assets_16.Asset("sourcedata/images/image-v2-16/image.jpg")
-if err != nil {
-return images, err
-}
-img, err = helper.DecodeByteToJpeg(asset)
-if err != nil {
-return images, err
-}
-images = append(images, img)
-
-return images, nil
+return imagesv2.GetImages()
 }