v1.2.4

dromara · Apr 8, 2023 · e9f7419 · e9f7419
1 parent 694e1ee
commit e9f7419
Show file tree

Hide file tree

Showing 23 changed files with 122 additions and 66 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,11 +1,12 @@
 ## 更新日志
 
 - v1.2.4(2023-04-07)
-    - 新增：分组批量域名
+    - 新增：分组批量关联域名
     - 优化：域名导出新增分组字段
-    - 优化：域名编辑分组的时候，看不到第10个以后的分组名字。
+    - 优化：域名导入支持txt（仅域名字段）、csv（域名、备注）
+    - 修复：域名编辑分组的时候，看不到第10个以后的分组名字。
     - 优化：域名分组列表ID改为序号
-    
+
 - v1.2.3(2023-04-05)
     - 优化：支持docker多平台
 

diff --git a/domain_admin/api/domain_api.py b/domain_admin/api/domain_api.py
@@ -23,7 +23,7 @@ def add_domain():
 
     domain = request.json.get('domain')
     alias = request.json.get('alias', '')
-    group_id = request.json.get('group_id', 0)
+    group_id = request.json.get('group_id') or 0
 
     if not domain:
         raise AppException('参数缺失：domain')
@@ -54,6 +54,7 @@ def update_domain_by_id():
     domain_service.check_permission_and_get_row(domain_id, current_user_id)
 
     data['update_time'] = datetime_util.get_datetime()
+    data['group_id'] = data.get('group_id') or 0
 
     DomainModel.update(data).where(
         DomainModel.id == domain_id
@@ -264,27 +265,6 @@ def check_domain_cert():
     async_task_service.submit_task(fn=domain_service.update_and_check_domain_cert, user_id=current_user_id)
 
 
-def import_domain_from_file():
-    """
-    从文件导入域名
-    :return:
-    """
-    current_user_id = g.user_id
-
-    update_file = request.files.get('file')
-
-    filename = file_service.save_temp_file(update_file)
-
-    # 异步导入
-    async_task_service.submit_task(fn=domain_service.add_domain_from_file, filename=filename, user_id=current_user_id)
-
-    # count = domain_service.add_domain_from_file(filename, current_user_id)
-
-    # return {
-    #     'count': count
-    # }
-
-
 def get_all_domain_list_of_user():
     """
     获取用户的所有域名数据
@@ -306,19 +286,34 @@ def get_all_domain_list_of_user():
     }
 
 
+def import_domain_from_file():
+    """
+    从文件导入域名
+    支持 txt 和 csv格式
+    :return:
+    """
+    current_user_id = g.user_id
+
+    update_file = request.files.get('file')
+
+    filename = file_service.save_temp_file(update_file)
+
+    # 异步导入
+    async_task_service.submit_task(fn=domain_service.add_domain_from_file, filename=filename, user_id=current_user_id)
+
+
 def export_domain_file():
     """
     导出域名文件
+    csv格式
     :return:
     """
     current_user_id = g.user_id
-    # temp_filename = domain_service.export_domain_to_file(current_user_id)
 
-    ret = domain_service.export_domain_to_file(current_user_id)
+    filename = domain_service.export_domain_to_file(current_user_id)
 
     return {
-        'ret': ret,
-        'url': file_service.resolve_temp_url(ret)
+        'url': file_service.resolve_temp_url(filename)
     }
 
 

diff --git a/domain_admin/model/domain_model.py b/domain_admin/model/domain_model.py
@@ -26,7 +26,7 @@ class DomainModel(BaseModel):
     ip = CharField(default="")
 
     # 分组
-    group_id = IntegerField(default=0)
+    group_id = IntegerField(default=0, null=False)
 
     # 域名注册时间 @since 1.1.0
     domain_start_time = DateTimeField(default=None, null=True)

diff --git a/domain_admin/public/css/index.1def0e09.css → domain_admin/public/css/index.8b1a49a5.css b/domain_admin/public/css/index.1def0e09.css → domain_admin/public/css/index.8b1a49a5.css
diff --git a/domain_admin/public/index.html b/domain_admin/public/index.html
@@ -16,12 +16,12 @@
       content="no-referrer"
     />
     <title>Domain Admin-域名证书SSL监测系统</title>
-    <script type="module" crossorigin src="/js/index.c9528988.js"></script>
+    <script type="module" crossorigin src="/js/index.b7697840.js"></script>
     <link rel="modulepreload" crossorigin href="/js/vendor-vue.e07d7f7e.js">
     <link rel="modulepreload" crossorigin href="/js/element-icon.bb5f2c38.js">
     <link rel="modulepreload" crossorigin href="/js/element-plus.0d508af4.js">
     <link rel="modulepreload" crossorigin href="/js/vendor-lib.f93a8f58.js">
-    <link rel="stylesheet" href="/css/index.1def0e09.css">
+    <link rel="stylesheet" href="/css/index.8b1a49a5.css">
   </head>
   <body>
     <div id="app"></div>

diff --git a/...admin/public/js/ConnectStatus.39609056.js → ...admin/public/js/ConnectStatus.ce3f13cb.js b/...admin/public/js/ConnectStatus.39609056.js → ...admin/public/js/ConnectStatus.ce3f13cb.js
diff --git a/domain_admin/public/js/SelectGroup.4a24a2f4.js b/domain_admin/public/js/SelectGroup.4a24a2f4.js
diff --git a/domain_admin/public/js/group-store.43a1d7ec.js b/domain_admin/public/js/group-store.43a1d7ec.js
diff --git a/domain_admin/public/js/index.85864a5a.js → domain_admin/public/js/index.5674bea3.js b/domain_admin/public/js/index.85864a5a.js → domain_admin/public/js/index.5674bea3.js
diff --git a/domain_admin/public/js/index.9dd5ab40.js b/domain_admin/public/js/index.9dd5ab40.js