update

Dockerfile_business

@@ -13,7 +13,7 @@ WORKDIR /go/release
 ADD . .
 
 # 编译：把main.go编译成可执行的二进制文件，命名为egg_im
-RUN GOOS=linux CGO_ENABLED=0 GOARCH=amd64 go build -o egg_im cmd/business/main.go
+RUN GOOS=linux CGO_ENABLED=0 GOARCH=amd64 go build -o egg-im cmd/business/main.go
 
 FROM ubuntu:xenial as prod
 LABEL maintainer="dengbiao"
@@ -25,7 +25,7 @@ RUN rm -f /etc/localtime \
     && echo $TZ > /etc/timezone
 
 # 在build阶段复制可执行的go二进制文件app
-COPY --from=build /go/release/egg_im ./egg_im
+COPY --from=build /go/release/egg-im ./egg-im
 
 # 启动服务
 # 优化内核参数
@@ -33,5 +33,5 @@ COPY --from=build /go/release/egg_im ./egg_im
 #RUN sysctl -w net.ipv4.tcp_tw_recycle=1
 #RUN sysctl -w net.ipv4.ip_local_port_range=1024 65535
 #RUN sysctl -p
-#CMD ["bash","-c","sysctl -w net.ipv4.tcp_timestamps=1 && sysctl -w net.ipv4.tcp_tw_reuse=1 && sysctl -w net.ipv4.tcp_tw_timeout=10 && sysctl -w net.ipv4.tcp_fin_timeout=10 && sysctl -w net.ipv4.ip_local_port_range='1024 65535' && ./egg_im"]
-CMD ["./egg_im"]
+#CMD ["bash","-c","sysctl -w net.ipv4.tcp_timestamps=1 && sysctl -w net.ipv4.tcp_tw_reuse=1 && sysctl -w net.ipv4.tcp_tw_timeout=10 && sysctl -w net.ipv4.tcp_fin_timeout=10 && sysctl -w net.ipv4.ip_local_port_range='1024 65535' && ./egg-im"]
+CMD ["./egg-im"]

Dockerfile_connect

@@ -13,7 +13,7 @@ WORKDIR /go/release
 ADD . .
 
 # 编译：把main.go编译成可执行的二进制文件，命名为egg_im
-RUN GOOS=linux CGO_ENABLED=0 GOARCH=amd64 go build -o egg_im cmd/connect/main.go
+RUN GOOS=linux CGO_ENABLED=0 GOARCH=amd64 go build -o egg-im cmd/connect/main.go
 
 FROM ubuntu:xenial as prod
 LABEL maintainer="dengbiao"
@@ -25,7 +25,7 @@ RUN rm -f /etc/localtime \
     && echo $TZ > /etc/timezone
 
 # 在build阶段复制可执行的go二进制文件app
-COPY --from=build /go/release/egg_im ./egg_im
+COPY --from=build /go/release/egg-im ./egg-im
 
 # 启动服务
 # 优化内核参数
@@ -33,5 +33,5 @@ COPY --from=build /go/release/egg_im ./egg_im
 #RUN sysctl -w net.ipv4.tcp_tw_recycle=1
 #RUN sysctl -w net.ipv4.ip_local_port_range=1024 65535
 #RUN sysctl -p
-#CMD ["bash","-c","sysctl -w net.ipv4.tcp_timestamps=1 && sysctl -w net.ipv4.tcp_tw_reuse=1 && sysctl -w net.ipv4.tcp_tw_timeout=10 && sysctl -w net.ipv4.tcp_fin_timeout=10 && sysctl -w net.ipv4.ip_local_port_range='1024 65535' && ./egg_im"]
-CMD ["./egg_im"]
+#CMD ["bash","-c","sysctl -w net.ipv4.tcp_timestamps=1 && sysctl -w net.ipv4.tcp_tw_reuse=1 && sysctl -w net.ipv4.tcp_tw_timeout=10 && sysctl -w net.ipv4.tcp_fin_timeout=10 && sysctl -w net.ipv4.ip_local_port_range='1024 65535' && ./egg-im"]
+CMD ["./egg-im"]

Dockerfile_logic

@@ -13,7 +13,7 @@ WORKDIR /go/release
 ADD . .
 
 # 编译：把main.go编译成可执行的二进制文件，命名为egg_im
-RUN GOOS=linux CGO_ENABLED=0 GOARCH=amd64 go build -o egg_im cmd/logic/main.go
+RUN GOOS=linux CGO_ENABLED=0 GOARCH=amd64 go build -o egg-im cmd/logic/main.go
 
 FROM ubuntu:xenial as prod
 LABEL maintainer="dengbiao"
@@ -25,7 +25,7 @@ RUN rm -f /etc/localtime \
     && echo $TZ > /etc/timezone
 
 # 在build阶段复制可执行的go二进制文件app
-COPY --from=build /go/release/egg_im ./egg_im
+COPY --from=build /go/release/egg-im ./egg-im
 
 # 启动服务
 # 优化内核参数
@@ -33,5 +33,5 @@ COPY --from=build /go/release/egg_im ./egg_im
 #RUN sysctl -w net.ipv4.tcp_tw_recycle=1
 #RUN sysctl -w net.ipv4.ip_local_port_range=1024 65535
 #RUN sysctl -p
-#CMD ["bash","-c","sysctl -w net.ipv4.tcp_timestamps=1 && sysctl -w net.ipv4.tcp_tw_reuse=1 && sysctl -w net.ipv4.tcp_tw_timeout=10 && sysctl -w net.ipv4.tcp_fin_timeout=10 && sysctl -w net.ipv4.ip_local_port_range='1024 65535' && ./egg_im"]
-CMD ["./egg_im"]
+#CMD ["bash","-c","sysctl -w net.ipv4.tcp_timestamps=1 && sysctl -w net.ipv4.tcp_tw_reuse=1 && sysctl -w net.ipv4.tcp_tw_timeout=10 && sysctl -w net.ipv4.tcp_fin_timeout=10 && sysctl -w net.ipv4.ip_local_port_range='1024 65535' && ./egg-im"]
+CMD ["./egg-im"]

README.md

