docs: add readme docs

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

.github/workflows/build-docker-image.yml

@@ -29,31 +29,30 @@ jobs:
       - name: Check out the repo
         uses: actions/checkout@v3
 
-# docker.io/openim/openim-server:latest
       - name: Log in to Docker Hub
-        uses: docker/login-action@v2
+        uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@v4.6.0
+        uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
         with:
           images: openim/openim-server
           tags: latest
 
       - name: Build and push Docker image
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
         with:
           context: .
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
 
-# registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-server:latest
+
       - name: Log in to AliYun Docker Hub
-        uses: docker/login-action@v2
+        uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
         with:
           registry: registry.cn-hangzhou.aliyuncs.com
           username: ${{ secrets.ALIREGISTRY_USERNAME }}
@@ -61,42 +60,19 @@ jobs:
       
       - name: Extract metadata (tags, labels) for Docker
         id: meta2
-        uses: docker/metadata-action@v4.6.0
+        uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
         with:
           images: registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-server
           tags: latest
       
       - name: Build and push Docker image
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
         with:
           context: .
           push: true
           tags: ${{ steps.meta2.outputs.tags }}
           labels: ${{ steps.meta2.outputs.labels }}
 
-# ghcr.io/openim/openim-server:latest
-      - name: Log in to GitHub Container Registry
-        uses: docker/login-action@v2
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Extract metadata (tags, labels) for Docker
-        id: meta3
-        uses: docker/metadata-action@v4.6.0
-        with:
-          images: openim/openim-server
-          tags: latest
-
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v4
-        with:
-          context: .
-          push: true
-          tags: ${{ steps.meta3.outputs.tags }}
-          labels: ${{ steps.meta3.outputs.labels }}
-
 # name: OpenIM Build Docker Images
 # on:
 #   push:

.github/workflows/deploy.yml

@@ -12,52 +12,48 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-name: OpenIM Deploy for dev
+name: deploy for dev
 
 on:
-  push:
+    push:
-    branches:
+        branches:
-      - 'devops' # Only for the dev branch
+            - 'devops' # Only for the dev branch
-    paths:
+        paths:
-      - '.github/workflows/*'
+            - '.github/workflows/*'
-      # - '__test__/**' # dev No immediate testing is required
+            # - '__test__/**' # dev No immediate testing is required
-      - 'src/**'
+            - 'src/**'
-      - 'Dockerfile'
+            - 'Dockerfile'
-      - 'docker-compose.yml'
+            - 'docker-compose.yml'
-      - 'bin/*'
+            - 'bin/*'
-
-env:
-  SERVER_PRIVATE_KEY: ${{ secrets.SERVER_PRIVATE_KEY }} # server private key
-  SERVER_HOST: ${{ secrets.SERVER_HOST }}               # server ip address
-  USER_NAME: ${{ secrets.USER_NAME }}                   # server username
-  cache-name: note
 
 jobs:
