修复Verify实现的错误

.air.toml

@@ -0,0 +1,54 @@
+# https://github.com/cosmtrek/air/blob/master/air_example.toml TOML 格式的配置文件
+
+# 工作目录
+# 使用 . 或绝对路径，请注意 `tmp_dir` 目录必须在 `root` 目录下
+root = "."
+tmp_dir = "tmp"
+
+[build]
+  # 由`cmd`命令得到的二进制文件名
+  bin = "./tmp/main"
+  # 只需要写你平常编译使用的shell命令。你也可以使用 `make`
+  cmd = "go build -o ./tmp/main ."
+  # 如果文件更改过于频繁，则没有必要在每次更改时都触发构建。可以设置触发构建的延迟时间
+  delay = 1000
+  # 忽略这些文件扩展名或目录
+  exclude_dir = ["assets", "tmp", "vendor","public/uploads"]
+  # 忽略以下文件
+  exclude_file = []
+  # 使用正则表达式进行忽略文件设置
+  exclude_regex = []
+  # 忽略未变更的慰问金
+  exclude_unchanged = false
+  # 监控系统链接的目录
+  follow_symlink = false
+  # 自定义参数，可以添加额外的编译标识，例如添加 GIN_MODE=release
+  full_bin = ""
+  # 监听以下指定目录的文件
+  include_dir = []
+  # 监听以下文件扩展名的文件.
+  include_ext = ["go", "tpl", "tmpl", "html", "gohtml", "env"]
+  # kill 命令延迟
+  kill_delay = "0s"
+  # air的日志文件名，该日志文件放置在你的`tmp_dir`中
+  log = "build-errors.log"
+  # 在 kill 之前发送系统中断信号，windows 不支持此功能
+  send_interrupt = false
+  # error 发生是结束运行
+  stop_on_error = true
+
+[color]
+  # 自定义每个部分显示的颜色。如果找不到颜色，使用原始的应用程序日志。
+  app = ""
+  build = "yellow"
+  main = "magenta"
+  runner = "green"
+  watcher = "cyan"
+
+[log]
+  # 显示日志时间
+  time = false
+
+[misc]
+  # 退出时删除tmp目录
+  clean_on_exit = false

.env.example

@@ -0,0 +1,41 @@
+APP_NAME=Gohub
+APP_ENV=local
+APP_KEY=zBqYyQrPNaIUsnRhsGtHLivjqiMjBVLS
+APP_DEBUG=true
+APP_URL=http://localhost:3000
+APP_PORT=3000
+
+DB_CONNECTION=sqlite
+DB_HOST=127.0.0.1
+DB_PORT=3306
+DB_DATABASE=gohub
+DB_USERNAME=root
+DB_PASSWORD=secret
+DB_DEBUG=2
+
+REDIS_HOST=127.0.0.1
+REDIS_PORT=6379
+REDIS_PASSWORD=
+REDIS_CACHE_DB=0
+REDIS_MAIN_DB=1
+
+JWT_EXPIRE_TIME=120
+JWT_EXPIRE_TIME=86400
+
+MAIL_HOST=localhost
+MAIL_PORT=1025
+MAIL_USERNAME=
+MAIL_PASSWORD=
+[email protected]
+MAIL_FROM_NAME=Gohub
+
+SMS_ALIYUN_ACCESS_ID=XXX
+SMS_ALIYUN_ACCESS_SECRET=XXXXX
+SMS_ALIYUN_SIGN_NAME=
+SMS_ALIYUN_TEMPLATE_CODE=
+
+VERIFY_CODE_LENGTH=6
+VERIFY_CODE_EXPIRE=15
+
+LOG_TYPE=single
+LOG_LEVEL=debug

app/cmd/cache.go

