conflect

Makefile

@@ -18,14 +18,14 @@ env:
 deps:
 	pipenv install --dev && \
 	pipenv run flask db-setup && \
-	pipenv run flask init-cache && \
+	pipenv run flask cmdb-init-cache && \
     cd cmdb-ui && yarn install && cd ..
 
 api:
 	cd cmdb-api && pipenv run flask run -h 0.0.0.0
 
 worker:
-	cd cmdb-api && pipenv run celery worker -A celery_worker.celery -E -Q cmdb_async --concurrency=1
+	cd cmdb-api && pipenv run celery worker -A celery_worker.celery -E -Q one_cmdb_async --concurrency=1 -D && pipenv run celery worker -A celery_worker.celery -E -Q acl_async --concurrency=1 -D
 
 ui:
 	cd cmdb-ui && yarn run serve

README.md

@@ -59,7 +59,7 @@
 
 ### 更多功能
 
-> 也欢迎移步[维易科技官网](https://www.veops.cn)，发现更多免费运维系统。
+> 也欢迎移步[维易科技官网](https://veops.cn)，发现更多免费运维系统。
 
 ## 接入公司
 

cmdb-api/Pipfile

@@ -39,7 +39,7 @@ kombu = "==4.4.0"
 # common setting
 Flask-APScheduler = "==1.12.4"
 timeout-decorator = "==0.5.0"
-numpy = "==1.18.5"
+numpy = "==1.21.5"
 pandas = "==1.3.2"
 WTForms = "==3.0.0"
 email-validator = "==1.3.1"

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

@@ -235,7 +235,7 @@ class CITypeGroupManager(object):
             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']).to_dict()
                 if resources is None or (ci_type and ci_type['name'] in resources):
-                    ci_type['permissions'] = resources[ci_type['name']]
+                    ci_type['permissions'] = resources[ci_type['name']] if resources is not None else None
                     group.setdefault("ci_types", []).append(ci_type)
                     group_types.add(t["type_id"])
 
@@ -244,7 +244,7 @@ class CITypeGroupManager(object):
             other_types = dict(ci_types=[])
             for ci_type in ci_types:
                 if ci_type["id"] not in group_types and (resources is None or ci_type['name'] in resources):
-                    ci_type['permissions'] = resources.get(ci_type['name'])
+                    ci_type['permissions'] = resources.get(ci_type['name']) if resources is not None else None
                     other_types['ci_types'].append(ci_type)
 
             groups.append(other_types)

cmdb-api/requirements.txt

@@ -47,7 +47,7 @@ meld3==2.0.1
 mistune==3.0.1
 more-itertools==5.0.0
 msgpack-python==0.5.6
-numpy==1.18.5
+numpy==1.21.5
 pandas==1.3.2
 Pillow==8.3.2
 pkgutil_resolve_name==1.3.10

cmdb-ui/src/modules/cmdb/views/ci_types/attributeEditForm.vue

@@ -172,7 +172,7 @@
         >
           <template slot="label">
             <span
-              style="position:relative;white-space:pre;"
+              style="position: relative; white-space: pre"
             >{{ `索引` }}
               <a-tooltip title="字段可被用于检索，加速查询">
                 <a-icon
@@ -204,7 +204,7 @@
         >
           <template slot="label">
             <span
-              style="position:relative;white-space:pre;"
+              style="position: relative; white-space: pre"
             >{{ `显示` }}
               <a-tooltip title="CI实例表格默认展示该字段">
                 <a-icon
@@ -250,7 +250,7 @@
         >
           <template slot="label">
             <span
-              style="position:relative;white-space:pre;"
+              style="position: relative; white-space: pre"
             >{{ `多值` }}
               <a-tooltip title="字段的值是1个或者多个，接口返回的值的类型是list">
                 <a-icon
@@ -316,7 +316,7 @@
           <a-form-item :label-col="{ span: 4 }" :wrapper-col="{ span: 20 }">
             <template slot="label">
               <span
-                style="position:relative;white-space:pre;"
+                style="position: relative; white-space: pre"
               >{{ `计算属性` }}
                 <a-tooltip
                   :title="