feat: fix scripts

Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com>

.github/sync.yml

@@ -94,9 +94,6 @@ group:
       - source: .github/workflows/cla.yml
         dest: .github/workflows/cla.yml
         replace: false
-      - source: .github/workflows/
-        dest: .github/workflows/
-        replace: false
       - source: .github/workflows/auto-assign-issue.yml
         dest: .github/workflows/auto-assign-issue.yml
         replace: false

.github/workflows/check-coverage.yml

@@ -1,45 +1,45 @@
-# name: Check-Coverage
+name: Check-Coverage
 
-# on:
-#   workflow_dispatch:
-#   push:
-#     branches: [ "main" ]
-#     paths-ignore:
-#       - "docs/**"
-#       - "**/*.md"
-#       - "**/*.yaml"
-#       - "CONTRIBUTORS"
-#       - "CHANGELOG/**"
-#   pull_request:
-#     branches: [ "*" ]
-#     paths-ignore:
-#       - "docs/**"
-#       - "**/*.md"
-#       - "**/*.yaml"
-#       - "CONTRIBUTORS"
-#       - "CHANGELOG/**"
-# env:
-#   # Common versions
-#   GO_VERSION: "1.20"
+on:
+  workflow_dispatch:
+  push:
+    branches: [ "main" ]
+    paths-ignore:
+      - "docs/**"
+      - "**/*.md"
+      - "**/*.yaml"
+      - "CONTRIBUTORS"
+      - "CHANGELOG/**"
+  pull_request:
+    branches: [ "*" ]
+    paths-ignore:
+      - "docs/**"
+      - "**/*.md"
+      - "**/*.yaml"
+      - "CONTRIBUTORS"
+      - "CHANGELOG/**"
+env:
+  # Common versions
+  GO_VERSION: "1.20"
 
-# jobs:
-#   coverage:
-#     runs-on: ubuntu-20.04
-#     steps:
-#       - name: Checkout
-#         uses: actions/checkout@v3
+jobs:
+  coverage:
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
 
-#       - name: Setup Golang with cache
-#         uses: magnetikonline/action-golang-cache@v3
-#         with:
-#           go-version: ${{ env.GO_VERSION }}
-#           token: ${{ secrets.BOT_GITHUB_TOKEN }}
+      - name: Setup Golang with cache
+        uses: magnetikonline/action-golang-cache@v3
+        with:
+          go-version: ${{ env.GO_VERSION }}
 
-#       - name: Install Dependencies
-#         run: sudo apt update && sudo apt install -y libgpgme-dev libbtrfs-dev libdevmapper-dev
+      - name: Install Dependencies
+        run: sudo apt update && sudo apt install -y libgpgme-dev libbtrfs-dev libdevmapper-dev
 
-#       - name: Run Cover
-#         run: make cover
+      - name: Run Cover
+        run: make cover
+        continue-on-error: true
 
-#       - name: Upload Coverage to Codecov
-#         uses: codecov/codecov-action@v3
+      - name: Upload Coverage to Codecov
+        uses: codecov/codecov-action@v3

.github/workflows/cla.yml

@@ -41,7 +41,7 @@ jobs:
           remote-repository-name: ${{ env.REMOTE_REPOSITORY }}
 
           create-file-commit-message: '📚 Docs: Creating file for storing ${{ github.event.repository.name }} CLA Signatures'
-          custom-notsigned-prcomment: '💕 Thank you for your contribution and please kindly read and sign our [🎯https://github.com/openim-sigs/cla/blob/main/README.md](https://github.com/openim-sigs/cla/blob/main/README.md) <br> '
+          custom-notsigned-prcomment: '💕 Thank you for your contribution and please kindly read and sign our [🎯https://github.com/openim-sigs/cla/blob/main/README.md](https://github.com/openim-sigs/cla/blob/main/README.md). <br> If you wish to sign the CRA, **please comment on this sentence:**'
           custom-pr-sign-comment: 'I have read the CLA Document and I hereby sign the CLA'
           custom-allsigned-prcomment: '🤖 All Contributors have signed the [${{ github.event.repository.name }} CLA](https://github.com/openim-sigs/cla/blob/main/README.md).<br> The signed information is recorded [🤖here](https://github.com/openim-sigs/cla/tree/main/signatures/${{ env.OPEN_IM_SERVER_ALLOWLIST }}/cla.json)'
         #   lock-pullrequest-aftermerge: false - if you don't want this bot to automatically lock the pull request after merging (default - true)

.github/workflows/e2e-test.yml

@@ -1,2 +1,2 @@
+# name: OpenIM e2e Test
 
-# name: OpenIM e2e Test

.github/workflows/openimci.yml

