From d916f2ba6fc365ef70d276a30b0aebc1b3fd0e89 Mon Sep 17 00:00:00 2001
From: zhengkunwang <31820853+zhengkunwang223@users.noreply.github.com>
Date: Tue, 19 Mar 2024 13:50:06 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E7=BD=91=E7=AB=99?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E6=9B=B4=E6=96=B0=E4=B9=8B?=
 =?UTF-8?q?=E5=90=8E=E5=8F=82=E6=95=B0=E4=B8=A2=E5=A4=B1=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=20(#4231)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Refs https://github.com/1Panel-dev/1Panel/issues/4171
---
 backend/utils/nginx/parser/parser.go             | 4 ++--
 frontend/src/views/app-store/installed/index.vue | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/backend/utils/nginx/parser/parser.go b/backend/utils/nginx/parser/parser.go
index 7ebb756a5..46a48efa1 100644
--- a/backend/utils/nginx/parser/parser.go
+++ b/backend/utils/nginx/parser/parser.go
@@ -61,7 +61,7 @@ func NewParserFromLexer(lexer *lexer) *Parser {
 
 	parser.directiveWrappers = map[string]func(*components.Directive) components.IDirective{
 		"server": func(directive *components.Directive) components.IDirective {
-			return parser.parseUpstreamServer(directive)
+			return parser.wrapServer(directive)
 		},
 	}
 
@@ -113,7 +113,7 @@ parsingloop:
 		case p.curTokenIs(flag.LuaCode):
 			context.IsLuaBlock = true
 			context.LiteralCode = p.currentToken.Literal
-		case p.curTokenIs(flag.Keyword):
+		case p.curTokenIs(flag.Keyword) || p.curTokenIs(flag.QuotedString):
 			s, err := p.parseStatement()
 			if err != nil {
 				return nil, err
diff --git a/frontend/src/views/app-store/installed/index.vue b/frontend/src/views/app-store/installed/index.vue
index e84777378..769e86c27 100644
--- a/frontend/src/views/app-store/installed/index.vue
+++ b/frontend/src/views/app-store/installed/index.vue
@@ -390,7 +390,7 @@ const changeTag = (key: string) => {
         searchReq.tags = [key];
     }
     const index = tags.value.findIndex((tag) => tag.key === key);
-    if (index > 5) {
+    if (index > 6) {
         moreTag.value = key;
     } else {
         moreTag.value = '';