@@ -0,0 +1,48 @@
+package cmd
+
+import (
+	"fmt"
+	"gohub/pkg/cache"
+	"gohub/pkg/console"
+
+	"github.com/spf13/cobra"
+)
+
+var CmdCache = &cobra.Command{
+	Use:   "cache",
+	Short: "Cache management",
+}
+
+var CmdCacheClear = &cobra.Command{
+	Use:   "clear",
+	Short: "Clear cache",
+	Run:   runCacheClear,
+}
+
+var CmdCacheForget = &cobra.Command{
+	Use:   "forget",
+	Short: "Delete redis key, example: cache forget cache-key",
+	Run:   runCacheForget,
+}
+
+// forget 命令的选项
+var cacheKey string
+
+func init() {
+	// 注册 cache 命令的子命令
+	CmdCache.AddCommand(CmdCacheClear, CmdCacheForget)
+
+	// 设置 cache forget 命令的选项
+	CmdCacheForget.Flags().StringVarP(&cacheKey, "key", "k", "", "KEY of the cache")
+	CmdCacheForget.MarkFlagRequired("key")
+}
+
+func runCacheClear(cmd *cobra.Command, args []string) {
+	cache.Flush()
+	console.Success("Cache cleared.")
+}
+
+func runCacheForget(cmd *cobra.Command, args []string) {
+	cache.Forget(cacheKey)
+	console.Success(fmt.Sprintf("Cache key [%s] deleted.", cacheKey))
+}

app/cmd/cmd.go

@@ -0,0 +1,27 @@
+// Package cmd 存放程序的所有子命令
+package cmd
+
+import (
+	"gohub/pkg/helpers"
+	"os"
+
+	"github.com/spf13/cobra"
+)
+
+// Env 存储全局选项 --env 的值
+var Env string
+
+// RegisterGlobalFlags 注册全局选项（flag）
+func RegisterGlobalFlags(rootCmd *cobra.Command) {
+	rootCmd.PersistentFlags().StringVarP(&Env, "env", "e", "", "load .env file, example: --env=testing will use .env.testing file")
+}
+
+// RegisterDefaultCmd 注册默认命令
+func RegisterDefaultCmd(rootCmd *cobra.Command, subCmd *cobra.Command) {
+	cmd, _, err := rootCmd.Find(os.Args[1:])
+	firtArg := helpers.FirstElement(os.Args[1:])
+	if err == nil && cmd.Use == rootCmd.Use && firtArg != "-h" && firtArg != "--help" {
+		args := append([]string{subCmd.Use}, os.Args[1:]...)
+		rootCmd.SetArgs(args)
+	}
+}

app/cmd/key.go

@@ -0,0 +1,23 @@
+package cmd
+
+import (
+	"gohub/pkg/console"
+	"gohub/pkg/helpers"
+
+	"github.com/spf13/cobra"
+)
+
+var CmdKey = &cobra.Command{
+	Use:   "key",
+	Short: "Generate App Key, will print the generated Key",
+	Run:   runKeyGenerate,
+	Args:  cobra.NoArgs, // 不允许传参
+}
+
+func runKeyGenerate(cmd *cobra.Command, args []string) {
+	console.Success("---")
+	console.Success("App Key:")
+	console.Success(helpers.RandomString(32))
+	console.Success("---")
+	console.Warning("please go to .env file to change the APP_KEY option")
+}

app/cmd/make/make.go

