diff --git a/internal/rpc/group/group.go b/internal/rpc/group/group.go index 01848efd2..0101ef077 100644 --- a/internal/rpc/group/group.go +++ b/internal/rpc/group/group.go @@ -244,25 +244,6 @@ func (s *groupServer) GetJoinedGroupList(ctx context.Context, req *pbGroup.GetJo log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error(), v) continue } - //if num > 0 && owner != nil && err2 == nil && group != nil && err == nil { - // if group.Status == constant.GroupStatusDismissed { - // log.NewError(req.OperationID, "constant.GroupStatusDismissed ", group) - // continue - // } - // utils.CopyStructFields(&groupNode, group) - // groupNode.CreateTime = uint32(group.CreateTime.Unix()) - // groupNode.NotificationUpdateTime = uint32(group.NotificationUpdateTime.Unix()) - // if group.NotificationUpdateTime.Unix() < 0 { - // groupNode.NotificationUpdateTime = 0 - // } - // - // groupNode.MemberCount = uint32(num) - // groupNode.OwnerUserID = owner.UserID - // resp.GroupList = append(resp.GroupList, &groupNode) - //} else { - // log.NewError(req.OperationID, "check nil ", num, owner, err, group, err2) - // continue - //} if group.Status == constant.GroupStatusDismissed { log.NewError(req.OperationID, "constant.GroupStatusDismissed ", group) continue diff --git a/internal/rpc/organization/organization.go b/internal/rpc/organization/organization.go index f78d832a0..a3b0301a6 100644 --- a/internal/rpc/organization/organization.go +++ b/internal/rpc/organization/organization.go @@ -300,7 +300,7 @@ func (s *organizationServer) CreateOrganizationUser(ctx context.Context, req *rp log.Debug(req.OperationID, "CreateOrganizationUser ", organizationUser) resp := &rpc.CreateOrganizationUserResp{} log.NewInfo(req.OperationID, utils.GetSelfFuncName(), " rpc return ", *resp) - chat.OrganizationNotificationToAll(req.OpUserID, req.OperationID) + //chat.OrganizationNotificationToAll(req.OpUserID, req.OperationID) return resp, nil } diff --git a/script/check_all.sh b/script/check_all.sh index 14bca6c81..c036142f9 100644 --- a/script/check_all.sh +++ b/script/check_all.sh @@ -34,7 +34,7 @@ for i in ${service_port_name[*]}; do list=$(cat $config_path | grep -w ${i} | awk -F '[:]' '{print $NF}') list_to_string $list for j in ${ports_array}; do - port=$(netstat -netulp | grep ./open_im | awk '{print $4}' | grep -w ${j} | awk -F '[:]' '{print $NF}') + port=$(ss -tunlp| grep open_im | awk '{print $5}' | grep -w ${j} | awk -F '[:]' '{print $NF}') if [[ ${port} -ne ${j} ]]; then echo -e ${YELLOW_PREFIX}${i}${COLOR_SUFFIX}${RED_PREFIX}" service does not start normally,not initiated port is "${COLOR_SUFFIX}${YELLOW_PREFIX}${j}${COLOR_SUFFIX} echo -e ${RED_PREFIX}"please check ../logs/openIM.log "${COLOR_SUFFIX}