-  deploy-dev:
+    deploy-dev:
-    runs-on: ubuntu-latest
+        runs-on: ubuntu-latest
-    steps:
+
-      - uses: actions/checkout@v2
+        steps:
-      - name: set ssh key # Temporarily set up ssh key
+            - uses: actions/checkout@v2
-        run: |
+            - name: set ssh key # Temporarily set up ssh key
-          mkdir -p ~/.ssh/
+              run: |
-          # secrets.WFP_ID_RSA set in GitHub
+                  mkdir -p ~/.ssh/
-          echo "${{secrets.WFP_ID_RSA}}" > ~/.ssh/id_rsa
+                  # secrets.WFP_ID_RSA set in GitHub
-          chmod 600 ~/.ssh/id_rsa
+                  echo "${{secrets.WFP_ID_RSA}}" > ~/.ssh/id_rsa
-          ssh-keyscan "182.92.xxx.xxx" >> ~/.ssh/known_hosts
+                  chmod 600 ~/.ssh/id_rsa
-      - name: deploy # Deployment
+                  ssh-keyscan "182.92.xxx.xxx" >> ~/.ssh/known_hosts
-        run: |
+            - name: deploy # Deployment
-          ssh work@182.92.xxx.xxx "
+              run: |
-            # 【Attention】Log in with the 'work' account, manually create /home/work/imooc-lego directory
+                  ssh work@182.92.xxx.xxx "
-            # Then git clone https://username:password@github.com/imooc-lego/biz-editor-server.git -b dev (private repository, use GitHub username and password)
+                    # 【Attention】Log in with the 'work' account, manually create /home/work/imooc-lego directory
-            # Remember to delete origin to avoid exposing GitHub password
+                    # Then git clone https://username:password@github.com/imooc-lego/biz-editor-server.git -b dev (private repository, use GitHub username and password)
-            cd /home/work/imooc-lego/biz-editor-server;
+                    # Remember to delete origin to avoid exposing GitHub password
-            git remote add origin https://openimbot:${{secrets.WFP_PASSWORD}}@github.com/OpenIMSDK/open-im-server.git;
+
-            git checkout dev;
+                    cd /home/work/imooc-lego/biz-editor-server;
-            git pull origin dev; # Download the latest code again
+                    git remote add origin https://openimbot:${{secrets.WFP_PASSWORD}}@github.com/OpenIMSDK/open-im-server.git;
-            git remote remove origin; # Remove origin to avoid exposing GitHub password
+                    git checkout dev;
-            # Start docker
+                    git pull origin dev; # Download the latest code again
-            docker-compose build editor-server; # Same as the service name in docker-compose.yml
+                    git remote remove origin; # Remove origin to avoid exposing GitHub password
-            docker-compose up -d;
+                    # Start docker
-          "
+                    docker-compose build editor-server; # Same as the service name in docker-compose.yml
-      - name: delete ssh key # Delete ssh key
+                    docker-compose up -d;
-        run: rm -rf ~/.ssh/id_rsa
+                  "
+            - name: delete ssh key # Delete ssh key
+              run: rm -rf ~/.ssh/id_rsa

.goreleaser.yaml

@@ -335,66 +335,66 @@ changelog:
     - title: Other work
       order: 9999
 
