Merge branch 'master' of gitea.drugeyes.vip:pharnexbase/utils

master
commit ea3901866c
  1. 47
      README.md
  2. 14
      glog/v1/glog.go
  3. 30
      glog/v1/logger.go

@ -8,7 +8,7 @@
* [transport:通用http ResponseEncoder](#transport通用http-responseencoder)
* [meta:跨服务meta信息设置和获取](#meta跨服务meta信息设置和获取)
* [encrypt:对称加密](#encrypt对称加密)
<!-- TOC -->
<!-- TOC -->
## 安装
@ -55,4 +55,47 @@ go get gitea.drugeyes.vip/pharnexbase/tools@v1.0.0
* v1
> 对称加密,目前包含:SHA1PRNG
> 对称加密,目前包含:SHA1PRNG
### glog:全局日志
* v1
* 本地环境不变,dev,pre,pro 上传阿里
```go
// main.go 加入
func initLog() (log.Logger, func()) {
l, f := glog.NewLogger(&glog.LoggerConfig{
Env: "dev",
Id: id,
Name: Name,
Version: Version,
AliLogConfig: glog.AliLogConfig{
AccessKey: "",
AccessSecret: "",
Endpoint: "",
Project: "",
LogStore: "",
},
})
glog.NewHelper(l)
return l, f
}
// main函数加入
func main() {
...
logger, f := initLog()
defer f()
...
app, cleanup, err := wireApp(..., logger)
}
// 使用
glog.Glog.WithContext(ctx).Error("请输入正确手机号")
```

@ -1,9 +1,17 @@
package glog
import "github.com/go-kratos/kratos/v2/log"
import (
"github.com/go-kratos/kratos/v2/log"
"sync"
)
var Glog *log.Helper
var (
once sync.Once
Glog *log.Helper
)
func NewHelper(logger log.Logger) {
Glog = log.NewHelper(logger)
once.Do(func() {
Glog = log.NewHelper(logger)
})
}

@ -13,11 +13,11 @@ type Logger interface {
}
type LoggerConfig struct {
env string
id string
name string
version string
aliLogConfig AliLogConfig
Env string
Id string
Name string
Version string
AliLogConfig AliLogConfig
}
type AliLogConfig struct {
@ -32,28 +32,28 @@ func NewLogger(c *LoggerConfig) (log.Logger, func()) {
var l Logger
switch c.env {
switch c.Env {
default:
l = NewStdLogger(os.Stdout)
case enum.EnvLocal:
l = NewStdLogger(os.Stdout)
case enum.EnvDevelop, enum.EnvPre, enum.EnvProduct:
l = NewAliyunLog(
WithAccessKey(c.aliLogConfig.AccessKey),
WithAccessSecret(c.aliLogConfig.AccessSecret),
WithEndpoint(c.aliLogConfig.Endpoint),
WithProject(c.aliLogConfig.Project),
WithLogstore(c.aliLogConfig.LogStore),
WithAccessKey(c.AliLogConfig.AccessKey),
WithAccessSecret(c.AliLogConfig.AccessSecret),
WithEndpoint(c.AliLogConfig.Endpoint),
WithProject(c.AliLogConfig.Project),
WithLogstore(c.AliLogConfig.LogStore),
)
}
logger := log.With(l,
"ts", log.DefaultTimestamp,
"caller", log.DefaultCaller,
"env", c.env,
"service.id", "id",
"service.name", "Name",
"service.version", "Version",
"env", c.Env,
"service.id", c.Id,
"service.name", c.Name,
"service.version", c.Version,
"trace.id", tracing.TraceID(),
"span.id", tracing.SpanID(),
)

Loading…
Cancel
Save