From b79d13a271d875ac918a33235569d45e066e6964 Mon Sep 17 00:00:00 2001
From: GoEdgeLab <goedgecloud@gmail.com>
Date: Mon, 25 Oct 2021 19:01:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../default/servers/components/waf/upgradeTemplate.go    | 9 +++++----
 web/public/js/components/server/http-firewall-rules.js   | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/internal/web/actions/default/servers/components/waf/upgradeTemplate.go b/internal/web/actions/default/servers/components/waf/upgradeTemplate.go
index dcbd12da..50acc7c8 100644
--- a/internal/web/actions/default/servers/components/waf/upgradeTemplate.go
+++ b/internal/web/actions/default/servers/components/waf/upgradeTemplate.go
@@ -41,6 +41,7 @@ func (this *UpgradeTemplateAction) RunPost(params struct {
 				createGroupResp, err := this.RPC().HTTPFirewallRuleGroupRPC().CreateHTTPFirewallRuleGroup(this.AdminContext(), &pb.CreateHTTPFirewallRuleGroupRequest{
 					IsOn:        true,
 					Name:        group.Name,
+					Code:        group.Code,
 					Description: group.Description,
 				})
 				if err != nil {
@@ -60,8 +61,8 @@ func (this *UpgradeTemplateAction) RunPost(params struct {
 						return
 					}
 					_, err = this.RPC().HTTPFirewallRuleGroupRPC().AddHTTPFirewallRuleGroupSet(this.AdminContext(), &pb.AddHTTPFirewallRuleGroupSetRequest{
-						FirewallRuleGroupId:        groupId,
-						FirewallRuleSetsConfigJSON: setJSON,
+						FirewallRuleGroupId:       groupId,
+						FirewallRuleSetConfigJSON: setJSON,
 					})
 					if err != nil {
 						this.ErrorPage(err)
@@ -83,8 +84,8 @@ func (this *UpgradeTemplateAction) RunPost(params struct {
 						return
 					}
 					_, err = this.RPC().HTTPFirewallRuleGroupRPC().AddHTTPFirewallRuleGroupSet(this.AdminContext(), &pb.AddHTTPFirewallRuleGroupSetRequest{
-						FirewallRuleGroupId:        oldGroup.Id,
-						FirewallRuleSetsConfigJSON: setJSON,
+						FirewallRuleGroupId:       oldGroup.Id,
+						FirewallRuleSetConfigJSON: setJSON,
 					})
 					if err != nil {
 						this.ErrorPage(err)
diff --git a/web/public/js/components/server/http-firewall-rules.js b/web/public/js/components/server/http-firewall-rules.js
index b95b6645..9e5a2455 100644
--- a/web/public/js/components/server/http-firewall-rules.js
+++ b/web/public/js/components/server/http-firewall-rules.js
@@ -288,7 +288,7 @@ Vue.component("http-firewall-checkpoint-referer-block", {
 			<td>允许的来源域名</td>
 			<td>
 				<values-box :values="allowDomains" @change="changeAllowDomains"></values-box>
-				<p class="comment">允许的来源域名列表，比如<code-label>example.com</code-label>、<code-label>*.example.com</code-label>。</p>
+				<p class="comment">允许的来源域名列表，比如<code-label>example.com</code-label>、<code-label>*.example.com</code-label>。单个星号<code-label>*</code-label>表示允许所有域名。</p>
 			</td>
 		</tr>
 	</table>