@@ -97,4 +97,4 @@ APP截图：
 如果觉得项目对你有帮助，请支持一下  
 ![pay.png](https://upload-images.jianshu.io/upload_images/5760439-7aac91bc83c8735f.png?imageMogr2/auto-orient/strip%7CimageView2/2/w/310)
 ### github
-https://github.com/alberliu/egg_im
+https://github.com/alberliu/egg-im

chart/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v2
-name: egg_im
+name: egg-im
 description: A Helm chart for Kubernetes
 
 # A chart can be either an 'application' or a 'library' chart.

chart/templates/configmap/configmap-prd.yaml

@@ -4,7 +4,7 @@ metadata:
   name: config
 data:
   # 类属性键；每一个键都映射到一个简单的值，仅仅支持键值对，不支持嵌套
-  mysql: "root:ZHIoscnfnuo123@@tcp(zhios123.rwlb.rds.aliyuncs.com:3306)/egg_im?charset=utf8&parseTime=true"
+  mysql: "root:ZHIoscnfnuo123@@tcp(zhios123.rwlb.rds.aliyuncs.com:3306)/egg-im?charset=utf8&parseTime=true"
   redisIP: "116.62.62.35:6379"
   redisPassword: "dengsanhu"
   pushRoomSubscribeNum: "100"

chart/templates/configmap/configmap.yaml

@@ -4,7 +4,7 @@ metadata:
   name: config
 data:
   # 类属性键；每一个键都映射到一个简单的值，仅仅支持键值对，不支持嵌套
-  mysql: "root:Fnuo123com@@tcp(119.23.182.117:3306)/egg_im?charset=utf8&parseTime=true"
+  mysql: "root:Fnuo123com@@tcp(119.23.182.117:3306)/egg-im?charset=utf8&parseTime=true"
   redisIP: "120.24.28.6:32572"
   redisPassword: ""
   pushRoomSubscribeNum: "100"

chart/templates/role/cluster_role.yaml

@@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   name: pod-role
-  namespace: egg_im
+  namespace: egg-im
 rules:
   - apiGroups:
       - ""
@@ -32,4 +32,4 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: default
-    namespace: egg_im
+    namespace: egg-im

cmd/business/main.go

@@ -1,13 +1,13 @@
 package main
 
 import (
-	"egg_im/config"
-	"egg_im/internal/business/api"
-	"egg_im/pkg/db"
-	"egg_im/pkg/interceptor"
-	"egg_im/pkg/logger"
-	"egg_im/pkg/pb"
-	"egg_im/pkg/urlwhitelist"
+	"egg-im/config"
+	"egg-im/internal/business/api"
+	"egg-im/pkg/db"
+	"egg-im/pkg/interceptor"
+	"egg-im/pkg/logger"
+	"egg-im/pkg/pb"
+	"egg-im/pkg/urlwhitelist"
 	"net"
 	"net/http"
 	_ "net/http/pprof"

cmd/connect/main.go

@@ -2,13 +2,13 @@ package main
 
 import (
 	"context"
-	"egg_im/config"
-	"egg_im/internal/connect"
-	"egg_im/pkg/db"
-	"egg_im/pkg/interceptor"
-	"egg_im/pkg/logger"
-	"egg_im/pkg/pb"
-	"egg_im/pkg/rpc"
+	"egg-im/config"
+	"egg-im/internal/connect"
+	"egg-im/pkg/db"
+	"egg-im/pkg/interceptor"
+	"egg-im/pkg/logger"
+	"egg-im/pkg/pb"
+	"egg-im/pkg/rpc"
 	"google.golang.org/grpc"
 	"net"
 	"os"

cmd/file/main.go

@@ -1,8 +1,8 @@
 package main
 
 import (
-	"egg_im/pkg/logger"
-	"egg_im/pkg/util"
+	"egg-im/pkg/logger"
+	"egg-im/pkg/util"
 	"net/http"
 	"strconv"
 	"strings"

cmd/logic/main.go

@@ -1,15 +1,15 @@
 package main
 
 import (
-	"egg_im/config"
-	"egg_im/internal/logic/api"
-	"egg_im/internal/logic/app"
-	"egg_im/internal/logic/proxy"
-	"egg_im/pkg/db"
-	"egg_im/pkg/interceptor"
-	"egg_im/pkg/logger"
-	"egg_im/pkg/pb"
-	"egg_im/pkg/urlwhitelist"
+	"egg-im/config"
+	"egg-im/internal/logic/api"
+	"egg-im/internal/logic/app"
+	"egg-im/internal/logic/proxy"
+	"egg-im/pkg/db"
+	"egg-im/pkg/interceptor"
+	"egg-im/pkg/logger"
+	"egg-im/pkg/pb"
+	"egg-im/pkg/urlwhitelist"
 	"fmt"
 	"net"
 	"os"

config/config.go

@@ -1,13 +1,9 @@
 package config
 
 import (
-	"context"
-	"egg_im/pkg/k8sutil"
-	"egg_im/pkg/logger"
+	"egg-im/pkg/logger"
 	"go.uber.org/zap"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"os"
-	"strconv"
 )
 
 const (
@@ -21,7 +17,7 @@ const (
 
 var (
 	NameSpace     string = "egg-im"
-	MySQL         string = "root:Fnuo123com@@tcp(119.23.182.117:3306)/egg_im?charset=utf8&parseTime=true&loc=Local"
+	MySQL         string = "root:Fnuo123com@@tcp(119.23.182.117:3306)/egg-im?charset=utf8&parseTime=true&loc=Local"
 	RedisIP       string = "120.24.28.6:32572"
 	RedisPassword string = ""
 
@@ -31,26 +27,26 @@ var (
 )
 
 func Init() {
-	k8sClient, err := k8sutil.GetK8sClient()
-	if err != nil {
-		panic(err)
-	}
-	configmap, err := k8sClient.CoreV1().ConfigMaps(NameSpace).Get(context.TODO(), "config", metav1.GetOptions{})
-	if err != nil {
-		panic(err)
-	}
-
-	MySQL = configmap.Data["mysql"]
-	RedisIP = configmap.Data["redisIP"]
-	RedisPassword = configmap.Data["redisPassword"]
-	PushRoomSubscribeNum, _ = strconv.Atoi(configmap.Data["pushRoomSubscribeNum"])
-	if PushRoomSubscribeNum == 0 {
-		panic("PushRoomSubscribeNum == 0")
-	}
-	PushAllSubscribeNum, _ = strconv.Atoi(configmap.Data["pushAllSubscribeNum"])
-	if PushRoomSubscribeNum == 0 {
-		panic("PushAllSubscribeNum == 0")
-	}
+	//k8sClient, err := k8sutil.GetK8sClient()
+	//if err != nil {
+	//	panic(err)
+	//}
+	//configmap, err := k8sClient.CoreV1().ConfigMaps(NameSpace).Get(context.TODO(), "config", metav1.GetOptions{})
+	//if err != nil {
+	//	panic(err)
+	//}
+	//
+	//MySQL = configmap.Data["mysql"]
+	//RedisIP = configmap.Data["redisIP"]
+	//RedisPassword = configmap.Data["redisPassword"]
+	//PushRoomSubscribeNum, _ = strconv.Atoi(configmap.Data["pushRoomSubscribeNum"])
+	//if PushRoomSubscribeNum == 0 {
+	//	panic("PushRoomSubscribeNum == 0")
+	//}
+	//PushAllSubscribeNum, _ = strconv.Atoi(configmap.Data["pushAllSubscribeNum"])
+	//if PushRoomSubscribeNum == 0 {
+	//	panic("PushAllSubscribeNum == 0")
+	//}
 
 	LocalAddr = os.Getenv("POD_IP") + RPCListenAddr
 

go.mod

@@ -1,4 +1,4 @@
-module egg_im
+module egg-im
 
 go 1.19
 

internal/business/api/business_ext.go

@@ -2,16 +2,16 @@ package api
 
 import (
 	"context"
-	"egg_im/internal/business/app"
-	comm "egg_im/internal/business/comm"
-	"egg_im/internal/business/comm/utils"
-	"egg_im/internal/business/domain/user/repo"
-	friend2 "egg_im/internal/logic/domain/friend"
-	"egg_im/internal/logic/domain/group/model"
-	repo2 "egg_im/internal/logic/domain/group/repo"
-	"egg_im/internal/logic/domain/message/service"
-	"egg_im/pkg/grpclib"
-	"egg_im/pkg/pb"
+	"egg-im/internal/business/app"
+	comm "egg-im/internal/business/comm"
+	"egg-im/internal/business/comm/utils"
+	"egg-im/internal/business/domain/user/repo"
+	friend2 "egg-im/internal/logic/domain/friend"
+	"egg-im/internal/logic/domain/group/model"
+	repo2 "egg-im/internal/logic/domain/group/repo"
+	"egg-im/internal/logic/domain/message/service"
+	"egg-im/pkg/grpclib"
+	"egg-im/pkg/pb"
 	"encoding/json"
 	"errors"
 	"strconv"

internal/business/api/business_ext_test.go

@@ -2,7 +2,7 @@ package api
 
 import (
 	"context"
-	"egg_im/pkg/pb"
+	"egg-im/pkg/pb"
 	"fmt"
 	"strconv"
 	"testing"

internal/business/api/business_int.go

@@ -2,8 +2,8 @@ package api
 
 import (
 	"context"
-	"egg_im/internal/business/app"
-	"egg_im/pkg/pb"
+	"egg-im/internal/business/app"
+	"egg-im/pkg/pb"
 )
 
 type BusinessIntServer struct{}

internal/business/api/business_int_test.go

@@ -1,7 +1,7 @@
 package api
 
 import (
-	"egg_im/pkg/pb"
+	"egg-im/pkg/pb"
 	"fmt"
 	"testing"
 

internal/business/app/auth_app.go

@@ -2,7 +2,7 @@ package app
 
 import (
 	"context"
-	"egg_im/internal/business/domain/user/service"
+	"egg-im/internal/business/domain/user/service"
 )
 
 type authApp struct{}

internal/business/app/user_app.go

@@ -2,9 +2,9 @@ package app
 
 import (
 	"context"
-	"egg_im/internal/business/comm/utils"
-	"egg_im/internal/business/domain/user/repo"
-	"egg_im/pkg/pb"
+	"egg-im/internal/business/comm/utils"
+	"egg-im/internal/business/domain/user/repo"
+	"egg-im/pkg/pb"
 	"time"
 )
 

internal/business/comm/cloud_upload.go

@@ -2,7 +2,7 @@ package app
 
 import (
 	"context"
-	svc "egg_im/internal/business/comm/service"
+	svc "egg-im/internal/business/comm/service"
 	"fmt"
 )
 

internal/business/comm/db/db_emoticon.go

@@ -1,9 +1,9 @@
 package db
 
 import (
-	"egg_im/internal/business/comm/db/model"
-	"egg_im/pkg/db"
-	"egg_im/pkg/gerrors"
+	"egg-im/internal/business/comm/db/model"
+	"egg-im/pkg/db"
+	"egg-im/pkg/gerrors"
 )
 
 type dbEmoticon struct{}

internal/business/comm/db/db_sys_cfg.go

@@ -1,11 +1,11 @@
 package db
 
 import (
-	"egg_im/internal/business/comm/db/model"
-	"egg_im/internal/business/comm/md"
-	"egg_im/internal/business/comm/utils/logx"
-	"egg_im/pkg/db"
-	"egg_im/pkg/gerrors"
+	"egg-im/internal/business/comm/db/model"
+	"egg-im/internal/business/comm/md"
+	"egg-im/internal/business/comm/utils/logx"
+	"egg-im/pkg/db"
+	"egg-im/pkg/gerrors"
 	"fmt"
 )
 

internal/business/comm/db/db_user_push_for_jg.go

@@ -1,11 +1,11 @@
 package db
 
 import (
-	"egg_im/internal/business/comm/db/model"
-	"egg_im/internal/business/comm/md"
-	"egg_im/internal/business/comm/utils/logx"
-	"egg_im/pkg/db"
-	"egg_im/pkg/gerrors"
+	"egg-im/internal/business/comm/db/model"
+	"egg-im/internal/business/comm/md"
+	"egg-im/internal/business/comm/utils/logx"
+	"egg-im/pkg/db"
+	"egg-im/pkg/gerrors"
 	"fmt"
 	"github.com/jinzhu/gorm"
 )

internal/business/comm/db/model/emoticon.go

@@ -1,6 +1,6 @@
 package model
 
-import "egg_im/pkg/pb"
+import "egg-im/pkg/pb"
 
 type Emoticon struct {
 	Id       int64

internal/business/comm/service/qiniu/init.go

@@ -1,7 +1,7 @@
 package qiniu
 
 import (
-	"egg_im/internal/business/comm/utils"
+	"egg-im/internal/business/comm/utils"
 )
 
 var (

internal/business/comm/service/qiniu/req_img_upload.go

@@ -1,8 +1,8 @@
 package qiniu
 
 import (
-	"egg_im/internal/business/comm/md"
-	"egg_im/internal/business/comm/utils"
+	"egg-im/internal/business/comm/md"
+	"egg-im/internal/business/comm/utils"
 	"time"
 
 	"github.com/qiniu/api.v7/v7/auth/qbox"

internal/business/comm/service/svc_file_upload.go

@@ -2,10 +2,10 @@ package svc
 
 import (
 	"context"
-	"egg_im/internal/business/comm/md"
-	"egg_im/internal/business/comm/service/qiniu"
-	"egg_im/internal/business/comm/utils"
-	"egg_im/internal/business/comm/utils/logx"
+	"egg-im/internal/business/comm/md"
+	"egg-im/internal/business/comm/service/qiniu"
+	"egg-im/internal/business/comm/utils"
+	"egg-im/internal/business/comm/utils/logx"
 	"errors"
 	"fmt"
 	"strings"

internal/business/comm/service/svc_sys_cfg_get.go

@@ -1,9 +1,9 @@
 package svc
 
 import (
-	"egg_im/internal/business/comm/db"
-	"egg_im/internal/business/comm/md"
-	db2 "egg_im/pkg/db"
+	"egg-im/internal/business/comm/db"
+	"egg-im/internal/business/comm/md"
+	db2 "egg-im/pkg/db"
 	"fmt"
 )
 

internal/business/domain/user/model/user.go

@@ -1,7 +1,7 @@
 package model
 
 import (
-	"egg_im/pkg/pb"
+	"egg-im/pkg/pb"
 	"time"
 )
 

internal/business/domain/user/repo/auth_cache.go

@@ -1,10 +1,10 @@
 package repo
 
 import (
-	"egg_im/internal/business/domain/user/model"
-	"egg_im/pkg/db"
-	"egg_im/pkg/gerrors"
-	"egg_im/pkg/util"
+	"egg-im/internal/business/domain/user/model"
+	"egg-im/pkg/db"
+	"egg-im/pkg/gerrors"
+	"egg-im/pkg/util"
 	"encoding/json"
 	"strconv"
 

internal/business/domain/user/repo/auth_cache_test.go

@@ -1,7 +1,7 @@
 package repo
 
 import (
-	"egg_im/internal/business/domain/user/model"
+	"egg-im/internal/business/domain/user/model"
 	"fmt"
 	"testing"
 )

internal/business/domain/user/repo/auth_repo.go

@@ -1,6 +1,6 @@
 package repo
 
-import "egg_im/internal/business/domain/user/model"
+import "egg-im/internal/business/domain/user/model"
 
 type authRepo struct{}
 

internal/business/domain/user/repo/user_cache.go

@@ -1,9 +1,9 @@
 package repo
 
 import (
-	"egg_im/internal/business/domain/user/model"
-	"egg_im/pkg/db"
-	"egg_im/pkg/gerrors"
+	"egg-im/internal/business/domain/user/model"
+	"egg-im/pkg/db"
+	"egg-im/pkg/gerrors"
 	"strconv"
 	"time"
 

internal/business/domain/user/repo/user_dao.go

@@ -1,9 +1,9 @@
 package repo
 
 import (
-	"egg_im/internal/business/domain/user/model"
-	"egg_im/pkg/db"
-	"egg_im/pkg/gerrors"
+	"egg-im/internal/business/domain/user/model"
+	"egg-im/pkg/db"
+	"egg-im/pkg/gerrors"
 	"time"
 
 	"github.com/jinzhu/gorm"

internal/business/domain/user/repo/user_dao_test.go

@@ -1,8 +1,8 @@
 package repo
 
 import (
-	"egg_im/internal/business/domain/user/model"
-	"egg_im/pkg/db"
+	"egg-im/internal/business/domain/user/model"
+	"egg-im/pkg/db"
 	"fmt"
 	"testing"
 )

internal/business/domain/user/repo/user_repo.go

@@ -1,7 +1,7 @@
 package repo
 
 import (
-	"egg_im/internal/business/domain/user/model"
+	"egg-im/internal/business/domain/user/model"
 )
 
 type userRepo struct{}

internal/business/domain/user/service/auth.go

@@ -2,13 +2,13 @@ package service
 
 import (
 	"context"
-	"egg_im/internal/business/comm/db"
-	"egg_im/internal/business/domain/user/model"
-	"egg_im/internal/business/domain/user/repo"
-	"egg_im/pkg/gerrors"
-	"egg_im/pkg/pb"
-	"egg_im/pkg/rpc"
-	"egg_im/pkg/util"
+	"egg-im/internal/business/comm/db"
+	"egg-im/internal/business/domain/user/model"
+	"egg-im/internal/business/domain/user/repo"
+	"egg-im/pkg/gerrors"
+	"egg-im/pkg/pb"
+	"egg-im/pkg/rpc"
+	"egg-im/pkg/util"
 	"errors"
 	"strconv"
 	"time"

internal/connect/api.go

@@ -2,9 +2,9 @@ package connect
 
 import (
 	"context"
-	"egg_im/pkg/grpclib"
-	"egg_im/pkg/logger"
-	"egg_im/pkg/pb"
+	"egg-im/pkg/grpclib"
+	"egg-im/pkg/logger"
+	"egg-im/pkg/pb"
 
 	"go.uber.org/zap"
 )

internal/connect/conn.go

@@ -3,11 +3,11 @@ package connect
 import (
 	"container/list"
 	"context"
-	"egg_im/config"
-	"egg_im/pkg/grpclib"
-	"egg_im/pkg/logger"
-	"egg_im/pkg/pb"
-	"egg_im/pkg/rpc"
+	"egg-im/config"
+	"egg-im/pkg/grpclib"
+	"egg-im/pkg/logger"
+	"egg-im/pkg/pb"
+	"egg-im/pkg/rpc"
 	"sync"
 	"time"
 

internal/connect/conn_manager.go

@@ -1,7 +1,7 @@
 package connect
 
 import (
-	"egg_im/pkg/pb"
+	"egg-im/pkg/pb"
 	"sync"
 )
 

internal/connect/mq.go

@@ -1,11 +1,11 @@
 package connect
 
 import (
-	"egg_im/config"
-	"egg_im/pkg/db"
-	"egg_im/pkg/logger"
-	"egg_im/pkg/mq"
-	"egg_im/pkg/pb"
+	"egg-im/config"
+	"egg-im/pkg/db"
+	"egg-im/pkg/logger"
+	"egg-im/pkg/mq"
+	"egg-im/pkg/pb"
 	"time"
 
 	"github.com/go-redis/redis"

internal/connect/room.go

@@ -2,7 +2,7 @@ package connect
 
 import (
 	"container/list"
-	"egg_im/pkg/pb"
+	"egg-im/pkg/pb"
 	"sync"
 )
 

internal/connect/tcp_server.go

@@ -2,9 +2,9 @@ package connect
 
 import (
 	"context"
-	"egg_im/pkg/logger"
-	"egg_im/pkg/pb"
-	"egg_im/pkg/rpc"
+	"egg-im/pkg/logger"
+	"egg-im/pkg/pb"
+	"egg-im/pkg/rpc"
 	"time"
 
 	"go.uber.org/zap"

internal/connect/ws_server.go

@@ -1,8 +1,8 @@
 package connect
 
 import (
-	"egg_im/pkg/logger"
-	"egg_im/pkg/util"
+	"egg-im/pkg/logger"
+	"egg-im/pkg/util"
 	"io"
 	"net/http"
 	"strings"

internal/logic/api/logic_ext.go

@@ -2,10 +2,10 @@ package api
 
 import (
 	"context"
-	"egg_im/internal/business/comm/utils"
-	"egg_im/internal/logic/app"
-	"egg_im/pkg/grpclib"
-	"egg_im/pkg/pb"
+	"egg-im/internal/business/comm/utils"
+	"egg-im/internal/logic/app"
+	"egg-im/pkg/grpclib"
+	"egg-im/pkg/pb"
 	"google.golang.org/protobuf/proto"
 )
 

internal/logic/api/logic_ext_test.go

@@ -2,11 +2,11 @@ package api
 
 import (
 	"context"
-	"egg_im/config"
-	"egg_im/internal/logic/domain/message/model"
-	"egg_im/pkg/db"
-	"egg_im/pkg/pb"
-	"egg_im/pkg/util"
+	"egg-im/config"
+	"egg-im/internal/logic/domain/message/model"
+	"egg-im/pkg/db"
+	"egg-im/pkg/pb"
+	"egg-im/pkg/util"
 	"fmt"
 	"github.com/jinzhu/gorm"
 	"strconv"

internal/logic/api/logic_int.go

@@ -2,9 +2,9 @@ package api
 
 import (
 	"context"
-	"egg_im/internal/logic/app"
-	"egg_im/pkg/logger"
-	"egg_im/pkg/pb"
+	"egg-im/internal/logic/app"
+	"egg-im/pkg/logger"
+	"egg-im/pkg/pb"
 )
 
 type LogicIntServer struct{}

internal/logic/api/logic_int_test.go

@@ -2,9 +2,9 @@ package api
 
 import (
 	"context"
-	"egg_im/pkg/logger"
-	"egg_im/pkg/pb"
-	"egg_im/pkg/util"
+	"egg-im/pkg/logger"
+	"egg-im/pkg/pb"
+	"egg-im/pkg/util"
 	"fmt"
 	"testing"
 	"time"

internal/logic/app/device_app.go

@@ -2,9 +2,9 @@ package app
 
 import (
 	"context"
-	devicedomain "egg_im/internal/logic/domain/device"
-	"egg_im/pkg/gerrors"
-	"egg_im/pkg/pb"
+	devicedomain "egg-im/internal/logic/domain/device"
+	"egg-im/pkg/gerrors"
+	"egg-im/pkg/pb"
 )
 
 type deviceApp struct{}

internal/logic/app/friend_app.go

@@ -2,8 +2,8 @@ package app
 
 import (
 	"context"
-	frienddomain "egg_im/internal/logic/domain/friend"
-	"egg_im/pkg/pb"
+	frienddomain "egg-im/internal/logic/domain/friend"
+	"egg-im/pkg/pb"
 	"time"
 )
 

internal/logic/app/group_app.go

@@ -3,11 +3,11 @@ package app
 import (
 	"context"
 	"database/sql"
-	"egg_im/internal/logic/domain/group/model"
-	"egg_im/internal/logic/domain/group/repo"
-	"egg_im/pkg/db"
-	"egg_im/pkg/grpclib"
-	"egg_im/pkg/pb"
+	"egg-im/internal/logic/domain/group/model"
+	"egg-im/internal/logic/domain/group/repo"
+	"egg-im/pkg/db"
+	"egg-im/pkg/grpclib"
+	"egg-im/pkg/pb"
 	"errors"
 	"strings"
 )

internal/logic/app/message_app.go

@@ -2,8 +2,8 @@ package app
 
 import (
 	"context"
-	"egg_im/internal/logic/domain/message/service"
-	"egg_im/pkg/pb"
+	"egg-im/internal/logic/domain/message/service"
+	"egg-im/pkg/pb"
 	"time"
 
 	"google.golang.org/protobuf/proto"

internal/logic/app/room_app.go

@@ -2,8 +2,8 @@ package app
 
 import (
 	"context"
-	"egg_im/internal/logic/domain/room"
-	"egg_im/pkg/pb"
+	"egg-im/internal/logic/domain/room"
+	"egg-im/pkg/pb"
 )
 
 type roomApp struct{}

internal/logic/domain/device/device.go

@@ -1,7 +1,7 @@
 package device
 
 import (
-	"egg_im/pkg/pb"
+	"egg-im/pkg/pb"
 	"time"
 )
 

internal/logic/domain/device/device_dao.go

@@ -1,9 +1,9 @@
 package device
 
 import (
-	"egg_im/internal/business/domain/user/model"
-	"egg_im/pkg/db"
-	"egg_im/pkg/gerrors"
+	"egg-im/internal/business/domain/user/model"
+	"egg-im/pkg/db"
+	"egg-im/pkg/gerrors"
 	"time"
 
 	"github.com/jinzhu/gorm"

internal/logic/domain/device/device_dao_test.go

@@ -1,7 +1,7 @@
 package device
 
 import (
-	"egg_im/pkg/db"
+	"egg-im/pkg/db"
 	"fmt"
 	"testing"
 )

internal/logic/domain/device/device_service.go

@@ -2,12 +2,12 @@ package device
 
 import (
 	"context"
-	"egg_im/internal/business/comm/utils"
-	"egg_im/pkg/db"
-	"egg_im/pkg/gerrors"
-	"egg_im/pkg/logger"
-	"egg_im/pkg/pb"
-	"egg_im/pkg/rpc"
+	"egg-im/internal/business/comm/utils"
+	"egg-im/pkg/db"
+	"egg-im/pkg/gerrors"
+	"egg-im/pkg/logger"
+	"egg-im/pkg/pb"
+	"egg-im/pkg/rpc"
 	"errors"
 	"fmt"
 	"time"

internal/logic/domain/device/user_device_cache.go

@@ -1,8 +1,8 @@
 package device
 
 import (
-	"egg_im/pkg/db"
-	"egg_im/pkg/gerrors"
+	"egg-im/pkg/db"
+	"egg-im/pkg/gerrors"
 	"strconv"
 	"time"
 

internal/logic/domain/friend/friend_repo.go

@@ -1,8 +1,8 @@
 package friend
 
 import (
-	"egg_im/pkg/db"
-	"egg_im/pkg/gerrors"
+	"egg-im/pkg/db"
+	"egg-im/pkg/gerrors"
 
 	"github.com/jinzhu/gorm"
 )

internal/logic/domain/friend/friend_service.go

@@ -2,14 +2,14 @@ package friend
 
 import (
 	"context"
-	svc "egg_im/internal/business/comm/service"
-	"egg_im/internal/business/comm/utils"
-	"egg_im/internal/logic/domain/message/repo"
-	"egg_im/internal/logic/proxy"
-	"egg_im/pkg/db"
-	"egg_im/pkg/gerrors"
-	"egg_im/pkg/pb"
-	"egg_im/pkg/rpc"
+	svc "egg-im/internal/business/comm/service"
+	"egg-im/internal/business/comm/utils"
+	"egg-im/internal/logic/domain/message/repo"
+	"egg-im/internal/logic/proxy"
+	"egg-im/pkg/db"
+	"egg-im/pkg/gerrors"
+	"egg-im/pkg/pb"
+	"egg-im/pkg/rpc"
 	"google.golang.org/protobuf/proto"
 	"time"
 )

internal/logic/domain/group/model/group.go

@@ -3,14 +3,14 @@ package model
 import (
 	"context"
 	"database/sql"
-	"egg_im/internal/logic/domain/message/repo"
-	"egg_im/internal/logic/proxy"
-	"egg_im/pkg/gerrors"
-	"egg_im/pkg/grpclib"
-	"egg_im/pkg/logger"
-	"egg_im/pkg/pb"
-	"egg_im/pkg/rpc"
-	"egg_im/pkg/util"
+	"egg-im/internal/logic/domain/message/repo"
+	"egg-im/internal/logic/proxy"
+	"egg-im/pkg/gerrors"
+	"egg-im/pkg/grpclib"
+	"egg-im/pkg/logger"
+	"egg-im/pkg/pb"
+	"egg-im/pkg/rpc"
+	"egg-im/pkg/util"
 	"fmt"
 	"strings"
 	"time"

internal/logic/domain/group/repo/group_cache.go

@@ -1,9 +1,9 @@
 package repo
 
 import (
-	"egg_im/internal/logic/domain/group/model"
-	"egg_im/pkg/db"
-	"egg_im/pkg/gerrors"
+	"egg-im/internal/logic/domain/group/model"
+	"egg-im/pkg/db"
+	"egg-im/pkg/gerrors"
 	"strconv"
 	"time"
 

internal/logic/domain/group/repo/group_complain_dao.go

@@ -1,9 +1,9 @@
 package repo
 
 import (
-	"egg_im/internal/logic/domain/group/model"
-	"egg_im/pkg/db"
-	"egg_im/pkg/gerrors"
+	"egg-im/internal/logic/domain/group/model"
+	"egg-im/pkg/db"
+	"egg-im/pkg/gerrors"
 
 	"github.com/jinzhu/gorm"
 )

internal/logic/domain/group/repo/group_dao.go

@@ -1,9 +1,9 @@
 package repo
 
 import (
-	"egg_im/internal/logic/domain/group/model"
-	"egg_im/pkg/db"
-	"egg_im/pkg/gerrors"
+	"egg-im/internal/logic/domain/group/model"
+	"egg-im/pkg/db"
+	"egg-im/pkg/gerrors"
 
 	"github.com/jinzhu/gorm"
 )

internal/logic/domain/group/repo/group_repo.go

@@ -1,7 +1,7 @@
 package repo
 
 import (
-	"egg_im/internal/logic/domain/group/model"
+	"egg-im/internal/logic/domain/group/model"
 	"strconv"
 )
 

internal/logic/domain/group/repo/group_user_repo.go

@@ -1,11 +1,11 @@
 package repo
 
 import (
-	"egg_im/internal/business/comm/utils"
-	"egg_im/internal/logic/domain/group/model"
-	"egg_im/pkg/db"
-	"egg_im/pkg/gerrors"
-	"egg_im/pkg/pb"
+	"egg-im/internal/business/comm/utils"
+	"egg-im/internal/logic/domain/group/model"
+	"egg-im/pkg/db"
+	"egg-im/pkg/gerrors"
+	"egg-im/pkg/pb"
 
 	"github.com/jinzhu/gorm"
 )

internal/logic/domain/message/md/push.go

@@ -5,7 +5,7 @@ type PushParams struct {
 	PushAlia          string `json:"push_alia"`            //推送别名
 	Title             string `json:"title"`                //标题
 	Content           string `json:"content"`              //内容
-	PushType          string `json:"push_type"`            //推送类型`egg_im`
+	PushType          string `json:"push_type"`            //推送类型`egg-im`
 	MessageType       string `json:"message_type"`         //消息类型`UNKNOWN、TEXT、FACE、VOICE、IMAGE、FILE、LOCATION、COMMAND、CUSTOM`
 	SendUserNickname  string `json:"send_user_nickname"`   //消息发送者-会员昵称
 	SendUserAvatarUrl string `json:"send_user_avatar_url"` //消息发送者-会员头像

internal/logic/domain/message/model/message.go

@@ -1,9 +1,9 @@
 package model
 
 import (
-	"egg_im/pkg/logger"
-	"egg_im/pkg/pb"
-	"egg_im/pkg/util"
+	"egg-im/pkg/logger"
+	"egg-im/pkg/pb"
+	"egg-im/pkg/util"
 	"strconv"
 	"strings"
 	"time"

internal/logic/domain/message/model/sender.go

@@ -1,6 +1,6 @@
 package model
 
-import "egg_im/pkg/pb"
+import "egg-im/pkg/pb"
 
 type Sender struct {
 	SenderType pb.SenderType // 发送者类型，1：系统，2：用户，3：业务方

internal/logic/domain/message/repo/device_ack_repo.go

@@ -1,8 +1,8 @@
 package repo
 
 import (
-	"egg_im/pkg/db"
-	"egg_im/pkg/gerrors"
+	"egg-im/pkg/db"
+	"egg-im/pkg/gerrors"
 	"strconv"
 )
 

internal/logic/domain/message/repo/message_repo.go

@@ -1,10 +1,10 @@
 package repo
 
 import (
-	"egg_im/internal/business/comm/utils"
-	"egg_im/internal/logic/domain/message/model"
-	"egg_im/pkg/db"
-	"egg_im/pkg/gerrors"
+	"egg-im/internal/business/comm/utils"
+	"egg-im/internal/logic/domain/message/model"
+	"egg-im/pkg/db"
+	"egg-im/pkg/gerrors"
 	"fmt"
 	"time"
 )

internal/logic/domain/message/repo/message_repo_test.go

@@ -1,7 +1,7 @@
 package repo
 
 import (
-	"egg_im/internal/logic/domain/message/model"
+	"egg-im/internal/logic/domain/message/model"
 	"fmt"
 	"testing"
 	"time"

internal/logic/domain/message/repo/seq_repo.go

@@ -2,8 +2,8 @@ package repo
 
 import (
 	"database/sql"
-	"egg_im/pkg/db"
-	"egg_im/pkg/gerrors"
+	"egg-im/pkg/db"
+	"egg-im/pkg/gerrors"
 )
 
 const (

internal/logic/domain/message/service/app_push.go

@@ -3,10 +3,10 @@ package service
 import (
 	jg_push "code.fnuoos.com/go_rely_warehouse/zyos_go_jg_push.git/hdl"
 	md2 "code.fnuoos.com/go_rely_warehouse/zyos_go_jg_push.git/md"
-	svc "egg_im/internal/business/comm/service"
-	"egg_im/internal/business/comm/utils"
-	md3 "egg_im/internal/logic/domain/message/md"
-	"egg_im/pkg/logger"
+	svc "egg-im/internal/business/comm/service"
+	"egg-im/internal/business/comm/utils"
+	md3 "egg-im/internal/logic/domain/message/md"
+	"egg-im/pkg/logger"
 	"fmt"
 	"go.uber.org/zap"
 

internal/logic/domain/message/service/device_ack.go

@@ -2,7 +2,7 @@ package service
 
 import (
 	"context"
-	"egg_im/internal/logic/domain/message/repo"
+	"egg-im/internal/logic/domain/message/repo"
 )
 
 type deviceAckService struct{}

internal/logic/domain/message/service/device_ack_test.go

@@ -2,7 +2,7 @@ package service
 
 import (
 	"context"
-	"egg_im/pkg/db"
+	"egg-im/pkg/db"
 	"fmt"
 	"testing"
 )

internal/logic/domain/message/service/emoticon_service.go

@@ -1,8 +1,8 @@
 package service
 
 import (
-	"egg_im/internal/business/comm/db"
-	"egg_im/pkg/pb"
+	"egg-im/internal/business/comm/db"
+	"egg-im/pkg/pb"
 )
 
 func EmoticonList() ([]*pb.Emoticon, error) {

internal/logic/domain/message/service/message_service.go

@@ -2,20 +2,20 @@ package service
 
 import (
 	"context"
-	"egg_im/internal/business/comm/db"
-	svc "egg_im/internal/business/comm/service"
-	"egg_im/internal/business/comm/utils"
-	repo2 "egg_im/internal/business/domain/user/repo"
-	"egg_im/internal/logic/domain/message/md"
-	"egg_im/internal/logic/domain/message/model"
-	"egg_im/internal/logic/domain/message/repo"
-	"egg_im/internal/logic/proxy"
-	"egg_im/pkg/grpclib"
-	"egg_im/pkg/grpclib/picker"
-	"egg_im/pkg/logger"
-	"egg_im/pkg/pb"
-	"egg_im/pkg/rpc"
-	"egg_im/pkg/util"
+	"egg-im/internal/business/comm/db"
+	svc "egg-im/internal/business/comm/service"
+	"egg-im/internal/business/comm/utils"
+	repo2 "egg-im/internal/business/domain/user/repo"
+	"egg-im/internal/logic/domain/message/md"
+	"egg-im/internal/logic/domain/message/model"
+	"egg-im/internal/logic/domain/message/repo"
+	"egg-im/internal/logic/proxy"
+	"egg-im/pkg/grpclib"
+	"egg-im/pkg/grpclib/picker"
+	"egg-im/pkg/logger"
+	"egg-im/pkg/pb"
+	"egg-im/pkg/rpc"
+	"egg-im/pkg/util"
 	"go.uber.org/zap"
 	"google.golang.org/protobuf/proto"
 	"strconv"
@@ -225,7 +225,7 @@ func (*messageService) SendToUser(ctx context.Context, sender *pb.Sender, toUser
 					PushAlia:          alia,
 					Title:             sender.Nickname,
 					Content:           pushContent,
-					PushType:          "egg_im",
+					PushType:          "egg-im",
 					MessageType:       req.MessageType.String(),
 					SendUserNickname:  sender.Nickname,
 					SendUserAvatarUrl: sender.AvatarUrl,

internal/logic/domain/message/service/message_service_test.go

@@ -2,9 +2,9 @@ package service
 
 import (
 	"context"
-	md3 "egg_im/internal/logic/domain/message/md"
-	"egg_im/pkg/pb"
-	"egg_im/pkg/util"
+	md3 "egg-im/internal/logic/domain/message/md"
+	"egg-im/pkg/pb"
+	"egg-im/pkg/util"
 	"fmt"
 	"google.golang.org/grpc/metadata"
 	"google.golang.org/protobuf/proto"
@@ -52,7 +52,7 @@ func Test_CommAddPush(t *testing.T) {
 		PushAlia:          "22255132_21702",
 		Title:             "测试",
 		Content:           "您收到一条新消息，来自会员[消息发送者-会员昵称],发送时间[时间],消息类型[消息类型],备注[备注]",
-		PushType:          "egg_im",
+		PushType:          "egg-im",
 		MessageType:       "text",
 		SendUserNickname:  "fsahfjs",
 		SendUserAvatarUrl: "fafsd",

internal/logic/domain/message/service/push.go

@@ -2,12 +2,12 @@ package service
 
 import (
 	"context"
-	"egg_im/pkg/gerrors"
-	"egg_im/pkg/grpclib"
-	"egg_im/pkg/logger"
-	"egg_im/pkg/mq"
-	"egg_im/pkg/pb"
-	"egg_im/pkg/util"
+	"egg-im/pkg/gerrors"
+	"egg-im/pkg/grpclib"
+	"egg-im/pkg/logger"
+	"egg-im/pkg/mq"
+	"egg-im/pkg/pb"
+	"egg-im/pkg/util"
 	"time"
 
 	"go.uber.org/zap"

internal/logic/domain/message/service/seq.go

@@ -2,7 +2,7 @@ package service
 
 import (
 	"context"
-	"egg_im/internal/logic/domain/message/repo"
+	"egg-im/internal/logic/domain/message/repo"
 )
 
 type seqService struct{}

internal/logic/domain/room/room_message_repo.go

@@ -1,10 +1,10 @@
 package room
 
 import (
-	"egg_im/pkg/db"
-	"egg_im/pkg/gerrors"
-	"egg_im/pkg/pb"
-	"egg_im/pkg/util"
+	"egg-im/pkg/db"
+	"egg-im/pkg/gerrors"
+	"egg-im/pkg/pb"
+	"egg-im/pkg/util"
 	"fmt"
 	"strconv"
 	"time"

internal/logic/domain/room/room_seq_repo.go

@@ -1,8 +1,8 @@
 package room
 
 import (
-	"egg_im/pkg/db"
-	"egg_im/pkg/gerrors"
+	"egg-im/pkg/db"
+	"egg-im/pkg/gerrors"
 	"fmt"
 )
 

internal/logic/domain/room/room_service.go

@@ -2,13 +2,13 @@ package room
 
 import (
 	"context"
-	"egg_im/pkg/gerrors"
-	"egg_im/pkg/grpclib/picker"
-	"egg_im/pkg/logger"
-	"egg_im/pkg/mq"
-	"egg_im/pkg/pb"
-	"egg_im/pkg/rpc"
-	"egg_im/pkg/util"
+	"egg-im/pkg/gerrors"
+	"egg-im/pkg/grpclib/picker"
+	"egg-im/pkg/logger"
+	"egg-im/pkg/mq"
+	"egg-im/pkg/pb"
+	"egg-im/pkg/rpc"
+	"egg-im/pkg/util"
 	"time"
 
 	"google.golang.org/protobuf/proto"

internal/logic/domain/room/room_service_test.go

@@ -1,8 +1,8 @@
 package room
 
 import (
-	"egg_im/pkg/pb"
-	"egg_im/pkg/util"
+	"egg-im/pkg/pb"
+	"egg-im/pkg/util"
 	"fmt"
 	"testing"
 	"time"

internal/logic/proxy/device_proxy.go

@@ -2,7 +2,7 @@ package proxy
 
 import (
 	"context"
-	"egg_im/pkg/pb"
+	"egg-im/pkg/pb"
 )
 
 type deviceProxy interface {

internal/logic/proxy/message_proxy.go

@@ -2,7 +2,7 @@ package proxy
 
 import (
 	"context"
-	"egg_im/pkg/pb"
+	"egg-im/pkg/pb"
 	"time"
 
 	"google.golang.org/protobuf/proto"

pkg/db/db.go

@@ -1,9 +1,9 @@
 package db
 
 import (
-	"egg_im/config"
-	"egg_im/pkg/logger"
-	"egg_im/pkg/util"
+	"egg-im/config"
+	"egg-im/pkg/logger"
+	"egg-im/pkg/util"
 	"fmt"
 
 	"github.com/go-redis/redis"

pkg/gerrors/error.go

@@ -2,8 +2,8 @@ package gerrors
 
 import (
 	"context"
-	"egg_im/pkg/logger"
-	"egg_im/pkg/util"
+	"egg-im/pkg/logger"
+	"egg-im/pkg/util"
 	"fmt"
 
 	"go.uber.org/zap"

pkg/grpclib/ctx.go

@@ -2,8 +2,8 @@ package grpclib
 
 import (
 	"context"
-	"egg_im/pkg/gerrors"
-	"egg_im/pkg/logger"
+	"egg-im/pkg/gerrors"
+	"egg-im/pkg/logger"
 	"strconv"
 
 	"google.golang.org/grpc/metadata"

pkg/grpclib/picker/addr_picker.go

@@ -2,7 +2,7 @@ package picker
 
 import (
 	"context"
-	"egg_im/pkg/logger"
+	"egg-im/pkg/logger"
 	"errors"
 
 	"go.uber.org/zap"

pkg/grpclib/resolver/k8s/k8s_resolver.go

@@ -2,7 +2,7 @@ package k8s
 
 import (
 	"context"
-	"egg_im/pkg/logger"
+	"egg-im/pkg/logger"
 	"errors"
 	"fmt"
 	"go.uber.org/zap"

pkg/grpclib/resolver/k8s_new/k8s_resolver.go

@@ -2,7 +2,7 @@ package k8s
 
 import (
 	"context"
-	"egg_im/pkg/logger"
+	"egg-im/pkg/logger"
 	"errors"
 	"fmt"
 	"go.uber.org/zap"

pkg/interceptor/interceptor.go

@@ -2,11 +2,11 @@ package interceptor
 
 import (
 	"context"
-	"egg_im/pkg/gerrors"
-	"egg_im/pkg/grpclib"
-	"egg_im/pkg/logger"
-	"egg_im/pkg/pb"
-	"egg_im/pkg/rpc"
+	"egg-im/pkg/gerrors"
+	"egg-im/pkg/grpclib"
+	"egg-im/pkg/logger"
+	"egg-im/pkg/pb"
+	"egg-im/pkg/rpc"
 	"strings"
 
 	"go.uber.org/zap"

pkg/mq/mq.go

@@ -1,8 +1,8 @@
 package mq
 
 import (
-	"egg_im/pkg/db"
-	"egg_im/pkg/gerrors"
+	"egg-im/pkg/db"
+	"egg-im/pkg/gerrors"
 )
 
 const (

pkg/proto/business.ext.proto

@@ -1,6 +1,6 @@
 syntax = "proto3";
 package pb;
-option go_package = "egg_im/pkg/pb/";
+option go_package = "egg-im/pkg/pb/";
 
 import "common.ext.proto";
 

pkg/proto/business.int.proto

@@ -1,6 +1,6 @@
 syntax = "proto3";
 package pb;
-option go_package = "egg_im/pkg/pb/";
+option go_package = "egg-im/pkg/pb/";
 
 import "common.ext.proto";
 import "business.ext.proto";

pkg/proto/common.ext.proto

@@ -1,5 +1,5 @@
 syntax = "proto3";
 package pb;
-option go_package = "egg_im/pkg/pb/";
+option go_package = "egg-im/pkg/pb/";
 
 message Empty{}

pkg/proto/connect.ext.proto

@@ -1,6 +1,6 @@
 syntax = "proto3";
 package pb;
-option go_package = "egg_im/pkg/pb/";
+option go_package = "egg-im/pkg/pb/";
 
 enum PackageType {
   PT_UNKNOWN = 0; // 未知