From bf658c478b099c523bbe1dcc670d3769c84b3cf1 Mon Sep 17 00:00:00 2001
From: jingrow <support@jingrow.com>
Date: Sat, 9 Aug 2025 20:01:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Ddashboard=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E5=99=A8=E8=AF=A6=E6=83=85=E9=A1=B5=E9=98=B2=E7=81=AB=E5=A2=99?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=8D=8F=E8=AE=AE=E5=AD=97=E6=AE=B5=E4=B8=BA?=
 =?UTF-8?q?=E7=A9=BA=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=8C=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E6=88=96=E5=88=A0=E9=99=A4=E8=A7=84=E5=88=99=E5=90=8E=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5=E9=98=B2=E7=81=AB=E5=A2=99=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/JsiteServerFirewallRules.vue   | 30 ++++++++---------
 jcloud/api/aliyun_server_light.py             | 20 ++++++------
 .../firewall_rules/firewall_rules.json        | 32 +++++++++----------
 .../pagetype/firewall_rules/firewall_rules.py |  4 +--
 4 files changed, 44 insertions(+), 42 deletions(-)

diff --git a/dashboard/src2/components/JsiteServerFirewallRules.vue b/dashboard/src2/components/JsiteServerFirewallRules.vue
index 645a37c..bd6d482 100644
--- a/dashboard/src2/components/JsiteServerFirewallRules.vue
+++ b/dashboard/src2/components/JsiteServerFirewallRules.vue
@@ -108,7 +108,7 @@
 								<!-- 协议编辑 -->
 								<div v-if="rule.editing" class="flex items-center space-x-2">
 									<select 
-										v-model="rule.protocol" 
+										v-model="rule.rule_protocol" 
 										class="w-20 px-2 py-1 text-sm border border-gray-300 rounded focus:ring-2 focus:ring-blue-500 focus:border-blue-500"
 									>
 										<option value="TCP">TCP</option>
@@ -119,12 +119,12 @@
 								<div v-else>
 									<span class="inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium" 
 										:class="{
-											'bg-blue-100 text-blue-800': rule.protocol === 'TCP',
-											'bg-green-100 text-green-800': rule.protocol === 'UDP',
-											'bg-yellow-100 text-yellow-800': rule.protocol === 'ICMP',
-											'bg-gray-100 text-gray-800': !rule.protocol
+											'bg-blue-100 text-blue-800': rule.rule_protocol === 'TCP',
+											'bg-green-100 text-green-800': rule.rule_protocol === 'UDP',
+											'bg-yellow-100 text-yellow-800': rule.rule_protocol === 'ICMP',
+											'bg-gray-100 text-gray-800': !rule.rule_protocol
 										}">
-										{{ rule.protocol || '未知' }}
+										{{ rule.rule_protocol || '未知' }}
 									</span>
 								</div>
 							</td>
@@ -143,8 +143,8 @@
 								</div>
 							</td>
 							<td class="px-4 py-4 whitespace-nowrap">
-								<div class="text-sm text-gray-900 max-w-xs truncate" :title="rule.source_ip">
-									{{ rule.source_ip || '0.0.0.0/0' }}
+								<div class="text-sm text-gray-900 max-w-xs truncate" :title="rule.source_cidr_ip">
+									{{ rule.source_cidr_ip || '0.0.0.0/0' }}
 								</div>
 							</td>
 							<td class="px-4 py-4 whitespace-nowrap">
