Merge remote-tracking branch 'origin/main'

Author: piexlmax

server/api/v1/system/sys_user.go

@@ -275,6 +275,8 @@ func (b *BaseApi) SetUserInfo(c *gin.Context) {
 	var user system.SysUser
 	_ = c.ShouldBindJSON(&user)
 	user.Username = ""
+	user.Password = ""
+	user.AuthorityId = ""
 	if err := utils.Verify(user, utils.IdVerify); err != nil {
 		response.FailWithMessage(err.Error(), c)
 		return
@@ -299,6 +301,8 @@ func (b *BaseApi) SetSelfInfo(c *gin.Context) {
 	var user system.SysUser
 	_ = c.ShouldBindJSON(&user)
 	user.Username = ""
+	user.Password = ""
+	user.AuthorityId = ""
 	user.ID = utils.GetUserID(c)
 	if err, ReqUser := userService.SetUserInfo(user); err != nil {
 		global.GVA_LOG.Error("设置失败!", zap.Error(err))

server/config/gorm_mysql.go

@@ -16,3 +16,7 @@ type Mysql struct {
 func (m *Mysql) Dsn() string {
 	return m.Username + ":" + m.Password + "@tcp(" + m.Path + ":" + m.Port + ")/" + m.Dbname + "?" + m.Config
 }
+
+func (m *Mysql) GetLogMode() string {
+	return m.LogMode
+}

server/config/gorm_pgsql.go

@@ -24,3 +24,7 @@ func (p *Pgsql) Dsn() string {
 func (p *Pgsql) LinkDsn(dbname string) string {
 	return "host=" + p.Path + " user=" + p.Username + " password=" + p.Password + " dbname=" + dbname + " port=" + p.Port + " " + p.Config
 }
+
+func (m *Pgsql) GetLogMode() string {
+	return m.LogMode
+}

server/core/server.go

@@ -37,7 +37,7 @@ func RunWindowsServer() {
 
 	fmt.Printf(`
 	欢迎使用 github.com/flipped-aurora/gin-vue-admin/server
-	当前版本:V2.5.0 beta
+	当前版本:V2.5.0 beta.2
     加群方式:微信号：shouzi_1994 QQ群：622360840
 	GVA讨论社区:https://support.qq.com/products/371961
 	默认自动化文档地址:http://127.0.0.1%s/swagger/index.html

server/go.mod

@@ -18,6 +18,7 @@ require (
 	github.com/go-sql-driver/mysql v1.5.0
 	github.com/gookit/color v1.3.1
 	github.com/huaweicloud/huaweicloud-sdk-go-obs v3.21.8+incompatible
+	github.com/jackc/pgx/v4 v4.15.0 // indirect
 	github.com/jordan-wright/email v0.0.0-20200824153738-3f5bafa1cd84
 	github.com/mojocn/base64Captcha v1.3.1
 	github.com/natefinch/lumberjack v2.0.0+incompatible
@@ -36,10 +37,11 @@ require (
 	github.com/unrolled/secure v1.0.7
 	github.com/xuri/excelize/v2 v2.4.1
 	go.uber.org/zap v1.16.0
+	golang.org/x/crypto v0.0.0-20220213190939-1e6e3497d506 // indirect
 	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
 	gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
 	gorm.io/driver/mysql v1.0.1
-	gorm.io/driver/postgres v0.2.6
-	gorm.io/gorm v1.20.11
+	gorm.io/driver/postgres v1.2.3
+	gorm.io/gorm v1.22.5
 	nhooyr.io/websocket v1.8.6
 )

server/go.sum

@@ -10,6 +10,10 @@ import (
 	"gorm.io/gorm/logger"
 )
 
+type DBBASE interface {
+	GetLogMode() string
+}
+
 var Gorm = new(_gorm)
 
 type _gorm struct{}
@@ -23,7 +27,19 @@ func (g *_gorm) Config() *gorm.Config {
 		LogLevel:      logger.Warn,
 		Colorful:      true,
 	})
-	switch global.GVA_CONFIG.Mysql.LogMode {
+	var logMode DBBASE
+	switch global.GVA_CONFIG.System.DbType {
+	case "mysql":
+		logMode = &global.GVA_CONFIG.Mysql
+		break
+	case "pgsql":
+		logMode = &global.GVA_CONFIG.Pgsql
+		break
+	default:
+		logMode = &global.GVA_CONFIG.Mysql
+	}
+
+	switch logMode.GetLogMode() {
 	case "silent", "Silent":
 		config.Logger = _default.LogMode(logger.Silent)
 	case "error", "Error":

server/initialize/internal/gorm.go

@@ -4,6 +4,7 @@ import (
 	"github.com/flipped-aurora/gin-vue-admin/server/core"
 	"github.com/flipped-aurora/gin-vue-admin/server/global"
 	"github.com/flipped-aurora/gin-vue-admin/server/initialize"
+	"go.uber.org/zap"
 )
 
 //go:generate go env -w GO111MODULE=on
@@ -19,8 +20,9 @@ import (
 // @name x-token
 // @BasePath /
 func main() {
-	global.GVA_VP = core.Viper()      // 初始化Viper
-	global.GVA_LOG = core.Zap()       // 初始化zap日志库
+	global.GVA_VP = core.Viper() // 初始化Viper
+	global.GVA_LOG = core.Zap()  // 初始化zap日志库
+	zap.ReplaceGlobals(global.GVA_LOG)
 	global.GVA_DB = initialize.Gorm() // gorm连接数据库
 	initialize.Timer()
 	initialize.DBList()

server/main.go

@@ -43,24 +43,30 @@ func (i *InitDB) PgsqlEmptyDsn() string {
 // Author [SliverHorn](https://github.com/SliverHorn)
 func (i *InitDB) ToMysqlConfig() config.Mysql {
 	return config.Mysql{
-		Path:     i.Host,
-		Port:     i.Port,
-		Dbname:   i.DBName,
-		Username: i.UserName,
-		Password: i.Password,
-		Config:   "charset=utf8mb4&parseTime=True&loc=Local",
+		Path:         i.Host,
+		Port:         i.Port,
+		Dbname:       i.DBName,
+		Username:     i.UserName,
+		Password:     i.Password,
+		MaxIdleConns: 10,
+		MaxOpenConns: 100,
+		LogMode:      "error",
+		Config:       "charset=utf8mb4&parseTime=True&loc=Local",
 	}
 }
 
 // ToPgsqlConfig 转换 config.Pgsql
 // Author [SliverHorn](https://github.com/SliverHorn)
 func (i *InitDB) ToPgsqlConfig() config.Pgsql {
 	return config.Pgsql{
-		Path:     i.Host,
-		Port:     i.Port,
-		Dbname:   i.DBName,
-		Username: i.UserName,
-		Password: i.Password,
-		Config:   "sslmode=disable TimeZone=Asia/Shanghai",
+		Path:         i.Host,
+		Port:         i.Port,
+		Dbname:       i.DBName,
+		Username:     i.UserName,
+		Password:     i.Password,
+		MaxIdleConns: 10,
+		MaxOpenConns: 100,
+		LogMode:      "error",
+		Config:       "sslmode=disable TimeZone=Asia/Shanghai",
 	}
 }

server/model/system/request/sys_init.go

@@ -18,4 +18,6 @@ type SysUser struct {
 	AuthorityId string         `json:"authorityId" gorm:"default:888;comment:用户角色ID"`                                        // 用户角色ID
 	Authority   SysAuthority   `json:"authority" gorm:"foreignKey:AuthorityId;references:AuthorityId;comment:用户角色"`
 	Authorities []SysAuthority `json:"authorities" gorm:"many2many:sys_user_authority;"`
+	Phone       string         `json:"phone"  gorm:"comment:用户手机号"` // 用户角色ID
+	Email       string         `json:"email"  gorm:"comment:用户邮箱"`  // 用户邮箱
 }