feat 修改包路径

This commit is contained in:
2026-10-28 15:58:42 +08:00
parent 9439be8a60
commit c39cea8656
35 changed files with 75 additions and 75 deletions

View File

@@ -173,7 +173,7 @@ user-service/
# 增加服务器步骤 # 增加服务器步骤
代码 代码
1. go module 命名:`git.hlsq.asia/mmorpg/service-${服务名}` 1. go module 命名:`git.hlsq.asia/alex/service-${服务名}`
2. `deploy、config` 修改 2. `deploy、config` 修改
common common

View File

@@ -2,7 +2,7 @@ package etcd
import ( import (
"context" "context"
"git.hlsq.asia/mmorpg/service-common/config" "git.hlsq.asia/alex/service-common/config"
"go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/client/v3"
"time" "time"
) )

View File

@@ -1,7 +1,7 @@
package kafka package kafka
import ( import (
"git.hlsq.asia/mmorpg/service-common/config" "git.hlsq.asia/alex/service-common/config"
"github.com/IBM/sarama" "github.com/IBM/sarama"
"time" "time"
) )

View File

@@ -5,8 +5,8 @@ import (
"encoding/json" "encoding/json"
"errors" "errors"
"fmt" "fmt"
"git.hlsq.asia/mmorpg/service-common/log" "git.hlsq.asia/alex/service-common/log"
"git.hlsq.asia/mmorpg/service-common/utils" "git.hlsq.asia/alex/service-common/utils"
"github.com/IBM/sarama" "github.com/IBM/sarama"
"go.opentelemetry.io/otel" "go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/attribute"

View File

@@ -2,8 +2,8 @@ package mongo
import ( import (
"context" "context"
"git.hlsq.asia/mmorpg/service-common/config" "git.hlsq.asia/alex/service-common/config"
"git.hlsq.asia/mmorpg/service-common/log" "git.hlsq.asia/alex/service-common/log"
"go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo"
"go.mongodb.org/mongo-driver/mongo/options" "go.mongodb.org/mongo-driver/mongo/options"
) )

View File

@@ -1,8 +1,8 @@
package mysql package mysql
import ( import (
"git.hlsq.asia/mmorpg/service-common/config" "git.hlsq.asia/alex/service-common/config"
"git.hlsq.asia/mmorpg/service-common/log" "git.hlsq.asia/alex/service-common/log"
"gorm.io/driver/mysql" "gorm.io/driver/mysql"
"gorm.io/gorm" "gorm.io/gorm"
"gorm.io/gorm/logger" "gorm.io/gorm/logger"

View File

@@ -2,8 +2,8 @@ package redis
import ( import (
"context" "context"
"git.hlsq.asia/mmorpg/service-common/config" "git.hlsq.asia/alex/service-common/config"
"git.hlsq.asia/mmorpg/service-common/log" "git.hlsq.asia/alex/service-common/log"
"github.com/redis/go-redis/v9" "github.com/redis/go-redis/v9"
"time" "time"
) )

View File

@@ -1,8 +1,8 @@
package common package common
import ( import (
"git.hlsq.asia/mmorpg/service-common/db/etcd" "git.hlsq.asia/alex/service-common/db/etcd"
"git.hlsq.asia/mmorpg/service-common/log" "git.hlsq.asia/alex/service-common/log"
clientv3 "go.etcd.io/etcd/client/v3" clientv3 "go.etcd.io/etcd/client/v3"
) )

View File

@@ -2,10 +2,10 @@ package discover
import ( import (
"fmt" "fmt"
"git.hlsq.asia/mmorpg/service-common/db/etcd" "git.hlsq.asia/alex/service-common/db/etcd"
"git.hlsq.asia/mmorpg/service-common/discover/common" "git.hlsq.asia/alex/service-common/discover/common"
"git.hlsq.asia/mmorpg/service-common/log" "git.hlsq.asia/alex/service-common/log"
"git.hlsq.asia/mmorpg/service-common/utils" "git.hlsq.asia/alex/service-common/utils"
clientv3 "go.etcd.io/etcd/client/v3" clientv3 "go.etcd.io/etcd/client/v3"
"sync" "sync"
) )

View File

@@ -3,10 +3,10 @@ package discover
import ( import (
"context" "context"
"fmt" "fmt"
"git.hlsq.asia/mmorpg/service-common/db/etcd" "git.hlsq.asia/alex/service-common/db/etcd"
"git.hlsq.asia/mmorpg/service-common/discover/common" "git.hlsq.asia/alex/service-common/discover/common"
"git.hlsq.asia/mmorpg/service-common/log" "git.hlsq.asia/alex/service-common/log"
"git.hlsq.asia/mmorpg/service-common/utils" "git.hlsq.asia/alex/service-common/utils"
"go.etcd.io/etcd/api/v3/mvccpb" "go.etcd.io/etcd/api/v3/mvccpb"
clientv3 "go.etcd.io/etcd/client/v3" clientv3 "go.etcd.io/etcd/client/v3"
"strconv" "strconv"

View File

@@ -2,10 +2,10 @@ package discover
import ( import (
"fmt" "fmt"
"git.hlsq.asia/mmorpg/service-common/db/etcd" "git.hlsq.asia/alex/service-common/db/etcd"
"git.hlsq.asia/mmorpg/service-common/discover/common" "git.hlsq.asia/alex/service-common/discover/common"
"git.hlsq.asia/mmorpg/service-common/log" "git.hlsq.asia/alex/service-common/log"
"git.hlsq.asia/mmorpg/service-common/net/grpc/grpcconn" "git.hlsq.asia/alex/service-common/net/grpc/grpcconn"
clientv3 "go.etcd.io/etcd/client/v3" clientv3 "go.etcd.io/etcd/client/v3"
"google.golang.org/grpc" "google.golang.org/grpc"
"sync" "sync"

2
go.mod
View File

@@ -1,4 +1,4 @@
module git.hlsq.asia/mmorpg/service-common module git.hlsq.asia/alex/service-common
go 1.24.0 go 1.24.0

View File

@@ -1,7 +1,7 @@
package log package log
import ( import (
"git.hlsq.asia/mmorpg/service-common/config" "git.hlsq.asia/alex/service-common/config"
"github.com/natefinch/lumberjack" "github.com/natefinch/lumberjack"
"go.uber.org/zap" "go.uber.org/zap"
"go.uber.org/zap/zapcore" "go.uber.org/zap/zapcore"

View File

@@ -1,12 +1,12 @@
package module package module
import ( import (
"git.hlsq.asia/mmorpg/service-common/config" "git.hlsq.asia/alex/service-common/config"
"git.hlsq.asia/mmorpg/service-common/db/etcd" "git.hlsq.asia/alex/service-common/db/etcd"
"git.hlsq.asia/mmorpg/service-common/db/kafka" "git.hlsq.asia/alex/service-common/db/kafka"
"git.hlsq.asia/mmorpg/service-common/db/mysql" "git.hlsq.asia/alex/service-common/db/mysql"
"git.hlsq.asia/mmorpg/service-common/db/redis" "git.hlsq.asia/alex/service-common/db/redis"
"git.hlsq.asia/mmorpg/service-common/log" "git.hlsq.asia/alex/service-common/log"
) )
// DB 数据库模块 // DB 数据库模块

View File

@@ -1,7 +1,7 @@
package module package module
import ( import (
"git.hlsq.asia/mmorpg/service-common/discover" "git.hlsq.asia/alex/service-common/discover"
"sync" "sync"
) )

View File

@@ -1,7 +1,7 @@
package module package module
import ( import (
"git.hlsq.asia/mmorpg/service-common/net/grpc/service" "git.hlsq.asia/alex/service-common/net/grpc/service"
"sync" "sync"
) )

View File

@@ -1,8 +1,8 @@
package module package module
import ( import (
"git.hlsq.asia/mmorpg/service-common/config" "git.hlsq.asia/alex/service-common/config"
"git.hlsq.asia/mmorpg/service-common/log" "git.hlsq.asia/alex/service-common/log"
) )
// Log 日志模块 // Log 日志模块

View File

@@ -4,8 +4,8 @@ import (
"context" "context"
"errors" "errors"
"fmt" "fmt"
"git.hlsq.asia/mmorpg/service-common/config" "git.hlsq.asia/alex/service-common/config"
"git.hlsq.asia/mmorpg/service-common/log" "git.hlsq.asia/alex/service-common/log"
"github.com/prometheus/client_golang/prometheus/promhttp" "github.com/prometheus/client_golang/prometheus/promhttp"
"net/http" "net/http"
"sync" "sync"

View File

@@ -4,9 +4,9 @@ import (
"context" "context"
"errors" "errors"
"fmt" "fmt"
"git.hlsq.asia/mmorpg/service-common/db/etcd" "git.hlsq.asia/alex/service-common/db/etcd"
"git.hlsq.asia/mmorpg/service-common/log" "git.hlsq.asia/alex/service-common/log"
"git.hlsq.asia/mmorpg/service-common/utils" "git.hlsq.asia/alex/service-common/utils"
clientv3 "go.etcd.io/etcd/client/v3" clientv3 "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/client/v3/concurrency" "go.etcd.io/etcd/client/v3/concurrency"
"math/rand" "math/rand"

View File

@@ -2,8 +2,8 @@ package module
import ( import (
"context" "context"
"git.hlsq.asia/mmorpg/service-common/config" "git.hlsq.asia/alex/service-common/config"
"git.hlsq.asia/mmorpg/service-common/log" "git.hlsq.asia/alex/service-common/log"
"go.opentelemetry.io/otel" "go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc" "go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc"
"go.opentelemetry.io/otel/propagation" "go.opentelemetry.io/otel/propagation"

View File

@@ -1,9 +1,9 @@
package grpcclient package grpcclient
import ( import (
"git.hlsq.asia/mmorpg/service-common/discover" "git.hlsq.asia/alex/service-common/discover"
"git.hlsq.asia/mmorpg/service-common/discover/common" "git.hlsq.asia/alex/service-common/discover/common"
"git.hlsq.asia/mmorpg/service-common/proto/rs/rspb" "git.hlsq.asia/alex/service-common/proto/rs/rspb"
) )
func GatewayNewClient(sid ...int64) (rspb.GatewayClient, error) { func GatewayNewClient(sid ...int64) (rspb.GatewayClient, error) {

View File

@@ -1,10 +1,10 @@
package grpcclient package grpcclient
import ( import (
"git.hlsq.asia/mmorpg/service-common/discover" "git.hlsq.asia/alex/service-common/discover"
"git.hlsq.asia/mmorpg/service-common/discover/common" "git.hlsq.asia/alex/service-common/discover/common"
"git.hlsq.asia/mmorpg/service-common/net/grpc/resolver" "git.hlsq.asia/alex/service-common/net/grpc/resolver"
"git.hlsq.asia/mmorpg/service-common/proto/rs/rspb" "git.hlsq.asia/alex/service-common/proto/rs/rspb"
) )
func QgdzsNewClient(sid ...int64) (rspb.QgdzsClient, error) { func QgdzsNewClient(sid ...int64) (rspb.QgdzsClient, error) {

View File

@@ -1,10 +1,10 @@
package grpcclient package grpcclient
import ( import (
"git.hlsq.asia/mmorpg/service-common/discover" "git.hlsq.asia/alex/service-common/discover"
"git.hlsq.asia/mmorpg/service-common/discover/common" "git.hlsq.asia/alex/service-common/discover/common"
"git.hlsq.asia/mmorpg/service-common/net/grpc/resolver" "git.hlsq.asia/alex/service-common/net/grpc/resolver"
"git.hlsq.asia/mmorpg/service-common/proto/rs/rspb" "git.hlsq.asia/alex/service-common/proto/rs/rspb"
) )
func SceneNewClient(sid ...int64) (rspb.SceneClient, error) { func SceneNewClient(sid ...int64) (rspb.SceneClient, error) {

View File

@@ -1,10 +1,10 @@
package grpcclient package grpcclient
import ( import (
"git.hlsq.asia/mmorpg/service-common/discover" "git.hlsq.asia/alex/service-common/discover"
"git.hlsq.asia/mmorpg/service-common/discover/common" "git.hlsq.asia/alex/service-common/discover/common"
"git.hlsq.asia/mmorpg/service-common/net/grpc/resolver" "git.hlsq.asia/alex/service-common/net/grpc/resolver"
"git.hlsq.asia/mmorpg/service-common/proto/rs/rspb" "git.hlsq.asia/alex/service-common/proto/rs/rspb"
) )
func UserNewClient(sid ...int64) (rspb.UserClient, error) { func UserNewClient(sid ...int64) (rspb.UserClient, error) {

View File

@@ -3,7 +3,7 @@ package grpcclient
import ( import (
"context" "context"
"fmt" "fmt"
"git.hlsq.asia/mmorpg/service-common/log" "git.hlsq.asia/alex/service-common/log"
"google.golang.org/grpc" "google.golang.org/grpc"
"google.golang.org/protobuf/proto" "google.golang.org/protobuf/proto"
"sync" "sync"

View File

@@ -3,7 +3,7 @@ package grpcclient
import ( import (
"context" "context"
"fmt" "fmt"
"git.hlsq.asia/mmorpg/service-common/log" "git.hlsq.asia/alex/service-common/log"
"google.golang.org/grpc" "google.golang.org/grpc"
"google.golang.org/protobuf/proto" "google.golang.org/protobuf/proto"
"sync" "sync"

View File

@@ -1,7 +1,7 @@
package grpcconn package grpcconn
import ( import (
"git.hlsq.asia/mmorpg/service-common/log" "git.hlsq.asia/alex/service-common/log"
"go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc" "go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc"
"google.golang.org/grpc" "google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure" "google.golang.org/grpc/credentials/insecure"

View File

@@ -2,7 +2,7 @@ package grpcconn
import ( import (
"fmt" "fmt"
"git.hlsq.asia/mmorpg/service-common/log" "git.hlsq.asia/alex/service-common/log"
"google.golang.org/grpc" "google.golang.org/grpc"
"math/rand" "math/rand"
) )

View File

@@ -1,7 +1,7 @@
package resolver package resolver
import ( import (
"git.hlsq.asia/mmorpg/service-common/log" "git.hlsq.asia/alex/service-common/log"
"go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc" "go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc"
"google.golang.org/grpc" "google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure" "google.golang.org/grpc/credentials/insecure"

View File

@@ -2,9 +2,9 @@ package resolver
import ( import (
"context" "context"
"git.hlsq.asia/mmorpg/service-common/db/etcd" "git.hlsq.asia/alex/service-common/db/etcd"
"git.hlsq.asia/mmorpg/service-common/discover/common" "git.hlsq.asia/alex/service-common/discover/common"
"git.hlsq.asia/mmorpg/service-common/log" "git.hlsq.asia/alex/service-common/log"
"go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/client/v3"
"google.golang.org/grpc/resolver" "google.golang.org/grpc/resolver"
"strings" "strings"

View File

@@ -3,7 +3,7 @@ package service
import ( import (
"context" "context"
"fmt" "fmt"
"git.hlsq.asia/mmorpg/service-common/log" "git.hlsq.asia/alex/service-common/log"
"go.opentelemetry.io/otel" "go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/attribute"
otelcodes "go.opentelemetry.io/otel/codes" otelcodes "go.opentelemetry.io/otel/codes"

View File

@@ -2,10 +2,10 @@ package service
import ( import (
"fmt" "fmt"
"git.hlsq.asia/mmorpg/service-common/config" "git.hlsq.asia/alex/service-common/config"
"git.hlsq.asia/mmorpg/service-common/discover" "git.hlsq.asia/alex/service-common/discover"
"git.hlsq.asia/mmorpg/service-common/log" "git.hlsq.asia/alex/service-common/log"
"git.hlsq.asia/mmorpg/service-common/utils" "git.hlsq.asia/alex/service-common/utils"
"go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc" "go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc"
"google.golang.org/grpc" "google.golang.org/grpc"
"google.golang.org/grpc/health" "google.golang.org/grpc/health"

View File

@@ -1,7 +1,7 @@
package httpresp package httpresp
import ( import (
"git.hlsq.asia/mmorpg/service-common/proto/rs/rscommon" "git.hlsq.asia/alex/service-common/proto/rs/rscommon"
"google.golang.org/grpc/codes" "google.golang.org/grpc/codes"
"google.golang.org/grpc/status" "google.golang.org/grpc/status"
) )

View File

@@ -3,7 +3,7 @@ package websocket
import ( import (
"bytes" "bytes"
"context" "context"
"git.hlsq.asia/mmorpg/service-common/net/socket" "git.hlsq.asia/alex/service-common/net/socket"
"github.com/panjf2000/gnet/v2" "github.com/panjf2000/gnet/v2"
"github.com/panjf2000/gnet/v2/pkg/logging" "github.com/panjf2000/gnet/v2/pkg/logging"
"sync" "sync"

View File

@@ -3,7 +3,7 @@ package utils
import ( import (
"bytes" "bytes"
"encoding/json" "encoding/json"
"git.hlsq.asia/mmorpg/service-common/net/http/httpresp" "git.hlsq.asia/alex/service-common/net/http/httpresp"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"github.com/stretchr/testify/suite" "github.com/stretchr/testify/suite"
"net/http/httptest" "net/http/httptest"