refactor(other): merge v1.3.0 to v1.4.0 #3564

dbm-ui/backend/db_services/mysql/open_area/handlers.py

@@ -18,8 +18,8 @@
 from backend.components import DBPrivManagerApi
 from backend.db_meta.enums import ClusterType
 from backend.db_meta.models import Cluster
+from backend.db_services.dbpermission.constants import AccountType
 from backend.db_services.mysql.open_area.models import TendbOpenAreaConfig
-from backend.db_services.mysql.permission.constants import AccountType
 from backend.db_services.mysql.remote_service.handlers import RemoteServiceHandler
 
 
@@ -122,7 +122,9 @@ def __get_openarea_rules_set(cls, config, config_data, operator, cluster_id__clu
         if not priv_ids:
             return []
 
-        account_type = AccountType.TENDB if config.cluster_type == ClusterType.TenDBCluster else AccountType.MYSQL
+        account_type = (
+            AccountType.TENDBCLUSTER if config.cluster_type == ClusterType.TenDBCluster else AccountType.MYSQL
+        )
         authorize_rules = DBPrivManagerApi.list_account_rules(
             {"bk_biz_id": config.bk_biz_id, "ids": priv_ids, "cluster_type": account_type}
         )

dbm-ui/backend/db_services/mysql/permission/db_account/handlers.py

@@ -24,6 +24,7 @@ class MySQLAccountHandler(AccountHandler):
     """
     封装账号相关的处理操作
     """
+
     def has_high_risk_privileges(self, rule_sets):
         """
         - 判断是否有高危权限

dbm-ui/backend/flow/utils/mysql/mysql_db_meta.py

@@ -13,6 +13,7 @@
 
 from django.db.transaction import atomic
 
+from backend.components import DBPrivManagerApi
 from backend.components.mysql_partition.client import DBPartitionApi
 from backend.configuration.constants import DBType
 from backend.db_meta import api