fix26.2: полная UI-полировка peer/dashboard и завершение i18n

apps/middleware/admin.go

@@ -2,21 +2,27 @@ package middleware
 
 import (
 	"github.com/gin-gonic/gin"
+	"hy2xs-admin/model/bo"
 	"hy2xs-admin/model/constant"
 	"hy2xs-admin/model/vo"
-	"hy2xs-admin/service"
 	"hy2xs-admin/util"
 )
 
 func AdminHandler() gin.HandlerFunc {
 	return func(c *gin.Context) {
-		myClaims, err := service.ParseToken(service.GetToken(c))
-		if err != nil {
-			vo.Fail(err.Error(), c)
+		claimsRaw, ok := c.Get("adminClaims")
+		if !ok {
+			vo.Fail(constant.UnauthorizedError, c)
 			c.Abort()
 			return
 		}
-		if !util.ArrContain(myClaims.Admin.Roles, "admin") {
+		claims, castOK := claimsRaw.(bo.AccountBo)
+		if !castOK {
+			vo.Fail(constant.IllegalTokenError, c)
+			c.Abort()
+			return
+		}
+		if !util.ArrContain(claims.Roles, "admin") {
 			vo.Fail(constant.ForbiddenError, c)
 			c.Abort()
 			return