fix,upd module

database/sql/ext.go

@@ -0,0 +1,30 @@
+package sql
+
+import "strings"
+
+// key,value To like sql
+func Like(key, val string) string {
+	if val == "" {
+		return ""
+	}
+	key = strings.TrimSpace(key)
+	val = strings.TrimSpace(val)
+	return key + " LIKE '%" + val + "%'"
+}
+
+// map strings to like sqls
+func Likes(in map[string]string) string {
+	var ar []string
+	for key, val := range in {
+		sql := Like(key, val)
+		if sql != "" {
+			ar = append(ar, sql)
+		}
+	}
+
+	if len(ar) == 0 {
+		return ""
+	}
+
+	return strings.Join(ar, " AND ")
+}

database/sql/postgresql.go

@@ -24,14 +24,14 @@ func NewPostgreSql(dsn string, options *types.SqlOptions) (*gorm.DB, error) {
 	}
 
 	//控制台和文件同时输出日志
-	var newLogger = setLogger(vars.ServiceKey, options.LogStdout)
+	//var newLogger = setLogger(vars.ServiceKey, options.LogStdout)
 
 	gormDb, err := gorm.Open(postgres.New(postgres.Config{
 		DSN: dsn,
 		// PreferSimpleProtocol: true,  disables implicit prepared statement usage
 
 	}), &gorm.Config{
-		Logger:                                   newLogger,
+		//Logger:newLogger,
 		DisableForeignKeyConstraintWhenMigrating: true,
 		NamingStrategy: schema.NamingStrategy{
 			SingularTable: true, // 使用单数表名，启用该选项，此时，`User` 的表名应该是 `t_user`

encipher/aes.go

@@ -21,8 +21,8 @@ var (
 	JwtSecretLen int
 )
 
-func New() {
+func New(token string) {
-	JwtSecret = []byte(env.MeshEnv.JwtSecretKey)
+	JwtSecret = []byte(token)
 	JwtSecretLen = len(env.MeshEnv.JwtSecretKey)
 }
 
@@ -34,6 +34,7 @@ func GenerateTokenAes(id uint, identity, client, role string, owner any, extend
 	claims := types.JwtClaims{
 		ID:        id,
 		Identity:  identity,
+		Client:    client,
 		Extend:    extend,
 		Owner:     owner,
 		Role:      role,

env/env.go

@@ -14,11 +14,32 @@ var MeshEnv *types.MeshEnv = nil
 func NewEnv() *types.MeshEnv {
 	if MeshEnv == nil {
 		MeshEnv = &types.MeshEnv{
-			Workspace:    GetEnvDefault("BlocksMesh_Workspace", "bsm"),
+			Workspace:    GetEnvDefault("BlocksMesh_Workspace", "def"),
-			Prefix:       GetEnvDefault("BlocksMesh_Prefix", utils.GetCurrentPath()),
 			JwtSecretKey: GetEnvDefault("BlocksMesh_JwtSecretKey", "Cblocksmesh2022C"),
 			RuntimeMode:  strings.ToLower(GetEnvDefault("BlocksMesh_RuntimeMode", "dev")),
 		}
+
+		if MeshEnv.RuntimeMode == "dev" {
+			MeshEnv.Prefix = GetEnvDefault("BlocksMesh_Prefix", utils.GetCurrentPath())
+		} else {
+			MeshEnv.Prefix = GetEnvDefault("BlocksMesh_Prefix", "/usr/local/bsm")
+		}
+	}
+	return MeshEnv
+}
+
+// get system base env.
+func NewBaseEnv() *types.MeshEnv {
+	if MeshEnv == nil {
+		MeshEnv = &types.MeshEnv{
+			RuntimeMode: strings.ToLower(GetEnvDefault("BlocksMesh_RuntimeMode", "dev")),
+		}
+
+		if MeshEnv.RuntimeMode == "dev" {
+			MeshEnv.Prefix = GetEnvDefault("BlocksMesh_Prefix", utils.GetCurrentPath())
+		} else {
+			MeshEnv.Prefix = GetEnvDefault("BlocksMesh_Prefix", "/usr/local/bsm")
+		}
 	}
 	return MeshEnv
 }

exception/auth.go

@@ -14,4 +14,5 @@ var (
 	ErrAuthClient       = Errorf(209, "Auth Token Client Not Passed")
 	ErrJsonDecode       = Errorf(210, "Auth JSON Decode Error")
 	ErrJsonEncode       = Errorf(211, "Auth JSON Encode Error")
+	ErrAccountNotFound  = Errorf(202, "Account Not Found")
 )

exception/errors.go

@@ -31,6 +31,8 @@ var (
 	ErrPasswd             = Errorf(19, "Password Error")
 
 	ErrSmsCode          = Errorf(20, "SMS Code Invalid")
+	ErrIdArgument       = Errorf(30, "ID Invalid Argument")
+	ErrIdentityArgument = Errorf(31, "Identity Invalid Argument")
 
 	// coustom error status
 )

go.mod

@@ -1,3 +1,3 @@
 module git.apinb.com/bsm-sdk/engine
 
-go 1.22
+go 1.23.3

service/context.go

@@ -2,9 +2,9 @@ package service
 
 import (
 	"context"
+	"encoding/json"
 	"strings"
 
-	"git.apinb.com/bsm-sdk/engine/encipher"
 	"git.apinb.com/bsm-sdk/engine/exception"
 	"git.apinb.com/bsm-sdk/engine/types"
 	"google.golang.org/grpc/metadata"
@@ -23,14 +23,15 @@ func ParseMetaCtx(ctx context.Context, opts *ParseOptions) (*types.JwtClaims, er
 		return nil, exception.ErrAuthNotFound
 	}
 
-	var Authorizations []string = md.Get("authorization")
+	var Authorizations []string = md.Get("authorization_claims")
 	if len(Authorizations) == 0 || Authorizations[0] == "" {
 		return nil, exception.ErrAuthNotFound
 	}
 
-	claims, err := encipher.ParseTokenAes(Authorizations[0])
+	var claims types.JwtClaims
+	err := json.Unmarshal([]byte(Authorizations[0]), &claims)
 	if err != nil {
-		return nil, err
+		return nil, exception.ErrAuthParseFail
 	}
 
 	if opts != nil {
@@ -39,6 +40,6 @@ func ParseMetaCtx(ctx context.Context, opts *ParseOptions) (*types.JwtClaims, er
 		}
 	}
 
-	return claims, nil
+	return &claims, nil
 
 }

service/service.go

@@ -6,7 +6,6 @@ import (
 
 	"git.apinb.com/bsm-sdk/engine/cmd"
 	"git.apinb.com/bsm-sdk/engine/configure"
-	"git.apinb.com/bsm-sdk/engine/encipher"
 	"git.apinb.com/bsm-sdk/engine/env"
 	"git.apinb.com/bsm-sdk/engine/print"
 	"git.apinb.com/bsm-sdk/engine/vars"
@@ -23,8 +22,6 @@ func Register(srvKey string, cfg any) {
 	// open side cmd.
 	cmd.NewCmd()
 
-	encipher.New()
-
 	print.Info("[Blocks Service] %s Starting...", vars.ServiceKey)
 
 	// set config args.
@@ -37,7 +34,7 @@ func Register(srvKey string, cfg any) {
 	// get config file.
 	cf := fmt.Sprintf("%s_%s.yaml", srvKey, env.MeshEnv.RuntimeMode)
 	cf = filepath.Join(env.MeshEnv.Prefix, "etc", cf)
-
+	print.Info("[Blocks Service] %s Config File: %s", vars.ServiceKey, cf)
 	configure.LoadYamlFile(cf, args, cfg)
 
 	return

types/db.go

@@ -18,48 +18,54 @@ type (
 		Debug     bool
 	}
 
+	// 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
+	}
+
 	// standard ID,Created,Updated,Deleted definition.
 	Std_IICUDS struct {
-		ID        uint   `gorm:"primarykey;"`
+		ID        uint           `gorm:"primarykey;"  json:"id"`
-		Identity  string `gorm:"column:identity;type:varchar(36);uniqueIndex;"` // 唯一标识，24位NanoID,36位为UUID
+		Identity  string         `gorm:"column:identity;type:varchar(36);uniqueIndex;"  json:"identity"` // 唯一标识，24位NanoID,36位为ULID
-		CreatedAt time.Time
+		CreatedAt time.Time      `json:"created_at"`
-		UpdatedAt time.Time
+		UpdatedAt time.Time      `json:"updated_at"`
-		DeletedAt gorm.DeletedAt `gorm:"index";`
+		DeletedAt gorm.DeletedAt `gorm:"index;" json:"deleted_at"`
-		Status    int8           `gorm:"default:0;index;"` // 状态：默认为0，-1禁止，1为正常
+		Status    int8           `gorm:"default:0;index;" json:"status"` // 状态：默认为0，-1禁止，1为正常
 	}
 
 	// standard ID,Identity,Created,Updated,Deleted,Status definition.
 	Std_ICUD struct {
-		ID        uint `gorm:"primarykey;"`
+		ID        uint           `gorm:"primarykey;"  json:"id"`
-		CreatedAt time.Time
+		CreatedAt time.Time      `json:"created_at"`
-		UpdatedAt time.Time
+		UpdatedAt time.Time      `json:"updated_at"`
-		DeletedAt gorm.DeletedAt `gorm:"index"`
+		DeletedAt gorm.DeletedAt `gorm:"index;" json:"deleted_at"`
 	}
 
 	// standard ID,Created definition.
 	Std_IdCreated struct {
-		ID        uint `gorm:"primarykey;"`
+		ID        uint      `gorm:"primarykey;"  json:"id"`
-		CreatedAt time.Time
+		CreatedAt time.Time `json:"created_at"`
 	}
 
 	// standard PassportID,PassportIdentity definition.
 	Std_Passport struct {
-		PassportID       uint   `gorm:"column:passport_id;Index;"`
+		PassportID       uint   `gorm:"column:passport_id;Index;" json:"passport_id"`
-		PassportIdentity string `gorm:"column:passport_identity;type:varchar(36);Index;"` // 用户唯一标识，24位NanoID,36位为UUID
+		PassportIdentity string `gorm:"column:passport_identity;type:varchar(36);Index;"  json:"passport_identity"` // 用户唯一标识，24位NanoID,36位为ULID
 	}
 
 	// standard ID definition.
 	Std_ID struct {
-		ID uint `gorm:"primarykey;"`
+		ID uint `gorm:"primarykey;"  json:"id"`
 	}
 
 	// standard Identity definition.
 	Std_Identity struct {
-		Identity string `gorm:"column:identity;type:varchar(36);uniqueIndex;"` // 唯一标识，24位NanoID,36位为UUID
+		Identity string `gorm:"column:identity;type:varchar(36);uniqueIndex;"  json:"identity"` // 唯一标识，24位NanoID,36位为ULID
 	}
 
 	// standard Status definition.
 	Std_Status struct {
-		Status int8 `gorm:"default:0;index;"` // 状态：默认为0，-1禁止，1为正常
+		Status int8 `gorm:"default:0;index;" json:"status"` // 状态：默认为0，-1禁止，1为正常
 	}
 )

types/encipher.go

@@ -9,6 +9,7 @@ type JwtClaims struct {
 	ID        uint              `json:"id"`
 	Identity  string            `json:"identity"`
 	Extend    map[string]string `json:"extend"`
+	Client    string            `json:"client"`
 	Owner     any               `json:"owner"`
 	Role      string            `json:"role"`
 	ExpiresAt int64             `json:"exp"`

types/etcd.go

@@ -1,12 +1,12 @@
 package types
 
 type Etcd struct {
-	Endpoints []string `json:"endpoints"`
+	Endpoints []string `json:"Endpoints"`
-	Tls       EtcdTls  `json:",optional"`
+	Tls       EtcdTls  `json:"Tls,optional"`
 }
 
 type EtcdTls struct {
-	Ca      string `json:"ca,optional"`
+	Ca      string `json:"Ca,optional"`
-	Cert    string `json:"cert,optional"`
+	Cert    string `json:"Cert,optional"`
-	CertKey string `json:"cert_key,optional" `
+	CertKey string `json:"CertKey,optional" `
 }

utils/identity.go

@@ -1,26 +1,10 @@
 package utils
 
 import (
-	"strconv"
+	ulid "github.com/oklog/ulid/v2"
-
-	"github.com/google/uuid"
-	"github.com/jaevor/go-nanoid"
 )
 
-func NanoID() string {
+// remove nanoid,uuid,replace to ulid
-	nanoid, _ := nanoid.CustomASCII("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789", 21)
+func ULID() string {
-	return nanoid()
+	return ulid.Make().String()
-}
-
-func NanoIDInt() (id int64, err error) {
-	decenaryID, err := nanoid.CustomASCII("0123456789", 18)
-	if err != nil {
-		return
-	}
-	id, err = strconv.ParseInt(decenaryID(), 10, 64)
-	return
-}
-
-func UUID() string {
-	return uuid.NewString()
 }

utils/net.go

@@ -99,7 +99,7 @@ func HttpPost(url string, header map[string]string, data []byte) ([]byte, error)
 	}
 
 	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
-	request.Header.Set("Request-Id", NanoID())
+	request.Header.Set("Request-Id", ULID())
 
 	for key, val := range header {
 		request.Header.Set(key, val)

vars/status.go

@@ -0,0 +1,8 @@
+package vars
+
+const (
+	// NormalStatus .
+	NormalStatus = 1
+	// DisabledStatus .
+	DisabledStatus = -1
+)