From 3071983d6b3ad6c6792648bb04840a6b65528931 Mon Sep 17 00:00:00 2001
From: pycook <pycook@126.com>
Date: Sat, 19 Aug 2023 12:43:55 +0800
Subject: [PATCH] version: 2.3.1
---
.../src/modules/acl/views/module/roleHistoryTable.vue | 2 +-
.../src/modules/acl/views/module/triggerHistoryTable.vue | 2 +-
.../operation_history/modules/triggerHistoryTable.vue | 2 +-
cmdb-ui/src/modules/cmdb/views/ci/index.vue | 6 +++---
cmdb-ui/src/modules/cmdb/views/discovery/index.vue | 2 +-
cmdb-ui/src/modules/cmdb/views/model_relation/index.vue | 2 +-
cmdb-ui/src/modules/cmdb/views/relation_views/index.vue | 2 +-
cmdb-ui/src/views/setting/components/employeeTable.vue | 3 +--
docker-compose.yml | 9 ++++-----
9 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/cmdb-ui/src/modules/acl/views/module/roleHistoryTable.vue b/cmdb-ui/src/modules/acl/views/module/roleHistoryTable.vue
index b11d559..10e9468 100644
--- a/cmdb-ui/src/modules/acl/views/module/roleHistoryTable.vue
+++ b/cmdb-ui/src/modules/acl/views/module/roleHistoryTable.vue
@@ -287,7 +287,7 @@ export default {
item.description += str
} else {
const str = ` 【 ${key} : 由 ${oldVal} 改为 ${newVal} 】 `
- item.description += ` 【 ${key} : 由 ${oldVal} 改为 ${newVal} 】 `
+ item.description += str
}
}
}
diff --git a/cmdb-ui/src/modules/acl/views/module/triggerHistoryTable.vue b/cmdb-ui/src/modules/acl/views/module/triggerHistoryTable.vue
index 7018efc..0c2bbcf 100644
--- a/cmdb-ui/src/modules/acl/views/module/triggerHistoryTable.vue
+++ b/cmdb-ui/src/modules/acl/views/module/triggerHistoryTable.vue
@@ -238,7 +238,7 @@ export default {
item.changeDescription += str
} else {
const str = ` 【 ${key} : 由 ${oldVal} 改为 ${newVal} 】 `
- item.changeDescription += ` 【 ${key} : 由 ${oldVal} 改为 ${newVal} 】 `
+ item.changeDescription += str
}
}
}
diff --git a/cmdb-ui/src/modules/acl/views/operation_history/modules/triggerHistoryTable.vue b/cmdb-ui/src/modules/acl/views/operation_history/modules/triggerHistoryTable.vue
index 75e5ed8..3ff9ac9 100644
--- a/cmdb-ui/src/modules/acl/views/operation_history/modules/triggerHistoryTable.vue
+++ b/cmdb-ui/src/modules/acl/views/operation_history/modules/triggerHistoryTable.vue
@@ -286,7 +286,7 @@ export default {
item.changeDescription += str
} else {
const str = ` 【 ${key} : 由 ${oldVal} 改为 ${newVal} 】 `
- item.changeDescription += ` 【 ${key} : 由 ${oldVal} 改为 ${newVal} 】 `
+ item.changeDescription += str
}
}
}
diff --git a/cmdb-ui/src/modules/cmdb/views/ci/index.vue b/cmdb-ui/src/modules/cmdb/views/ci/index.vue
index 1399b80..cfa03ae 100644
--- a/cmdb-ui/src/modules/cmdb/views/ci/index.vue
+++ b/cmdb-ui/src/modules/cmdb/views/ci/index.vue
@@ -550,7 +550,7 @@ export default {
.then(() => {
successNum += 1
})
- .catch((err) => {
+ .catch(() => {
errorNum += 1
})
.finally(() => {
@@ -584,7 +584,7 @@ export default {
.then(() => {
successNum += 1
})
- .catch((err) => {
+ .catch(() => {
errorNum += 1
})
.finally(() => {
@@ -685,7 +685,7 @@ export default {
},
onEnd: (params) => {
// 由于开启了虚拟滚动，newIndex和oldIndex是虚拟的
- const { newIndex, oldIndex, from, to } = params
+ const { newIndex, oldIndex } = params
// 从tableDragClassName拿到colid
const fromColid = this.tableDragClassName[oldIndex]
const toColid = this.tableDragClassName[newIndex]
diff --git a/cmdb-ui/src/modules/cmdb/views/discovery/index.vue b/cmdb-ui/src/modules/cmdb/views/discovery/index.vue
index a11e284..e2442fd 100644
--- a/cmdb-ui/src/modules/cmdb/views/discovery/index.vue
+++ b/cmdb-ui/src/modules/cmdb/views/discovery/index.vue
@@ -31,7 +31,7 @@
</template>
<script>
-import { getDiscovery, deleteDiscovery, downloadADR } from '../../api/discovery'
+import { getDiscovery, deleteDiscovery } from '../../api/discovery'
import DiscoveryCard from './discoveryCard.vue'
import EditDrawer from './editDrawer.vue'
export default {
diff --git a/cmdb-ui/src/modules/cmdb/views/model_relation/index.vue b/cmdb-ui/src/modules/cmdb/views/model_relation/index.vue
index 437167a..e383790 100644
--- a/cmdb-ui/src/modules/cmdb/views/model_relation/index.vue
+++ b/cmdb-ui/src/modules/cmdb/views/model_relation/index.vue
@@ -66,7 +66,7 @@ import ModelRelationTable from './modules/modelRelationTable.vue'
import { searchResourceType } from '@/modules/acl/api/resource'
import { getCITypeGroupsConfig } from '@/modules/cmdb/api/ciTypeGroup'
import { getCITypes } from '@/modules/cmdb/api/CIType'
-import { createRelation, deleteRelation, getCITypeChildren, getRelationTypes } from '@/modules/cmdb/api/CITypeRelation'
+import { createRelation, deleteRelation, getRelationTypes } from '@/modules/cmdb/api/CITypeRelation'
export default {
name: 'Index',
components: {
diff --git a/cmdb-ui/src/modules/cmdb/views/relation_views/index.vue b/cmdb-ui/src/modules/cmdb/views/relation_views/index.vue
index ca61e63..1ad13c9 100644
--- a/cmdb-ui/src/modules/cmdb/views/relation_views/index.vue
+++ b/cmdb-ui/src/modules/cmdb/views/relation_views/index.vue
@@ -594,7 +594,7 @@ export default {
this.calcColumns()
if (refreshType === 'refreshNumber') {
- const promises = this.treeKeys.map((key, index) => {
+ this.treeKeys.map((key, index) => {
statisticsCIRelation({
root_ids: key.split('%')[0],
level: this.treeKeys.length - index,
diff --git a/cmdb-ui/src/views/setting/components/employeeTable.vue b/cmdb-ui/src/views/setting/components/employeeTable.vue
index 35ee807..1f12865 100644
--- a/cmdb-ui/src/views/setting/components/employeeTable.vue
+++ b/cmdb-ui/src/views/setting/components/employeeTable.vue
@@ -802,7 +802,6 @@
import { mapState } from 'vuex'
import { getDepartmentName, getDirectorName } from '@/utils/util'
import Bus from '../companyStructure/eventBus/bus'
-import appConfig from '@/config/app'
import Sortable from 'sortablejs'
import XEUtils from 'xe-utils'
import { ops_move_icon as OpsMoveIcon } from '@/core/icons'
@@ -1179,7 +1178,7 @@ export default {
},
onEnd: (params) => {
// 由于开启了虚拟滚动，newIndex和oldIndex是虚拟的
- const { newIndex, oldIndex, from, to } = params
+ const { newIndex, oldIndex } = params
// 从tableDragClassName拿到colid
const fromColid = this.tableDragClassName[oldIndex]
const toColid = this.tableDragClassName[newIndex]
diff --git a/docker-compose.yml b/docker-compose.yml
index 049be9a..370a102 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -30,7 +30,7 @@ services:
- redis
cmdb-api:
- image: registry.cn-hangzhou.aliyuncs.com/veops/cmdb-api:3.0
+ image: registry.cn-hangzhou.aliyuncs.com/veops/cmdb-api:2.3.1
# build:
# context: .
# target: cmdb-api
@@ -44,14 +44,13 @@ services:
- |
sed -i "s#USE_ACL = False#USE_ACL = True#g" settings.py
/wait
- sleep 5
gunicorn --workers=3 autoapp:app -b 0.0.0.0:5000 -D
flask cmdb-init-cache
flask cmdb-init-acl
nohup flask cmdb-counter > counter.log 2>&1 &
- celery worker -A celery_worker.celery -E -Q one_cmdb_async --concurrency=2 -D
- celery worker -A celery_worker.celery -E -Q acl_async --concurrency=2
+ celery -A celery_worker.celery worker -E -Q one_cmdb_async --concurrency=2 -D
+ celery -A celery_worker.celery worker -E -Q acl_async --concurrency=2
depends_on:
- cmdb-db
- cmdb-cache
@@ -61,7 +60,7 @@ services:
- cmdb-api
cmdb-ui:
- image: registry.cn-hangzhou.aliyuncs.com/veops/cmdb-ui:3.0
+ image: registry.cn-hangzhou.aliyuncs.com/veops/cmdb-ui:2.3.1
# build:
# context: .
# target: cmdb-ui