@@ -0,0 +1,135 @@
+// Package make 命令行的 make 命令
+package make
+
+import (
+	"embed"
+	"fmt"
+	"gohub/pkg/console"
+	"gohub/pkg/file"
+	"gohub/pkg/str"
+	"strings"
+
+	"github.com/iancoleman/strcase"
+	"github.com/spf13/cobra"
+)
+
+// Model 参数解释
+// 单个词，用户命令传参，以 User 模型为例：
+//     - user
+//  - User
+//  - users
+//  - Users
+// 整理好的数据：
+// {
+//     "TableName": "users",
+//     "StructName": "User",
+//     "StructNamePlural": "Users"
+//     "VariableName": "user",
+//     "VariableNamePlural": "users",
+//     "PackageName": "user"
+// }
+// -
+// 两个词或者以上，用户命令传参，以 TopicComment 模型为例：
+//     - topic_comment
+//  - topic_comments
+//  - TopicComment
+//  - TopicComments
+// 整理好的数据：
+// {
+//     "TableName": "topic_comments",
+//     "StructName": "TopicComment",
+//     "StructNamePlural": "TopicComments"
+//     "VariableName": "topicComment",
+//     "VariableNamePlural": "topicComments",
+//     "PackageName": "topic_comment"
+// }
+type Model struct {
+	TableName          string
+	StructName         string
+	StructNamePlural   string
+	VariableName       string
+	VariableNamePlural string
+	PackageName        string
+}
+
+// stubsFS 方便我们后面打包这些 .stub 为后缀名的文件
+
+//go:embed stubs
+var stubsFS embed.FS
+
+// CmdMake 说明 cobra 命令
+var CmdMake = &cobra.Command{
+	Use:   "make",
+	Short: "Generate file and code",
+}
+
+func init() {
+	// 注册 make 的子命令
+	CmdMake.AddCommand(
+		CmdMakeCMD,
+		CmdMakeModel,
+		CmdMakeAPIController,
+		CmdMakeRequest,
+		CmdMakeMigration,
+		CmdMakeFactory,
+		CmdMakeSeeder,
+		CmdMakePolicy,
+	)
+}
+
+// makeModelFromString 格式化用户输入的内容
+func makeModelFromString(name string) Model {
+	model := Model{}
+	model.StructName = str.Singular(strcase.ToCamel(name))
+	model.StructNamePlural = str.Plural(model.StructName)
+	model.TableName = str.Snake(model.StructNamePlural)
+	model.VariableName = str.LowerCamel(model.StructName)
+	model.PackageName = str.Snake(model.StructName)
+	model.VariableNamePlural = str.LowerCamel(model.StructNamePlural)
+	return model
+}
+
+// createFileFromStub 读取 stub 文件并进行变量替换
+// 最后一个选项可选，如若传参，应传 map[string]string 类型，作为附加的变量搜索替换
+func createFileFromStub(filePath string, stubName string, model Model, variables ...interface{}) {
+
+	// 实现最后一个参数可选
+	replaces := make(map[string]string)
+	if len(variables) > 0 {
+		replaces = variables[0].(map[string]string)
+	}
+
+	// 目标文件已存在
+	if file.Exists(filePath) {
+		console.Exit(filePath + " already exists!")
+	}
+
+	// 读取 stub 模板文件
+	modelData, err := stubsFS.ReadFile("stubs/" + stubName + ".stub")
+	if err != nil {
+		console.Exit(err.Error())
+	}
+	modelStub := string(modelData)
+
+	// 添加默认的替换变量
+	replaces["{{VariableName}}"] = model.VariableName
+	replaces["{{VariableNamePlural}}"] = model.VariableNamePlural
+	replaces["{{StructName}}"] = model.StructName
+	replaces["{{StructNamePlural}}"] = model.StructNamePlural
+	replaces["{{PackageName}}"] = model.PackageName
+	replaces["{{TableName}}"] = model.TableName
+
+	// 对模板内容做变量替换
+	for search, replace := range replaces {
+		modelStub = strings.ReplaceAll(modelStub, search, replace)
+	}
+
+	// 存储到目标文件中
+	err = file.Put([]byte(modelStub), filePath)
+	if err != nil {
+		console.Exit(err.Error())
+	}
+
+	// 提示成功
+	console.Success(fmt.Sprintf("[%s] created.", filePath))
+}

app/cmd/make/make_apicontroller.go

@@ -0,0 +1,36 @@
+package make
+
+import (
+	"fmt"
+	"gohub/pkg/console"
+	"strings"
+
+	"github.com/spf13/cobra"
+)
+
+var CmdMakeAPIController = &cobra.Command{
+	Use:   "apicontroller",
+	Short: "Create api controller，exmaple: make apicontroller v1/user",
+	Run:   runMakeAPIController,
+	Args:  cobra.ExactArgs(1), // 只允许且必须传 1 个参数
+}
+
+func runMakeAPIController(cmd *cobra.Command, args []string) {
+
+	// 处理参数，要求附带 API 版本（v1 或者 v2）
+	array := strings.Split(args[0], "/")
+	if len(array) != 2 {
+		console.Exit("api controller name format: v1/user")
+	}
+
+	// apiVersion 用来拼接目标路径
+	// name 用来生成 cmd.Model 实例
+	apiVersion, name := array[0], array[1]
+	model := makeModelFromString(name)
+
+	// 组建目标目录
+	filePath := fmt.Sprintf("app/http/controllers/api/%s/%s_controller.go", apiVersion, model.TableName)
+
+	// 基于模板创建文件（做好变量替换）
+	createFileFromStub(filePath, "apicontroller", model)
+}