diff --git a/.github/workflows/go-build-test.yml b/.github/workflows/go-build-test.yml index 2ca960cc9..60b64d118 100644 --- a/.github/workflows/go-build-test.yml +++ b/.github/workflows/go-build-test.yml @@ -92,12 +92,13 @@ jobs: contents: write env: SDK_DIR: openim-sdk-core - CONFIG_PATH: config/notification.yml - # pull-requests: write + NOTIFICATION_CONFIG_PATH: config/notification.yml + SHARE_CONFIG_PATH: config/share.yml + strategy: matrix: - os: [ ubuntu-latest ] - go_version: [ "1.22.x" ] + os: [ubuntu-latest] + go_version: ["1.22.x"] steps: - name: Checkout Server repository @@ -106,7 +107,8 @@ jobs: - name: Checkout SDK repository uses: actions/checkout@v4 with: - repository: 'openimsdk/openim-sdk-core' + repository: "openimsdk/openim-sdk-core" + ref: "main" path: ${{ env.SDK_DIR }} - name: Set up Go ${{ matrix.go_version }} @@ -119,15 +121,11 @@ jobs: go install github.com/magefile/mage@latest go mod download - - name: Install yq - run: | - sudo wget https://github.com/mikefarah/yq/releases/download/v4.34.1/yq_linux_amd64 -O /usr/bin/yq - sudo chmod +x /usr/bin/yq - - name: Modify Server Configuration run: | - yq e '.groupCreated.unreadCount = true' -i ${{ env.CONFIG_PATH }} - yq e '.friendApplicationApproved.unreadCount = true' -i ${{ env.CONFIG_PATH }} + yq e '.groupCreated.isSendMsg = true' -i ${{ env.NOTIFICATION_CONFIG_PATH }} + yq e '.friendApplicationApproved.isSendMsg = true' -i ${{ env.NOTIFICATION_CONFIG_PATH }} + yq e '.secret = 123456' -i ${{ env.SHARE_CONFIG_PATH }} - name: Start Server Services run: | diff --git a/internal/rpc/group/notification.go b/internal/rpc/group/notification.go index 7894ccc00..95335b2fc 100644 --- a/internal/rpc/group/notification.go +++ b/internal/rpc/group/notification.go @@ -476,14 +476,15 @@ func (g *NotificationSender) GroupApplicationAcceptedNotification(ctx context.Co if err = g.fillOpUser(ctx, &opUser, group.GroupID); err != nil { return } - tips := &sdkws.GroupApplicationAcceptedTips{ - Group: group, - OpUser: opUser, - HandleMsg: req.HandledMsg, - Uuid: g.uuid(), - Request: request, - } + uid := g.uuid() for _, userID := range append(userIDs, req.FromUserID) { + tips := &sdkws.GroupApplicationAcceptedTips{ + Group: group, + OpUser: opUser, + HandleMsg: req.HandledMsg, + Uuid: uid, + Request: request, + } if userID == req.FromUserID { tips.ReceiverAs = applicantReceiver } else { @@ -520,14 +521,15 @@ func (g *NotificationSender) GroupApplicationRejectedNotification(ctx context.Co if err = g.fillOpUser(ctx, &opUser, group.GroupID); err != nil { return } - tips := &sdkws.GroupApplicationRejectedTips{ - Group: group, - OpUser: opUser, - HandleMsg: req.HandledMsg, - Uuid: g.uuid(), - Request: request, - } + uid := g.uuid() for _, userID := range append(userIDs, req.FromUserID) { + tips := &sdkws.GroupApplicationRejectedTips{ + Group: group, + OpUser: opUser, + HandleMsg: req.HandledMsg, + Uuid: uid, + Request: request, + } if userID == req.FromUserID { tips.ReceiverAs = applicantReceiver } else {