自动缓存工具

hwholiday · hwholiday · commit b96819b3b742 · 2021-06-29T22:35:11.000+08:00
diff --git a/all_packaged_library/base/tool/log.go b/all_packaged_library/base/tool/log.go
@@ -1,9 +1,9 @@
 package tool
 
 import (
+	"github.com/natefinch/lumberjack"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
-	"gopkg.in/natefinch/lumberjack"
 	"os"
 	"path/filepath"
 	"sync"
diff --git a/all_packaged_library/push/firebase/filebase.go b/all_packaged_library/push/firebase/filebase.go
@@ -1,59 +1,59 @@
 package firebase
 
-import (
-	"context"
-	firebase "firebase.google.com/go"
-	"firebase.google.com/go/messaging"
-	"fmt"
-	"google.golang.org/api/option"
-)
-
-var FireBaseClient *messaging.Client
-
-func InitFireBaseClient() {
-	var serviceAccountKey = []byte(`{
-  "type": "123123",
-  "project_id": "123123123",
-  "private_key_id": "123123123123123",
-  "private_key": "-----BEGIN PRIVATE KEY-----\n\n-----END PRIVATE KEY-----\n",
-  "client_email": "123123123",
-  "client_id": "123123123123",
-  "auth_uri": "https://accounts.google.com/o/oauth2/auth",
-  "token_uri": "https://oauth2.googleapis.com/token",
-  "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
-  "client_x509_cert_url": "123123123"
-}`)
-	opt := option.WithCredentialsJSON(serviceAccountKey)
-	app, err := firebase.NewApp(context.Background(), nil, opt)
-	if err != nil {
-		panic(err)
-	}
-	ctx := context.Background()
-	FireBaseClient, err = app.Messaging(ctx)
-	if err != nil {
-		panic(err)
-	}
-}
-
-func FireBaseSendMsgToToken(msg string, token string) {
-	notification := &messaging.Notification{
-		Title: "推送标题",
-		Body:  msg,
-	}
-	message := &messaging.Message{
-		Notification: notification,
-		Webpush: &messaging.WebpushConfig{
-			Notification: &messaging.WebpushNotification{
-				Title: "title",
-				Body:  "body",
-				Icon:  "icon",
-			},
-		},
-		Token: token,
-	}
-	response, err := FireBaseClient.Send(context.Background(), message)
-	if err != nil {
-		panic(err)
-	}
-	fmt.Println(response)
-}
+//import (
+//	"context"
+//	firebase "firebase.google.com/go"
+//	"firebase.google.com/go/messaging"
+//	"fmt"
+//	"google.golang.org/api/option"
+//)
+//
+//var FireBaseClient *messaging.Client
+//
+//func InitFireBaseClient() {
+//	var serviceAccountKey = []byte(`{
+//  "type": "123123",
+//  "project_id": "123123123",
+//  "private_key_id": "123123123123123",
+//  "private_key": "-----BEGIN PRIVATE KEY-----\n\n-----END PRIVATE KEY-----\n",
+//  "client_email": "123123123",
+//  "client_id": "123123123123",
+//  "auth_uri": "https://accounts.google.com/o/oauth2/auth",
+//  "token_uri": "https://oauth2.googleapis.com/token",
+//  "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
+//  "client_x509_cert_url": "123123123"
+//}`)
+//	opt := option.WithCredentialsJSON(serviceAccountKey)
+//	app, err := firebase.NewApp(context.Background(), nil, opt)
+//	if err != nil {
+//		panic(err)
+//	}
+//	ctx := context.Background()
+//	FireBaseClient, err = app.Messaging(ctx)
+//	if err != nil {
+//		panic(err)
+//	}
+//}
+//
+//func FireBaseSendMsgToToken(msg string, token string) {
+//	notification := &messaging.Notification{
+//		Title: "推送标题",
+//		Body:  msg,
+//	}
+//	message := &messaging.Message{
+//		Notification: notification,
+//		Webpush: &messaging.WebpushConfig{
+//			Notification: &messaging.WebpushNotification{
+//				Title: "title",
+//				Body:  "body",
+//				Icon:  "icon",
+//			},
+//		},
+//		Token: token,
+//	}
+//	response, err := FireBaseClient.Send(context.Background(), message)
+//	if err != nil {
+//		panic(err)
+//	}
+//	fmt.Println(response)
+//}
diff --git a/go.mod b/go.mod
@@ -3,7 +3,6 @@ module learning_tools
 go 1.15
 
 require (
-	cloud.google.com/go/firestore v1.5.0 // indirect
 	firebase.google.com/go v3.13.0+incompatible
 	github.com/HdrHistogram/hdrhistogram-go v1.0.1 // indirect
 	github.com/PuerkitoBio/goquery v1.6.1
@@ -12,6 +11,7 @@ require (
 	github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575
 	github.com/coreos/etcd v3.3.25+incompatible
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
+	github.com/dustin/go-humanize v1.0.0 // indirect
 	github.com/fastly/go-utils v0.0.0-20180712184237-d95a45783239 // indirect
 	github.com/fsnotify/fsnotify v1.4.9
 	github.com/garyburd/redigo v1.6.2
@@ -22,12 +22,14 @@ require (
 	github.com/go-redis/redis v6.15.9+incompatible
 	github.com/go-sql-driver/mysql v1.5.0
 	github.com/go-xorm/xorm v0.7.9
-	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
-	github.com/golang/protobuf v1.4.3
+	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e
+	github.com/golang/mock v1.5.0 // indirect
+	github.com/golang/protobuf v1.5.2
+	github.com/google/martian/v3 v3.1.0 // indirect
 	github.com/google/uuid v1.2.0
 	github.com/google/wire v0.5.0
 	github.com/gorilla/websocket v1.4.2
-	github.com/grpc-ecosystem/go-grpc-middleware v1.2.2
+	github.com/grpc-ecosystem/go-grpc-middleware v1.2.0
 	github.com/hashicorp/memberlist v0.2.2
 	github.com/hpcloud/tail v1.0.0
 	github.com/jehiah/go-strftime v0.0.0-20171201141054-1d33003b3869 // indirect
@@ -45,7 +47,7 @@ require (
 	github.com/nsqio/go-nsq v1.0.8
 	github.com/opentracing/opentracing-go v1.2.0
 	github.com/patrickmn/go-cache v2.1.0+incompatible
-	github.com/prometheus/client_golang v1.9.0
+	github.com/prometheus/client_golang v1.11.0
 	github.com/robfig/cron v1.2.0
 	github.com/satori/go.uuid v1.2.0
 	github.com/shopspring/decimal v1.2.0
@@ -59,20 +61,25 @@ require (
 	github.com/urfave/cli v1.22.5
 	github.com/urfave/cli/v2 v2.3.0
 	go.etcd.io/etcd v3.3.25+incompatible
+	go.etcd.io/etcd/client/pkg/v3 v3.5.0 // indirect
 	go.mongodb.org/mongo-driver v1.4.6
+	go.opencensus.io v0.22.5 // indirect
 	go.uber.org/ratelimit v0.2.0
-	go.uber.org/zap v1.16.0
+	go.uber.org/zap v1.17.0
 	golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b
-	golang.org/x/net v0.0.0-20210427231257-85d9c07bbe3a
+	golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
+	golang.org/x/net v0.0.0-20210614182718-04defd469f4e
+	golang.org/x/sys v0.0.0-20210616094352-59db8d763f22 // indirect
 	golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba
-	google.golang.org/api v0.40.0
-	google.golang.org/grpc v1.35.0
+	google.golang.org/appengine v1.6.7 // indirect
+	google.golang.org/grpc v1.26.0
+	google.golang.org/protobuf v1.27.1 // indirect
 	gopkg.in/go-oauth2/redis.v3 v3.2.1
 	gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22
 	gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
 	gopkg.in/oauth2.v3 v3.12.0
 	gorm.io/driver/mysql v1.0.5
-    gorm.io/gorm v1.21.3
+	gorm.io/gorm v1.21.3
+	honnef.co/go/tools v0.0.1-2020.1.4 // indirect
+	sigs.k8s.io/yaml v1.2.0 // indirect
 )
-
-replace google.golang.org/grpc v1.35.0 => google.golang.org/grpc v1.26.0
diff --git a/kafka/offset_test.go b/kafka/offset_test.go
@@ -23,7 +23,7 @@ func TestKafkaSyncProducer(t *testing.T) {
 	}
 	defer producer.Close()
 	fmt.Println(producer.SendMessage(&sarama.ProducerMessage{
-		Topic: "test_topic11",
+		Topic: "gs_stats_topic",
 		Value: sarama.ByteEncoder("1"),
 	}))
 	select {}
diff --git a/log/zaplog/zap.go b/log/zaplog/zap.go
@@ -1,9 +1,9 @@
 package zaplog
 
 import (
+	"github.com/natefinch/lumberjack"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
-	"gopkg.in/natefinch/lumberjack"
 	"os"
 	"path/filepath"
 	"sync"
diff --git a/micro_agent/base/tool/log.go b/micro_agent/base/tool/log.go
@@ -1,9 +1,9 @@
 package tool
 
 import (
+	"github.com/natefinch/lumberjack"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
-	"gopkg.in/natefinch/lumberjack"
 	"os"
 	"path/filepath"
 	"sync"
diff --git a/micro_v2/go.mod b/micro_v2/go.mod
@@ -7,5 +7,4 @@ require (
 	github.com/golang/protobuf v1.4.2
 	github.com/micro/go-micro/v2 v2.8.0
 	github.com/pkg/errors v0.9.1
-	go.etcd.io/etcd v3.3.25+incompatible
 )
diff --git a/micro_v2/go.sum b/micro_v2/go.sum
@@ -399,8 +399,6 @@ github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 h1:eY9dn8+vbi4tKz5
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
 go.etcd.io/bbolt v1.3.4 h1:hi1bXHMVrlQh6WwxAy+qZCV/SYIlqo+Ushwdpa4tAKg=
 go.etcd.io/bbolt v1.3.4/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ=
-go.etcd.io/etcd v3.3.25+incompatible h1:V1RzkZJj9LqsJRy+TUBgpWSbZXITLB819lstuTFoZOY=
-go.etcd.io/etcd v3.3.25+incompatible/go.mod h1:yaeTdrJi5lOmYerz05bd8+V7KubZs8YSFZfzsF9A6aI=
 go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk=
 go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
diff --git a/rpc/main.go b/rpc/main.go
@@ -1,11 +1,11 @@
 package main
 
 import (
-	"github.com/hwholiday/libs/perf"
-	"github.com/hwholiday/libs/quit"
 	"fmt"
-	"net/rpc"
+	"learning_tools/all_packaged_library/perf"
+	"learning_tools/all_packaged_library/quit"
 	"net"
+	"net/rpc"
 )
 
 // RPC
@@ -45,6 +45,6 @@ func rpcListen(network, addr string) {
 }
 
 func (r *RPC) Ping(arg *Arg, reply *Reply) error {
-	reply.Reply=arg.Arg+"howie"
+	reply.Reply = arg.Arg + "howie"
 	return nil
 }
diff --git a/service_registration_discovery/etcd_lock_test.go b/service_registration_discovery/etcd_lock_test.go
diff --git a/service_registration_discovery/etcdv3_test.go b/service_registration_discovery/etcdv3_test.go
diff --git a/tcp/main.go b/tcp/main.go
diff --git a/tcp/network/tcp_server.go b/tcp/network/tcp_server.go

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ func TestKafkaSyncProducer(t *testing.T) {`
`23`	`23`	`}`
`24`	`24`	`defer producer.Close()`
`25`	`25`	`fmt.Println(producer.SendMessage(&sarama.ProducerMessage{`
`26`		`- Topic: "test_topic11",`
	`26`	`+ Topic: "gs_stats_topic",`
`27`	`27`	`Value: sarama.ByteEncoder("1"),`
`28`	`28`	`}))`
`29`	`29`	`select {}`
Original file line number	Diff line number	Diff line change
`@@ -7,5 +7,4 @@ require (`
`7`	`7`	`github.com/golang/protobuf v1.4.2`
`8`	`8`	`github.com/micro/go-micro/v2 v2.8.0`
`9`	`9`	`github.com/pkg/errors v0.9.1`
`10`		`- go.etcd.io/etcd v3.3.25+incompatible`
`11`	`10`	`)`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,11 @@`
`1`	`1`	`package main`
`2`	`2`
`3`	`3`	`import (`
`4`		`- "github.com/hwholiday/libs/perf"`
`5`		`- "github.com/hwholiday/libs/quit"`
`6`	`4`	`"fmt"`
`7`		`- "net/rpc"`
	`5`	`+ "learning_tools/all_packaged_library/perf"`
	`6`	`+ "learning_tools/all_packaged_library/quit"`
`8`	`7`	`"net"`
	`8`	`+ "net/rpc"`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`// RPC`
`@@ -45,6 +45,6 @@ func rpcListen(network, addr string) {`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`func (r RPC) Ping(arg Arg, reply *Reply) error {`
`48`		`- reply.Reply=arg.Arg+"howie"`
	`48`	`+ reply.Reply = arg.Arg + "howie"`
`49`	`49`	`return nil`
`50`	`50`	`}`