refactor: centralize protobuf and remove go-zero

module/ec/delivery/internal/config/config.go

@@ -1,14 +1,54 @@
 package config
 
 import (
-	"git.apinb.com/bsm-sdk/engine/types"
-	"github.com/zeromicro/go-zero/zrpc"
+	"fmt"
+	"os"
+	"path/filepath"
+	"strings"
+
+	"git.apinb.com/bsm-sdk/core/types"
+	"gopkg.in/yaml.v3"
 )
 
+// Config retains the legacy delivery YAML shape so existing deployments continue to work.
+// Cache and Pulsar are deprecated and intentionally ignored because the service never used them.
 type Config struct {
-	zrpc.RpcServerConf
-	DSN       string              `json:",optional"`
-	Cache     string              `json:",optional"`
-	Anonymous types.AnonymousConf `json:",optional"`
-	Pulsar    types.PulsarConf    `json:",optional"`
+	Name      string              `yaml:"Name"`
+	ListenOn  string              `yaml:"ListenOn"`
+	DSN       string              `yaml:"Dsn"`
+	Cache     string              `yaml:"Cache"`
+	Anonymous types.AnonymousConf `yaml:"Anonymous"`
+	Pulsar    types.PulsarConf    `yaml:"Pulsar"`
+}
+
+func Load(serviceKey string) (Config, error) {
+	mode := strings.ToLower(envOr("BlocksMesh_RuntimeMode", "dev"))
+	prefix := envOr("BlocksMesh_Prefix", ".")
+	workspace := envOr("BlocksMesh_Workspace", "def")
+	path := filepath.Join(prefix, "etc", fmt.Sprintf("%s_%s.yaml", serviceKey, mode))
+
+	data, err := os.ReadFile(path)
+	if err != nil {
+		return Config{}, fmt.Errorf("read config %s: %w", path, err)
+	}
+	replacer := strings.NewReplacer(
+		"{ServiceKey}", serviceKey,
+		"{Workspace}", workspace,
+		"{RuntimeMode}", mode,
+	)
+	var cfg Config
+	if err := yaml.Unmarshal([]byte(os.ExpandEnv(replacer.Replace(string(data)))), &cfg); err != nil {
+		return Config{}, fmt.Errorf("parse config %s: %w", path, err)
+	}
+	if cfg.ListenOn == "" {
+		return Config{}, fmt.Errorf("ListenOn is required in %s", path)
+	}
+	return cfg, nil
+}
+
+func envOr(key, fallback string) string {
+	if value := os.Getenv(key); value != "" {
+		return value
+	}
+	return fallback
 }

module/ec/delivery/internal/impl/cache.go

@@ -1,32 +0,0 @@
-package impl
-
-import (
-	"strconv"
-	"strings"
-
-	"git.apinb.com/bsm-sdk/engine/cache/mem"
-	"git.apinb.com/bsm-sdk/engine/cache/redis"
-	"git.apinb.com/bsm-sdk/engine/print"
-	"git.apinb.com/bsm-sdk/engine/vars"
-	"github.com/FishGoddess/cachego"
-)
-
-var (
-	MemCache   *cachego.Cache
-	RedisCache *redis.RedisClient
-)
-
-func withMemCache() {
-	m := mem.New()
-	MemCache = &m
-}
-
-func withRedisCache() {
-	if Configure.Cache != "" {
-		addrs := strings.Split(Configure.ListenOn, ":")
-		port, _ := strconv.Atoi(addrs[1])
-		RedisCache = redis.New(Configure.Cache, port)
-
-		print.Info("[Blocks Service] %s Cache: %s, DB Index: %d", vars.ServiceKey, Configure.Cache, RedisCache.DB)
-	}
-}

module/ec/delivery/internal/impl/impl.go

@@ -1,29 +1,21 @@
 package impl
 
 import (
+	"fmt"
+
 	"bsm/full/module/ec/delivery/internal/config"
-
-	"git.apinb.com/bsm-sdk/engine/service"
 )
 
