fix merge conflict

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

@@ -49,7 +49,6 @@ class AuditCRUD(object):
 
     @staticmethod
     def get_current_operate_uid(uid=None):
-
         user_id = uid or (getattr(current_user, 'uid', None)) or getattr(current_user, 'user_id', None)
 
         if has_request_context() and request.headers.get('X-User-Id'):

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
               }
             }
           }

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
               }
             }
           }

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
               }
             }
           }

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]

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 {

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: {

cmdb-ui/src/modules/cmdb/views/operation_history/modules/typeTable.vue

@@ -60,7 +60,7 @@
       </vxe-column>
       <vxe-column field="type_id" title="模型" width="150px">
         <template #default="{ row }">
-          {{ row.operate_type === '删除模型' ? row.change.alias : row.type_id}}
+          {{ row.operate_type === '删除模型' ? row.change.alias : row.type_id }}
         </template>
       </vxe-column>
       <vxe-column field="changeDescription" title="描述">

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,

cmdb-ui/src/modules/cmdb/views/tree_views/index.vue

@@ -14,12 +14,16 @@
               }
             "
             class="cmdb-views-header-metadata"
-            ><a-icon type="info-circle" />
+          ><a-icon type="info-circle" />
             属性说明
           </span>
         </span>
-        <a-button size="small" icon="plus" type="primary" @click="$refs.create.handleOpen(true, 'create')"
-          >新建</a-button
+        <a-button
+          size="small"
+          icon="plus"
+          type="primary"
+          @click="$refs.create.handleOpen(true, 'create')"
+        >新建</a-button
         >
       </div>
       <SplitPane
@@ -231,10 +235,10 @@
                           margin: '2px',
                           ...getChoiceValueStyle(col, value),
                         }"
-                        ><ops-icon
-                          :style="{ color: getChoiceValueIcon(col, value).color }"
-                          :type="getChoiceValueIcon(col, value).name"
-                        />{{ value }}</span
+                      ><ops-icon
+                        :style="{ color: getChoiceValueIcon(col, value).color }"
+                        :type="getChoiceValueIcon(col, value).name"
+                      />{{ value }}</span
                       >
                     </template>
                     <span

cmdb-ui/src/views/setting/companyStructure/EmployeeModal.vue

@@ -382,9 +382,9 @@
         :style="{ display: 'inline-block', width: '98%', margin: '0 7px 24px' }"
         v-if="
           attributes.findIndex((v) => v == 'bank_card_number') !== -1 ||
-          attributes.findIndex((v) => v == 'bank_card_name') !== -1 ||
-          attributes.findIndex((v) => v == 'opening_bank') !== -1 ||
-          attributes.findIndex((v) => v == 'account_opening_location') !== -1
+            attributes.findIndex((v) => v == 'bank_card_name') !== -1 ||
+            attributes.findIndex((v) => v == 'opening_bank') !== -1 ||
+            attributes.findIndex((v) => v == 'account_opening_location') !== -1
         "
       >
         <a-row :gutter="[8, { xs: 8 }]">

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]

cmdb-ui/src/views/user/Login.vue

@@ -117,7 +117,7 @@ export default {
           const loginParams = { ...values }
           delete loginParams.username
           loginParams[!state.loginType ? 'email' : 'username'] = values.username
-          loginParams.password = appConfig.useEncryption?md5(values.password):values.password
+          loginParams.password = appConfig.useEncryption ? md5(values.password) : values.password
           Login(loginParams)
             .then((res) => this.loginSuccess(res))
             .finally(() => {

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