合并代码

cmd/api/server.go

@@ -41,6 +41,11 @@ func init() {
 	StartCmd.PersistentFlags().StringVarP(&config, "config", "c", "config/settings.yml", "Start server with provided configuration file")
 	StartCmd.PersistentFlags().StringVarP(&port, "port", "p", "8000", "Tcp port server listening on")
 	StartCmd.PersistentFlags().StringVarP(&mode, "mode", "m", "dev", "server mode ; eg:dev,test,prod")
+	//if mode=="dev"{
+	//	config="config/settings.{dev.}yml"
+	//}else if mode=="test"{
+	//	config="config/settings.{test.}yml"
+	//}
 }
 
 func usage() {

models/sysuser.go

@@ -3,8 +3,6 @@ package models
 import (
 	"errors"
 	orm "go-admin/database"
-	"go-admin/pkg"
-	"go-admin/pkg/utils"
 	"go-admin/tools"
 	"golang.org/x/crypto/bcrypt"
 	"log"
@@ -127,7 +125,7 @@ func (e *SysUser) Get() (SysUserView SysUserView, err error) {
 
 func (e *SysUser) GetPage(pageSize int, pageIndex int) ([]SysUserPage, int, error) {
 	var doc []SysUserPage
-
+	table := orm.Eloquent.Select("sys_user.*,sys_dept.dept_name").Table(e.TableName())
 	table = table.Joins("left join sys_dept on sys_dept.dept_id = sys_user.dept_id")
 
 	if e.Username != "" {

tools/config/config.go

@@ -25,20 +25,13 @@ func ConfigSetup(path string) {
 	if err != nil {
 		log.Fatal(fmt.Sprintf("Read config file fail: %s", err.Error()))
 	}
+
+
 	//Replace environment variables
 	err = viper.ReadConfig(strings.NewReader(os.ExpandEnv(string(content))))
 	if err != nil {
 		log.Fatal(fmt.Sprintf("Parse config file fail: %s", err.Error()))
 	}
-	//}
-	//
-	//func InitConfig(fileName string) {
-	//	viper.SetConfigName(fileName)
-	//	viper.AddConfigPath("/config")
-	//	err := viper.ReadInConfig()
-	//	if err != nil {
-	//		log.Println(err)
-	//	}
 
 	cfgDatabase = viper.Sub("settings.database")
 	if cfgDatabase == nil {