From 229c656edab1a497f66ecf4d515d919697853b3c Mon Sep 17 00:00:00 2001 From: cubxxw Date: Fri, 10 Nov 2023 11:55:43 +0000 Subject: [PATCH] cicd: robot automated Change --- go.mod | 2 +- go.sum | 1 + internal/api/third.go | 3 +- internal/push/offlinepush/dummy/push.go | 1 + pkg/apistruct/manage.go | 34 +++++++++++----------- pkg/common/cmd/msg_transfer.go | 4 ++- pkg/common/db/controller/msg.go | 3 +- pkg/common/prommetrics/prommetrics.go | 5 ++-- pkg/common/prommetrics/prommetrics_test.go | 3 +- pkg/common/startrpc/start.go | 3 +- test/e2e/api/user/curd.go | 2 +- test/e2e/e2e_test.go | 2 +- 12 files changed, 36 insertions(+), 27 deletions(-) diff --git a/go.mod b/go.mod index ad0937d01..bbbfaec41 100644 --- a/go.mod +++ b/go.mod @@ -44,6 +44,7 @@ require ( github.com/go-sql-driver/mysql v1.7.1 github.com/redis/go-redis/v9 v9.2.1 github.com/tencentyun/cos-go-sdk-v5 v0.7.45 + go.uber.org/automaxprocs v1.5.3 gopkg.in/src-d/go-git.v4 v4.13.1 gotest.tools v2.2.0+incompatible ) @@ -127,7 +128,6 @@ require ( github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect go.opencensus.io v0.24.0 // indirect go.uber.org/atomic v1.7.0 // indirect - go.uber.org/automaxprocs v1.5.3 // indirect go.uber.org/multierr v1.6.0 // indirect golang.org/x/arch v0.3.0 // indirect golang.org/x/net v0.17.0 // indirect diff --git a/go.sum b/go.sum index e1886ca91..b1ee37912 100644 --- a/go.sum +++ b/go.sum @@ -280,6 +280,7 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/prashantv/gostub v1.1.0 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g= github.com/prometheus/client_golang v1.17.0 h1:rl2sfwZMtSthVU752MqfjQozy7blglC+1SOtjMAMh+Q= github.com/prometheus/client_golang v1.17.0/go.mod h1:VeL+gMmOAxkS2IqfCq0ZmHSL+LjWfWDUmp1mBz9JgUY= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= diff --git a/internal/api/third.go b/internal/api/third.go index fca133ea9..5191903da 100644 --- a/internal/api/third.go +++ b/internal/api/third.go @@ -15,11 +15,12 @@ package api import ( - config2 "github.com/openimsdk/open-im-server/v3/pkg/common/config" "math/rand" "net/http" "strconv" + config2 "github.com/openimsdk/open-im-server/v3/pkg/common/config" + "github.com/gin-gonic/gin" "github.com/OpenIMSDK/protocol/third" diff --git a/internal/push/offlinepush/dummy/push.go b/internal/push/offlinepush/dummy/push.go index 1be234d68..2b15bc05d 100644 --- a/internal/push/offlinepush/dummy/push.go +++ b/internal/push/offlinepush/dummy/push.go @@ -2,6 +2,7 @@ package dummy import ( "context" + "github.com/openimsdk/open-im-server/v3/internal/push/offlinepush" ) diff --git a/pkg/apistruct/manage.go b/pkg/apistruct/manage.go index e9e2c3b13..1e0ab3214 100644 --- a/pkg/apistruct/manage.go +++ b/pkg/apistruct/manage.go @@ -22,37 +22,37 @@ import ( type SendMsg struct { // SendID uniquely identifies the sender. SendID string `json:"sendID" binding:"required"` - + // GroupID is the identifier for the group, required if SessionType is 2 or 3. GroupID string `json:"groupID" binding:"required_if=SessionType 2|required_if=SessionType 3"` - + // SenderNickname is the nickname of the sender. SenderNickname string `json:"senderNickname"` - + // SenderFaceURL is the URL to the sender's avatar. SenderFaceURL string `json:"senderFaceURL"` - + // SenderPlatformID is an integer identifier for the sender's platform. SenderPlatformID int32 `json:"senderPlatformID"` - + // Content is the actual content of the message, required and excluded from Swagger documentation. Content map[string]interface{} `json:"content" binding:"required" swaggerignore:"true"` - + // ContentType is an integer that represents the type of the content. ContentType int32 `json:"contentType" binding:"required"` - + // SessionType is an integer that represents the type of session for the message. SessionType int32 `json:"sessionType" binding:"required"` - + // IsOnlineOnly specifies if the message is only sent when the receiver is online. IsOnlineOnly bool `json:"isOnlineOnly"` - + // NotOfflinePush specifies if the message should not trigger offline push notifications. NotOfflinePush bool `json:"notOfflinePush"` - + // SendTime is a timestamp indicating when the message was sent. SendTime int64 `json:"sendTime"` - + // OfflinePushInfo contains information for offline push notifications. OfflinePushInfo *sdkws.OfflinePushInfo `json:"offlinePushInfo"` } @@ -67,10 +67,10 @@ type SendMsgReq struct { // BatchSendMsgReq defines the structure for sending a message to multiple recipients. type BatchSendMsgReq struct { SendMsg - + // IsSendAll indicates whether the message should be sent to all users. IsSendAll bool `json:"isSendAll"` - + // RecvIDs is a slice of receiver identifiers to whom the message will be sent, required field. RecvIDs []string `json:"recvIDs" binding:"required"` } @@ -79,7 +79,7 @@ type BatchSendMsgReq struct { type BatchSendMsgResp struct { // Results is a slice of SingleReturnResult, representing the outcome of each message sent. Results []*SingleReturnResult `json:"results"` - + // FailedIDs is a slice of user IDs for whom the message send failed. FailedIDs []string `json:"failedUserIDs"` } @@ -88,13 +88,13 @@ type BatchSendMsgResp struct { type SingleReturnResult struct { // ServerMsgID is the message identifier on the server-side. ServerMsgID string `json:"serverMsgID"` - + // ClientMsgID is the message identifier on the client-side. ClientMsgID string `json:"clientMsgID"` - + // SendTime is the timestamp of when the message was sent. SendTime int64 `json:"sendTime"` - + // RecvID uniquely identifies the receiver of the message. RecvID string `json:"recvID"` } diff --git a/pkg/common/cmd/msg_transfer.go b/pkg/common/cmd/msg_transfer.go index 903d1fb95..f99b625c7 100644 --- a/pkg/common/cmd/msg_transfer.go +++ b/pkg/common/cmd/msg_transfer.go @@ -16,10 +16,12 @@ package cmd import ( "fmt" + "github.com/OpenIMSDK/protocol/constant" - config2 "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/spf13/cobra" + config2 "github.com/openimsdk/open-im-server/v3/pkg/common/config" + "github.com/openimsdk/open-im-server/v3/internal/msgtransfer" ) diff --git a/pkg/common/db/controller/msg.go b/pkg/common/db/controller/msg.go index b5249b5b4..183874657 100644 --- a/pkg/common/db/controller/msg.go +++ b/pkg/common/db/controller/msg.go @@ -24,6 +24,8 @@ import ( "github.com/OpenIMSDK/tools/errs" "github.com/OpenIMSDK/tools/log" + "go.mongodb.org/mongo-driver/mongo" + "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/common/convert" "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" @@ -31,7 +33,6 @@ import ( "github.com/openimsdk/open-im-server/v3/pkg/common/db/unrelation" "github.com/openimsdk/open-im-server/v3/pkg/common/kafka" "github.com/openimsdk/open-im-server/v3/pkg/common/prommetrics" - "go.mongodb.org/mongo-driver/mongo" pbmsg "github.com/OpenIMSDK/protocol/msg" "github.com/OpenIMSDK/protocol/sdkws" diff --git a/pkg/common/prommetrics/prommetrics.go b/pkg/common/prommetrics/prommetrics.go index 244f96b45..26b02b16f 100644 --- a/pkg/common/prommetrics/prommetrics.go +++ b/pkg/common/prommetrics/prommetrics.go @@ -2,10 +2,11 @@ package prommetrics import ( grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus" - config2 "github.com/openimsdk/open-im-server/v3/pkg/common/config" - "github.com/openimsdk/open-im-server/v3/pkg/common/ginprometheus" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/collectors" + + config2 "github.com/openimsdk/open-im-server/v3/pkg/common/config" + "github.com/openimsdk/open-im-server/v3/pkg/common/ginprometheus" ) func NewGrpcPromObj(cusMetrics []prometheus.Collector) (*prometheus.Registry, *grpc_prometheus.ServerMetrics, error) { diff --git a/pkg/common/prommetrics/prommetrics_test.go b/pkg/common/prommetrics/prommetrics_test.go index 771fcac19..babc5e410 100644 --- a/pkg/common/prommetrics/prommetrics_test.go +++ b/pkg/common/prommetrics/prommetrics_test.go @@ -3,9 +3,10 @@ package prommetrics import ( "testing" - config2 "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/prometheus/client_golang/prometheus" "github.com/stretchr/testify/assert" + + config2 "github.com/openimsdk/open-im-server/v3/pkg/common/config" ) func TestNewGrpcPromObj(t *testing.T) { diff --git a/pkg/common/startrpc/start.go b/pkg/common/startrpc/start.go index 09f7177ae..d5e31701e 100644 --- a/pkg/common/startrpc/start.go +++ b/pkg/common/startrpc/start.go @@ -28,10 +28,11 @@ import ( "github.com/openimsdk/open-im-server/v3/pkg/common/prommetrics" grpcprometheus "github.com/grpc-ecosystem/go-grpc-prometheus" - kdisc "github.com/openimsdk/open-im-server/v3/pkg/common/discoveryregister" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" + kdisc "github.com/openimsdk/open-im-server/v3/pkg/common/discoveryregister" + "github.com/OpenIMSDK/tools/discoveryregistry" "github.com/OpenIMSDK/tools/mw" "github.com/OpenIMSDK/tools/network" diff --git a/test/e2e/api/user/curd.go b/test/e2e/api/user/curd.go index cdff1ea1e..28b55b682 100644 --- a/test/e2e/api/user/curd.go +++ b/test/e2e/api/user/curd.go @@ -41,4 +41,4 @@ func GetUsersOnlineStatus(token string, userIDs []string) error { UserIDs: userIDs, } return sendPostRequestWithToken("http://your-api-host:port/user/get_users_online_status", token, requestBody) -} \ No newline at end of file +} diff --git a/test/e2e/e2e_test.go b/test/e2e/e2e_test.go index d578a988b..8fe810789 100644 --- a/test/e2e/e2e_test.go +++ b/test/e2e/e2e_test.go @@ -20,4 +20,4 @@ func TestMain(m *testing.M) { func TestE2E(t *testing.T) { RunE2ETests(t) -} \ No newline at end of file +}