-var (
-	Configure config.Config
-)
-
-func NewService(srvKey string) {
-	// register service
-	service.Register(srvKey, &Configure)
-	service.RegisterAnonymous(&Configure.RpcServerConf, &Configure.Anonymous)
-
-	service.Start(Configure.ListenOn)
-
-	// with activating
-	withModel()      // model
-	withMemCache()   // mem cache
-	withRedisCache() // redis cache
-	withPulsar()     // mq - pulsar
-
-	// service done.
-	service.Done(&Configure.Prometheus, &Configure.Telemetry)
+var Configure config.Config
 
+func NewService(serviceKey string) error {
+	cfg, err := config.Load(serviceKey)
+	if err != nil {
+		return err
+	}
+	Configure = cfg
+	if err := withModel(); err != nil {
+		return fmt.Errorf("initialize model: %w", err)
+	}
+	return nil
 }

module/ec/delivery/internal/impl/model.go

@@ -1,21 +1,10 @@
 package impl
 
-import (
-	"os"
+import "bsm/full/module/ec/delivery/internal/models"
 
-	"bsm/full/module/ec/delivery/internal/models"
-
-	"git.apinb.com/bsm-sdk/engine/print"
-	"git.apinb.com/bsm-sdk/engine/vars"
-)
-
-func withModel() {
-	if Configure.DSN != "" {
-		err := models.New(Configure.DSN, nil)
-		if err != nil {
-			print.Fail("[Blocks Service] %s Model Error: %d", vars.ServiceKey, err.Error())
-			os.Exit(0)
-		}
-		print.Info("[Blocks Service] %s Database Source: %s", vars.ServiceKey, Configure.DSN)
+func withModel() error {
+	if Configure.DSN == "" {
+		return nil
 	}
+	return models.New(Configure.DSN, nil)
 }

module/ec/delivery/internal/impl/mq.go

@@ -1,24 +0,0 @@
-package impl
-
-import (
-	"os"
-
-	"git.apinb.com/bsm-sdk/engine/print"
-	"git.apinb.com/bsm-sdk/engine/queue/pulsar"
-	"git.apinb.com/bsm-sdk/engine/vars"
-)
-
-var MQ *pulsar.Pulsar
-
-func withPulsar() {
-	if Configure.Pulsar.IsHas() {
-		mq, err := pulsar.NewPulsar(&Configure.Pulsar)
-		if err != nil {
-			print.Fail("[Blocks Service] %s Pulsar Error: %d", vars.ServiceKey, err.Error())
-			os.Exit(0)
-		} else {
-			MQ = mq
-			print.Info("[Blocks Service] %s Queue/Pulsar Endpoint: %s", vars.ServiceKey, Configure.Pulsar.Endpoints)
-		}
-	}
-}

module/ec/delivery/internal/logic/car/car_add_logic.go

@@ -3,27 +3,29 @@ package deliverylogic
 import (
 	"context"
 
-	"git.apinb.com/bsm-sdk/engine/exception"
-	"git.apinb.com/bsm-sdk/engine/service"
-	"git.apinb.com/bsm-sdk/engine/utils"
 	"bsm/full/module/ec/delivery/external/pb/delivery"
 	"bsm/full/module/ec/delivery/internal/models"
 	"bsm/full/module/ec/delivery/internal/svc"
+	"git.apinb.com/bsm-sdk/core/errcode"
+	"git.apinb.com/bsm-sdk/core/service"
+	"git.apinb.com/bsm-sdk/core/utils"
 
-	"github.com/zeromicro/go-zero/core/logx"
+	"log/slog"
+
+	"bsm/full/shared/logging"
 )
 
 type CarAddLogic struct {
 	ctx    context.Context
 	svcCtx *svc.ServiceContext
-	logx.Logger
+	*slog.Logger
 }
 
 func NewCarAddLogic(ctx context.Context, svcCtx *svc.ServiceContext) *CarAddLogic {
 	return &CarAddLogic{
 		ctx:    ctx,
 		svcCtx: svcCtx,
-		Logger: logx.WithContext(ctx),
+		Logger: logging.Context(ctx),
 	}
 }
 
@@ -51,32 +53,32 @@ func (l *CarAddLogic) CarAdd(in *delivery.CarItem) (*delivery.StatusReply, error
 	err = models.DBService.Create(&data).Error
 	if err != nil {
 		l.Logger.Error(err.Error())
-		return nil, exception.ErrDBFatal
+		return nil, errcode.ErrDB
 	}
 
 	return &delivery.StatusReply{Status: 200, Identity: data.Identity, Message: ""}, nil
 }
 func carAddChick(in *delivery.CarItem) error {
 	if in.GetBrand() == "" {
-		return exception.ErrInvalidArgument
+		return errcode.ErrInvalidArgument
 	}
 	if in.GetPhone() == "" {
-		return exception.ErrInvalidArgument
+		return errcode.ErrInvalidArgument
 	}
 	// if in.GetTeamIdentity() == "" {
-	// 	return exception.ErrInvalidArgument
+	// 	return errcode.ErrInvalidArgument
 	// }
 	if in.GetContacts() == "" {
-		return exception.ErrInvalidArgument
+		return errcode.ErrInvalidArgument
 	}
 	if in.GetVersion() == "" {
-		return exception.ErrInvalidArgument
+		return errcode.ErrInvalidArgument
 	}
 	if in.GetPicture() == "" {
-		return exception.ErrInvalidArgument
+		return errcode.ErrInvalidArgument
 	}
 	if in.GetLicenseNumber() == "" {
-		return exception.ErrInvalidArgument
+		return errcode.ErrInvalidArgument
 	}
 	return nil
 }

module/ec/delivery/internal/logic/car/car_del_logic.go

@@ -3,26 +3,28 @@ package deliverylogic
 import (
 	"context"
 
-	"git.apinb.com/bsm-sdk/engine/exception"
-	"git.apinb.com/bsm-sdk/engine/service"
 	"bsm/full/module/ec/delivery/external/pb/delivery"
 	"bsm/full/module/ec/delivery/internal/models"
 	"bsm/full/module/ec/delivery/internal/svc"
+	"git.apinb.com/bsm-sdk/core/errcode"
+	"git.apinb.com/bsm-sdk/core/service"
 
-	"github.com/zeromicro/go-zero/core/logx"
+	"log/slog"
+
+	"bsm/full/shared/logging"
 )
 
 type CarDelLogic struct {
 	ctx    context.Context
 	svcCtx *svc.ServiceContext
-	logx.Logger
+	*slog.Logger
 }
 
 func NewCarDelLogic(ctx context.Context, svcCtx *svc.ServiceContext) *CarDelLogic {
 	return &CarDelLogic{
 		ctx:    ctx,
 		svcCtx: svcCtx,
-		Logger: logx.WithContext(ctx),
+		Logger: logging.Context(ctx),
 	}
 }
 
@@ -33,14 +35,14 @@ func (l *CarDelLogic) CarDel(in *delivery.IdentRequest) (*delivery.StatusReply,
 		return nil, err
 	}
 	if in.GetIdentity() == "" {
-		return nil, exception.ErrInvalidArgument
+		return nil, errcode.ErrInvalidArgument
 	}
 	//Todo: 删除是是否判定有未完成订单不能删除
 
 	err = models.DBService.Where("identity = ?", in.Identity).Delete(&models.DeliveryCar{}).Error
 	if err != nil {
 		l.Logger.Error(err.Error())
-		return nil, exception.ErrDBFatal
+		return nil, errcode.ErrDB
 	}
 	return &delivery.StatusReply{Status: 200, Identity: in.Identity, Message: ""}, nil
 }

module/ec/delivery/internal/logic/car/car_get_logic.go

@@ -4,27 +4,29 @@ import (
 	"context"
 	"errors"
 
-	"git.apinb.com/bsm-sdk/engine/exception"
-	"git.apinb.com/bsm-sdk/engine/service"
 	"bsm/full/module/ec/delivery/external/pb/delivery"
 	"bsm/full/module/ec/delivery/internal/models"
 	"bsm/full/module/ec/delivery/internal/svc"
+	"git.apinb.com/bsm-sdk/core/errcode"
+	"git.apinb.com/bsm-sdk/core/service"
 	"gorm.io/gorm"
 
-	"github.com/zeromicro/go-zero/core/logx"
+	"log/slog"
+
+	"bsm/full/shared/logging"
 )
 
 type CarGetLogic struct {
 	ctx    context.Context
 	svcCtx *svc.ServiceContext
-	logx.Logger
+	*slog.Logger
 }
 
 func NewCarGetLogic(ctx context.Context, svcCtx *svc.ServiceContext) *CarGetLogic {
 	return &CarGetLogic{
 		ctx:    ctx,
 		svcCtx: svcCtx,
-		Logger: logx.WithContext(ctx),
+		Logger: logging.Context(ctx),
 	}
 }
 
@@ -35,7 +37,7 @@ func (l *CarGetLogic) CarGet(in *delivery.IdentRequest) (*delivery.CarItem, erro
 		return nil, err
 	}
 	if in.GetIdentity() == "" {
-		return nil, exception.ErrInvalidArgument
+		return nil, errcode.ErrInvalidArgument
 	}
 
 	var data = delivery.CarItem{}
@@ -43,9 +45,9 @@ func (l *CarGetLogic) CarGet(in *delivery.IdentRequest) (*delivery.CarItem, erro
 	if err != nil {
 		l.Logger.Error(err.Error())
 		if errors.Is(err, gorm.ErrRecordNotFound) {
-			return nil, exception.ErrNotFound
+			return nil, errcode.ErrRecordNotFound
 		}
-		return nil, exception.ErrDBFatal
+		return nil, errcode.ErrDB
 	}
 	return &data, nil
 }

module/ec/delivery/internal/logic/car/car_list_logic.go

@@ -4,27 +4,29 @@ import (
 	"context"
 	"errors"
 
-	"git.apinb.com/bsm-sdk/engine/exception"
-	"git.apinb.com/bsm-sdk/engine/service"
 	"bsm/full/module/ec/delivery/external/pb/delivery"
 	"bsm/full/module/ec/delivery/internal/models"
 	"bsm/full/module/ec/delivery/internal/svc"
+	"git.apinb.com/bsm-sdk/core/errcode"
+	"git.apinb.com/bsm-sdk/core/service"
 	"gorm.io/gorm"
 
-	"github.com/zeromicro/go-zero/core/logx"
+	"log/slog"
+
+	"bsm/full/shared/logging"
 )
 
 type CarListLogic struct {
 	ctx    context.Context
 	svcCtx *svc.ServiceContext
-	logx.Logger
+	*slog.Logger
 }
 
 func NewCarListLogic(ctx context.Context, svcCtx *svc.ServiceContext) *CarListLogic {
 	return &CarListLogic{
 		ctx:    ctx,
 		svcCtx: svcCtx,
-		Logger: logx.WithContext(ctx),
+		Logger: logging.Context(ctx),
 	}
 }
 
@@ -60,9 +62,9 @@ func (l *CarListLogic) CarList(in *delivery.FetchRequest) (*delivery.CarListRepl
 	if err != nil {
 		l.Logger.Error(err.Error())
 		if errors.Is(err, gorm.ErrRecordNotFound) {
-			return nil, exception.ErrNotFound
+			return nil, errcode.ErrRecordNotFound
 		}
-		return nil, exception.ErrDBFatal
+		return nil, errcode.ErrDB
 	}
 	for _, v := range res {
 		item := delivery.CarItem{

module/ec/delivery/internal/logic/car/car_set_logic.go

@@ -3,26 +3,28 @@ package deliverylogic
 import (
 	"context"
 
-	"git.apinb.com/bsm-sdk/engine/exception"
-	"git.apinb.com/bsm-sdk/engine/service"
 	"bsm/full/module/ec/delivery/external/pb/delivery"
 	"bsm/full/module/ec/delivery/internal/models"
 	"bsm/full/module/ec/delivery/internal/svc"
+	"git.apinb.com/bsm-sdk/core/errcode"
+	"git.apinb.com/bsm-sdk/core/service"
 
-	"github.com/zeromicro/go-zero/core/logx"
+	"log/slog"
+
+	"bsm/full/shared/logging"
 )
 
 type CarSetLogic struct {
 	ctx    context.Context
 	svcCtx *svc.ServiceContext
-	logx.Logger
+	*slog.Logger
 }
 
 func NewCarSetLogic(ctx context.Context, svcCtx *svc.ServiceContext) *CarSetLogic {
 	return &CarSetLogic{
 		ctx:    ctx,
 		svcCtx: svcCtx,
-		Logger: logx.WithContext(ctx),
+		Logger: logging.Context(ctx),
 	}
 }
 
@@ -49,35 +51,35 @@ func (l *CarSetLogic) CarSet(in *delivery.CarItem) (*delivery.StatusReply, error
 	err = models.DBService.Where("identity = ?", in.Identity).Updates(&data).Error
 	if err != nil {
 		l.Logger.Error(err.Error())
-		return nil, exception.ErrDBFatal
+		return nil, errcode.ErrDB
 	}
 
 	return &delivery.StatusReply{Status: 200, Identity: in.Identity, Message: ""}, nil
 }
 func carSetChick(in *delivery.CarItem) error {
 	if in.GetIdentity() == "" {
-		return exception.ErrInvalidArgument
+		return errcode.ErrInvalidArgument
 	}
 	if in.GetBrand() == "" {
-		return exception.ErrInvalidArgument
+		return errcode.ErrInvalidArgument
 	}
 	if in.GetPhone() == "" {
-		return exception.ErrInvalidArgument
+		return errcode.ErrInvalidArgument
 	}
 	// if in.GetTeamIdentity() == "" {
-	// 	return exception.ErrInvalidArgument
+	// 	return errcode.ErrInvalidArgument
 	// }
 	if in.GetContacts() == "" {
-		return exception.ErrInvalidArgument
+		return errcode.ErrInvalidArgument
 	}
 	if in.GetVersion() == "" {
-		return exception.ErrInvalidArgument
+		return errcode.ErrInvalidArgument
 	}
 	if in.GetPicture() == "" {
-		return exception.ErrInvalidArgument
+		return errcode.ErrInvalidArgument
 	}
 	if in.GetLicenseNumber() == "" {
-		return exception.ErrInvalidArgument
+		return errcode.ErrInvalidArgument
 	}
 	return nil
 }

module/ec/delivery/internal/logic/member/member_add_logic.go

@@ -3,27 +3,29 @@ package deliverylogic
 import (
 	"context"
 
-	"git.apinb.com/bsm-sdk/engine/exception"
-	"git.apinb.com/bsm-sdk/engine/service"
-	"git.apinb.com/bsm-sdk/engine/utils"
 	"bsm/full/module/ec/delivery/external/pb/delivery"
 	"bsm/full/module/ec/delivery/internal/models"
 	"bsm/full/module/ec/delivery/internal/svc"
+	"git.apinb.com/bsm-sdk/core/errcode"
+	"git.apinb.com/bsm-sdk/core/service"
+	"git.apinb.com/bsm-sdk/core/utils"
 
-	"github.com/zeromicro/go-zero/core/logx"
+	"log/slog"
+
+	"bsm/full/shared/logging"
 )
 
 type MemberAddLogic struct {
 	ctx    context.Context
 	svcCtx *svc.ServiceContext
-	logx.Logger
+	*slog.Logger
 }
 
 func NewMemberAddLogic(ctx context.Context, svcCtx *svc.ServiceContext) *MemberAddLogic {
 	return &MemberAddLogic{
 		ctx:    ctx,
 		svcCtx: svcCtx,
-		Logger: logx.WithContext(ctx),
+		Logger: logging.Context(ctx),
 	}
 }
 
@@ -48,26 +50,26 @@ func (l *MemberAddLogic) MemberAdd(in *delivery.MemberItem) (*delivery.StatusRep
 	err = models.DBService.Create(&data).Error
 	if err != nil {
 		l.Logger.Error(err.Error())
-		return nil, exception.ErrDBFatal
+		return nil, errcode.ErrDB
 	}
 
 	return &delivery.StatusReply{Status: 200, Identity: data.Identity, Message: ""}, nil
 }
 func memberAddChick(in *delivery.MemberItem) error {
 	if in.GetName() == "" {
-		return exception.ErrInvalidArgument
+		return errcode.ErrInvalidArgument
 	}
 	if in.GetPhone() == "" {
-		return exception.ErrInvalidArgument
+		return errcode.ErrInvalidArgument
 	}
 	// if in.GetTeamIdentity() == "" {
-	// 	return exception.ErrInvalidArgument
+	// 	return errcode.ErrInvalidArgument
 	// }
 	if in.GetPicture() == "" {
-		return exception.ErrInvalidArgument
+		return errcode.ErrInvalidArgument
 	}
 	if in.GetPhone() == "" {
-		return exception.ErrInvalidArgument
+		return errcode.ErrInvalidArgument
 	}
 	return nil
 }

module/ec/delivery/internal/logic/member/member_del_logic.go

@@ -3,26 +3,28 @@ package deliverylogic
 import (
 	"context"
 
-	"git.apinb.com/bsm-sdk/engine/exception"
-	"git.apinb.com/bsm-sdk/engine/service"
 	"bsm/full/module/ec/delivery/external/pb/delivery"
 	"bsm/full/module/ec/delivery/internal/models"
 	"bsm/full/module/ec/delivery/internal/svc"
+	"git.apinb.com/bsm-sdk/core/errcode"
+	"git.apinb.com/bsm-sdk/core/service"
 
-	"github.com/zeromicro/go-zero/core/logx"
+	"log/slog"
+
+	"bsm/full/shared/logging"
 )
 
 type MemberDelLogic struct {
 	ctx    context.Context
 	svcCtx *svc.ServiceContext
-	logx.Logger
+	*slog.Logger
 }
 
 func NewMemberDelLogic(ctx context.Context, svcCtx *svc.ServiceContext) *MemberDelLogic {
 	return &MemberDelLogic{
 		ctx:    ctx,
 		svcCtx: svcCtx,
-		Logger: logx.WithContext(ctx),
+		Logger: logging.Context(ctx),
 	}
 }
 
@@ -33,14 +35,14 @@ func (l *MemberDelLogic) MemberDel(in *delivery.IdentRequest) (*delivery.StatusR
 		return nil, err
 	}
 	if in.GetIdentity() == "" {
-		return nil, exception.ErrInvalidArgument
+		return nil, errcode.ErrInvalidArgument
 	}
 	//Todo: 删除是是否判定有未完成订单不能删除
 
 	err = models.DBService.Where("identity = ?", in.Identity).Delete(&models.DeliveryMember{}).Error
 	if err != nil {
 		l.Logger.Error(err.Error())
-		return nil, exception.ErrDBFatal
+		return nil, errcode.ErrDB
 	}
 	return &delivery.StatusReply{Status: 200, Identity: in.Identity, Message: ""}, nil
 }

module/ec/delivery/internal/logic/member/member_get_logic.go

@@ -4,27 +4,29 @@ import (
 	"context"
 	"errors"
 
-	"git.apinb.com/bsm-sdk/engine/exception"
-	"git.apinb.com/bsm-sdk/engine/service"
 	"bsm/full/module/ec/delivery/external/pb/delivery"
 	"bsm/full/module/ec/delivery/internal/models"
 	"bsm/full/module/ec/delivery/internal/svc"
+	"git.apinb.com/bsm-sdk/core/errcode"
+	"git.apinb.com/bsm-sdk/core/service"
 	"gorm.io/gorm"
 
-	"github.com/zeromicro/go-zero/core/logx"
+	"log/slog"
+
+	"bsm/full/shared/logging"
 )
 
 type MemberGetLogic struct {
 	ctx    context.Context
 	svcCtx *svc.ServiceContext
-	logx.Logger
+	*slog.Logger
 }
 
 func NewMemberGetLogic(ctx context.Context, svcCtx *svc.ServiceContext) *MemberGetLogic {
 	return &MemberGetLogic{
 		ctx:    ctx,
 		svcCtx: svcCtx,
-		Logger: logx.WithContext(ctx),
+		Logger: logging.Context(ctx),
 	}
 }
 
@@ -35,7 +37,7 @@ func (l *MemberGetLogic) MemberGet(in *delivery.IdentRequest) (*delivery.MemberI
 		return nil, err
 	}
 	if in.GetIdentity() == "" {
-		return nil, exception.ErrInvalidArgument
+		return nil, errcode.ErrInvalidArgument
 	}
 
 	var data = delivery.MemberItem{}
@@ -43,9 +45,9 @@ func (l *MemberGetLogic) MemberGet(in *delivery.IdentRequest) (*delivery.MemberI
 	if err != nil {
 		l.Logger.Error(err.Error())
 		if errors.Is(err, gorm.ErrRecordNotFound) {
-			return nil, exception.ErrNotFound
+			return nil, errcode.ErrRecordNotFound
 		}
-		return nil, exception.ErrDBFatal
+		return nil, errcode.ErrDB
 	}
 	return &data, nil
 }

module/ec/delivery/internal/logic/member/member_list_logic.go

@@ -4,27 +4,29 @@ import (
 	"context"
 	"errors"
 
-	"git.apinb.com/bsm-sdk/engine/exception"
-	"git.apinb.com/bsm-sdk/engine/service"
 	"bsm/full/module/ec/delivery/external/pb/delivery"
 	"bsm/full/module/ec/delivery/internal/models"
 	"bsm/full/module/ec/delivery/internal/svc"
+	"git.apinb.com/bsm-sdk/core/errcode"
+	"git.apinb.com/bsm-sdk/core/service"
 	"gorm.io/gorm"
 
-	"github.com/zeromicro/go-zero/core/logx"
+	"log/slog"
+
+	"bsm/full/shared/logging"
 )
 
 type MemberListLogic struct {
 	ctx    context.Context
 	svcCtx *svc.ServiceContext
-	logx.Logger
+	*slog.Logger
 }
 
 func NewMemberListLogic(ctx context.Context, svcCtx *svc.ServiceContext) *MemberListLogic {
 	return &MemberListLogic{
 		ctx:    ctx,
 		svcCtx: svcCtx,
-		Logger: logx.WithContext(ctx),
+		Logger: logging.Context(ctx),
 	}
 }
 
@@ -60,9 +62,9 @@ func (l *MemberListLogic) MemberList(in *delivery.FetchRequest) (*delivery.Membe
 	if err != nil {
 		l.Logger.Error(err.Error())
 		if errors.Is(err, gorm.ErrRecordNotFound) {
-			return nil, exception.ErrNotFound
+			return nil, errcode.ErrRecordNotFound
 		}
-		return nil, exception.ErrDBFatal
+		return nil, errcode.ErrDB
 	}
 	for _, v := range res {
 		item := delivery.MemberItem{

module/ec/delivery/internal/logic/member/member_set_logic.go

@@ -3,26 +3,28 @@ package deliverylogic
 import (
 	"context"
 
-	"git.apinb.com/bsm-sdk/engine/exception"
-	"git.apinb.com/bsm-sdk/engine/service"
 	"bsm/full/module/ec/delivery/external/pb/delivery"
 	"bsm/full/module/ec/delivery/internal/models"
 	"bsm/full/module/ec/delivery/internal/svc"
+	"git.apinb.com/bsm-sdk/core/errcode"
+	"git.apinb.com/bsm-sdk/core/service"
 
-	"github.com/zeromicro/go-zero/core/logx"
+	"log/slog"
+
+	"bsm/full/shared/logging"
 )
 
 type MemberSetLogic struct {
 	ctx    context.Context
 	svcCtx *svc.ServiceContext
-	logx.Logger
+	*slog.Logger
 }
 
 func NewMemberSetLogic(ctx context.Context, svcCtx *svc.ServiceContext) *MemberSetLogic {
 	return &MemberSetLogic{
 		ctx:    ctx,
 		svcCtx: svcCtx,
-		Logger: logx.WithContext(ctx),
+		Logger: logging.Context(ctx),
 	}
 }
 
@@ -47,7 +49,7 @@ func (l *MemberSetLogic) MemberSet(in *delivery.MemberItem) (*delivery.StatusRep
 	err = models.DBService.Where("identity = ?", in.Identity).Updates(&data).Error
 	if err != nil {
 		l.Logger.Error(err.Error())
-		return nil, exception.ErrDBFatal
+		return nil, errcode.ErrDB
 	}
 
 	return &delivery.StatusReply{Status: 200, Identity: in.Identity, Message: ""}, nil
@@ -55,22 +57,22 @@ func (l *MemberSetLogic) MemberSet(in *delivery.MemberItem) (*delivery.StatusRep
 
 func memberSetChick(in *delivery.MemberItem) error {
 	if in.GetIdentity() == "" {
-		return exception.ErrInvalidArgument
+		return errcode.ErrInvalidArgument
 	}
 	if in.GetName() == "" {
-		return exception.ErrInvalidArgument
+		return errcode.ErrInvalidArgument
 	}
 	if in.GetPhone() == "" {
-		return exception.ErrInvalidArgument
+		return errcode.ErrInvalidArgument
 	}
 	// if in.GetTeamIdentity() == "" {
-	// 	return exception.ErrInvalidArgument
+	// 	return errcode.ErrInvalidArgument
 	// }
 	if in.GetPicture() == "" {
-		return exception.ErrInvalidArgument
+		return errcode.ErrInvalidArgument
 	}
 	if in.GetPhone() == "" {
-		return exception.ErrInvalidArgument
+		return errcode.ErrInvalidArgument
 	}
 	return nil
 }

module/ec/delivery/internal/logic/team/team_add_logic.go

@@ -3,27 +3,29 @@ package deliverylogic
 import (
 	"context"
 
-	"git.apinb.com/bsm-sdk/engine/exception"
-	"git.apinb.com/bsm-sdk/engine/service"
-	"git.apinb.com/bsm-sdk/engine/utils"
 	"bsm/full/module/ec/delivery/external/pb/delivery"
 	"bsm/full/module/ec/delivery/internal/models"
 	"bsm/full/module/ec/delivery/internal/svc"
+	"git.apinb.com/bsm-sdk/core/errcode"
+	"git.apinb.com/bsm-sdk/core/service"
+	"git.apinb.com/bsm-sdk/core/utils"
 
-	"github.com/zeromicro/go-zero/core/logx"
+	"log/slog"
+
+	"bsm/full/shared/logging"
 )
 
 type TeamAddLogic struct {
 	ctx    context.Context
 	svcCtx *svc.ServiceContext
-	logx.Logger
+	*slog.Logger
 }
 
 func NewTeamAddLogic(ctx context.Context, svcCtx *svc.ServiceContext) *TeamAddLogic {
 	return &TeamAddLogic{
 		ctx:    ctx,
 		svcCtx: svcCtx,
-		Logger: logx.WithContext(ctx),
+		Logger: logging.Context(ctx),
 	}
 }
 
@@ -49,7 +51,7 @@ func (l *TeamAddLogic) TeamAdd(in *delivery.TeamItem) (*delivery.StatusReply, er
 	err = models.DBService.Create(&data).Error
 	if err != nil {
 		l.Logger.Error(err.Error())
-		return nil, exception.ErrDBFatal
+		return nil, errcode.ErrDB
 	}
 
 	return &delivery.StatusReply{Status: 200, Identity: data.Identity, Message: ""}, nil
@@ -57,19 +59,19 @@ func (l *TeamAddLogic) TeamAdd(in *delivery.TeamItem) (*delivery.StatusReply, er
 
 func teamAddChick(in *delivery.TeamItem) error {
 	if in.GetOwner() == "" {
-		return exception.ErrInvalidArgument
+		return errcode.ErrInvalidArgument
 	}
 	if in.GetPhone() == "" {
-		return exception.ErrInvalidArgument
+		return errcode.ErrInvalidArgument
 	}
 	if in.GetTitle() == "" {
-		return exception.ErrInvalidArgument
+		return errcode.ErrInvalidArgument
 	}
 	if in.GetContacts() == "" {
-		return exception.ErrInvalidArgument
+		return errcode.ErrInvalidArgument
 	}
 	if in.GetLogo() == "" {
-		return exception.ErrInvalidArgument
+		return errcode.ErrInvalidArgument
 	}
 	return nil
 }

module/ec/delivery/internal/logic/team/team_del_logic.go

@@ -3,26 +3,28 @@ package deliverylogic
 import (
 	"context"
 
-	"git.apinb.com/bsm-sdk/engine/exception"
-	"git.apinb.com/bsm-sdk/engine/service"
 	"bsm/full/module/ec/delivery/external/pb/delivery"
 	"bsm/full/module/ec/delivery/internal/models"
 	"bsm/full/module/ec/delivery/internal/svc"
+	"git.apinb.com/bsm-sdk/core/errcode"
+	"git.apinb.com/bsm-sdk/core/service"
 
-	"github.com/zeromicro/go-zero/core/logx"
+	"log/slog"
+
+	"bsm/full/shared/logging"
 )
 
 type TeamDelLogic struct {
 	ctx    context.Context
 	svcCtx *svc.ServiceContext
-	logx.Logger
+	*slog.Logger
 }
 
 func NewTeamDelLogic(ctx context.Context, svcCtx *svc.ServiceContext) *TeamDelLogic {
 	return &TeamDelLogic{
 		ctx:    ctx,
 		svcCtx: svcCtx,
-		Logger: logx.WithContext(ctx),
+		Logger: logging.Context(ctx),
 	}
 }
 
@@ -33,14 +35,14 @@ func (l *TeamDelLogic) TeamDel(in *delivery.IdentRequest) (*delivery.StatusReply
 		return nil, err
 	}
 	if in.GetIdentity() == "" {
-		return nil, exception.ErrInvalidArgument
+		return nil, errcode.ErrInvalidArgument
 	}
 	//Todo: 删除是是否判定有成员不能删除
 
 	err = models.DBService.Where("identity = ?", in.Identity).Delete(&models.DeliveryItem{}).Error
 	if err != nil {
 		l.Logger.Error(err.Error())
-		return nil, exception.ErrDBFatal
+		return nil, errcode.ErrDB
 	}
 
 	return &delivery.StatusReply{Status: 200, Identity: in.Identity, Message: ""}, nil

module/ec/delivery/internal/logic/team/team_get_logic.go

@@ -4,27 +4,29 @@ import (
 	"context"
 	"errors"
 
-	"git.apinb.com/bsm-sdk/engine/exception"
-	"git.apinb.com/bsm-sdk/engine/service"
 	"bsm/full/module/ec/delivery/external/pb/delivery"
 	"bsm/full/module/ec/delivery/internal/models"
 	"bsm/full/module/ec/delivery/internal/svc"
+	"git.apinb.com/bsm-sdk/core/errcode"
+	"git.apinb.com/bsm-sdk/core/service"
 	"gorm.io/gorm"
 
-	"github.com/zeromicro/go-zero/core/logx"
+	"log/slog"
+
+	"bsm/full/shared/logging"
 )
 
 type TeamGetLogic struct {
 	ctx    context.Context
 	svcCtx *svc.ServiceContext
-	logx.Logger
+	*slog.Logger
 }
 
 func NewTeamGetLogic(ctx context.Context, svcCtx *svc.ServiceContext) *TeamGetLogic {
 	return &TeamGetLogic{
 		ctx:    ctx,
 		svcCtx: svcCtx,
-		Logger: logx.WithContext(ctx),
+		Logger: logging.Context(ctx),
 	}
 }
 
@@ -35,7 +37,7 @@ func (l *TeamGetLogic) TeamGet(in *delivery.IdentRequest) (*delivery.TeamItem, e
 		return nil, err
 	}
 	if in.GetIdentity() == "" {
-		return nil, exception.ErrInvalidArgument
+		return nil, errcode.ErrInvalidArgument
 	}
 
 	var data = delivery.TeamItem{}
@@ -43,9 +45,9 @@ func (l *TeamGetLogic) TeamGet(in *delivery.IdentRequest) (*delivery.TeamItem, e
 	if err != nil {
 		l.Logger.Error(err.Error())
 		if errors.Is(err, gorm.ErrRecordNotFound) {
-			return nil, exception.ErrNotFound
+			return nil, errcode.ErrRecordNotFound
 		}
-		return nil, exception.ErrDBFatal
+		return nil, errcode.ErrDB
 	}
 	return &data, nil
 }

module/ec/delivery/internal/logic/team/team_list_logic.go

@@ -5,27 +5,29 @@ import (
 	"errors"
 	"fmt"
 
-	"git.apinb.com/bsm-sdk/engine/exception"
-	"git.apinb.com/bsm-sdk/engine/service"
 	"bsm/full/module/ec/delivery/external/pb/delivery"
 	"bsm/full/module/ec/delivery/internal/models"
 	"bsm/full/module/ec/delivery/internal/svc"
+	"git.apinb.com/bsm-sdk/core/errcode"
+	"git.apinb.com/bsm-sdk/core/service"
 	"gorm.io/gorm"
 
-	"github.com/zeromicro/go-zero/core/logx"
+	"log/slog"
+
+	"bsm/full/shared/logging"
 )
 
 type TeamListLogic struct {
 	ctx    context.Context
 	svcCtx *svc.ServiceContext
-	logx.Logger
+	*slog.Logger
 }
 
 func NewTeamListLogic(ctx context.Context, svcCtx *svc.ServiceContext) *TeamListLogic {
 	return &TeamListLogic{
 		ctx:    ctx,
 		svcCtx: svcCtx,
-		Logger: logx.WithContext(ctx),
+		Logger: logging.Context(ctx),
 	}
 }
 
@@ -62,10 +64,10 @@ func (l *TeamListLogic) TeamList(in *delivery.FetchRequest) (*delivery.TeamListR
 		fmt.Println("err:", err.Error())
 		l.Logger.Error(err.Error())
 		if errors.Is(err, gorm.ErrRecordNotFound) {
-			return nil, exception.ErrNotFound
+			return nil, errcode.ErrRecordNotFound
 		}
 
-		return nil, exception.ErrDBFatal
+		return nil, errcode.ErrDB
 	}
 	for _, v := range res {
 		item := delivery.TeamItem{

module/ec/delivery/internal/logic/team/team_set_logic.go

@@ -3,26 +3,28 @@ package deliverylogic
 import (
 	"context"
 
-	"git.apinb.com/bsm-sdk/engine/exception"
-	"git.apinb.com/bsm-sdk/engine/service"
 	"bsm/full/module/ec/delivery/external/pb/delivery"
 	"bsm/full/module/ec/delivery/internal/models"
 	"bsm/full/module/ec/delivery/internal/svc"
+	"git.apinb.com/bsm-sdk/core/errcode"
+	"git.apinb.com/bsm-sdk/core/service"
 
-	"github.com/zeromicro/go-zero/core/logx"
+	"log/slog"
+
+	"bsm/full/shared/logging"
 )
 
 type TeamSetLogic struct {
 	ctx    context.Context
 	svcCtx *svc.ServiceContext
-	logx.Logger
+	*slog.Logger
 }
 
 func NewTeamSetLogic(ctx context.Context, svcCtx *svc.ServiceContext) *TeamSetLogic {
 	return &TeamSetLogic{
 		ctx:    ctx,
 		svcCtx: svcCtx,
-		Logger: logx.WithContext(ctx),
+		Logger: logging.Context(ctx),
 	}
 }
 
@@ -47,30 +49,30 @@ func (l *TeamSetLogic) TeamSet(in *delivery.TeamItem) (*delivery.StatusReply, er
 	err = models.DBService.Where("identity = ?", in.Identity).Updates(&data).Error
 	if err != nil {
 		l.Logger.Error(err.Error())
-		return nil, exception.ErrDBFatal
+		return nil, errcode.ErrDB
 	}
 
 	return &delivery.StatusReply{Status: 200, Identity: in.Identity, Message: ""}, nil
 }
 func teamSetChick(in *delivery.TeamItem) error {
 	if in.GetIdentity() == "" {
-		return exception.ErrInvalidArgument
+		return errcode.ErrInvalidArgument
 
 	}
 	if in.GetOwner() == "" {
-		return exception.ErrInvalidArgument
+		return errcode.ErrInvalidArgument
 	}
 	if in.GetPhone() == "" {
-		return exception.ErrInvalidArgument
+		return errcode.ErrInvalidArgument
 	}
 	if in.GetTitle() == "" {
-		return exception.ErrInvalidArgument
+		return errcode.ErrInvalidArgument
 	}
 	if in.GetContacts() == "" {
-		return exception.ErrInvalidArgument
+		return errcode.ErrInvalidArgument
 	}
 	if in.GetLogo() == "" {
-		return exception.ErrInvalidArgument
+		return errcode.ErrInvalidArgument
 	}
 	return nil
 }

module/ec/delivery/internal/models/impl.go

@@ -1,8 +1,8 @@
 package models
 
 import (
-	"git.apinb.com/bsm-sdk/engine/database/sql"
-	"git.apinb.com/bsm-sdk/engine/types"
+	"git.apinb.com/bsm-sdk/core/database/sql"
+	"git.apinb.com/bsm-sdk/core/types"
 	"gorm.io/gorm"
 )
 
@@ -19,10 +19,5 @@ func New(dsn string, options *types.SqlOptions) (err error) {
 	if err != nil {
 		return err
 	}
-
-	err = DBService.AutoMigrate(migrateTables...)
-	if err != nil {
-		return err
-	}
-	return
+	return DBService.AutoMigrate(migrateTables...)
 }