From c39cea86565ed76dfd17ce902c6af03decc1a814 Mon Sep 17 00:00:00 2001 From: "DESKTOP-V763RJ7\\Administrator" <835606593@qq.com> Date: Wed, 28 Oct 2026 15:58:42 +0800 Subject: [PATCH] =?UTF-8?q?feat=20=E4=BF=AE=E6=94=B9=E5=8C=85=E8=B7=AF?= =?UTF-8?q?=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- db/etcd/client.go | 2 +- db/kafka/client.go | 2 +- db/kafka/consumer.go | 4 ++-- db/mongo/client.go | 4 ++-- db/mysql/client.go | 4 ++-- db/redis/client.go | 4 ++-- discover/common/tool.go | 4 ++-- discover/instance.go | 8 ++++---- discover/listener.go | 8 ++++---- discover/server.go | 8 ++++---- go.mod | 2 +- log/log_zap.go | 2 +- module/db.go | 12 ++++++------ module/discover.go | 2 +- module/grpc.go | 2 +- module/log.go | 4 ++-- module/prometheus.go | 4 ++-- module/snowflake.go | 6 +++--- module/tracer.go | 4 ++-- net/grpc/grpcclient/client_gateway.go | 6 +++--- net/grpc/grpcclient/client_qgdzs.go | 8 ++++---- net/grpc/grpcclient/client_scene.go | 8 ++++---- net/grpc/grpcclient/client_user.go | 8 ++++---- net/grpc/grpcclient/stream_gateway.go | 2 +- net/grpc/grpcclient/stream_scene.go | 2 +- net/grpc/grpcconn/conn.go | 2 +- net/grpc/grpcconn/conn_mgr.go | 2 +- net/grpc/resolver/conn.go | 2 +- net/grpc/resolver/etcd_resolver.go | 6 +++--- net/grpc/service/interceptor.go | 2 +- net/grpc/service/service.go | 8 ++++---- net/http/httpresp/code.go | 2 +- net/socket/websocket/websocket.go | 2 +- utils/test.go | 2 +- 35 files changed, 75 insertions(+), 75 deletions(-) diff --git a/README.md b/README.md index e4b0ac3..c196895 100644 --- a/README.md +++ b/README.md @@ -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` 修改 common diff --git a/db/etcd/client.go b/db/etcd/client.go index 3822a81..c8119fa 100644 --- a/db/etcd/client.go +++ b/db/etcd/client.go @@ -2,7 +2,7 @@ package etcd import ( "context" - "git.hlsq.asia/mmorpg/service-common/config" + "git.hlsq.asia/alex/service-common/config" "go.etcd.io/etcd/client/v3" "time" ) diff --git a/db/kafka/client.go b/db/kafka/client.go index cadee83..5f27f3e 100644 --- a/db/kafka/client.go +++ b/db/kafka/client.go @@ -1,7 +1,7 @@ package kafka import ( - "git.hlsq.asia/mmorpg/service-common/config" + "git.hlsq.asia/alex/service-common/config" "github.com/IBM/sarama" "time" ) diff --git a/db/kafka/consumer.go b/db/kafka/consumer.go index 5bcff3b..62c4172 100644 --- a/db/kafka/consumer.go +++ b/db/kafka/consumer.go @@ -5,8 +5,8 @@ import ( "encoding/json" "errors" "fmt" - "git.hlsq.asia/mmorpg/service-common/log" - "git.hlsq.asia/mmorpg/service-common/utils" + "git.hlsq.asia/alex/service-common/log" + "git.hlsq.asia/alex/service-common/utils" "github.com/IBM/sarama" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/attribute" diff --git a/db/mongo/client.go b/db/mongo/client.go index f6de04a..48a4e1f 100644 --- a/db/mongo/client.go +++ b/db/mongo/client.go @@ -2,8 +2,8 @@ package mongo import ( "context" - "git.hlsq.asia/mmorpg/service-common/config" - "git.hlsq.asia/mmorpg/service-common/log" + "git.hlsq.asia/alex/service-common/config" + "git.hlsq.asia/alex/service-common/log" "go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo/options" ) diff --git a/db/mysql/client.go b/db/mysql/client.go index cdd2ca0..e8c68b1 100644 --- a/db/mysql/client.go +++ b/db/mysql/client.go @@ -1,8 +1,8 @@ package mysql import ( - "git.hlsq.asia/mmorpg/service-common/config" - "git.hlsq.asia/mmorpg/service-common/log" + "git.hlsq.asia/alex/service-common/config" + "git.hlsq.asia/alex/service-common/log" "gorm.io/driver/mysql" "gorm.io/gorm" "gorm.io/gorm/logger" diff --git a/db/redis/client.go b/db/redis/client.go index 29dffcc..ba76433 100644 --- a/db/redis/client.go +++ b/db/redis/client.go @@ -2,8 +2,8 @@ package redis import ( "context" - "git.hlsq.asia/mmorpg/service-common/config" - "git.hlsq.asia/mmorpg/service-common/log" + "git.hlsq.asia/alex/service-common/config" + "git.hlsq.asia/alex/service-common/log" "github.com/redis/go-redis/v9" "time" ) diff --git a/discover/common/tool.go b/discover/common/tool.go index 6b7dfd4..95349cd 100644 --- a/discover/common/tool.go +++ b/discover/common/tool.go @@ -1,8 +1,8 @@ package common import ( - "git.hlsq.asia/mmorpg/service-common/db/etcd" - "git.hlsq.asia/mmorpg/service-common/log" + "git.hlsq.asia/alex/service-common/db/etcd" + "git.hlsq.asia/alex/service-common/log" clientv3 "go.etcd.io/etcd/client/v3" ) diff --git a/discover/instance.go b/discover/instance.go index 89b728b..eafd814 100644 --- a/discover/instance.go +++ b/discover/instance.go @@ -2,10 +2,10 @@ package discover import ( "fmt" - "git.hlsq.asia/mmorpg/service-common/db/etcd" - "git.hlsq.asia/mmorpg/service-common/discover/common" - "git.hlsq.asia/mmorpg/service-common/log" - "git.hlsq.asia/mmorpg/service-common/utils" + "git.hlsq.asia/alex/service-common/db/etcd" + "git.hlsq.asia/alex/service-common/discover/common" + "git.hlsq.asia/alex/service-common/log" + "git.hlsq.asia/alex/service-common/utils" clientv3 "go.etcd.io/etcd/client/v3" "sync" ) diff --git a/discover/listener.go b/discover/listener.go index 2ae7256..e976c64 100644 --- a/discover/listener.go +++ b/discover/listener.go @@ -3,10 +3,10 @@ package discover import ( "context" "fmt" - "git.hlsq.asia/mmorpg/service-common/db/etcd" - "git.hlsq.asia/mmorpg/service-common/discover/common" - "git.hlsq.asia/mmorpg/service-common/log" - "git.hlsq.asia/mmorpg/service-common/utils" + "git.hlsq.asia/alex/service-common/db/etcd" + "git.hlsq.asia/alex/service-common/discover/common" + "git.hlsq.asia/alex/service-common/log" + "git.hlsq.asia/alex/service-common/utils" "go.etcd.io/etcd/api/v3/mvccpb" clientv3 "go.etcd.io/etcd/client/v3" "strconv" diff --git a/discover/server.go b/discover/server.go index 27ef2a9..20317e9 100644 --- a/discover/server.go +++ b/discover/server.go @@ -2,10 +2,10 @@ package discover import ( "fmt" - "git.hlsq.asia/mmorpg/service-common/db/etcd" - "git.hlsq.asia/mmorpg/service-common/discover/common" - "git.hlsq.asia/mmorpg/service-common/log" - "git.hlsq.asia/mmorpg/service-common/net/grpc/grpcconn" + "git.hlsq.asia/alex/service-common/db/etcd" + "git.hlsq.asia/alex/service-common/discover/common" + "git.hlsq.asia/alex/service-common/log" + "git.hlsq.asia/alex/service-common/net/grpc/grpcconn" clientv3 "go.etcd.io/etcd/client/v3" "google.golang.org/grpc" "sync" diff --git a/go.mod b/go.mod index 10c8ab6..026fde6 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module git.hlsq.asia/mmorpg/service-common +module git.hlsq.asia/alex/service-common go 1.24.0 diff --git a/log/log_zap.go b/log/log_zap.go index 7bc3dd1..b2373b2 100644 --- a/log/log_zap.go +++ b/log/log_zap.go @@ -1,7 +1,7 @@ package log import ( - "git.hlsq.asia/mmorpg/service-common/config" + "git.hlsq.asia/alex/service-common/config" "github.com/natefinch/lumberjack" "go.uber.org/zap" "go.uber.org/zap/zapcore" diff --git a/module/db.go b/module/db.go index bdfec1b..c829fb4 100644 --- a/module/db.go +++ b/module/db.go @@ -1,12 +1,12 @@ package module import ( - "git.hlsq.asia/mmorpg/service-common/config" - "git.hlsq.asia/mmorpg/service-common/db/etcd" - "git.hlsq.asia/mmorpg/service-common/db/kafka" - "git.hlsq.asia/mmorpg/service-common/db/mysql" - "git.hlsq.asia/mmorpg/service-common/db/redis" - "git.hlsq.asia/mmorpg/service-common/log" + "git.hlsq.asia/alex/service-common/config" + "git.hlsq.asia/alex/service-common/db/etcd" + "git.hlsq.asia/alex/service-common/db/kafka" + "git.hlsq.asia/alex/service-common/db/mysql" + "git.hlsq.asia/alex/service-common/db/redis" + "git.hlsq.asia/alex/service-common/log" ) // DB 数据库模块 diff --git a/module/discover.go b/module/discover.go index 263d291..f4b280a 100644 --- a/module/discover.go +++ b/module/discover.go @@ -1,7 +1,7 @@ package module import ( - "git.hlsq.asia/mmorpg/service-common/discover" + "git.hlsq.asia/alex/service-common/discover" "sync" ) diff --git a/module/grpc.go b/module/grpc.go index a324c06..f8cd8e6 100644 --- a/module/grpc.go +++ b/module/grpc.go @@ -1,7 +1,7 @@ package module import ( - "git.hlsq.asia/mmorpg/service-common/net/grpc/service" + "git.hlsq.asia/alex/service-common/net/grpc/service" "sync" ) diff --git a/module/log.go b/module/log.go index 35700f9..e463e3d 100644 --- a/module/log.go +++ b/module/log.go @@ -1,8 +1,8 @@ package module import ( - "git.hlsq.asia/mmorpg/service-common/config" - "git.hlsq.asia/mmorpg/service-common/log" + "git.hlsq.asia/alex/service-common/config" + "git.hlsq.asia/alex/service-common/log" ) // Log 日志模块 diff --git a/module/prometheus.go b/module/prometheus.go index 684451d..1479740 100644 --- a/module/prometheus.go +++ b/module/prometheus.go @@ -4,8 +4,8 @@ import ( "context" "errors" "fmt" - "git.hlsq.asia/mmorpg/service-common/config" - "git.hlsq.asia/mmorpg/service-common/log" + "git.hlsq.asia/alex/service-common/config" + "git.hlsq.asia/alex/service-common/log" "github.com/prometheus/client_golang/prometheus/promhttp" "net/http" "sync" diff --git a/module/snowflake.go b/module/snowflake.go index 7572948..c24d1be 100644 --- a/module/snowflake.go +++ b/module/snowflake.go @@ -4,9 +4,9 @@ import ( "context" "errors" "fmt" - "git.hlsq.asia/mmorpg/service-common/db/etcd" - "git.hlsq.asia/mmorpg/service-common/log" - "git.hlsq.asia/mmorpg/service-common/utils" + "git.hlsq.asia/alex/service-common/db/etcd" + "git.hlsq.asia/alex/service-common/log" + "git.hlsq.asia/alex/service-common/utils" clientv3 "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/client/v3/concurrency" "math/rand" diff --git a/module/tracer.go b/module/tracer.go index 5d3f449..4e0258c 100644 --- a/module/tracer.go +++ b/module/tracer.go @@ -2,8 +2,8 @@ package module import ( "context" - "git.hlsq.asia/mmorpg/service-common/config" - "git.hlsq.asia/mmorpg/service-common/log" + "git.hlsq.asia/alex/service-common/config" + "git.hlsq.asia/alex/service-common/log" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc" "go.opentelemetry.io/otel/propagation" diff --git a/net/grpc/grpcclient/client_gateway.go b/net/grpc/grpcclient/client_gateway.go index 05b128d..5f332e1 100644 --- a/net/grpc/grpcclient/client_gateway.go +++ b/net/grpc/grpcclient/client_gateway.go @@ -1,9 +1,9 @@ package grpcclient import ( - "git.hlsq.asia/mmorpg/service-common/discover" - "git.hlsq.asia/mmorpg/service-common/discover/common" - "git.hlsq.asia/mmorpg/service-common/proto/rs/rspb" + "git.hlsq.asia/alex/service-common/discover" + "git.hlsq.asia/alex/service-common/discover/common" + "git.hlsq.asia/alex/service-common/proto/rs/rspb" ) func GatewayNewClient(sid ...int64) (rspb.GatewayClient, error) { diff --git a/net/grpc/grpcclient/client_qgdzs.go b/net/grpc/grpcclient/client_qgdzs.go index 96f75fc..f58ca94 100644 --- a/net/grpc/grpcclient/client_qgdzs.go +++ b/net/grpc/grpcclient/client_qgdzs.go @@ -1,10 +1,10 @@ package grpcclient import ( - "git.hlsq.asia/mmorpg/service-common/discover" - "git.hlsq.asia/mmorpg/service-common/discover/common" - "git.hlsq.asia/mmorpg/service-common/net/grpc/resolver" - "git.hlsq.asia/mmorpg/service-common/proto/rs/rspb" + "git.hlsq.asia/alex/service-common/discover" + "git.hlsq.asia/alex/service-common/discover/common" + "git.hlsq.asia/alex/service-common/net/grpc/resolver" + "git.hlsq.asia/alex/service-common/proto/rs/rspb" ) func QgdzsNewClient(sid ...int64) (rspb.QgdzsClient, error) { diff --git a/net/grpc/grpcclient/client_scene.go b/net/grpc/grpcclient/client_scene.go index 2e102ed..9b1b9fc 100644 --- a/net/grpc/grpcclient/client_scene.go +++ b/net/grpc/grpcclient/client_scene.go @@ -1,10 +1,10 @@ package grpcclient import ( - "git.hlsq.asia/mmorpg/service-common/discover" - "git.hlsq.asia/mmorpg/service-common/discover/common" - "git.hlsq.asia/mmorpg/service-common/net/grpc/resolver" - "git.hlsq.asia/mmorpg/service-common/proto/rs/rspb" + "git.hlsq.asia/alex/service-common/discover" + "git.hlsq.asia/alex/service-common/discover/common" + "git.hlsq.asia/alex/service-common/net/grpc/resolver" + "git.hlsq.asia/alex/service-common/proto/rs/rspb" ) func SceneNewClient(sid ...int64) (rspb.SceneClient, error) { diff --git a/net/grpc/grpcclient/client_user.go b/net/grpc/grpcclient/client_user.go index 8984146..f59c01b 100644 --- a/net/grpc/grpcclient/client_user.go +++ b/net/grpc/grpcclient/client_user.go @@ -1,10 +1,10 @@ package grpcclient import ( - "git.hlsq.asia/mmorpg/service-common/discover" - "git.hlsq.asia/mmorpg/service-common/discover/common" - "git.hlsq.asia/mmorpg/service-common/net/grpc/resolver" - "git.hlsq.asia/mmorpg/service-common/proto/rs/rspb" + "git.hlsq.asia/alex/service-common/discover" + "git.hlsq.asia/alex/service-common/discover/common" + "git.hlsq.asia/alex/service-common/net/grpc/resolver" + "git.hlsq.asia/alex/service-common/proto/rs/rspb" ) func UserNewClient(sid ...int64) (rspb.UserClient, error) { diff --git a/net/grpc/grpcclient/stream_gateway.go b/net/grpc/grpcclient/stream_gateway.go index 329acce..ef255f9 100644 --- a/net/grpc/grpcclient/stream_gateway.go +++ b/net/grpc/grpcclient/stream_gateway.go @@ -3,7 +3,7 @@ package grpcclient import ( "context" "fmt" - "git.hlsq.asia/mmorpg/service-common/log" + "git.hlsq.asia/alex/service-common/log" "google.golang.org/grpc" "google.golang.org/protobuf/proto" "sync" diff --git a/net/grpc/grpcclient/stream_scene.go b/net/grpc/grpcclient/stream_scene.go index 4a50489..ccea551 100644 --- a/net/grpc/grpcclient/stream_scene.go +++ b/net/grpc/grpcclient/stream_scene.go @@ -3,7 +3,7 @@ package grpcclient import ( "context" "fmt" - "git.hlsq.asia/mmorpg/service-common/log" + "git.hlsq.asia/alex/service-common/log" "google.golang.org/grpc" "google.golang.org/protobuf/proto" "sync" diff --git a/net/grpc/grpcconn/conn.go b/net/grpc/grpcconn/conn.go index 660f4bd..2365eb6 100644 --- a/net/grpc/grpcconn/conn.go +++ b/net/grpc/grpcconn/conn.go @@ -1,7 +1,7 @@ package grpcconn 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" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" diff --git a/net/grpc/grpcconn/conn_mgr.go b/net/grpc/grpcconn/conn_mgr.go index e38f582..2d70e77 100644 --- a/net/grpc/grpcconn/conn_mgr.go +++ b/net/grpc/grpcconn/conn_mgr.go @@ -2,7 +2,7 @@ package grpcconn import ( "fmt" - "git.hlsq.asia/mmorpg/service-common/log" + "git.hlsq.asia/alex/service-common/log" "google.golang.org/grpc" "math/rand" ) diff --git a/net/grpc/resolver/conn.go b/net/grpc/resolver/conn.go index b2a2ed4..fe868c6 100644 --- a/net/grpc/resolver/conn.go +++ b/net/grpc/resolver/conn.go @@ -1,7 +1,7 @@ package resolver 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" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" diff --git a/net/grpc/resolver/etcd_resolver.go b/net/grpc/resolver/etcd_resolver.go index e9d68ed..e91ffb5 100644 --- a/net/grpc/resolver/etcd_resolver.go +++ b/net/grpc/resolver/etcd_resolver.go @@ -2,9 +2,9 @@ package resolver import ( "context" - "git.hlsq.asia/mmorpg/service-common/db/etcd" - "git.hlsq.asia/mmorpg/service-common/discover/common" - "git.hlsq.asia/mmorpg/service-common/log" + "git.hlsq.asia/alex/service-common/db/etcd" + "git.hlsq.asia/alex/service-common/discover/common" + "git.hlsq.asia/alex/service-common/log" "go.etcd.io/etcd/client/v3" "google.golang.org/grpc/resolver" "strings" diff --git a/net/grpc/service/interceptor.go b/net/grpc/service/interceptor.go index e075645..dca2c49 100644 --- a/net/grpc/service/interceptor.go +++ b/net/grpc/service/interceptor.go @@ -3,7 +3,7 @@ package service import ( "context" "fmt" - "git.hlsq.asia/mmorpg/service-common/log" + "git.hlsq.asia/alex/service-common/log" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/attribute" otelcodes "go.opentelemetry.io/otel/codes" diff --git a/net/grpc/service/service.go b/net/grpc/service/service.go index 4b6b7ab..6b881e7 100644 --- a/net/grpc/service/service.go +++ b/net/grpc/service/service.go @@ -2,10 +2,10 @@ package service import ( "fmt" - "git.hlsq.asia/mmorpg/service-common/config" - "git.hlsq.asia/mmorpg/service-common/discover" - "git.hlsq.asia/mmorpg/service-common/log" - "git.hlsq.asia/mmorpg/service-common/utils" + "git.hlsq.asia/alex/service-common/config" + "git.hlsq.asia/alex/service-common/discover" + "git.hlsq.asia/alex/service-common/log" + "git.hlsq.asia/alex/service-common/utils" "go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc" "google.golang.org/grpc" "google.golang.org/grpc/health" diff --git a/net/http/httpresp/code.go b/net/http/httpresp/code.go index 256c686..c316a0c 100644 --- a/net/http/httpresp/code.go +++ b/net/http/httpresp/code.go @@ -1,7 +1,7 @@ package httpresp 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/status" ) diff --git a/net/socket/websocket/websocket.go b/net/socket/websocket/websocket.go index 3421c6e..a5fb3b8 100644 --- a/net/socket/websocket/websocket.go +++ b/net/socket/websocket/websocket.go @@ -3,7 +3,7 @@ package websocket import ( "bytes" "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/pkg/logging" "sync" diff --git a/utils/test.go b/utils/test.go index 95d75fa..f50e4f9 100644 --- a/utils/test.go +++ b/utils/test.go @@ -3,7 +3,7 @@ package utils import ( "bytes" "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/stretchr/testify/suite" "net/http/httptest"