优化代码

WingGao · WingGao · commit e88db948b27a · 2019-07-22T14:55:47.000+08:00
diff --git a/config.go b/config.go
@@ -4,6 +4,7 @@ import (
 	"encoding/hex"
 	"fmt"
 	tconfig "github.com/RichardKnop/machinery/v1/config"
+	"github.com/WingGao/go-utils/redis"
 	"github.com/go-errors/errors"
 	"github.com/micro/go-micro/registry"
 	"github.com/ungerik/go-dry"
@@ -69,7 +70,7 @@ type MConfig struct {
 		WpDir string
 	}
 	WxConfig WxConfig `yaml:"wechat"`
-	Redis    RedisConf
+	Redis    redis.RedisConf
 	Task     tconfig.Config
 
 	Cms struct {
@@ -230,15 +231,7 @@ type WxCorpConf struct {
 	OauthRedirect string `yaml:"oauth_redirect"`
 }
 
-type RedisConf struct {
-	Addr          string   //host:port 127.0.0.1:6379
-	Shards        []string //host:port 127.0.0.1:6379
-	Password      string
-	Database      int
-	UniqueIdKey   string
-	Prefix        string
-	CacheCloudUrl string
-}
+
 type GraphQLConf struct {
 	Path string
 }
@@ -320,7 +313,3 @@ func formatEnv(v string) string {
 	}
 	return v
 }
-
-func IsDebug() bool {
-	return DefaultConfig.Debug
-}
diff --git a/consts.go b/consts.go
@@ -3,7 +3,7 @@ package utils
 import "os"
 
 const (
-	XSESSION_KEY = "xsession"
+
 )
 
 var (
diff --git a/core/errors.go b/core/errors.go
@@ -1,4 +1,4 @@
-package utils
+package core
 
 import (
 	"bytes"
diff --git a/core/errors_test.go b/core/errors_test.go
@@ -1,4 +1,4 @@
-package utils
+package core
 
 import (
 	"testing"
diff --git a/core/json.go b/core/json.go
@@ -1,4 +1,4 @@
-package utils
+package core
 
 import "github.com/json-iterator/go"
 
diff --git a/init.go b/init.go
@@ -1,7 +1,26 @@
 package utils
 
+import (
+	ucore "github.com/WingGao/go-utils/core"
+	"github.com/WingGao/go-utils/session"
+	"github.com/WingGao/go-utils/whandler"
+)
+
 func init() {
-	for _, v := range UtilsErrList {
-		AddHandlerIgnoreErrors(v.Error())
+	for _, v := range ucore.UtilsErrList {
+		whandler.AddHandlerIgnoreErrors(v.Error())
 	}
 }
+
+var (
+	// error
+	NewErrorList = ucore.NewErrorList
+	NewWError    = ucore.NewWError
+	PanicIfErr   = ucore.PanicIfErr
+	FirstError   = ucore.FirstError
+	//handler
+	AfterHandler = whandler.AfterHandler
+	CancelAfterHandler = whandler.CancelAfterHandler
+	//session
+	XSESSION_KEY = session.XSESSION_KEY
+)
diff --git a/redis/config.go b/redis/config.go
@@ -0,0 +1,11 @@
+package redis
+
+type RedisConf struct {
+	Addr          string   //host:port 127.0.0.1:6379
+	Shards        []string //host:port 127.0.0.1:6379
+	Password      string
+	Database      int
+	UniqueIdKey   string
+	Prefix        string
+	CacheCloudUrl string
+}
diff --git a/redis/redis.go b/redis/redis.go
@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"encoding/gob"
 	"fmt"
-	"github.com/WingGao/go-utils"
 	"github.com/emirpasic/gods/lists/arraylist"
 	gredis "github.com/go-redis/redis"
 	"time"
@@ -17,7 +16,7 @@ const (
 type RedisClient interface {
 	gredis.UniversalClient
 	FullKey(key string) string
-	GetConfig() utils.RedisConf
+	GetConfig() RedisConf
 	ExpireSecond(key string, second int) (bool, error)
 	SetGlob(key string, ptr interface{}, opt *Option) (error)
 	GetGlob(key string, out interface{}) (error)
@@ -249,14 +248,14 @@ var MainClient RedisClient
 //	panic("implement me")
 //}
 
-func LoadClient(conf utils.RedisConf) (err error) {
+func LoadClient(conf RedisConf) (err error) {
 	if MainClient == nil {
 		MainClient, err = NewRedisClient(conf)
 	}
 	return
 }
 
-func NewRedisClient(conf utils.RedisConf) (c RedisClient, err error) {
+func NewRedisClient(conf RedisConf) (c RedisClient, err error) {
 	uoption := &gredis.UniversalOptions{}
 	if conf.CacheCloudUrl != "" {
 		fmt.Println("redis use cachecloud")
diff --git a/redis/redis_universal.go b/redis/redis_universal.go
@@ -3,7 +3,6 @@ package redis
 import (
 	"context"
 	"fmt"
-	"github.com/WingGao/go-utils"
 	"github.com/WingGao/go-utils/wlog"
 	gredis "github.com/go-redis/redis"
 	"strings"
@@ -30,14 +29,14 @@ var (
 
 type RedisUniversalClient struct {
 	gredis.UniversalClient
-	Config utils.RedisConf
+	Config RedisConf
 }
 
 func (c *RedisUniversalClient) ExpireSecond(key string, second int) (bool, error) {
 	return c.Expire(key, time.Duration(second)*time.Second).Result()
 }
 
-func (c *RedisUniversalClient) GetConfig() utils.RedisConf {
+func (c *RedisUniversalClient) GetConfig() RedisConf {
 	return c.Config
 }
 
diff --git a/session/session.go b/session/session.go
@@ -1,7 +1,6 @@
 package session
 
 import (
-	. "github.com/WingGao/go-utils"
 	"github.com/WingGao/go-utils/session/redis"
 	"github.com/kataras/iris"
 	"github.com/kataras/iris/context"
@@ -20,7 +19,9 @@ import (
 	//pxdb "px/db"
 	"time"
 )
-
+const (
+	XSESSION_KEY = "xsession"
+)
 type XSession struct {
 	ctx      context.Context
 	Iris     *sessions.Session `json:"-"`
@@ -52,8 +53,7 @@ var (
 	_sessionKeyPrefix = "core:sid:"
 )
 
-func BuildIrisSession(conf MConfig) {
-	rconf := conf.Redis
+func BuildIrisSession(rconf uredis.RedisConf,cookieExpire int64) {
 	_rdb = redis.New(uredis.MainClient, service.Config{
 		Network:     service.DefaultRedisNetwork,
 		Addr:        rconf.Addr,
@@ -68,7 +68,7 @@ func BuildIrisSession(conf MConfig) {
 		_rdb.Close()
 	})
 
-	exp := time.Duration(conf.CookieExpires)
+	exp := time.Duration(cookieExpire)
 	if exp > 0 {
 		exp = exp * time.Second
 	}
diff --git a/uhandler/checker.go b/uhandler/checker.go
diff --git a/valuechecker.go b/valuechecker.go
@@ -1,11 +1,12 @@
 package utils
 
 import (
-	"github.com/thoas/go-funk"
+	"fmt"
+	ucore "github.com/WingGao/go-utils/core"
 	"github.com/go-errors/errors"
-	"regexp"
+	"github.com/thoas/go-funk"
 	"reflect"
-	"fmt"
+	"regexp"
 )
 
 var (
@@ -15,13 +16,13 @@ var (
 //简单值检查
 // 应该只使用true情况，不要使用`!xxx`这种
 type ValueChecker struct {
-	errs        *ErrorList
+	errs        *ucore.ErrorList
 	SkipOnError bool //遇到错误是否跳过
 }
 
 func NewValueChecker() (v *ValueChecker) {
 	v = &ValueChecker{SkipOnError: true}
-	v.errs = NewErrorList()
+	v.errs = ucore.NewErrorList()
 	return
 }
 
diff --git a/whandler/checker.go b/whandler/checker.go
@@ -0,0 +1,12 @@
+package whandler
+
+import (
+	ucore "github.com/WingGao/go-utils/core"
+	. "github.com/WingGao/go-utils/session"
+)
+
+func RequireLoginX(sess *XSession) {
+	if sess.Uid <= 0 {
+		panic(ucore.ERR_REQUIRE_LOGIN)
+	}
+}
diff --git a/whandler/handler.go b/whandler/handler.go
@@ -1,15 +1,17 @@
-package utils
+package whandler
 
 import (
-	"github.com/kataras/iris"
-	"github.com/kataras/iris/context"
-	"github.com/kataras/iris/core/router"
 	"encoding/json"
+	ucore "github.com/WingGao/go-utils/core"
+	"github.com/WingGao/go-utils/wlog"
+	"github.com/emirpasic/gods/sets/hashset"
 	"github.com/go-playground/form"
 	"github.com/json-iterator/go"
-	"github.com/emirpasic/gods/sets/hashset"
-	"net/url"
+	"github.com/kataras/iris"
+	"github.com/kataras/iris/context"
+	"github.com/kataras/iris/core/router"
 	"net/http"
+	"net/url"
 	"strings"
 )
 
@@ -38,9 +40,9 @@ func AfterHandler(ictx context.Context, o interface{}, err error) {
 	}
 	if err != nil {
 		if !ignoreErros.Contains(err.Error()) {
-			err2 := NewWError(err)
+			err2 := ucore.NewWError(err)
 			err2.Fmt()
-			ictx.Application().Logger().Error(err2.ErrorStack())
+			wlog.S().Error(err2.ErrorStack())
 		}
 		ictx.StatusCode(iris.StatusBadRequest)
 		ictx.JSON(ErrJson{Err: err.Error()})
@@ -71,7 +73,7 @@ func ParseFormIris(ictx context.Context, params interface{}) (err error) {
 	err = dec.Decode(params, ictx.FormValues())
 	if err != nil {
 		ictx.Application().Logger().Warnf("Error when reading form: " + err.Error())
-		err = NewErrParams()
+		err = ucore.NewErrParams()
 	}
 	return
 }
diff --git a/whandler/server.go b/whandler/server.go
@@ -1,4 +1,4 @@
-package uhandler
+package whandler
 
 import (
 	"github.com/kataras/iris"
diff --git a/wlog/kafka.go b/wlog/kafka.go
@@ -3,22 +3,24 @@ package wlog
 import (
 	"fmt"
 	"github.com/Shopify/sarama"
-	"github.com/WingGao/go-utils"
+	ucore "github.com/WingGao/go-utils/core"
 	"github.com/go-errors/errors"
 	"github.com/ungerik/go-dry"
 	"go.uber.org/zap/zapcore"
 	"strings"
 	"time"
 )
 
-func NewZapToKafka(producer sarama.AsyncProducer, topic, appid string) *ZapToKafka {
-	return &ZapToKafka{producer: producer, topic: topic, appid: appid, name: dry.RealNetIP()}
+func NewZapToKafka(producer sarama.AsyncProducer, topic, appid, logName string) *ZapToKafka {
+	return &ZapToKafka{producer: producer, topic: topic, appid: appid, name: dry.RealNetIP(),
+		logName: logName}
 }
 
 type ZapToKafka struct {
 	appid    string
 	topic    string
 	name     string
+	logName  string
 	producer sarama.AsyncProducer
 }
 
@@ -46,12 +48,12 @@ func (c *ZapToKafka) Write(ent zapcore.Entry, fields []zapcore.Field) error {
 	lmsg := &logMessage{
 		AppId:         c.appid,
 		ThreadName:    c.name,
-		LogName:       utils.DefaultConfig.Project,
+		LogName:       c.logName,
 		Level:         ent.Level.String(),
 		LayoutMessage: strMsg,
-		TimeStamp:     now.Unix()*1000,
+		TimeStamp:     now.Unix() * 1000,
 	}
-	js := utils.JsonMarshalToString(lmsg)
+	js := ucore.JsonMarshalToString(lmsg)
 	msg := &sarama.ProducerMessage{
 		Topic:     c.topic,
 		Value:     sarama.StringEncoder(js),

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package utils`
`3`	`3`	`import "os"`
`4`	`4`
`5`	`5`	`const (`
`6`		`- XSESSION_KEY = "xsession"`
	`6`	`+`
`7`	`7`	`)`
`8`	`8`
`9`	`9`	`var (`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package utils`
	`1`	`+package core`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"bytes"`