Merge branch 'feature/v1.0.2' of https://jygit.jydev.jianyu360.cn/data_processing/DataService into feature/v1.0.2

jy_publishing/main.go

@@ -3,7 +3,8 @@ package main
 import (
 	"encoding/json"
 	"fmt"
-	"jy_publishing/Logger"
+	"go.uber.org/zap"
+	. "jy_publishing/Logger"
 	ms "jy_publishing/megaloscope"
 	nsq "jy_publishing/nsq"
 	"jy_publishing/tool"
@@ -21,7 +22,7 @@ var (
 )
 
 func init() {
-	Logger.InitLogger("./log/All.log", "debug")
+	InitLogger("./log/All.log", "debug")
 	util.ReadConfig(&tool.Sysconfig)
 	//信息类型
 	if tool.Sysconfig["infoCode"] != nil {
@@ -147,7 +148,7 @@ func processUdpMsg(act byte, data []byte, ra *net.UDPAddr) {
 	case udp.OP_TYPE_DATA: //测试接收
 		var resp map[string]interface{}
 		err := json.Unmarshal(data, &resp)
-		Logger.Info("udp receive...", Logger.Field("data", resp))
+		Logger.Info("udp receive...", zap.Any("data", resp))
 		if err != nil {
 			//go Udpclient.WriteUdp([]byte{}, mu.OP_NOOP, ra) //回应上一个节点
 		} else if resp != nil {
@@ -165,7 +166,7 @@ func processUdpMsg(act byte, data []byte, ra *net.UDPAddr) {
 			}
 		}
 	case udp.OP_NOOP: //下个节点回应
-		Logger.Info("接收回应：", Logger.Field("data", string(data)))
+		Logger.Info("接收回应：", zap.Any("data", string(data)))
 	}
 
 }

jy_publishing/service.go

@@ -2,7 +2,8 @@ package main
 
 import (
 	"fmt"
-	"jy_publishing/Logger"
+	"go.uber.org/zap"
+	. "jy_publishing/Logger"
 	"jy_publishing/tool"
 )
 
@@ -21,7 +22,7 @@ type Response struct {
 // @Author J 2022/4/13 9:25 AM
 // Deprecated
 func (d *DataService) EsInterfaceMethod(req Request, resp *Response) error {
-	Logger.Info("EsInterfaceMethod----id---", Logger.Field("id", req.Id))
+	Logger.Info("EsInterfaceMethod----id---", zap.Any("id", req.Id))
 	var err error
 	//JyRpcDataFin()
 	return err
@@ -31,7 +32,7 @@ func (d *DataService) EsInterfaceMethod(req Request, resp *Response) error {
 // @Author J 2022/4/13 9:23 AM
 // Deprecated
 func (d *DataService) DeleteData(req Request, res *Response) error {
-	Logger.Info("DeleteData----infoId---", Logger.Field("id", req.Id))
+	Logger.Info("DeleteData----infoId---", zap.Any("id", req.Id))
 	if req.Id == "" {
 		return fmt.Errorf(" Id error...")
 	}

jy_publishing/tool/etcd.go

@@ -3,7 +3,7 @@ package tool
 import (
 	"github.com/zeromicro/go-zero/core/discov"
 	"github.com/zeromicro/go-zero/zrpc"
-	"jy_publishing/Logger"
+	. "jy_publishing/Logger"
 	util "jygit.jydev.jianyu360.cn/data_processing/common_utils"
 	"strings"
 )

jy_publishing/tool/task.go

@@ -6,9 +6,10 @@ import (
 	"encoding/json"
 	"fmt"
 	"go.mongodb.org/mongo-driver/bson/primitive"
+	"go.uber.org/zap"
 	"google.golang.org/grpc"
 	"gopkg.in/mgo.v2/bson"
-	"jy_publishing/Logger"
+	. "jy_publishing/Logger"
 	jypb "jy_publishing/proto/common"
 	pb "jy_publishing/proto/proto"
 	"jygit.jydev.jianyu360.cn/BP/servicerd/proto"
@@ -260,7 +261,7 @@ func InfoPub(info map[string]interface{}) {
 			if s != "" {
 				atts := map[string]interface{}{}
 				if err := json.Unmarshal([]byte(s), &atts); err != nil {
-					Logger.Error("data Unmarshal Failed：", Logger.Field("error", err))
+					Logger.Error("data Unmarshal Failed：", zap.Any("error", err))
 				}
 				for _, i := range atts {
 					i2 := i.(map[string]interface{})
@@ -274,7 +275,7 @@ func InfoPub(info map[string]interface{}) {
 			if s := util.ObjToString(tmp[f]); s != "" {
 				atts_txt := map[string]interface{}{}
 				if err := json.Unmarshal([]byte(s), &atts_txt); err != nil {
-					Logger.Error("data Unmarshal Failed：", Logger.Field("error", err))
+					Logger.Error("data Unmarshal Failed：", zap.Any("error", err))
 				}
 				for k, v := range atts_txt {
 					atts_txt[k] = map[string]interface{}{k: v}