diff --git a/base/global/global.go b/base/global/global.go index 3eb6cf3e..164f910e 100644 --- a/base/global/global.go +++ b/base/global/global.go @@ -1,11 +1,13 @@ package global import ( + "github.com/go-redis/redis" "github.com/sirupsen/logrus" "gorm.io/gorm" ) var ( - Log *logrus.Logger // 日志 - Db *gorm.DB // gorm + Log *logrus.Logger // 日志 + Db *gorm.DB // gorm + RedisCli *redis.Client // redis ) diff --git a/base/starter/banner.go b/base/starter/banner.go new file mode 100644 index 00000000..988de1c1 --- /dev/null +++ b/base/starter/banner.go @@ -0,0 +1,14 @@ +package starter + +import "fmt" + +func PrintBanner() { + fmt.Print(` + __ _ + _ __ ___ __ _ _ _ / _| |_ _ __ _ ___ + | '_ ' _ \ / _' | | | | |_| | | | |_____ / _' |/ _ \ + | | | | | | (_| | |_| | _| | |_| |_____| (_| | (_) | + |_| |_| |_|\__,_|\__, |_| |_|\__, | \__, |\___/ + |___/ |___/ |___/ + `) +} diff --git a/base/starter/gorm.go b/base/starter/gorm.go index 0a69bd2d..cf706b03 100644 --- a/base/starter/gorm.go +++ b/base/starter/gorm.go @@ -10,6 +10,10 @@ import ( "gorm.io/gorm/schema" ) +func InitDb() { + global.Db = GormMysql() +} + func GormMysql() *gorm.DB { m := config.Conf.Mysql if m == nil || m.Dbname == "" { diff --git a/base/starter/redis.go b/base/starter/redis.go index 000ae31b..f44e16ea 100644 --- a/base/starter/redis.go +++ b/base/starter/redis.go @@ -8,11 +8,16 @@ import ( "github.com/go-redis/redis" ) +func InitRedis() { + global.RedisCli = ConnRedis() +} + func ConnRedis() *redis.Client { // 设置redis客户端 redisConf := config.Conf.Redis if redisConf == nil { global.Log.Panic("未找到redis配置信息") + return nil } global.Log.Infof("连接redis [%s:%d]", redisConf.Host, redisConf.Port) rdb := redis.NewClient(&redis.Options{ diff --git a/base/starter/web-server.go b/base/starter/web-server.go index 7dfb250a..fd3836c9 100644 --- a/base/starter/web-server.go +++ b/base/starter/web-server.go @@ -1,13 +1,21 @@ package starter import ( + "mayfly-go/base/biz" "mayfly-go/base/config" + "mayfly-go/base/ctx" "mayfly-go/base/global" - - "github.com/gin-gonic/gin" + "mayfly-go/server/initialize" ) -func RunWebServer(web *gin.Engine) { +func RunWebServer() { + // 权限处理器 + ctx.UseBeforeHandlerInterceptor(ctx.PermissionHandler) + // 日志处理器 + ctx.UseAfterHandlerInterceptor(ctx.LogHandler) + // 注册路由 + web := initialize.InitRouter() + server := config.Conf.Server port := server.GetPort() if app := config.Conf.App; app != nil { @@ -16,9 +24,11 @@ func RunWebServer(web *gin.Engine) { global.Log.Infof("Listening and serving HTTP on %s", port) } + var err error if server.Tls != nil && server.Tls.Enable { - web.RunTLS(port, server.Tls.CertFile, server.Tls.KeyFile) + err = web.RunTLS(port, server.Tls.CertFile, server.Tls.KeyFile) } else { - web.Run(port) + err = web.Run(port) } + biz.ErrIsNilAppendErr(err, "服务启动失败: %s") } diff --git a/mayfly_go_web/src/views/ops/redis/DataOperation.vue b/mayfly_go_web/src/views/ops/redis/DataOperation.vue index 5e78024e..d161037a 100644 --- a/mayfly_go_web/src/views/ops/redis/DataOperation.vue +++ b/mayfly_go_web/src/views/ops/redis/DataOperation.vue @@ -90,7 +90,6 @@ import { ElMessage, ElMessageBox } from 'element-plus'; import ProjectEnvSelect from '../component/ProjectEnvSelect.vue'; import DataEdit from './DataEdit.vue'; import { isTrue, notNull } from '@/common/assert'; -import { key } from '../../../store/index'; export default defineComponent({ name: 'DataOperation', diff --git a/mayfly_go_web/src/views/ops/redis/RedisList.vue b/mayfly_go_web/src/views/ops/redis/RedisList.vue index bcd290fa..f7648105 100644 --- a/mayfly_go_web/src/views/ops/redis/RedisList.vue +++ b/mayfly_go_web/src/views/ops/redis/RedisList.vue @@ -15,7 +15,7 @@ - +