fixes #34 「动态指令」多行指令会被当作一行执行

fixes #32 会话无法维持，1分钟左右自动断开
fixes #31 更新"资产"会清空"标签"
fixes #13 建议添加用户权限功能、隐藏授权账户信息

pkg/api/middleware.go

@@ -1,9 +1,11 @@
 package api
 
 import (
+	"fmt"
 	"github.com/labstack/echo/v4"
 	"github.com/sirupsen/logrus"
 	"next-terminal/pkg/global"
+	"next-terminal/pkg/model"
 	"strings"
 	"time"
 )
@@ -12,6 +14,12 @@ func ErrorHandler(next echo.HandlerFunc) echo.HandlerFunc {
 	return func(c echo.Context) error {
 
 		if err := next(c); err != nil {
+
+			if he, ok := err.(*echo.HTTPError); ok {
+				message := fmt.Sprintf("%v", he.Message)
+				return Fail(c, he.Code, message)
+			}
+
 			return Fail(c, 0, err.Error())
 		}
 		return nil
@@ -21,9 +29,6 @@ func ErrorHandler(next echo.HandlerFunc) echo.HandlerFunc {
 func Auth(next echo.HandlerFunc) echo.HandlerFunc {
 
 	urls := []string{"download", "recording", "login", "static", "favicon", "logo"}
-	permissionUrls := H{
-		"/users": "admin",
-	}
 
 	return func(c echo.Context) error {
 		// 路由拦截 - 登录身份、资源权限判断等
@@ -43,14 +48,6 @@ func Auth(next echo.HandlerFunc) echo.HandlerFunc {
 			return Fail(c, 401, "您的登录信息已失效，请重新登录后再试。")
 		}
 
-		for url := range permissionUrls {
-			if strings.HasPrefix(c.Request().RequestURI, url) {
-				if authorization.(Authorization).User.Type != permissionUrls[url] {
-					return Fail(c, 403, "permission denied")
-				}
-			}
-		}
-
 		if authorization.(Authorization).Remember {
 			// 记住登录有效期两周
 			global.Cache.Set(token, authorization, time.Hour*time.Duration(24*14))
@@ -61,3 +58,16 @@ func Auth(next echo.HandlerFunc) echo.HandlerFunc {
 		return next(c)
 	}
 }
+
+func Admin(next echo.HandlerFunc) echo.HandlerFunc {
+	return func(c echo.Context) error {
+
+		account, _ := GetCurrentAccount(c)
+
+		if account.Type != model.TypeAdmin {
+			return Fail(c, 403, "permission denied")
+		}
+
+		return next(c)
+	}
+}