From 77b4a1eaf6da8eda3964af67f1352823b57a023d Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Tue, 21 Oct 2025 22:38:02 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AB=99=E7=82=B9=E7=9B=91=E6=8E=A7=E6=89=B9?=
 =?UTF-8?q?=E9=87=8F=E5=AF=BC=E5=85=A5=E6=94=AF=E6=8C=81=E5=88=86=E7=BB=84?=
 =?UTF-8?q?=E5=92=8C=E5=A4=87=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/certd-client/src/locales/langs/en-US/certd.ts  |  2 +-
 .../ui/certd-client/src/locales/langs/zh-CN/certd.ts  |  4 ++--
 .../src/views/certd/monitor/site/index.vue            |  5 +----
 .../controller/user/monitor/site-info-controller.ts   |  1 +
 .../src/modules/monitor/service/site-info-service.ts  | 11 ++++++++---
 5 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/packages/ui/certd-client/src/locales/langs/en-US/certd.ts b/packages/ui/certd-client/src/locales/langs/en-US/certd.ts
index eed1e588..339c3bce 100644
--- a/packages/ui/certd-client/src/locales/langs/en-US/certd.ts
+++ b/packages/ui/certd-client/src/locales/langs/en-US/certd.ts
@@ -294,7 +294,7 @@ export default {
   },
   domainList: {
     title: "Domain List",
-    helper: "Format: domain:port:name, one per line. Port and name are optional.\nExamples:\nwww.baidu.com:443:Baidu\nwww.taobao.com::Taobao\nwww.google.com",
+    helper: "Format: domain:port:name:remark, one per line. Port and name are optional.\nExamples:\nwww.baidu.com:443:Baidu:remarkText\nwww.taobao.com::Taobao\nwww.google.com",
     required: "Please enter domains to import",
     placeholder: "www.baidu.com:443:Baidu\nwww.taobao.com::Taobao\nwww.google.com\n",
   },
diff --git a/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts b/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts
index ff900a85..563ccacd 100644
--- a/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts
+++ b/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts
@@ -299,9 +299,9 @@ export default {
   },
   domainList: {
     title: "域名列表",
-    helper: "格式【域名:端口:名称】，一行一个，其中端口、名称可以省略\n比如：\nwww.baidu.com:443:百度\nwww.taobao.com::淘宝\nwww.google.com",
+    helper: "格式【域名:端口:名称:备注】，一行一个，其中端口、名称、备注可以省略\n比如：\nwww.baidu.com:443:百度:备注文本\nwww.taobao.com::淘宝\nwww.google.com",
     required: "请输入要导入的域名",
-    placeholder: "www.baidu.com:443:百度\nwww.taobao.com::淘宝\nwww.google.com\n",
+    placeholder: "www.baidu.com:443:百度:备注文本\nwww.taobao.com::淘宝\nwww.google.com\n",
   },
   accountInfo: "账号信息",
   securitySettings: "认证安全设置",
diff --git a/packages/ui/certd-client/src/views/certd/monitor/site/index.vue b/packages/ui/certd-client/src/views/certd/monitor/site/index.vue
index 8558e25d..9eceafe7 100644
--- a/packages/ui/certd-client/src/views/certd/monitor/site/index.vue
+++ b/packages/ui/certd-client/src/views/certd/monitor/site/index.vue
@@ -26,13 +26,10 @@
 </template>
 
 <script lang="ts" setup>
-import { onActivated, onMounted } from "vue";
 import { useFs } from "@fast-crud/fast-crud";
+import { onActivated, onMounted } from "vue";
 import createCrudOptions from "./crud";
-import { siteInfoApi } from "./api";
-import { Modal, notification } from "ant-design-vue";
 import { useI18n } from "/src/locales";
-import * as api from "./api";
 const { t } = useI18n();
 defineOptions({
   name: "SiteCertMonitor",
diff --git a/packages/ui/certd-server/src/controller/user/monitor/site-info-controller.ts b/packages/ui/certd-server/src/controller/user/monitor/site-info-controller.ts
index 390a47c0..4431c5b8 100644
--- a/packages/ui/certd-server/src/controller/user/monitor/site-info-controller.ts
+++ b/packages/ui/certd-server/src/controller/user/monitor/site-info-controller.ts
@@ -119,6 +119,7 @@ export class SiteInfoController extends CrudController<SiteInfoService> {
     const userId = this.getUserId();
     await this.service.doImport({
       text:body.text,
+      groupId:body.groupId,
       userId
     })
     return this.ok();
diff --git a/packages/ui/certd-server/src/modules/monitor/service/site-info-service.ts b/packages/ui/certd-server/src/modules/monitor/service/site-info-service.ts
index 13f415df..d67f852c 100644
--- a/packages/ui/certd-server/src/modules/monitor/service/site-info-service.ts
+++ b/packages/ui/certd-server/src/modules/monitor/service/site-info-service.ts
@@ -393,7 +393,7 @@ export class SiteInfoService extends BaseService<SiteInfoEntity> {
     }
   }
 
-  async doImport(req: { text: string; userId: number }) {
+  async doImport(req: { text: string; userId: number,groupId?:number }) {
     if (!req.text) {
       throw new Error("text is required");
     }
@@ -421,17 +421,22 @@ export class SiteInfoService extends BaseService<SiteInfoEntity> {
         } catch (e) {
           throw new Error(`${item}格式错误`);
         }
-
       }
       if (arr.length > 2) {
         name = arr[2] || domain;
       }
+      let remark:string = "";
+      if (arr.length > 3) {
+        remark = arr[3] || "";
+      }
 
       list.push({
         domain,
         name,
         httpsPort: port,
-        userId: req.userId
+        userId: req.userId,
+        remark,
+        groupId: req.groupId
       });
     }