Browse Source

feature: 中间件打印日志,panic转为err

世祺 1 day ago
parent
commit
2a20972f9c

+ 69 - 1
CloudflareServer.go

@@ -7,28 +7,96 @@ import (
 	"cfTest/cloudflareApi/logPush"
 	"cfTest/cloudflareApi/zone"
 	"cfTest/server"
+	"context"
+	"fmt"
+	"github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/logging"
+	grpc_recovery "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/recovery"
+	"github.com/sirupsen/logrus"
 	"google.golang.org/grpc"
+	"io"
 	"log"
 	"net"
+	"os"
 )
+import "github.com/grpc-ecosystem/go-grpc-middleware"
 
 const (
 	port = ":50051"
 )
 
+// InterceptorLogger adapts logrus logger to interceptor logger.
+// This code is simple enough to be copied and not imported.
+func InterceptorLogger(l logrus.FieldLogger) logging.Logger {
+	return logging.LoggerFunc(func(_ context.Context, lvl logging.Level, msg string, fields ...any) {
+		f := make(map[string]any, len(fields)/2)
+		i := logging.Fields(fields).Iterator()
+		for i.Next() {
+			k, v := i.At()
+			f[k] = v
+		}
+		l := l.WithFields(f)
+
+		switch lvl {
+		case logging.LevelDebug:
+			l.Debug(msg)
+		case logging.LevelInfo:
+			l.Info(msg)
+		case logging.LevelWarn:
+			l.Warn(msg)
+		case logging.LevelError:
+			l.Error(msg)
+		default:
+			panic(fmt.Sprintf("unknown level %v", lvl))
+		}
+	})
+}
+
 func main() {
+	//日志设置
+	logger := logrus.New()
+	loggerOutputs := []io.Writer{os.Stdout}
+	logFilePath := "CloudflareServer.log"
+	if len(os.Args) > 1 {
+		logFilePath = os.Args[1]
+	}
+	file, err := os.OpenFile(logFilePath, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0666)
+	if err != nil {
+		logger.Error(err)
+	} else {
+		loggerOutputs = append(loggerOutputs, file)
+	}
+	logger.SetOutput(io.MultiWriter(loggerOutputs...))
+
+	opts := []logging.Option{
+		logging.WithLogOnEvents(logging.StartCall, logging.FinishCall, logging.PayloadReceived, logging.PayloadSent),
+	}
 
+	//监听端口
 	lis, err := net.Listen("tcp", port)
 	if err != nil {
 		log.Fatalf("failed to listen: %v", err)
 	}
 
-	s := grpc.NewServer()
+	//注册GRPC中间件
+	s := grpc.NewServer(
+		grpc.ChainUnaryInterceptor(grpc_middleware.ChainUnaryServer(
+			grpc_recovery.UnaryServerInterceptor(),
+			logging.UnaryServerInterceptor(InterceptorLogger(logger), opts...),
+		)),
+		grpc.ChainStreamInterceptor(grpc_middleware.ChainStreamServer(
+			grpc_recovery.StreamServerInterceptor(),
+			logging.StreamServerInterceptor(InterceptorLogger(logger), opts...),
+		)),
+	)
+
+	//注册服务
 	purge.RegisterPurgeCloudflareServer(s, &server.PurgeServer{})
 	certificate.RegisterCertificateCloudflareServer(s, &server.CertificateServer{})
 	zone.RegisterZoneCloudflareServer(s, &server.ZoneServer{})
 	dns.RegisterDnsCloudflareServer(s, &server.DnsServer{})
 	logPush.RegisterLogPushCloudflareServer(s, &server.LogPushCloudflareServer{})
+
+	//启动服务
 	log.Printf("server listening at %v", lis.Addr())
 	if err := s.Serve(lis); err != nil {
 		log.Fatalf("failed to serve: %v", err)

+ 3 - 1
go.mod

@@ -4,6 +4,8 @@ go 1.18
 
 require (
 	github.com/cloudflare/cloudflare-go v0.98.0
+	github.com/grpc-ecosystem/go-grpc-middleware v1.4.0
+	github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.1.0
 	github.com/jinzhu/copier v0.3.5
 	github.com/samber/lo v1.37.0
 	github.com/sirupsen/logrus v1.9.0
@@ -18,7 +20,7 @@ require (
 	github.com/google/go-querystring v1.1.0 // indirect
 	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
 	github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
-	golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17 // indirect
+	golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 // indirect
 	golang.org/x/net v0.26.0 // indirect
 	golang.org/x/sys v0.21.0 // indirect
 	golang.org/x/text v0.16.0 // indirect

+ 106 - 2
go.sum

@@ -1,17 +1,41 @@
+cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/toml v1.2.0 h1:Rt8g24XnyGTyglgET/PRUNlrUeu9F5L+7FilkXfZgs0=
 github.com/BurntSushi/toml v1.2.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
+github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
+github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
+github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/cloudflare/cloudflare-go v0.98.0 h1:IjBVU1jmmG2Vm5emW1cXv/RPCT2XWpRPuB1zgaTdcZY=
 github.com/cloudflare/cloudflare-go v0.98.0/go.mod h1:sQzaVM6DlkWe1yqQXaql+CRt4rA8efMfpoPjNuUE1KI=
+github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
+github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
+github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
+github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM=
+github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=
+github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
+github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/goccy/go-json v0.10.3 h1:KZ5WoDbxAIgm2HNbYckL0se1fHD6rz5j4ywS6ebzDqA=
 github.com/goccy/go-json v0.10.3/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
+github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
+github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
+github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
+github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
 github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
+github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 h1:UH//fgunKIs4JdUbpDl1VZCDaL56wXCB/5+wF6uHfaI=
+github.com/grpc-ecosystem/go-grpc-middleware v1.4.0/go.mod h1:g5qyo/la0ALbONm6Vbp88Yd8NsDy6rZz+RcrMPxvld8=
+github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.1.0 h1:pRhl55Yx1eC7BZ1N+BBWwnKaMyD8uC+34TLdndZMAKk=
+github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.1.0/go.mod h1:XKMd7iuf/RGPSMJ/U4HP0zS2Z9Fh8Ps9a+6X26m/tmI=
 github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=
 github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=
 github.com/hashicorp/go-hclog v1.6.3 h1:Qr2kF+eVWjTiYmU7Y31tYlP1h0q/X3Nl3tPGdaB11/k=
@@ -19,39 +43,119 @@ github.com/hashicorp/go-retryablehttp v0.7.7 h1:C8hUCYzor8PIfXHa4UrZkU4VvK8o9ISH
 github.com/hashicorp/go-retryablehttp v0.7.7/go.mod h1:pkQpWZeYWskR+D1tR2O5OcBFOxfA7DoAO6xtkuQnHTk=
 github.com/jinzhu/copier v0.3.5 h1:GlvfUwHk62RokgqVNvYsku0TATCF7bAHVwEXoBh3iJg=
 github.com/jinzhu/copier v0.3.5/go.mod h1:DfbEm0FYsaqBcKcFuvmOZb218JkPGtvSHsKg8S8hyyg=
+github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
+github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
+github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
+github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
+github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/samber/lo v1.37.0 h1:XjVcB8g6tgUp8rsPsJ2CvhClfImrpL04YpQHXeHPhRw=
 github.com/samber/lo v1.37.0/go.mod h1:9vaz2O4o8oOnK23pd2TrXufcbdbJIa3b6cstBWKpopA=
+github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
 github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
-golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17 h1:3MTrJm4PyNL9NBqvYDSj3DHl46qQakyfqfWo4jgfaEM=
-golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17/go.mod h1:lgLbSvA5ygNOMpwM/9anMpWVlVJ7Z+cHWq/eFuinpGE=
+github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
+go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A=
+go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
+go.uber.org/zap v1.18.1/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 h1:k/i9J1pBpvlfR+9QsetwPyERsqu1GIbi967PQMq3Ivc=
+golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w=
+golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
+golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ=
 golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE=
+golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
+golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
 golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
 golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
 golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
 golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
+golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
+google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
+google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
+google.golang.org/genproto v0.0.0-20200423170343-7949de9c1215/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/genproto v0.0.0-20220808131553-a91ffa7f803e h1:yXLYwnRRqNHIwwHZLiA9/aC9uieNrOF0owsijAiZJr8=
 google.golang.org/genproto v0.0.0-20220808131553-a91ffa7f803e/go.mod h1:iHe1svFLAZg9VWz891+QbRMwUv9O/1Ww+/mngYeThbc=
+google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
+google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
+google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
+google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
 google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY=
 google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg=
 google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
 google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
 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=
 gopkg.in/natefinch/lumberjack.v2 v2.0.0 h1:1Lc07Kr7qY4U2YPouBjpCLxpiyxIVoxqXgkXLknAOE8=
 gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=

+ 1 - 1
proto

@@ -1 +1 @@
-Subproject commit 36f239c37ce88c93b924241196307c5d3d0917dc
+Subproject commit 0bb9cdbf7035a625b9840acf2674c50824fe32eb

+ 0 - 19
server/CertificateCloudflareServer.go

@@ -4,7 +4,6 @@ import (
 	cert "cfTest/cloudflareApi/certificate"
 	"context"
 	"github.com/cloudflare/cloudflare-go"
-	"log"
 )
 
 type CertificateServer struct {
@@ -12,9 +11,6 @@ type CertificateServer struct {
 }
 
 func (s *CertificateServer) UniversalCertificate(ctx context.Context, requestCloudflare *cert.UniversalCertificateRequestCloudflare) (*cert.UniversalCertificateReplyCloudflare, error) {
-	log.Printf("apiKey Received: %v", requestCloudflare.GetApiKey())
-	log.Printf("apiEmail Received: %v", requestCloudflare.GetApiEmail())
-	log.Printf("zoneName Received: %v", requestCloudflare.GetZoneName())
 	api, err := cloudflare.New(requestCloudflare.GetApiKey(), requestCloudflare.GetApiEmail())
 	if err != nil {
 		return nil, err
@@ -40,11 +36,6 @@ func (s *CertificateServer) UniversalCertificate(ctx context.Context, requestClo
 }
 
 func (s *CertificateServer) CreateCertificate(ctx context.Context, requestCloudflare *cert.CreateCertificateRequestCloudflare) (*cert.CreateCertificateReplyCloudflare, error) {
-	log.Printf("apiKey Received: %v", requestCloudflare.GetApiKey())
-	log.Printf("apiEmail Received: %v", requestCloudflare.GetApiEmail())
-	log.Printf("zoneName Received: %v", requestCloudflare.GetZoneName())
-	log.Printf("certificate Received: %v", requestCloudflare.GetCertificate())
-	log.Printf("privateKey Received: %v", requestCloudflare.GetPrivateKey())
 	api, err := cloudflare.New(requestCloudflare.GetApiKey(), requestCloudflare.GetApiEmail())
 	if err != nil {
 		return nil, err
@@ -76,10 +67,6 @@ func (s *CertificateServer) CreateCertificate(ctx context.Context, requestCloudf
 }
 
 func (s *CertificateServer) DeleteCertificate(ctx context.Context, requestCloudflare *cert.DeleteCertificateRequestCloudflare) (*cert.DeleteCertificateReplyCloudflare, error) {
-	log.Printf("apiKey Received: %v", requestCloudflare.GetApiKey())
-	log.Printf("apiEmail Received: %v", requestCloudflare.GetApiEmail())
-	log.Printf("zoneName Received: %v", requestCloudflare.GetZoneName())
-	log.Printf("certificateId Received: %v", requestCloudflare.GetCertificateId())
 	api, err := cloudflare.New(requestCloudflare.GetApiKey(), requestCloudflare.GetApiEmail())
 	if err != nil {
 		return nil, err
@@ -101,12 +88,6 @@ func (s *CertificateServer) DeleteCertificate(ctx context.Context, requestCloudf
 	}, err
 }
 func (s *CertificateServer) EditCertificate(ctx context.Context, requestCloudflare *cert.EditCertificateRequestCloudflare) (*cert.EditCertificateReplyCloudflare, error) {
-	log.Printf("apiKey Received: %v", requestCloudflare.GetApiKey())
-	log.Printf("apiEmail Received: %v", requestCloudflare.GetApiEmail())
-	log.Printf("zoneName Received: %v", requestCloudflare.GetZoneName())
-	log.Printf("certificateId Received: %v", requestCloudflare.GetCertificateId())
-	log.Printf("certificate Received: %v", requestCloudflare.GetCertificate())
-	log.Printf("privateKey Received: %v", requestCloudflare.GetPrivateKey())
 	api, err := cloudflare.New(requestCloudflare.GetApiKey(), requestCloudflare.GetApiEmail())
 	if err != nil {
 		return nil, err

+ 0 - 29
server/LogPushCloudflareServer.go

@@ -14,10 +14,6 @@ type LogPushCloudflareServer struct {
 
 func (s *LogPushCloudflareServer) ListLogPushJobsByZoneId(ctx context.Context,
 	requestCloudflare *logPush.ListLogPushJobRequestByZoneId) (*logPush.ListLogPushJobReplay, error) {
-	log.Printf("apiKey Received: %v", requestCloudflare.GetApiKey())
-	log.Printf("apiEmail Received: %v", requestCloudflare.GetApiEmail())
-	log.Printf("zoneId Received: %v", requestCloudflare.GetZoneId())
-	log.Printf("dataSet Received: %v", requestCloudflare.GetDataSet())
 
 	api, err := cloudflare.New(requestCloudflare.GetApiKey(), requestCloudflare.GetApiEmail())
 	if err != nil {
@@ -51,13 +47,6 @@ func (s *LogPushCloudflareServer) ListLogPushJobsByZoneId(ctx context.Context,
 func (s *LogPushCloudflareServer) CreateLogPushJobByZoneId(ctx context.Context,
 	requestCloudflare *logPush.CreateLogPushJobRequestByZoneId) (*logPush.CreateLogPushJobReplay, error) {
 
-	log.Printf("apiKey Received: %v", requestCloudflare.GetApiKey())
-	log.Printf("apiEmail Received: %v", requestCloudflare.GetApiEmail())
-	log.Printf("zoneId Received: %v", requestCloudflare.GetZoneId())
-	log.Printf("dataSet Received: %v", requestCloudflare.GetDataSet())
-	log.Printf("destinationConf Received: %v", requestCloudflare.GetDestinationConf())
-	log.Printf("ownershipChallenge Received: %v", requestCloudflare.GetOwnershipChallenge())
-
 	api, err := cloudflare.New(requestCloudflare.GetApiKey(), requestCloudflare.GetApiEmail())
 	if err != nil {
 		log.Printf("new cloudflare api error : %v", err)
@@ -104,11 +93,6 @@ func (s *LogPushCloudflareServer) CreateLogPushJobByZoneId(ctx context.Context,
 func (s *LogPushCloudflareServer) DeleteLogPushJobByZoneId(ctx context.Context,
 	requestCloudflare *logPush.DeleteLogPushJobRequestByZoneId) (*logPush.DeleteLogPushJobReplay, error) {
 
-	log.Printf("apiKey Received: %v", requestCloudflare.GetApiKey())
-	log.Printf("apiEmail Received: %v", requestCloudflare.GetApiEmail())
-	log.Printf("zoneId Received: %v", requestCloudflare.GetZoneId())
-	log.Printf("jobId Received: %v", requestCloudflare.GetJobId())
-
 	api, err := cloudflare.New(requestCloudflare.GetApiKey(), requestCloudflare.GetApiEmail())
 	if err != nil {
 		log.Printf("new cloudflare api error : %v", err)
@@ -135,10 +119,6 @@ func (s *LogPushCloudflareServer) DeleteLogPushJobByZoneId(ctx context.Context,
 
 func (s *LogPushCloudflareServer) GetOwnershipChallengeByZoneId(ctx context.Context,
 	requestCloudflare *logPush.GetOwnershipChallengeRequestByZoneId) (*logPush.GetOwnershipChallengeReply, error) {
-	log.Printf("apiKey Received: %v", requestCloudflare.GetApiKey())
-	log.Printf("apiEmail Received: %v", requestCloudflare.GetApiEmail())
-	log.Printf("zoneId Received: %v", requestCloudflare.GetZoneId())
-	log.Printf("destinationConf Received: %v", requestCloudflare.GetDestinationConf())
 
 	api, err := cloudflare.New(requestCloudflare.GetApiKey(), requestCloudflare.GetApiEmail())
 	if err != nil {
@@ -176,10 +156,6 @@ func (s *LogPushCloudflareServer) GetOwnershipChallengeByZoneId(ctx context.Cont
 
 func (s *LogPushCloudflareServer) CheckDestinationExist(ctx context.Context,
 	requestCloudflare *logPush.CheckDestinationExistRequest) (*logPush.CheckDestinationExistReply, error) {
-	log.Printf("apiKey Received: %v", requestCloudflare.GetApiKey())
-	log.Printf("apiEmail Received: %v", requestCloudflare.GetApiEmail())
-	log.Printf("zoneId Received: %v", requestCloudflare.GetZoneId())
-	log.Printf("destinationConf Received: %v", requestCloudflare.GetDestinationConf())
 
 	api, err := cloudflare.New(requestCloudflare.GetApiKey(), requestCloudflare.GetApiEmail())
 	if err != nil {
@@ -204,11 +180,6 @@ func (s *LogPushCloudflareServer) CheckDestinationExist(ctx context.Context,
 
 func (s *LogPushCloudflareServer) ValidateOwnershipChallenge(ctx context.Context,
 	requestCloudflare *logPush.ValidateOwnershipChallengeRequest) (*logPush.ValidateOwnershipChallengeReply, error) {
-	log.Printf("apiKey Received: %v", requestCloudflare.GetApiKey())
-	log.Printf("apiEmail Received: %v", requestCloudflare.GetApiEmail())
-	log.Printf("zoneId Received: %v", requestCloudflare.GetZoneId())
-	log.Printf("destinationConf Received: %v", requestCloudflare.GetDestinationConf())
-	log.Printf("ownershipChallenge Received: %v", requestCloudflare.GetOwnershipChallenge())
 
 	api, err := cloudflare.New(requestCloudflare.GetApiKey(), requestCloudflare.GetApiEmail())
 	if err != nil {

+ 0 - 14
server/PurgeCloudflareServer.go

@@ -12,11 +12,6 @@ type PurgeServer struct {
 }
 
 func (s *PurgeServer) PurgeCloudflare(ctx context.Context, in *pb.PurgeRequestCloudflare) (*pb.PurgeReplyCloudflare, error) {
-	log.Printf("purgeTaskByUrl")
-	log.Printf("apiKey Received: %v", in.GetApiKey())
-	log.Printf("apiEmail Received: %v", in.GetApiEmail())
-	log.Printf("zoneId Received: %v", in.GetZoneId())
-	log.Printf("purgeList Received: %v", in.GetPurgeList())
 
 	// Construct a new API object using a global API key
 	api, err := cloudflare.New(in.GetApiKey(), in.GetApiEmail())
@@ -50,11 +45,6 @@ func (s *PurgeServer) PurgeCloudflare(ctx context.Context, in *pb.PurgeRequestCl
 }
 
 func (s *PurgeServer) PurgeCloudflareByPrefix(ctx context.Context, in *pb.PurgeRequestCloudflarePrefix) (*pb.PurgeReplyCloudflare, error) {
-	log.Printf("purgeTaskByPrefix")
-	log.Printf("apiKey Received: %v", in.GetApiKey())
-	log.Printf("apiEmail Received: %v", in.GetApiEmail())
-	log.Printf("zoneId Received: %v", in.GetZoneId())
-	log.Printf("prefixList Received: %v", in.GetPrefixList())
 
 	// Construct a new API object using a global API key
 	api, err := cloudflare.New(in.GetApiKey(), in.GetApiEmail())
@@ -88,10 +78,6 @@ func (s *PurgeServer) PurgeCloudflareByPrefix(ctx context.Context, in *pb.PurgeR
 }
 
 func (s *PurgeServer) PurgeCloudflareEverything(ctx context.Context, in *pb.PurgeRequestCloudflareEverything) (*pb.PurgeReplyCloudflare, error) {
-	log.Printf("purgeEverythingTask")
-	log.Printf("apiKey Received: %v", in.GetApiKey())
-	log.Printf("apiEmail Received: %v", in.GetApiEmail())
-	log.Printf("zoneId Received: %v", in.GetZoneId())
 
 	// Construct a new API object using a global API key
 	api, err := cloudflare.New(in.GetApiKey(), in.GetApiEmail())

+ 0 - 45
server/ZoneCloudflareServer.go

@@ -58,9 +58,6 @@ type Subscription struct {
 var ArgoSubscriptionId = "argo_zone_ent_tryout"
 
 func (s *ZoneServer) GetArgoSettingSubscription(ctx context.Context, request *zone.IdRequest) (*zone.ArgoSetting, error) {
-	log.Printf("apiKey Received: %v", request.GetApiKey())
-	log.Printf("apiEmail Received: %v", request.GetApiEmail())
-	log.Printf("zoneId Received: %v", request.GetZoneId())
 
 	//设置HTTP请求
 	client := &http.Client{}
@@ -113,9 +110,6 @@ func (s *ZoneServer) GetArgoSettingSubscription(ctx context.Context, request *zo
 }
 
 func (s *ZoneServer) CreateArgoSettingSubscription(ctx context.Context, request *zone.IdRequest) (*zone.ArgoSetting, error) {
-	log.Printf("apiKey Received: %v", request.GetApiKey())
-	log.Printf("apiEmail Received: %v", request.GetApiEmail())
-	log.Printf("zoneId Received: %v", request.GetZoneId())
 
 	type RequestType struct {
 		RatePlan struct {
@@ -188,9 +182,6 @@ func (s *ZoneServer) CreateArgoSettingSubscription(ctx context.Context, request
 }
 
 func (s *ZoneServer) UpdateArgoSetting(ctx context.Context, requestCloudflare *zone.UpdateArgoRequestCloudflare) (*zone.ArgoSetting, error) {
-	log.Printf("apiKey Received: %v", requestCloudflare.GetApiKey())
-	log.Printf("apiEmail Received: %v", requestCloudflare.GetApiEmail())
-	log.Printf("zoneId Received: %v", requestCloudflare.GetZoneId())
 
 	api, err := cloudflare.New(requestCloudflare.GetApiKey(), requestCloudflare.GetApiEmail())
 	if err != nil {
@@ -208,9 +199,6 @@ func (s *ZoneServer) UpdateArgoSetting(ctx context.Context, requestCloudflare *z
 }
 
 func (s *ZoneServer) GetArgoSetting(ctx context.Context, requestCloudflare *zone.IdRequest) (*zone.ArgoSetting, error) {
-	log.Printf("apiKey Received: %v", requestCloudflare.GetApiKey())
-	log.Printf("apiEmail Received: %v", requestCloudflare.GetApiEmail())
-	log.Printf("zoneId Received: %v", requestCloudflare.GetZoneId())
 
 	api, err := cloudflare.New(requestCloudflare.GetApiKey(), requestCloudflare.GetApiEmail())
 	if err != nil {
@@ -227,10 +215,6 @@ func (s *ZoneServer) GetArgoSetting(ctx context.Context, requestCloudflare *zone
 
 func (s *ZoneServer) ZoneIDByNameCloudflare(ctx context.Context, requestCloudflare *zone.ZoneIDByNameRequestCloudflare) (*zone.ZoneIDByNameReplyCloudflare, error) {
 
-	log.Printf("apiKey Received: %v", requestCloudflare.GetApiKey())
-	log.Printf("apiEmail Received: %v", requestCloudflare.GetApiEmail())
-	log.Printf("zoneName Received: %v", requestCloudflare.GetZoneName())
-
 	api, err := cloudflare.New(requestCloudflare.GetApiKey(), requestCloudflare.GetApiEmail())
 	if err != nil {
 		return nil, err
@@ -245,9 +229,6 @@ func (s *ZoneServer) ZoneIDByNameCloudflare(ctx context.Context, requestCloudfla
 }
 
 func (s *ZoneServer) ZoneDetails(ctx context.Context, requestCloudflare *zone.ZoneDetailsRequestCloudflare) (*zone.ZoneDetailsReplyCloudflare, error) {
-	log.Printf("apiKey Received: %v", requestCloudflare.GetApiKey())
-	log.Printf("apiEmail Received: %v", requestCloudflare.GetApiEmail())
-	log.Printf("zoneId Received: %v", requestCloudflare.GetZoneId())
 
 	api, err := cloudflare.New(requestCloudflare.GetApiKey(), requestCloudflare.GetApiEmail())
 	if err != nil {
@@ -267,9 +248,6 @@ func (s *ZoneServer) ZoneDetails(ctx context.Context, requestCloudflare *zone.Zo
 }
 
 func (s *ZoneServer) GetZones(ctx context.Context, requestCloudflare *zone.GetZonesRequestCloudflare) (*zone.GetZonesReplyCloudflare, error) {
-	log.Printf("apiKey Received: %v", requestCloudflare.GetApiKey())
-	log.Printf("apiEmail Received: %v", requestCloudflare.GetApiEmail())
-	log.Printf("domain Received: %v", requestCloudflare.GetDomain())
 
 	api, err := cloudflare.New(requestCloudflare.GetApiKey(), requestCloudflare.GetApiEmail())
 	if err != nil {
@@ -291,8 +269,6 @@ func (s *ZoneServer) GetZones(ctx context.Context, requestCloudflare *zone.GetZo
 }
 
 func (s *ZoneServer) ListZones(ctx context.Context, requestCloudflare *zone.ListZonesRequestCloudflare) (*zone.ZonesList, error) {
-	log.Printf("apiKey Received: %v", requestCloudflare.GetApiKey())
-	log.Printf("apiEmail Received: %v", requestCloudflare.GetApiEmail())
 
 	api, err := cloudflare.New(requestCloudflare.GetApiKey(), requestCloudflare.GetApiEmail())
 	if err != nil {
@@ -315,9 +291,6 @@ func (s *ZoneServer) ListZones(ctx context.Context, requestCloudflare *zone.List
 }
 
 func (s *ZoneServer) ListZonesByAccountId(ctx context.Context, requestCloudflare *zone.ListZonesByAccountIdRequestCloudflare) (*zone.ZonesList, error) {
-	log.Printf("apiKey Received: %v", requestCloudflare.GetApiKey())
-	log.Printf("apiEmail Received: %v", requestCloudflare.GetApiEmail())
-	log.Printf("accountId Received: %v", requestCloudflare.GetAccountId())
 
 	api, err := cloudflare.New(requestCloudflare.GetApiKey(), requestCloudflare.GetApiEmail())
 	if err != nil {
@@ -340,9 +313,6 @@ func (s *ZoneServer) ListZonesByAccountId(ctx context.Context, requestCloudflare
 }
 
 func (s *ZoneServer) EditZone(ctx context.Context, requestCloudflare *zone.EditZoneRequestCloudflare) (*zone.EditZoneReplyCloudflare, error) {
-	log.Printf("apiKey Received: %v", requestCloudflare.GetApiKey())
-	log.Printf("apiEmail Received: %v", requestCloudflare.GetApiEmail())
-	log.Printf("zoneId Received: %v", requestCloudflare.GetZoneId())
 
 	api, err := cloudflare.New(requestCloudflare.GetApiKey(), requestCloudflare.GetApiEmail())
 	if err != nil {
@@ -381,10 +351,6 @@ func (s *ZoneServer) EditZone(ctx context.Context, requestCloudflare *zone.EditZ
 
 func (s *ZoneServer) DeleteZone(ctx context.Context, requestCloudflare *zone.DeleteZoneRequestCloudflare) (*zone.DeleteZoneReplyCloudflare, error) {
 
-	log.Printf("apiKey Received: %v", requestCloudflare.GetApiKey())
-	log.Printf("apiEmail Received: %v", requestCloudflare.GetApiEmail())
-	log.Printf("zoneId Received: %v", requestCloudflare.GetZoneId())
-
 	api, err := cloudflare.New(requestCloudflare.GetApiKey(), requestCloudflare.GetApiEmail())
 	if err != nil {
 		return nil, err
@@ -404,7 +370,6 @@ func (s *ZoneServer) DeleteZone(ctx context.Context, requestCloudflare *zone.Del
 }
 
 func (s *ZoneServer) CreateZone(ctx context.Context, requestCloudflare *zone.CreateZoneRequestCloudflare) (*zone.CreateZoneReplyCloudflare, error) {
-	log.Printf("request Received: %+v", requestCloudflare)
 
 	api, err := cloudflare.New(requestCloudflare.GetApiKey(), requestCloudflare.GetApiEmail())
 	if err != nil {
@@ -430,7 +395,6 @@ func (s *ZoneServer) CreateZone(ctx context.Context, requestCloudflare *zone.Cre
 }
 
 func (s *ZoneServer) SetZonePlan(ctx context.Context, requestCloudflare *zone.SetZonePlanRequestCloudflare) (*zone.SetZonePlanReplyCloudflare, error) {
-	log.Printf("request Received: %+v", requestCloudflare)
 
 	api, err := cloudflare.New(requestCloudflare.GetApiKey(), requestCloudflare.GetApiEmail())
 	if err != nil {
@@ -449,9 +413,6 @@ func (s *ZoneServer) SetZonePlan(ctx context.Context, requestCloudflare *zone.Se
 }
 
 func (s *ZoneServer) ActivationCheck(ctx context.Context, requestCloudflare *zone.ActivationCheckRequestCloudflare) (*zone.ActivationCheckReplyCloudflare, error) {
-	log.Printf("apiKey Received: %v", requestCloudflare.GetApiKey())
-	log.Printf("apiEmail Received: %v", requestCloudflare.GetApiEmail())
-	log.Printf("zoneId Received: %v", requestCloudflare.GetZoneId())
 
 	api, err := cloudflare.New(requestCloudflare.GetApiKey(), requestCloudflare.GetApiEmail())
 	if err != nil {
@@ -824,9 +785,6 @@ func (s *ZoneServer) UpdatePageRulesPriorities(ctx context.Context, requestCloud
 
 // 默认开启Smarttiered cache
 func (s *ZoneServer) SetSmartTieredCache(ctx context.Context, requestCloudflare *zone.SetSmartTieredCacheRequestCloudflare) (*zone.SetSmartTieredCacheReplyCloudflare, error) {
-	log.Printf("apiKey Received: %v", requestCloudflare.GetApiKey())
-	log.Printf("apiEmail Received: %v", requestCloudflare.GetApiEmail())
-	log.Printf("zoneId Received: %v", requestCloudflare.GetZoneId())
 
 	type ResponseType struct {
 		Errors   []interface{} `json:"errors"`
@@ -874,9 +832,6 @@ func (s *ZoneServer) SetSmartTieredCache(ctx context.Context, requestCloudflare
 
 // 开启强制使用https
 func (s *ZoneServer) UpdateAlwaysUseHttps(ctx context.Context, requestCloudflare *zone.UpdateAlwaysUseHttpsRequestCloudflare) (*zone.UpdateAlwaysUseHttpsReplyCloudflare, error) {
-	log.Printf("apiKey Received: %v", requestCloudflare.GetApiKey())
-	log.Printf("apiEmail Received: %v", requestCloudflare.GetApiEmail())
-	log.Printf("zoneId Received: %v", requestCloudflare.GetZoneId())
 
 	type ResponseType struct {
 		Errors   []interface{} `json:"errors"`