Merge remote-tracking branch 'origin/gva_gormv2_dev' into gva_gormv2_dev

# Conflicts:
#	server/go.mod
#	server/initialize/data.go
#	server/model/sys_base_menu.go
#	server/service/sys_db_initialize.go

server/initialize/db_table.go

@@ -3,6 +3,7 @@ package initialize
 import (
 	"gin-vue-admin/global"
 	"gin-vue-admin/model"
+	"go.uber.org/zap"
 	"os"
 )
 
@@ -28,7 +29,7 @@ func DBTables() {
 		model.SysOperationRecord{},
 	)
 	if err != nil {
-		global.GVA_LOG.Error("register table failed", err)
+		global.GVA_LOG.Error("register table failed", zap.Any("err", err))
 		os.Exit(0)
 	}
 	global.GVA_LOG.Debug("register table success")

server/initialize/mysql.go

@@ -2,6 +2,7 @@ package initialize
 
 import (
 	"gin-vue-admin/global"
+	"go.uber.org/zap"
 	"gorm.io/driver/mysql"
 	"gorm.io/gorm"
 	"gorm.io/gorm/logger"
@@ -33,7 +34,7 @@ func Mysql() {
 	}
 
 	if db, err := gorm.Open(mysql.New(mysqlConfig), gormConfig); err != nil {
-		global.GVA_LOG.Error("MySQL启动异常", err)
+		global.GVA_LOG.Error("MySQL启动异常", zap.Any("err", err))
 		os.Exit(0)
 	} else {
 		global.GVA_DB = db

server/initialize/redis.go

@@ -3,6 +3,7 @@ package initialize
 import (
 	"gin-vue-admin/global"
 	"github.com/go-redis/redis"
+	"go.uber.org/zap"
 )
 
 func Redis() {
@@ -14,9 +15,9 @@ func Redis() {
 	})
 	pong, err := client.Ping().Result()
 	if err != nil {
-		global.GVA_LOG.Error(err)
+		global.GVA_LOG.Error("redis connect ping failed, err:", zap.Any("err", err))
 	} else {
-		global.GVA_LOG.Info("redis connect ping response:", pong)
+		global.GVA_LOG.Info("redis connect ping response:", zap.String("pong",pong))
 		global.GVA_REDIS = client
 	}
 }