Migrate the gva project to the cmd folder, delete other redundant database configurations, optimize the initialization method of viper, zap, and gorm

2020-10-22 16:28:51 +08:00
parent 45f2bd4a15
commit dd65a4a716
28 changed files with 1010 additions and 698 deletions
@@ -0,0 +1,75 @@
+/*
+Copyright © 2020 SliverHorn
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+package gva
+
+import (
+	"gin-vue-admin/cmd/datas"
+	"gin-vue-admin/core"
+	"gin-vue-admin/initialize"
+
+	"github.com/gookit/color"
+
+	_ "gin-vue-admin/core"
+	"gin-vue-admin/global"
+
+	"github.com/spf13/cobra"
+)
+
+// initdbCmd represents the initdb command
+var initdbCmd = &cobra.Command{
+	Use:   "initdb",
+	Short: "gin-vue-admin初始化数据",
+	Long: `gin-vue-admin初始化数据适配数据库情况: 
+1. mysql完美适配,
+2. postgresql不能保证完美适配,
+3. sqlite未适配,
+4. sqlserver未适配`,
+	Run: func(cmd *cobra.Command, args []string) {
+		path, _ := cmd.Flags().GetString("path")
+		core.Viper(path)
+		db := initialize.GormMysql()
+		switch global.GVA_CONFIG.System.DbType {
+		case "mysql":
+			datas.InitMysqlTables(db)
+			datas.InitMysqlData(db)
+		case "postgresql":
+			datas.InitPostgresqlTables(db)
+			datas.InitPostgresqlData(db)
+		case "sqlite":
+			color.Info.Println("sqlite功能开发中")
+		case "sqlserver":
+			color.Info.Println("sqlserver功能开发中")
+		default:
+			datas.InitMysqlTables(db)
+			datas.InitMysqlData(db)
+			color.Info.Println("sqlserver功能开发中")
+		}
+		frame, _ := cmd.Flags().GetString("frame")
+		if frame == "gf" {
+			color.Info.Println("gf功能开发中")
+			return
+		} else {
+			return
+		}
+	},
+}
+
+func init() {
+	rootCmd.AddCommand(initdbCmd)
+	initdbCmd.Flags().StringP("path", "p", "./config.yaml", "自定配置文件路径(绝对路径)")
+	initdbCmd.Flags().StringP("frame", "f", "gin", "可选参数为gin,gf")
+	initdbCmd.Flags().StringP("type", "t", "mysql", "可选参数为mysql,postgresql,sqlite,sqlserver")
+}
@@ -0,0 +1,94 @@
+/*
+Copyright © 2020 SliverHorn
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+package gva
+
+import (
+	"github.com/mitchellh/go-homedir"
+	"os"
+
+	"github.com/gookit/color"
+	"github.com/spf13/cobra"
+
+	"github.com/spf13/viper"
+)
+
+var cfgFile string
+
+// rootCmd represents the base command when called without any subcommands
+var rootCmd = &cobra.Command{
+	Use:   "gva",
+	Short: "这是一款amazing的终端工具",
+	Long: `欢迎使用gva终端工具
+ ________ ____   ____   _____   
+ /  _____/ \   \ /   /  /  _  \  
+/   \  ___  \   Y   /  /  /_\  \ 
+\    \_\  \  \     /  /    |    \
+ \______  /   \___/   \____|__  /
+        \/                    \/ 
+`,
+	// Uncomment the following line if your bare application
+	// has an action associated with it:
+	//	Run: func(cmd *cobra.Command, args []string) { },
+}
+
+// Execute adds all child commands to the root command and sets flags appropriately.
+// This is called by main.main(). It only needs to happen once to the rootCmd.
+func Execute() {
+	if err := rootCmd.Execute(); err != nil {
+		color.Warn.Println(err)
+		os.Exit(1)
+	}
+}
+
+func init() {
+	cobra.OnInitialize(initConfig)
+
+	// Here you will define your flags and configuration settings.
+	// Cobra supports persistent flags, which, if defined here,
+	// will be global for your application.
+
+	rootCmd.PersistentFlags().StringVar(&cfgFile, "config", "", "config file (default is $HOME/.gva.yaml)")
+
+	// Cobra also supports local flags, which will only run
+	// when this action is called directly.
+	rootCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
+}
+
+// initConfig reads in config file and ENV variables if set.
+func initConfig() {
+	if cfgFile != "" {
+		// Use config file from the flag.
+		viper.SetConfigFile(cfgFile)
+	} else {
+		// Find home directory.
+		home, err := homedir.Dir()
+		if err != nil {
+			color.Warn.Println(err)
+			os.Exit(1)
+		}
+
+		// Search config in home directory with name ".gva" (without extension).
+		viper.AddConfigPath(home)
+		viper.SetConfigName(".gva")
+	}
+
+	viper.AutomaticEnv() // read in environment variables that match
+
+	// If a config file is found, read it in.
+	if err := viper.ReadInConfig(); err == nil {
+		color.Warn.Println("Using config file:", viper.ConfigFileUsed())
+	}
+}
@@ -0,0 +1,36 @@
+/*
+Copyright © 2020 SliverHorn
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+package gva
+
+import (
+	"github.com/gookit/color"
+
+	"github.com/spf13/cobra"
+)
+
+// versionCmd represents the version command
+var versionCmd = &cobra.Command{
+	Use:   "version",
+	Short: "版本信息",
+	Long:  `版本的长信息`,
+	Run: func(cmd *cobra.Command, args []string) {
+		color.Green.Println("v0.0.2")
+	},
+}
+
+func init() {
+	rootCmd.AddCommand(versionCmd)
+}