chore: release v2.4.13

feat(api): relation path search

README.md

@@ -27,6 +27,7 @@
 
 <img src=docs/images/dashboard.png />
 
+[查看更多展示](docs/screenshot.md)
 
 ### 相关文章
 
@@ -50,12 +51,14 @@
 
 ### 主要功能
 
-- 自定义模型和模型关系，模型属性支持下拉列表、字体颜色、计算属性等高级特性
-- 支持计算机、网络设备、存储设备、数据库、中间件、公有云资源等自动发现
+- 模型属性支持索引、多值、默认排序、字体颜色，支持计算属性
+- 支持自动发现、定时巡检、文件导入
 - 支持资源、层级、关系视图展示
+- 支持模型间关系配置和展示
 - 细粒度访问控制，完备的操作日志
-- 通用的资源搜索和关系搜索
-- 支持IP地址管理(IPAM), 数据中心基础设施管理(DCIM)
+- 支持跨模型搜索
+
+
 
 
 

cmdb-api/.ruff.toml

@@ -1,79 +0,0 @@
-line-length = 120
-cache-dir = ".ruff_cache"
-target-version = "py310"
-unsafe-fixes = true
-show-fixes = true
-
-[lint]
-select = [
-    "E",
-    "F",
-    "I",
-    "TCH",
-    # W
-    "W505",
-    # PT
-    "PT018",
-    # SIM
-    "SIM101",
-    "SIM114",
-    # PGH
-    "PGH004",
-    # PL
-    "PLE1142",
-    # RUF
-    "RUF100",
-    # UP
-    "UP007"
-]
-preview = true
-ignore = ["FURB101"]
-
-[lint.flake8-pytest-style]
-mark-parentheses = false
-parametrize-names-type = "list"
-parametrize-values-row-type = "list"
-parametrize-values-type = "tuple"
-
-[lint.flake8-unused-arguments]
-ignore-variadic-names = true
-
-[lint.isort]
-lines-between-types = 1
-order-by-type = true
-
-[lint.per-file-ignores]
-"**/api/v1/*.py" = ["TCH"]
-"**/model/*.py" = ["TCH003"]
-"**/models/__init__.py" = ["F401", "F403"]
-"**/tests/*.py" = ["E402"]
-"celery_worker.py" = ["F401"]
-"api/views/entry.py" = ["I001"]
-"migrations/*.py" = ["I001", "E402"]
-"*.py" = ["I001"]
-"api/views/common_setting/department.py" = ["F841"]
-"api/lib/common_setting/upload_file.py" = ["F841"]
-"api/lib/common_setting/acl.py" = ["F841"]
-"**/__init__.py" = ["F822"]
-"api/tasks/*.py" = ["E722"]
-"api/views/cmdb/*.py" = ["E722"]
-"api/views/acl/*.py" = ["E722"]
-"api/lib/secrets/*.py" = ["E722", "F841"]
-"api/lib/utils.py" = ["E722", "E731"]
-"api/lib/perm/authentication/cas/*" = ["E113", "F841"]
-"api/lib/perm/acl/*" = ["E722"]
-"api/lib/*" = ["E721", "F722"]
-"api/lib/cmdb/*" = ["F722", "E722"]
-"api/lib/cmdb/search/ci/es/search.py" = ["F841", "SIM114"]
-"api/lib/cmdb/search/ci/db/search.py" = ["F841"]
-"api/lib/cmdb/value.py" = ["F841"]
-"api/lib/cmdb/history.py" = ["E501"]
-"api/commands/common.py" = ["E722"]
-"api/commands/click_cmdb.py" = ["E722"]
-"api/lib/perm/auth.py" = ["SIM114"]
-
-[format]
-preview = true
-quote-style = "single"
-docstring-code-format = true
-skip-magic-trailing-comma = false

cmdb-api/Pipfile

@@ -11,7 +11,7 @@ click = ">=5.0"
 # Api
 Flask-RESTful = "==0.3.10"
 # Database
-Flask-SQLAlchemy = "==3.0.5"
+Flask-SQLAlchemy = "==2.5.0"
 SQLAlchemy = "==1.4.49"
 PyMySQL = "==1.1.0"
 redis = "==4.6.0"
@@ -69,7 +69,6 @@ lz4 = ">=4.3.2"
 python-magic = "==0.4.27"
 jsonpath = "==0.82.2"
 networkx = ">=3.1"
-ipaddress = ">=1.0.23"
 
 [dev-packages]
 # Testing

cmdb-api/api/commands/click_cmdb.py

@@ -1,13 +1,14 @@
 # -*- coding:utf-8 -*-
 
 
-import click
 import copy
 import datetime
 import json
-import requests
 import time
 import uuid
+
+import click
+import requests
 from flask import current_app
 from flask.cli import with_appcontext
 from flask_login import login_user
@@ -23,7 +24,6 @@ from api.lib.cmdb.const import REDIS_PREFIX_CI_RELATION2
 from api.lib.cmdb.const import ResourceTypeEnum
 from api.lib.cmdb.const import RoleEnum
 from api.lib.cmdb.const import ValueTypeEnum
-from api.lib.cmdb.dcim.rack import RackManager
 from api.lib.exception import AbortException
 from api.lib.perm.acl.acl import ACLManager
 from api.lib.perm.acl.acl import UserCache
@@ -37,14 +37,11 @@ from api.lib.secrets.secrets import InnerKVManger
 from api.models.acl import App
 from api.models.acl import ResourceType
 from api.models.cmdb import Attribute
-from api.models.cmdb import AttributeHistory
 from api.models.cmdb import CI
 from api.models.cmdb import CIRelation
 from api.models.cmdb import CIType
 from api.models.cmdb import CITypeTrigger
-from api.models.cmdb import OperationRecord
 from api.models.cmdb import PreferenceRelationView
-from api.tasks.cmdb import batch_ci_cache
 
 
 @click.command()
@@ -196,7 +193,7 @@ def cmdb_counter():
     today = datetime.date.today()
     while True:
         try:
-            db.session.commit()
+            db.session.remove()
 
             CMDBCounterCache.reset()
 
@@ -210,8 +207,6 @@ def cmdb_counter():
 
             CMDBCounterCache.flush_sub_counter()
 
-            RackManager().check_u_slot()
-
             i += 1
         except:
             import traceback
@@ -256,10 +251,10 @@ def cmdb_trigger():
                         trigger2cis[trigger.id] = (trigger, ready_cis)
                     else:
                         cur = trigger2cis[trigger.id]
-                        cur_ci_ids = {_ci.ci_id for _ci in cur[1]}
+                        cur_ci_ids = {i.ci_id for i in cur[1]}
                         trigger2cis[trigger.id] = (
-                            trigger, cur[1] + [_ci for _ci in ready_cis if _ci.ci_id not in cur_ci_ids
-                                               and _ci.ci_id not in trigger2completed.get(trigger.id, {})])
+                            trigger, cur[1] + [i for i in ready_cis if i.ci_id not in cur_ci_ids
+                                               and i.ci_id not in trigger2completed.get(trigger.id, {})])
 
             for tid in trigger2cis:
                 trigger, cis = trigger2cis[tid]
@@ -346,7 +341,7 @@ def cmdb_inner_secrets_init(address):
     if valid_address(address):
         token = current_app.config.get("INNER_TRIGGER_TOKEN", "") if not token else token
         if not token:
-            token = click.prompt('Enter root token', hide_input=True, confirmation_prompt=False)
+            token = click.prompt(f'Enter root token', hide_input=True, confirmation_prompt=False)
         assert token is not None
         resp = requests.post("{}/api/v0.1/secrets/auto_seal".format(address.strip("/")),
                              headers={"Inner-Token": token})
@@ -562,20 +557,5 @@ def cmdb_patch(version):
                         existed.update(option=option, commit=False)
 
             db.session.commit()
-
-        if version >= "2.4.14":  # update ci columns: updated_at and updated_by
-            ci_ids = []
-            for i in CI.get_by(only_query=True).filter(CI.updated_at.is_(None)):
-                hist = AttributeHistory.get_by(ci_id=i.id, only_query=True).order_by(AttributeHistory.id.desc()).first()
-                if hist is not None:
-                    record = OperationRecord.get_by_id(hist.record_id)
-                    if record is not None:
-                        u = UserCache.get(record.uid)
-                        i.update(updated_at=record.created_at, updated_by=u and u.nickname, flush=True)
-                        ci_ids.append(i.id)
-
-            db.session.commit()
-
-            batch_ci_cache.apply_async(args=(ci_ids,))
     except Exception as e:
         print("cmdb patch failed: {}".format(e))

cmdb-api/api/lib/cmdb/attribute.py

@@ -415,7 +415,7 @@ class AttributeManager(object):
             db.session.rollback()
             current_app.logger.error("update attribute error, {0}".format(str(e)))
 
-            return abort(400, ErrFormat.update_attribute_failed.format(("id={}".format(_id))))
+            return abort(400, ErrFormat.update_attribute_failed.format(("id=".format(_id))))
 
         new = attr.to_dict()
         if not new['choice_web_hook'] and new['is_choice']:

cmdb-api/api/lib/cmdb/cache.py