-# dockers:
+dockers:
-#   - image_templates:
+  - image_templates:
-#       - "openimsdk/open-im-server:{{ .Tag }}-amd64"
+      - "openimsdk/open-im-server:{{ .Tag }}-amd64"
-#       - "ghcr.io/goreleaser/goreleaser:{{ .Tag }}-amd64"
+      - "ghcr.io/goreleaser/goreleaser:{{ .Tag }}-amd64"
-#     dockerfile: Dockerfile
+    dockerfile: Dockerfile
-#     use: buildx
+    use: buildx
-#     build_flag_templates:
+    build_flag_templates:
-#       - "--pull"
+      - "--pull"
-#       - "--label=io.artifacthub.package.readme-url=https://raw.githubusercontent.com/OpenIMSDK/Open-IM-Server/main/README.md"
+      - "--label=io.artifacthub.package.readme-url=https://raw.githubusercontent.com/OpenIMSDK/Open-IM-Server/main/README.md"
-#       - "--label=io.artifacthub.package.logo-url=hhttps://github.com/OpenIMSDK/Open-IM-Server/blob/main/assets/logo/openim-logo-green.png"
+      - "--label=io.artifacthub.package.logo-url=hhttps://github.com/OpenIMSDK/Open-IM-Server/blob/main/assets/logo/openim-logo-green.png"
-#       - '--label=io.artifacthub.package.maintainers=[{"name":"Xinwei Xiong","email":"3293172751nss@gmail.com"}]'
+      - '--label=io.artifacthub.package.maintainers=[{"name":"Xinwei Xiong","email":"3293172751nss@gmail.com"}]'
-#       - "--label=io.artifacthub.package.license=Apace-2.0"
+      - "--label=io.artifacthub.package.license=Apace-2.0"
-#       - "--label=org.opencontainers.image.description=OpenIM Open source top instant messaging system"
+      - "--label=org.opencontainers.image.description=OpenIM Open source top instant messaging system"
-#       - "--label=org.opencontainers.image.created={{.Date}}"
+      - "--label=org.opencontainers.image.created={{.Date}}"
-#       - "--label=org.opencontainers.image.name={{.ProjectName}}"
+      - "--label=org.opencontainers.image.name={{.ProjectName}}"
-#       - "--label=org.opencontainers.image.revision={{.FullCommit}}"
+      - "--label=org.opencontainers.image.revision={{.FullCommit}}"
-#       - "--label=org.opencontainers.image.version={{.Version}}"
+      - "--label=org.opencontainers.image.version={{.Version}}"
-#       - "--label=org.opencontainers.image.source={{.GitURL}}"
+      - "--label=org.opencontainers.image.source={{.GitURL}}"
-#       - "--platform=linux/amd64"
+      - "--platform=linux/amd64"
-#     extra_files:
+    extra_files:
-#       - scripts/entrypoint.sh
+      - scripts/entrypoint.sh
-#   - image_templates:
+  - image_templates:
-#       - "goreleaser/goreleaser:{{ .Tag }}-arm64"
+      - "goreleaser/goreleaser:{{ .Tag }}-arm64"
-#       - "ghcr.io/goreleaser/goreleaser:{{ .Tag }}-arm64"
+      - "ghcr.io/goreleaser/goreleaser:{{ .Tag }}-arm64"
-#     dockerfile: Dockerfile
+    dockerfile: Dockerfile
-#     use: buildx
+    use: buildx
-#     build_flag_templates:
+    build_flag_templates:
-#       - "--pull"
+      - "--pull"
-#       - "--label=io.artifacthub.package.readme-url=https://raw.githubusercontent.com/OpenIMSDK/Open-IM-Server/main/README.md"
+      - "--label=io.artifacthub.package.readme-url=https://raw.githubusercontent.com/OpenIMSDK/Open-IM-Server/main/README.md"
-#       - "--label=io.artifacthub.package.logo-url=hhttps://github.com/OpenIMSDK/Open-IM-Server/blob/main/assets/logo/openim-logo-green.png"
+      - "--label=io.artifacthub.package.logo-url=hhttps://github.com/OpenIMSDK/Open-IM-Server/blob/main/assets/logo/openim-logo-green.png"
-#       - '--label=io.artifacthub.package.maintainers=[{"name":"Xinwei Xiong","email":"3293172751nss@gmail.com"}]'
+      - '--label=io.artifacthub.package.maintainers=[{"name":"Xinwei Xiong","email":"3293172751nss@gmail.com"}]'
-#       - "--label=io.artifacthub.package.license=Apace-2.0"
+      - "--label=io.artifacthub.package.license=Apace-2.0"
-#       - "--label=org.opencontainers.image.description=OpenIM Open source top instant messaging system"
+      - "--label=org.opencontainers.image.description=OpenIM Open source top instant messaging system"
-#       - "--label=org.opencontainers.image.created={{.Date}}"
+      - "--label=org.opencontainers.image.created={{.Date}}"
-#       - "--label=org.opencontainers.image.name={{.ProjectName}}"
+      - "--label=org.opencontainers.image.name={{.ProjectName}}"
-#       - "--label=org.opencontainers.image.revision={{.FullCommit}}"
+      - "--label=org.opencontainers.image.revision={{.FullCommit}}"
-#       - "--label=org.opencontainers.image.version={{.Version}}"
+      - "--label=org.opencontainers.image.version={{.Version}}"
-#       - "--label=org.opencontainers.image.source={{.GitURL}}"
+      - "--label=org.opencontainers.image.source={{.GitURL}}"
-#       - "--platform=linux/arm64"
+      - "--platform=linux/arm64"
-#     goarch: arm64
+    goarch: arm64
-#     extra_files:
+    extra_files:
-#       - scripts/entrypoint.sh
+      - scripts/entrypoint.sh
 
