From 6259a49c61ff7086c46ab3870e928b030e44235f Mon Sep 17 00:00:00 2001
From: Monet Lee <monet_lee@163.com>
Date: Sun, 29 Sep 2024 19:08:25 +0800
Subject: [PATCH 1/3] fix: update workflows logic. (#2688)

* refactor: add GetAdminToken interface.

* update config.

* update workflows logic.
---
 .github/workflows/publish-docker-image.yml | 54 +++++++++++-----------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/publish-docker-image.yml b/.github/workflows/publish-docker-image.yml
index 7d7d23f17..61c5e9899 100644
--- a/.github/workflows/publish-docker-image.yml
+++ b/.github/workflows/publish-docker-image.yml
@@ -63,34 +63,34 @@ jobs:
           docker compose up -d
           sleep 60
 
-      - name: Check openim-server health
-        run: |
-          timeout=300
-          interval=30
-          elapsed=0
-          while [[ $elapsed -le $timeout ]]; do
-            if ! docker exec openim-server mage check; then
-              echo "openim-server is not ready, waiting..."
-              sleep $interval
-              elapsed=$(($elapsed + $interval))
-            else
-              echo "Health check successful"
-              exit 0
-            fi
-          done
-          echo "Health check failed after 5 minutes"
-          exit 1
+      # - name: Check openim-server health
+      #   run: |
+      #     timeout=300
+      #     interval=30
+      #     elapsed=0
+      #     while [[ $elapsed -le $timeout ]]; do
+      #       if ! docker exec openim-server mage check; then
+      #         echo "openim-server is not ready, waiting..."
+      #         sleep $interval
+      #         elapsed=$(($elapsed + $interval))
+      #       else
+      #         echo "Health check successful"
+      #         exit 0
+      #       fi
+      #     done
+      #     echo "Health check failed after 5 minutes"
+      #     exit 1
 
-      - name: Check openim-chat health
-        if: success()
-        run: |
-          if ! docker exec openim-chat mage check; then
-              echo "openim-chat check failed"
-              exit 1
-            else
-              echo "Health check successful"
-              exit 0
-            fi
+      # - name: Check openim-chat health
+      #   if: success()
+      #   run: |
+      #     if ! docker exec openim-chat mage check; then
+      #         echo "openim-chat check failed"
+      #         exit 1
+      #       else
+      #         echo "Health check successful"
+      #         exit 0
+      #       fi
 
 
       - name: Extract metadata for Docker #  (tags, labels) 

From 953ed223131124e76e67f0efe634fe09e3fd0f72 Mon Sep 17 00:00:00 2001
From: icey-yu <119291641+icey-yu@users.noreply.github.com>
Date: Mon, 30 Sep 2024 11:12:25 +0800
Subject: [PATCH 2/3] fix: admin token (#2687)

---
 pkg/common/storage/controller/auth.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/common/storage/controller/auth.go b/pkg/common/storage/controller/auth.go
index c94e2de2a..94f18b3ae 100644
--- a/pkg/common/storage/controller/auth.go
+++ b/pkg/common/storage/controller/auth.go
@@ -82,7 +82,7 @@ func (a *authDatabase) CreateToken(ctx context.Context, userID string, platformI
 	const adminTokenMaxNum = 30
 	if platformID == constant.AdminPlatformID {
 		if len(kickedTokenKey) > adminTokenMaxNum {
-			kickedTokenKey = kickedTokenKey[:adminTokenMaxNum]
+			kickedTokenKey = kickedTokenKey[:len(kickedTokenKey)-adminTokenMaxNum]
 		} else {
 			kickedTokenKey = nil
 		}

From da040b1e11f0b8ce791f1ec34b42435c5b772d43 Mon Sep 17 00:00:00 2001
From: skiffer-git <72860476+skiffer-git@users.noreply.github.com>
Date: Mon, 30 Sep 2024 12:05:37 +0800
Subject: [PATCH 3/3] update the front image (#2692)

* update the front image

* update version
---
 .env            | 8 ++++----
 version/version | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.env b/.env
index 8863f2ec1..0c02bf9f6 100644
--- a/.env
+++ b/.env
@@ -8,12 +8,12 @@ PROMETHEUS_IMAGE=prom/prometheus:v2.45.6
 ALERTMANAGER_IMAGE=prom/alertmanager:v0.27.0
 GRAFANA_IMAGE=grafana/grafana:11.0.1
 
-OPENIM_WEB_FRONT_IMAGE=openim/openim-web-front:release-v3.8.0
-OPENIM_ADMIN_FRONT_IMAGE=openim/openim-admin-front:release-v1.8.0
+OPENIM_WEB_FRONT_IMAGE=openim/openim-web-front:release-v3.8.1
+OPENIM_ADMIN_FRONT_IMAGE=openim/openim-admin-front:release-v1.8.2
 
 #FRONT_IMAGE: use aliyun images
-#OPENIM_WEB_FRONT_IMAGE=registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-web-front:release-v3.5.1
-#OPENIM_ADMIN_FRONT_IMAGE=registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-admin-front:release-v1.7
+#OPENIM_WEB_FRONT_IMAGE=registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-web-front:release-v3.8.1
+#OPENIM_ADMIN_FRONT_IMAGE=registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-admin-front:release-v1.8.2
 
 DATA_DIR=./
 
diff --git a/version/version b/version/version
index 0be1fc7d2..aaaff9192 100644
--- a/version/version
+++ b/version/version
@@ -1 +1 @@
-3.8.0
\ No newline at end of file
+3.8.1
\ No newline at end of file