feat : added version & config

This commit is contained in:
zhangwenjian committed 2020-08-01 11:00:06 +08:00
1 parent 1a580366fc
commit 309be41b05
5 files changed
+106 -7

No files matched your search

+8 -4
View File
@@ -25,9 +25,10 @@ var (
port string
mode string
StartCmd = &cobra.Command{
Use: "server",
Short: "Start API server",
Example: "go-admin server config/settings.yml",
Use: "server",
Short: "Start API server",
Example: "go-admin server -c config/settings.yml",
SilenceUsage: true,
PreRun: func(cmd *cobra.Command, args []string) {
setup()
},
@@ -35,8 +36,11 @@ var (
return run()
},
}
)
var echoTimes int
func init() {
StartCmd.PersistentFlags().StringVarP(&configYml, "config", "c", "config/settings.yml", "Start server with provided configuration file")
StartCmd.PersistentFlags().StringVarP(&port, "port", "p", "8000", "Tcp port server listening on")
@@ -113,6 +117,6 @@ func run() error {
}
func tip() {
usageStr := `欢迎使用 `+ tools.Green( `go-admin ` +global.Version) + ` 可以使用 ` + tools.Red(`-h`) + ` 查看命令`
usageStr := `欢迎使用 ` + tools.Green(`go-admin `+global.Version) + ` 可以使用 ` + tools.Red(`-h`) + ` 查看命令`
fmt.Printf("%s \n\n", usageStr)
}
+5 -2
View File
@@ -5,7 +5,9 @@ import (
"fmt"
"github.com/spf13/cobra"
"go-admin/cmd/api"
"go-admin/cmd/config"
"go-admin/cmd/migrate"
"go-admin/cmd/version"
"go-admin/global"
"go-admin/tools"
"os"
@@ -13,9 +15,8 @@ import (
var rootCmd = &cobra.Command{
Use: "go-admin",
Short: "-v",
Short: "go-admin",
SilenceUsage: true,
DisableAutoGenTag: true,
Long: `go-admin`,
Args: func(cmd *cobra.Command, args []string) error {
if len(args) < 1 {
@@ -40,6 +41,8 @@ func tip() {
func init() {
rootCmd.AddCommand(api.StartCmd)
rootCmd.AddCommand(migrate.StartCmd)
rootCmd.AddCommand(version.StartCmd)
rootCmd.AddCommand(config.StartCmd)
}
//Execute : apply commands
+61
View File
@@ -0,0 +1,61 @@
package config
import (
"encoding/json"
"fmt"
"go-admin/tools/config"
"github.com/spf13/cobra"
)
var (
configYml string
mode string
StartCmd = &cobra.Command{
Use: "config",
Short: "Get Application config info",
Example: "go-admin config -c config/settings.yml",
Run: func(cmd *cobra.Command, args []string) {
run()
},
}
)
func init() {
StartCmd.PersistentFlags().StringVarP(&configYml, "config", "c", "config/settings.yml", "Start server with provided configuration file")
}
func run() {
config.Setup(configYml)
application, errs := json.MarshalIndent(config.ApplicationConfig, "", " ") //转换成JSON返回的是byte[]
if errs != nil {
fmt.Println(errs.Error())
}
fmt.Println("application:", string(application))
jwt, errs := json.MarshalIndent(config.JwtConfig, "", " ") //转换成JSON返回的是byte[]
if errs != nil {
fmt.Println(errs.Error())
}
fmt.Println("jwt:", string(jwt))
database, errs := json.MarshalIndent(config.DatabaseConfig, "", " ") //转换成JSON返回的是byte[]
if errs != nil {
fmt.Println(errs.Error())
}
fmt.Println("database:", string(database))
gen, errs := json.MarshalIndent(config.GenConfig, "", " ") //转换成JSON返回的是byte[]
if errs != nil {
fmt.Println(errs.Error())
}
fmt.Println("gen:", string(gen))
loggerConfig, errs := json.MarshalIndent(config.LoggerConfig, "", " ") //转换成JSON返回的是byte[]
if errs != nil {
fmt.Println(errs.Error())
}
fmt.Println("logger:", string(loggerConfig))
}
+2 -1
View File
@@ -17,7 +17,8 @@ var (
mode string
StartCmd = &cobra.Command{
Use: "init",
Short: "initialize the database",
Short: "Initialize the database",
Example: "go-admin init -c config/settings.yml",
Run: func(cmd *cobra.Command, args []string) {
run()
},
+30
View File
@@ -0,0 +1,30 @@
package version
import (
"fmt"
"github.com/spf13/cobra"
"go-admin/global"
)
var (
configYml string
port string
mode string
StartCmd = &cobra.Command{
Use: "version",
Short: "Get version info",
Example: "go-admin version",
PreRun: func(cmd *cobra.Command, args []string) {
},
RunE: func(cmd *cobra.Command, args []string) error {
return run()
},
}
)
func run() error {
fmt.Println(global.Version)
return nil
}