From f166824efbe9dc9f8da50efb6ef4293ddcf93e8e Mon Sep 17 00:00:00 2001
From: pycook <pycook@126.com>
Date: Mon, 26 Aug 2024 18:44:23 +0800
Subject: [PATCH] chore: release v2.4.11

---
 .../workflows/docker-build-and-release.yaml   | 62 +++++++++----------
 cmdb-api/api/lib/cmdb/cache.py                | 10 +--
 docker-compose.yml                            |  6 +-
 3 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/.github/workflows/docker-build-and-release.yaml b/.github/workflows/docker-build-and-release.yaml
index ace9cde..bea7bd3 100644
--- a/.github/workflows/docker-build-and-release.yaml
+++ b/.github/workflows/docker-build-and-release.yaml
@@ -5,9 +5,9 @@ on:
     branches:
       - master
     tags: ["v*"]
-  pull_request:
-    branches:
-      - master
+#  pull_request:
+#    branches:
+#      - master
 
 env:
   # Use docker.io for Docker Hub if empty
@@ -49,31 +49,31 @@ jobs:
           platforms: linux/amd64,linux/arm64
           push: true
           tags: ${{ env.REGISTRY_SERVER_ADDRESS }}/cmdb-api:${{ env.TAG }}
-  release-ui-images:
-    runs-on: ubuntu-latest
-    needs: [setup-environment]
-    permissions:
-      contents: read
-      packages: write
-    timeout-minutes: 90
-    steps:
-      - name: Checkout Repo
-        uses: actions/checkout@v4
-      - name: Login to GitHub Package Registry
-        uses: docker/login-action@v2
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      - name: Build and push CMDB-UI Docker image
-        uses: docker/build-push-action@v6
-        with:
-          file: docker/Dockerfile-UI
-          context: .
-          platforms: linux/amd64,linux/arm64
-          push: true
-          tags: ${{ env.REGISTRY_SERVER_ADDRESS }}/cmdb-ui:${{ env.TAG }}
\ No newline at end of file
+#  release-ui-images:
+#    runs-on: ubuntu-latest
+#    needs: [setup-environment]
+#    permissions:
+#      contents: read
+#      packages: write
+#    timeout-minutes: 90
+#    steps:
+#      - name: Checkout Repo
+#        uses: actions/checkout@v4
+#      - name: Login to GitHub Package Registry
+#        uses: docker/login-action@v2
+#        with:
+#          registry: ghcr.io
+#          username: ${{ github.repository_owner }}
+#          password: ${{ secrets.GITHUB_TOKEN }}
+#      - name: Set up QEMU
+#        uses: docker/setup-qemu-action@v3
+#      - name: Set up Docker Buildx
+#        uses: docker/setup-buildx-action@v3
+#      - name: Build and push CMDB-UI Docker image
+#        uses: docker/build-push-action@v6
+#        with:
+#          file: docker/Dockerfile-UI
+#          context: .
+#          platforms: linux/amd64,linux/arm64
+#          push: true
+#          tags: ${{ env.REGISTRY_SERVER_ADDRESS }}/cmdb-ui:${{ env.TAG }}
\ No newline at end of file
diff --git a/cmdb-api/api/lib/cmdb/cache.py b/cmdb-api/api/lib/cmdb/cache.py
index 4c939b1..8381787 100644
--- a/cmdb-api/api/lib/cmdb/cache.py
+++ b/cmdb-api/api/lib/cmdb/cache.py
@@ -8,7 +8,7 @@ import datetime
 import os
 import yaml
 from flask import current_app
-
+import json
 from api.extensions import cache
 from api.extensions import db
 from api.lib.cmdb.custom_dashboard import CustomDashboardManager
@@ -255,7 +255,7 @@ class CMDBCounterCache(object):
 
     @classmethod
     def set(cls, result):
-        cache.set(cls.KEY, result, timeout=0)
+        cache.set(cls.KEY, json.loads(json.dumps(result)), timeout=0)
 
     @classmethod
     def reset(cls):
@@ -277,7 +277,7 @@ class CMDBCounterCache(object):
 
         cls.set(result)
 
-        return result
+        return json.loads(json.dumps(result))
 
     @classmethod
     def update(cls, custom, flush=True):
@@ -299,7 +299,7 @@ class CMDBCounterCache(object):
             result[custom['id']] = res
             cls.set(result)
 
-        return res
+        return json.loads(json.dumps(res))
 
     @classmethod
     def relation_counter(cls, type_id, level, other_filer, type_ids):
@@ -418,7 +418,7 @@ class CMDBCounterCache(object):
                 return
             result[v] = dict()
             for i in (list(facet.values()) or [[]])[0]:
-                k = ValueTypeMap.serialize2[attr2value_type[0]](str(i[0]))
+                k = ValueTypeMap.serialize2[attr2value_type[1]](str(i[0]))
                 result[v][enum_map.get(k, k)] = i[1]
 
         if len(attr_ids) == 2:
diff --git a/docker-compose.yml b/docker-compose.yml
index 0423d0b..72ae4bd 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -41,7 +41,7 @@ services:
           - redis
 
   cmdb-api:
-    image: registry.cn-hangzhou.aliyuncs.com/veops/cmdb-api:2.4.10
+    image: registry.cn-hangzhou.aliyuncs.com/veops/cmdb-api:2.4.11
     container_name: cmdb-api
     env_file:
       - .env
@@ -71,7 +71,7 @@ services:
         flask cmdb-init-acl
         flask init-import-user-from-acl
         flask init-department
-        flask cmdb-patch -v 2.4.10
+        flask cmdb-patch -v 2.4.11
         flask cmdb-counter > counter.log 2>&1
     networks:
       new:
@@ -84,7 +84,7 @@ services:
       test: "ps aux|grep -v grep|grep -v '1 root'|grep gunicorn || exit 1"
 
   cmdb-ui:
-    image: registry.cn-hangzhou.aliyuncs.com/veops/cmdb-ui:2.4.10
+    image: registry.cn-hangzhou.aliyuncs.com/veops/cmdb-ui:2.4.11
     container_name: cmdb-ui
     depends_on:
       cmdb-api: