From 94ff9ee2611d7e7f76e7644d3ce178789443f95b Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Wed, 6 Aug 2025 10:14:09 +0800
Subject: [PATCH] perf: conn token add remote addr

---
 .../0007_connectiontoken_remote_addr.py       | 20 +++++++++++++++++++
 .../authentication/models/connection_token.py |  3 +++
 .../serializers/connection_token.py           |  8 ++++++++
 apps/i18n/luna/en.json                        |  4 ++--
 4 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 apps/authentication/migrations/0007_connectiontoken_remote_addr.py

diff --git a/apps/authentication/migrations/0007_connectiontoken_remote_addr.py b/apps/authentication/migrations/0007_connectiontoken_remote_addr.py
new file mode 100644
index 000000000..2bb429e96
--- /dev/null
+++ b/apps/authentication/migrations/0007_connectiontoken_remote_addr.py
@@ -0,0 +1,20 @@
+# Generated by Django 4.1.13 on 2025-08-04 06:20
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("authentication", "0006_connectiontoken_type"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="connectiontoken",
+            name="remote_addr",
+            field=models.CharField(
+                blank=True, max_length=128, null=True, verbose_name="Remote addr"
+            ),
+        ),
+    ]
diff --git a/apps/authentication/models/connection_token.py b/apps/authentication/models/connection_token.py
index 95e0c3d7e..278eedc5a 100644
--- a/apps/authentication/models/connection_token.py
+++ b/apps/authentication/models/connection_token.py
@@ -57,6 +57,9 @@ class ConnectionToken(JMSOrgBaseModel):
     )
     face_monitor_token = models.CharField(max_length=128, null=True, blank=True, verbose_name=_("Face monitor token"))
     is_active = models.BooleanField(default=True, verbose_name=_("Active"))
+    remote_addr = models.CharField(
+        max_length=128, verbose_name=_("Remote addr"), blank=True, null=True
+    )
 
     type = models.CharField(
         max_length=16, choices=ConnectionTokenType.choices,
diff --git a/apps/authentication/serializers/connection_token.py b/apps/authentication/serializers/connection_token.py
index 3c176f57c..f2459be51 100644
--- a/apps/authentication/serializers/connection_token.py
+++ b/apps/authentication/serializers/connection_token.py
@@ -1,6 +1,7 @@
 from django.utils.translation import gettext_lazy as _
 from rest_framework import serializers
 
+from common.utils import get_request_ip
 from common.serializers import CommonModelSerializer
 from common.serializers.fields import EncryptedField
 from perms.serializers.permission import ActionChoicesField
@@ -29,6 +30,7 @@ class ConnectionTokenSerializer(CommonModelSerializer):
             'is_active', 'is_reusable', 'from_ticket', 'from_ticket_info',
             'date_expired', 'date_created', 'date_updated', 'created_by',
             'updated_by', 'org_id', 'org_name', 'face_monitor_token',
+            'remote_addr',
         ]
         read_only_fields = [
             # 普通 Token 不支持指定 user
@@ -52,6 +54,12 @@ class ConnectionTokenSerializer(CommonModelSerializer):
     def get_user(self, attrs):
         return self.get_request_user()
 
+    def create(self, validated_data):
+        request = self.context.get('request')
+        if request:
+            validated_data['remote_addr'] = get_request_ip(request)
+        return super().create(validated_data)
+
     def get_from_ticket_info(self, instance):
         if not instance.from_ticket:
             return {}
diff --git a/apps/i18n/luna/en.json b/apps/i18n/luna/en.json
index 4ab3b946e..93770951c 100644
--- a/apps/i18n/luna/en.json
+++ b/apps/i18n/luna/en.json
@@ -205,7 +205,7 @@
     "SelectCommand": "Please select the command to execute.",
     "Send command": "Send command",
     "Send text to all ssh terminals": "Send text to all ssh terminals",
-    "SendCommandPlaceholder": "Input command here..., Enter for new line, Ctrl+Enter to send",
+    "SendCommandPlaceholder": "Input command here, Enter for new line, Ctrl+Enter to send",
     "Session": "Session",
     "SessionIsBeingMonitored": "Session is being monitored",
     "SessionShare": "Session share",
@@ -283,4 +283,4 @@
     "success": "Success",
     "system user": "System user",
     "user": "User"
-}
\ No newline at end of file
+}