-# docker_manifests:
+docker_manifests:
-#   - name_template: "goreleaser/goreleaser:{{ .Tag }}"
+  - name_template: "goreleaser/goreleaser:{{ .Tag }}"
-#     image_templates:
+    image_templates:
-#       - "goreleaser/goreleaser:{{ .Tag }}-amd64"
+      - "goreleaser/goreleaser:{{ .Tag }}-amd64"
-#       - "goreleaser/goreleaser:{{ .Tag }}-arm64"
+      - "goreleaser/goreleaser:{{ .Tag }}-arm64"
-#   - name_template: "ghcr.io/goreleaser/goreleaser:{{ .Tag }}"
+  - name_template: "ghcr.io/goreleaser/goreleaser:{{ .Tag }}"
-#     image_templates:
+    image_templates:
-#       - "ghcr.io/goreleaser/goreleaser:{{ .Tag }}-amd64"
+      - "ghcr.io/goreleaser/goreleaser:{{ .Tag }}-amd64"
-#       - "ghcr.io/goreleaser/goreleaser:{{ .Tag }}-arm64"
+      - "ghcr.io/goreleaser/goreleaser:{{ .Tag }}-arm64"
-#   - name_template: "goreleaser/goreleaser:latest"
+  - name_template: "goreleaser/goreleaser:latest"
-#     image_templates:
+    image_templates:
-#       - "goreleaser/goreleaser:{{ .Tag }}-amd64"
+      - "goreleaser/goreleaser:{{ .Tag }}-amd64"
-#       - "goreleaser/goreleaser:{{ .Tag }}-arm64"
+      - "goreleaser/goreleaser:{{ .Tag }}-arm64"
-#   - name_template: "ghcr.io/goreleaser/goreleaser:latest"
+  - name_template: "ghcr.io/goreleaser/goreleaser:latest"
-#     image_templates:
+    image_templates:
-#       - "ghcr.io/goreleaser/goreleaser:{{ .Tag }}-amd64"
+      - "ghcr.io/goreleaser/goreleaser:{{ .Tag }}-amd64"
-#       - "ghcr.io/goreleaser/goreleaser:{{ .Tag }}-arm64"
+      - "ghcr.io/goreleaser/goreleaser:{{ .Tag }}-arm64"
 
 nfpms:
   - id: packages

pkg/common/db/controller/friend.go

@@ -24,7 +24,6 @@ import (
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation"
 	"github.com/OpenIMSDK/protocol/constant"
 	"github.com/OpenIMSDK/tools/errs"
-	"github.com/OpenIMSDK/tools/log"
 	"github.com/OpenIMSDK/tools/mcontext"
 	"github.com/OpenIMSDK/tools/tx"
 	"github.com/OpenIMSDK/tools/utils"
@@ -223,7 +222,6 @@ func (f *friendDatabase) AgreeFriendRequest(
 	friendRequest *relation.FriendRequestModel,
 ) (err error) {
 	return f.tx.Transaction(func(tx any) error {
-		defer log.ZDebug(ctx, "return line")
 		now := time.Now()
 		fr, err := f.friendRequest.NewTx(tx).Take(ctx, friendRequest.FromUserID, friendRequest.ToUserID)
 		if err != nil {
@@ -249,7 +247,7 @@ func (f *friendDatabase) AgreeFriendRequest(
 			if err != nil {
 				return err
 			}
-		} else if err != nil && errs.Unwrap(err) != gorm.ErrRecordNotFound {
+		} else if errs.Unwrap(err) != gorm.ErrRecordNotFound {
 			return err
 		}