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

* feat(gin.Mode()): 由环境变量决定，不再依赖于配置文件system.Env * feat(casbin)：不需要判断是否是debug模式，都要附带参数 * feat(前端配置)：去掉环境之的配置
flipped-aurora · Mar 6, 2024 · 93ac2e7 · 93ac2e7
1 parent f4c2b50
commit 93ac2e7
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 34 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,22 +16,20 @@ var casbinService = service.ServiceGroupApp.SystemServiceGroup.CasbinService
 // CasbinHandler 拦截器
 func CasbinHandler() gin.HandlerFunc {
 	return func(c *gin.Context) {
-		if global.GVA_CONFIG.System.Env != "develop" {
-			waitUse, _ := utils.GetClaims(c)
-			//获取请求的PATH
-			path := c.Request.URL.Path
-			obj := strings.TrimPrefix(path, global.GVA_CONFIG.System.RouterPrefix)
-			// 获取请求方法
-			act := c.Request.Method
-			// 获取用户的角色
-			sub := strconv.Itoa(int(waitUse.AuthorityId))
-			e := casbinService.Casbin() // 判断策略中是否存在
-			success, _ := e.Enforce(sub, obj, act)
-			if !success {
-				response.FailWithDetailed(gin.H{}, "权限不足", c)
-				c.Abort()
-				return
-			}
+		waitUse, _ := utils.GetClaims(c)
+		//获取请求的PATH
+		path := c.Request.URL.Path
+		obj := strings.TrimPrefix(path, global.GVA_CONFIG.System.RouterPrefix)
+		// 获取请求方法
+		act := c.Request.Method
+		// 获取用户的角色
+		sub := strconv.Itoa(int(waitUse.AuthorityId))
+		e := casbinService.Casbin() // 判断策略中是否存在
+		success, _ := e.Enforce(sub, obj, act)
+		if !success {
+			response.FailWithDetailed(gin.H{}, "权限不足", c)
+			c.Abort()
+			return
 		}
 		c.Next()
 	}

diff --git a/web/src/view/systemTools/system/system.vue b/web/src/view/systemTools/system/system.vue
@@ -11,16 +11,6 @@
           title="系统配置"
           name="1"
         >
-          <el-form-item label="环境值">
-            <!-- <el-input v-model="config.system.env" />-->
-            <el-select
-              v-model="config.system.env"
-              style="width:100%"
-            >
-              <el-option value="public" />
-              <el-option value="develop" />
-            </el-select>
-          </el-form-item>
           <el-form-item label="端口值">
             <el-input v-model.number="config.system.addr" />
           </el-form-item>