add third

conf/new.go

@@ -59,17 +59,17 @@ func NotNil(values ...string) {
 	}
 }
 
-func PrintInfo(ip string, port int) {
+func PrintInfo(addr string) {
 	print.Success("[BSM - %s] Config Check Success.", vars.ServiceKey)
 	print.Info("[BSM - %s] Service Name: %s", vars.ServiceKey, vars.ServiceKey)
 	print.Info("[BSM - %s] Runtime Mode: %s", vars.ServiceKey, env.Runtime.Mode)
-	print.Info("[BSM - %s] Listen Addr: %s:%d", vars.ServiceKey, ip, port)
 }
 
-func CheckPort(port int) int {
+func CheckPort(port string) string {
-	if port <= 0 || port >= 65535 {
+	if port == "" {
 		r := rand.New(rand.NewPCG(1000, uint64(time.Now().UnixNano())))
-		return r.IntN(65535-1024) + 1024 // 生成1024到65535之间的随机端口
+		p := r.IntN(65535-1024) + 1024 // 生成1024到65535之间的随机端口
+		return utils.Int2String(p)
 	}
 	return port
 }

conf/types.go

@@ -2,10 +2,11 @@ package conf
 
 type Base struct {
 	Service   string `yaml:"Service"`   // 服务名称
-	Port      int    `yaml:"Port"`      // 服务监听端口,0为自动随机端口
+	Port      string `yaml:"Port"`      // 服务监听端口,0为自动随机端口
 	Cache     string `yaml:"Cache"`     // REDIS缓存
 	SecretKey string `yaml:"SecretKey"` // 服务秘钥
 	BindIP    string `yaml:"BindIP"`    // 绑定IP
+	Addr      string `yaml:"Addr"`
 }
 
 type DBConf struct {
@@ -18,6 +19,11 @@ type MicroServiceConf struct {
 	Anonymous []string `yaml:"Anonymous"`
 }
 
+type GatewayConf struct {
+	Enable bool `yaml:"Enable"` // 是否启用网关服务
+	Port   int  `yaml:"Port"`   // 服务监听端口
+}
+
 type ApmConf struct {
 	Name     string // APM服务名称
 	Platform string `yaml:"Platform"` // APM平台：apm,skywalking

go.mod

@@ -6,6 +6,7 @@ require (
 	github.com/FishGoddess/cachego v0.6.1
 	github.com/elastic/go-elasticsearch/v8 v8.17.1
 	github.com/google/uuid v1.6.0
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3
 	github.com/nats-io/nats.go v1.39.0
 	github.com/oklog/ulid/v2 v2.1.0
 	github.com/redis/go-redis/v9 v9.7.0
@@ -75,8 +76,8 @@ require (
 	golang.org/x/sync v0.11.0 // indirect
 	golang.org/x/sys v0.30.0 // indirect
 	golang.org/x/text v0.22.0 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20250212204824-5a70512c5d8b // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20250212204824-5a70512c5d8b // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20250303144028-a0af3efb3deb // indirect
 	google.golang.org/grpc v1.70.0
 	google.golang.org/protobuf v1.36.5 // indirect
 )

go.sum

@@ -4,13 +4,9 @@ github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs=
 github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c=
 github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA=
 github.com/bsm/gomega v1.27.10/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0=
-github.com/bytedance/sonic v1.12.8 h1:4xYRVRlXIgvSZ4e8iVTlMF5szgpXd4AfvuWgA8I8lgs=
-github.com/bytedance/sonic v1.12.8/go.mod h1:uVvFidNmlt9+wa31S1urfwwthTWteBgG0hWuoKAXTx8=
 github.com/bytedance/sonic v1.13.2 h1:8/H1FempDZqC4VqjptGo14QQlJx8VdZJegxs6wwfqpQ=
 github.com/bytedance/sonic v1.13.2/go.mod h1:o68xyaF9u2gvVBuGHPlUVCy+ZfmNNO5ETf1+KgkJhz4=
 github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU=
-github.com/bytedance/sonic/loader v0.2.3 h1:yctD0Q3v2NOGfSWPLPvG2ggA2kV6TS6s4wioyEqssH0=
-github.com/bytedance/sonic/loader v0.2.3/go.mod h1:N8A3vUdtUebEY2/VQC0MyhYeKUFosQU6FxH2JmUe6VI=
 github.com/bytedance/sonic/loader v0.2.4 h1:ZWCw4stuXUsn1/+zQDqeE7JKP+QO47tz7QCNan80NzY=
 github.com/bytedance/sonic/loader v0.2.4/go.mod h1:N8A3vUdtUebEY2/VQC0MyhYeKUFosQU6FxH2JmUe6VI=
 github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
@@ -60,11 +56,13 @@ github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
 github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
 github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
-github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
-github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 h1:5ZPtiqj0JL5oKWmcsq4VMaAW5ukBEgSGXEN89zeH1Jo=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3/go.mod h1:ndYquD05frm2vACXE1nsccT4oJzjhw2arTS2cpUD1PI=
 github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
 github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
 github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo=
@@ -207,10 +205,10 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/genproto/googleapis/api v0.0.0-20250212204824-5a70512c5d8b h1:i+d0RZa8Hs2L/MuaOQYI+krthcxdEbEM2N+Tf3kJ4zk=
+google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb h1:p31xT4yrYrSM/G4Sn2+TNUkVhFCbG9y8itM2S6Th950=
-google.golang.org/genproto/googleapis/api v0.0.0-20250212204824-5a70512c5d8b/go.mod h1:iYONQfRdizDB8JJBybql13nArx91jcUk7zCXEsOofM4=
+google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb/go.mod h1:jbe3Bkdp+Dh2IrslsFCklNhweNTBgSYanP1UXhJDhKg=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20250212204824-5a70512c5d8b h1:FQtJ1MxbXoIIrZHZ33M+w5+dAP9o86rgpjoKr/ZmT7k=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250303144028-a0af3efb3deb h1:TLPQVbx1GJ8VKZxz52VAxl1EBgKXXbTiU9Fc5fZeLn4=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20250212204824-5a70512c5d8b/go.mod h1:8BS3B93F/U1juMFq9+EDk+qOT5CO1R9IzXxG3PTqiRk=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250303144028-a0af3efb3deb/go.mod h1:LuRYeWDFV6WOn90g357N17oMCaxpgCnbi/44qJvDn2I=
 google.golang.org/grpc v1.70.0 h1:pWFv03aZoHzlRKHWicjsZytKAiYCtNS0dHbXnIdq7jQ=
 google.golang.org/grpc v1.70.0/go.mod h1:ofIJqVKDXx/JiXrwr2IG4/zwdH9txy3IlF40RmcJSQw=
 google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM=

service/meta.go

@@ -30,6 +30,17 @@ func ParseMetaCtx(ctx context.Context, opts *ParseOptions) (*Meta, error) {
 		return nil, errcode.ErrJWTAuthNotFound
 	}
 
+	// 安全获取 metadata 中的值
+	identityValues := md.Get("authorization_identity")
+	clientValues := md.Get("client")
+
+	if len(identityValues) == 0 {
+		return nil, errcode.ErrJWTAuthNotFound
+	}
+	if len(clientValues) == 0 {
+		return nil, errcode.ErrJWTAuthNotFound
+	}
+
 	meta := &Meta{
 		IDENTITY: md["authorization_identity"][0],
 		CLIENT:   md["client"][0],

service/service.go

@@ -1,12 +1,17 @@
 package service
 
 import (
+	"context"
 	"log"
 	"net"
 	"os"
 	"strconv"
 	"strings"
 
+	"net/http"
+
+	gwRuntime "github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
+
 	"git.apinb.com/bsm-sdk/core/conf"
 	"git.apinb.com/bsm-sdk/core/env"
 	"git.apinb.com/bsm-sdk/core/print"
@@ -25,9 +30,12 @@ type (
 	}
 
 	Options struct {
-		Addr       string
+		Addr        string
-		Conf       *conf.MicroServiceConf
+		EtcdClient  *clientv3.Client
-		EtcdClient *clientv3.Client
+		MsConf      *conf.MicroServiceConf
+		GatewayConf *conf.GatewayConf
+		GatewayCtx  context.Context
+		GatewayMux  *gwRuntime.ServeMux
 	}
 )
 
@@ -43,11 +51,12 @@ func (s *Service) Start() {
 	print.Info("[BSM - %s] Service Starting ...", vars.ServiceKey)
 
 	// register to etcd.
-	if s.Opts.Conf != nil && s.Opts.Conf.Enable {
+	if s.Opts.MsConf != nil && s.Opts.MsConf.Enable {
 		if s.Opts.EtcdClient == nil {
 			print.Error("[BSM Register] Etcd Client is nil.")
 			os.Exit(1)
 		}
+		print.Info("[BSM - %s] Registering Service to Etcd ...", vars.ServiceKey)
 		// get methods
 		methods := FoundGrpcMethods(s.GrpcSrv)
 
@@ -62,7 +71,7 @@ func (s *Service) Start() {
 
 		anonKey := vars.ServiceRootPrefix + "Router/" + env.Runtime.Workspace + "/"
 
-		register.SetAnonymous(anonKey, s.Opts.Conf.Anonymous)
+		register.SetAnonymous(anonKey, s.Opts.MsConf.Anonymous)
 
 		// service register lease
 		go register.ListenLeaseRespChan()
@@ -74,11 +83,29 @@ func (s *Service) Start() {
 		panic(err)
 	}
 
-	print.Success("[BSM - %s] Service Grpc Register & Runing Success!", vars.ServiceKey)
+	go func() {
-	if err := s.GrpcSrv.Serve(tcpListen); err != nil {
+		if err := s.GrpcSrv.Serve(tcpListen); err != nil {
-		panic(err)
+			panic(err)
+		}
+	}()
+	print.Success("[BSM - %s] Grpc %s Runing Success !", vars.ServiceKey, s.Opts.Addr)
+
+	if s.Opts.GatewayConf != nil && s.Opts.GatewayConf.Enable {
+		addr := Addr("0.0.0.0", s.Opts.GatewayConf.Port)
+		go s.Gateway(s.Opts.Addr, addr)
+
+		print.Success("[BSM - %s] Http %s Runing Success!", vars.ServiceKey, addr)
 	}
 
+	select {}
+}
+
+func (s *Service) Gateway(grpcAddr string, httpAddr string) {
+	// 1. 定义一个context
+	_, cancel := context.WithCancel(s.Opts.GatewayCtx)
+	defer cancel()
+
+	http.ListenAndServe(httpAddr, s.Opts.GatewayMux)
 }
 
 func (s *Service) Stop() {

third/wechat.go

@@ -0,0 +1,65 @@
+package third
+
+import (
+	"crypto/aes"
+	"crypto/cipher"
+	"encoding/base64"
+	"errors"
+)
+
+func WeChat_Decrypt(sessionKey, encryptedData, iv string) (string, error) {
+	aesKey, err := base64.StdEncoding.DecodeString(sessionKey)
+	if err != nil {
+		return "", err
+	}
+	cipherText, err := base64.StdEncoding.DecodeString(encryptedData)
+	if err != nil {
+		return "", err
+	}
+	ivBytes, err := base64.StdEncoding.DecodeString(iv)
+	if err != nil {
+		return "", err
+	}
+	block, err := aes.NewCipher(aesKey)
+	if err != nil {
+		return "", err
+	}
+	mode := cipher.NewCBCDecrypter(block, ivBytes)
+	mode.CryptBlocks(cipherText, cipherText)
+	cipherText, err = WeChat_Pkcs7Unpad(cipherText, block.BlockSize())
+	if err != nil {
+		return "", err
+	}
+
+	return string(cipherText), nil
+}
+
+// pkcs7Unpad returns slice of the original data without padding
+func WeChat_Pkcs7Unpad(data []byte, blockSize int) ([]byte, error) {
+	var (
+		// ErrInvalidBlockSize block size不合法
+		ErrInvalidBlockSize = errors.New("invalid block size")
+		// ErrInvalidPKCS7Data PKCS7数据不合法
+		ErrInvalidPKCS7Data = errors.New("invalid PKCS7 data")
+		// ErrInvalidPKCS7Padding 输入padding失败
+		ErrInvalidPKCS7Padding = errors.New("invalid padding on input")
+	)
+
+	if blockSize <= 0 {
+		return nil, ErrInvalidBlockSize
+	}
+	if len(data)%blockSize != 0 || len(data) == 0 {
+		return nil, ErrInvalidPKCS7Data
+	}
+	c := data[len(data)-1]
+	n := int(c)
+	if n == 0 || n > len(data) {
+		return nil, ErrInvalidPKCS7Padding
+	}
+	for i := 0; i < n; i++ {
+		if data[len(data)-n+i] != c {
+			return nil, ErrInvalidPKCS7Padding
+		}
+	}
+	return data[:len(data)-n], nil
+}

types/db.go

@@ -21,13 +21,13 @@ type (
 	// standard ID,Identity definition.
 	Std_IDIdentity struct {
 		ID       uint   `gorm:"primarykey;"  json:"id"`
-		Identity string `gorm:"column:identity;type:varchar(36);uniqueIndex;"  json:"identity"` // 唯一标识，24位NanoID,36位为ULID
+		Identity string `gorm:"column:identity;type:varchar(36);uniqueIndex;default:uuid_generate_v4()"  json:"identity"` // 唯一标识，24位NanoID,36位为ULID
 	}
 
 	// standard ID,Created,Updated,Deleted definition.
 	Std_IICUDS struct {
 		ID        uint           `gorm:"primarykey;"  json:"id"`
-		Identity  string         `gorm:"column:identity;type:varchar(36);uniqueIndex;"  json:"identity"` // 唯一标识，24位NanoID,36位为ULID
+		Identity  string         `gorm:"column:identity;type:varchar(36);uniqueIndex;default:uuid_generate_v4()"  json:"identity"` // 唯一标识，24位NanoID,36位为ULID
 		CreatedAt time.Time      `json:"created_at"`
 		UpdatedAt time.Time      `json:"updated_at"`
 		DeletedAt gorm.DeletedAt `gorm:"index;" json:"deleted_at"`
@@ -51,7 +51,7 @@ type (
 	// standard PassportID,PassportIdentity definition.
 	Std_Passport struct {
 		PassportID       uint   `gorm:"column:passport_id;Index;" json:"passport_id"`
-		PassportIdentity string `gorm:"column:passport_identity;type:varchar(36);Index;"  json:"passport_identity"` // 用户唯一标识，24位NanoID,36位为ULID
+		PassportIdentity string `gorm:"column:passport_identity;type:varchar(36);Index;default:uuid_generate_v4()"  json:"passport_identity"` // 用户唯一标识，24位NanoID,36位为ULID
 	}
 
 	// standard ID definition.
@@ -61,7 +61,7 @@ type (
 
 	// standard Identity definition.
 	Std_Identity struct {
-		Identity string `gorm:"column:identity;type:varchar(36);uniqueIndex;"  json:"identity"` // 唯一标识，24位NanoID,36位为ULID
+		Identity string `gorm:"column:identity;type:varchar(36);uniqueIndex;default:uuid_generate_v4()"  json:"identity"` // 唯一标识，24位NanoID,36位为ULID
 	}
 
 	// standard Status definition.

utils/time.go

@@ -0,0 +1,14 @@
+package utils
+
+import (
+	"time"
+)
+
+func Time2String(layout string, t time.Time) string {
+	return t.Format(layout)
+}
+
+func String2Time(layout, in string) time.Time {
+	t, _ := time.ParseInLocation(layout, in, time.Local)
+	return t
+}