@@ -512,7 +512,7 @@ class CMDBCounterCache(object):
                 result[i.type_id]['rule_count'] = len(adts) + AutoDiscoveryCITypeRelation.get_by(
                     ad_type_id=i.type_id, only_query=True).count()
                 result[i.type_id]['exec_target_count'] = len(
-                    set([j.oneagent_id for adt in adts for j in db.session.query(
+                    set([i.oneagent_id for adt in adts for i in db.session.query(
                         AutoDiscoveryRuleSyncHistory.oneagent_id).filter(
                         AutoDiscoveryRuleSyncHistory.adt_id == adt.id)]))
 

cmdb-api/api/lib/cmdb/ci.py

@@ -45,7 +45,6 @@ from api.lib.notify import notify_send
 from api.lib.perm.acl.acl import ACLManager
 from api.lib.perm.acl.acl import is_app_admin
 from api.lib.perm.acl.acl import validate_permission
-from api.lib.perm.acl.cache import UserCache
 from api.lib.secrets.inner import InnerCrypt
 from api.lib.secrets.vault import VaultClient
 from api.lib.utils import handle_arg_list
@@ -114,8 +113,7 @@ class CIManager(object):
         ci_type = CITypeCache.get(ci.type_id)
         res["ci_type"] = ci_type.name
 
-        ci_list = cls.get_cis_by_ids([str(ci_id)], fields=fields, ret_key=ret_key)
-        ci_list and res.update(ci_list[0])
+        res.update(cls.get_cis_by_ids([str(ci_id)], fields=fields, ret_key=ret_key))
 
         res['_type'] = ci_type.id
         res['_id'] = ci_id
@@ -208,8 +206,6 @@ class CIManager(object):
         res['_type'] = ci_type.id
         res['ci_type_alias'] = ci_type.alias
         res['_id'] = ci_id
-        res['_updated_at'] = str(ci.updated_at or '')
-        res['_updated_by'] = ci.updated_by
 
         return res
 
@@ -295,7 +291,7 @@ class CIManager(object):
         db.session.commit()
 
         value_table = TableMap(attr_name=attr.name).table
-        with redis_lock.Lock(rd.r, "auto_inc_id_{}".format(attr.name), expire=10):
+        with redis_lock.Lock(rd.r, "auto_inc_id_{}".format(attr.name)):
             max_v = value_table.get_by(attr_id=attr.id, only_query=True).order_by(
                 getattr(value_table, 'value').desc()).first()
             if max_v is not None:
@@ -357,7 +353,6 @@ class CIManager(object):
             is_auto_discovery=False,
             _is_admin=False,
             ticket_id=None,
-            _sync=False,
             **ci_dict):
         """
         add ci
@@ -367,7 +362,6 @@ class CIManager(object):
         :param is_auto_discovery: default is False
         :param _is_admin: default is False
         :param ticket_id:
-        :param _sync:
         :param ci_dict:
         :return:
         """
@@ -393,7 +387,7 @@ class CIManager(object):
         ci = None
         record_id = None
         password_dict = {}
-        with redis_lock.Lock(rd.r, ci_type.name, expire=10):
+        with redis_lock.Lock(rd.r, ci_type.name):
             db.session.commit()
 
             if (unique_key.default and unique_key.default.get('default') == AttributeDefaultValueEnum.AUTO_INC_ID and
@@ -498,16 +492,10 @@ class CIManager(object):
                 record_id = cls.save_password(ci.id, attr_id, password_dict[attr_id], record_id, ci_type.id)
 
         if record_id or has_dynamic:  # has changed
-            if not _sync:
-                ci_cache.apply_async(args=(ci.id, operate_type, record_id), queue=CMDB_QUEUE)
-            else:
-                ci_cache(ci.id, operate_type, record_id)
+            ci_cache.apply_async(args=(ci.id, operate_type, record_id), queue=CMDB_QUEUE)
 
         if ref_ci_dict:  # add relations
-            if not _sync:
-                ci_relation_add.apply_async(args=(ref_ci_dict, ci.id, current_user.uid), queue=CMDB_QUEUE)
-            else:
-                ci_relation_add(ref_ci_dict, ci.id, current_user.uid)
+            ci_relation_add.apply_async(args=(ref_ci_dict, ci.id, current_user.uid), queue=CMDB_QUEUE)
 
         return ci.id
 
@@ -550,7 +538,7 @@ class CIManager(object):
         limit_attrs = self._valid_ci_for_no_read(ci) if not _is_admin else {}
 
         record_id = None
-        with redis_lock.Lock(rd.r, ci_type.name, expire=10):
+        with redis_lock.Lock(rd.r, ci_type.name):
             db.session.commit()
 
             self._valid_unique_constraint(ci.type_id, ci_dict, ci_id)
@@ -580,9 +568,6 @@ class CIManager(object):
             for attr_id in password_dict:
                 record_id = self.save_password(ci.id, attr_id, password_dict[attr_id], record_id, ci.type_id)
 
-        u = UserCache.get(current_user.uid)
-        ci.update(updated_at=now, updated_by=u and u.nickname)
-
         if record_id or has_dynamic:  # has changed
             if not _sync:
                 ci_cache.apply_async(args=(ci_id, OperateType.UPDATE, record_id), queue=CMDB_QUEUE)
@@ -596,9 +581,6 @@ class CIManager(object):
             else:
                 ci_relation_add(ref_ci_dict, ci.id)
 
-        u = UserCache.get(current_user.uid)
-        ci.update(updated_at=now, updated_by=u and u.nickname)
-
     @staticmethod
     def update_unique_value(ci_id, unique_name, unique_value):
         ci = CI.get_by_id(ci_id) or abort(404, ErrFormat.ci_not_found.format("id={}".format(ci_id)))
@@ -1268,9 +1250,7 @@ class CIRelationManager(object):
             else:
                 type_relation = CITypeRelation.get_by_id(relation_type_id)
 
-            with redis_lock.Lock(rd.r,
-                                 "ci_relation_add_{}_{}".format(first_ci.type_id, second_ci.type_id),
-                                 expire=10):
+            with redis_lock.Lock(rd.r, "ci_relation_add_{}_{}".format(first_ci.type_id, second_ci.type_id)):
 
                 cls._check_constraint(first_ci_id, first_ci.type_id, second_ci_id, second_ci.type_id, type_relation)
 
@@ -1291,10 +1271,10 @@ class CIRelationManager(object):
         return existed.id
 
     @staticmethod
-    def delete(cr_id, apply_async=True, valid=True):
+    def delete(cr_id, apply_async=True):
         cr = CIRelation.get_by_id(cr_id) or abort(404, ErrFormat.relation_not_found.format("id={}".format(cr_id)))
 
-        if current_app.config.get('USE_ACL') and current_user.username != 'worker' and valid:
+        if current_app.config.get('USE_ACL') and current_user.username != 'worker':
             resource_name = CITypeRelationManager.acl_resource_name(cr.first_ci.ci_type.name, cr.second_ci.ci_type.name)
             if not ACLManager().has_permission(
                     resource_name,
@@ -1333,7 +1313,7 @@ class CIRelationManager(object):
         return cr
 
     @classmethod
-    def delete_3(cls, first_ci_id, second_ci_id, apply_async=True, valid=True):
+    def delete_3(cls, first_ci_id, second_ci_id, apply_async=True):
         cr = CIRelation.get_by(first_ci_id=first_ci_id,
                                second_ci_id=second_ci_id,
                                to_dict=False,
@@ -1343,7 +1323,7 @@ class CIRelationManager(object):
             # ci_relation_delete.apply_async(args=(first_ci_id, second_ci_id, cr.ancestor_ids), queue=CMDB_QUEUE)
             # delete_id_filter.apply_async(args=(second_ci_id,), queue=CMDB_QUEUE)
 
-            cls.delete(cr.id, apply_async=apply_async, valid=valid)
+            cls.delete(cr.id, apply_async=apply_async)
 
         return cr
 
@@ -1536,8 +1516,7 @@ class CITriggerManager(object):
         ci_dict.update(attr_dict)
 
     @classmethod
-    def _exec_webhook(cls, operate_type, webhook, ci_dict, trigger_id, trigger_name, record_id,
-                      ci_id=None, app=None, record_history=True):
+    def _exec_webhook(cls, operate_type, webhook, ci_dict, trigger_id, trigger_name, record_id, ci_id=None, app=None):
         app = app or current_app
 
         with app.app_context():
@@ -1555,20 +1534,19 @@ class CITriggerManager(object):
                 current_app.logger.warning("exec webhook failed: {}".format(e))
                 response = e
                 is_ok = False
-            if record_history:
-                CITriggerHistoryManager.add(operate_type,
-                                            record_id,
-                                            ci_dict.get('_id'),
-                                            trigger_id,
-                                            trigger_name,
-                                            is_ok=is_ok,
-                                            webhook=response)
+
+            CITriggerHistoryManager.add(operate_type,
+                                        record_id,
+                                        ci_dict.get('_id'),
+                                        trigger_id,
+                                        trigger_name,
+                                        is_ok=is_ok,
+                                        webhook=response)
 
             return is_ok
 
     @classmethod
-    def _exec_notify(cls, operate_type, notify, ci_dict, trigger_id, trigger_name, record_id,
-                     ci_id=None, app=None, record_history=True):
+    def _exec_notify(cls, operate_type, notify, ci_dict, trigger_id, trigger_name, record_id, ci_id=None, app=None):
         app = app or current_app
 
         with app.app_context():
@@ -1592,14 +1570,13 @@ class CITriggerManager(object):
                     response = "{}\n{}".format(response, e)
                     is_ok = False
 
-            if record_history:
-                CITriggerHistoryManager.add(operate_type,
-                                            record_id,
-                                            ci_dict.get('_id'),
-                                            trigger_id,
-                                            trigger_name,
-                                            is_ok=is_ok,
-                                            notify=response.strip())
+            CITriggerHistoryManager.add(operate_type,
+                                        record_id,
+                                        ci_dict.get('_id'),
+                                        trigger_id,
+                                        trigger_name,
+                                        is_ok=is_ok,
+                                        notify=response.strip())
 
             return is_ok
 
@@ -1676,47 +1653,25 @@ class CITriggerManager(object):
         return result
 
     @classmethod
-    def trigger_notify(cls, trigger, ci, only_test=False):
+    def trigger_notify(cls, trigger, ci):
         """
         only for date attribute
         :param trigger:
         :param ci:
-        :param only_test:
         :return:
         """
         if (trigger.option.get('notifies', {}).get('notify_at') == datetime.datetime.now().strftime("%H:%M") or
-            not trigger.option.get('notifies', {}).get('notify_at')) or only_test:
+                not trigger.option.get('notifies', {}).get('notify_at')):
 
             if trigger.option.get('webhooks'):
-                threading.Thread(
-                    target=cls._exec_webhook,
-                    args=(None, trigger.option['webhooks'], None, trigger.id,
-                          trigger.option.get('name'), None,
-                          ci and ci.ci_id,
-                          current_app._get_current_object(), not only_test)).start()
+                threading.Thread(target=cls._exec_webhook, args=(
+                    None, trigger.option['webhooks'], None, trigger.id, trigger.option.get('name'), None, ci.ci_id,
+                    current_app._get_current_object())).start()
             elif trigger.option.get('notifies'):
                 threading.Thread(target=cls._exec_notify, args=(
-                    None, trigger.option['notifies'], None, trigger.id,
-                    trigger.option.get('name'), None,
-                    ci and ci.ci_id,
-                    current_app._get_current_object(), not only_test)).start()
+                    None, trigger.option['notifies'], None, trigger.id, trigger.option.get('name'), None, ci.ci_id,
+                    current_app._get_current_object())).start()
 
             return True
 
         return False
-
-    @classmethod
-    def trigger_notify_test(cls, type_id, trigger_id):
-        trigger = CITypeTrigger.get_by_id(trigger_id) or abort(
-            404, ErrFormat.ci_type_trigger_not_found.format(trigger_id))
-
-        ci_type = CITypeCache.get(type_id) or abort(404, ErrFormat.ci_type_not_found.format(type_id))
-        attr = AttributeCache.get(ci_type.unique_id)
-        value_table = TableMap(attr=attr).table
-        if not value_table:
-            return
-
-        value = value_table.get_by(attr_id=attr.id, only_query=True).join(
-            CI, value_table.ci_id == CI.id).filter(CI.type_id == type_id).first()
-
-        cls.trigger_notify(trigger, value, only_test=True)

cmdb-api/api/lib/cmdb/ci_type.py

@@ -17,14 +17,12 @@ from api.lib.cmdb.cache import AttributeCache
 from api.lib.cmdb.cache import CITypeAttributeCache
 from api.lib.cmdb.cache import CITypeAttributesCache
 from api.lib.cmdb.cache import CITypeCache
-from api.lib.cmdb.const import BuiltinModelEnum
 from api.lib.cmdb.const import CITypeOperateType
 from api.lib.cmdb.const import CMDB_QUEUE
 from api.lib.cmdb.const import ConstraintEnum
 from api.lib.cmdb.const import PermEnum
 from api.lib.cmdb.const import ResourceTypeEnum
 from api.lib.cmdb.const import RoleEnum
-from api.lib.cmdb.const import SysComputedAttributes
 from api.lib.cmdb.const import ValueTypeEnum
 from api.lib.cmdb.history import CITypeHistoryManager
 from api.lib.cmdb.perms import CIFilterPermsCRUD
@@ -66,7 +64,6 @@ class CITypeManager(object):
     """
     manage CIType
     """
-
     cls = CIType
 
     def __init__(self):
@@ -189,9 +186,6 @@ class CITypeManager(object):
 
         ci_type = cls.check_is_existed(type_id)
 
-        if ci_type.name in BuiltinModelEnum.all() and kwargs.get('name', ci_type.name) != ci_type.name:
-            return abort(400, ErrFormat.builtin_type_cannot_update_name)
-
         cls._validate_unique(type_id=type_id, name=kwargs.get('name'))
         # cls._validate_unique(type_id=type_id, alias=kwargs.get('alias') or kwargs.get('name'))
 
@@ -421,10 +415,7 @@ class CITypeGroupManager(object):
         group_types = set()
         for group in groups:
             for t in sorted(CITypeGroupItem.get_by(group_id=group['id']), key=lambda x: x['order'] or 0):
-                ci_type = CITypeCache.get(t['type_id'])
-                if ci_type is None:
-                    continue
-                ci_type = ci_type.to_dict()
+                ci_type = CITypeCache.get(t['type_id']).to_dict()
                 if type_ids is not None and ci_type['id'] not in type_ids:
                     continue
                 if resources is None or (ci_type and ci_type['name'] in resources):
@@ -862,15 +853,15 @@ class CITypeRelationManager(object):
 
         graph = nx.DiGraph()
 
-        def get_children(_id, _graph):
+        def get_children(_id):
             children = CITypeRelation.get_by(parent_id=_id, to_dict=False)
 
             for i in children:
                 if i.child_id != _id:
-                    _graph.add_edge(i.parent_id, i.child_id)
-                    get_children(i.child_id, _graph)
+                    graph.add_edge(i.parent_id, i.child_id)
+                    get_children(i.child_id)
 
-        get_children(source_type_id, graph)
+        get_children(source_type_id)
 
         paths = list(nx.all_simple_paths(graph, source_type_id, target_type_ids))
 
@@ -882,8 +873,6 @@ class CITypeRelationManager(object):
     def _wrap_relation_type_dict(type_id, relation_inst):
         ci_type_dict = CITypeCache.get(type_id).to_dict()
         ci_type_dict["ctr_id"] = relation_inst.id
-        show_key = AttributeCache.get(ci_type_dict.get('show_id') or ci_type_dict['unique_id'])
-        ci_type_dict["show_key"] = show_key and show_key.name
         ci_type_dict["attributes"] = CITypeAttributeManager.get_attributes_by_type_id(ci_type_dict["id"])
         attr_filter = CIFilterPermsCRUD.get_attr_filter(type_id)
         if attr_filter:
@@ -1106,7 +1095,6 @@ class CITypeAttributeGroupManager(object):
 
     @staticmethod
     def get_by_type_id(type_id, need_other=False):
-        _type = CITypeCache.get(type_id) or abort(404, ErrFormat.ci_type_not_found)
         parent_ids = CITypeInheritanceManager.base(type_id)
 
         groups = []
@@ -1156,12 +1144,6 @@ class CITypeAttributeGroupManager(object):
                 if i.attr_id in attr2pos:
                     result[attr2pos[i.attr_id][0]]['attributes'].remove(attr2pos[i.attr_id][1])
 
-                if (_type.name in SysComputedAttributes.type2attr and
-                        attr['name'] in SysComputedAttributes.type2attr[_type.name]):
-                    attr['sys_computed'] = True
-                else:
-                    attr['sys_computed'] = False
-
                 attr2pos[i.attr_id] = [group_pos, attr]
 
             group.pop('inherited_from', None)
@@ -1556,10 +1538,7 @@ class CITypeTemplateManager(object):
                 if existed is None:
                     _group['type_id'] = type_id_map.get(_group['type_id'], _group['type_id'])
 
-                    try:
-                        existed = CITypeAttributeGroup.create(flush=True, **_group)
-                    except:
-                        continue
+                    existed = CITypeAttributeGroup.create(flush=True, **_group)
 
                 for order, attr in enumerate(group['attributes'] or []):
                     item_existed = CITypeAttributeGroupItem.get_by(group_id=existed.id,

cmdb-api/api/lib/cmdb/const.py

@@ -1,8 +1,6 @@
 # -*- coding:utf-8 -*- 
 
 
-from flask_babel import lazy_gettext as _l
-
 from api.lib.utils import BaseEnum
 
 
@@ -112,47 +110,17 @@ class ExecuteStatusEnum(BaseEnum):
     FAILED = '1'
     RUNNING = '2'
 
-
 class RelationSourceEnum(BaseEnum):
     ATTRIBUTE_VALUES = "0"
     AUTO_DISCOVERY = "1"
 
 
-class BuiltinModelEnum(BaseEnum):
-    IPAM_SUBNET = "ipam_subnet"
-    IPAM_ADDRESS = "ipam_address"
-    IPAM_SCOPE = "ipam_scope"
-
-    DCIM_REGION = "dcim_region"
-    DCIM_IDC = "dcim_idc"
-    DCIM_SERVER_ROOM = "dcim_server_room"
-    DCIM_RACK = "dcim_rack"
-
-
-BUILTIN_ATTRIBUTES = {
-    "_updated_at": _l("Update Time"),
-    "_updated_by": _l("Updated By"),
-}
-
 CMDB_QUEUE = "one_cmdb_async"
 REDIS_PREFIX_CI = "ONE_CMDB"
 REDIS_PREFIX_CI_RELATION = "CMDB_CI_RELATION"
 REDIS_PREFIX_CI_RELATION2 = "CMDB_CI_RELATION2"
 
-BUILTIN_KEYWORDS = {'id', '_id', 'ci_id', 'type', '_type', 'ci_type', 'ticket_id', *BUILTIN_ATTRIBUTES.keys()}
-
-
-class SysComputedAttributes(object):
-    from api.lib.cmdb.ipam.const import SubnetBuiltinAttributes
-    type2attr = {
-        BuiltinModelEnum.IPAM_SUBNET: {
-            SubnetBuiltinAttributes.HOSTS_COUNT,
-            SubnetBuiltinAttributes.ASSIGN_COUNT,
-            SubnetBuiltinAttributes.USED_COUNT,
-            SubnetBuiltinAttributes.FREE_COUNT
-        }
-    }
-
+BUILTIN_KEYWORDS = {'id', '_id', 'ci_id', 'type', '_type', 'ci_type', 'ticket_id'}
 
 L_TYPE = None
 L_CI = None

cmdb-api/api/lib/cmdb/dcim/__init__.py

@@ -1 +0,0 @@
-# -*- coding:utf-8 -*-

cmdb-api/api/lib/cmdb/dcim/base.py

@@ -1,33 +0,0 @@
-# -*- coding:utf-8 -*-
-
-from api.lib.cmdb.ci import CIManager
-from api.lib.cmdb.ci import CIRelationManager
-from api.lib.cmdb.const import ExistPolicy
-
-
-class DCIMBase(object):
-    def __init__(self):
-        self.type_id = None
-
-    @staticmethod
-    def add_relation(parent_id, child_id):
-        if not parent_id or not child_id:
-            return
-
-        CIRelationManager().add(parent_id, child_id, valid=False, apply_async=False)
-
-    def add(self, parent_id, **kwargs):
-        ci_id = CIManager().add(self.type_id, exist_policy=ExistPolicy.REJECT, **kwargs)
-
-        if parent_id:
-            self.add_relation(parent_id, ci_id)
-
-        return ci_id
-
-    @classmethod
-    def update(cls, _id, **kwargs):
-        CIManager().update(_id, **kwargs)
-
-    @classmethod
-    def delete(cls, _id):
-        CIManager().delete(_id)

cmdb-api/api/lib/cmdb/dcim/const.py

@@ -1,17 +0,0 @@
-# -*- coding:utf-8 -*-
-
-
-from api.lib.utils import BaseEnum
-
-
-class RackBuiltinAttributes(BaseEnum):
-    U_COUNT = 'u_count'
-    U_START = 'u_start'
-    FREE_U_COUNT = 'free_u_count'
-    U_SLOT_ABNORMAL = 'u_slot_abnormal'
-
-
-class OperateTypeEnum(BaseEnum):
-    ADD_DEVICE = "0"
-    REMOVE_DEVICE = "1"
-    MOVE_DEVICE = "2"

cmdb-api/api/lib/cmdb/dcim/history.py

@@ -1,40 +0,0 @@
-from flask_login import current_user
-
-from api.lib.cmdb.cache import AttributeCache
-from api.lib.cmdb.cache import CITypeCache
-from api.lib.cmdb.ci import CIManager
-from api.lib.mixin import DBMixin
-from api.models.cmdb import DCIMOperationHistory
-
-
-class OperateHistoryManager(DBMixin):
-    cls = DCIMOperationHistory
-
-    @classmethod
-    def search(cls, page, page_size, fl=None, only_query=False, reverse=False, count_query=False,
-               last_size=None, **kwargs):
-        numfound, result = super(OperateHistoryManager, cls).search(page, page_size, fl, only_query, reverse,
-                                                                    count_query, last_size, **kwargs)
-
-        ci_ids = [i['ci_id'] for i in result]
-        id2ci = {i['_id']: i for i in (CIManager.get_cis_by_ids(ci_ids) or []) if i}
-        type2show_key = dict()
-        for i in id2ci.values():
-            if i.get('_type') not in type2show_key:
-                ci_type = CITypeCache.get(i.get('_type'))
-                if ci_type:
-                    show_key = AttributeCache.get(ci_type.show_id or ci_type.unique_id)
-                    type2show_key[i['_type']] = show_key and show_key.name
-
-        return numfound, result, id2ci, type2show_key
-
-    def _can_add(self, **kwargs):
-        kwargs['uid'] = current_user.uid
-
-        return kwargs
-
-    def _can_update(self, **kwargs):
-        pass
-
-    def _can_delete(self, **kwargs):
-        pass

cmdb-api/api/lib/cmdb/dcim/idc.py

@@ -1,19 +0,0 @@
-# -*- coding:utf-8 -*-
-
-
-from flask import abort
-
-from api.lib.cmdb.cache import CITypeCache
-from api.lib.cmdb.const import BuiltinModelEnum
-from api.lib.cmdb.dcim.base import DCIMBase
-from api.lib.cmdb.resp_format import ErrFormat
-
-
-class IDCManager(DCIMBase):
-    def __init__(self):
-        super(IDCManager, self).__init__()
-
-        self.ci_type = CITypeCache.get(BuiltinModelEnum.DCIM_IDC) or abort(
-            404, ErrFormat.dcim_builtin_model_not_found.format(BuiltinModelEnum.DCIM_IDC))
-
-        self.type_id = self.ci_type.id

cmdb-api/api/lib/cmdb/dcim/rack.py

@@ -1,182 +0,0 @@
-# -*- coding:utf-8 -*-
-
-import itertools
-import redis_lock
-from flask import abort
-
-from api.extensions import rd
-from api.lib.cmdb.cache import CITypeCache
-from api.lib.cmdb.ci import CIManager
-from api.lib.cmdb.ci import CIRelationManager
-from api.lib.cmdb.const import BuiltinModelEnum
-from api.lib.cmdb.dcim.base import DCIMBase
-from api.lib.cmdb.dcim.const import OperateTypeEnum
-from api.lib.cmdb.dcim.const import RackBuiltinAttributes
-from api.lib.cmdb.dcim.history import OperateHistoryManager
-from api.lib.cmdb.resp_format import ErrFormat
-from api.lib.cmdb.search.ci.db.search import Search as SearchFromDB
-from api.lib.cmdb.search.ci_relation.search import Search as RelationSearch
-
-
-class RackManager(DCIMBase):
-    def __init__(self):
-        super(RackManager, self).__init__()
-
-        self.ci_type = CITypeCache.get(BuiltinModelEnum.DCIM_RACK) or abort(
-            404, ErrFormat.dcim_builtin_model_not_found.format(BuiltinModelEnum.DCIM_RACK))
-
-        self.type_id = self.ci_type.id
-
-    @classmethod
-    def update(cls, _id, **kwargs):
-        if RackBuiltinAttributes.U_COUNT in kwargs:
-            devices, _, _, _, _, _ = RelationSearch(
-                [_id],
-                level=[1],
-                fl=[RackBuiltinAttributes.U_COUNT, RackBuiltinAttributes.U_START],
-                count=1000000).search()
-            for device in devices:
-                u_start = device.get(RackBuiltinAttributes.U_START)
-                u_count = device.get(RackBuiltinAttributes.U_COUNT) or 2
-                if u_start and u_start + u_count - 1 > kwargs[RackBuiltinAttributes.U_COUNT]:
-                    return abort(400, ErrFormat.dcim_rack_u_count_invalid)
-
-        CIManager().update(_id, _sync=True, **kwargs)
-
-        if RackBuiltinAttributes.U_COUNT in kwargs:
-            payload = {RackBuiltinAttributes.FREE_U_COUNT: cls.calc_u_free_count(_id)}
-
-            CIManager().update(_id, _sync=True, **payload)
-
-    def delete(self, _id):
-        super(RackManager, self).delete(_id)
-
-        payload = {RackBuiltinAttributes.U_START: None}
-        _, _, second_cis = CIRelationManager.get_second_cis(_id, per_page='all')
-        for ci in second_cis:
-            CIManager().update(ci['_id'], **payload)
-
-    @staticmethod
-    def calc_u_free_count(rack_id, device_id=None, u_start=None, u_count=None):
-        rack = CIManager.get_ci_by_id(rack_id, need_children=False)
-        if not rack.get(RackBuiltinAttributes.U_COUNT):
-            return 0
-
-        if device_id is not None and u_count is None:
-            ci = CIManager().get_ci_by_id(device_id, need_children=False)
-            u_count = ci.get(RackBuiltinAttributes.U_COUNT) or 2
-
-        if u_start and u_start + u_count - 1 > rack.get(RackBuiltinAttributes.U_COUNT):
-            return abort(400, ErrFormat.dcim_rack_u_slot_invalid)
-
-        devices, _, _, _, _, _ = RelationSearch(
-            [rack_id],
-            level=[1],
-            fl=[RackBuiltinAttributes.U_COUNT, RackBuiltinAttributes.U_START],
-            count=1000000).search()
-
-        u_count_sum = 0
-        for device in devices:
-            u_count_sum += (device.get(RackBuiltinAttributes.U_COUNT) or 2)
-            if device_id is not None:
-                _u_start = device.get(RackBuiltinAttributes.U_START)
-                _u_count = device.get(RackBuiltinAttributes.U_COUNT) or 2
-                if not _u_start:
-                    continue
-
-                if device.get('_id') != device_id and set(range(u_start, u_start + u_count)) & set(
-                        range(_u_start, _u_start + _u_count)):
-                    return abort(400, ErrFormat.dcim_rack_u_slot_invalid)
-
-        return rack[RackBuiltinAttributes.U_COUNT] - u_count_sum
-
-    def check_u_slot(self):
-        racks, _, _, _, _, _ = SearchFromDB(
-            "_type:{}".format(self.type_id),
-            count=10000000,
-            fl=[RackBuiltinAttributes.U_START, RackBuiltinAttributes.U_COUNT, RackBuiltinAttributes.U_SLOT_ABNORMAL],
-            parent_node_perm_passed=True).search()
-
-        for rack in racks:
-            devices, _, _, _, _, _ = RelationSearch(
-                [rack['_id']],
-                level=[1],
-                fl=[RackBuiltinAttributes.U_COUNT, RackBuiltinAttributes.U_START],
-                count=1000000).search()
-
-            u_slot_sets = []
-            for device in devices:
-                u_start = device.get(RackBuiltinAttributes.U_START)
-                u_count = device.get(RackBuiltinAttributes.U_COUNT) or 2
-                if u_start is not None and str(u_start).isdigit():
-                    u_slot_sets.append(set(range(u_start, u_start + u_count)))
-
-            if len(u_slot_sets) > 1:
-                u_slot_abnormal = False
-                for a, b in itertools.combinations(u_slot_sets, 2):
-                    if a.intersection(b):
-                        u_slot_abnormal = True
-                        break
-                if u_slot_abnormal != rack.get(RackBuiltinAttributes.U_SLOT_ABNORMAL):
-                    payload = {RackBuiltinAttributes.U_SLOT_ABNORMAL: u_slot_abnormal}
-                    CIManager().update(rack['_id'], **payload)
-
-    def add_device(self, rack_id, device_id, u_start, u_count=None):
-        with (redis_lock.Lock(rd.r, "DCIM_RACK_OPERATE_{}".format(rack_id), expire=10)):
-            self.calc_u_free_count(rack_id, device_id, u_start, u_count)
-
-            self.add_relation(rack_id, device_id)
-
-            payload = {RackBuiltinAttributes.U_START: u_start}
-            if u_count:
-                payload[RackBuiltinAttributes.U_COUNT] = u_count
-            CIManager().update(device_id, _sync=True, **payload)
-
-            payload = {
-                RackBuiltinAttributes.FREE_U_COUNT: self.calc_u_free_count(rack_id, device_id, u_start, u_count)}
-            CIManager().update(rack_id, _sync=True, **payload)
-
-        OperateHistoryManager().add(operate_type=OperateTypeEnum.ADD_DEVICE, rack_id=rack_id, ci_id=device_id)
-
-    def remove_device(self, rack_id, device_id):
-        with (redis_lock.Lock(rd.r, "DCIM_RACK_OPERATE_{}".format(rack_id), expire=10)):
-            CIRelationManager.delete_3(rack_id, device_id, apply_async=False, valid=False)
-
-            payload = {RackBuiltinAttributes.FREE_U_COUNT: self.calc_u_free_count(rack_id)}
-            CIManager().update(rack_id, _sync=True, **payload)
-
-            payload = {RackBuiltinAttributes.U_START: None}
-            CIManager().update(device_id, _sync=True, **payload)
-
-        OperateHistoryManager().add(operate_type=OperateTypeEnum.REMOVE_DEVICE, rack_id=rack_id, ci_id=device_id)
-
-    def move_device(self, rack_id, device_id, to_u_start):
-        with (redis_lock.Lock(rd.r, "DCIM_RACK_OPERATE_{}".format(rack_id), expire=10)):
-            payload = {RackBuiltinAttributes.FREE_U_COUNT: self.calc_u_free_count(rack_id, device_id, to_u_start)}
-            CIManager().update(rack_id, _sync=True, **payload)
-
-            CIManager().update(device_id, _sync=True, **{RackBuiltinAttributes.U_START: to_u_start})
-
-        OperateHistoryManager().add(operate_type=OperateTypeEnum.MOVE_DEVICE, rack_id=rack_id, ci_id=device_id)
-
-    def migrate_device(self, rack_id, device_id, to_rack_id, to_u_start):
-        with (redis_lock.Lock(rd.r, "DCIM_RACK_OPERATE_{}".format(rack_id), expire=10)):
-            self.calc_u_free_count(to_rack_id, device_id, to_u_start)
-
-            if rack_id != to_rack_id:
-                CIRelationManager.delete_3(rack_id, device_id, apply_async=False, valid=False)
-
-                self.add_relation(to_rack_id, device_id)
-
-                payload = {
-                    RackBuiltinAttributes.FREE_U_COUNT: self.calc_u_free_count(to_rack_id, device_id, to_u_start)}
-                CIManager().update(to_rack_id, _sync=True, **payload)
-
-            CIManager().update(device_id, _sync=True, **{RackBuiltinAttributes.U_START: to_u_start})
-
-            if rack_id != to_rack_id:
-                payload = {RackBuiltinAttributes.FREE_U_COUNT: self.calc_u_free_count(rack_id)}
-                CIManager().update(rack_id, _sync=True, **payload)
-
-        OperateHistoryManager().add(operate_type=OperateTypeEnum.REMOVE_DEVICE, rack_id=rack_id, ci_id=device_id)
-        OperateHistoryManager().add(operate_type=OperateTypeEnum.ADD_DEVICE, rack_id=to_rack_id, ci_id=device_id)

cmdb-api/api/lib/cmdb/dcim/region.py

@@ -1,29 +0,0 @@
-# -*- coding:utf-8 -*-
-
-
-from flask import abort
-
-from api.lib.cmdb.cache import CITypeCache
-from api.lib.cmdb.ci import CIManager
-from api.lib.cmdb.const import BuiltinModelEnum
-from api.lib.cmdb.const import ExistPolicy
-from api.lib.cmdb.resp_format import ErrFormat
-
-
-class RegionManager(object):
-    def __init__(self):
-        self.ci_type = CITypeCache.get(BuiltinModelEnum.DCIM_REGION) or abort(
-            404, ErrFormat.dcim_builtin_model_not_found.format(BuiltinModelEnum.DCIM_REGION))
-
-        self.type_id = self.ci_type.id
-
-    def add(self, **kwargs):
-        return CIManager().add(self.type_id, exist_policy=ExistPolicy.REJECT, **kwargs)
-
-    @classmethod
-    def update(cls, _id, **kwargs):
-        CIManager().update(_id, **kwargs)
-
-    @classmethod
-    def delete(cls, _id):
-        CIManager().delete(_id)

cmdb-api/api/lib/cmdb/dcim/server_room.py

@@ -1,56 +0,0 @@
-# -*- coding:utf-8 -*-
-
-
-from flask import abort
-
-from api.lib.cmdb.cache import CITypeCache
-from api.lib.cmdb.const import BuiltinModelEnum
-from api.lib.cmdb.dcim.base import DCIMBase
-from api.lib.cmdb.dcim.const import RackBuiltinAttributes
-from api.lib.cmdb.resp_format import ErrFormat
-from api.lib.cmdb.search.ci.db.search import Search as SearchFromDB
-from api.models.cmdb import CI
-from api.models.cmdb import CIRelation
-
-
-class ServerRoomManager(DCIMBase):
-    def __init__(self):
-        super(ServerRoomManager, self).__init__()
-
-        self.ci_type = CITypeCache.get(BuiltinModelEnum.DCIM_SERVER_ROOM) or abort(
-            404, ErrFormat.dcim_builtin_model_not_found.format(BuiltinModelEnum.DCIM_SERVER_ROOM))
-        self.type_id = self.ci_type.id
-
-    @staticmethod
-    def get_racks(_id, q=None):
-        rack_type = CITypeCache.get(BuiltinModelEnum.DCIM_RACK) or abort(
-            404, ErrFormat.dcim_builtin_model_not_found.format(BuiltinModelEnum.DCIM_RACK))
-
-        relations = CIRelation.get_by(first_ci_id=_id, only_query=True).join(
-            CI, CI.id == CIRelation.second_ci_id).filter(CI.type_id == rack_type.id)
-        rack_ids = [i.second_ci_id for i in relations]
-
-        q = "_type:{}".format(rack_type.id) if not q else "_type:{},{}".format(rack_type.id, q)
-        if rack_ids:
-            response, _, _, _, numfound, _ = SearchFromDB(
-                q,
-                ci_ids=list(rack_ids),
-                count=1000000,
-                parent_node_perm_passed=True).search()
-        else:
-            response, numfound = [], 0
-
-        counter = dict(rack_count=numfound)
-        u_count = 0
-        free_u_count = 0
-        for i in response:
-            _u_count = i.get(RackBuiltinAttributes.U_COUNT) or 0
-            u_count += _u_count
-            free_u_count += (_u_count if i.get(RackBuiltinAttributes.FREE_U_COUNT) is None else
-                             i.get(RackBuiltinAttributes.FREE_U_COUNT))
-        counter["u_count"] = u_count
-        counter["u_used_count"] = u_count - free_u_count
-        counter["device_count"] = CIRelation.get_by(only_query=True).filter(
-            CIRelation.first_ci_id.in_(rack_ids)).count()
-
-        return counter, response

cmdb-api/api/lib/cmdb/dcim/tree_view.py

@@ -1,85 +0,0 @@
-# -*- coding:utf-8 -*-
-
-from collections import defaultdict
-
-from flask import abort
-
-from api.lib.cmdb.cache import AttributeCache
-from api.lib.cmdb.cache import CITypeCache
-from api.lib.cmdb.const import BuiltinModelEnum
-from api.lib.cmdb.resp_format import ErrFormat
-from api.lib.cmdb.search.ci.db.search import Search as SearchFromDB
-from api.models.cmdb import CI
-from api.models.cmdb import CIRelation
-
-
-class TreeViewManager(object):
-    @classmethod
-    def get(cls):
-        region_type = CITypeCache.get(BuiltinModelEnum.DCIM_REGION) or abort(
-            404, ErrFormat.dcim_builtin_model_not_found.format(BuiltinModelEnum.DCIM_REGION))
-
-        idc_type = CITypeCache.get(BuiltinModelEnum.DCIM_IDC) or abort(
-            404, ErrFormat.dcim_builtin_model_not_found.format(BuiltinModelEnum.DCIM_IDC))
-
-        server_room_type = CITypeCache.get(BuiltinModelEnum.DCIM_SERVER_ROOM) or abort(
-            404, ErrFormat.dcim_builtin_model_not_found.format(BuiltinModelEnum.DCIM_SERVER_ROOM))
-
-        rack_type = CITypeCache.get(BuiltinModelEnum.DCIM_RACK) or abort(
-            404, ErrFormat.dcim_builtin_model_not_found.format(BuiltinModelEnum.DCIM_RACK))
-
-        relations = defaultdict(set)
-        ids = set()
-        has_parent_ids = set()
-
-        for i in CIRelation.get_by(only_query=True).join(CI, CI.id == CIRelation.first_ci_id).filter(
-                CI.type_id.in_([region_type.id, idc_type.id])):
-            relations[i.first_ci_id].add(i.second_ci_id)
-            ids.add(i.first_ci_id)
-            ids.add(i.second_ci_id)
-            has_parent_ids.add(i.second_ci_id)
-
-        for i in CIRelation.get_by(only_query=True).join(
-                CI, CI.id == CIRelation.second_ci_id).filter(CI.type_id.in_([idc_type.id, server_room_type.id])):
-            relations[i.first_ci_id].add(i.second_ci_id)
-            ids.add(i.first_ci_id)
-            ids.add(i.second_ci_id)
-            has_parent_ids.add(i.second_ci_id)
-
-        for i in CI.get_by(only_query=True).filter(CI.type_id.in_([region_type.id, idc_type.id])):
-            ids.add(i.id)
-
-        for _id in ids:
-            if _id not in has_parent_ids:
-                relations[None].add(_id)
-
-        type2name = dict()
-        type2name[region_type.id] = AttributeCache.get(region_type.show_id or region_type.unique_id).name
-        type2name[idc_type.id] = AttributeCache.get(idc_type.show_id or idc_type.unique_id).name
-        type2name[server_room_type.id] = AttributeCache.get(server_room_type.show_id or server_room_type.unique_id).name
-
-        response, _, _, _, _, _ = SearchFromDB(
-            "_type:({})".format(";".join(map(str, [region_type.id, idc_type.id, server_room_type.id]))),
-            ci_ids=list(ids),
-            count=1000000,
-            fl=list(type2name.values()),
-            parent_node_perm_passed=True).search()
-        id2ci = {i['_id']: i for i in response}
-
-        def _build_tree(_tree, parent_id=None):
-            tree = []
-            for child_id in _tree.get(parent_id, []):
-                children = sorted(_build_tree(_tree, child_id), key=lambda x: x['_id'])
-                if not id2ci.get(child_id):
-                    continue
-                ci = id2ci[child_id]
-                if ci['ci_type'] == BuiltinModelEnum.DCIM_SERVER_ROOM:
-                    ci['rack_count'] = CIRelation.get_by(first_ci_id=child_id, only_query=True).join(
-                        CI, CI.id == CIRelation.second_ci_id).filter(CI.type_id == rack_type.id).count()
-
-                tree.append({'children': children, **ci})
-            return tree
-
-        result = sorted(_build_tree(relations), key=lambda x: x['_id'])
-
-        return result, type2name

cmdb-api/api/lib/cmdb/ipam/__init__.py

@@ -1 +0,0 @@
-# -*- coding:utf-8 -*-

cmdb-api/api/lib/cmdb/ipam/address.py

@@ -1,132 +0,0 @@
-# -*- coding:utf-8 -*-
-
-import redis_lock
-from flask import abort
-
-from api.extensions import rd
-from api.lib.cmdb.cache import CITypeCache
-from api.lib.cmdb.ci import CIManager
-from api.lib.cmdb.ci import CIRelationManager
-from api.lib.cmdb.const import BuiltinModelEnum
-from api.lib.cmdb.ipam.const import IPAddressAssignStatus
-from api.lib.cmdb.ipam.const import IPAddressBuiltinAttributes
-from api.lib.cmdb.ipam.const import OperateTypeEnum
-from api.lib.cmdb.ipam.const import SubnetBuiltinAttributes
-from api.lib.cmdb.ipam.history import OperateHistoryManager
-from api.lib.cmdb.resp_format import ErrFormat
-from api.lib.cmdb.search.ci.db.search import Search as SearchFromDB
-from api.lib.cmdb.search.ci_relation.search import Search as RelationSearch
-
-
-class IpAddressManager(object):
-    def __init__(self):
-        self.ci_type = CITypeCache.get(BuiltinModelEnum.IPAM_ADDRESS) or abort(
-            404, ErrFormat.ipam_address_model_not_found.format(BuiltinModelEnum.IPAM_ADDRESS))
-
-        self.type_id = self.ci_type.id
-
-    @staticmethod
-    def list_ip_address(parent_id):
-        numfound, _, result = CIRelationManager.get_second_cis(parent_id, per_page="all")
-
-        return numfound, result
-
-    def _get_cis(self, subnet_id, ips):
-
-        q = "_type:{},{}:({})".format(self.type_id, IPAddressBuiltinAttributes.IP, ";".join(ips or []))
-
-        response, _, _, _, _, _ = RelationSearch([subnet_id], level=[1], query=q, count=1000000).search()
-
-        return response
-
-    @staticmethod
-    def _add_relation(parent_id, child_id):
-        if not parent_id or not child_id:
-            return
-
-        CIRelationManager().add(parent_id, child_id, valid=False, apply_async=False)
-
-    @staticmethod
-    def calc_used_count(subnet_id):
-        q = "{}:(0;2),-{}:true".format(IPAddressBuiltinAttributes.ASSIGN_STATUS, IPAddressBuiltinAttributes.IS_USED)
-
-        return len(set(RelationSearch([subnet_id], level=[1], query=q, count=1000000).search(only_ids=True) or []))
-
-    @staticmethod
-    def _calc_assign_count(subnet_id):
-        q = "{}:(0;2)".format(IPAddressBuiltinAttributes.ASSIGN_STATUS)
-
-        return len(set(RelationSearch([subnet_id], level=[1], query=q, count=1000000).search(only_ids=True) or []))
-
-    def _update_subnet_count(self, subnet_id, assign_count_computed, used_count=None):
-        payload = {}
-
-        cur = CIManager.get_ci_by_id(subnet_id, need_children=False)
-        if assign_count_computed:
-            payload[SubnetBuiltinAttributes.ASSIGN_COUNT] = self._calc_assign_count(subnet_id)
-        if used_count is not None:
-            payload[SubnetBuiltinAttributes.USED_COUNT] = used_count
-
-        payload[SubnetBuiltinAttributes.FREE_COUNT] = (cur[SubnetBuiltinAttributes.HOSTS_COUNT] -
-                                                       self.calc_used_count(subnet_id))
-        CIManager().update(subnet_id, **payload)
-
-    def assign_ips(self, ips, subnet_id, cidr, **kwargs):
-        """
-
-        :param ips: ip list
-        :param subnet_id: subnet id
-        :param cidr: subnet cidr
-        :param kwargs: other attributes for ip address
-        :return:
-        """
-        if subnet_id is not None:
-            subnet = CIManager.get_ci_by_id(subnet_id)
-        else:
-            cis, _, _, _, _, _ = SearchFromDB("_type:{},{}:{}".format(
-                BuiltinModelEnum.IPAM_SUBNET, SubnetBuiltinAttributes.CIDR, cidr),
-                parent_node_perm_passed=True).search()
-            if cis:
-                subnet = cis[0]
-                subnet_id = subnet['_id']
-            else:
-                return abort(400, ErrFormat.ipam_address_model_not_found)
-
-        with (redis_lock.Lock(rd.r, "IPAM_ASSIGN_ADDRESS_{}".format(subnet_id), expire=10)):
-            cis = self._get_cis(subnet_id, ips)
-            ip2ci = {ci[IPAddressBuiltinAttributes.IP]: ci for ci in cis}
-
-            ci_ids = []
-            for ip in ips:
-                kwargs['name'] = ip
-                kwargs[IPAddressBuiltinAttributes.IP] = ip
-                if ip not in ip2ci:
-                    ci_id = CIManager.add(self.type_id, _sync=True, **kwargs)
-                else:
-                    ci_id = ip2ci[ip]['_id']
-                    CIManager().update(ci_id, _sync=True, **kwargs)
-                ci_ids.append(ci_id)
-
-                self._add_relation(subnet_id, ci_id)
-
-            if ips and IPAddressBuiltinAttributes.ASSIGN_STATUS in kwargs:
-                self._update_subnet_count(subnet_id, True)
-
-            if ips and IPAddressBuiltinAttributes.IS_USED in kwargs:
-                q = "{}:true".format(IPAddressBuiltinAttributes.IS_USED)
-                cur_used_ids = RelationSearch([subnet_id], level=[1], query=q).search(only_ids=True)
-                for _id in set(cur_used_ids) - set(ci_ids):
-                    CIManager().update(_id, **{IPAddressBuiltinAttributes.IS_USED: False})
-
-                self._update_subnet_count(subnet_id, False, used_count=len(ips))
-
-        if kwargs.get(IPAddressBuiltinAttributes.ASSIGN_STATUS) in (
-                IPAddressAssignStatus.ASSIGNED, IPAddressAssignStatus.RESERVED):
-            OperateHistoryManager().add(operate_type=OperateTypeEnum.ASSIGN_ADDRESS,
-                                        cidr=subnet.get(SubnetBuiltinAttributes.CIDR),
-                                        description=" | ".join(ips))
-
-        elif kwargs.get(IPAddressBuiltinAttributes.ASSIGN_STATUS) == IPAddressAssignStatus.UNASSIGNED:
-            OperateHistoryManager().add(operate_type=OperateTypeEnum.REVOKE_ADDRESS,
-                                        cidr=subnet.get(SubnetBuiltinAttributes.CIDR),
-                                        description=" | ".join(ips))

cmdb-api/api/lib/cmdb/ipam/const.py

@@ -1,35 +0,0 @@
-# -*- coding:utf-8 -*-
-
-from api.lib.utils import BaseEnum
-
-
-class IPAddressAssignStatus(BaseEnum):
-    ASSIGNED = 0
-    UNASSIGNED = 1
-    RESERVED = 2
-
-
-class OperateTypeEnum(BaseEnum):
-    ADD_SCOPE = "0"
-    UPDATE_SCOPE = "1"
-    DELETE_SCOPE = "2"
-    ADD_SUBNET = "3"
-    UPDATE_SUBNET = "4"
-    DELETE_SUBNET = "5"
-    ASSIGN_ADDRESS = "6"
-    REVOKE_ADDRESS = "7"
-
-
-class SubnetBuiltinAttributes(BaseEnum):
-    NAME = 'name'
-    CIDR = 'cidr'
-    HOSTS_COUNT = 'hosts_count'
-    ASSIGN_COUNT = 'assign_count'
-    USED_COUNT = 'used_count'
-    FREE_COUNT = 'free_count'
-
-
-class IPAddressBuiltinAttributes(BaseEnum):
-    IP = 'ip'
-    ASSIGN_STATUS = 'assign_status'  # enum: 0 - assigned   1 - unassigned   2 - reserved
-    IS_USED = 'is_used'  # bool

cmdb-api/api/lib/cmdb/ipam/history.py

@@ -1,61 +0,0 @@
-# -*- coding:utf-8 -*-
-
-from flask_login import current_user
-
-from api.lib.cmdb.ipam.const import IPAddressBuiltinAttributes
-from api.lib.mixin import DBMixin
-from api.models.cmdb import IPAMOperationHistory
-from api.models.cmdb import IPAMSubnetScan
-from api.models.cmdb import IPAMSubnetScanHistory
-
-
-class OperateHistoryManager(DBMixin):
-    cls = IPAMOperationHistory
-
-    def _can_add(self, **kwargs):
-        kwargs['uid'] = current_user.uid
-
-        return kwargs
-
-    def _can_update(self, **kwargs):
-        pass
-
-    def _can_delete(self, **kwargs):
-        pass
-
-
-class ScanHistoryManager(DBMixin):
-    cls = IPAMSubnetScanHistory
-
-    def _can_add(self, **kwargs):
-        return kwargs
-
-    def add(self, **kwargs):
-        kwargs.pop('_key', None)
-        kwargs.pop('_secret', None)
-        ci_id = kwargs.pop('ci_id', None)
-
-        existed = self.cls.get_by(exec_id=kwargs['exec_id'], first=True, to_dict=False)
-        if existed is None:
-            self.cls.create(**kwargs)
-        else:
-            existed.update(**kwargs)
-
-        if kwargs.get('ips'):
-            from api.lib.cmdb.ipam.address import IpAddressManager
-            IpAddressManager().assign_ips(kwargs['ips'], None, kwargs.get('cidr'),
-                                          **{IPAddressBuiltinAttributes.IS_USED: 1})
-
-            scan_rule = IPAMSubnetScan.get_by(ci_id=ci_id, first=True, to_dict=False)
-            if scan_rule is not None:
-                scan_rule.update(last_scan_time=kwargs.get('start_at'))
-
-        for i in self.cls.get_by(subnet_scan_id=kwargs.get('subnet_scan_id'), only_query=True).order_by(
-                self.cls.id.desc()).offset(100):
-            i.delete()
-
-    def _can_update(self, **kwargs):
-        pass
-
-    def _can_delete(self, **kwargs):
-        pass

cmdb-api/api/lib/cmdb/ipam/stats.py

@@ -1,104 +0,0 @@
-# -*- coding:utf-8 -*-
-
-
-import json
-from flask import abort
-
-from api.extensions import rd
-from api.lib.cmdb.cache import CITypeCache
-from api.lib.cmdb.ci import CIManager
-from api.lib.cmdb.const import BuiltinModelEnum
-from api.lib.cmdb.const import REDIS_PREFIX_CI_RELATION
-from api.lib.cmdb.resp_format import ErrFormat
-from api.lib.cmdb.search.ci.db.search import Search as SearchFromDB
-from api.models.cmdb import CI
-from api.models.cmdb import CIRelation
-from api.models.cmdb import IPAMSubnetScan
-
-
-class Stats(object):
-    def __init__(self):
-        self.address_type = CITypeCache.get(BuiltinModelEnum.IPAM_ADDRESS) or abort(
-            404, ErrFormat.ipam_address_model_not_found.format(BuiltinModelEnum.IPAM_ADDRESS))
-
-        self.address_type_id = self.address_type.id
-
-        self.subnet_type = CITypeCache.get(BuiltinModelEnum.IPAM_SUBNET) or abort(
-            404, ErrFormat.ipam_address_model_not_found.format(BuiltinModelEnum.IPAM_ADDRESS))
-
-        self.subnet_type_id = self.subnet_type.id
-
-    def leaf_nodes(self, parent_id):
-        if str(parent_id) == '0':  # all
-            ci_ids = [i.id for i in CI.get_by(type_id=self.subnet_type_id, to_dict=False)]
-            has_children_ci_ids = [i.first_ci_id for i in CIRelation.get_by(
-                only_query=True).join(CI, CIRelation.second_ci_id == CI.id).filter(
-                CIRelation.first_ci_id.in_(ci_ids)).filter(CI.type_id == self.subnet_type_id)]
-
-            return list(set(ci_ids) - set(has_children_ci_ids))
-
-        else:
-            _type = CIManager().get_by_id(parent_id)
-            if not _type:
-                return abort(404, ErrFormat.ipam_subnet_not_found)
-            key = [(str(parent_id), _type.type_id)]
-            result = []
-            while True:
-                res = [json.loads(x).items() for x in [i or '{}' for i in rd.get(
-                    [i[0] for i in key], REDIS_PREFIX_CI_RELATION) or []]]
-
-                for idx, i in enumerate(res):
-                    if (not i or list(i)[0][1] == self.address_type_id) and key[idx][1] == self.subnet_type_id:
-                        result.append(int(key[idx][0]))
-
-                res = [j for i in res for j in i]  # [(id, type_id)]
-
-                if not res:
-                    return result
-
-                key = res
-
-    def statistic_subnets(self, subnet_ids):
-        if subnet_ids:
-            response, _, _, _, _, _ = SearchFromDB(
-                "_type:{}".format(self.subnet_type_id),
-                ci_ids=subnet_ids,
-                count=1000000,
-                parent_node_perm_passed=True,
-            ).search()
-        else:
-            response = []
-
-        scans = IPAMSubnetScan.get_by(only_query=True).filter(IPAMSubnetScan.ci_id.in_(list(map(int, subnet_ids))))
-        id2scan = {i.ci_id: i for i in scans}
-
-        address_num, address_free_num, address_assign_num, address_used_num = 0, 0, 0, 0
-        for subnet in response:
-            address_num += (subnet.get('hosts_count') or 0)
-            address_free_num += (subnet.get('free_count') or 0)
-            address_assign_num += (subnet.get('assign_count') or 0)
-            address_used_num += (subnet.get('used_count') or 0)
-
-            if id2scan.get(subnet['_id']):
-                subnet['scan_enabled'] = id2scan[subnet['_id']].scan_enabled
-                subnet['last_scan_time'] = id2scan[subnet['_id']].last_scan_time
-            else:
-                subnet['scan_enabled'] = False
-                subnet['last_scan_time'] = None
-
-        return response, address_num, address_free_num, address_assign_num, address_used_num
-
-    def summary(self, parent_id):
-        subnet_ids = self.leaf_nodes(parent_id)
-
-        subnets, address_num, address_free_num, address_assign_num, address_used_num = (
-            self.statistic_subnets(subnet_ids))
-
-        return dict(subnet_num=len(subnets),
-                    address_num=address_num,
-                    address_free_num=address_free_num,
-                    address_assign_num=address_assign_num,
-                    address_unassign_num=address_num - address_assign_num,
-                    address_used_num=address_used_num,
-                    address_used_free_num=address_num - address_used_num,
-                    subnets=subnets)

cmdb-api/api/lib/cmdb/ipam/subnet.py

@@ -1,355 +0,0 @@
-# -*- coding:utf-8 -*-
-
-from collections import defaultdict
-
-import datetime
-import ipaddress
-from flask import abort
-
-from api.lib.cmdb.cache import AttributeCache
-from api.lib.cmdb.cache import CITypeCache
-from api.lib.cmdb.ci import CIManager
-from api.lib.cmdb.ci import CIRelationManager
-from api.lib.cmdb.const import BuiltinModelEnum
-from api.lib.cmdb.ipam.const import OperateTypeEnum
-from api.lib.cmdb.ipam.const import SubnetBuiltinAttributes
-from api.lib.cmdb.ipam.history import OperateHistoryManager
-from api.lib.cmdb.resp_format import ErrFormat
-from api.lib.cmdb.search.ci.db.search import Search as SearchFromDB
-from api.models.cmdb import CI
-from api.models.cmdb import CIRelation
-from api.models.cmdb import IPAMSubnetScan
-
-
-class SubnetManager(object):
-    def __init__(self):
-        self.ci_type = CITypeCache.get(BuiltinModelEnum.IPAM_SUBNET) or abort(
-            404, ErrFormat.ipam_subnet_model_not_found.format(BuiltinModelEnum.IPAM_SUBNET))
-
-        self.type_id = self.ci_type.id
-
-    def scan_rules(self, oneagent_id, last_update_at=None):
-        result = []
-        rules = IPAMSubnetScan.get_by(agent_id=oneagent_id, to_dict=True)
-        ci_ids = [i['ci_id'] for i in rules]
-        if ci_ids:
-            response, _, _, _, _, _ = SearchFromDB("_type:{}".format(self.type_id),
-                                                   ci_ids=list(ci_ids),
-                                                   count=1000000,
-                                                   fl=[SubnetBuiltinAttributes.CIDR],
-                                                   parent_node_perm_passed=True).search()
-            id2ci = {i['_id']: i for i in response}
-
-            for rule in rules:
-                if rule['ci_id'] in id2ci:
-                    rule[SubnetBuiltinAttributes.CIDR] = id2ci[rule['ci_id']][SubnetBuiltinAttributes.CIDR]
-                    result.append(rule)
-
-        new_last_update_at = ""
-        for i in result:
-            __last_update_at = max([i['rule_updated_at'] or "", i['created_at'] or ""])
-            if new_last_update_at < __last_update_at:
-                new_last_update_at = __last_update_at
-
-        if not last_update_at or new_last_update_at > last_update_at:
-            return result, new_last_update_at
-        else:
-            return [], new_last_update_at
-
-    @staticmethod
-    def get_hosts(cidr):
-        try:
-            return list(map(str, ipaddress.ip_network(cidr).hosts()))
-        except ValueError:
-            return []
-
-    def get_by_id(self, subnet_id):
-        response, _, _, _, _, _ = SearchFromDB("_type:{}".format(self.type_id),
-                                               ci_ids=[subnet_id],
-                                               parent_node_perm_passed=True).search()
-        scan_rule = IPAMSubnetScan.get_by(ci_id=subnet_id, first=True, to_dict=True)
-        if scan_rule and response:
-            scan_rule.update(response[0])
-
-        return scan_rule
-
-    def tree_view(self):
-        scope = CITypeCache.get(BuiltinModelEnum.IPAM_SCOPE)
-        ci_types = scope and [scope.id, self.type_id] or [self.type_id]
-
-        relations = defaultdict(set)
-        ids = set()
-        has_parent_ids = set()
-        for i in CIRelation.get_by(only_query=True).join(
-                CI, CI.id == CIRelation.first_ci_id).filter(CI.type_id.in_(ci_types)):
-            relations[i.first_ci_id].add(i.second_ci_id)
-            ids.add(i.first_ci_id)
-            ids.add(i.second_ci_id)
-            has_parent_ids.add(i.second_ci_id)
-        for i in CIRelation.get_by(only_query=True).join(
-                CI, CI.id == CIRelation.second_ci_id).filter(CI.type_id.in_(ci_types)):
-            relations[i.first_ci_id].add(i.second_ci_id)
-            ids.add(i.first_ci_id)
-            ids.add(i.second_ci_id)
-            has_parent_ids.add(i.second_ci_id)
-
-        for i in CI.get_by(only_query=True).filter(CI.type_id.in_(ci_types)):
-            ids.add(i.id)
-
-        for _id in ids:
-            if _id not in has_parent_ids:
-                relations[None].add(_id)
-
-        type2name = dict()
-        type2name[self.type_id] = AttributeCache.get(self.ci_type.show_id or self.ci_type.unique_id).name
-
-        fl = [type2name[self.type_id]]
-        if scope:
-            type2name[scope.id] = AttributeCache.get(scope.show_id or scope.unique_id).name
-            fl.append(type2name[scope.id])
-
-        response, _, _, _, _, _ = SearchFromDB("_type:({})".format(";".join(map(str, ci_types))),
-                                               ci_ids=list(ids),
-                                               count=1000000,
-                                               fl=list(set(fl + [SubnetBuiltinAttributes.CIDR])),
-                                               parent_node_perm_passed=True).search()
-        id2ci = {i['_id']: i for i in response}
-
-        def _build_tree(_tree, parent_id=None):
-            tree = []
-            for child_id in _tree.get(parent_id, []):
-                children = sorted(_build_tree(_tree, child_id), key=lambda x: x['_id'])
-                if not id2ci.get(child_id):
-                    continue
-                tree.append({'children': children, **id2ci[child_id]})
-            return tree
-
-        result = sorted(_build_tree(relations), key=lambda x: x['_id'])
-
-        return result, type2name
-
-    @staticmethod
-    def _is_valid_cidr(cidr):
-        try:
-            cidr = ipaddress.ip_network(cidr)
-            if not (8 <= cidr.prefixlen <= 31):
-                raise ValueError
-
-            return str(cidr)
-        except ValueError:
-            return abort(400, ErrFormat.ipam_cidr_invalid_notation.format(cidr))
-
-    def _check_root_node_is_overlapping(self, cidr, _id=None):
-        none_root_nodes = [i.id for i in CI.get_by(only_query=True).join(
-            CIRelation, CIRelation.second_ci_id == CI.id).filter(CI.type_id == self.type_id)]
-        all_nodes = [i.id for i in CI.get_by(type_id=self.type_id, to_dict=False, fl=['id'])]
-
-        root_nodes = set(all_nodes) - set(none_root_nodes) - set(_id and [_id] or [])
-        response, _, _, _, _, _ = SearchFromDB("_type:{}".format(self.type_id),
-                                               ci_ids=list(root_nodes),
-                                               count=1000000,
-                                               parent_node_perm_passed=True).search()
-
-        cur_subnet = ipaddress.ip_network(cidr)
-        for item in response:
-            if item['_id'] == _id:
-                continue
-
-            if cur_subnet.overlaps(ipaddress.ip_network(item.get(SubnetBuiltinAttributes.CIDR))):
-                return abort(400, ErrFormat.ipam_subnet_overlapped.format(cidr, item.get(SubnetBuiltinAttributes.CIDR)))
-
-        return cidr
-
-    def _check_child_node_is_overlapping(self, parent_id, cidr, _id=None):
-        child_nodes = [i.second_ci_id for i in CIRelation.get_by(
-            first_ci_id=parent_id, to_dict=False, fl=['second_ci_id']) if i.second_ci_id != _id]
-        if not child_nodes:
-            return
-
-        response, _, _, _, _, _ = SearchFromDB("_type:{}".format(self.type_id),
-                                               ci_ids=list(child_nodes),
-                                               count=1000000,
-                                               parent_node_perm_passed=True).search()
-
-        cur_subnet = ipaddress.ip_network(cidr)
-        for item in response:
-            if item['_id'] == _id:
-                continue
-
-            if cur_subnet.overlaps(ipaddress.ip_network(item.get(SubnetBuiltinAttributes.CIDR))):
-                return abort(400, ErrFormat.ipam_subnet_overlapped.format(cidr, item.get(SubnetBuiltinAttributes.CIDR)))
-
-    def validate_cidr(self, parent_id, cidr, _id=None):
-        cidr = self._is_valid_cidr(cidr)
-
-        if not parent_id:
-            return self._check_root_node_is_overlapping(cidr, _id)
-
-        parent_subnet = CIManager().get_ci_by_id(parent_id, need_children=False)
-        if parent_subnet['ci_type'] == BuiltinModelEnum.IPAM_SUBNET:
-            if parent_subnet.get(SubnetBuiltinAttributes.CIDR):
-                prefix = int(cidr.split('/')[1])
-                if int(parent_subnet[SubnetBuiltinAttributes.CIDR].split('/')[1]) >= prefix:
-                    return abort(400, ErrFormat.ipam_subnet_prefix_length_invalid.format(prefix))
-
-                valid_subnets = [str(i) for i in
-                                 ipaddress.ip_network(parent_subnet[SubnetBuiltinAttributes.CIDR]).subnets(
-                                     new_prefix=prefix)]
-                if cidr not in valid_subnets:
-                    return abort(400, ErrFormat.ipam_cidr_invalid_subnet.format(cidr, valid_subnets))
-            else:
-                return abort(400, ErrFormat.ipam_parent_subnet_node_cidr_cannot_empty)
-
-        self._check_child_node_is_overlapping(parent_id, cidr, _id)
-
-        return cidr
-
-    def _add_subnet(self, cidr, **kwargs):
-        kwargs[SubnetBuiltinAttributes.HOSTS_COUNT] = len(list(ipaddress.ip_network(cidr).hosts()))
-        kwargs[SubnetBuiltinAttributes.USED_COUNT] = 0
-        kwargs[SubnetBuiltinAttributes.ASSIGN_COUNT] = 0
-        kwargs[SubnetBuiltinAttributes.FREE_COUNT] = kwargs[SubnetBuiltinAttributes.HOSTS_COUNT]
-
-        return CIManager().add(self.type_id, cidr=cidr, **kwargs)
-
-    @staticmethod
-    def _add_scan_rule(ci_id, agent_id, cron, scan_enabled=True):
-        IPAMSubnetScan.create(ci_id=ci_id, agent_id=agent_id, cron=cron, scan_enabled=scan_enabled)
-
-    @staticmethod
-    def _add_relation(parent_id, child_id):
-        if not parent_id or not child_id:
-            return
-
-        CIRelationManager().add(parent_id, child_id, valid=False)
-
-    def add(self, cidr, parent_id, agent_id, cron, scan_enabled=True, **kwargs):
-        cidr = self.validate_cidr(parent_id, cidr)
-
-        ci_id = self._add_subnet(cidr, **kwargs)
-
-        self._add_scan_rule(ci_id, agent_id, cron, scan_enabled)
-
-        self._add_relation(parent_id, ci_id)
-
-        OperateHistoryManager().add(operate_type=OperateTypeEnum.ADD_SUBNET,
-                                    cidr=cidr,
-                                    description=cidr)
-
-        return ci_id
-
-    @staticmethod
-    def _update_subnet(_id, **kwargs):
-        return CIManager().update(_id, **kwargs)
-
-    @staticmethod
-    def _update_scan_rule(ci_id, agent_id, cron, scan_enabled=True):
-        existed = IPAMSubnetScan.get_by(ci_id=ci_id, first=True, to_dict=False)
-        if existed is not None:
-            existed.update(ci_id=ci_id, agent_id=agent_id, cron=cron, scan_enabled=scan_enabled,
-                           rule_updated_at=datetime.datetime.now())
-        else:
-            IPAMSubnetScan.create(ci_id=ci_id, agent_id=agent_id, cron=cron, scan_enabled=scan_enabled)
-
-    def update(self, _id, **kwargs):
-        kwargs[SubnetBuiltinAttributes.CIDR] = self.validate_cidr(kwargs.pop('parent_id', None),
-                                                                  kwargs.get(SubnetBuiltinAttributes.CIDR), _id)
-
-        agent_id = kwargs.pop('agent_id', None)
-        cron = kwargs.pop('cron', None)
-        scan_enabled = kwargs.pop('scan_enabled', True)
-
-        cur = CIManager.get_ci_by_id(_id, need_children=False)
-
-        self._update_subnet(_id, **kwargs)
-
-        self._update_scan_rule(_id, agent_id, cron, scan_enabled)
-
-        OperateHistoryManager().add(operate_type=OperateTypeEnum.UPDATE_SUBNET,
-                                    cidr=cur.get(SubnetBuiltinAttributes.CIDR),
-                                    description="{} -> {}".format(cur.get(SubnetBuiltinAttributes.CIDR),
-                                                                  kwargs.get(SubnetBuiltinAttributes.CIDR)))
-
-        return _id
-
-    @classmethod
-    def delete(cls, _id):
-        if CIRelation.get_by(only_query=True).filter(CIRelation.first_ci_id == _id).first():
-            return abort(400, ErrFormat.ipam_subnet_cannot_delete)
-
-        existed = IPAMSubnetScan.get_by(ci_id=_id, first=True, to_dict=False)
-        existed and existed.delete()
-
-        delete_ci_ids = []
-        for i in CIRelation.get_by(first_ci_id=_id, to_dict=False):
-            delete_ci_ids.append(i.second_ci_id)
-            i.delete()
-
-        cur = CIManager.get_ci_by_id(_id, need_children=False)
-
-        CIManager().delete(_id)
-
-        OperateHistoryManager().add(operate_type=OperateTypeEnum.DELETE_SUBNET,
-                                    cidr=cur.get(SubnetBuiltinAttributes.CIDR),
-                                    description=cur.get(SubnetBuiltinAttributes.CIDR))
-
-        # batch_delete_ci.apply_async(args=(delete_ci_ids,))
-
-        return _id
-
-
-class SubnetScopeManager(object):
-    def __init__(self):
-        self.ci_type = CITypeCache.get(BuiltinModelEnum.IPAM_SCOPE)
-        not self.ci_type and abort(400, ErrFormat.ipam_subnet_model_not_found.format(
-            BuiltinModelEnum.IPAM_SCOPE))
-
-        self.type_id = self.ci_type.id
-
-    def _add_scope(self, name):
-        return CIManager().add(self.type_id, name=name)
-
-    @staticmethod
-    def _add_relation(parent_id, child_id):
-        if not parent_id or not child_id:
-            return
-
-        CIRelationManager().add(parent_id, child_id, valid=False)
-
-    def add(self, parent_id, name):
-        ci_id = self._add_scope(name)
-
-        self._add_relation(parent_id, ci_id)
-
-        OperateHistoryManager().add(operate_type=OperateTypeEnum.ADD_SCOPE,
-                                    description=name)
-
-        return ci_id
-
-    @staticmethod
-    def _update_scope(_id, name):
-        return CIManager().update(_id, name=name)
-
-    def update(self, _id, name):
-        cur = CIManager.get_ci_by_id(_id, need_children=False)
-
-        res = self._update_scope(_id, name)
-
-        OperateHistoryManager().add(operate_type=OperateTypeEnum.UPDATE_SCOPE,
-                                    description="{} -> {}".format(cur.get('name'), name))
-
-        return res
-
-    @staticmethod
-    def delete(_id):
-        if CIRelation.get_by(first_ci_id=_id, first=True, to_dict=False):
-            return abort(400, ErrFormat.ipam_scope_cannot_delete)
-
-        cur = CIManager.get_ci_by_id(_id, need_children=False)
-
-        CIManager().delete(_id)
-
-        OperateHistoryManager().add(operate_type=OperateTypeEnum.DELETE_SCOPE,
-                                    description=cur.get('name'))
-
-        return _id

cmdb-api/api/lib/cmdb/perms.py

@@ -1,6 +1,7 @@
 # -*- coding:utf-8 -*-
 import copy
 import functools
+
 import redis_lock
 from flask import abort
 from flask import current_app
@@ -9,7 +10,6 @@ from flask_login import current_user
 
 from api.extensions import db
 from api.extensions import rd
-from api.lib.cmdb.const import BUILTIN_ATTRIBUTES
 from api.lib.cmdb.const import ResourceTypeEnum
 from api.lib.cmdb.resp_format import ErrFormat
 from api.lib.mixin import DBMixin
@@ -27,7 +27,7 @@ class CIFilterPermsCRUD(DBMixin):
         result = {}
         for i in res:
             if i['attr_filter']:
-                i['attr_filter'] = i['attr_filter'].split(',') + list(BUILTIN_ATTRIBUTES.keys())
+                i['attr_filter'] = i['attr_filter'].split(',')
 
             if i['rid'] not in result:
                 result[i['rid']] = i
@@ -62,7 +62,7 @@ class CIFilterPermsCRUD(DBMixin):
         result = {}
         for i in res:
             if i['attr_filter']:
-                i['attr_filter'] = i['attr_filter'].split(',') + list(BUILTIN_ATTRIBUTES.keys())
+                i['attr_filter'] = i['attr_filter'].split(',')
 
             if i['type_id'] not in result:
                 result[i['type_id']] = i
@@ -163,7 +163,7 @@ class CIFilterPermsCRUD(DBMixin):
 
     def add(self, **kwargs):
         kwargs = self._can_add(**kwargs) or kwargs
-        with redis_lock.Lock(rd.r, 'CMDB_FILTER_{}_{}'.format(kwargs['type_id'], kwargs['rid']), expire=10):
+        with redis_lock.Lock(rd.r, 'CMDB_FILTER_{}_{}'.format(kwargs['type_id'], kwargs['rid'])):
             request_id_filter = {}
             if kwargs.get('id_filter'):
                 obj = self.cls.get_by(type_id=kwargs.get('type_id'),
@@ -232,7 +232,7 @@ class CIFilterPermsCRUD(DBMixin):
         pass
 
     def delete(self, **kwargs):
-        with redis_lock.Lock(rd.r, 'CMDB_FILTER_{}_{}'.format(kwargs['type_id'], kwargs['rid']), expire=10):
+        with redis_lock.Lock(rd.r, 'CMDB_FILTER_{}_{}'.format(kwargs['type_id'], kwargs['rid'])):
             obj = self.cls.get_by(type_id=kwargs.get('type_id'),
                                   rid=kwargs.get('rid'),
                                   id_filter=None,
@@ -249,7 +249,7 @@ class CIFilterPermsCRUD(DBMixin):
 
     def delete2(self, **kwargs):
 
-        with redis_lock.Lock(rd.r, 'CMDB_FILTER_{}_{}'.format(kwargs['type_id'], kwargs['rid']), expire=10):
+        with redis_lock.Lock(rd.r, 'CMDB_FILTER_{}_{}'.format(kwargs['type_id'], kwargs['rid'])):
             obj = self.cls.get_by(type_id=kwargs.get('type_id'),
                                   rid=kwargs.get('rid'),
                                   ci_filter=None,

cmdb-api/api/lib/cmdb/preference.py

@@ -1,5 +1,6 @@
 # -*- coding:utf-8 -*-
 
+
 from collections import defaultdict
 
 import copy
@@ -16,16 +17,15 @@ from api.lib.cmdb.cache import CITypeAttributesCache
 from api.lib.cmdb.cache import CITypeCache
 from api.lib.cmdb.cache import CMDBCounterCache
 from api.lib.cmdb.ci_type import CITypeAttributeManager
-from api.lib.cmdb.const import BUILTIN_ATTRIBUTES
 from api.lib.cmdb.const import ConstraintEnum
 from api.lib.cmdb.const import PermEnum
 from api.lib.cmdb.const import ResourceTypeEnum
 from api.lib.cmdb.const import RoleEnum
-from api.lib.cmdb.const import SysComputedAttributes
 from api.lib.cmdb.perms import CIFilterPermsCRUD
 from api.lib.cmdb.resp_format import ErrFormat
 from api.lib.exception import AbortException
 from api.lib.perm.acl.acl import ACLManager
+from api.models.cmdb import CITypeAttribute
 from api.models.cmdb import CITypeGroup
 from api.models.cmdb import CITypeGroupItem
 from api.models.cmdb import CITypeRelation
@@ -49,7 +49,7 @@ class PreferenceManager(object):
         type2group = {}
         for i in db.session.query(CITypeGroupItem, CITypeGroup).join(
                 CITypeGroup, CITypeGroup.id == CITypeGroupItem.group_id).filter(
-                CITypeGroup.deleted.is_(False)).filter(CITypeGroupItem.deleted.is_(False)):
+            CITypeGroup.deleted.is_(False)).filter(CITypeGroupItem.deleted.is_(False)):
             type2group[i.CITypeGroupItem.type_id] = i.CITypeGroup.to_dict()
 
         types = db.session.query(PreferenceShowAttributes.type_id).filter(
@@ -133,24 +133,21 @@ class PreferenceManager(object):
 
     @staticmethod
     def get_show_attributes(type_id):
-        _type = CITypeCache.get(type_id) or abort(404, ErrFormat.ci_type_not_found)
-        type_id = _type and _type.id
-
         if not isinstance(type_id, six.integer_types):
             _type = CITypeCache.get(type_id)
             type_id = _type and _type.id
 
-        attrs = PreferenceShowAttributes.get_by(uid=current_user.uid, type_id=type_id, to_dict=False)
+        attrs = db.session.query(PreferenceShowAttributes, CITypeAttribute.order).join(
+            CITypeAttribute, CITypeAttribute.attr_id == PreferenceShowAttributes.attr_id).filter(
+            PreferenceShowAttributes.uid == current_user.uid).filter(
+            PreferenceShowAttributes.type_id == type_id).filter(
+            PreferenceShowAttributes.deleted.is_(False)).filter(CITypeAttribute.deleted.is_(False)).group_by(
+            CITypeAttribute.attr_id).all()
 
         result = []
-        for i in sorted(attrs, key=lambda x: x.order):
-            if i.attr_id:
-                item = i.attr.to_dict()
-            elif i.builtin_attr:
-                item = dict(name=i.builtin_attr, alias=BUILTIN_ATTRIBUTES[i.builtin_attr])
-            else:
-                item = dict(name="", alias="")
-            item.update(dict(is_fixed=i.is_fixed))
+        for i in sorted(attrs, key=lambda x: x.PreferenceShowAttributes.order):
+            item = i.PreferenceShowAttributes.attr.to_dict()
+            item.update(dict(is_fixed=i.PreferenceShowAttributes.is_fixed))
             result.append(item)
 
         is_subscribed = True
@@ -159,23 +156,13 @@ class PreferenceManager(object):
                                                                       choice_web_hook_parse=False,
                                                                       choice_other_parse=False)
             result = [i for i in result if i['default_show']]
-
-            for i in BUILTIN_ATTRIBUTES:
-                result.append(dict(name=i, alias=BUILTIN_ATTRIBUTES[i]))
-
             is_subscribed = False
 
         for i in result:
-            if i.get("is_choice"):
+            if i["is_choice"]:
                 i.update(dict(choice_value=AttributeManager.get_choice_values(
                     i["id"], i["value_type"], i.get("choice_web_hook"), i.get("choice_other"))))
 
-                if (_type.name in SysComputedAttributes.type2attr and
-                        i['name'] in SysComputedAttributes.type2attr[_type.name]):
-                    i['sys_computed'] = True
-                else:
-                    i['sys_computed'] = False
-
         return is_subscribed, result
 
     @classmethod
@@ -186,34 +173,24 @@ class PreferenceManager(object):
                 _attr, is_fixed = x
             else:
                 _attr, is_fixed = x, False
-
-            if _attr in BUILTIN_ATTRIBUTES:
-                attr = None
-                builtin_attr = _attr
-            else:
-                attr = AttributeCache.get(_attr) or abort(
-                    404, ErrFormat.attribute_not_found.format("id={}".format(_attr)))
-                builtin_attr = None
+            attr = AttributeCache.get(_attr) or abort(404, ErrFormat.attribute_not_found.format("id={}".format(_attr)))
             existed = PreferenceShowAttributes.get_by(type_id=type_id,
                                                       uid=current_user.uid,
-                                                      attr_id=attr and attr.id,
-                                                      builtin_attr=builtin_attr,
+                                                      attr_id=attr.id,
                                                       first=True,
                                                       to_dict=False)
             if existed is None:
                 PreferenceShowAttributes.create(type_id=type_id,
                                                 uid=current_user.uid,
-                                                attr_id=attr and attr.id,
-                                                builtin_attr=builtin_attr,
+                                                attr_id=attr.id,
                                                 order=order,
                                                 is_fixed=is_fixed)
             else:
                 existed.update(order=order, is_fixed=is_fixed)
 
-        attr_dict = {(int(i[0]) if i[0].isdigit() else i[0]) if isinstance(i, list) else
-                     (int(i) if i.isdigit() else i): j for i, j in attr_order}
+        attr_dict = {int(i[0]) if isinstance(i, list) else int(i): j for i, j in attr_order}
         for i in existed_all:
-            if (i.attr_id and i.attr_id not in attr_dict) or (i.builtin_attr and i.builtin_attr not in attr_dict):
+            if i.attr_id not in attr_dict:
                 i.soft_delete()
 
         if not existed_all and attr_order:
@@ -407,7 +384,7 @@ class PreferenceManager(object):
     def add_search_option(**kwargs):
         kwargs['uid'] = current_user.uid
 
-        if kwargs['name'] in ('__recent__', '__favor__', '__relation_favor__'):
+        if kwargs['name'] in ('__recent__', '__favor__'):
             if kwargs['name'] == '__recent__':
                 for i in PreferenceSearchOption.get_by(
                         only_query=True, name=kwargs['name'], uid=current_user.uid).order_by(

cmdb-api/api/lib/cmdb/resp_format.py

@@ -16,9 +16,8 @@ class ErrFormat(CommonErrFormat):
     argument_file_not_found = _l("The file doesn't seem to be uploaded")  # 文件似乎并未上传
 
     attribute_not_found = _l("Attribute {} does not exist!")  # 属性 {} 不存在!
-    # 该属性是模型的唯一标识，不能被删除!
     attribute_is_unique_id = _l(
-        "This attribute is the unique identifier of the model and cannot be deleted!")  
+        "This attribute is the unique identifier of the model and cannot be deleted!")  # 该属性是模型的唯一标识，不能被删除!
     attribute_is_ref_by_type = _l(
         "This attribute is referenced by model {} and cannot be deleted!")  # 该属性被模型 {} 引用, 不能删除!
     attribute_value_type_cannot_change = _l(
@@ -130,8 +129,7 @@ class ErrFormat(CommonErrFormat):
     adr_default_ref_once = _l("The default auto-discovery rule is already referenced by model {}!")
     # unique_key方法必须返回非空字符串!
     adr_unique_key_required = _l("The unique_key method must return a non-empty string!")
-    # attributes方法必须返回的是list
-    adr_plugin_attributes_list_required = _l("The attributes method must return a list")  
+    adr_plugin_attributes_list_required = _l("The attributes method must return a list")  # attributes方法必须返回的是list
     # attributes方法返回的list不能为空!
     adr_plugin_attributes_list_no_empty = _l("The list returned by the attributes method cannot be empty!")
     # 只有管理员才可以定义执行机器为: 所有节点!
@@ -157,22 +155,4 @@ class ErrFormat(CommonErrFormat):
     # 因为该分组下定义了拓扑视图，不能删除
     topo_view_exists_cannot_delete_group = _l("The group cannot be deleted because the topology view already exists")
 
-    relation_path_search_src_target_required = _l("Both the source model and the target model must be selected")
-
-    builtin_type_cannot_update_name = _l("The names of built-in models cannot be changed")
-    # # IPAM
-    ipam_subnet_model_not_found = _l("The subnet model {} does not exist")
-    ipam_address_model_not_found = _l("The IP Address model {} does not exist")
-    ipam_cidr_invalid_notation = _l("CIDR {} is an invalid notation")
-    ipam_cidr_invalid_subnet = _l("Invalid CIDR: {}, available subnets: {}")
-    ipam_subnet_prefix_length_invalid = _l("Invalid subnet prefix length: {}")
-    ipam_parent_subnet_node_cidr_cannot_empty = _l("parent node cidr must be required")
-    ipam_subnet_overlapped = _l("{} and {} overlap")
-    ipam_subnet_cannot_delete = _l("Cannot delete because child nodes exist")
-    ipam_subnet_not_found = _l("Subnet is not found")
-    ipam_scope_cannot_delete = _l("Cannot delete because child nodes exist")
-
-    # # DCIM
-    dcim_builtin_model_not_found = _l("The dcim model {} does not exist")
-    dcim_rack_u_slot_invalid = _l("Irregularities in Rack Units")
-    dcim_rack_u_count_invalid = _l("The device's position is greater than the rack unit height")
+    relation_path_search_src_target_required = _l("Both the source model and the target model must be selected")

cmdb-api/api/lib/cmdb/search/ci/db/search.py

@@ -15,7 +15,6 @@ from api.extensions import db
 from api.lib.cmdb.cache import AttributeCache
 from api.lib.cmdb.cache import CITypeCache
 from api.lib.cmdb.ci import CIManager
-from api.lib.cmdb.const import BUILTIN_ATTRIBUTES
 from api.lib.cmdb.const import PermEnum
 from api.lib.cmdb.const import ResourceTypeEnum
 from api.lib.cmdb.const import RetKey
@@ -305,21 +304,14 @@ class Search(object):
                     (self.page - 1) * self.count, sort_type, self.count))
 
     def __sort_by_field(self, field, sort_type, query_sql):
-        if field not in BUILTIN_ATTRIBUTES:
+        attr = AttributeCache.get(field)
+        attr_id = attr.id
 
-            attr = AttributeCache.get(field)
-            attr_id = attr.id
-
-            table_name = TableMap(attr=attr).table_name
-            _v_query_sql = """SELECT ALIAS.ci_id, {0}.value
-                              FROM ({1}) AS ALIAS INNER JOIN {0} ON {0}.ci_id = ALIAS.ci_id
-                              WHERE {0}.attr_id = {2}""".format(table_name, query_sql, attr_id)
-            new_table = _v_query_sql
-        else:
-            _v_query_sql = """SELECT c_cis.id AS ci_id, c_cis.{0} AS value
-                                          FROM c_cis  INNER JOIN ({1}) AS ALIAS ON ALIAS.ci_id = c_cis.id""".format(
-                field[1:], query_sql)
-            new_table = _v_query_sql
+        table_name = TableMap(attr=attr).table_name
+        _v_query_sql = """SELECT {0}.ci_id, {1}.value
+                          FROM ({2}) AS {0} INNER JOIN {1} ON {1}.ci_id = {0}.ci_id
+                          WHERE {1}.attr_id = {3}""".format("ALIAS", table_name, query_sql, attr_id)
+        new_table = _v_query_sql
 
         if self.only_type_query or not self.type_id_list or self.multi_type_has_ci_filter:
             return ("SELECT SQL_CALC_FOUND_ROWS DISTINCT C.ci_id FROM ({0}) AS C ORDER BY C.value {2} "

cmdb-api/api/lib/cmdb/search/ci_relation/search.py

@@ -64,7 +64,7 @@ class Search(object):
 
         self.ancestor_ids = ancestor_ids
         self.descendant_ids = descendant_ids
-        self.root_parent_path = root_parent_path or []
+        self.root_parent_path = root_parent_path
         self.has_m2m = has_m2m or False
         if not self.has_m2m:
             if self.ancestor_ids:
@@ -391,10 +391,9 @@ class Search(object):
             id2children[str(i)] = item['children']
 
         for lv in range(1, self.level):
-            type_id = type_ids[lv]
 
-            if len(type_ids or []) >= lv and type2filter_perms.get(type_id):
-                id_filter_limit, _ = self._get_ci_filter(type2filter_perms[type_id])
+            if len(type_ids or []) >= lv and type2filter_perms.get(type_ids[lv]):
+                id_filter_limit, _ = self._get_ci_filter(type2filter_perms[type_ids[lv]])
             else:
                 id_filter_limit = {}
 
@@ -402,12 +401,12 @@ class Search(object):
                 key, prefix = [i for i in level_ids], REDIS_PREFIX_CI_RELATION2
             else:
                 key, prefix = [i.split(',')[-1] for i in level_ids], REDIS_PREFIX_CI_RELATION
-            
             res = [json.loads(x).items() for x in [i or '{}' for i in rd.get(key, prefix) or []]]
-            res = [[i for i in x if i[1] == type_id and (not id_filter_limit or (key[idx] not in id_filter_limit or
+            res = [[i for i in x if (not id_filter_limit or (key[idx] not in id_filter_limit or
                                                              int(i[0]) in id_filter_limit[key[idx]]) or
                                      int(i[0]) in id_filter_limit)] for idx, x in enumerate(res)]
             _level_ids = []
+            type_id = type_ids[lv]
             id2name = _get_id2name(type_id)
             for idx, node_path in enumerate(level_ids):
                 for child_id, _ in (res[idx] or []):

cmdb-api/api/lib/cmdb/utils.py

@@ -55,6 +55,7 @@ def str2datetime(x):
     return datetime.datetime.strptime(x, "%Y-%m-%d %H:%M")
 
 
+
 class ValueTypeMap(object):
     deserialize = {
         ValueTypeEnum.INT: string2int,

cmdb-api/api/lib/common_setting/decorator.py

@@ -1,6 +1,6 @@
 import functools
 
-from flask import abort, session, current_app
+from flask import abort, session
 from api.lib.common_setting.acl import ACLManager
 from api.lib.common_setting.resp_format import ErrFormat
 from api.lib.perm.acl.acl import is_app_admin
@@ -15,7 +15,6 @@ def perms_role_required(app_name, resource_type_name, resource_name, perm, role_
             try:
                 has_perms = acl.role_has_perms(session["acl"]['rid'], resource_name, resource_type_name, perm)
             except Exception as e:
-                current_app.logger.error(f"acl role_has_perms err: {e}")
                 # resource_type not exist, continue check role
                 if role_name:
                     if role_name not in session.get("acl", {}).get("parentRoles", []) and not is_app_admin(app_name):

cmdb-api/api/lib/common_setting/department.py

@@ -476,7 +476,7 @@ class EditDepartmentInACL(object):
         for employee in e_list:
             employee_acl_rid = employee.get('e_acl_rid')
             if employee_acl_rid == 0:
-                result.append("employee_acl_rid == 0")
+                result.append(f"employee_acl_rid == 0")
                 continue
             cls.remove_single_employee_from_old_department(acl, employee, result)
 
@@ -501,8 +501,8 @@ class EditDepartmentInACL(object):
             acl.remove_user_from_role(employee.get('e_acl_rid'), payload)
             current_app.logger.info(f"remove {employee.get('e_acl_rid')} from {d_acl_rid}")
         except Exception as e:
-            err = f"remove_user_from_role e_acl_rid: {employee.get('e_acl_rid')}, parent_id: {d_acl_rid}, err: {e}"
-            result.append(err)
+            result.append(
+                f"remove_user_from_role employee_acl_rid: {employee.get('e_acl_rid')}, parent_id: {d_acl_rid}, err: {e}")
 
         return True
 
@@ -548,7 +548,7 @@ class EditDepartmentInACL(object):
         for employee in e_list:
             employee_acl_rid = employee.get('e_acl_rid')
             if employee_acl_rid == 0:
-                result.append("employee_acl_rid == 0")
+                result.append(f"employee_acl_rid == 0")
                 continue
 
             cls.remove_single_employee_from_old_department(acl, employee, result)

cmdb-api/api/lib/common_setting/employee.py

@@ -4,7 +4,7 @@ import traceback
 from datetime import datetime
 
 import requests
-from flask import abort, current_app
+from flask import abort
 from flask_login import current_user
 from sqlalchemy import or_, literal_column, func, not_, and_
 from werkzeug.datastructures import MultiDict
@@ -478,7 +478,7 @@ class EmployeeCRUD(object):
             Employee.deleted == 0,
             Employee.block == block,
         ]
-        if isinstance(department_id, list):
+        if type(department_id) == list:
             if len(department_id) == 0:
                 return []
             else:
@@ -702,7 +702,6 @@ class EmployeeCRUD(object):
             try:
                 last_login = datetime.strptime(last_login, '%Y-%m-%d %H:%M:%S')
             except Exception as e:
-                current_app.logger.error(f"strptime {last_login} err: {e}")
                 last_login = datetime.now()
         else:
             last_login = datetime.now()
@@ -713,7 +712,6 @@ class EmployeeCRUD(object):
             )
             return last_login
         except Exception as e:
-            current_app.logger.error(f"update last_login err: {e}")
             return
 
 

cmdb-api/api/lib/common_setting/notice_config.py

@@ -2,7 +2,7 @@ import requests
 
 from api.lib.common_setting.const import BotNameMap
 from api.lib.common_setting.resp_format import ErrFormat
-from api.models.common_setting import NoticeConfig
+from api.models.common_setting import CompanyInfo, NoticeConfig
 from wtforms import Form
 from wtforms import StringField
 from wtforms import validators

cmdb-api/api/lib/common_setting/role_perm_base.py

@@ -48,15 +48,11 @@ class CMDBApp(BaseApp):
         {"page": "Model_Relationships", "page_cn": "模型关系", "perms": ["read"]},
         {"page": "Operation_Audit", "page_cn": "操作审计", "perms": ["read"]},
         {"page": "Relationship_Types", "page_cn": "关系类型", "perms": ["read"]},
-        {"page": "Auto_Discovery", "page_cn": "自动发现",
-         "perms": ["read", "create_plugin", "update_plugin", "delete_plugin"]
-        },
+        {"page": "Auto_Discovery", "page_cn": "自动发现", "perms": ["read", "create_plugin", "update_plugin", "delete_plugin"]},
         {"page": "TopologyView", "page_cn": "拓扑视图",
          "perms": ["read", "create_topology_group", "update_topology_group", "delete_topology_group",
                    "create_topology_view"],
          },
-        {"page": "IPAM", "page_cn": "IPAM", "perms": ["read"]},
-        {"page": "DCIM", "page_cn": "数据中心", "perms": ["read"]},
     ]
 
     def __init__(self):

cmdb-api/api/lib/mixin.py

@@ -1,7 +1,6 @@
 # -*- coding:utf-8 -*-
 
 
-from flask import current_app
 from sqlalchemy import func
 
 from api.extensions import db
@@ -33,21 +32,11 @@ class DBMixin(object):
 
         for k in kwargs:
             if hasattr(cls.cls, k):
-                if isinstance(kwargs[k], list):
-                    query = query.filter(getattr(cls.cls, k).in_(kwargs[k]))
-                    if count_query:
-                        _query = _query.filter(getattr(cls.cls, k).in_(kwargs[k]))
-                else:
-                    if "*" in str(kwargs[k]):
-                        query = query.filter(getattr(cls.cls, k).ilike(kwargs[k].replace('*', '%')))
-                        if count_query:
-                            _query = _query.filter(getattr(cls.cls, k).ilike(kwargs[k].replace('*', '%')))
-                    else:
-                        query = query.filter(getattr(cls.cls, k) == kwargs[k])
-                        if count_query:
-                            _query = _query.filter(getattr(cls.cls, k) == kwargs[k])
+                query = query.filter(getattr(cls.cls, k) == kwargs[k])
+                if count_query:
+                    _query = _query.filter(getattr(cls.cls, k) == kwargs[k])
 
-        if reverse in current_app.config.get('BOOL_TRUE'):
+        if reverse:
             query = query.order_by(cls.cls.id.desc())
 
         if only_query and not count_query:

cmdb-api/api/lib/perm/acl/__init__.py

@@ -6,7 +6,7 @@ from functools import wraps
 from flask import abort
 from flask import request
 
-from api.lib.perm.acl.cache import AppCache
+from api.lib.perm.acl.cache import AppCache, AppAccessTokenCache
 from api.lib.perm.acl.resp_format import ErrFormat
 
 

cmdb-api/api/lib/perm/acl/cache.py

@@ -138,14 +138,14 @@ class HasResourceRoleCache(object):
 
     @classmethod
     def add(cls, rid, app_id):
-        with redis_lock.Lock(rd.r, 'HasResourceRoleCache', expire=10):
+        with redis_lock.Lock(rd.r, 'HasResourceRoleCache'):
             c = cls.get(app_id)
             c[rid] = 1
             cache.set(cls.PREFIX_KEY.format(app_id), c, timeout=0)
 
     @classmethod
     def remove(cls, rid, app_id):
-        with redis_lock.Lock(rd.r, 'HasResourceRoleCache', expire=10):
+        with redis_lock.Lock(rd.r, 'HasResourceRoleCache'):
             c = cls.get(app_id)
             c.pop(rid, None)
             cache.set(cls.PREFIX_KEY.format(app_id), c, timeout=0)

cmdb-api/api/lib/perm/acl/permission.py

@@ -71,7 +71,7 @@ class PermissionCRUD(object):
 
     @classmethod
     def get_all2(cls, resource_name, resource_type_name, app_id):
-        rt = ResourceType.get_by(name=resource_type_name, app_id=app_id, first=True, to_dict=False)
+        rt = ResourceType.get_by(name=resource_type_name, first=True, to_dict=False)
         rt or abort(404, ErrFormat.resource_type_not_found.format(resource_type_name))
 
         r = Resource.get_by(name=resource_name, resource_type_id=rt.id, app_id=app_id, first=True, to_dict=False)

cmdb-api/api/lib/perm/acl/role.py

@@ -1,5 +1,8 @@
 # -*- coding:utf-8 -*-
 
+
+import time
+
 import redis_lock
 import six
 from flask import abort
@@ -142,7 +145,7 @@ class RoleRelationCRUD(object):
 
     @classmethod
     def add(cls, role, parent_id, child_ids, app_id):
-        with redis_lock.Lock(rd.r, "ROLE_RELATION_ADD", expire=10):
+        with redis_lock.Lock(rd.r, "ROLE_RELATION_ADD"):
             db.session.commit()
 
             result = []

cmdb-api/api/lib/utils.py

@@ -1,6 +1,7 @@
 # -*- coding:utf-8 -*- 
 
 import base64
+from typing import Set
 
 import elasticsearch
 import redis

cmdb-api/api/models/acl.py

@@ -105,8 +105,8 @@ class User(CRUDModel, SoftDeleteMixin):
     _password = db.Column("password", db.String(80))
     key = db.Column(db.String(32), nullable=False)
     secret = db.Column(db.String(32), nullable=False)
-    date_joined = db.Column(db.DateTime, default=datetime.now)
-    last_login = db.Column(db.DateTime, default=datetime.now)
+    date_joined = db.Column(db.DateTime, default=datetime.utcnow)
+    last_login = db.Column(db.DateTime, default=datetime.utcnow)
     block = db.Column(db.Boolean, default=False)
     has_logined = db.Column(db.Boolean, default=False)
     wx_id = db.Column(db.String(32))

cmdb-api/api/models/cmdb.py

@@ -253,7 +253,6 @@ class CI(Model):
     status = db.Column(db.Enum(*CIStatusEnum.all(), name="status"))
     heartbeat = db.Column(db.DateTime, default=lambda: datetime.datetime.now())
     is_auto_discovery = db.Column('a', db.Boolean, default=False)
-    updated_by = db.Column(db.String(64))
 
     ci_type = db.relationship("CIType", backref="c_cis.type_id")
 
@@ -476,7 +475,6 @@ class PreferenceShowAttributes(Model):
     uid = db.Column(db.Integer, index=True, nullable=False)
     type_id = db.Column(db.Integer, db.ForeignKey("c_ci_types.id"), nullable=False)
     attr_id = db.Column(db.Integer, db.ForeignKey("c_attributes.id"))
-    builtin_attr = db.Column(db.String(256), nullable=True)
     order = db.Column(db.SmallInteger, default=0)
     is_fixed = db.Column(db.Boolean, default=False)
 
@@ -536,7 +534,6 @@ class CustomDashboard(Model):
 
     type_id = db.Column(db.Integer, db.ForeignKey('c_ci_types.id'))
     attr_id = db.Column(db.Integer, db.ForeignKey('c_attributes.id'))
-    builtin_attr = db.Column(db.String(256), nullable=True)
     level = db.Column(db.Integer)
 
     options = db.Column(db.JSON)
@@ -669,52 +666,3 @@ class InnerKV(Model):
 
     key = db.Column(db.String(128), index=True)
     value = db.Column(db.Text)
-
-
-class IPAMSubnetScan(Model):
-    __tablename__ = "c_ipam_subnet_scans"
-
-    ci_id = db.Column(db.Integer, index=True, nullable=False)
-    scan_enabled = db.Column(db.Boolean, default=True)
-    rule_updated_at = db.Column(db.DateTime)
-    last_scan_time = db.Column(db.DateTime)
-
-    # scan rules
-    agent_id = db.Column(db.String(8), index=True)
-    cron = db.Column(db.String(128))
-
-
-class IPAMSubnetScanHistory(Model2):
-    __tablename__ = "c_ipam_subnet_scan_histories"
-
-    subnet_scan_id = db.Column(db.Integer, index=True)
-    exec_id = db.Column(db.String(64), index=True)
-    cidr = db.Column(db.String(18), index=True)
-    start_at = db.Column(db.DateTime)
-    end_at = db.Column(db.DateTime)
-    status = db.Column(db.Integer, default=0)  # 0 is ok
-    stdout = db.Column(db.Text)
-    ip_num = db.Column(db.Integer)
-    ips = db.Column(db.JSON)  # keep only the last 10 records
-
-
-class IPAMOperationHistory(Model2):
-    __tablename__ = "c_ipam_operation_histories"
-
-    from api.lib.cmdb.ipam.const import OperateTypeEnum
-
-    uid = db.Column(db.Integer, index=True)
-    cidr = db.Column(db.String(18), index=True)
-    operate_type = db.Column(db.Enum(*OperateTypeEnum.all()))
-    description = db.Column(db.Text)
-
-
-class DCIMOperationHistory(Model2):
-    __tablename__ = "c_dcim_operation_histories"
-
-    from api.lib.cmdb.dcim.const import OperateTypeEnum
-
-    uid = db.Column(db.Integer, index=True)
-    rack_id = db.Column(db.Integer, index=True)
-    ci_id = db.Column(db.Integer, index=True)
-    operate_type = db.Column(db.Enum(*OperateTypeEnum.all()))

cmdb-api/api/tasks/acl.py

@@ -32,7 +32,7 @@ from api.models.acl import Trigger
 def role_rebuild(rids, app_id):
     rids = rids if isinstance(rids, list) else [rids]
     for rid in rids:
-        with redis_lock.Lock(rd.r, "ROLE_REBUILD_{}_{}".format(rid, app_id), expire=10):
+        with redis_lock.Lock(rd.r, "ROLE_REBUILD_{}_{}".format(rid, app_id)):
             RoleRelationCache.rebuild(rid, app_id)
 
     current_app.logger.info("Role {0} App {1} rebuild..........".format(rids, app_id))

cmdb-api/api/tasks/cmdb.py

@@ -1,11 +1,10 @@
-# -*- coding:utf-8 -*-
+# -*- coding:utf-8 -*- 
 
 
 import datetime
 import json
 import redis_lock
 from flask import current_app
-from flask import has_request_context
 from flask_login import login_user
 
 import api.lib.cmdb.ci
@@ -54,9 +53,8 @@ def ci_cache(ci_id, operate_type, record_id):
     current_app.logger.info("{0} flush..........".format(ci_id))
 
     if operate_type:
-        if not has_request_context():
-            current_app.test_request_context().push()
-            login_user(UserCache.get('worker'))
+        current_app.test_request_context().push()
+        login_user(UserCache.get('worker'))
 
         _, enum_map = CITypeAttributeManager.get_attr_names_label_enum(ci_dict.get('_type'))
         payload = dict()
@@ -145,7 +143,7 @@ def ci_delete_trigger(trigger, operate_type, ci_dict):
 @flush_db
 @reconnect_db
 def ci_relation_cache(parent_id, child_id, ancestor_ids):
-    with redis_lock.Lock(rd.r, "CIRelation_{}".format(parent_id), expire=10):
+    with redis_lock.Lock(rd.r, "CIRelation_{}".format(parent_id)):
         children = rd.get([parent_id], REDIS_PREFIX_CI_RELATION)[0]
         children = json.loads(children) if children is not None else {}
 
@@ -186,9 +184,8 @@ def ci_relation_add(parent_dict, child_id, uid):
     from api.lib.cmdb.search import SearchError
     from api.lib.cmdb.search.ci import search
 
-    if not has_request_context():
-        current_app.test_request_context().push()
-        login_user(UserCache.get(uid))
+    current_app.test_request_context().push()
+    login_user(UserCache.get(uid))
 
     for parent in parent_dict:
         parent_ci_type_name, _attr_name = parent.strip()[1:].split('.', 1)
@@ -223,7 +220,7 @@ def ci_relation_add(parent_dict, child_id, uid):
 @celery.task(name="cmdb.ci_relation_delete", queue=CMDB_QUEUE)
 @reconnect_db
 def ci_relation_delete(parent_id, child_id, ancestor_ids):
-    with redis_lock.Lock(rd.r, "CIRelation_{}".format(parent_id), expire=10):
+    with redis_lock.Lock(rd.r, "CIRelation_{}".format(parent_id)):
         children = rd.get([parent_id], REDIS_PREFIX_CI_RELATION)[0]
         children = json.loads(children) if children is not None else {}
 
@@ -275,9 +272,8 @@ def ci_type_attribute_order_rebuild(type_id, uid):
 def calc_computed_attribute(attr_id, uid):
     from api.lib.cmdb.ci import CIManager
 
-    if not has_request_context():
-        current_app.test_request_context().push()
-        login_user(UserCache.get(uid))
+    current_app.test_request_context().push()
+    login_user(UserCache.get(uid))
 
     cim = CIManager()
     for i in CITypeAttribute.get_by(attr_id=attr_id, to_dict=False):
@@ -374,25 +370,3 @@ def build_relations_for_ad_accept(adc, ci_id, ad_key2attr):
                                               source=RelationSourceEnum.AUTO_DISCOVERY)
                     except:
                         pass
-
-
-@celery.task(name="cmdb.dcim_calc_u_free_count", queue=CMDB_QUEUE)
-@reconnect_db
-def dcim_calc_u_free_count():
-    from api.lib.cmdb.ci import CIManager
-    from api.lib.cmdb.dcim.rack import RackManager
-    from api.lib.cmdb.dcim.const import RackBuiltinAttributes
-
-    if not has_request_context():
-        current_app.test_request_context().push()
-        login_user(UserCache.get('worker'))
-
-    try:
-        rack_m = RackManager()
-    except Exception:
-        return
-
-    racks = CI.get_by(type_id=rack_m.type_id, to_dict=False)
-    for rack in racks:
-        payload = {RackBuiltinAttributes.FREE_U_COUNT: rack_m.calc_u_free_count(rack.id)}
-        CIManager().update(rack.id, **payload)

cmdb-api/api/translations/zh/LC_MESSAGES/messages.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-11-26 18:54+0800\n"
+"POT-Creation-Date: 2024-09-26 17:57+0800\n"
 "PO-Revision-Date: 2023-12-25 20:21+0800\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: zh\n"
@@ -92,14 +92,6 @@ msgstr "您没有操作权限!"
 msgid "Only the creator or administrator has permission!"
 msgstr "只有创建人或者管理员才有权限!"
 
-#: api/lib/cmdb/const.py:133
-msgid "Update Time"
-msgstr "更新时间"
-
-#: api/lib/cmdb/const.py:134
-msgid "Updated By"
-msgstr "更新人"
-
 #: api/lib/cmdb/resp_format.py:9
 msgid "CI Model"
 msgstr "模型配置"
@@ -482,11 +474,11 @@ msgstr "{}格式错误，应该为：%Y-%m-%d %H:%M:%S"
 
 #: api/lib/cmdb/resp_format.py:150
 msgid "CMDB data reconciliation results"
-msgstr "CMDB数据合规检查结果"
+msgstr ""
 
 #: api/lib/cmdb/resp_format.py:151
 msgid "Number of {} illegal: {}"
-msgstr "{} 不合规数: {}"
+msgstr ""
 
 #: api/lib/cmdb/resp_format.py:153
 msgid "Topology view {} already exists"
@@ -504,58 +496,6 @@ msgstr "因为该分组下定义了拓扑视图，不能删除"
 msgid "Both the source model and the target model must be selected"
 msgstr "源模型和目标模型不能为空!"
 
-#: api/lib/cmdb/resp_format.py:160
-msgid "The names of built-in models cannot be changed"
-msgstr "内置模型的名字不能修改"
-
-#: api/lib/cmdb/resp_format.py:162
-msgid "The subnet model {} does not exist"
-msgstr "子网模型 {} 不存在!"
-
-#: api/lib/cmdb/resp_format.py:163
-msgid "The IP Address model {} does not exist"
-msgstr "IP地址模型 {} 不存在!"
-
-#: api/lib/cmdb/resp_format.py:164
-msgid "CIDR {} is an invalid notation"
-msgstr "CIDR {} 写法不正确!"
-
-#: api/lib/cmdb/resp_format.py:165
-msgid "Invalid CIDR: {}, available subnets: {}"
-msgstr "无效的CIDR: {}, 可用的子网: {}"
-
-#: api/lib/cmdb/resp_format.py:166
-msgid "Invalid subnet prefix length: {}"
-msgstr "无效的子网前缀长度: {}"
-
-#: api/lib/cmdb/resp_format.py:167
-msgid "parent node cidr must be required"
-msgstr "必须要有父节点"
-
-#: api/lib/cmdb/resp_format.py:168
-msgid "{} and {} overlap"
-msgstr "{} 和 {} 有重叠"
-
-#: api/lib/cmdb/resp_format.py:169 api/lib/cmdb/resp_format.py:171
-msgid "Cannot delete because child nodes exist"
-msgstr "因为子节点已经存在，不能删除"
-
-#: api/lib/cmdb/resp_format.py:170
-msgid "Subnet is not found"
-msgstr "子网不存在"
-
-#: api/lib/cmdb/resp_format.py:174
-msgid "The dcim model {} does not exist"
-msgstr "DCIM模型 {} 不存在!"
-
-#: api/lib/cmdb/resp_format.py:175
-msgid "Irregularities in Rack Units"
-msgstr "机架U位异常!"
-
-#: api/lib/cmdb/resp_format.py:176
-msgid "The device's position is greater than the rack unit height"
-msgstr "有设备的位置大于机柜的U数!"
-
 #: api/lib/common_setting/resp_format.py:8
 msgid "Company info already existed"
 msgstr "公司信息已存在,无法创建!"

cmdb-api/api/views/cmdb/auto_discovery.py

@@ -24,7 +24,6 @@ from api.lib.cmdb.auto_discovery.const import PRIVILEGED_USERS
 from api.lib.cmdb.cache import AttributeCache
 from api.lib.cmdb.const import PermEnum
 from api.lib.cmdb.const import ResourceTypeEnum
-from api.lib.cmdb.ipam.subnet import SubnetManager
 from api.lib.cmdb.resp_format import ErrFormat
 from api.lib.cmdb.search import SearchError
 from api.lib.cmdb.search.ci import search as ci_search
@@ -294,13 +293,9 @@ class AutoDiscoveryRuleSyncView(APIView):
 
                 return self.jsonify(rules=rules, last_update_at=last_update_at)
 
-        rules, last_update_at1 = AutoDiscoveryCITypeCRUD.get(None, oneagent_id, oneagent_name, last_update_at)
+        rules, last_update_at = AutoDiscoveryCITypeCRUD.get(None, oneagent_id, oneagent_name, last_update_at)
 
-        subnet_scan_rules, last_update_at2 = SubnetManager().scan_rules(oneagent_id, last_update_at)
-
-        return self.jsonify(rules=rules,
-                            subnet_scan_rules=subnet_scan_rules,
-                            last_update_at=max(last_update_at1 or "", last_update_at2 or ""))
+        return self.jsonify(rules=rules, last_update_at=last_update_at)
 
 
 class AutoDiscoveryRuleSyncHistoryView(APIView):

cmdb-api/api/views/cmdb/ci_type.py

@@ -2,14 +2,14 @@
 
 
 import json
+from io import BytesIO
+
 from flask import abort
 from flask import current_app
 from flask import request
-from io import BytesIO
 
 from api.lib.cmdb.cache import AttributeCache
 from api.lib.cmdb.cache import CITypeCache
-from api.lib.cmdb.ci import CITriggerManager
 from api.lib.cmdb.ci_type import CITypeAttributeGroupManager
 from api.lib.cmdb.ci_type import CITypeAttributeManager
 from api.lib.cmdb.ci_type import CITypeGroupManager
@@ -497,16 +497,6 @@ class CITypeTriggerView(APIView):
         return self.jsonify(code=200)
 
 
-class CITypeTriggerTestView(APIView):
-    url_prefix = ("/ci_types/<int:type_id>/triggers/<int:_id>/test_notify",)
-
-    @has_perm_from_args("type_id", ResourceTypeEnum.CI, PermEnum.CONFIG, CITypeManager.get_name_by_id)
-    def post(self, type_id, _id):
-        CITriggerManager().trigger_notify_test(type_id, _id)
-
-        return self.jsonify(code=200)
-
-
 class CITypeGrantView(APIView):
     url_prefix = "/ci_types/<int:type_id>/roles/<int:rid>/grant"
 

cmdb-api/api/views/cmdb/dcim/__init__.py

@@ -1 +0,0 @@
-# -*- coding:utf-8 -*-

cmdb-api/api/views/cmdb/dcim/dcim_history.py

@@ -1,30 +0,0 @@
-# -*- coding:utf-8 -*-
-
-from flask import request
-
-from api.lib.cmdb.dcim.history import OperateHistoryManager
-from api.lib.common_setting.decorator import perms_role_required
-from api.lib.common_setting.role_perm_base import CMDBApp
-from api.lib.utils import get_page
-from api.lib.utils import get_page_size
-from api.lib.utils import handle_arg_list
-from api.resource import APIView
-
-app_cli = CMDBApp()
-
-
-class DCIMOperateHistoryView(APIView):
-    url_prefix = ("/dcim/history/operate",)
-
-    @perms_role_required(app_cli.app_name, app_cli.resource_type_name, app_cli.op.DCIM,
-                         app_cli.op.read, app_cli.admin_name)
-    def get(self):
-        page = get_page(request.values.pop("page", 1))
-        page_size = get_page_size(request.values.pop("page_size", None))
-        operate_type = handle_arg_list(request.values.pop('operate_type', []))
-        if operate_type:
-            request.values["operate_type"] = operate_type
-
-        numfound, result, id2ci, type2show_key = OperateHistoryManager.search(page, page_size, **request.values)
-
-        return self.jsonify(numfound=numfound, result=result, id2ci=id2ci, type2show_key=type2show_key)

cmdb-api/api/views/cmdb/dcim/idc.py

@@ -1,35 +0,0 @@
-# -*- coding:utf-8 -*-
-
-from flask import request
-
-from api.lib.cmdb.dcim.idc import IDCManager
-from api.lib.common_setting.decorator import perms_role_required
-from api.lib.common_setting.role_perm_base import CMDBApp
-from api.resource import APIView
-
-app_cli = CMDBApp()
-
-
-class IDCView(APIView):
-    url_prefix = ("/dcim/idc", "/dcim/idc/<int:_id>")
-
-    @perms_role_required(app_cli.app_name, app_cli.resource_type_name, app_cli.op.DCIM,
-                         app_cli.op.read, app_cli.admin_name)
-    def post(self):
-        parent_id = request.values.pop("parent_id")
-
-        return self.jsonify(ci_id=IDCManager().add(parent_id, **request.values))
-
-    @perms_role_required(app_cli.app_name, app_cli.resource_type_name, app_cli.op.DCIM,
-                         app_cli.op.read, app_cli.admin_name)
-    def put(self, _id):
-        IDCManager().update(_id, **request.values)
-
-        return self.jsonify(ci_id=_id)
-
-    @perms_role_required(app_cli.app_name, app_cli.resource_type_name, app_cli.op.DCIM,
-                         app_cli.op.read, app_cli.admin_name)
-    def delete(self, _id):
-        IDCManager().delete(_id)
-
-        return self.jsonify(ci_id=_id)

cmdb-api/api/views/cmdb/dcim/rack.py

@@ -1,102 +0,0 @@
-# -*- coding:utf-8 -*-
-
-from flask import request
-
-from api.lib.cmdb.const import CMDB_QUEUE
-from api.lib.cmdb.dcim.const import RackBuiltinAttributes
-from api.lib.cmdb.dcim.rack import RackManager
-from api.lib.common_setting.decorator import perms_role_required
-from api.lib.common_setting.role_perm_base import CMDBApp
-from api.lib.decorator import args_required
-from api.resource import APIView
-from api.tasks.cmdb import dcim_calc_u_free_count
-
-app_cli = CMDBApp()
-
-
-class RackView(APIView):
-    url_prefix = ("/dcim/rack", "/dcim/rack/<int:_id>")
-
-    @perms_role_required(app_cli.app_name, app_cli.resource_type_name, app_cli.op.DCIM,
-                         app_cli.op.read, app_cli.admin_name)
-    @args_required("parent_id")
-    def post(self):
-        parent_id = request.values.pop("parent_id")
-
-        return self.jsonify(ci_id=RackManager().add(parent_id, **request.values))
-
-    @perms_role_required(app_cli.app_name, app_cli.resource_type_name, app_cli.op.DCIM,
-                         app_cli.op.read, app_cli.admin_name)
-    def put(self, _id):
-        RackManager().update(_id, **request.values)
-
-        return self.jsonify(ci_id=_id)
-
-    @perms_role_required(app_cli.app_name, app_cli.resource_type_name, app_cli.op.DCIM,
-                         app_cli.op.read, app_cli.admin_name)
-    def delete(self, _id):
-        RackManager().delete(_id)
-
-        return self.jsonify(ci_id=_id)
-
-
-class RackDetailView(APIView):
-    url_prefix = ("/dcim/rack/<int:rack_id>/device/<int:device_id>",)
-
-    @perms_role_required(app_cli.app_name, app_cli.resource_type_name, app_cli.op.DCIM,
-                         app_cli.op.read, app_cli.admin_name)
-    @args_required(RackBuiltinAttributes.U_START)
-    def post(self, rack_id, device_id):
-        u_start = request.values.pop(RackBuiltinAttributes.U_START)
-        u_count = request.values.get(RackBuiltinAttributes.U_COUNT)
-
-        RackManager().add_device(rack_id, device_id, u_start, u_count)
-
-        return self.jsonify(rack_id=rack_id, device_id=device_id)
-
-    @perms_role_required(app_cli.app_name, app_cli.resource_type_name, app_cli.op.DCIM,
-                         app_cli.op.read, app_cli.admin_name)
-    @args_required("to_u_start")
-    def put(self, rack_id, device_id):
-        to_u_start = request.values.pop("to_u_start")
-
-        RackManager().move_device(rack_id, device_id, to_u_start)
-
-        return self.jsonify(rack_id=rack_id, device_id=device_id, to_u_start=to_u_start)
-
-    @perms_role_required(app_cli.app_name, app_cli.resource_type_name, app_cli.op.DCIM,
-                         app_cli.op.read, app_cli.admin_name)
-    def delete(self, rack_id, device_id):
-        RackManager().remove_device(rack_id, device_id)
-
-        return self.jsonify(code=200)
-
-
-class RackDeviceMigrateView(APIView):
-    url_prefix = ("/dcim/rack/<int:rack_id>/device/<int:device_id>/migrate",)
-
-    @perms_role_required(app_cli.app_name, app_cli.resource_type_name, app_cli.op.DCIM,
-                         app_cli.op.read, app_cli.admin_name)
-    @args_required("to_rack_id")
-    @args_required("to_u_start")
-    def put(self, rack_id, device_id):
-        to_rack_id = request.values.pop("to_rack_id")
-        to_u_start = request.values.pop("to_u_start")
-
-        RackManager().migrate_device(rack_id, device_id, to_rack_id, to_u_start)
-
-        return self.jsonify(rack_id=rack_id,
-                            device_id=device_id,
-                            to_u_start=to_u_start,
-                            to_rack_id=to_rack_id)
-
-
-class RackCalcUFreeCountView(APIView):
-    url_prefix = ("/dcim/rack/calc_u_free_count",)
-
-    @perms_role_required(app_cli.app_name, app_cli.resource_type_name, app_cli.op.DCIM,
-                         app_cli.op.read, app_cli.admin_name)
-    def post(self):
-        dcim_calc_u_free_count.apply_async(queue=CMDB_QUEUE)
-
-        return self.jsonify(code=200)

cmdb-api/api/views/cmdb/dcim/region.py

@@ -1,33 +0,0 @@
-# -*- coding:utf-8 -*-
-
-from flask import request
-
-from api.lib.cmdb.dcim.region import RegionManager
-from api.lib.common_setting.decorator import perms_role_required
-from api.lib.common_setting.role_perm_base import CMDBApp
-from api.resource import APIView
-
-app_cli = CMDBApp()
-
-
-class RegionView(APIView):
-    url_prefix = ("/dcim/region", "/dcim/region/<int:_id>")
-
-    @perms_role_required(app_cli.app_name, app_cli.resource_type_name, app_cli.op.DCIM,
-                         app_cli.op.read, app_cli.admin_name)
-    def post(self):
-        return self.jsonify(ci_id=RegionManager().add(**request.values))
-
-    @perms_role_required(app_cli.app_name, app_cli.resource_type_name, app_cli.op.DCIM,
-                         app_cli.op.read, app_cli.admin_name)
-    def put(self, _id):
-        RegionManager().update(_id, **request.values)
-
-        return self.jsonify(ci_id=_id)
-
-    @perms_role_required(app_cli.app_name, app_cli.resource_type_name, app_cli.op.DCIM,
-                         app_cli.op.read, app_cli.admin_name)
-    def delete(self, _id):
-        RegionManager().delete(_id)
-
-        return self.jsonify(ci_id=_id)

cmdb-api/api/views/cmdb/dcim/server_room.py

@@ -1,43 +0,0 @@
-# -*- coding:utf-8 -*-
-
-from flask import request
-
-from api.lib.cmdb.dcim.server_room import ServerRoomManager
-from api.lib.common_setting.decorator import perms_role_required
-from api.lib.common_setting.role_perm_base import CMDBApp
-from api.lib.decorator import args_required
-from api.resource import APIView
-
-app_cli = CMDBApp()
-
-
-class ServerRoomView(APIView):
-    url_prefix = ("/dcim/server_room", "/dcim/server_room/<int:_id>", "/dcim/server_room/<int:_id>/racks")
-
-    def get(self, _id):
-        q = request.values.get('q')
-        counter, result = ServerRoomManager.get_racks(_id, q)
-
-        return self.jsonify(counter=counter, result=result)
-
-    @perms_role_required(app_cli.app_name, app_cli.resource_type_name, app_cli.op.DCIM,
-                         app_cli.op.read, app_cli.admin_name)
-    @args_required("parent_id")
-    def post(self):
-        parent_id = request.values.pop("parent_id")
-
-        return self.jsonify(ci_id=ServerRoomManager().add(parent_id, **request.values))
-
-    @perms_role_required(app_cli.app_name, app_cli.resource_type_name, app_cli.op.DCIM,
-                         app_cli.op.read, app_cli.admin_name)
-    def put(self, _id):
-        ServerRoomManager().update(_id, **request.values)
-
-        return self.jsonify(ci_id=_id)
-
-    @perms_role_required(app_cli.app_name, app_cli.resource_type_name, app_cli.op.DCIM,
-                         app_cli.op.read, app_cli.admin_name)
-    def delete(self, _id):
-        ServerRoomManager().delete(_id)
-
-        return self.jsonify(ci_id=_id)

cmdb-api/api/views/cmdb/dcim/tree_view.py

@@ -1,19 +0,0 @@
-# -*- coding:utf-8 -*-
-
-from api.lib.cmdb.dcim.tree_view import TreeViewManager
-from api.lib.common_setting.decorator import perms_role_required
-from api.lib.common_setting.role_perm_base import CMDBApp
-from api.resource import APIView
-
-app_cli = CMDBApp()
-
-
-class DCIMTreeView(APIView):
-    url_prefix = "/dcim/tree_view"
-
-    @perms_role_required(app_cli.app_name, app_cli.resource_type_name, app_cli.op.DCIM,
-                         app_cli.op.read, app_cli.admin_name)
-    def get(self):
-        result, type2name = TreeViewManager.get()
-
-        return self.jsonify(result=result, type2name=type2name)

cmdb-api/api/views/cmdb/ipam/__init__.py

@@ -1 +0,0 @@
-# -*- coding:utf-8 -*-

cmdb-api/api/views/cmdb/ipam/address.py

@@ -1,39 +0,0 @@
-# -*- coding:utf-8 -*-
-
-from flask import request
-
-from api.lib.cmdb.ipam.address import IpAddressManager
-from api.lib.common_setting.decorator import perms_role_required
-from api.lib.common_setting.role_perm_base import CMDBApp
-from api.lib.decorator import args_required
-from api.lib.utils import handle_arg_list
-from api.resource import APIView
-
-app_cli = CMDBApp()
-
-
-class IPAddressView(APIView):
-    url_prefix = ("/ipam/address",)
-
-    @args_required("parent_id")
-    @perms_role_required(app_cli.app_name, app_cli.resource_type_name, app_cli.op.IPAM,
-                         app_cli.op.read, app_cli.admin_name)
-    def get(self):
-        parent_id = request.args.get("parent_id")
-
-        numfound, result = IpAddressManager.list_ip_address(parent_id)
-
-        return self.jsonify(numfound=numfound, result=result)
-
-    @args_required("ips")
-    @args_required("assign_status", value_required=False)
-    @perms_role_required(app_cli.app_name, app_cli.resource_type_name, app_cli.op.IPAM,
-                         app_cli.op.read, app_cli.admin_name)
-    def post(self):
-        ips = handle_arg_list(request.values.pop("ips"))
-        parent_id = request.values.pop("parent_id", None)
-        cidr = request.values.pop("cidr", None)
-
-        IpAddressManager().assign_ips(ips, parent_id, cidr, **request.values)
-
-        return self.jsonify(code=200)

cmdb-api/api/views/cmdb/ipam/ipam_history.py

@@ -1,53 +0,0 @@
-# -*- coding:utf-8 -*-
-
-from flask import request
-
-from api.lib.cmdb.ipam.history import OperateHistoryManager
-from api.lib.cmdb.ipam.history import ScanHistoryManager
-from api.lib.common_setting.decorator import perms_role_required
-from api.lib.common_setting.role_perm_base import CMDBApp
-from api.lib.decorator import args_required
-from api.lib.utils import get_page
-from api.lib.utils import get_page_size
-from api.lib.utils import handle_arg_list
-from api.resource import APIView
-
-app_cli = CMDBApp()
-
-
-class IPAMOperateHistoryView(APIView):
-    url_prefix = ("/ipam/history/operate",)
-
-    @perms_role_required(app_cli.app_name, app_cli.resource_type_name, app_cli.op.IPAM,
-                         app_cli.op.read, app_cli.admin_name)
-    def get(self):
-        page = get_page(request.values.pop("page", 1))
-        page_size = get_page_size(request.values.pop("page_size", None))
-        operate_type = handle_arg_list(request.values.pop('operate_type', []))
-        if operate_type:
-            request.values["operate_type"] = operate_type
-
-        numfound, result = OperateHistoryManager.search(page, page_size, **request.values)
-
-        return self.jsonify(numfound=numfound, result=result)
-
-
-class IPAMScanHistoryView(APIView):
-    url_prefix = ("/ipam/history/scan",)
-
-    @perms_role_required(app_cli.app_name, app_cli.resource_type_name, app_cli.op.IPAM,
-                         app_cli.op.read, app_cli.admin_name)
-    def get(self):
-        page = get_page(request.values.pop("page", 1))
-        page_size = get_page_size(request.values.pop("page_size", None))
-
-        numfound, result = ScanHistoryManager.search(page, page_size, **request.values)
-
-        return self.jsonify(numfound=numfound, result=result)
-
-    @args_required("exec_id")
-    def post(self):
-
-        ScanHistoryManager().add(**request.values)
-
-        return self.jsonify(code=200)

cmdb-api/api/views/cmdb/ipam/ipam_stats.py

@@ -1,24 +0,0 @@
-# -*- coding:utf-8 -*-
-
-
-from flask import request
-
-from api.lib.cmdb.ipam.stats import Stats
-from api.lib.common_setting.decorator import perms_role_required
-from api.lib.common_setting.role_perm_base import CMDBApp
-from api.lib.decorator import args_required
-from api.resource import APIView
-
-app_cli = CMDBApp()
-
-
-class IPAMStatsView(APIView):
-    url_prefix = '/ipam/stats'
-
-    @args_required("parent_id")
-    @perms_role_required(app_cli.app_name, app_cli.resource_type_name, app_cli.op.IPAM,
-                         app_cli.op.read, app_cli.admin_name)
-    def get(self):
-        parent_id = request.values.get("parent_id")
-
-        return self.jsonify(Stats().summary(parent_id))

cmdb-api/api/views/cmdb/ipam/subnet.py

@@ -1,75 +0,0 @@
-# -*- coding:utf-8 -*-
-
-from flask import request
-
-from api.lib.cmdb.ipam.subnet import SubnetManager
-from api.lib.cmdb.ipam.subnet import SubnetScopeManager
-from api.lib.common_setting.decorator import perms_role_required
-from api.lib.common_setting.role_perm_base import CMDBApp
-from api.lib.decorator import args_required
-from api.resource import APIView
-
-app_cli = CMDBApp()
-
-
-class SubnetView(APIView):
-    url_prefix = ("/ipam/subnet", "/ipam/subnet/hosts", "/ipam/subnet/<int:_id>")
-
-    @perms_role_required(app_cli.app_name, app_cli.resource_type_name, app_cli.op.IPAM,
-                         app_cli.op.read, app_cli.admin_name)
-    def get(self, _id=None):
-        if "hosts" in request.url:
-            return self.jsonify(SubnetManager.get_hosts(request.values.get('cidr')))
-
-        if _id is not None:
-            return self.jsonify(SubnetManager().get_by_id(_id))
-
-        result, type2name = SubnetManager().tree_view()
-
-        return self.jsonify(result=result, type2name=type2name)
-
-    @args_required("cidr")
-    @args_required("parent_id", value_required=False)
-    @perms_role_required(app_cli.app_name, app_cli.resource_type_name, app_cli.op.IPAM,
-                         app_cli.op.read, app_cli.admin_name)
-    def post(self):
-        cidr = request.values.pop("cidr")
-        parent_id = request.values.pop("parent_id")
-        agent_id = request.values.pop("agent_id", None)
-        cron = request.values.pop("cron", None)
-
-        return self.jsonify(SubnetManager().add(cidr, parent_id, agent_id, cron, **request.values))
-
-    @perms_role_required(app_cli.app_name, app_cli.resource_type_name, app_cli.op.IPAM,
-                         app_cli.op.read, app_cli.admin_name)
-    def put(self, _id):
-        return self.jsonify(id=SubnetManager().update(_id, **request.values))
-
-    @perms_role_required(app_cli.app_name, app_cli.resource_type_name, app_cli.op.IPAM,
-                         app_cli.op.read, app_cli.admin_name)
-    def delete(self, _id):
-        return self.jsonify(id=SubnetManager().delete(_id))
-
-
-class SubnetScopeView(APIView):
-    url_prefix = ("/ipam/scope", "/ipam/scope/<int:_id>")
-
-    @args_required("parent_id", value_required=False)
-    @args_required("name")
-    @perms_role_required(app_cli.app_name, app_cli.resource_type_name, app_cli.op.IPAM,
-                         app_cli.op.read, app_cli.admin_name)
-    def post(self):
-        parent_id = request.values.pop("parent_id")
-        name = request.values.pop("name")
-
-        return self.jsonify(SubnetScopeManager().add(parent_id, name))
-
-    @perms_role_required(app_cli.app_name, app_cli.resource_type_name, app_cli.op.IPAM,
-                         app_cli.op.read, app_cli.admin_name)
-    def put(self, _id):
-        return self.jsonify(id=SubnetScopeManager().update(_id, **request.values))
-
-    @perms_role_required(app_cli.app_name, app_cli.resource_type_name, app_cli.op.IPAM,
-                         app_cli.op.read, app_cli.admin_name)
-    def delete(self, _id):
-        return self.jsonify(id=SubnetScopeManager.delete(_id))

cmdb-api/api/views/common_setting/employee.py

@@ -131,7 +131,7 @@ class EmployeeChangePasswordWithACLID(APIView):
         if not password:
             abort(400, ErrFormat.password_is_required)
 
-        EmployeeCRUD.change_password_by_uid(_uid, password)
+        data = EmployeeCRUD.change_password_by_uid(_uid, password)
         return self.jsonify(200)
 
 

cmdb-api/api/views/common_setting/file_manage.py

@@ -6,7 +6,7 @@ import magic
 
 from api.lib.common_setting.const import MIMEExtMap
 from api.lib.common_setting.resp_format import ErrFormat
-from api.lib.common_setting.upload_file import generate_new_file_name, CommonFileCRUD
+from api.lib.common_setting.upload_file import allowed_file, generate_new_file_name, CommonFileCRUD
 from api.resource import APIView
 
 prefix = '/file'

cmdb-api/requirements.txt

@@ -16,7 +16,7 @@ Flask-Cors==4.0.0
 Flask-Login>=0.6.2
 Flask-Migrate==2.5.2
 Flask-RESTful==0.3.10
-Flask-SQLAlchemy==3.0.5
+Flask-SQLAlchemy==2.5.0
 future==0.18.3
 gunicorn==21.0.1
 hvac==2.0.0
@@ -57,5 +57,3 @@ lz4>=4.3.2
 python-magic==0.4.27
 jsonpath==0.82.2
 networkx>=3.1
-ipaddress>=1.0.23
-ruff==0.8.3

cmdb-ui/public/iconfont/demo_index.html

@@ -54,168 +54,6 @@
       <div class="content unicode" style="display: block;">
           <ul class="icon_lists dib-box">
           
-            <li class="dib">
-              <span class="icon iconfont">&#xea02;</span>
-                <div class="name">veops-rear</div>
-                <div class="code-name">&amp;#xea02;</div>
-              </li>
-          
-            <li class="dib">
-              <span class="icon iconfont">&#xea03;</span>
-                <div class="name">veops-front</div>
-                <div class="code-name">&amp;#xea03;</div>
-              </li>
-          
-            <li class="dib">
-              <span class="icon iconfont">&#xea01;</span>
-                <div class="name">veops-xianggang</div>
-                <div class="code-name">&amp;#xea01;</div>
-              </li>
-          
-            <li class="dib">
-              <span class="icon iconfont">&#xea00;</span>
-                <div class="name">veops-device (2)</div>
-                <div class="code-name">&amp;#xea00;</div>
-              </li>
-          
-            <li class="dib">
-              <span class="icon iconfont">&#xe9ff;</span>
-                <div class="name">veops-room (1)</div>
-                <div class="code-name">&amp;#xe9ff;</div>
-              </li>
-          
-            <li class="dib">
-              <span class="icon iconfont">&#xe9fe;</span>
-                <div class="name">veops-IDC</div>
-                <div class="code-name">&amp;#xe9fe;</div>
-              </li>
-          
-            <li class="dib">
-              <span class="icon iconfont">&#xe9fd;</span>
-                <div class="name">veops-region</div>
-                <div class="code-name">&amp;#xe9fd;</div>
-              </li>
-          
-            <li class="dib">
-              <span class="icon iconfont">&#xe9fb;</span>
-                <div class="name">veops-device</div>
-                <div class="code-name">&amp;#xe9fb;</div>
-              </li>
-          
-            <li class="dib">
-              <span class="icon iconfont">&#xe9fc;</span>
-                <div class="name">veops-cabinet</div>
-                <div class="code-name">&amp;#xe9fc;</div>
-              </li>
-          
-            <li class="dib">
-              <span class="icon iconfont">&#xe9f9;</span>
-                <div class="name">veops-data_center</div>
-                <div class="code-name">&amp;#xe9f9;</div>
-              </li>
-          
-            <li class="dib">
-              <span class="icon iconfont">&#xe9fa;</span>
-                <div class="name">ops-setting-holiday_management-copy</div>
-                <div class="code-name">&amp;#xe9fa;</div>
-              </li>
-          
-            <li class="dib">
-              <span class="icon iconfont">&#xe9f8;</span>
-                <div class="name">itsm-system_log</div>
-                <div class="code-name">&amp;#xe9f8;</div>
-              </li>
-          
-            <li class="dib">
-              <span class="icon iconfont">&#xe9f6;</span>
-                <div class="name">ops-setting-adjustday</div>
-                <div class="code-name">&amp;#xe9f6;</div>
-              </li>
-          
-            <li class="dib">
-              <span class="icon iconfont">&#xe9f7;</span>
-                <div class="name">ops-setting-holiday</div>
-                <div class="code-name">&amp;#xe9f7;</div>
-              </li>
-          
-            <li class="dib">
-              <span class="icon iconfont">&#xe9f5;</span>
-                <div class="name">ops-setting-festival</div>
-                <div class="code-name">&amp;#xe9f5;</div>
-              </li>
-          
-            <li class="dib">
-              <span class="icon iconfont">&#xe9f4;</span>
-                <div class="name">itsm-count</div>
-                <div class="code-name">&amp;#xe9f4;</div>
-              </li>
-          
-            <li class="dib">
-              <span class="icon iconfont">&#xe9f3;</span>
-                <div class="name">itsm-satisfaction</div>
-                <div class="code-name">&amp;#xe9f3;</div>
-              </li>
-          
-            <li class="dib">
-              <span class="icon iconfont">&#xe9f2;</span>
-                <div class="name">veops-folder</div>
-                <div class="code-name">&amp;#xe9f2;</div>
-              </li>
-          
-            <li class="dib">
-              <span class="icon iconfont">&#xe9f1;</span>
-                <div class="name">veops-entire_network_</div>
-                <div class="code-name">&amp;#xe9f1;</div>
-              </li>
-          
-            <li class="dib">
-              <span class="icon iconfont">&#xe9f0;</span>
-                <div class="name">veops-subnet</div>
-                <div class="code-name">&amp;#xe9f0;</div>
-              </li>
-          
-            <li class="dib">
-              <span class="icon iconfont">&#xe9ef;</span>
-                <div class="name">veops-map_view</div>
-                <div class="code-name">&amp;#xe9ef;</div>
-              </li>
-          
-            <li class="dib">
-              <span class="icon iconfont">&#xe9ee;</span>
-                <div class="name">veops-recycle</div>
-                <div class="code-name">&amp;#xe9ee;</div>
-              </li>
-          
-            <li class="dib">
-              <span class="icon iconfont">&#xe9ed;</span>
-                <div class="name">veops-catalog</div>
-                <div class="code-name">&amp;#xe9ed;</div>
-              </li>
-          
-            <li class="dib">
-              <span class="icon iconfont">&#xe9ec;</span>
-                <div class="name">veops-ipam</div>
-                <div class="code-name">&amp;#xe9ec;</div>
-              </li>
-          
-            <li class="dib">
-              <span class="icon iconfont">&#xe9eb;</span>
-                <div class="name">cmdb-calc</div>
-                <div class="code-name">&amp;#xe9eb;</div>
-              </li>
-          
-            <li class="dib">
-              <span class="icon iconfont">&#xe9ea;</span>
-                <div class="name">ai-users</div>
-                <div class="code-name">&amp;#xe9ea;</div>
-              </li>
-          
-            <li class="dib">
-              <span class="icon iconfont">&#xe9e9;</span>
-                <div class="name">ai-tokens</div>
-                <div class="code-name">&amp;#xe9e9;</div>
-              </li>
-          
             <li class="dib">
               <span class="icon iconfont">&#xe9e8;</span>
                 <div class="name">oneterm-mysql</div>
@@ -6162,9 +6000,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1732673294759') format('woff2'),
-       url('iconfont.woff?t=1732673294759') format('woff'),
-       url('iconfont.ttf?t=1732673294759') format('truetype');
+  src: url('iconfont.woff2?t=1729157759723') format('woff2'),
+       url('iconfont.woff?t=1729157759723') format('woff'),
+       url('iconfont.ttf?t=1729157759723') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -6190,249 +6028,6 @@
       <div class="content font-class">
         <ul class="icon_lists dib-box">
           
-          <li class="dib">
-            <span class="icon iconfont veops-rear"></span>
-            <div class="name">
-              veops-rear
-            </div>
-            <div class="code-name">.veops-rear
-            </div>
-          </li>
-          
-          <li class="dib">
-            <span class="icon iconfont veops-front"></span>
-            <div class="name">
-              veops-front
-            </div>
-            <div class="code-name">.veops-front
-            </div>
-          </li>
-          
-          <li class="dib">
-            <span class="icon iconfont veops-xianggang"></span>
-            <div class="name">
-              veops-xianggang
-            </div>
-            <div class="code-name">.veops-xianggang
-            </div>
-          </li>
-          
-          <li class="dib">
-            <span class="icon iconfont a-veops-device2"></span>
-            <div class="name">
-              veops-device (2)
-            </div>
-            <div class="code-name">.a-veops-device2
-            </div>
-          </li>
-          
-          <li class="dib">
-            <span class="icon iconfont a-veops-room1"></span>
-            <div class="name">
-              veops-room (1)
-            </div>
-            <div class="code-name">.a-veops-room1
-            </div>
-          </li>
-          
-          <li class="dib">
-            <span class="icon iconfont veops-IDC"></span>
-            <div class="name">
-              veops-IDC
-            </div>
-            <div class="code-name">.veops-IDC
-            </div>
-          </li>
-          
-          <li class="dib">
-            <span class="icon iconfont veops-region"></span>
-            <div class="name">
-              veops-region
-            </div>
-            <div class="code-name">.veops-region
-            </div>
-          </li>
-          
-          <li class="dib">
-            <span class="icon iconfont veops-device"></span>
-            <div class="name">
-              veops-device
-            </div>
-            <div class="code-name">.veops-device
-            </div>
-          </li>
-          
-          <li class="dib">
-            <span class="icon iconfont veops-cabinet"></span>
-            <div class="name">
-              veops-cabinet
-            </div>
-            <div class="code-name">.veops-cabinet
-            </div>
-          </li>
-          
-          <li class="dib">
-            <span class="icon iconfont veops-data_center"></span>
-            <div class="name">
-              veops-data_center
-            </div>
-            <div class="code-name">.veops-data_center
-            </div>
-          </li>
-          
-          <li class="dib">
-            <span class="icon iconfont ops-setting-holidays"></span>
-            <div class="name">
-              ops-setting-holiday_management-copy
-            </div>
-            <div class="code-name">.ops-setting-holidays
-            </div>
-          </li>
-          
-          <li class="dib">
-            <span class="icon iconfont ops-itsm-logs"></span>
-            <div class="name">
-              itsm-system_log
-            </div>
-            <div class="code-name">.ops-itsm-logs
-            </div>
-          </li>
-          
-          <li class="dib">
-            <span class="icon iconfont ops-setting-workday"></span>
-            <div class="name">
-              ops-setting-adjustday
-            </div>
-            <div class="code-name">.ops-setting-workday
-            </div>
-          </li>
-          
-          <li class="dib">
-            <span class="icon iconfont ops-setting-holiday"></span>
-            <div class="name">
-              ops-setting-holiday
-            </div>
-            <div class="code-name">.ops-setting-holiday
-            </div>
-          </li>
-          
-          <li class="dib">
-            <span class="icon iconfont ops-setting-festival"></span>
-            <div class="name">
-              ops-setting-festival
-            </div>
-            <div class="code-name">.ops-setting-festival
-            </div>
-          </li>
-          
-          <li class="dib">
-            <span class="icon iconfont itsm-calc"></span>
-            <div class="name">
-              itsm-count
-            </div>
-            <div class="code-name">.itsm-calc
-            </div>
-          </li>
-          
-          <li class="dib">
-            <span class="icon iconfont itsm-reports_4"></span>
-            <div class="name">
-              itsm-satisfaction
-            </div>
-            <div class="code-name">.itsm-reports_4
-            </div>
-          </li>
-          
-          <li class="dib">
-            <span class="icon iconfont veops-folder"></span>
-            <div class="name">
-              veops-folder
-            </div>
-            <div class="code-name">.veops-folder
-            </div>
-          </li>
-          
-          <li class="dib">
-            <span class="icon iconfont veops-entire_network_"></span>
-            <div class="name">
-              veops-entire_network_
-            </div>
-            <div class="code-name">.veops-entire_network_
-            </div>
-          </li>
-          
-          <li class="dib">
-            <span class="icon iconfont veops-subnet"></span>
-            <div class="name">
-              veops-subnet
-            </div>
-            <div class="code-name">.veops-subnet
-            </div>
-          </li>
-          
-          <li class="dib">
-            <span class="icon iconfont veops-map_view"></span>
-            <div class="name">
-              veops-map_view
-            </div>
-            <div class="code-name">.veops-map_view
-            </div>
-          </li>
-          
-          <li class="dib">
-            <span class="icon iconfont veops-recycle"></span>
-            <div class="name">
-              veops-recycle
-            </div>
-            <div class="code-name">.veops-recycle
-            </div>
-          </li>
-          
-          <li class="dib">
-            <span class="icon iconfont veops-catalog"></span>
-            <div class="name">
-              veops-catalog
-            </div>
-            <div class="code-name">.veops-catalog
-            </div>
-          </li>
-          
-          <li class="dib">
-            <span class="icon iconfont veops-ipam"></span>
-            <div class="name">
-              veops-ipam
-            </div>
-            <div class="code-name">.veops-ipam
-            </div>
-          </li>
-          
-          <li class="dib">
-            <span class="icon iconfont cmdb-calc"></span>
-            <div class="name">
-              cmdb-calc
-            </div>
-            <div class="code-name">.cmdb-calc
-            </div>
-          </li>
-          
-          <li class="dib">
-            <span class="icon iconfont ai-users"></span>
-            <div class="name">
-              ai-users
-            </div>
-            <div class="code-name">.ai-users
-            </div>
-          </li>
-          
-          <li class="dib">
-            <span class="icon iconfont ai-tokens"></span>
-            <div class="name">
-              ai-tokens
-            </div>
-            <div class="code-name">.ai-tokens
-            </div>
-          </li>
-          
           <li class="dib">
             <span class="icon iconfont oneterm-mysql"></span>
             <div class="name">
@@ -8567,20 +8162,20 @@
           </li>
           
           <li class="dib">
-            <span class="icon iconfont itsm-reports_3"></span>
+            <span class="icon iconfont itsm-duration"></span>
             <div class="name">
               itsm-duration
             </div>
-            <div class="code-name">.itsm-reports_3
+            <div class="code-name">.itsm-duration
             </div>
           </li>
           
           <li class="dib">
-            <span class="icon iconfont itsm-reports_2"></span>
+            <span class="icon iconfont itsm-workload"></span>
             <div class="name">
               itsm-workload (1)
             </div>
-            <div class="code-name">.itsm-reports_2
+            <div class="code-name">.itsm-workload
             </div>
           </li>
           
@@ -15352,222 +14947,6 @@
       <div class="content symbol">
           <ul class="icon_lists dib-box">
           
-            <li class="dib">
-                <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#veops-rear"></use>
-                </svg>
-                <div class="name">veops-rear</div>
-                <div class="code-name">#veops-rear</div>
-            </li>
-          
-            <li class="dib">
-                <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#veops-front"></use>
-                </svg>
-                <div class="name">veops-front</div>
-                <div class="code-name">#veops-front</div>
-            </li>
-          
-            <li class="dib">
-                <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#veops-xianggang"></use>
-                </svg>
-                <div class="name">veops-xianggang</div>
-                <div class="code-name">#veops-xianggang</div>
-            </li>
-          
-            <li class="dib">
-                <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#a-veops-device2"></use>
-                </svg>
-                <div class="name">veops-device (2)</div>
-                <div class="code-name">#a-veops-device2</div>
-            </li>
-          
-            <li class="dib">
-                <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#a-veops-room1"></use>
-                </svg>
-                <div class="name">veops-room (1)</div>
-                <div class="code-name">#a-veops-room1</div>
-            </li>
-          
-            <li class="dib">
-                <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#veops-IDC"></use>
-                </svg>
-                <div class="name">veops-IDC</div>
-                <div class="code-name">#veops-IDC</div>
-            </li>
-          
-            <li class="dib">
-                <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#veops-region"></use>
-                </svg>
-                <div class="name">veops-region</div>
-                <div class="code-name">#veops-region</div>
-            </li>
-          
-            <li class="dib">
-                <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#veops-device"></use>
-                </svg>
-                <div class="name">veops-device</div>
-                <div class="code-name">#veops-device</div>
-            </li>
-          
-            <li class="dib">
-                <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#veops-cabinet"></use>
-                </svg>
-                <div class="name">veops-cabinet</div>
-                <div class="code-name">#veops-cabinet</div>
-            </li>
-          
-            <li class="dib">
-                <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#veops-data_center"></use>
-                </svg>
-                <div class="name">veops-data_center</div>
-                <div class="code-name">#veops-data_center</div>
-            </li>
-          
-            <li class="dib">
-                <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#ops-setting-holidays"></use>
-                </svg>
-                <div class="name">ops-setting-holiday_management-copy</div>
-                <div class="code-name">#ops-setting-holidays</div>
-            </li>
-          
-            <li class="dib">
-                <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#ops-itsm-logs"></use>
-                </svg>
-                <div class="name">itsm-system_log</div>
-                <div class="code-name">#ops-itsm-logs</div>
-            </li>
-          
-            <li class="dib">
-                <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#ops-setting-workday"></use>
-                </svg>
-                <div class="name">ops-setting-adjustday</div>
-                <div class="code-name">#ops-setting-workday</div>
-            </li>
-          
-            <li class="dib">
-                <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#ops-setting-holiday"></use>
-                </svg>
-                <div class="name">ops-setting-holiday</div>
-                <div class="code-name">#ops-setting-holiday</div>
-            </li>
-          
-            <li class="dib">
-                <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#ops-setting-festival"></use>
-                </svg>
-                <div class="name">ops-setting-festival</div>
-                <div class="code-name">#ops-setting-festival</div>
-            </li>
-          
-            <li class="dib">
-                <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#itsm-calc"></use>
-                </svg>
-                <div class="name">itsm-count</div>
-                <div class="code-name">#itsm-calc</div>
-            </li>
-          
-            <li class="dib">
-                <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#itsm-reports_4"></use>
-                </svg>
-                <div class="name">itsm-satisfaction</div>
-                <div class="code-name">#itsm-reports_4</div>
-            </li>
-          
-            <li class="dib">
-                <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#veops-folder"></use>
-                </svg>
-                <div class="name">veops-folder</div>
-                <div class="code-name">#veops-folder</div>
-            </li>
-          
-            <li class="dib">
-                <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#veops-entire_network_"></use>
-                </svg>
-                <div class="name">veops-entire_network_</div>
-                <div class="code-name">#veops-entire_network_</div>
-            </li>
-          
-            <li class="dib">
-                <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#veops-subnet"></use>
-                </svg>
-                <div class="name">veops-subnet</div>
-                <div class="code-name">#veops-subnet</div>
-            </li>
-          
-            <li class="dib">
-                <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#veops-map_view"></use>
-                </svg>
-                <div class="name">veops-map_view</div>
-                <div class="code-name">#veops-map_view</div>
-            </li>
-          
-            <li class="dib">
-                <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#veops-recycle"></use>
-                </svg>
-                <div class="name">veops-recycle</div>
-                <div class="code-name">#veops-recycle</div>
-            </li>
-          
-            <li class="dib">
-                <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#veops-catalog"></use>
-                </svg>
-                <div class="name">veops-catalog</div>
-                <div class="code-name">#veops-catalog</div>
-            </li>
-          
-            <li class="dib">
-                <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#veops-ipam"></use>
-                </svg>
-                <div class="name">veops-ipam</div>
-                <div class="code-name">#veops-ipam</div>
-            </li>
-          
-            <li class="dib">
-                <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#cmdb-calc"></use>
-                </svg>
-                <div class="name">cmdb-calc</div>
-                <div class="code-name">#cmdb-calc</div>
-            </li>
-          
-            <li class="dib">
-                <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#ai-users"></use>
-                </svg>
-                <div class="name">ai-users</div>
-                <div class="code-name">#ai-users</div>
-            </li>
-          
-            <li class="dib">
-                <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#ai-tokens"></use>
-                </svg>
-                <div class="name">ai-tokens</div>
-                <div class="code-name">#ai-tokens</div>
-            </li>
-          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#oneterm-mysql"></use>
@@ -17466,18 +16845,18 @@
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#itsm-reports_3"></use>
+                  <use xlink:href="#itsm-duration"></use>
                 </svg>
                 <div class="name">itsm-duration</div>
-                <div class="code-name">#itsm-reports_3</div>
+                <div class="code-name">#itsm-duration</div>
             </li>
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#itsm-reports_2"></use>
+                  <use xlink:href="#itsm-workload"></use>
                 </svg>
                 <div class="name">itsm-workload (1)</div>
-                <div class="code-name">#itsm-reports_2</div>
+                <div class="code-name">#itsm-workload</div>
             </li>
           
             <li class="dib">

cmdb-ui/public/iconfont/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 3857903 */
-  src: url('iconfont.woff2?t=1732673294759') format('woff2'),
-       url('iconfont.woff?t=1732673294759') format('woff'),
-       url('iconfont.ttf?t=1732673294759') format('truetype');
+  src: url('iconfont.woff2?t=1729157759723') format('woff2'),
+       url('iconfont.woff?t=1729157759723') format('woff'),
+       url('iconfont.ttf?t=1729157759723') format('truetype');
 }
 
 .iconfont {
@@ -13,114 +13,6 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
-.veops-rear:before {
-  content: "\ea02";
-}
-
-.veops-front:before {
-  content: "\ea03";
-}
-
-.veops-xianggang:before {
-  content: "\ea01";
-}
-
-.a-veops-device2:before {
-  content: "\ea00";
-}
-
-.a-veops-room1:before {
-  content: "\e9ff";
-}
-
-.veops-IDC:before {
-  content: "\e9fe";
-}
-
-.veops-region:before {
-  content: "\e9fd";
-}
-
-.veops-device:before {
-  content: "\e9fb";
-}
-
-.veops-cabinet:before {
-  content: "\e9fc";
-}
-
-.veops-data_center:before {
-  content: "\e9f9";
-}
-
-.ops-setting-holidays:before {
-  content: "\e9fa";
-}
-
-.ops-itsm-logs:before {
-  content: "\e9f8";
-}
-
-.ops-setting-workday:before {
-  content: "\e9f6";
-}
-
-.ops-setting-holiday:before {
-  content: "\e9f7";
-}
-
-.ops-setting-festival:before {
-  content: "\e9f5";
-}
-
-.itsm-calc:before {
-  content: "\e9f4";
-}
-
-.itsm-reports_4:before {
-  content: "\e9f3";
-}
-
-.veops-folder:before {
-  content: "\e9f2";
-}
-
-.veops-entire_network_:before {
-  content: "\e9f1";
-}
-
-.veops-subnet:before {
-  content: "\e9f0";
-}
-
-.veops-map_view:before {
-  content: "\e9ef";
-}
-
-.veops-recycle:before {
-  content: "\e9ee";
-}
-
-.veops-catalog:before {
-  content: "\e9ed";
-}
-
-.veops-ipam:before {
-  content: "\e9ec";
-}
-
-.cmdb-calc:before {
-  content: "\e9eb";
-}
-
-.ai-users:before {
-  content: "\e9ea";
-}
-
-.ai-tokens:before {
-  content: "\e9e9";
-}
-
 .oneterm-mysql:before {
   content: "\e9e8";
 }
@@ -1069,11 +961,11 @@
   content: "\e914";
 }
 
-.itsm-reports_3:before {
+.itsm-duration:before {
   content: "\e913";
 }
 
-.itsm-reports_2:before {
+.itsm-workload:before {
   content: "\e912";
 }
 

cmdb-ui/public/iconfont/iconfont.json

@@ -5,195 +5,6 @@
   "css_prefix_text": "",
   "description": "",
   "glyphs": [
-    {
-      "icon_id": "42510712",
-      "name": "veops-rear",
-      "font_class": "veops-rear",
-      "unicode": "ea02",
-      "unicode_decimal": 59906
-    },
-    {
-      "icon_id": "42510708",
-      "name": "veops-front",
-      "font_class": "veops-front",
-      "unicode": "ea03",
-      "unicode_decimal": 59907
-    },
-    {
-      "icon_id": "42497603",
-      "name": "veops-xianggang",
-      "font_class": "veops-xianggang",
-      "unicode": "ea01",
-      "unicode_decimal": 59905
-    },
-    {
-      "icon_id": "42485038",
-      "name": "veops-device (2)",
-      "font_class": "a-veops-device2",
-      "unicode": "ea00",
-      "unicode_decimal": 59904
-    },
-    {
-      "icon_id": "42455620",
-      "name": "veops-room (1)",
-      "font_class": "a-veops-room1",
-      "unicode": "e9ff",
-      "unicode_decimal": 59903
-    },
-    {
-      "icon_id": "42455607",
-      "name": "veops-IDC",
-      "font_class": "veops-IDC",
-      "unicode": "e9fe",
-      "unicode_decimal": 59902
-    },
-    {
-      "icon_id": "42455609",
-      "name": "veops-region",
-      "font_class": "veops-region",
-      "unicode": "e9fd",
-      "unicode_decimal": 59901
-    },
-    {
-      "icon_id": "42448953",
-      "name": "veops-device",
-      "font_class": "veops-device",
-      "unicode": "e9fb",
-      "unicode_decimal": 59899
-    },
-    {
-      "icon_id": "42448948",
-      "name": "veops-cabinet",
-      "font_class": "veops-cabinet",
-      "unicode": "e9fc",
-      "unicode_decimal": 59900
-    },
-    {
-      "icon_id": "42433324",
-      "name": "veops-data_center",
-      "font_class": "veops-data_center",
-      "unicode": "e9f9",
-      "unicode_decimal": 59897
-    },
-    {
-      "icon_id": "42337844",
-      "name": "ops-setting-holiday_management-copy",
-      "font_class": "ops-setting-holidays",
-      "unicode": "e9fa",
-      "unicode_decimal": 59898
-    },
-    {
-      "icon_id": "42335414",
-      "name": "itsm-system_log",
-      "font_class": "ops-itsm-logs",
-      "unicode": "e9f8",
-      "unicode_decimal": 59896
-    },
-    {
-      "icon_id": "42334782",
-      "name": "ops-setting-adjustday",
-      "font_class": "ops-setting-workday",
-      "unicode": "e9f6",
-      "unicode_decimal": 59894
-    },
-    {
-      "icon_id": "42334768",
-      "name": "ops-setting-holiday",
-      "font_class": "ops-setting-holiday",
-      "unicode": "e9f7",
-      "unicode_decimal": 59895
-    },
-    {
-      "icon_id": "42334734",
-      "name": "ops-setting-festival",
-      "font_class": "ops-setting-festival",
-      "unicode": "e9f5",
-      "unicode_decimal": 59893
-    },
-    {
-      "icon_id": "42281202",
-      "name": "itsm-count",
-      "font_class": "itsm-calc",
-      "unicode": "e9f4",
-      "unicode_decimal": 59892
-    },
-    {
-      "icon_id": "42270632",
-      "name": "itsm-satisfaction",
-      "font_class": "itsm-reports_4",
-      "unicode": "e9f3",
-      "unicode_decimal": 59891
-    },
-    {
-      "icon_id": "42205149",
-      "name": "veops-folder",
-      "font_class": "veops-folder",
-      "unicode": "e9f2",
-      "unicode_decimal": 59890
-    },
-    {
-      "icon_id": "42205128",
-      "name": "veops-entire_network_",
-      "font_class": "veops-entire_network_",
-      "unicode": "e9f1",
-      "unicode_decimal": 59889
-    },
-    {
-      "icon_id": "42205094",
-      "name": "veops-subnet",
-      "font_class": "veops-subnet",
-      "unicode": "e9f0",
-      "unicode_decimal": 59888
-    },
-    {
-      "icon_id": "42201912",
-      "name": "veops-map_view",
-      "font_class": "veops-map_view",
-      "unicode": "e9ef",
-      "unicode_decimal": 59887
-    },
-    {
-      "icon_id": "42201676",
-      "name": "veops-recycle",
-      "font_class": "veops-recycle",
-      "unicode": "e9ee",
-      "unicode_decimal": 59886
-    },
-    {
-      "icon_id": "42201586",
-      "name": "veops-catalog",
-      "font_class": "veops-catalog",
-      "unicode": "e9ed",
-      "unicode_decimal": 59885
-    },
-    {
-      "icon_id": "42201534",
-      "name": "veops-ipam",
-      "font_class": "veops-ipam",
-      "unicode": "e9ec",
-      "unicode_decimal": 59884
-    },
-    {
-      "icon_id": "42179262",
-      "name": "cmdb-calc",
-      "font_class": "cmdb-calc",
-      "unicode": "e9eb",
-      "unicode_decimal": 59883
-    },
-    {
-      "icon_id": "42161413",
-      "name": "ai-users",
-      "font_class": "ai-users",
-      "unicode": "e9ea",
-      "unicode_decimal": 59882
-    },
-    {
-      "icon_id": "42161417",
-      "name": "ai-tokens",
-      "font_class": "ai-tokens",
-      "unicode": "e9e9",
-      "unicode_decimal": 59881
-    },
     {
       "icon_id": "42155223",
       "name": "oneterm-mysql",
@@ -1856,14 +1667,14 @@
     {
       "icon_id": "39926816",
       "name": "itsm-duration",
-      "font_class": "itsm-reports_3",
+      "font_class": "itsm-duration",
       "unicode": "e913",
       "unicode_decimal": 59667
     },
     {
       "icon_id": "39926833",
       "name": "itsm-workload (1)",
-      "font_class": "itsm-reports_2",
+      "font_class": "itsm-workload",
       "unicode": "e912",
       "unicode_decimal": 59666
     },

cmdb-ui/src/components/CMDBFilterComp/expression.vue

@@ -139,9 +139,9 @@
         :normalizer="
           (node) => {
             return {
-              id: node.id,
-              label: node.label,
-              children: node.children,
+              id: String(node[0] || ''),
+              label: node[1] ? node[1].label || node[0] : node[0],
+              children: node.children && node.children.length ? node.children : undefined,
             }
           }
         "
@@ -352,12 +352,8 @@ export default {
     },
     getChoiceValueByProperty(property) {
       const _find = this.canSearchPreferenceAttrList.find((item) => item.name === property)
-      if (_find?.choice_value?.length) {
-        return _find.choice_value.map((node) => ({
-          id: String(node?.[0] ?? ''),
-          label: node?.[1]?.label || node?.[0] || '',
-          children: node?.children?.length ? node.children : undefined
-        }))
+      if (_find) {
+        return _find.choice_value
       }
       return []
     },

cmdb-ui/src/components/Menu/index.module.less

@@ -11,19 +11,10 @@
 
     .ant-input {
       box-shadow: none;
+      border: none;
+      background-color: #F7F8FA;
       height: 30px;
       line-height: 30px;
-      border-radius: 30px;
-
-      &:focus {
-        border: solid 1px #B1C9FF;
-      }
-    }
-
-    .cmdb-side-menu-search-focused {
-      .ant-input {
-        border: solid 1px #B1C9FF;
-      }
     }
 
     .ant-input-suffix {

cmdb-ui/src/components/Menu/menu.js

@@ -92,7 +92,7 @@ export default {
       e.preventDefault()
       e.stopPropagation()
       this.$confirm({
-        title: this.$t('warning'),
+        title: this.$t('alert'),
         content: this.$t('cmdb.preference.confirmcancelSub2', { name: menu.meta.title }),
         onOk() {
           const citypeId = menu.meta.typeId
@@ -313,7 +313,10 @@ export default {
         <Item class={styles['cmdb-side-menu-search']}>
           <a-input
             ref="cmdbSideMenuSearchInputRef"
-            class={`ops-input ${this.$route.name === 'cmdb_resource_search' ? 'cmdb-side-menu-search-focused' : ''}`}
+            class={styles['cmdb-side-menu-search-input']}
+            style={{
+              border: this.$route.name === 'cmdb_resource_search' ? 'solid 1px #B1C9FF' : ''
+            }}
             placeholder={this.$t('cmdbSearch')}
             onPressEnter={(e) => {
               this.jumpCMDBSearch(e.target.value)

cmdb-ui/src/components/OpsTable/index.vue

@@ -1,121 +1,121 @@
-<template>
-  <vxe-table v-bind="$attrs" v-on="new$listeners" ref="xTable">
-    <slot></slot>
-    <template #empty>
-      <slot name="empty">
-        <div :style="{ paddingTop: '10px' }">
-          <img :style="{ width: '140px', height: '120px' }" :src="require('@/assets/data_empty.png')" />
-          <div>{{ $t('noData') }}</div>
-        </div>
-      </slot>
-    </template>
-    <template #loading>
-      <slot name="loading"></slot>
-    </template>
-  </vxe-table>
-</template>
-
-<script>
-import _ from 'lodash'
-// 该组件使用方法与vxe-table一致，但调用它的方法时，需先调用getVxetableRef()获取到vxe-table实体
-export default {
-  name: 'OpsTable',
-  data() {
-    return {
-      // isShifting: false,
-      // lastIndex: -1,
-      lastSelected: [],
-      currentSelected: [],
-    }
-  },
-  computed: {
-    new$listeners() {
-      if (!Object.keys(this.$listeners).length) {
-        return this.$listeners
-      }
-      return Object.assign(this.$listeners, {
-        // 在这里覆盖原有的change事件
-        // 'checkbox-change': this.selectChangeEvent,
-        'checkbox-range-change': this.checkboxRangeChange,
-        'checkbox-range-start': this.checkboxRangeStart,
-        'checkbox-range-end': this.checkboxRangeEnd,
-      })
-    },
-  },
-  mounted() {
-    // window.onkeydown = (e) => {
-    //   if (e.key === 'Shift') {
-    //     this.isShifting = true
-    //   }
-    // }
-    // window.onkeyup = (e) => {
-    //   if (e.key === 'Shift') {
-    //     this.isShifting = false
-    //     this.lastIndex = -1
-    //   }
-    // }
-  },
-  beforeDestroy() {
-    // window.onkeydown = ''
-    // window.onkeyup = ''
-  },
-  methods: {
-    getVxetableRef() {
-      return this.$refs.xTable
-    },
-    // selectChangeEvent(e) {
-    //   const xTable = this.$refs.xTable
-    //   const { lastIndex } = this
-    //   const currentIndex = e.rowIndex
-    //   const { tableData } = xTable.getTableData()
-    //   if (lastIndex > -1 && this.isShifting) {
-    //     let start = lastIndex
-    //     let end = currentIndex
-    //     if (lastIndex > currentIndex) {
-    //       start = currentIndex
-    //       end = lastIndex
-    //     }
-    //     const rangeData = tableData.slice(start, end + 1)
-    //     xTable.setCheckboxRow(rangeData, true)
-    //   }
-    //   this.lastIndex = currentIndex
-    //   this.$emit('checkbox-change', { ...e, records: xTable.getCheckboxRecords() })
-    // },
-    checkboxRangeStart(e) {
-      const xTable = this.$refs.xTable
-      const lastSelected = xTable.getCheckboxRecords()
-      const selectedReserve = xTable.getCheckboxReserveRecords()
-      this.lastSelected = [...lastSelected, ...selectedReserve]
-      this.$emit('checkbox-range-start', e)
-    },
-    checkboxRangeChange(e) {
-      const xTable = this.$refs.xTable
-      xTable.setCheckboxRow(this.lastSelected, true)
-      this.currentSelected = e.records
-      // this.lastSelected = [...new Set([...this.lastSelected, ...e.records])]
-      this.$emit('checkbox-range-change', {
-        ...e,
-        records: [...xTable.getCheckboxRecords(), ...xTable.getCheckboxReserveRecords()],
-      })
-    },
-    checkboxRangeEnd(e) {
-      const xTable = this.$refs.xTable
-      const isAllSelected = this.currentSelected.every((item) => {
-        const _idx = this.lastSelected.findIndex((ele) => _.isEqual(ele, item))
-        return _idx > -1
-      })
-      if (isAllSelected) {
-        xTable.setCheckboxRow(this.currentSelected, false)
-      }
-      this.currentSelected = []
-      this.lastSelected = []
-      this.$emit('checkbox-range-end', {
-        ...e,
-        records: [...xTable.getCheckboxRecords(), ...xTable.getCheckboxReserveRecords()],
-      })
-    },
-  },
-}
-</script>
-
-<style lang="less"></style>
+<template>
+  <vxe-table v-bind="$attrs" v-on="new$listeners" ref="xTable">
+    <slot></slot>
+    <template #empty>
+      <slot name="empty">
+        <div :style="{ paddingTop: '10px' }">
+          <img :style="{ width: '140px', height: '90px' }" :src="require('@/assets/data_empty.png')" />
+          <div>{{ $t('noData') }}</div>
+        </div>
+      </slot>
+    </template>
+    <template #loading>
+      <slot name="loading"></slot>
+    </template>
+  </vxe-table>
+</template>
+
+<script>
+import _ from 'lodash'
+// 该组件使用方法与vxe-table一致，但调用它的方法时，需先调用getVxetableRef()获取到vxe-table实体
+export default {
+  name: 'OpsTable',
+  data() {
+    return {
+      // isShifting: false,
+      // lastIndex: -1,
+      lastSelected: [],
+      currentSelected: [],
+    }
+  },
+  computed: {
+    new$listeners() {
+      if (!Object.keys(this.$listeners).length) {
+        return this.$listeners
+      }
+      return Object.assign(this.$listeners, {
+        // 在这里覆盖原有的change事件
+        // 'checkbox-change': this.selectChangeEvent,
+        'checkbox-range-change': this.checkboxRangeChange,
+        'checkbox-range-start': this.checkboxRangeStart,
+        'checkbox-range-end': this.checkboxRangeEnd,
+      })
+    },
+  },
+  mounted() {
+    // window.onkeydown = (e) => {
+    //   if (e.key === 'Shift') {
+    //     this.isShifting = true
+    //   }
+    // }
+    // window.onkeyup = (e) => {
+    //   if (e.key === 'Shift') {
+    //     this.isShifting = false
+    //     this.lastIndex = -1
+    //   }
+    // }
+  },
+  beforeDestroy() {
+    // window.onkeydown = ''
+    // window.onkeyup = ''
+  },
+  methods: {
+    getVxetableRef() {
+      return this.$refs.xTable
+    },
+    // selectChangeEvent(e) {
+    //   const xTable = this.$refs.xTable
+    //   const { lastIndex } = this
+    //   const currentIndex = e.rowIndex
+    //   const { tableData } = xTable.getTableData()
+    //   if (lastIndex > -1 && this.isShifting) {
+    //     let start = lastIndex
+    //     let end = currentIndex
+    //     if (lastIndex > currentIndex) {
+    //       start = currentIndex
+    //       end = lastIndex
+    //     }
+    //     const rangeData = tableData.slice(start, end + 1)
+    //     xTable.setCheckboxRow(rangeData, true)
+    //   }
+    //   this.lastIndex = currentIndex
+    //   this.$emit('checkbox-change', { ...e, records: xTable.getCheckboxRecords() })
+    // },
+    checkboxRangeStart(e) {
+      const xTable = this.$refs.xTable
+      const lastSelected = xTable.getCheckboxRecords()
+      const selectedReserve = xTable.getCheckboxReserveRecords()
+      this.lastSelected = [...lastSelected, ...selectedReserve]
+      this.$emit('checkbox-range-start', e)
+    },
+    checkboxRangeChange(e) {
+      const xTable = this.$refs.xTable
+      xTable.setCheckboxRow(this.lastSelected, true)
+      this.currentSelected = e.records
+      // this.lastSelected = [...new Set([...this.lastSelected, ...e.records])]
+      this.$emit('checkbox-range-change', {
+        ...e,
+        records: [...xTable.getCheckboxRecords(), ...xTable.getCheckboxReserveRecords()],
+      })
+    },
+    checkboxRangeEnd(e) {
+      const xTable = this.$refs.xTable
+      const isAllSelected = this.currentSelected.every((item) => {
+        const _idx = this.lastSelected.findIndex((ele) => _.isEqual(ele, item))
+        return _idx > -1
+      })
+      if (isAllSelected) {
+        xTable.setCheckboxRow(this.currentSelected, false)
+      }
+      this.currentSelected = []
+      this.lastSelected = []
+      this.$emit('checkbox-range-end', {
+        ...e,
+        records: [...xTable.getCheckboxRecords(), ...xTable.getCheckboxReserveRecords()],
+      })
+    },
+  },
+}
+</script>
+
+<style lang="less"></style>

cmdb-ui/src/components/tools/UserMenu.vue

@@ -11,11 +11,38 @@
         <span class="common-settings-btn-text">{{ $t('settings') }}</span>
       </span>
       <a-popover
+        overlayClassName="lang-popover-wrap"
+        placement="bottomRight"
+        :getPopupContainer="(trigger) => trigger.parentNode"
+      >
+        <span class="locale">{{ languageList.find((lang) => lang.key === locale).title }}</span>
+        <div class="lang-menu" slot="content">
+          <a
+            v-for="(lang) in languageList"
+            :key="lang.key"
+            :class="['lang-menu-item', lang.key === locale ? 'lang-menu-item_active' : '']"
+            @click="changeLang(lang.key)"
+          >
+            {{ lang.title }}
+          </a>
+        </div>
+      </a-popover>
+      <a-popover
+        :overlayStyle="{ width: '130px' }"
         placement="bottomRight"
         overlayClassName="custom-user"
       >
         <template slot="content">
-          <UserPanel />
+          <router-link :to="{ name: 'setting_person' }" :style="{ color: '#000000a6' }">
+            <div class="custom-user-item">
+              <a-icon type="user" :style="{ marginRight: '10px' }" />
+              <span>{{ $t('topMenu.personalCenter') }}</span>
+            </div>
+          </router-link>
+          <div @click="handleLogout" class="custom-user-item">
+            <a-icon type="logout" :style="{ marginRight: '10px' }" />
+            <span>{{ $t('topMenu.logout') }}</span>
+          </div>
         </template>
         <span class="action ant-dropdown-link user-dropdown-menu user-info-wrap">
           <a-avatar
@@ -36,13 +63,11 @@
 import { mapState, mapActions, mapGetters, mapMutations } from 'vuex'
 import DocumentLink from './DocumentLink.vue'
 import { setDocumentTitle, domTitle } from '@/utils/domUtil'
-import UserPanel from './userPanel.vue'
 
 export default {
   name: 'UserMenu',
   components: {
     DocumentLink,
-    UserPanel
   },
   data() {
     return {

cmdb-ui/src/components/tools/userPanel.vue

@@ -1,487 +0,0 @@
-<template>
-  <div class="user-panel">
-    <a-avatar
-      class="user-panel-avatar"
-      size="small"
-      icon="user"
-      :src="avatarSrc"
-    />
-    <div class="user-panel-nickname">
-      {{ userInfo.nickname }}
-    </div>
-    <div class="user-panel-info">
-      <ops-icon
-        type="veops-company"
-        class="user-panel-info-icon"
-      />
-      <div class="user-panel-info-text">
-        {{ companyName }}
-      </div>
-    </div>
-    <div class="user-panel-info">
-      <ops-icon
-        type="veops-emails"
-        class="user-panel-info-icon"
-      />
-      <div class="user-panel-info-text">
-        {{ email }}
-      </div>
-    </div>
-
-    <div class="user-panel-btn">
-      <div
-        v-for="(item) in userBtnGroup"
-        :key="item.type"
-        class="user-panel-btn-item"
-        @click="clickBtnGroup(item.type)"
-      >
-        <ops-icon
-          :type="item.icon"
-          class="user-panel-btn-icon"
-        />
-        <span class="user-panel-btn-title">
-          {{ $t(item.title) }}
-        </span>
-      </div>
-    </div>
-
-    <div class="user-panel-row">
-      <div class="user-panel-row-label">
-        {{ $t('userPanel.switchLanguage') }}
-      </div>
-
-      <div class="user-panel-lang">
-        <div
-          v-for="(lang, index) in languageList"
-          :key="index"
-          :class="['user-panel-lang-item', lang.key === locale ? 'user-panel-lang-item_active' : '']"
-          @click="changeLang(lang.key)"
-        >
-          {{ lang.title }}
-        </div>
-      </div>
-    </div>
-
-    <div class="user-panel-row">
-      <div class="user-panel-row-label">
-        {{ $t('userPanel.bindAccount') }}
-      </div>
-
-      <div class="user-panel-bind">
-        <a-tooltip
-          v-for="(item) in bindList"
-          :key="item.type"
-          :title="$t(item.title)"
-        >
-          <ops-icon
-            class="user-panel-bind-item"
-            :type="userInfo.notice_info && userInfo.notice_info[item.type] ? item.existedIcon : item.icon"
-            @click="handleBindInfo(item.type)"
-          />
-        </a-tooltip>
-      </div>
-    </div>
-
-    <div class="user-panel-account">
-      <div
-        v-for="(item, index) in accountActions"
-        :key="index"
-        class="user-panel-account-item"
-        @click="handleLogout"
-      >
-        <ops-icon class="user-panel-account-icon" :type="item.icon" />
-        <span class="user-panel-account-title">
-          {{ $t(item.title) }}
-        </span>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import { mapActions, mapState, mapMutations } from 'vuex'
-import { setDocumentTitle, domTitle } from '@/utils/domUtil'
-import {
-  bindPlatformByUid,
-  unbindPlatformByUid,
-} from '@/api/employee'
-import { getCompanyInfo } from '@/api/company'
-
-export default {
-  name: 'UserPanel',
-  data() {
-    return {
-      userBtnGroup: [
-        {
-          icon: 'veops-personal',
-          title: 'userPanel.myProfile',
-          type: 'myProfile'
-        },
-        {
-          icon: 'a-veops-account1',
-          title: 'userPanel.accountPassword',
-          type: 'accountPassword'
-        }
-      ],
-      languageList: [
-        {
-          title: '简中',
-          key: 'zh'
-        },
-        {
-          title: 'EN',
-          key: 'en'
-        },
-      ],
-      bindList: [
-        {
-          type: 'wechatApp',
-          icon: 'qiyeweixin',
-          existedIcon: 'wechatApp',
-          title: 'wechat'
-        },
-        {
-          type: 'feishuApp',
-          icon: 'ops-setting-notice-feishu-selected',
-          existedIcon: 'feishuApp',
-          title: 'feishu'
-        },
-        {
-          type: 'dingdingApp',
-          icon: 'ops-setting-notice-dingding-selected',
-          existedIcon: 'dingdingApp',
-          title: 'dingding'
-        },
-      ],
-      accountActions: [
-        {
-          icon: 'veops-switch',
-          title: 'userPanel.switchAccount'
-        },
-        {
-          icon: 'veops-sign_out',
-          title: 'userPanel.logout'
-        },
-      ],
-      hoverBindAccountList: []
-    }
-  },
-  computed: {
-    ...mapState({
-      email: (state) => state.user.email,
-      locale: (state) => state.locale,
-      userInfo: (state) => state.user,
-      companyName: (state) => state.company.name
-    }),
-    avatarSrc() {
-      const avatar = this.userInfo.avatar
-      if (!avatar) {
-        return null
-      }
-
-      return avatar.startsWith('https') ? avatar : `/api/common-setting/v1/file/${avatar}`
-    }
-  },
-  mounted() {
-    if (this.companyName === undefined) {
-      this.getCompanyInfo()
-    }
-  },
-  methods: {
-    ...mapActions(['Logout', 'GetInfo']),
-    ...mapMutations(['SET_LOCALE', 'SET_COMPANY_NAME']),
-    async getCompanyInfo() {
-      const res = await getCompanyInfo()
-      const name = res?.info?.name || ''
-      this.SET_COMPANY_NAME(name)
-    },
-
-    changeLang(lang) {
-      this.SET_LOCALE(lang)
-      this.$i18n.locale = lang
-      this.$nextTick(() => {
-        setDocumentTitle(`${this.$t(this.$route.meta.title)} - ${domTitle}`)
-      })
-    },
-    handleBindInfo(platform) {
-      const isBind = this?.userInfo?.notice_info?.[platform]
-      const uid = this?.userInfo?.uid
-
-      if (isBind) {
-        this.$confirm({
-          title: this.$t('warning'),
-          content: this.$t('cs.person.confirmUnbind'),
-          onOk: () => {
-            unbindPlatformByUid(platform, uid)
-              .then(() => {
-                this.$message.success(this.$t('cs.person.unbindSuccess'))
-              })
-              .finally(() => {
-                this.GetInfo()
-              })
-          },
-        })
-      } else {
-        bindPlatformByUid(platform, uid)
-          .then(() => {
-            this.$message.success(this.$t('cs.person.bindSuccess'))
-          })
-          .finally(() => {
-            this.GetInfo()
-          })
-      }
-    },
-
-    handleLogout() {
-      this.$confirm({
-        title: this.$t('tip'),
-        content: this.$t('topMenu.confirmLogout'),
-        onOk: () => {
-          this.Logout()
-        },
-        onCancel() {},
-      })
-    },
-
-    clickBtnGroup(type) {
-      switch (type) {
-        case 'myProfile':
-          if (this.$route.name === 'setting_person') {
-            this.$bus.$emit('changeSettingPersonCurrent', '1')
-          } else {
-            this.$router.push({
-              name: 'setting_person',
-              query: {
-                current: '1'
-              }
-            })
-          }
-          break
-        case 'accountPassword':
-          if (this.$route.name === 'setting_person') {
-            this.$bus.$emit('changeSettingPersonCurrent', '2')
-          } else {
-            this.$router.push({
-              name: 'setting_person',
-              query: {
-                current: '2'
-              }
-            })
-          }
-          break
-        default:
-          break
-      }
-    },
-
-    handleBindAccountMouse(type, isHover) {
-      const index = this.hoverBindAccountList.findIndex((item) => item === type)
-      if (isHover && index === -1) {
-        this.hoverBindAccountList.push(type)
-      } else if (!isHover && index !== -1) {
-        this.hoverBindAccountList.splice(index, 1)
-      }
-    }
-  }
-}
-</script>
-
-<style lang="less" scoped>
-.user-panel {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  width: 350px;
-  padding: 0 20px;
-
-  &-avatar {
-    width: 62px;
-    height: 62px;
-    border-radius: 62px;
-    margin-top: 13px;
-
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    color: #000000;
-    background-color: #FFFFFF;
-    font-size: 48px !important;
-  }
-
-  &-nickname {
-    color: #1D2129;
-    font-size: 15px;
-    font-weight: 700;
-
-    max-width: 100%;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    text-wrap: nowrap;
-    margin-top: 8px;
-  }
-
-  &-info {
-    display: flex;
-    align-items: center;
-    column-gap: 6px;
-    margin-top: 6px;
-    max-width: 100%;
-
-    &-icon {
-      flex-shrink: 0;
-      font-size: 12px;
-    }
-
-    &-text {
-      font-size: 12px;
-      font-weight: 400;
-      color: #4E5969;
-
-      max-width: 100%;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      text-wrap: nowrap;
-    }
-  }
-
-  &-btn {
-    width: 100%;
-    height: 72px;
-    display: flex;
-    align-items: center;
-    margin-top: 11px;
-
-    &-icon {
-      font-size: 22px;
-      color: #CACDD9;
-    }
-
-    &-title {
-      font-size: 14px;
-      font-weight: 400;
-      color: #1D2129;
-      margin-top: 8px;
-    }
-
-    &-item {
-      flex: 1;
-      height: 100%;
-      display: flex;
-      flex-direction: column;
-      align-items: center;
-      justify-content: center;
-      background-color: #F7F8FA;
-      cursor: pointer;
-
-      &:hover {
-        background-color: #EBEFF8;
-
-        .user-panel-btn-icon {
-          color: #2F54EB;
-        }
-
-        .user-panel-btn-title {
-          color: #2F54EB;
-        }
-      }
-    }
-  }
-
-  &-row {
-    width: 100%;
-    margin-top: 22px;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-
-    &-label {
-      font-size: 14px;
-      font-weight: 400;
-      color: #4E5969;
-    }
-  }
-
-  &-lang {
-    display: flex;
-    align-items: center;
-    height: 28px;
-    width: 108px;
-    border-radius: 28px;
-    overflow: hidden;
-
-    &-item {
-      flex: 1;
-      height: 28px;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      background-color: #F7F8FA;
-      cursor: pointer;
-
-      &:first-child {
-        border-right: solid 1px #E4E7ED;
-      }
-
-      &_active {
-        background-color: #EBEFF8;
-        color: #2F54EB;
-      }
-
-      &:hover {
-        color: #2F54EB;
-      }
-    }
-  }
-
-  &-bind {
-    display: flex;
-    align-items: center;
-    column-gap: 22px;
-
-    &-item {
-      cursor: pointer;
-      font-size: 16px;
-    }
-  }
-
-  &-account {
-    margin-top: 22px;
-    padding-top: 13px;
-    padding-bottom: 20px;
-    border-top: solid 1px #F0F1F5;
-    display: flex;
-    align-items: center;
-    justify-content: space-evenly;
-    width: 100%;
-
-    &-icon {
-      font-size: 14px;
-      color: #CACDD9;
-    }
-
-    &-title {
-      font-size: 14px;
-      color: #86909C;
-      margin-left: 5px;
-    }
-
-    &-item {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      flex: 1;
-      cursor: pointer;
-
-      &:hover {
-        .user-panel-account-icon {
-          color: #2F54EB;
-        }
-
-        .user-panel-account-title {
-          color: #2F54EB;
-        }
-      }
-    }
-  }
-}
-</style>

cmdb-ui/src/lang/en.js

@@ -168,15 +168,6 @@ export default {
         monetaryAmount: 'monetary amount',
         custom: 'custom',
     },
-    userPanel: {
-      myProfile: 'My Profile',
-      accountPassword: 'Password',
-      notice: 'Notice',
-      switchLanguage: 'Switch Language',
-      bindAccount: 'Bind Account',
-      switchAccount: 'Switch Account',
-      logout: 'Logout'
-    },
     cmdb: cmdb_en,
     cs: cs_en,
     acl: acl_en,

cmdb-ui/src/lang/zh.js

@@ -168,15 +168,6 @@ export default {
         monetaryAmount: '货币金额',
         custom: '自定义',
     },
-    userPanel: {
-      myProfile: '个人中心',
-      accountPassword: '账号密码',
-      notice: '通知中心',
-      switchLanguage: '切换语言',
-      bindAccount: '绑定账号',
-      switchAccount: '切换账号',
-      logout: '退出账号'
-    },
     cmdb: cmdb_zh,
     cs: cs_zh,
     acl: acl_zh,

cmdb-ui/src/modules/acl/views/resource_types.vue

@@ -195,11 +195,11 @@ export default {
   background-color: #fff;
   height: calc(100vh - 64px);
   margin-bottom: -24px;
-  padding: 20px;
+  padding: 24px;
   .acl-resource-types-header {
     width: 100%;
     display: inline-flex;
-    margin-bottom: 20px;
+    margin-bottom: 15px;
     align-items: center;
   }
 }

cmdb-ui/src/modules/acl/views/resources.vue

@@ -358,11 +358,11 @@ export default {
   background-color: #fff;
   height: calc(100vh - 64px);
   margin-bottom: -24px;
-  padding: 8px 20px 20px 20px;
+  padding: 12px 24px 24px 24px;
   .acl-resources-header {
     width: 100%;
     display: inline-flex;
-    margin-bottom: 20px;
+    margin-bottom: 15px;
     align-items: center;
     justify-content: space-between;
     .ant-switch {

cmdb-ui/src/modules/acl/views/roles.vue

@@ -291,11 +291,11 @@ export default {
   background-color: #fff;
   height: calc(100vh - 64px);
   margin-bottom: -24px;
-  padding: 20px;
+  padding: 24px;
   .acl-roles-header {
     width: 100%;
     display: inline-flex;
-    margin-bottom: 20px;
+    margin-bottom: 15px;
     align-items: center;
     .ant-checkbox-wrapper {
       margin-left: auto;

cmdb-ui/src/modules/acl/views/trigger.vue

@@ -326,11 +326,11 @@ export default {
   background-color: #fff;
   height: calc(100vh - 64px);
   margin-bottom: -24px;
-  padding: 20px;
+  padding: 24px;
   .acl-trigger-header {
     width: 100%;
     display: inline-flex;
-    margin-bottom: 20px;
+    margin-bottom: 15px;
     align-items: center;
   }
 }

cmdb-ui/src/modules/cmdb/api/CIType.js

@@ -207,13 +207,6 @@ export function deleteTrigger(type_id, id) {
   })
 }
 
-export function testTrigger(type_id, id) {
-  return axios({
-    url: `/v0.1/ci_types/${type_id}/triggers/${id}/test_notify`,
-    method: 'post',
-  })
-}
-
 // CMDB的模型和实例的授权接口
 export function grantCiType(type_id, rid, data) {
   return axios({

cmdb-ui/src/modules/cmdb/api/dcim.js

@@ -1,93 +0,0 @@
-import { axios } from '@/utils/request'
-
-export function getDCIMTreeView(params) {
-  return axios({
-    url: '/v0.1/dcim/tree_view ',
-    method: 'GET',
-    params
-  })
-}
-
-export function getDCIMById(type, id) {
-  return axios({
-    url: `/v0.1/dcim/${type}/${id}`,
-    method: 'GET'
-  })
-}
-
-export function postDCIM(type, data) {
-  return axios({
-    url: `/v0.1/dcim/${type}`,
-    method: 'POST',
-    data
-  })
-}
-
-export function putDCIM(type, id, data) {
-  return axios({
-    url: `/v0.1/dcim/${type}/${id}`,
-    method: 'PUT',
-    data
-  })
-}
-
-export function deleteDCIM(type, id) {
-  return axios({
-    url: `/v0.1/dcim/${type}/${id}`,
-    method: 'DELETE',
-  })
-}
-
-export function getDCIMRacks(id, params) {
-  return axios({
-    url: `/v0.1/dcim/server_room/${id}/racks`,
-    method: 'GET',
-    params
-  })
-}
-
-export function postDevice(rackId, deviceId, data) {
-  return axios({
-    url: `/v0.1/dcim/rack/${rackId}/device/${deviceId}`,
-    method: 'POST',
-    data
-  })
-}
-
-export function deleteDevice(rackId, deviceId) {
-  return axios({
-    url: `/v0.1/dcim/rack/${rackId}/device/${deviceId}`,
-    method: 'DELETE'
-  })
-}
-
-export function putDevice(rackId, deviceId, data) {
-  return axios({
-    url: `/v0.1/dcim/rack/${rackId}/device/${deviceId}`,
-    method: 'PUT',
-    data
-  })
-}
-
-export function migrateDevice(rackId, deviceId, data) {
-  return axios({
-    url: `/v0.1/dcim/rack/${rackId}/device/${deviceId}/migrate`,
-    method: 'PUT',
-    data
-  })
-}
-
-export function getDCIMHistoryOperate(params) {
-  return axios({
-    url: `/v0.1/dcim/history/operate`,
-    method: 'GET',
-    params
-  })
-}
-
-export function calcUnitFreeCount() {
-  return axios({
-    url: `/v0.1/dcim/rack/calc_u_free_count`,
-    method: 'POST'
-  })
-}

cmdb-ui/src/modules/cmdb/api/ipam.js

@@ -1,109 +0,0 @@
-import { axios } from '@/utils/request'
-
-export function getIPAMSubnet() {
-  return axios({
-    url: '/v0.1/ipam/subnet',
-    method: 'GET'
-  })
-}
-
-export function postIPAMSubnet(data) {
-  return axios({
-    url: '/v0.1/ipam/subnet',
-    method: 'POST',
-    data
-  })
-}
-
-export function getIPAMSubnetById(id) {
-  return axios({
-    url: `/v0.1/ipam/subnet/${id}`,
-    method: 'GET'
-  })
-}
-
-export function putIPAMSubnet(id, data) {
-  return axios({
-    url: `/v0.1/ipam/subnet/${id}`,
-    method: 'PUT',
-    data
-  })
-}
-
-export function deleteIPAMSubnet(id) {
-  return axios({
-    url: `/v0.1/ipam/subnet/${id}`,
-    method: 'DELETE'
-  })
-}
-
-export function postIPAMScope(data) {
-  return axios({
-    url: '/v0.1/ipam/scope',
-    method: 'POST',
-    data
-  })
-}
-
-export function putIPAMScope(id, data) {
-  return axios({
-    url: `/v0.1/ipam/scope/${id}`,
-    method: 'PUT',
-    data
-  })
-}
-
-export function deleteIPAMScope(id) {
-  return axios({
-    url: `/v0.1/ipam/scope/${id}`,
-    method: 'DELETE'
-  })
-}
-
-export function getIPAMAddress(params) {
-  return axios({
-    url: '/v0.1/ipam/address',
-    method: 'GET',
-    params
-  })
-}
-
-export function getIPAMHosts(params) {
-  return axios({
-    url: '/v0.1/ipam/subnet/hosts',
-    method: 'GET',
-    params
-  })
-}
-
-export function postIPAMAddress(data) {
-  return axios({
-    url: '/v0.1/ipam/address',
-    method: 'POST',
-    data
-  })
-}
-
-export function getIPAMHistoryOperate(params) {
-  return axios({
-    url: '/v0.1/ipam/history/operate',
-    method: 'GET',
-    params
-  })
-}
-
-export function getIPAMHistoryScan(params) {
-  return axios({
-    url: '/v0.1/ipam/history/scan',
-    method: 'GET',
-    params
-  })
-}
-
-export function getIPAMStats(params) {
-  return axios({
-    url: '/v0.1/ipam/stats',
-    method: 'GET',
-    params
-  })
-}

cmdb-ui/src/modules/cmdb/api/preference.js

@@ -1,6 +1,4 @@
 import { axios } from '@/utils/request'
-import { CI_DEFAULT_ATTR } from '@/modules/cmdb/utils/const.js'
-import i18n from '@/lang'
 
 export function getPreference(instance = true, tree = null) {
   return axios({
@@ -18,34 +16,10 @@ export function getPreference2(instance = true, tree = null) {
   })
 }
 
-export function getSubscribeAttributes(ciTypeId, formatDefaultAttr = true) {
-  return new Promise(async (resolve) => {
-    const res = await axios({
-      url: `/v0.1/preference/ci_types/${ciTypeId}/attributes`,
-      method: 'GET'
-    })
-
-    if (
-      formatDefaultAttr &&
-      res?.attributes?.length
-    ) {
-      res.attributes.forEach((item) => {
-        switch (item.name) {
-          case CI_DEFAULT_ATTR.UPDATE_USER:
-            item.id = item.name
-            item.alias = i18n.t('cmdb.components.updater')
-            break
-          case CI_DEFAULT_ATTR.UPDATE_TIME:
-            item.id = item.name
-            item.alias = i18n.t('cmdb.components.updateTime')
-            break
-          default:
-            break
-        }
-      })
-    }
-
-    resolve(res)
+export function getSubscribeAttributes(ciTypeId) {
+  return axios({
+    url: `/v0.1/preference/ci_types/${ciTypeId}/attributes`,
+    method: 'GET'
   })
 }