feat(gin.Mode()): 由环境变量决定，不再依赖于配置文件system.Env

flipped-aurora · Mar 6, 2024 · d2f0f8f · d2f0f8f
1 parent d360049
commit d2f0f8f
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 9 deletions.
diff --git a/server/config/system.go b/server/config/system.go
@@ -1,7 +1,6 @@
 package config
 
 type System struct {
-	Env           string `mapstructure:"env" json:"env" yaml:"env"`                // 环境值
 	DbType        string `mapstructure:"db-type" json:"db-type" yaml:"db-type"`    // 数据库类型:mysql(默认)|sqlite|sqlserver|postgresql
 	OssType       string `mapstructure:"oss-type" json:"oss-type" yaml:"oss-type"` // Oss类型
 	RouterPrefix  string `mapstructure:"router-prefix" json:"router-prefix" yaml:"router-prefix"`

diff --git a/server/initialize/router.go b/server/initialize/router.go
@@ -33,15 +33,9 @@ func (fs justFilesFilesystem) Open(name string) (http.File, error) {
 // 初始化总路由
 
 func Routers() *gin.Engine {
-
-	// 设置为发布模式
-	if global.GVA_CONFIG.System.Env == "public" {
-		gin.SetMode(gin.ReleaseMode) //DebugMode ReleaseMode TestMode
-	}
-
 	Router := gin.New()
 	Router.Use(gin.Recovery())
-	if global.GVA_CONFIG.System.Env != "public" {
+	if gin.Mode() == gin.DebugMode {
 		Router.Use(gin.Logger())
 	}
 

diff --git a/server/middleware/casbin_rbac.go b/server/middleware/casbin_rbac.go
@@ -16,7 +16,7 @@ var casbinService = service.ServiceGroupApp.SystemServiceGroup.CasbinService
 // CasbinHandler 拦截器
 func CasbinHandler() gin.HandlerFunc {
 	return func(c *gin.Context) {
-		if global.GVA_CONFIG.System.Env != "develop" {
+		if gin.Mode() != gin.DebugMode {
 			waitUse, _ := utils.GetClaims(c)
 			//获取请求的PATH
 			path := c.Request.URL.Path