From c918d54ea552416a4e44d87743ed05fa761530b8 Mon Sep 17 00:00:00 2001 From: pycook Date: Tue, 12 Dec 2023 11:09:32 +0800 Subject: [PATCH 1/5] perf(api): ci delete (#297) --- cmdb-api/api/lib/cmdb/ci.py | 6 +++--- cmdb-api/settings.example.py | 1 + docker-compose.yml | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/cmdb-api/api/lib/cmdb/ci.py b/cmdb-api/api/lib/cmdb/ci.py index 1876a8f..74d18c1 100644 --- a/cmdb-api/api/lib/cmdb/ci.py +++ b/cmdb-api/api/lib/cmdb/ci.py @@ -514,9 +514,9 @@ class CIManager(object): ci_delete_trigger.apply_async(args=(trigger, OperateType.DELETE, ci_dict), queue=CMDB_QUEUE) attrs = CITypeAttribute.get_by(type_id=ci.type_id, to_dict=False) - attr_names = set([AttributeCache.get(attr.attr_id).name for attr in attrs]) - for attr_name in attr_names: - value_table = TableMap(attr_name=attr_name).table + attrs = [AttributeCache.get(attr.attr_id) for attr in attrs] + for attr in attrs: + value_table = TableMap(attr=attr).table for item in value_table.get_by(ci_id=ci_id, to_dict=False): item.delete(commit=False) diff --git a/cmdb-api/settings.example.py b/cmdb-api/settings.example.py index 9e4a1e1..d734473 100644 --- a/cmdb-api/settings.example.py +++ b/cmdb-api/settings.example.py @@ -68,6 +68,7 @@ ONCE = { } # # SSO +AUTH_WITH_CAS = False CAS_SERVER = "http://sso.xxx.com" CAS_VALIDATE_SERVER = "http://sso.xxx.com" CAS_LOGIN_ROUTE = "/cas/built-in/cas/login" diff --git a/docker-compose.yml b/docker-compose.yml index 282cc63..9465697 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -48,9 +48,9 @@ services: /wait flask db-setup flask common-check-new-columns - gunicorn --workers=3 autoapp:app -b 0.0.0.0:5000 -D + gunicorn --workers=8 autoapp:app -b 0.0.0.0:5000 -D - celery -A celery_worker.celery worker -E -Q one_cmdb_async --autoscale=5,2 --logfile=one_cmdb_async.log -D + celery -A celery_worker.celery worker -E -Q one_cmdb_async --autoscale=8,2 --logfile=one_cmdb_async.log -D celery -A celery_worker.celery worker -E -Q acl_async --logfile=one_acl_async.log --concurrency=2 -D nohup flask cmdb-trigger > trigger.log 2>&1 & From cd319421d56203c143ae1c8fb5b93df522a56e91 Mon Sep 17 00:00:00 2001 From: wang-liang0615 <53748875+wang-liang0615@users.noreply.github.com> Date: Tue, 12 Dec 2023 13:38:08 +0800 Subject: [PATCH 2/5] pref(cmdb-ui):batch upload for date type (#298) * fix(cmdb-ui):set localstorage '' after unsubscribe ci * pref(cmdb-ui):batch upload for date type --- cmdb-ui/src/modules/cmdb/api/batch.js | 3 +-- cmdb-ui/src/modules/cmdb/views/batch/index.vue | 17 +++++++++++++++++ .../cmdb/views/batch/modules/CiUploadTable.vue | 1 + .../modules/cmdb/views/ci_types/triggerForm.vue | 2 +- 4 files changed, 20 insertions(+), 3 deletions(-) diff --git a/cmdb-ui/src/modules/cmdb/api/batch.js b/cmdb-ui/src/modules/cmdb/api/batch.js index c37efc5..19f6143 100644 --- a/cmdb-ui/src/modules/cmdb/api/batch.js +++ b/cmdb-ui/src/modules/cmdb/api/batch.js @@ -7,7 +7,7 @@ export function processFile(fileObj) { reader.readAsBinaryString(fileObj) reader.onload = function (e) { const data = e.target.result - const workbook = XLSX.read(data, { type: 'binary' }) + const workbook = XLSX.read(data, { type: 'binary', cellDates: true, }) const sheet = workbook.Sheets[workbook.SheetNames[0]] const lt = XLSX.utils.sheet_to_json(sheet, { header: 1 }) resolve(lt) @@ -56,7 +56,6 @@ export function any(ArrayList) { // 去除一个二维数组 底下为空的部分 export function filterNull(twoDimArray) { - console.log(twoDimArray) const newArray = [] for (let i = 0; i < twoDimArray.length; i++) { if (any(twoDimArray[i])) { diff --git a/cmdb-ui/src/modules/cmdb/views/batch/index.vue b/cmdb-ui/src/modules/cmdb/views/batch/index.vue index 1a4010f..f48f698 100644 --- a/cmdb-ui/src/modules/cmdb/views/batch/index.vue +++ b/cmdb-ui/src/modules/cmdb/views/batch/index.vue @@ -29,6 +29,7 @@