ginhelper执行输出明细

Author: wangwei

README.md

@@ -65,7 +65,7 @@ __(2)、如果你只是在src目录下开发项目，你可以这样操作，这
     2、下载其他的依赖
 
        go get -u github.com/gin-gonic/gin
-       go get github.com/astaxie/beego  #这里我们可以使用beego的config、httplib、logs、cache等模块
+       go get github.com/astaxie/beego/config  #这里我们可以使用beego的config, 如果你还想使用beego的其他模块请自行下载，如：httplib、logs、cache等模块
        go get github.com/beego/bee  #可选下载
        github.com/jinzhu/gorm
        github.com/go-redis/redis

main.go

@@ -3,32 +3,43 @@ package main
 import (
 	"flag"
 	"fmt"
+	"github.com/logrusorgru/aurora"
 	"github.com/will110/ginhelper/project"
 )
 
-const usage = `
-Ginhelper is a gin web framework helper, Help you develop fast.
-
-USAGE
-
-    ginhelper [arguments]
-
-AVAILABLE ARGUMENTS
-
-	create -> Create single gin web framework
-`
+const _version = "v1.1.1"
 
 func main() {
 	flag.Parse()
 	arg := flag.Args()
 	if len(arg) == 0 {
-		fmt.Println(usage)
+		getHelp()
 		return
 	}
 
-	if arg[0] == "create" {
+	switch arg[0] {
+	case "create":
 		project.GenerateProject()
-	} else {
-		fmt.Println(usage)
+	case "version":
+		fmt.Println("ginhelper " + _version)
+	case "help":
+		getHelp()
+	default:
+		getHelp()
 	}
 }
+
+func getHelp() {
+	title :=aurora.White("Ginhelper is a gin web framework helper, Help you develop fast.")
+	usage := aurora.Magenta("USAGE")
+	t1 := aurora.BrightWhite("ginhelper [arguments]")
+	t2 := aurora.Underline(aurora.Magenta("AVAILABLE ARGUMENTS"))
+	t3 := aurora.BrightWhite("create       ")
+	t4 := aurora.Underline(aurora.BrightWhite("Create single gin web framework"))
+	t5 := aurora.BrightWhite("version      ")
+	t6 := aurora.Underline(aurora.BrightWhite("Prints the current GinHelper version"))
+	t7 := aurora.Underline(aurora.BrightWhite("Use ginhelper help for more information."))
+
+	buf := fmt.Sprintf("%v\n\n%v\n    %v\n\n%v\n\n    %v%v\n    %v%v\n\n\n\n%v", title, usage, t1, t2, t3, t4, t5, t6, t7)
+	fmt.Println(buf)
+}

project/project.go

@@ -4,12 +4,14 @@ import (
 	"bufio"
 	"errors"
 	"fmt"
+	"github.com/logrusorgru/aurora"
 	"log"
 	"os"
 	"os/exec"
 	"path"
 	"path/filepath"
 	"strings"
+	"time"
 )
 
 var dirList = []string{
@@ -56,10 +58,10 @@ func GenerateProject() {
 		appName = modName
 	}
 
-	fmt.Println("Project creating ...")
+	fmt.Println(aurora.BrightWhite("[INFO] Creating project..."))
 	generateDir()
 	generateAllFile()
-	fmt.Println("Congratulations on the completion of the project. Take a look at it.")
+	fmt.Println(aurora.BrightRed(time.Now().Format("2006-01-02 15:04:05") + " [SUCC] New project successfully created, Take a look at it."))
 }
 
 func generateDir() {
@@ -69,6 +71,8 @@ func generateDir() {
 		if _, err := os.Stat(fp); os.IsNotExist(err) {
 			if er := os.MkdirAll(fp, 0777); er != nil {
 				log.Fatalf("Could not create the "+ v +" directory: %s", er)
+			}else {
+				fmt.Println(strings.ReplaceAll(fp, "/", getSep()))
 			}
 		}
 	}
@@ -137,6 +141,7 @@ func generateGitignoreFile() {
 	gitignoreTmep += appName + ".exe\n" + appName + ".exe*\n" + appName+"\n"
 	_, _ = f.WriteString(gitignoreTmep)
 	_ = f.Close()
+	fmt.Println(strings.ReplaceAll(fpath, "/", getSep()))
 }
 
 func getAppDir() (string, error) {
@@ -210,4 +215,10 @@ func generateFile(dir, fileName, str string, ext ...string) {
 	_ = f.Close()
 	cmd := exec.Command("gofmt", "-w", fpath)
 	_ = cmd.Run()
+
+	fmt.Println(strings.ReplaceAll(fpath, "/", getSep()))
+}
+
+func getSep() string {
+	return string(filepath.Separator)
 }

project/temp.go

@@ -204,20 +204,26 @@ var localAppConf = `name = "hello-local"
 var previewAppConf = `include "app.conf"
 #当前环境的配置可以配置在这里
 
+name = "preivew"
+
 #请保持在最后一行
 include "local_app.conf"
 `
 
 var prodAppConf = `include "app.conf"
 #当前环境的配置可以配置在这里
 
+name = "prod"
+
 #请保持在最后一行
 include "local_app.conf"
 `
 
 var testAppConf = `include "app.conf"
 #当前环境的配置可以配置在这里
 
+name = "test"
+
 #请保持在最后一行
 include "local_app.conf"
 `
@@ -359,20 +365,20 @@ import (
 	"flag"
 	"github.com/jinzhu/gorm"
 	"fmt"
-	"github.com/astaxie/beego"
+	"{{baseDir}}/pkg/utils"
 )
 
 var (
 	Conn *gorm.DB
 )
 
 func GetDbConnect() (*gorm.DB, error) {
-	dbConStr := fmt.Sprintf("%s:%s@tcp(%s)/%s%s?charset=utf8&parseTime=True&loc=Local", beego.AppConfig.String("db::user"), beego.AppConfig.String("db::password"), beego.AppConfig.String("db::host"), beego.AppConfig.String("db::database"), getConnectDbName())
+	dbConStr := fmt.Sprintf("%s:%s@tcp(%s)/%s%s?charset=utf8&parseTime=True&loc=Local", utils.BeeConfig.String("db::user"), utils.BeeConfig.String("db::password"), utils.BeeConfig.String("db::host"), utils.BeeConfig.String("db::database"), getConnectDbName())
 	fmt.Println(dbConStr, "dbConStr")
 	db, err := gorm.Open("mysql", dbConStr)
 	Conn = db
 
-	runMode := beego.AppConfig.String("runmode")
+	runMode := utils.BeeConfig.String("runmode")
 	if runMode == "dev" || runMode == "test" {
 		db.LogMode(true)
 	}
@@ -395,11 +401,11 @@ var pkgDbMongodbTemp = `package db
 import (
 	"context"
 	"fmt"
-	"github.com/astaxie/beego"
+	"time"
+	"{{baseDir}}/pkg/utils"
 	"go.mongodb.org/mongo-driver/mongo"
 	"go.mongodb.org/mongo-driver/mongo/options"
 	"go.mongodb.org/mongo-driver/mongo/readpref"
-	"time"
 )
 
 var (
@@ -409,7 +415,7 @@ var (
 //连接mongodb
 func GetMongodbClient() (*mongo.Client, error) {
 	ctx, cancel := context.WithTimeout(context.Background(), 10 * time.Second)
-	host := fmt.Sprintf("mongodb://%s", beego.AppConfig.String("mongodb::host"))
+	host := fmt.Sprintf("mongodb://%s", utils.BeeConfig.String("mongodb::host"))
 	client, err := mongo.Connect(ctx, options.Client().ApplyURI(host))
 	cancel()
 	if err != nil {
@@ -435,7 +441,7 @@ var pkgDbRedisTemp = `package db
 /*
 import (
 	"github.com/go-redis/redis"
-	"github.com/astaxie/beego"
+	"{{baseDir}}/pkg/utils"
 )
 
 var (
@@ -444,15 +450,15 @@ var (
 
 //连接redis
 func GetRedisClient() (*redis.Client, error){
-	db ,_ := beego.AppConfig.Int("redis::database")
+	db ,_ := utils.BeeConfig.Int("redis::database")
 	redisOption := &redis.Options{
-		Addr:     beego.AppConfig.String("redis::host"),
+		Addr:     utils.BeeConfig.String("redis::host"),
 		DB:       db,
 	}
 
-	runMode := beego.AppConfig.String("runmode")
+	runMode := utils.BeeConfig.String("runmode")
 	if runMode != "prod" {
-		redisOption.Password = beego.AppConfig.String("redis::password")
+		redisOption.Password = utils.BeeConfig.String("redis::password")
 	}
 	client := redis.NewClient(redisOption)
 
@@ -505,8 +511,11 @@ type UserForm struct {
 
 var pkgUtilsConfigTemp = `package utils
 
+import "github.com/astaxie/beego/config"
+
 var (
 	MyConfig *WebConfig
+	BeeConfig config.Configer
 )
 
 type WebConfig struct {
@@ -782,7 +791,7 @@ import (
 	"log"
 	"os"
 	"{{baseDir}}/pkg/utils"
-	"github.com/astaxie/beego"
+	"github.com/astaxie/beego/config"
 )
 
 var envMode = "WebRunMode"
@@ -797,10 +806,11 @@ func InitConfig() {
 	}
 
 	configName := fmt.Sprintf("conf/%s_app.conf", env)
-	err := beego.LoadAppConfig("ini", configName)
+	beeConfig, err := config.NewConfig("ini", configName)
 	if err != nil {
 		log.Fatal(err)
 	}
+	utils.BeeConfig = beeConfig
 
 	configList, err := LoadConfig()
 	if err != nil {
@@ -816,10 +826,10 @@ func InitConfig() {
 */
 func LoadConfig() (*utils.WebConfig, error) {
 	config := &utils.WebConfig{}
-	config.DbHost = beego.AppConfig.String("db::host")
-	config.DbName = beego.AppConfig.String("db::user")
-	config.DbPassword = beego.AppConfig.String("db::password")
-	version, err := beego.AppConfig.Float("version")
+	config.DbHost = utils.BeeConfig.String("db::host")
+	config.DbName = utils.BeeConfig.String("db::user")
+	config.DbPassword = utils.BeeConfig.String("db::password")
+	version, err := utils.BeeConfig.Float("version")
 	if err != nil {
 		config.Version = version
 	}