@@ -303,9 +303,9 @@ export default {
 						const firewallRules = response.data.firewall_rules || [];
 						this.firewallRules = firewallRules.map(rule => ({
 							rule_id: rule.rule_id,
-							protocol: rule.protocol,
+							rule_protocol: rule.rule_protocol,
 							port: rule.port,
-							source_ip: rule.source_ip,
+							source_cidr_ip: rule.source_cidr_ip,
 							remark: rule.remark,
 							editing: false,
 							isNew: false
@@ -355,9 +355,9 @@ export default {
 		addNewRow() {
 			const newRule = {
 				rule_id: null,
-				protocol: 'TCP',
+				rule_protocol: 'TCP',
 				port: '',
-				source_ip: '0.0.0.0/0',
+				source_cidr_ip: '0.0.0.0/0',
 				remark: '',
 				editing: true,
 				isNew: true
@@ -369,7 +369,7 @@ export default {
 
 		// 保存规则
 		async saveRule(rule) {
-			if (!rule.protocol || !rule.port) {
+			if (!rule.rule_protocol || !rule.port) {
 				toast.error('协议和端口不能为空');
 				return;
 			}
@@ -379,7 +379,7 @@ export default {
 					url: 'jcloud.api.aliyun_server_light.create_aliyun_firewall_rule',
 					params: {
 						instance_id: this.$jsiteServer.pg.instance_id,
-						rule_protocol: rule.protocol,
+						rule_protocol: rule.rule_protocol,
 						port: rule.port,
 						remark: rule.remark,
 						region_id: this.$jsiteServer.pg.region
@@ -430,7 +430,7 @@ export default {
 		deleteRule(rule) {
 			confirmDialog({
 				title: '删除防火墙规则',
-				message: `确定要删除这条防火墙规则吗？\n协议: ${rule.protocol}\n端口: ${rule.port}`,
+				message: `确定要删除这条防火墙规则吗？\n协议: ${rule.rule_protocol}\n端口: ${rule.port}`,
 				primaryAction: {
 					label: '确定',
 					variant: 'solid',
diff --git a/jcloud/api/aliyun_server_light.py b/jcloud/api/aliyun_server_light.py
index d02b4cd..e3916d1 100644
--- a/jcloud/api/aliyun_server_light.py
+++ b/jcloud/api/aliyun_server_light.py
@@ -1687,6 +1687,10 @@ def create_aliyun_firewall_rule(instance_id, rule_protocol, port, remark=None, r
         manager = _get_manager()
         result = manager.create_firewall_rule(instance_id, rule_protocol, port, remark, region_id)
         
+        # 如果创建成功，同步防火墙规则到本地记录
+        if result and result.get('success'):
+            sync_firewall_rules(instance_id)
+        
         return result
         
     except Exception as e:
@@ -1696,13 +1700,7 @@ def create_aliyun_firewall_rule(instance_id, rule_protocol, port, remark=None, r
 @jingrow.whitelist()
 def get_aliyun_firewall_rules(instance_id, region_id='cn-shanghai'):
     """获取阿里云轻量应用服务器防火墙规则列表"""
-    try:
-        # 如果没有提供region_id，尝试从服务器记录中获取
-        if not region_id or region_id == 'cn-shanghai':
-            server = jingrow.get_pg("Jsite Server", {"instance_id": instance_id})
-            if server and server.region:
-                region_id = server.region
-        
+    try:        
         # 调用管理器获取防火墙规则列表
         manager = _get_manager()
         result = manager.list_firewall_rules(instance_id, region_id)
@@ -1721,6 +1719,10 @@ def delete_aliyun_firewall_rules(instance_id, rule_ids, region_id='cn-shanghai')
         manager = _get_manager()
         result = manager.delete_firewall_rules(instance_id, rule_ids, region_id)
         
+        # 如果删除成功，同步防火墙规则到本地记录
+        if result and result.get('success'):
+            sync_firewall_rules(instance_id)
+        
         return result
         
     except Exception as e:
@@ -1754,9 +1756,9 @@ def sync_firewall_rules(instance_id):
         for rule in firewall_rules_data:
             converted_rule = {
                 "rule_id": rule.get('rule_id', ''),
-                "protocol": rule.get('rule_protocol', ''),
+                "rule_protocol": rule.get('rule_protocol', ''),
                 "port": rule.get('port', ''),
-                "source_ip": rule.get('source_cidr_ip', '0.0.0.0/0'),
+                "source_cidr_ip": rule.get('source_cidr_ip', '0.0.0.0/0'),
                 "remark": rule.get('remark', '')
             }
             converted_rules.append(converted_rule)
diff --git a/jcloud/jcloud/pagetype/firewall_rules/firewall_rules.json b/jcloud/jcloud/pagetype/firewall_rules/firewall_rules.json
index 1d07f85..7e2509f 100644
--- a/jcloud/jcloud/pagetype/firewall_rules/firewall_rules.json
+++ b/jcloud/jcloud/pagetype/firewall_rules/firewall_rules.json
@@ -6,31 +6,18 @@
  "engine": "InnoDB",
  "field_order": [
   "rule_id",
-  "protocol",
+  "rule_protocol",
   "port",
-  "source_ip",
+  "source_cidr_ip",
   "remark"
  ],
  "fields": [
-  {
-   "fieldname": "protocol",
-   "fieldtype": "Select",
-   "in_list_view": 1,
-   "label": "协议",
-   "options": "TCP\nUDP\nICMP"
-  },
   {
    "fieldname": "port",
    "fieldtype": "Data",
    "in_list_view": 1,
    "label": "端口范围"
   },
-  {
-   "fieldname": "source_ip",
-   "fieldtype": "Data",
-   "in_list_view": 1,
-   "label": "来源IP"
-  },
   {
    "fieldname": "remark",
    "fieldtype": "Data",
@@ -44,13 +31,26 @@
    "in_list_view": 1,
    "label": "规则ID",
    "read_only": 1
+  },
+  {
+   "fieldname": "rule_protocol",
+   "fieldtype": "Select",
+   "in_list_view": 1,
+   "label": "协议",
+   "options": "TCP\nUDP\nICMP"
+  },
+  {
+   "fieldname": "source_cidr_ip",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "来源IP"
   }
  ],
  "grid_page_length": 50,
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2025-08-09 18:39:46.276289",
+ "modified": "2025-08-09 19:45:50.104225",
  "modified_by": "Administrator",
  "module": "Jcloud",
  "name": "Firewall Rules",
diff --git a/jcloud/jcloud/pagetype/firewall_rules/firewall_rules.py b/jcloud/jcloud/pagetype/firewall_rules/firewall_rules.py
index bf1845a..82abe48 100644
--- a/jcloud/jcloud/pagetype/firewall_rules/firewall_rules.py
+++ b/jcloud/jcloud/pagetype/firewall_rules/firewall_rules.py
@@ -18,9 +18,9 @@ class FirewallRules(Document):
 		parentfield: DF.Data
 		parenttype: DF.Data
 		port: DF.Data | None
-		protocol: DF.Literal["TCP", "UDP", "ICMP"]
 		remark: DF.Data | None
 		rule_id: DF.Data | None
-		source_ip: DF.Data | None
+		rule_protocol: DF.Literal["TCP", "UDP", "ICMP"]
+		source_cidr_ip: DF.Data | None
 	# end: auto-generated types
 	pass