@@ -90,11 +90,19 @@ jobs:
           echo "Run unit test and get test coverage successfully" 
         continue-on-error: true
 
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v2
+        with:
+          languages: go
+
       - name: Build source code for host platform
         run: |
           sudo make build
           echo "Build source code for host platform successfully" 
 
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v2
+
       - name: OpenIM verify copyright
         run: |
           sudo make verify-copyright

.golangci.yml

@@ -58,6 +58,7 @@ run:
   skip-files:
     - ".*\\.my\\.go$"
     - _test.go
+    - ".*\\.pb\\.go"
 
   # by default isn't set. If set we pass it to "go list -mod={option}". From "go help modules":
   # If invoked with -mod=readonly, the go command is disallowed from the implicit

internal/api/msg.go

@@ -250,7 +250,6 @@ func (m *MessageApi) BatchSendMsg(c *gin.Context) {
 		return
 	}
 
-
 	var recvIDs []string
 	var err error
 	if req.IsSendAll {

internal/msggateway/hub_server.go

@@ -16,6 +16,7 @@ package msggateway
 
 import (
 	"context"
+
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/cache"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/tokenverify"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/errs"

internal/push/offlinepush/offlinepush_interface.go

@@ -18,12 +18,12 @@ import (
 	"context"
 )
 
-// OfflinePusher Offline Pusher
+// OfflinePusher Offline Pusher.
 type OfflinePusher interface {
 	Push(ctx context.Context, userIDs []string, title, content string, opts *Opts) error
 }
 
-// Opts opts
+// Opts opts.
 type Opts struct {
 	Signal        *Signal
 	IOSPushSound  string
@@ -31,7 +31,7 @@ type Opts struct {
 	Ex            string
 }
 
-// Signal message id
+// Signal message id.
 type Signal struct {
 	ClientMsgID string
 }

internal/rpc/msg/send.go

@@ -16,6 +16,7 @@ package msg
 
 import (
 	"context"
+
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/constant"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/log"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/mcontext"

scripts/build.cmd

@@ -1,11 +1,12 @@
-go build -o api.exe ../cmd/openim-api/main.go
-go build -o auth.exe ../cmd/openim-rpc/openim-rpc-auth/main.go
-go build -o conversation.exe ../cmd/openim-rpc/openim-rpc-conversation/main.go
-go build -o friend.exe ../cmd/openim-rpc/openim-rpc-friend/main.go
-go build -o group.exe ../cmd/openim-rpc/openim-rpc-group/main.go
-go build -o msg.exe ../cmd/openim-rpc/openim-rpc-msg/main.go
-go build -o third.exe ../cmd/openim-rpc/openim-rpc-third/main.go
-go build -o user.exe ../cmd/openim-rpc/openim-rpc-user/main.go
-go build -o push.exe ../cmd/openim-push/main.go
-go build -o msgtransfer.exe ../cmd/openim-msgtransfer/main.go
-go build -o msggateway.exe ../cmd/openim-msggateway/main.go
+set output_dir=%~dp0..\_output\bin\platforms\windows
+go build -o %output_dir%\api.exe ../cmd/openim-api/main.go
+go build -o %output_dir%\auth.exe ../cmd/openim-rpc/openim-rpc-auth/main.go
+go build -o %output_dir%\conversation.exe ../cmd/openim-rpc/openim-rpc-conversation/main.go
+go build -o %output_dir%\friend.exe ../cmd/openim-rpc/openim-rpc-friend/main.go
+go build -o %output_dir%\group.exe ../cmd/openim-rpc/openim-rpc-group/main.go
+go build -o %output_dir%\msg.exe ../cmd/openim-rpc/openim-rpc-msg/main.go
+go build -o %output_dir%\third.exe ../cmd/openim-rpc/openim-rpc-third/main.go
+go build -o %output_dir%\user.exe ../cmd/openim-rpc/openim-rpc-user/main.go
+go build -o %output_dir%\push.exe ../cmd/openim-push/main.go
+go build -o %output_dir%\msgtransfer.exe ../cmd/openim-msgtransfer/main.go
+go build -o %output_dir%\msggateway.exe ../cmd/openim-msggateway/main.go

scripts/start_all.sh

@@ -36,7 +36,7 @@ echo -e "${YELLOW_PREFIX}=======>SCRIPTS_ROOT=$SCRIPTS_ROOT${COLOR_SUFFIX}"
 echo -e "${YELLOW_PREFIX}=======>OPENIM_ROOT=$OPENIM_ROOT${COLOR_SUFFIX}"
 echo -e "${YELLOW_PREFIX}=======>pwd=$PWD${COLOR_SUFFIX}"
 
-bin_dir="$BIN_DIR"
+bin_dir="$OPENIM_ROOT/_output/bin"
 logs_dir="$OPENIM_ROOT/logs"
 sdk_db_dir="$OPENIM_ROOT/sdk/db/"