From 8d30837341f82ae270635ccab312de734c648ab6 Mon Sep 17 00:00:00 2001 From: yushan Date: Wed, 1 Jun 2022 18:53:12 +0800 Subject: [PATCH] fix: change repo name --- api/message/v1/message.pb.go | 2 +- api/message/v1/message_grpc.pb.go | 2 +- api/user/friend/v1/friend.pb.go | 2 +- api/user/friend/v1/friend_grpc.pb.go | 2 +- api/user/v1/user.pb.go | 2 +- apps/gateway/cmd/main.go | 18 +++++++++--------- apps/gateway/internal/app/app.go | 4 ++-- apps/gateway/internal/dao/user_dao.go | 4 ++-- apps/gateway/internal/router/router.go | 4 ++-- .../internal/router/v1/discover_router.go | 8 ++++---- .../internal/router/v1/friend_router.go | 14 +++++++------- .../router/v1/offline_message_router.go | 12 ++++++------ .../internal/router/v1/send_msg_router.go | 14 +++++++------- apps/gateway/internal/router/v1/user_router.go | 12 ++++++------ apps/gateway/internal/router/v1/v1.go | 2 +- .../internal/service/discover_push_server.go | 4 ++-- .../gateway/internal/service/friend_service.go | 6 +++--- .../service/offline_message_service.go | 4 ++-- .../internal/service/send_message_service.go | 12 ++++++------ apps/gateway/internal/service/user_service.go | 12 ++++++------ apps/msg/cmd/main.go | 16 ++++++++-------- apps/msg/internal/app/app.go | 2 +- apps/msg/internal/service/msg_service.go | 12 ++++++------ .../service/offline_message_service.go | 10 +++++----- apps/push/cmd/main.go | 16 ++++++++-------- apps/push/internal/app/app.go | 2 +- apps/push/internal/router/router.go | 4 ++-- apps/push/internal/router/v1/conn_router.go | 8 ++++---- apps/push/internal/router/v1/v1.go | 2 +- apps/push/internal/service/push_message.go | 16 ++++++++-------- apps/push/internal/service/ws_service.go | 10 +++++----- apps/user/cmd/main.go | 18 +++++++++--------- apps/user/internal/app/app.go | 2 +- apps/user/internal/dao/friend_dao.go | 6 +++--- apps/user/internal/dao/friend_request_dao.go | 4 ++-- apps/user/internal/dao/user_dao.go | 14 +++++++------- apps/user/internal/data/friend.go | 2 +- apps/user/internal/data/friend_request.go | 2 +- apps/user/internal/data/user.go | 2 +- apps/user/internal/router/router.go | 4 ++-- apps/user/internal/router/v1/v1.go | 2 +- apps/user/internal/service/friend_service.go | 16 ++++++++-------- apps/user/internal/service/user_service.go | 10 +++++----- go.mod | 2 +- pkg/app/application.go | 12 ++++++------ pkg/config/config.go | 8 ++++---- pkg/config/source.go | 4 ++-- pkg/conn/pool/idle.go | 2 +- pkg/conn/wrapper/websocket.go | 3 ++- pkg/db/context.go | 2 +- pkg/db/mysql/mysql.go | 4 ++-- pkg/db/mysql/options.go | 2 +- pkg/db/redis/options.go | 2 +- pkg/graceful/graceful.go | 4 ++-- pkg/log/log.go | 2 +- pkg/log/option.go | 2 +- pkg/log/zap.go | 2 +- pkg/mid/auth.go | 2 +- pkg/mid/log.go | 2 +- pkg/registry/consul/consul.go | 3 ++- pkg/registry/consul/watcher.go | 2 +- pkg/registry/registry.go | 4 ++-- pkg/request/jsonpb.go | 4 ++-- pkg/response/gin_resp.go | 4 ++-- pkg/response/response.go | 2 +- pkg/util/retry/retry.go | 4 ++-- pkg/worker/pool.go | 2 +- pkg/worker/worker_set.go | 2 +- swagger.go | 2 +- swagger/docs.go | 2 +- tests/batch-user/main.go | 2 +- tests/batch-user/user.go | 4 ++-- tests/client-bench/main.go | 2 +- tests/client-gui/client.go | 2 +- 74 files changed, 209 insertions(+), 207 deletions(-) diff --git a/api/message/v1/message.pb.go b/api/message/v1/message.pb.go index 64086c9..12599d4 100644 --- a/api/message/v1/message.pb.go +++ b/api/message/v1/message.pb.go @@ -8,7 +8,7 @@ package v1 import ( _ "github.com/envoyproxy/protoc-gen-validate/validate" - response "github.com/go-goim/goim/api/transport/response" + response "github.com/go-goim/core/api/transport/response" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" diff --git a/api/message/v1/message_grpc.pb.go b/api/message/v1/message_grpc.pb.go index 176b4e0..cacf354 100644 --- a/api/message/v1/message_grpc.pb.go +++ b/api/message/v1/message_grpc.pb.go @@ -4,7 +4,7 @@ package v1 import ( context "context" - response "github.com/go-goim/goim/api/transport/response" + response "github.com/go-goim/core/api/transport/response" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/api/user/friend/v1/friend.pb.go b/api/user/friend/v1/friend.pb.go index ff36704..ce6d820 100644 --- a/api/user/friend/v1/friend.pb.go +++ b/api/user/friend/v1/friend.pb.go @@ -8,7 +8,7 @@ package v1 import ( _ "github.com/envoyproxy/protoc-gen-validate/validate" - response "github.com/go-goim/goim/api/transport/response" + response "github.com/go-goim/core/api/transport/response" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" diff --git a/api/user/friend/v1/friend_grpc.pb.go b/api/user/friend/v1/friend_grpc.pb.go index 3782647..7498a45 100644 --- a/api/user/friend/v1/friend_grpc.pb.go +++ b/api/user/friend/v1/friend_grpc.pb.go @@ -4,7 +4,7 @@ package v1 import ( context "context" - response "github.com/go-goim/goim/api/transport/response" + response "github.com/go-goim/core/api/transport/response" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/api/user/v1/user.pb.go b/api/user/v1/user.pb.go index 6dc2bb9..23e6aae 100644 --- a/api/user/v1/user.pb.go +++ b/api/user/v1/user.pb.go @@ -8,7 +8,7 @@ package v1 import ( _ "github.com/envoyproxy/protoc-gen-validate/validate" - response "github.com/go-goim/goim/api/transport/response" + response "github.com/go-goim/core/api/transport/response" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" diff --git a/apps/gateway/cmd/main.go b/apps/gateway/cmd/main.go index 8a20b34..f385bbf 100644 --- a/apps/gateway/cmd/main.go +++ b/apps/gateway/cmd/main.go @@ -7,18 +7,18 @@ import ( swaggerFiles "github.com/swaggo/files" ginSwagger "github.com/swaggo/gin-swagger" - messagev1 "github.com/go-goim/goim/api/message/v1" - "github.com/go-goim/goim/apps/gateway/internal/app" - "github.com/go-goim/goim/apps/gateway/internal/router" - "github.com/go-goim/goim/apps/gateway/internal/service" - "github.com/go-goim/goim/pkg/cmd" - "github.com/go-goim/goim/pkg/graceful" - "github.com/go-goim/goim/pkg/log" - "github.com/go-goim/goim/pkg/mid" + messagev1 "github.com/go-goim/core/api/message/v1" + "github.com/go-goim/core/apps/gateway/internal/app" + "github.com/go-goim/core/apps/gateway/internal/router" + "github.com/go-goim/core/apps/gateway/internal/service" + "github.com/go-goim/core/pkg/cmd" + "github.com/go-goim/core/pkg/graceful" + "github.com/go-goim/core/pkg/log" + "github.com/go-goim/core/pkg/mid" _ "github.com/swaggo/swag" - _ "github.com/go-goim/goim/swagger" + _ "github.com/go-goim/core/swagger" ) var ( diff --git a/apps/gateway/internal/app/app.go b/apps/gateway/internal/app/app.go index 4b03770..dc43385 100644 --- a/apps/gateway/internal/app/app.go +++ b/apps/gateway/internal/app/app.go @@ -1,8 +1,8 @@ package app import ( - "github.com/go-goim/goim/pkg/app" - "github.com/go-goim/goim/pkg/registry" + "github.com/go-goim/core/pkg/app" + "github.com/go-goim/core/pkg/registry" ) type Application struct { diff --git a/apps/gateway/internal/dao/user_dao.go b/apps/gateway/internal/dao/user_dao.go index 0c63fac..b42ed01 100644 --- a/apps/gateway/internal/dao/user_dao.go +++ b/apps/gateway/internal/dao/user_dao.go @@ -6,8 +6,8 @@ import ( redisv8 "github.com/go-redis/redis/v8" - "github.com/go-goim/goim/apps/gateway/internal/app" - "github.com/go-goim/goim/pkg/consts" + "github.com/go-goim/core/apps/gateway/internal/app" + "github.com/go-goim/core/pkg/consts" ) var ( diff --git a/apps/gateway/internal/router/router.go b/apps/gateway/internal/router/router.go index 6472fd8..00bcfd0 100644 --- a/apps/gateway/internal/router/router.go +++ b/apps/gateway/internal/router/router.go @@ -3,8 +3,8 @@ package router import ( "github.com/gin-gonic/gin" - v1 "github.com/go-goim/goim/apps/gateway/internal/router/v1" - "github.com/go-goim/goim/pkg/router" + v1 "github.com/go-goim/core/apps/gateway/internal/router/v1" + "github.com/go-goim/core/pkg/router" ) type rootRouter struct { diff --git a/apps/gateway/internal/router/v1/discover_router.go b/apps/gateway/internal/router/v1/discover_router.go index 8da30ac..f96cd22 100644 --- a/apps/gateway/internal/router/v1/discover_router.go +++ b/apps/gateway/internal/router/v1/discover_router.go @@ -6,10 +6,10 @@ import ( "github.com/gin-gonic/gin" - "github.com/go-goim/goim/apps/gateway/internal/service" - "github.com/go-goim/goim/pkg/mid" - "github.com/go-goim/goim/pkg/response" - "github.com/go-goim/goim/pkg/router" + "github.com/go-goim/core/apps/gateway/internal/service" + "github.com/go-goim/core/pkg/mid" + "github.com/go-goim/core/pkg/response" + "github.com/go-goim/core/pkg/router" ) type DiscoverRouter struct { diff --git a/apps/gateway/internal/router/v1/friend_router.go b/apps/gateway/internal/router/v1/friend_router.go index f82662e..fe84c0f 100644 --- a/apps/gateway/internal/router/v1/friend_router.go +++ b/apps/gateway/internal/router/v1/friend_router.go @@ -3,13 +3,13 @@ package v1 import ( "github.com/gin-gonic/gin" - responsepb "github.com/go-goim/goim/api/transport/response" - friendpb "github.com/go-goim/goim/api/user/friend/v1" - "github.com/go-goim/goim/apps/gateway/internal/service" - "github.com/go-goim/goim/pkg/mid" - "github.com/go-goim/goim/pkg/request" - "github.com/go-goim/goim/pkg/response" - "github.com/go-goim/goim/pkg/router" + responsepb "github.com/go-goim/core/api/transport/response" + friendpb "github.com/go-goim/core/api/user/friend/v1" + "github.com/go-goim/core/apps/gateway/internal/service" + "github.com/go-goim/core/pkg/mid" + "github.com/go-goim/core/pkg/request" + "github.com/go-goim/core/pkg/response" + "github.com/go-goim/core/pkg/router" ) type FriendRouter struct { diff --git a/apps/gateway/internal/router/v1/offline_message_router.go b/apps/gateway/internal/router/v1/offline_message_router.go index 5c21d48..37eae56 100644 --- a/apps/gateway/internal/router/v1/offline_message_router.go +++ b/apps/gateway/internal/router/v1/offline_message_router.go @@ -3,12 +3,12 @@ package v1 import ( "github.com/gin-gonic/gin" - messagev1 "github.com/go-goim/goim/api/message/v1" - "github.com/go-goim/goim/apps/gateway/internal/service" - "github.com/go-goim/goim/pkg/mid" - "github.com/go-goim/goim/pkg/request" - "github.com/go-goim/goim/pkg/response" - "github.com/go-goim/goim/pkg/router" + messagev1 "github.com/go-goim/core/api/message/v1" + "github.com/go-goim/core/apps/gateway/internal/service" + "github.com/go-goim/core/pkg/mid" + "github.com/go-goim/core/pkg/request" + "github.com/go-goim/core/pkg/response" + "github.com/go-goim/core/pkg/router" ) type OfflineMessageRouter struct { diff --git a/apps/gateway/internal/router/v1/send_msg_router.go b/apps/gateway/internal/router/v1/send_msg_router.go index e8dd593..91bb200 100644 --- a/apps/gateway/internal/router/v1/send_msg_router.go +++ b/apps/gateway/internal/router/v1/send_msg_router.go @@ -3,13 +3,13 @@ package v1 import ( "github.com/gin-gonic/gin" - messagev1 "github.com/go-goim/goim/api/message/v1" - responsepb "github.com/go-goim/goim/api/transport/response" - "github.com/go-goim/goim/apps/gateway/internal/service" - "github.com/go-goim/goim/pkg/mid" - "github.com/go-goim/goim/pkg/request" - "github.com/go-goim/goim/pkg/response" - "github.com/go-goim/goim/pkg/router" + messagev1 "github.com/go-goim/core/api/message/v1" + responsepb "github.com/go-goim/core/api/transport/response" + "github.com/go-goim/core/apps/gateway/internal/service" + "github.com/go-goim/core/pkg/mid" + "github.com/go-goim/core/pkg/request" + "github.com/go-goim/core/pkg/response" + "github.com/go-goim/core/pkg/router" ) type MsgRouter struct { diff --git a/apps/gateway/internal/router/v1/user_router.go b/apps/gateway/internal/router/v1/user_router.go index 8d59f16..61a68a7 100644 --- a/apps/gateway/internal/router/v1/user_router.go +++ b/apps/gateway/internal/router/v1/user_router.go @@ -3,12 +3,12 @@ package v1 import ( "github.com/gin-gonic/gin" - userv1 "github.com/go-goim/goim/api/user/v1" - "github.com/go-goim/goim/apps/gateway/internal/service" - "github.com/go-goim/goim/pkg/mid" - "github.com/go-goim/goim/pkg/request" - "github.com/go-goim/goim/pkg/response" - "github.com/go-goim/goim/pkg/router" + userv1 "github.com/go-goim/core/api/user/v1" + "github.com/go-goim/core/apps/gateway/internal/service" + "github.com/go-goim/core/pkg/mid" + "github.com/go-goim/core/pkg/request" + "github.com/go-goim/core/pkg/response" + "github.com/go-goim/core/pkg/router" ) type UserRouter struct { diff --git a/apps/gateway/internal/router/v1/v1.go b/apps/gateway/internal/router/v1/v1.go index 8a1ebe8..c01b8c0 100644 --- a/apps/gateway/internal/router/v1/v1.go +++ b/apps/gateway/internal/router/v1/v1.go @@ -1,7 +1,7 @@ package v1 import ( - "github.com/go-goim/goim/pkg/router" + "github.com/go-goim/core/pkg/router" ) type Router struct { diff --git a/apps/gateway/internal/service/discover_push_server.go b/apps/gateway/internal/service/discover_push_server.go index 180e3d2..c8e3784 100644 --- a/apps/gateway/internal/service/discover_push_server.go +++ b/apps/gateway/internal/service/discover_push_server.go @@ -6,8 +6,8 @@ import ( "math/rand" "strings" - "github.com/go-goim/goim/apps/gateway/internal/app" - "github.com/go-goim/goim/pkg/registry" + "github.com/go-goim/core/apps/gateway/internal/app" + "github.com/go-goim/core/pkg/registry" ) func LoadMatchedPushServer(ctx context.Context) (string, error) { diff --git a/apps/gateway/internal/service/friend_service.go b/apps/gateway/internal/service/friend_service.go index 0aeaa71..a839d3e 100644 --- a/apps/gateway/internal/service/friend_service.go +++ b/apps/gateway/internal/service/friend_service.go @@ -10,9 +10,9 @@ import ( ggrpc "google.golang.org/grpc" "google.golang.org/grpc/connectivity" - responsepb "github.com/go-goim/goim/api/transport/response" - friendpb "github.com/go-goim/goim/api/user/friend/v1" - "github.com/go-goim/goim/apps/gateway/internal/app" + responsepb "github.com/go-goim/core/api/transport/response" + friendpb "github.com/go-goim/core/api/user/friend/v1" + "github.com/go-goim/core/apps/gateway/internal/app" ) type FriendService struct { diff --git a/apps/gateway/internal/service/offline_message_service.go b/apps/gateway/internal/service/offline_message_service.go index 90d2df0..002f697 100644 --- a/apps/gateway/internal/service/offline_message_service.go +++ b/apps/gateway/internal/service/offline_message_service.go @@ -9,8 +9,8 @@ import ( ggrpc "google.golang.org/grpc" "google.golang.org/grpc/connectivity" - messagev1 "github.com/go-goim/goim/api/message/v1" - "github.com/go-goim/goim/apps/gateway/internal/app" + messagev1 "github.com/go-goim/core/api/message/v1" + "github.com/go-goim/core/apps/gateway/internal/app" ) type OfflineMessageService struct { diff --git a/apps/gateway/internal/service/send_message_service.go b/apps/gateway/internal/service/send_message_service.go index be5f791..21b3c93 100644 --- a/apps/gateway/internal/service/send_message_service.go +++ b/apps/gateway/internal/service/send_message_service.go @@ -11,13 +11,13 @@ import ( ggrpc "google.golang.org/grpc" "google.golang.org/grpc/connectivity" - responsepb "github.com/go-goim/goim/api/transport/response" - friendpb "github.com/go-goim/goim/api/user/friend/v1" - "github.com/go-goim/goim/pkg/log" + responsepb "github.com/go-goim/core/api/transport/response" + friendpb "github.com/go-goim/core/api/user/friend/v1" + "github.com/go-goim/core/pkg/log" - messagev1 "github.com/go-goim/goim/api/message/v1" - "github.com/go-goim/goim/apps/gateway/internal/app" - "github.com/go-goim/goim/pkg/mq" + messagev1 "github.com/go-goim/core/api/message/v1" + "github.com/go-goim/core/apps/gateway/internal/app" + "github.com/go-goim/core/pkg/mq" ) type SendMessageService struct { diff --git a/apps/gateway/internal/service/user_service.go b/apps/gateway/internal/service/user_service.go index 49803ee..ce6fa09 100644 --- a/apps/gateway/internal/service/user_service.go +++ b/apps/gateway/internal/service/user_service.go @@ -10,12 +10,12 @@ import ( ggrpc "google.golang.org/grpc" "google.golang.org/grpc/connectivity" - responsepb "github.com/go-goim/goim/api/transport/response" - userv1 "github.com/go-goim/goim/api/user/v1" - "github.com/go-goim/goim/apps/gateway/internal/app" - "github.com/go-goim/goim/apps/gateway/internal/dao" - "github.com/go-goim/goim/pkg/log" - "github.com/go-goim/goim/pkg/util" + responsepb "github.com/go-goim/core/api/transport/response" + userv1 "github.com/go-goim/core/api/user/v1" + "github.com/go-goim/core/apps/gateway/internal/app" + "github.com/go-goim/core/apps/gateway/internal/dao" + "github.com/go-goim/core/pkg/log" + "github.com/go-goim/core/pkg/util" ) type UserService struct { diff --git a/apps/msg/cmd/main.go b/apps/msg/cmd/main.go index 8f325bb..b7c95bc 100644 --- a/apps/msg/cmd/main.go +++ b/apps/msg/cmd/main.go @@ -3,14 +3,14 @@ package main import ( "context" - "github.com/go-goim/goim/pkg/cmd" - "github.com/go-goim/goim/pkg/log" - - messagev1 "github.com/go-goim/goim/api/message/v1" - "github.com/go-goim/goim/apps/msg/internal/app" - "github.com/go-goim/goim/apps/msg/internal/service" - "github.com/go-goim/goim/pkg/graceful" - "github.com/go-goim/goim/pkg/mq" + "github.com/go-goim/core/pkg/cmd" + "github.com/go-goim/core/pkg/log" + + messagev1 "github.com/go-goim/core/api/message/v1" + "github.com/go-goim/core/apps/msg/internal/app" + "github.com/go-goim/core/apps/msg/internal/service" + "github.com/go-goim/core/pkg/graceful" + "github.com/go-goim/core/pkg/mq" ) func main() { diff --git a/apps/msg/internal/app/app.go b/apps/msg/internal/app/app.go index 5142d03..2331d07 100644 --- a/apps/msg/internal/app/app.go +++ b/apps/msg/internal/app/app.go @@ -1,7 +1,7 @@ package app import ( - "github.com/go-goim/goim/pkg/app" + "github.com/go-goim/core/pkg/app" ) type Application struct { diff --git a/apps/msg/internal/service/msg_service.go b/apps/msg/internal/service/msg_service.go index 7daa6f1..bd3cf67 100644 --- a/apps/msg/internal/service/msg_service.go +++ b/apps/msg/internal/service/msg_service.go @@ -15,13 +15,13 @@ import ( redisv8 "github.com/go-redis/redis/v8" ggrpc "google.golang.org/grpc" - "github.com/go-goim/goim/pkg/consts" - "github.com/go-goim/goim/pkg/log" + "github.com/go-goim/core/pkg/consts" + "github.com/go-goim/core/pkg/log" - messagev1 "github.com/go-goim/goim/api/message/v1" - "github.com/go-goim/goim/apps/msg/internal/app" - "github.com/go-goim/goim/pkg/conn/pool" - "github.com/go-goim/goim/pkg/conn/wrapper" + messagev1 "github.com/go-goim/core/api/message/v1" + "github.com/go-goim/core/apps/msg/internal/app" + "github.com/go-goim/core/pkg/conn/pool" + "github.com/go-goim/core/pkg/conn/wrapper" ) type MqMessageService struct { diff --git a/apps/msg/internal/service/offline_message_service.go b/apps/msg/internal/service/offline_message_service.go index 0930548..6261ada 100644 --- a/apps/msg/internal/service/offline_message_service.go +++ b/apps/msg/internal/service/offline_message_service.go @@ -8,12 +8,12 @@ import ( "github.com/apache/rocketmq-client-go/v2/primitive" redisv8 "github.com/go-redis/redis/v8" - responsepb "github.com/go-goim/goim/api/transport/response" - "github.com/go-goim/goim/pkg/consts" - "github.com/go-goim/goim/pkg/log" + responsepb "github.com/go-goim/core/api/transport/response" + "github.com/go-goim/core/pkg/consts" + "github.com/go-goim/core/pkg/log" - messagev1 "github.com/go-goim/goim/api/message/v1" - "github.com/go-goim/goim/apps/msg/internal/app" + messagev1 "github.com/go-goim/core/api/message/v1" + "github.com/go-goim/core/apps/msg/internal/app" ) type OfflineMessageService struct { diff --git a/apps/push/cmd/main.go b/apps/push/cmd/main.go index 8ff0564..96db894 100644 --- a/apps/push/cmd/main.go +++ b/apps/push/cmd/main.go @@ -6,14 +6,14 @@ import ( "github.com/gin-gonic/gin" - messagev1 "github.com/go-goim/goim/api/message/v1" - "github.com/go-goim/goim/apps/push/internal/app" - "github.com/go-goim/goim/apps/push/internal/router" - "github.com/go-goim/goim/apps/push/internal/service" - "github.com/go-goim/goim/pkg/cmd" - "github.com/go-goim/goim/pkg/graceful" - "github.com/go-goim/goim/pkg/log" - "github.com/go-goim/goim/pkg/mid" + messagev1 "github.com/go-goim/core/api/message/v1" + "github.com/go-goim/core/apps/push/internal/app" + "github.com/go-goim/core/apps/push/internal/router" + "github.com/go-goim/core/apps/push/internal/service" + "github.com/go-goim/core/pkg/cmd" + "github.com/go-goim/core/pkg/graceful" + "github.com/go-goim/core/pkg/log" + "github.com/go-goim/core/pkg/mid" ) var ( diff --git a/apps/push/internal/app/app.go b/apps/push/internal/app/app.go index f78b360..21becd3 100644 --- a/apps/push/internal/app/app.go +++ b/apps/push/internal/app/app.go @@ -1,7 +1,7 @@ package app import ( - "github.com/go-goim/goim/pkg/app" + "github.com/go-goim/core/pkg/app" ) type Application struct { diff --git a/apps/push/internal/router/router.go b/apps/push/internal/router/router.go index 5a98e2d..31ae88c 100644 --- a/apps/push/internal/router/router.go +++ b/apps/push/internal/router/router.go @@ -3,8 +3,8 @@ package router import ( "github.com/gin-gonic/gin" - v1 "github.com/go-goim/goim/apps/push/internal/router/v1" - "github.com/go-goim/goim/pkg/router" + v1 "github.com/go-goim/core/apps/push/internal/router/v1" + "github.com/go-goim/core/pkg/router" ) type rootRouter struct { diff --git a/apps/push/internal/router/v1/conn_router.go b/apps/push/internal/router/v1/conn_router.go index a5dcae6..a9b790c 100644 --- a/apps/push/internal/router/v1/conn_router.go +++ b/apps/push/internal/router/v1/conn_router.go @@ -7,10 +7,10 @@ import ( "github.com/gin-gonic/gin" "github.com/gorilla/websocket" - "github.com/go-goim/goim/apps/push/internal/service" - "github.com/go-goim/goim/pkg/mid" - "github.com/go-goim/goim/pkg/response" - "github.com/go-goim/goim/pkg/router" + "github.com/go-goim/core/apps/push/internal/service" + "github.com/go-goim/core/pkg/mid" + "github.com/go-goim/core/pkg/response" + "github.com/go-goim/core/pkg/router" ) type ConnRouter struct { diff --git a/apps/push/internal/router/v1/v1.go b/apps/push/internal/router/v1/v1.go index 79528a1..d25edd0 100644 --- a/apps/push/internal/router/v1/v1.go +++ b/apps/push/internal/router/v1/v1.go @@ -1,7 +1,7 @@ package v1 import ( - "github.com/go-goim/goim/pkg/router" + "github.com/go-goim/core/pkg/router" ) type Router struct { diff --git a/apps/push/internal/service/push_message.go b/apps/push/internal/service/push_message.go index 32c23b5..a1b404a 100644 --- a/apps/push/internal/service/push_message.go +++ b/apps/push/internal/service/push_message.go @@ -7,14 +7,14 @@ import ( "github.com/gorilla/websocket" - responsepb "github.com/go-goim/goim/api/transport/response" - "github.com/go-goim/goim/pkg/log" - - messagev1 "github.com/go-goim/goim/api/message/v1" - "github.com/go-goim/goim/pkg/conn/pool" - "github.com/go-goim/goim/pkg/conn/wrapper" - "github.com/go-goim/goim/pkg/graceful" - "github.com/go-goim/goim/pkg/worker" + responsepb "github.com/go-goim/core/api/transport/response" + "github.com/go-goim/core/pkg/log" + + messagev1 "github.com/go-goim/core/api/message/v1" + "github.com/go-goim/core/pkg/conn/pool" + "github.com/go-goim/core/pkg/conn/wrapper" + "github.com/go-goim/core/pkg/graceful" + "github.com/go-goim/core/pkg/worker" ) type PushMessager struct { diff --git a/apps/push/internal/service/ws_service.go b/apps/push/internal/service/ws_service.go index 8e71757..428f871 100644 --- a/apps/push/internal/service/ws_service.go +++ b/apps/push/internal/service/ws_service.go @@ -6,12 +6,12 @@ import ( "github.com/gorilla/websocket" - "github.com/go-goim/goim/pkg/consts" - "github.com/go-goim/goim/pkg/log" + "github.com/go-goim/core/pkg/consts" + "github.com/go-goim/core/pkg/log" - "github.com/go-goim/goim/apps/push/internal/app" - "github.com/go-goim/goim/pkg/conn/pool" - "github.com/go-goim/goim/pkg/conn/wrapper" + "github.com/go-goim/core/apps/push/internal/app" + "github.com/go-goim/core/pkg/conn/pool" + "github.com/go-goim/core/pkg/conn/wrapper" ) func HandleWsConn(ctx context.Context, c *websocket.Conn, uid string) { diff --git a/apps/user/cmd/main.go b/apps/user/cmd/main.go index 95eeeab..4d31d5b 100644 --- a/apps/user/cmd/main.go +++ b/apps/user/cmd/main.go @@ -5,15 +5,15 @@ import ( "github.com/gin-gonic/gin" - friendpb "github.com/go-goim/goim/api/user/friend/v1" - userv1 "github.com/go-goim/goim/api/user/v1" - "github.com/go-goim/goim/apps/user/internal/app" - "github.com/go-goim/goim/apps/user/internal/router" - "github.com/go-goim/goim/apps/user/internal/service" - "github.com/go-goim/goim/pkg/cmd" - "github.com/go-goim/goim/pkg/graceful" - "github.com/go-goim/goim/pkg/log" - "github.com/go-goim/goim/pkg/mid" + friendpb "github.com/go-goim/core/api/user/friend/v1" + userv1 "github.com/go-goim/core/api/user/v1" + "github.com/go-goim/core/apps/user/internal/app" + "github.com/go-goim/core/apps/user/internal/router" + "github.com/go-goim/core/apps/user/internal/service" + "github.com/go-goim/core/pkg/cmd" + "github.com/go-goim/core/pkg/graceful" + "github.com/go-goim/core/pkg/log" + "github.com/go-goim/core/pkg/mid" ) func main() { diff --git a/apps/user/internal/app/app.go b/apps/user/internal/app/app.go index 5142d03..2331d07 100644 --- a/apps/user/internal/app/app.go +++ b/apps/user/internal/app/app.go @@ -1,7 +1,7 @@ package app import ( - "github.com/go-goim/goim/pkg/app" + "github.com/go-goim/core/pkg/app" ) type Application struct { diff --git a/apps/user/internal/dao/friend_dao.go b/apps/user/internal/dao/friend_dao.go index 226c714..bf4a8b1 100644 --- a/apps/user/internal/dao/friend_dao.go +++ b/apps/user/internal/dao/friend_dao.go @@ -8,9 +8,9 @@ import ( "gorm.io/gorm" - "github.com/go-goim/goim/apps/user/internal/data" - "github.com/go-goim/goim/pkg/cache" - "github.com/go-goim/goim/pkg/db" + "github.com/go-goim/core/apps/user/internal/data" + "github.com/go-goim/core/pkg/cache" + "github.com/go-goim/core/pkg/db" ) type FriendDao struct{} diff --git a/apps/user/internal/dao/friend_request_dao.go b/apps/user/internal/dao/friend_request_dao.go index e9c95d2..006fe98 100644 --- a/apps/user/internal/dao/friend_request_dao.go +++ b/apps/user/internal/dao/friend_request_dao.go @@ -7,8 +7,8 @@ import ( "gorm.io/gorm" - "github.com/go-goim/goim/apps/user/internal/data" - "github.com/go-goim/goim/pkg/db" + "github.com/go-goim/core/apps/user/internal/data" + "github.com/go-goim/core/pkg/db" ) type FriendRequestDao struct { diff --git a/apps/user/internal/dao/user_dao.go b/apps/user/internal/dao/user_dao.go index 5940c36..ade3e62 100644 --- a/apps/user/internal/dao/user_dao.go +++ b/apps/user/internal/dao/user_dao.go @@ -10,13 +10,13 @@ import ( redisv8 "github.com/go-redis/redis/v8" "gorm.io/gorm" - "github.com/go-goim/goim/apps/user/internal/app" - "github.com/go-goim/goim/apps/user/internal/data" - "github.com/go-goim/goim/pkg/cache" - "github.com/go-goim/goim/pkg/consts" - "github.com/go-goim/goim/pkg/db" - "github.com/go-goim/goim/pkg/log" - "github.com/go-goim/goim/pkg/util" + "github.com/go-goim/core/apps/user/internal/app" + "github.com/go-goim/core/apps/user/internal/data" + "github.com/go-goim/core/pkg/cache" + "github.com/go-goim/core/pkg/consts" + "github.com/go-goim/core/pkg/db" + "github.com/go-goim/core/pkg/log" + "github.com/go-goim/core/pkg/util" ) var ( diff --git a/apps/user/internal/data/friend.go b/apps/user/internal/data/friend.go index 8444647..fb6991d 100644 --- a/apps/user/internal/data/friend.go +++ b/apps/user/internal/data/friend.go @@ -1,7 +1,7 @@ package data import ( - friendpb "github.com/go-goim/goim/api/user/friend/v1" + friendpb "github.com/go-goim/core/api/user/friend/v1" ) // Friend is the model of user relation table based on gorm, which is used for user relation management. diff --git a/apps/user/internal/data/friend_request.go b/apps/user/internal/data/friend_request.go index 8257d7d..577e868 100644 --- a/apps/user/internal/data/friend_request.go +++ b/apps/user/internal/data/friend_request.go @@ -1,7 +1,7 @@ package data import ( - friendpb "github.com/go-goim/goim/api/user/friend/v1" + friendpb "github.com/go-goim/core/api/user/friend/v1" ) // FriendRequest is the model of fiend request table based on gorm, which is used for add friend request. diff --git a/apps/user/internal/data/user.go b/apps/user/internal/data/user.go index e4ace03..2a8a158 100644 --- a/apps/user/internal/data/user.go +++ b/apps/user/internal/data/user.go @@ -1,7 +1,7 @@ package data import ( - userv1 "github.com/go-goim/goim/api/user/v1" + userv1 "github.com/go-goim/core/api/user/v1" ) // User is the model of user table based on gorm, which contains user basic info. diff --git a/apps/user/internal/router/router.go b/apps/user/internal/router/router.go index 0616bc7..2354eef 100644 --- a/apps/user/internal/router/router.go +++ b/apps/user/internal/router/router.go @@ -3,8 +3,8 @@ package router import ( "github.com/gin-gonic/gin" - v1 "github.com/go-goim/goim/apps/user/internal/router/v1" - "github.com/go-goim/goim/pkg/router" + v1 "github.com/go-goim/core/apps/user/internal/router/v1" + "github.com/go-goim/core/pkg/router" ) type rootRouter struct { diff --git a/apps/user/internal/router/v1/v1.go b/apps/user/internal/router/v1/v1.go index 206add5..cedbaf0 100644 --- a/apps/user/internal/router/v1/v1.go +++ b/apps/user/internal/router/v1/v1.go @@ -1,7 +1,7 @@ package v1 import ( - "github.com/go-goim/goim/pkg/router" + "github.com/go-goim/core/pkg/router" ) type Router struct { diff --git a/apps/user/internal/service/friend_service.go b/apps/user/internal/service/friend_service.go index 6dd127e..0ff61d2 100644 --- a/apps/user/internal/service/friend_service.go +++ b/apps/user/internal/service/friend_service.go @@ -4,14 +4,14 @@ import ( "context" "sync" - responsepb "github.com/go-goim/goim/api/transport/response" - friendpb "github.com/go-goim/goim/api/user/friend/v1" - "github.com/go-goim/goim/apps/user/internal/app" - "github.com/go-goim/goim/apps/user/internal/dao" - "github.com/go-goim/goim/apps/user/internal/data" - "github.com/go-goim/goim/pkg/db" - "github.com/go-goim/goim/pkg/log" - "github.com/go-goim/goim/pkg/util/retry" + responsepb "github.com/go-goim/core/api/transport/response" + friendpb "github.com/go-goim/core/api/user/friend/v1" + "github.com/go-goim/core/apps/user/internal/app" + "github.com/go-goim/core/apps/user/internal/dao" + "github.com/go-goim/core/apps/user/internal/data" + "github.com/go-goim/core/pkg/db" + "github.com/go-goim/core/pkg/log" + "github.com/go-goim/core/pkg/util/retry" ) // FriendService implements friendpb.FriendServiceServer diff --git a/apps/user/internal/service/user_service.go b/apps/user/internal/service/user_service.go index 8e7fa14..aa2f56f 100644 --- a/apps/user/internal/service/user_service.go +++ b/apps/user/internal/service/user_service.go @@ -5,11 +5,11 @@ import ( "fmt" "sync" - responsepb "github.com/go-goim/goim/api/transport/response" - userv1 "github.com/go-goim/goim/api/user/v1" - "github.com/go-goim/goim/apps/user/internal/dao" - "github.com/go-goim/goim/apps/user/internal/data" - "github.com/go-goim/goim/pkg/util" + responsepb "github.com/go-goim/core/api/transport/response" + userv1 "github.com/go-goim/core/api/user/v1" + "github.com/go-goim/core/apps/user/internal/dao" + "github.com/go-goim/core/apps/user/internal/data" + "github.com/go-goim/core/pkg/util" ) // UserService implements userv1.UserServiceServer diff --git a/go.mod b/go.mod index 2a4dfc5..a857b9c 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/go-goim/goim +module github.com/go-goim/core go 1.17 diff --git a/pkg/app/application.go b/pkg/app/application.go index b6ab529..f12da47 100644 --- a/pkg/app/application.go +++ b/pkg/app/application.go @@ -16,12 +16,12 @@ import ( "github.com/go-kratos/kratos/v2/transport/http" redisv8 "github.com/go-redis/redis/v8" - "github.com/go-goim/goim/pkg/config" - "github.com/go-goim/goim/pkg/db/mysql" - "github.com/go-goim/goim/pkg/db/redis" - "github.com/go-goim/goim/pkg/errors" - "github.com/go-goim/goim/pkg/mq" - "github.com/go-goim/goim/pkg/registry" + "github.com/go-goim/core/pkg/config" + "github.com/go-goim/core/pkg/db/mysql" + "github.com/go-goim/core/pkg/db/redis" + "github.com/go-goim/core/pkg/errors" + "github.com/go-goim/core/pkg/mq" + "github.com/go-goim/core/pkg/registry" ) // Application is a common app entry. diff --git a/pkg/config/config.go b/pkg/config/config.go index d67e513..e3ddf68 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -4,10 +4,10 @@ import ( "github.com/go-kratos/kratos/v2/config" "github.com/go-kratos/kratos/v2/config/file" - registryv1 "github.com/go-goim/goim/api/config/registry/v1" - configv1 "github.com/go-goim/goim/api/config/v1" - "github.com/go-goim/goim/pkg/cmd" - "github.com/go-goim/goim/pkg/log" + registryv1 "github.com/go-goim/core/api/config/registry/v1" + configv1 "github.com/go-goim/core/api/config/v1" + "github.com/go-goim/core/pkg/cmd" + "github.com/go-goim/core/pkg/log" ) // Config contains service config. diff --git a/pkg/config/source.go b/pkg/config/source.go index cc0c5f7..ceaa341 100644 --- a/pkg/config/source.go +++ b/pkg/config/source.go @@ -8,8 +8,8 @@ import ( "github.com/hashicorp/consul/api" clientv3 "go.etcd.io/etcd/client/v3" - registryv1 "github.com/go-goim/goim/api/config/registry/v1" - "github.com/go-goim/goim/pkg/config/consul" + registryv1 "github.com/go-goim/core/api/config/registry/v1" + "github.com/go-goim/core/pkg/config/consul" ) // NewSource create a config source according to the registry info. diff --git a/pkg/conn/pool/idle.go b/pkg/conn/pool/idle.go index 1b4e18d..5f68f36 100644 --- a/pkg/conn/pool/idle.go +++ b/pkg/conn/pool/idle.go @@ -3,7 +3,7 @@ package pool import ( "time" - "github.com/go-goim/goim/pkg/log" + "github.com/go-goim/core/pkg/log" ) type Conn interface { diff --git a/pkg/conn/wrapper/websocket.go b/pkg/conn/wrapper/websocket.go index 518cf71..f13302b 100644 --- a/pkg/conn/wrapper/websocket.go +++ b/pkg/conn/wrapper/websocket.go @@ -4,8 +4,9 @@ import ( "context" "time" - "github.com/go-goim/goim/pkg/log" "github.com/gorilla/websocket" + + "github.com/go-goim/core/pkg/log" ) type WebsocketWrapper struct { diff --git a/pkg/db/context.go b/pkg/db/context.go index bea6ddd..1a74a91 100644 --- a/pkg/db/context.go +++ b/pkg/db/context.go @@ -5,7 +5,7 @@ import ( "gorm.io/gorm" - "github.com/go-goim/goim/pkg/db/mysql" + "github.com/go-goim/core/pkg/db/mysql" ) type transactionCtxKey struct{} diff --git a/pkg/db/mysql/mysql.go b/pkg/db/mysql/mysql.go index a7bc4fe..3601f29 100644 --- a/pkg/db/mysql/mysql.go +++ b/pkg/db/mysql/mysql.go @@ -10,8 +10,8 @@ import ( "gorm.io/gorm" "gorm.io/gorm/logger" - "github.com/go-goim/goim/pkg/graceful" - "github.com/go-goim/goim/pkg/log" + "github.com/go-goim/core/pkg/graceful" + "github.com/go-goim/core/pkg/log" ) var ( diff --git a/pkg/db/mysql/options.go b/pkg/db/mysql/options.go index 5bc1b12..0c2f9e4 100644 --- a/pkg/db/mysql/options.go +++ b/pkg/db/mysql/options.go @@ -3,7 +3,7 @@ package mysql import ( "time" - configv1 "github.com/go-goim/goim/api/config/v1" + configv1 "github.com/go-goim/core/api/config/v1" ) type Option func(*option) diff --git a/pkg/db/redis/options.go b/pkg/db/redis/options.go index d36ff4c..9e8c02a 100644 --- a/pkg/db/redis/options.go +++ b/pkg/db/redis/options.go @@ -3,7 +3,7 @@ package redis import ( "time" - configv1 "github.com/go-goim/goim/api/config/v1" + configv1 "github.com/go-goim/core/api/config/v1" ) type Option func(*options) diff --git a/pkg/graceful/graceful.go b/pkg/graceful/graceful.go index 011b1f8..c91ad83 100644 --- a/pkg/graceful/graceful.go +++ b/pkg/graceful/graceful.go @@ -5,8 +5,8 @@ import ( "sync" "time" - "github.com/go-goim/goim/pkg/errors" - "github.com/go-goim/goim/pkg/log" + "github.com/go-goim/core/pkg/errors" + "github.com/go-goim/core/pkg/log" ) var ( diff --git a/pkg/log/log.go b/pkg/log/log.go index c5ce181..555ad45 100644 --- a/pkg/log/log.go +++ b/pkg/log/log.go @@ -3,7 +3,7 @@ package log import ( kraoslogger "github.com/go-kratos/kratos/v2/log" - configv1 "github.com/go-goim/goim/api/config/v1" + configv1 "github.com/go-goim/core/api/config/v1" ) // define log api and implement diff --git a/pkg/log/option.go b/pkg/log/option.go index 7b87551..4d14ede 100644 --- a/pkg/log/option.go +++ b/pkg/log/option.go @@ -4,7 +4,7 @@ import ( "go.uber.org/zap" "go.uber.org/zap/zapcore" - configv1 "github.com/go-goim/goim/api/config/v1" + configv1 "github.com/go-goim/core/api/config/v1" ) type option struct { diff --git a/pkg/log/zap.go b/pkg/log/zap.go index f73b762..d2ddcdf 100644 --- a/pkg/log/zap.go +++ b/pkg/log/zap.go @@ -10,7 +10,7 @@ import ( "go.uber.org/zap/zapcore" "gopkg.in/natefinch/lumberjack.v2" - configv1 "github.com/go-goim/goim/api/config/v1" + configv1 "github.com/go-goim/core/api/config/v1" ) type zapLogger struct { diff --git a/pkg/mid/auth.go b/pkg/mid/auth.go index 2c309dd..99ea0f6 100644 --- a/pkg/mid/auth.go +++ b/pkg/mid/auth.go @@ -8,7 +8,7 @@ import ( "github.com/gin-gonic/gin" "github.com/golang-jwt/jwt/v4" - "github.com/go-goim/goim/pkg/log" + "github.com/go-goim/core/pkg/log" ) var ( diff --git a/pkg/mid/log.go b/pkg/mid/log.go index 49f4fd9..b7feeda 100644 --- a/pkg/mid/log.go +++ b/pkg/mid/log.go @@ -5,7 +5,7 @@ import ( "github.com/gin-gonic/gin" - "github.com/go-goim/goim/pkg/log" + "github.com/go-goim/core/pkg/log" ) func Logger(c *gin.Context) { diff --git a/pkg/registry/consul/consul.go b/pkg/registry/consul/consul.go index 02315af..0873a40 100644 --- a/pkg/registry/consul/consul.go +++ b/pkg/registry/consul/consul.go @@ -9,9 +9,10 @@ import ( "strings" "time" - "github.com/go-goim/goim/pkg/log" "github.com/go-kratos/kratos/v2/registry" + "github.com/go-goim/core/pkg/log" + "github.com/hashicorp/consul/api" ) diff --git a/pkg/registry/consul/watcher.go b/pkg/registry/consul/watcher.go index ebb7662..d4828b2 100644 --- a/pkg/registry/consul/watcher.go +++ b/pkg/registry/consul/watcher.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/consul/api" "github.com/hashicorp/consul/api/watch" - "github.com/go-goim/goim/pkg/log" + "github.com/go-goim/core/pkg/log" ) type consulWatcher struct { diff --git a/pkg/registry/registry.go b/pkg/registry/registry.go index e567723..76561ca 100644 --- a/pkg/registry/registry.go +++ b/pkg/registry/registry.go @@ -9,9 +9,9 @@ import ( "github.com/hashicorp/consul/api" clientv3 "go.etcd.io/etcd/client/v3" - "github.com/go-goim/goim/pkg/registry/consul" + "github.com/go-goim/core/pkg/registry/consul" - registryv1 "github.com/go-goim/goim/api/config/registry/v1" + registryv1 "github.com/go-goim/core/api/config/registry/v1" ) var ( diff --git a/pkg/request/jsonpb.go b/pkg/request/jsonpb.go index 4867bc6..0f5967b 100644 --- a/pkg/request/jsonpb.go +++ b/pkg/request/jsonpb.go @@ -9,8 +9,8 @@ import ( "google.golang.org/protobuf/encoding/protojson" "google.golang.org/protobuf/proto" - responsepb "github.com/go-goim/goim/api/transport/response" - "github.com/go-goim/goim/pkg/mid" + responsepb "github.com/go-goim/core/api/transport/response" + "github.com/go-goim/core/pkg/mid" ) type PbJSONBinding struct { diff --git a/pkg/response/gin_resp.go b/pkg/response/gin_resp.go index 4043f6f..e15e8be 100644 --- a/pkg/response/gin_resp.go +++ b/pkg/response/gin_resp.go @@ -5,8 +5,8 @@ import ( "github.com/gin-gonic/gin" - responsepb "github.com/go-goim/goim/api/transport/response" - "github.com/go-goim/goim/pkg/log" + responsepb "github.com/go-goim/core/api/transport/response" + "github.com/go-goim/core/pkg/log" ) func ErrorResp(c *gin.Context, err error) { diff --git a/pkg/response/response.go b/pkg/response/response.go index b1c66d8..bacc003 100644 --- a/pkg/response/response.go +++ b/pkg/response/response.go @@ -1,7 +1,7 @@ package response import ( - responsepb "github.com/go-goim/goim/api/transport/response" + responsepb "github.com/go-goim/core/api/transport/response" ) type BaseResponse struct { diff --git a/pkg/util/retry/retry.go b/pkg/util/retry/retry.go index 982eee6..5457802 100644 --- a/pkg/util/retry/retry.go +++ b/pkg/util/retry/retry.go @@ -6,8 +6,8 @@ import ( "fmt" "time" - "github.com/go-goim/goim/pkg/log" - "github.com/go-goim/goim/pkg/mq" + "github.com/go-goim/core/pkg/log" + "github.com/go-goim/core/pkg/mq" ) func Retry(f func() error, opts ...Option) error { diff --git a/pkg/worker/pool.go b/pkg/worker/pool.go index 5dc5d73..d5436d2 100644 --- a/pkg/worker/pool.go +++ b/pkg/worker/pool.go @@ -8,7 +8,7 @@ import ( "go.uber.org/atomic" - "github.com/go-goim/goim/pkg/util" + "github.com/go-goim/core/pkg/util" ) // Pool is a buffered worker pool diff --git a/pkg/worker/worker_set.go b/pkg/worker/worker_set.go index 5adc83a..faebe33 100644 --- a/pkg/worker/worker_set.go +++ b/pkg/worker/worker_set.go @@ -8,7 +8,7 @@ import ( "go.uber.org/atomic" - "github.com/go-goim/goim/pkg/errors" + "github.com/go-goim/core/pkg/errors" ) // workerSet represent a group of task handle workers diff --git a/swagger.go b/swagger.go index a2993ed..cde4adb 100644 --- a/swagger.go +++ b/swagger.go @@ -11,7 +11,7 @@ package main // @contact.email yusankurban@gmail.com // @license.name MIT -// @license.url https://github.com/go-goim/goim/blob/main/LICENSE +// @license.url https://github.com/go-goim/core/blob/main/LICENSE // @BasePath / func main() {} diff --git a/swagger/docs.go b/swagger/docs.go index b1c47c6..fc9eb9b 100644 --- a/swagger/docs.go +++ b/swagger/docs.go @@ -18,7 +18,7 @@ const docTemplate = `{ }, "license": { "name": "MIT", - "url": "https://github.com/go-goim/goim/blob/main/LICENSE" + "url": "https://github.com/go-goim/core/blob/main/LICENSE" }, "version": "{{.Version}}" }, diff --git a/tests/batch-user/main.go b/tests/batch-user/main.go index df3d8dd..72eac79 100644 --- a/tests/batch-user/main.go +++ b/tests/batch-user/main.go @@ -4,7 +4,7 @@ import ( "flag" "fmt" - "github.com/go-goim/goim/pkg/waitgroup" + "github.com/go-goim/core/pkg/waitgroup" ) func main() { diff --git a/tests/batch-user/user.go b/tests/batch-user/user.go index 3e0ac85..c7cb8f8 100644 --- a/tests/batch-user/user.go +++ b/tests/batch-user/user.go @@ -9,8 +9,8 @@ import ( "net/http" "strings" - userv1 "github.com/go-goim/goim/api/user/v1" - "github.com/go-goim/goim/pkg/response" + userv1 "github.com/go-goim/core/api/user/v1" + "github.com/go-goim/core/pkg/response" ) var ( diff --git a/tests/client-bench/main.go b/tests/client-bench/main.go index becffa2..e257024 100644 --- a/tests/client-bench/main.go +++ b/tests/client-bench/main.go @@ -14,7 +14,7 @@ import ( "syscall" "time" - messagev1 "github.com/go-goim/goim/api/message/v1" + messagev1 "github.com/go-goim/core/api/message/v1" ) var ( diff --git a/tests/client-gui/client.go b/tests/client-gui/client.go index fdf662a..c812f04 100644 --- a/tests/client-gui/client.go +++ b/tests/client-gui/client.go @@ -15,7 +15,7 @@ import ( "github.com/gorilla/websocket" "github.com/jroimartin/gocui" - messagev1 "github.com/go-goim/goim/api/message/v1" + messagev1 "github.com/go-goim/core/api/message/v1" ) var (