upd

config/config.go

@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/jinzhu/copier"
-	alioss "gitlab.wanzhuangkj.com/tush/xpkg/third/oss"
+	"gitlab.wanzhuangkj.com/tush/xpkg/third/oss"
 )
 
 var Cfg = &Config{
@@ -58,8 +58,8 @@ func CronOpen() bool {
 	return enable
 }
 
-func GetOssConfig() *alioss.AliOssConfig {
-	ossCfg := &alioss.AliOssConfig{}
+func GetOssConfig() *oss.AliOssConfig {
+	ossCfg := &oss.AliOssConfig{}
 	Read(func(c *Config) {
 		ossCfg.Endpoint = c.Oss.Endpoint
 		ossCfg.AccessKeyId = c.Oss.AccessKeyId
@@ -109,12 +109,10 @@ type Config struct {
 	HTTP       HTTP             `yaml:"http" json:"http"`
 	Jaeger     Jaeger           `yaml:"jaeger" json:"jaeger"`
 	Logger     Logger           `yaml:"logger" json:"logger"`
-	NacosRd         NacosRd             `yaml:"nacosRd" json:"nacosRd"`
 	Redis      Redis            `yaml:"redis" json:"redis"`
 	CronJobs   Cron             `yaml:"cron" json:"cron"`
 	Leaf       Leaf             `yaml:"leaf" json:"leaf"`
-	NacosConfClient *NacosClient        `yaml:"-" json:"-"`
-	Oss             alioss.AliOssConfig `yaml:"oss" json:"oss"`
+	Oss        oss.AliOssConfig `yaml:"oss" json:"oss"`
 	Content    []byte           `yaml:"-" json:"-"`
 }
 
@@ -356,12 +354,6 @@ type LogFileConfig struct {
 	IsCompression bool   `yaml:"isCompression" json:"isCompression"`
 }
 
-type NacosRd struct {
-	IPAddr      string `yaml:"ipAddr" json:"ipAddr"`
-	NamespaceID string `yaml:"namespaceID" json:"namespaceID"`
-	Port        int    `yaml:"port" json:"port"`
-}
-
 type HTTP struct {
 	Port    int `yaml:"port" json:"port"`
 	Timeout int `yaml:"timeout" json:"timeout"`

config/init.go

@@ -64,7 +64,6 @@ func parse() (err error) {
 		if err := nc.Connect().Watch().Fetch().Parse().Err(); err != nil {
 			return err
 		}
-		Cfg.NacosConfClient = nc
 	}
 	return nil
 }

database/mysql.go

@@ -49,6 +49,6 @@ func InitMysql(dbConfig *config.Database) (*sgorm.DB, error) {
 	}
 	sensitiveFields := append([]string{}, `"dsn"`, `"username"`, `"password"`, `"pwd"`, `"signKey"`, `"access-key-id"`, `"access-key-secret"`)
 	insensitiveDsn := config.HideSensitiveFields(dbConfig.Mysql.Dsn, sensitiveFields...)
-	logger.Infof("database[%s] connected.", insensitiveDsn)
+	logger.Infof("[database][%s] connected.", insensitiveDsn)
 	return db, nil
 }

logger/logger.go

@@ -76,10 +76,10 @@ func Init(opts ...Option) (*zap.Logger, error) {
 		if err != nil {
 			panic(err)
 		}
-		str = fmt.Sprintf("initialize logger finish, config is output to 'terminal', format=%s, level=%s", encoding, levelName)
+		str = fmt.Sprintf("[log]initialize logger finish, config is output to 'terminal', format=%s, level=%s", encoding, levelName)
 	} else {
 		zapLog = log2File(encoding, levelName, o.fileConfig)
-		str = fmt.Sprintf("initialize logger finish, config is output to 'file', format=%s, level=%s, file=%s", encoding, levelName, o.fileConfig.filename)
+		str = fmt.Sprintf("[log]initialize logger finish, config is output to 'file', format=%s, level=%s, file=%s", encoding, levelName, o.fileConfig.filename)
 	}
 
 	if len(o.hooks) > 0 {

utils/dxsf/dxsf.go

@@ -15,6 +15,7 @@ import (
 )
 
 var (
+	XSF_TYPE          = "SF"
 	retryCount        = 3
 	showLog           = false
 	xsfAddr    string = "http://leaf.qitu"
@@ -35,6 +36,9 @@ type client struct {
 }
 
 func init() {
+	if xsfType := os.Getenv("XSF_TYPE"); xsfType != "" {
+		XSF_TYPE = xsfType
+	}
 	if addr := os.Getenv("XSF_ADDR"); addr != "" {
 		xsfAddr = addr
 	}
@@ -51,6 +55,18 @@ func init() {
 	})
 }
 
+func GenerateID(ctx context.Context, bizTag string) (xsf.ID, error) {
+	if XSF_TYPE == "SF" {
+		return GenerateSFID(ctx, bizTag)
+	} else {
+		return GenerateApiID(ctx, bizTag)
+	}
+}
+
+func GenerateSFID(ctx context.Context, bizTag string) (xsf.ID, error) {
+	return xsf.GenerateID(), nil
+}
+
 func GenerateApiID(ctx context.Context, bizTag string) (xsf.ID, error) {
 	url := fmt.Sprintf(`%s/api/leaf?biz_tag=%s`, xsfAddr, bizTag)
 	var id xsf.ID