From 167c3136ee83cb546411a0afe7794143ee60cc06 Mon Sep 17 00:00:00 2001
From: "Xinwei Xiong(cubxxw-openim)" <3293172751nss@gmail.com>
Date: Sat, 5 Aug 2023 11:58:16 +0800
Subject: [PATCH] feat: fix scripts and build speed

Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com>
---
 .github/workflows/scripts-test.yml | 7 +++++--
 docker-compose.yaml                | 4 ++--
 pkg/common/db/controller/user.go   | 4 ++--
 scripts/msg_gateway_start.sh       | 1 -
 scripts/msg_transfer_start.sh      | 1 -
 scripts/push_start.sh              | 1 -
 scripts/start_all.sh               | 1 -
 scripts/start_cron.sh              | 1 -
 scripts/stop_all.sh                | 1 -
 9 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/scripts-test.yml b/.github/workflows/scripts-test.yml
index 0f98197e0..44b217c59 100644
--- a/.github/workflows/scripts-test.yml
+++ b/.github/workflows/scripts-test.yml
@@ -40,10 +40,13 @@ jobs:
     - name: Checkout code
       uses: actions/checkout@v3
 
+    - name: Download Docker Compose
+      run: |
+        curl -o docker-compose.yaml https://gist.githubusercontent.com/cubxxw/b1d5cbd2edfa23fee911118aa3e8249e/raw/openim-server.sh
+      shell: bash
+
     - name: Start Docker Compose
       run: |
-        sudo docker compose stop
-        sudo sleep 30
         sudo docker compose up -d
         sudo sleep 60
       continue-on-error: true
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 74eafd66c..6c9370b74 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -100,7 +100,7 @@ services:
 
 
   openim_server:
-    image: ghcr.io/openim-sigs/openim-server:v1.0.0-debug.11 #ghcr.io/openimsdk/openim-server:main
+    image: ghcr.io/openimsdk/openim-server:main
     container_name: openim-server
     volumes:
       - ./logs:/openim/openim-server/logs
@@ -122,7 +122,7 @@ services:
         max-file: "2"
 
   openim-chat:
-    image: ghcr.io/openim-sigs/openim-chat:v1.0.0-debug.11 # ghcr.io/openimsdk/openim-chat:main
+    image: ghcr.io/openimsdk/openim-chat:main
     container_name: openim-chat
     volumes:
       - ./_output/openim/openim-chat/logs:/openim/openim-chat/logs
diff --git a/pkg/common/db/controller/user.go b/pkg/common/db/controller/user.go
index 992cc87e3..6981afd40 100644
--- a/pkg/common/db/controller/user.go
+++ b/pkg/common/db/controller/user.go
@@ -16,10 +16,10 @@ package controller
 
 import (
 	"context"
-	unRelationTb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/unrelation"
-	"github.com/OpenIMSDK/protocol/user"
+	"time"
 
 	unRelationTb "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/unrelation"
+	"github.com/OpenIMSDK/protocol/user"
 
 	"github.com/OpenIMSDK/tools/errs"
 	"github.com/OpenIMSDK/tools/tx"
diff --git a/scripts/msg_gateway_start.sh b/scripts/msg_gateway_start.sh
index cc6f0b5dd..49d84fac5 100755
--- a/scripts/msg_gateway_start.sh
+++ b/scripts/msg_gateway_start.sh
@@ -30,7 +30,6 @@ echo -e "${YELLOW_PREFIX}=======>pwd=$PWD${COLOR_SUFFIX}"
 
 bin_dir="$BIN_DIR"
 logs_dir="$OPENIM_ROOT/logs"
-sdk_db_dir="$OPENIM_ROOT/sdk/db/"
 
 ulimit -n 200000
 
diff --git a/scripts/msg_transfer_start.sh b/scripts/msg_transfer_start.sh
index 7221ffa49..46c077c5d 100755
--- a/scripts/msg_transfer_start.sh
+++ b/scripts/msg_transfer_start.sh
@@ -28,7 +28,6 @@ echo -e "${YELLOW_PREFIX}=======>pwd=$PWD${COLOR_SUFFIX}"
 
 bin_dir="$BIN_DIR"
 logs_dir="$OPENIM_ROOT/logs"
-sdk_db_dir="$OPENIM_ROOT/sdk/db/"
 
 cd $OPENIM_ROOT
 
diff --git a/scripts/push_start.sh b/scripts/push_start.sh
index 6b26c3022..b474e1b99 100755
--- a/scripts/push_start.sh
+++ b/scripts/push_start.sh
@@ -32,7 +32,6 @@ echo -e "${YELLOW_PREFIX}=======>pwd=$PWD${COLOR_SUFFIX}"
 
 bin_dir="$BIN_DIR"
 logs_dir="$OPENIM_ROOT/logs"
-sdk_db_dir="$OPENIM_ROOT/sdk/db/"
 
 cd "$OPENIM_ROOT/scripts/"
 
diff --git a/scripts/start_all.sh b/scripts/start_all.sh
index 87363c547..b6b4e3428 100755
--- a/scripts/start_all.sh
+++ b/scripts/start_all.sh
@@ -38,7 +38,6 @@ fi
 
 bin_dir="$OPENIM_ROOT/_output/bin"
 logs_dir="$OPENIM_ROOT/logs"
-sdk_db_dir="$OPENIM_ROOT/sdk/db/"
 
 if [ ! -d "$bin_dir" ]; then
     mkdir -p "$bin_dir"
diff --git a/scripts/start_cron.sh b/scripts/start_cron.sh
index 2f27801be..5be85dbfe 100755
--- a/scripts/start_cron.sh
+++ b/scripts/start_cron.sh
@@ -30,7 +30,6 @@ echo -e "${YELLOW_PREFIX}=======>pwd=$PWD${COLOR_SUFFIX}"
 
 bin_dir="$BIN_DIR"
 logs_dir="$OPENIM_ROOT/logs"
-sdk_db_dir="$OPENIM_ROOT/sdk/db/"
 
 #Check if the service exists
 #If it is exists,kill this process
diff --git a/scripts/stop_all.sh b/scripts/stop_all.sh
index 4fd327407..51502171d 100755
--- a/scripts/stop_all.sh
+++ b/scripts/stop_all.sh
@@ -23,7 +23,6 @@ source $OPENIM_ROOT/scripts/path_info.sh
 
 bin_dir="$BIN_DIR"
 logs_dir="$OPENIM_ROOT/logs"
-sdk_db_dir="$OPENIM_ROOT/sdk/db/"
 
 cd "$SCRIPTS_ROOT"