feat:resource加上，config还是先留在common

go.mod

@@ -3,12 +3,29 @@ module git.hilo.cn/hilo-common
 go 1.17
 
 require (
+	github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da // indirect
+	github.com/cespare/xxhash/v2 v2.1.2 // indirect
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect
+	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
+	github.com/fatih/color v1.9.0 // indirect
+	github.com/go-redis/redis/v8 v8.11.5 // indirect
 	github.com/go-sql-driver/mysql v1.6.0 // indirect
+	github.com/hashicorp/consul/api v1.7.0 // indirect
+	github.com/hashicorp/go-cleanhttp v0.5.1 // indirect
+	github.com/hashicorp/go-hclog v0.12.0 // indirect
+	github.com/hashicorp/go-immutable-radix v1.0.0 // indirect
+	github.com/hashicorp/go-rootcerts v1.0.2 // indirect
+	github.com/hashicorp/golang-lru v0.5.0 // indirect
+	github.com/hashicorp/serf v0.9.3 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.5 // indirect
+	github.com/joho/godotenv v1.3.0 // indirect
 	github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible // indirect
 	github.com/lestrrat-go/strftime v1.0.6 // indirect
+	github.com/mattn/go-colorable v0.1.6 // indirect
+	github.com/mattn/go-isatty v0.0.12 // indirect
+	github.com/mitchellh/go-homedir v1.1.0 // indirect
+	github.com/mitchellh/mapstructure v1.1.2 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/rifflock/lfshook v0.0.0-20180920164130-b9218ef580f5 // indirect
 	github.com/satori/go.uuid v1.2.0 // indirect
@@ -16,6 +33,7 @@ require (
 	github.com/spf13/cast v1.5.0 // indirect
 	github.com/tealeg/xlsx v1.0.5 // indirect
 	golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 // indirect
+	gopkg.in/ini.v1 v1.63.2 // indirect
 	gorm.io/driver/mysql v1.4.3 // indirect
 	gorm.io/gorm v1.23.8 // indirect
 )

resource/consul/consul.go

+package consul
+
+import (
+	"fmt"
+	"git.hilo.cn/hilo-common/mylogrus"
+	"git.hilo.cn/hilo-common/utils"
+	"github.com/hashicorp/consul/api"
+	"net/http"
+	"os"
+	"time"
+)
+
+const (
+	RegisterName = "hiloFinance"
+	RegisterTag  = "金融中心"
+)
+
+// 异步注册到consul
+func RegisterToConsul(port int) {
+	go register(port, false)
+	go selfCheck(port)
+}
+
+func consulCheck(w http.ResponseWriter, r *http.Request) {
+	_, _ = fmt.Fprintln(w, "consulCheck")
+}
+
+func register(port int, retry bool) {
+	client, err := api.NewClient(api.DefaultConfig()) //非默认情况下需要设置实际的参数
+	if err != nil {
+		mylogrus.MyLog.Errorf("RegisterToConsul Fail:%v", err)
+		return
+	}
+	if client == nil {
+		mylogrus.MyLog.Errorf("Fail to get consul client.")
+		return
+	}
+	mylogrus.MyLog.Infof("RegisterToConsul:%v-%v", client, err)
+	checkPort := port + 1000
+	registration := new(api.AgentServiceRegistration)
+	hostName, _ := os.Hostname()
+	registration.ID = fmt.Sprintf("%s-%s", RegisterName, hostName)
+	registration.Name = RegisterName
+	registration.Port = port
+	registration.Tags = []string{RegisterTag}
+
+	myIp, myNodeName := "", ""
+	if localIp, err := utils.GetClientIp(); err != nil {
+		mylogrus.MyLog.Fatalln("local ip not found", err)
+	} else {
+		myIp = localIp
+	}
+	mylogrus.MyLog.Infof("My ip is %s, nodeName: %s\n", myIp, myNodeName)
+
+	registration.Address = myIp
+	registration.Check = &api.AgentServiceCheck{
+		HTTP:                           fmt.Sprintf("http://localhost:%d%s", checkPort, "/check"),
+		Timeout:                        "3s",
+		Interval:                       "5s",
+		DeregisterCriticalServiceAfter: "30s", //check失败后30秒删除本服务
+	}
+	err = client.Agent().ServiceRegister(registration)
+	if err != nil {
+		mylogrus.MyLog.Errorf("register server error :%v ", err)
+		return
+	}
+	if !retry {
+		http.HandleFunc("/check", consulCheck)
+		if err = http.ListenAndServe(fmt.Sprintf(":%d", checkPort), nil); err != nil {
+			mylogrus.MyLog.Warnf("check server error :%v ", err)
+			return
+		}
+	}
+}
+
+// 自愈检查
+// 启动后每一分钟检查一次
+// 首次启动不执行
+func selfCheck(port int) {
+	ticker := time.NewTicker(time.Minute)
+	defer ticker.Stop()
+	for {
+		select {
+		case <-ticker.C:
+			client, err := api.NewClient(api.DefaultConfig()) //非默认情况下需要设置实际的参数
+			if err != nil {
+				mylogrus.MyLog.Errorf("RegisterToConsul Fail:%v", err)
+				break
+			}
+			if client == nil {
+				mylogrus.MyLog.Errorf("Fail to get consul client.")
+				break
+			}
+			cataLog := client.Catalog()
+			if cataLog == nil {
+				mylogrus.MyLog.Errorf("No catalog.")
+				break
+			}
+			services, _, err := cataLog.Service(RegisterName, "", nil)
+			if err != nil {
+				mylogrus.MyLog.Errorf("%v", err)
+				break
+			}
+			if len(services) == 0 {
+				mylogrus.MyLog.Errorf("%s not found.", RegisterName)
+				go register(port, true) // 重新注册
+			} else {
+				mylogrus.MyLog.Infof("%s check success %v", RegisterName, services[0])
+			}
+		}
+	}
+}

resource/mysql/entity.go

+package mysql
+
+import "time"
+
+type EntityI interface {
+	GetID() ID
+	//用于判断数据是否进行持久化
+	IsLazyLoad() bool
+	//默认值为false true:代表要移除数据
+	CheckDel() bool
+	//检查是否唯一键冲突，依旧更新
+	CheckOnDuplicateKeyUPDATE() bool
+	//检查是否唯一键冲突，则不插入
+	CheckOnDuplicateKeyIGNORE() bool
+	//更新乐观锁 默认值为false true:乐观锁更新
+	CheckUpdateVersion() bool
+	//更新条件.
+	CheckUpdateCondition() bool
+	//获取版本号
+	GetUpdateVersionBefore() uint
+	//更新情况
+	GetUpdateCondition() string
+	//save 动作排除字段
+	GetOmit() []string
+}
+type Entity struct {
+	ID                   ID                     `gorm:"primary_key"`
+	CreatedTime          time.Time              `gorm:"->"`
+	UpdatedTime          time.Time              `gorm:"->"`
+	lazyLoad             bool                   `gorm:"-"`
+	del                  bool                   `gorm:"-"`
+	onDuplicateKeyUPDATE bool                   `gorm:"-"`
+	onDuplicateKeyIGNORE bool                   `gorm:"-"`
+	updateVersionFlag    bool                   `gorm:"-"`
+	updateVersionBefore  uint                   `gorm:"-"`
+	updateCondition      string                 `gorm:"-"`
+	omit                 []string               `gorm:"-"` //更新排除
+	updateColumns        map[string]interface{} `gorm:"-"` //更新字段
+}
+
+func (t *Entity) GetID() ID {
+	return t.ID
+}
+
+func (t *Entity) IsLazyLoad() bool {
+	return t.lazyLoad
+}
+
+func (t *Entity) SetLasyLoad() {
+	t.lazyLoad = true
+}
+
+func (t *Entity) SetDel() {
+	t.del = true
+}
+
+func (t *Entity) CheckDel() bool {
+	return t.del
+}
+
+func (t *Entity) SetOnDuplicateKeyUPDATE() {
+	t.onDuplicateKeyUPDATE = true
+}
+
+func (t *Entity) SetOnDuplicateKeyIGNORE() {
+	t.onDuplicateKeyIGNORE = true
+}
+
+func (t *Entity) CheckOnDuplicateKeyUPDATE() bool {
+	return t.onDuplicateKeyUPDATE
+}
+
+func (t *Entity) CheckOnDuplicateKeyIGNORE() bool {
+	return t.onDuplicateKeyIGNORE
+}
+
+func (t *Entity) SetCheckUpdateVersionBefore(versionBefore uint) {
+	t.updateVersionBefore = versionBefore
+	t.updateVersionFlag = true
+}
+
+func (t *Entity) SetCheckUpdateCondition(condition string) {
+	t.updateCondition = condition
+}
+
+func (t *Entity) CheckUpdateVersion() bool {
+	return t.updateVersionFlag
+}
+
+func (t *Entity) CheckUpdateCondition() bool {
+	return t.updateCondition != ""
+}
+
+func (t *Entity) GetUpdateCondition() string {
+	return t.updateCondition
+}
+
+func (t *Entity) GetUpdateVersionBefore() uint {
+	return t.updateVersionBefore
+}
+
+func (t *Entity) GetOmit() []string {
+	return t.omit
+}
+
+func (t *Entity) SetOmit(omit []string) {
+	t.omit = omit
+}
+
+func (t *Entity) SetUpdateColumns(updateColumns map[string]interface{}) {
+	t.updateColumns = updateColumns
+}
+
+func (t *Entity) GetUpdateColumns() map[string]interface{} {
+	return t.updateColumns
+}

resource/mysql/logger.go

+package mysql
+
+import (
+	"context"
+	"fmt"
+	. "gorm.io/gorm/logger"
+	"gorm.io/gorm/utils"
+	"time"
+)
+
+func MyNew(writer Writer, config Config) Interface {
+	var (
+		infoStr      = "%s[info] "
+		warnStr      = "%s[warn] "
+		errStr       = "%s[error] "
+		traceStr     = "%s[%.3fms] [rows:%v] %s"
+		traceWarnStr = "%s %s[%.3fms] [rows:%v] %s"
+		traceErrStr  = "%s %s[%.3fms] [rows:%v] %s"
+	)
+
+	//if config.Colorful {
+	//	infoStr = Green + "%s\n" + Reset + Green + "[info] " + Reset
+	//	warnStr = BlueBold + "%s\n" + Reset + Magenta + "[warn] " + Reset
+	//	errStr = Magenta + "%s\n" + Reset + Red + "[error] " + Reset
+	//	traceStr = Green + "%s\n" + Reset + Yellow + "[%.3fms] " + BlueBold + "[rows:%v]" + Reset + " %s"
+	//	traceWarnStr = Green + "%s " + Yellow + "%s\n" + Reset + RedBold + "[%.3fms] " + Yellow + "[rows:%v]" + Magenta + " %s" + Reset
+	//	traceErrStr = RedBold + "%s " + MagentaBold + "%s\n" + Reset + Yellow + "[%.3fms] " + BlueBold + "[rows:%v]" + Reset + " %s"
+	//}
+	myTraceStr := " traceId:%v userId:%v"
+	infoStr += myTraceStr
+	warnStr += myTraceStr
+	errStr += myTraceStr
+	traceStr += myTraceStr
+	traceWarnStr += myTraceStr
+	traceErrStr += myTraceStr
+
+	return &myLogger{
+		Writer:       writer,
+		Config:       config,
+		infoStr:      infoStr,
+		warnStr:      warnStr,
+		errStr:       errStr,
+		traceStr:     traceStr,
+		traceWarnStr: traceWarnStr,
+		traceErrStr:  traceErrStr,
+	}
+}
+
+type myLogger struct {
+	Writer
+	Config
+	infoStr, warnStr, errStr            string
+	traceStr, traceErrStr, traceWarnStr string
+}
+
+// LogMode log mode
+func (l *myLogger) LogMode(level LogLevel) Interface {
+	newlogger := *l
+	newlogger.LogLevel = level
+	return &newlogger
+}
+
+// Info print info
+func (l myLogger) Info(ctx context.Context, msg string, data ...interface{}) {
+	if l.LogLevel >= Info {
+		l.Printf(l.infoStr+msg, append([]interface{}{utils.FileWithLineNum()}, data...)...)
+	}
+}
+
+// Warn print warn messages
+func (l myLogger) Warn(ctx context.Context, msg string, data ...interface{}) {
+	if l.LogLevel >= Warn {
+		l.Printf(l.warnStr+msg, append([]interface{}{utils.FileWithLineNum()}, data...)...)
+	}
+}
+
+// Error print error messages
+func (l myLogger) Error(ctx context.Context, msg string, data ...interface{}) {
+	if l.LogLevel >= Error {
+		l.Printf(l.errStr+msg, append([]interface{}{utils.FileWithLineNum()}, data...)...)
+	}
+}
+
+// Trace print sql message
+func (l myLogger) Trace(ctx context.Context, begin time.Time, fc func() (string, int64), err error) {
+	traceId, userId := ctx.Value("traceId"), ctx.Value("userId")
+	if l.LogLevel > Silent {
+		elapsed := time.Since(begin)
+		switch {
+		case err != nil && l.LogLevel >= Error:
+			sql, rows := fc()
+			if rows == -1 {
+				l.Printf(l.traceErrStr, utils.FileWithLineNum(), err, float64(elapsed.Nanoseconds())/1e6, "-", sql, traceId, userId)
+			} else {
+				l.Printf(l.traceErrStr, utils.FileWithLineNum(), err, float64(elapsed.Nanoseconds())/1e6, rows, sql, traceId, userId)
+			}
+		case elapsed > l.SlowThreshold && l.SlowThreshold != 0 && l.LogLevel >= Warn:
+			sql, rows := fc()
+			slowLog := fmt.Sprintf("SLOW SQL >= %v", l.SlowThreshold)
+			if rows == -1 {
+				l.Printf(l.traceWarnStr, utils.FileWithLineNum(), slowLog, float64(elapsed.Nanoseconds())/1e6, "-", sql, traceId, userId)
+			} else {
+				l.Printf(l.traceWarnStr, utils.FileWithLineNum(), slowLog, float64(elapsed.Nanoseconds())/1e6, rows, sql, traceId, userId)
+			}
+		case l.LogLevel == Info:
+			sql, rows := fc()
+			if rows == -1 {
+				l.Printf(l.traceStr, utils.FileWithLineNum(), float64(elapsed.Nanoseconds())/1e6, "-", sql, traceId, userId)
+			} else {
+				l.Printf(l.traceStr, utils.FileWithLineNum(), float64(elapsed.Nanoseconds())/1e6, rows, sql, traceId, userId)
+			}
+		}
+	}
+}

resource/mysql/mysql.go

+package mysql
+
+import (
+	"fmt"
+	"git.hilo.cn/hilo-common/mylogrus"
+	"git.hilo.cn/hilo-common/resource/config"
+	_ "github.com/go-sql-driver/mysql" //加载mysql驱动
+	_ "github.com/joho/godotenv/autoload"
+	"gorm.io/driver/mysql"
+	"gorm.io/gorm"
+	"gorm.io/gorm/logger"
+	"gorm.io/gorm/schema"
+	"log"
+	"net/url"
+	"time"
+)
+
+var Db *gorm.DB
+
+func init() {
+	var err error
+	mysqlConfigData := config.GetConfigMysql()
+	options := "?charset=utf8mb4&parseTime=True&loc=Local&time_zone=" + url.QueryEscape("'+8:00'")
+	dsn := "" + mysqlConfigData.MYSQL_USERNAME + ":" + mysqlConfigData.MYSQL_PASSWORD + "@(" + mysqlConfigData.MYSQL_HOST + ")/" + mysqlConfigData.MYSQL_DB + options
+
+	sqlLogger := logger.Default.LogMode(logger.Info)
+	if file := mylogrus.GetSqlLog(); file != nil {
+		//sqlLogger = logger.New(log.New(file, "\r\n", log.Ldate|log.Lmicroseconds), logger.Config{
+		sqlLogger = MyNew(log.New(file, "", log.Ldate|log.Lmicroseconds), logger.Config{
+			SlowThreshold: 200 * time.Millisecond,
+			LogLevel:      logger.Info,
+			Colorful:      false,
+		})
+	}
+
+	Db, err = gorm.Open(mysql.Open(dsn), &gorm.Config{
+		Logger: sqlLogger,
+		NamingStrategy: schema.NamingStrategy{
+			SingularTable: true,
+		},
+	})
+	if err != nil {
+		log.Fatalf("mysql connect error %v", err)
+	} else {
+		log.Println("mysql connect success")
+	}
+
+	if Db.Error != nil {
+		fmt.Printf("database error %v", Db.Error)
+	}
+
+	if d, err := Db.DB(); err == nil {
+		d.SetConnMaxLifetime(time.Minute * 30) // 连接可复用的最大时间。
+		d.SetMaxIdleConns(20)                  // 空闲连接数
+		d.SetMaxOpenConns(20)                  // 最大连接数
+	}
+}

resource/mysql/types.go

+package mysql
+
+import "strconv"
+
+/**
+基于PDM,建立统计的数据domain结构。注意，不要选择0， 因为go的int默认值为0
+*/
+
+//主键ID
+type ID = uint64
+
+//性别
+type Sex = uint8
+
+//加减
+type AddReduce = uint8
+
+//拥有
+type YesNo = uint8
+
+//短描述
+type Str = string
+
+//时间戳
+type Time = int64
+
+//状态
+type UserYesNo = uint8
+
+//平台
+type Platform = uint8
+
+//多枚举类型
+type Type = uint8
+
+//数量
+type Num = uint32
+
+//时间戳
+type Timestamp = uint64
+
+//排序
+type Index = uint16
+
+//数量，并且用到-1作为特殊标记位
+type NumAll = int
+
+//开启关闭
+type OpenClose = uint8
+
+//逻辑删除
+type LogicDel = uint8
+
+//设备
+type Device = uint8
+
+type PeriodType = uint8
+
+type FinishYesNo = uint8
+
+//性别
+const (
+	MAN   Sex = 1
+	WOMAN Sex = 2
+	EMPTY Sex = 0
+)
+
+//yes no
+const (
+	YES YesNo = 1
+	NO  YesNo = 2
+)
+
+const (
+	OPEN  OpenClose = 1
+	CLOSE OpenClose = 2
+)
+
+//加，减
+const (
+	ADD    AddReduce = 1
+	REDUCE AddReduce = 2
+	SET    AddReduce = 3 // set
+)
+
+const (
+	USER   UserYesNo = 1
+	NOUSER UserYesNo = 2
+)
+
+func TypeToString(t Type) string {
+	return strconv.Itoa(int(t))
+}

resource/redisCli/redis.go

+package redisCli
+
+import (
+	"context"
+	"git.hilo.cn/hilo-common/mylogrus"
+	"git.hilo.cn/hilo-common/resource/config"
+	"github.com/go-redis/redis/v8"
+)
+
+var RedisClient *redis.Client
+
+func init() {
+	RedisClient = redis.NewClient(&redis.Options{
+		Addr:         config.GetConfigRedis().REDIS_HOST,
+		Password:     config.GetConfigRedis().REDIS_PASSWORD, // no password set
+		DB:           0,                                      // use default DB
+		PoolSize:     20,
+		MinIdleConns: 20,
+	})
+	mylogrus.MyLog.Infoln(config.GetConfigRedis().REDIS_HOST)
+	mylogrus.MyLog.Infoln(config.GetConfigRedis().REDIS_PASSWORD)
+	pong, err := RedisClient.Ping(context.Background()).Result()
+	if err != nil {
+		mylogrus.MyLog.Warn(err)
+		mylogrus.MyLog.Fatal("redis db0 connect fail")
+	} else {
+		mylogrus.MyLog.Info("redis db0 connection success - ", pong)
+	}
+}
+
+func GetRedis() *redis.Client {
+	return RedisClient
+}

utils/ip.go

+package utils
+
+import (
+	"fmt"
+	"net"
+)
+
+func GetClientIp() (string, error) {
+	addrs, err := net.InterfaceAddrs()
+
+	if err != nil {
+		return "", err
+	}
+
+	for _, address := range addrs {
+		// 检查ip地址判断是否回环地址
+		if ipNet, ok := address.(*net.IPNet); ok && ipNet.IP.IsGlobalUnicast() {
+			//if ipNet, ok := address.(*net.IPNet); ok && !ipNet.IP.IsLoopback() {
+			if ipNet.IP.To4() != nil {
+				return ipNet.IP.String(), nil
+			}
+
+		}
+	}
+	return "", fmt.Errorf("can not find the client ip address")
+}