feat:更换日志包

db/mongodb.go

@@ -3,7 +3,7 @@ package db
 import (
 	. "app.yhyue.com/moapp/jybase/mongodb"
 
-	"github.com/donnie4w/go-logger/logger"
+	"app.yhyue.com/moapp/jybase/logger"
 )
 
 var MyMgo = &myMgo{}

go.mod

@@ -2,10 +2,7 @@ module bp.jydev.jianyu360.cn/BaseService/pushpkg
 
 go 1.18
 
-require (
-	app.yhyue.com/moapp/jybase v0.0.0-20221229074840-790b25997170
-	github.com/donnie4w/go-logger v0.0.0-20170827050443-4740c51383f4
-)
+require app.yhyue.com/moapp/jybase v0.0.0-20230405040249-a36a23595798
 
 require (
 	app.yhyue.com/moapp/esv1 v0.0.0-20220414031211-3da4123e648d // indirect
@@ -28,6 +25,7 @@ require (
 	golang.org/x/crypto v0.0.0-20210920023735-84f357641f63 // indirect
 	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
 	golang.org/x/text v0.3.7 // indirect
+	gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
 	gorm.io/driver/mysql v1.0.5 // indirect
 	gorm.io/gorm v1.21.3 // indirect
 )

go.sum

@@ -1,7 +1,7 @@
 app.yhyue.com/moapp/esv1 v0.0.0-20220414031211-3da4123e648d h1:WPsYuuptAd3UEgN+jPzpnsDe/OvcshDUUtOTZPYGSJ8=
 app.yhyue.com/moapp/esv1 v0.0.0-20220414031211-3da4123e648d/go.mod h1:91/lSD/hS+ckMVP3WdidRzDhC60lLMdyce9QHy0cSMA=
-app.yhyue.com/moapp/jybase v0.0.0-20221229074840-790b25997170 h1:gjx6+x7P1Vp/++OyfuEdR3Bcjj4/HrgIaRnE1cMTP3k=
-app.yhyue.com/moapp/jybase v0.0.0-20221229074840-790b25997170/go.mod h1:efAeRPDpJ13JuNODuqtfLlKQSQgCbnUcwGPzhFU5krY=
+app.yhyue.com/moapp/jybase v0.0.0-20230405040249-a36a23595798 h1:seczpucZNVIcwMpHN/tr1t9l7Qf533nm69FqJLq24qs=
+app.yhyue.com/moapp/jybase v0.0.0-20230405040249-a36a23595798/go.mod h1:zB47XTeJvpcbtBRYgkQuxOICWNexiZfbUO+7aUf6mNs=
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
@@ -95,7 +95,6 @@ github.com/dchest/captcha v0.0.0-20200903113550-03f5f0333e1f h1:q/DpyjJjZs94bziQ
 github.com/dchest/captcha v0.0.0-20200903113550-03f5f0333e1f/go.mod h1:QGrK8vMWWHQYQ3QU9bw9Y9OPNfxccGzfb41qjvVeXtY=
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
 github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
-github.com/donnie4w/go-logger v0.0.0-20170827050443-4740c51383f4 h1:T9PR91sjTtrA1HmZB4G+M7OLCelch0f6rIEY7Mm1T4U=
 github.com/donnie4w/go-logger v0.0.0-20170827050443-4740c51383f4/go.mod h1:L7S4x0R7vv3xoOhGuyAJyCO2MYzWOpccM4Isn8jIUgY=
 github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
 github.com/eapache/go-resiliency v1.2.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs=
@@ -771,6 +770,7 @@ google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQ
 google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
+gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc h1:2gGKlE2+asNV9m7xrywl36YYNnBG5ZQ0r/BOOxqPpmk=
 gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc/go.mod h1:m7x9LTH6d71AHyAX77c9yqWCCa3UKHcVEj9y7hAtKDk=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
@@ -780,6 +780,7 @@ gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EV
 gopkg.in/cheggaaa/pb.v1 v1.0.28/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
+gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df h1:n7WqCuqOuCbNr617RXOY0AWRXxgwEyPp2z+p0+hgMuE=
 gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df/go.mod h1:LRQQ+SO6ZHR7tOkpBDuZnXENFzX8qRjMDMyPD6BRkCw=
 gopkg.in/h2non/gock.v1 v1.1.2/go.mod h1:n7UGz/ckNChHiK05rDoiC4MYSunEC/lyaUm2WWaDva0=
 gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=

main.go

@@ -2,17 +2,16 @@ package main
 
 import (
 	"log"
-	. "p"
-	. "app.yhyue.com/moapp/jybase/mysql"
+	"time"
+
+	. "bp.jydev.jianyu360.cn/BaseService/pushpkg/p"
 )
 
 func main() {
-	m := &Mysql{
-		Address:  "192.168.3.11:3366",
-		UserName: "root",      //用户名
-		PassWord: "Topnet123", //密码
-		DBName:   "jianyu",    //数据库名
-	}
-	m.Init()
-	log.Println(HasService(m, "5d6378301c298a5aac7b5402", Bigmember_Service_Report))
+	VarTimeTask.RunEveryHour(true, func() {
+		hour := time.Now().Hour()
+		VarTimeTask.RunInTimeLoop("执行每小时任务", HourFormat(hour), HourFormat(hour+1), 1, true, false, nil, func() {
+			log.Println("---------")
+		})
+	})
 }

mover/move.go

@@ -10,7 +10,7 @@ import (
 	. "bp.jydev.jianyu360.cn/BaseService/pushpkg/db"
 	. "bp.jydev.jianyu360.cn/BaseService/pushpkg/p"
 
-	"github.com/donnie4w/go-logger/logger"
+	"app.yhyue.com/moapp/jybase/logger"
 )
 
 type Mover interface {

p/lock.go

@@ -5,7 +5,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/donnie4w/go-logger/logger"
+	"app.yhyue.com/moapp/jybase/logger"
 )
 
 type Lock struct {

p/public.go

@@ -13,11 +13,10 @@ import (
 	. "app.yhyue.com/moapp/jybase/common"
 	util "app.yhyue.com/moapp/jybase/common"
 	. "app.yhyue.com/moapp/jybase/date"
+	"app.yhyue.com/moapp/jybase/logger"
 	. "app.yhyue.com/moapp/jybase/mongodb"
 	. "app.yhyue.com/moapp/jybase/mysql"
 	"app.yhyue.com/moapp/jybase/redis"
-
-	"github.com/donnie4w/go-logger/logger"
 )
 
 //金额转化   金额：0-万元以下单位为元  ，万元以上至亿元以下单位为万元 ，亿元以上单位为亿元。保留 小数点后 2 位，不进行四舍五入。

p/rpccall.go

@@ -6,7 +6,7 @@ import (
 	"sync"
 
 	util "app.yhyue.com/moapp/jybase/common"
-	"github.com/donnie4w/go-logger/logger"
+	"app.yhyue.com/moapp/jybase/logger"
 )
 
 //

p/struct.go

@@ -8,7 +8,7 @@ import (
 	util "app.yhyue.com/moapp/jybase/common"
 	. "app.yhyue.com/moapp/jybase/mongodb"
 	"bp.jydev.jianyu360.cn/BaseService/pushpkg/dfa"
-	"github.com/donnie4w/go-logger/logger"
+	"app.yhyue.com/moapp/jybase/logger"
 )
 
 //

p/timetask.go

@@ -6,7 +6,7 @@ import (
 
 	util "app.yhyue.com/moapp/jybase/common"
 
-	"github.com/donnie4w/go-logger/logger"
+	"app.yhyue.com/moapp/jybase/logger"
 )
 
 var VarTimeTask = &timeTask{}

p/wxtplmsgcustom.go

@@ -9,7 +9,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/donnie4w/go-logger/logger"
+	"app.yhyue.com/moapp/jybase/logger"
 )
 
 type WxTplMsgCustom struct {

projecter/match.go

@@ -12,7 +12,7 @@ import (
 	. "app.yhyue.com/moapp/jybase/mongodb"
 	. "bp.jydev.jianyu360.cn/BaseService/pushpkg/p"
 
-	"github.com/donnie4w/go-logger/logger"
+	"app.yhyue.com/moapp/jybase/logger"
 )
 
 type ProjectMatcher interface {

projecter/push.go

@@ -13,7 +13,7 @@ import (
 	. "app.yhyue.com/moapp/jybase/mongodb"
 	"app.yhyue.com/moapp/jybase/redis"
 	. "bp.jydev.jianyu360.cn/BaseService/pushpkg/p"
-	"github.com/donnie4w/go-logger/logger"
+	"app.yhyue.com/moapp/jybase/logger"
 )
 
 type Pusher interface {

pusher/push.go

@@ -12,7 +12,7 @@ import (
 	. "bp.jydev.jianyu360.cn/BaseService/pushpkg/db"
 	. "bp.jydev.jianyu360.cn/BaseService/pushpkg/p"
 
-	"github.com/donnie4w/go-logger/logger"
+	"app.yhyue.com/moapp/jybase/logger"
 )
 
 var VarPush = &Push{}