From 6add09d47620612e8e087cf8665264544614ea4d Mon Sep 17 00:00:00 2001
From: icey-yu <119291641+icey-yu@users.noreply.github.com>
Date: Mon, 23 Sep 2024 17:12:11 +0800
Subject: [PATCH] fix: kick group member callback (#2643)

* fix: kill group member callback

* fix: change port

* fix: change port
---
 config/openim-msgtransfer.yml  | 2 +-
 config/openim-push.yml         | 2 +-
 config/prometheus.yml          | 2 +-
 internal/rpc/group/callback.go | 1 +
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/config/openim-msgtransfer.yml b/config/openim-msgtransfer.yml
index 753ac10bc..94ed073d8 100644
--- a/config/openim-msgtransfer.yml
+++ b/config/openim-msgtransfer.yml
@@ -3,4 +3,4 @@ prometheus:
   enable: true
   # List of ports that Prometheus listens on; each port corresponds to an instance of monitoring. Ensure these are managed accordingly
   # Because four instances have been launched, four ports need to be specified
-  ports: [ 12020, 12021, 12022, 12023, 12024, 12025, 12026, 12027 ]
+  ports: [ 12020, 12021, 12022, 12023, 12024, 12025, 12026, 12027, 12028, 12029, 12030, 12031, 12032, 12033, 12034, 12035 ]
diff --git a/config/openim-push.yml b/config/openim-push.yml
index 6df2a62b7..4d2aaca6b 100644
--- a/config/openim-push.yml
+++ b/config/openim-push.yml
@@ -10,7 +10,7 @@ prometheus:
   # Enable or disable Prometheus monitoring
   enable: true
   # List of ports that Prometheus listens on; these must match the number of rpc.ports to ensure correct monitoring setup
-  ports: [ 12170, 12171, 12172, 12173, 12174, 12175, 12176, 12177, 12178, 12179, 12180, 12181, 12182, 12183, 12184, 12185 ]
+  ports: [ 12170, 12171, 12172, 12173, 12174, 12175, 12176, 12177, 12178, 12179, 12180, 12182, 12183, 12184, 12185, 12186 ]
 
 maxConcurrentWorkers: 3
 #Use geTui for offline push notifications, or choose fcm or jpns; corresponding configuration settings must be specified.
diff --git a/config/prometheus.yml b/config/prometheus.yml
index 4f0f7e32c..ab427ee82 100644
--- a/config/prometheus.yml
+++ b/config/prometheus.yml
@@ -46,7 +46,7 @@ scrape_configs:
   - job_name: openimserver-openim-push
     static_configs:
       - targets: [ internal_ip:12170, internal_ip:12171, internal_ip:12172, internal_ip:12173, internal_ip:12174, internal_ip:12175, internal_ip:12176, internal_ip:12177 ]
-#      - targets: [ internal_ip:12170, internal_ip:12171, internal_ip:12172, internal_ip:12173, internal_ip:12174, internal_ip:12175, internal_ip:12176, internal_ip:12177, internal_ip:12178, internal_ip:12179, internal_ip:12180, internal_ip:12181, internal_ip:12182, internal_ip:12183, internal_ip:12184, internal_ip:12185 ]
+#      - targets: [ internal_ip:12170, internal_ip:12171, internal_ip:12172, internal_ip:12173, internal_ip:12174, internal_ip:12175, internal_ip:12176, internal_ip:12177, internal_ip:12178, internal_ip:12179, internal_ip:12180,  internal_ip:12182, internal_ip:12183, internal_ip:12184, internal_ip:12185, internal_ip:12186 ]
         labels:
           namespace: default
   - job_name: openimserver-openim-rpc-auth
diff --git a/internal/rpc/group/callback.go b/internal/rpc/group/callback.go
index ef391bd70..e748c66dc 100644
--- a/internal/rpc/group/callback.go
+++ b/internal/rpc/group/callback.go
@@ -218,6 +218,7 @@ func (s *groupServer) webhookAfterKickGroupMember(ctx context.Context, after *co
 		CallbackCommand: callbackstruct.CallbackAfterKickGroupCommand,
 		GroupID:         req.GroupID,
 		KickedUserIDs:   req.KickedUserIDs,
+		Reason:          req.Reason,
 	}
 	s.webhookClient.AsyncPost(ctx, cbReq.GetCallbackCommand(), cbReq, &callbackstruct.CallbackKillGroupMemberResp{}, after)
 }