分支合并

jyBXBase/api/bxbase.go

@@ -3,7 +3,9 @@ package main
 import (
 	MC "app.yhyue.com/moapp/jybase/common"
 	"app.yhyue.com/moapp/jybase/endless"
+	logrusx "app.yhyue.com/moapp/jylogx/logx"
 	"fmt"
+	"github.com/zeromicro/go-zero/core/logx"
 	IC "jyBXBase/api/init"
 	"log"
 	"net/http"
@@ -46,6 +48,9 @@ func main() {
 	})
 	handler.RegisterHandlers(server, ctx)
 
+	//日志记录
+	logx.SetWriter(logrusx.NewLogrusWriter())
+
 	fmt.Printf("Starting server at %s:%d...\n", IC.C.Host, IC.C.Port)
 	server.Start()
 

jyBXBase/api/init/init.go

@@ -4,9 +4,7 @@ import (
 	MC "app.yhyue.com/moapp/jybase/common"
 	"flag"
 	"github.com/zeromicro/go-zero/core/conf"
-	"github.com/zeromicro/go-zero/core/logx"
 	"jyBXBase/api/internal/config"
-	"jyBXBase/entity"
 	"log"
 	"regexp"
 )
@@ -14,15 +12,9 @@ import (
 var configFile = flag.String("cf", "etc/bxbase-api.yaml", "the config file")
 var C config.Config
 
-//
-var logFile = flag.String("lf", "etc/logs.yaml", "the config file")
-var logc entity.Logc
-
-//
 var dbFile = flag.String("df", "etc/db.yaml", "the db file")
 var DB config.Db
 
-//
 var routesFile = flag.String("rf", "etc/routes.yaml", "the routes file")
 var Routes config.Routes
 var ExcludeUrl = []*regexp.Regexp{}
@@ -30,19 +22,6 @@ var ExcludeUrl = []*regexp.Regexp{}
 func init() {
 	conf.MustLoad(*configFile, &C)
 	log.Println("初始化配置") //
-	//初始化日志信息
-	conf.MustLoad(*logFile, &logc)
-	if len(logc.Level) > 0 {
-		for _, v := range logc.Level {
-			logx.MustSetup(logx.LogConf{
-				Mode:     logc.Mode,
-				Path:     logc.Path,
-				Level:    v,
-				KeepDays: logc.KeepDays,
-			})
-			logx.Info(v, "--日志记录")
-		}
-	}
 	//读取数据库配置
 	conf.MustLoad(*dbFile, &DB)
 	//初始mongodb

jyBXBase/entity/db.go

@@ -45,8 +45,11 @@ type RedisStuct struct {
 
 //es
 type EsStruct struct {
-	Addr string `json:"addr"`
-	Size int    `json:"size"`
+	Addr     string `json:"addr"`
+	Size     int    `json:"size"`
+	Version  string `json:"version"`
+	UserName string `json:"userName"`
+	Password string `json:"password"`
 }
 
 const (

jyBXBase/go.mod

@@ -3,16 +3,21 @@ module jyBXBase
 go 1.16
 
 require (
-	app.yhyue.com/moapp/jybase v0.0.0-20230117032034-ad7c00ffe11a
-	app.yhyue.com/moapp/jypkg v0.0.0-20230228082019-eff6065f0416
 	github.com/go-sql-driver/mysql v1.7.0
-	github.com/zeromicro/go-zero v1.4.4
-	go.mongodb.org/mongo-driver v1.11.1
-	google.golang.org/grpc v1.53.0
-	google.golang.org/protobuf v1.28.1
+	github.com/zeromicro/go-zero v1.5.2
+	go.mongodb.org/mongo-driver v1.11.4
+	google.golang.org/grpc v1.54.0
+	google.golang.org/protobuf v1.30.0
 )
 
 require (
+	app.yhyue.com/moapp/jybase v0.0.0-20230420060106-a9c3f4187463
+	app.yhyue.com/moapp/jylogx v0.0.0-20230511070629-0ed867dc49d6
+	app.yhyue.com/moapp/jypkg v0.0.0-20230420060744-ff53e7ca6f47
 	bp.jydev.jianyu360.cn/BaseService/gateway v1.3.4
 	github.com/randolphcyg/gozeropprof v1.0.2
+	go.opentelemetry.io/otel/exporters/jaeger v1.15.1 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.15.1 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.15.1 // indirect
+	go.opentelemetry.io/otel/exporters/zipkin v1.15.1 // indirect
 )

jyBXBase/rpc/bxbase.go

@@ -1,7 +1,9 @@
 package main
 
 import (
+	logrusx "app.yhyue.com/moapp/jylogx/logx"
 	"fmt"
+	"github.com/zeromicro/go-zero/core/logx"
 	"log"
 
 	MC "app.yhyue.com/moapp/jybase/common"
@@ -37,7 +39,8 @@ func main() {
 		}
 	})
 	defer s.Stop()
-
+	//日志记录
+	logx.SetWriter(logrusx.NewLogrusWriter())
 	fmt.Printf("Starting rpc server at %s...\n", IC.C.ListenOn)
 	s.Start()
 }

jyBXBase/rpc/etc/db.yaml

@@ -19,6 +19,9 @@ redis:
 es:
     addr: http://192.168.3.206:9800
     size: 30
+    version: v7
+    userName: ""
+    password: ""
 mongo:
     main:
         dbName: qfw

jyBXBase/rpc/init/db.go

@@ -7,7 +7,7 @@ import (
 	"jyBXBase/entity"
 	"strings"
 
-	"app.yhyue.com/moapp/jybase/esv1"
+	. "app.yhyue.com/moapp/jybase/es"
 	"app.yhyue.com/moapp/jybase/mongodb"
 	"app.yhyue.com/moapp/jybase/mysql"
 	"app.yhyue.com/moapp/jybase/redis"
@@ -130,6 +130,6 @@ func EsInit(es *entity.EsStruct) {
 	//初始化 elasticsearch
 	if es.Addr != "" {
 		logx.Info("--初始化 elasticsearch--")
-		elastic.InitElasticSize(es.Addr, es.Size)
+		NewEs(es.Version, es.Addr, es.Size, es.UserName, es.Password)
 	}
 }

jyBXBase/rpc/init/init.go

@@ -6,8 +6,6 @@ import (
 	"flag"
 	_ "github.com/go-sql-driver/mysql"
 	"github.com/zeromicro/go-zero/core/conf"
-	"github.com/zeromicro/go-zero/core/logx"
-	"jyBXBase/entity"
 	"jyBXBase/rpc/internal/config"
 )
 
@@ -15,30 +13,14 @@ var configFile = flag.String("cf", "etc/bxbase.yaml", "the config file")
 var C config.Config
 var err error
 
-//
 var dbFile = flag.String("df", "etc/db.yaml", "the db file")
 var DB config.Db
 
-//
 var logFile = flag.String("lf", "etc/logs.yaml", "the logs file")
-var logc entity.Logc
 var Middleground *middleground.Middleground
 var Compatible *compatible.Compatible
 
 func init() {
-	//初始化日志信息
-	conf.MustLoad(*logFile, &logc)
-	if len(logc.Level) > 0 {
-		for _, v := range logc.Level {
-			logx.MustSetup(logx.LogConf{
-				Mode:     logc.Mode,
-				Path:     logc.Path,
-				Level:    v,
-				KeepDays: logc.KeepDays,
-			})
-			logx.Info(v, "--日志记录")
-		}
-	}
 	//基本配置
 	conf.MustLoad(*configFile, &C)
 	//数据库配置

jyBXBase/rpc/internal/logic/newestbiddinglogic_test.go

@@ -1,124 +1,125 @@
 package logic
 
 import (
-        elastic "app.yhyue.com/moapp/jybase/esv1"
-        "app.yhyue.com/moapp/jybase/mongodb"
-        "app.yhyue.com/moapp/jybase/mysql"
-        "app.yhyue.com/moapp/jybase/redis"
-        "context"
-        "github.com/zeromicro/go-zero/core/logx"
-        "jyBXBase/entity"
-        "jyBXBase/rpc/bxbase"
-        IC "jyBXBase/rpc/init"
-        "jyBXBase/rpc/internal/config"
-        "jyBXBase/rpc/internal/svc"
-        "reflect"
-        "strings"
-        "testing"
+	"context"
+	"jyBXBase/entity"
+	"jyBXBase/rpc/bxbase"
+	IC "jyBXBase/rpc/init"
+	"jyBXBase/rpc/internal/config"
+	"jyBXBase/rpc/internal/svc"
+	"reflect"
+	"strings"
+	"testing"
+
+	elastic "app.yhyue.com/moapp/jybase/es"
+	"app.yhyue.com/moapp/jybase/mongodb"
+	"app.yhyue.com/moapp/jybase/mysql"
+	"app.yhyue.com/moapp/jybase/redis"
+	"github.com/zeromicro/go-zero/core/logx"
 )
 
 func init() {
 
-        logx.Info("--初始化 mongodb--")
-        IC.Mgo = mongodb.MongodbSim{
-	      MongodbAddr: "192.168.3.206:27080",
-	      Size:        5,
-	      DbName:      "qfw",
-        }
-        IC.Mgo.InitPool()
-        IC.DB = config.Db{Mongo: entity.Mongo{
-	      Bidding: &entity.MongoStruct{
-		    Collection:     "bidding",
-		    CollectionBack: "bidding_back",
-	      },
-        }}
-        IC.DB.Mongo.Bidding.Collection = "bidding_back"
-        //
-        logx.Info("--初始化 mongodb bidding--")
-        IC.MgoBidding = mongodb.MongodbSim{
-	      MongodbAddr: "192.168.3.206:27001",
-	      Size:        5,
-	      DbName:      "qfw_data",
-	      UserName:    "jyDevGroup",
-	      Password:    "jy@DevGroup",
-        }
-        IC.MgoBidding.InitPool()
+	logx.Info("--初始化 mongodb--")
+	IC.Mgo = mongodb.MongodbSim{
+		MongodbAddr: "192.168.3.206:27080",
+		Size:        5,
+		DbName:      "qfw",
+	}
+	IC.Mgo.InitPool()
+	IC.DB = config.Db{Mongo: entity.Mongo{
+		Bidding: &entity.MongoStruct{
+			Collection:     "bidding",
+			CollectionBack: "bidding_back",
+		},
+	}}
+	IC.DB.Mongo.Bidding.Collection = "bidding_back"
+	//
+	logx.Info("--初始化 mongodb bidding--")
+	IC.MgoBidding = mongodb.MongodbSim{
+		MongodbAddr: "192.168.3.206:27001",
+		Size:        5,
+		DbName:      "qfw_data",
+		UserName:    "jyDevGroup",
+		Password:    "jy@DevGroup",
+	}
+	IC.MgoBidding.InitPool()
 
-        logx.Info("--初始化 mysql--")
-        IC.MainMysql = &mysql.Mysql{
-	      Address:      "192.168.3.11:3366",
-	      UserName:     "root",
-	      PassWord:     "Topnet123",
-	      DBName:       "jianyu",
-	      MaxOpenConns: 5,
-	      MaxIdleConns: 5,
-        }
-        IC.MainMysql.Init()
+	logx.Info("--初始化 mysql--")
+	IC.MainMysql = &mysql.Mysql{
+		Address:      "192.168.3.11:3366",
+		UserName:     "root",
+		PassWord:     "Topnet123",
+		DBName:       "jianyu",
+		MaxOpenConns: 5,
+		MaxIdleConns: 5,
+	}
+	IC.MainMysql.Init()
 
-        //初始化 mysql-EntnichePush
-        logx.Info("--初始化 商机管理推送 mysql--")
-        IC.BaseServiceMysql = &mysql.Mysql{
-	      Address:      "192.168.3.217:4000",
-	      UserName:     "root",
-	      PassWord:     "=PDT49#80Z!RVv52_z",
-	      DBName:       "base_service",
-	      MaxOpenConns: 5,
-	      MaxIdleConns: 5,
-        }
-        IC.BaseServiceMysql.Init()
+	//初始化 mysql-EntnichePush
+	logx.Info("--初始化 商机管理推送 mysql--")
+	IC.BaseServiceMysql = &mysql.Mysql{
+		Address:      "192.168.3.217:4000",
+		UserName:     "root",
+		PassWord:     "=PDT49#80Z!RVv52_z",
+		DBName:       "base_service",
+		MaxOpenConns: 5,
+		MaxIdleConns: 5,
+	}
+	IC.BaseServiceMysql.Init()
 
-        logx.Info("--初始化 redis--")
-        redis.InitRedisBySize(strings.Join([]string{"other=192.168.3.206:1712", "push=192.168.3.206:1712", "pushcache_1=192.168.3.206:5000", "pushcache_2_a=192.168.3.206:5001", "pushcache_2_b=192.168.3.206:5002"}, ","), 100, 30, 300)
-        //初始化 elasticsearch
-        logx.Info("--初始化 elasticsearch--")
-        elastic.InitElasticSize("http://192.168.3.206:9800", 5)
+	logx.Info("--初始化 redis--")
+	redis.InitRedisBySize(strings.Join([]string{"other=192.168.3.206:1712", "push=192.168.3.206:1712", "pushcache_1=192.168.3.206:5000", "pushcache_2_a=192.168.3.206:5001", "pushcache_2_b=192.168.3.206:5002"}, ","), 100, 30, 300)
+	//初始化 elasticsearch
+	logx.Info("--初始化 elasticsearch--")
+	elastic.InitElasticSize("http://192.168.3.206:9800", 5)
 }
 
 func TestNewestBiddingLogic_NewestBidding(t *testing.T) {
-        type fields struct {
-	      ctx    context.Context
-	      svcCtx *svc.ServiceContext
-	      Logger logx.Logger
-        }
-        type args struct {
-	      in *bxbase.NewestBiddingReq
-        }
-        tests := []struct {
-	      name    string
-	      fields  fields
-	      args    args
-	      want    *bxbase.NewsetBiddingResp
-	      wantErr bool
-        }{
-	      // TODO: Add test cases.
-	      {name: "app首页数据",
-		    args: args{
-			  in: &bxbase.NewestBiddingReq{
-				City:      "",
-				IsSearch:  0,
-				UserId:    "5e8eb60ae138234b4f91aacf",
-				AppId:     "10000",
-				EntUserId: "4530",
-				NewUserId: 11111,
-				EntId:     "15232",
-			  },
-		    }},
-        }
-        for _, tt := range tests {
-	      t.Run(tt.name, func(t *testing.T) {
-		    l := &NewestBiddingLogic{
-			  ctx:    tt.fields.ctx,
-			  svcCtx: tt.fields.svcCtx,
-			  Logger: tt.fields.Logger,
-		    }
-		    got, err := l.NewestBidding(tt.args.in)
-		    if (err != nil) != tt.wantErr {
-			  t.Errorf("NewestBidding() error = %v, wantErr %v", err, tt.wantErr)
-			  return
-		    }
-		    if !reflect.DeepEqual(got, tt.want) {
-			  t.Errorf("NewestBidding() got = %v, want %v", got, tt.want)
-		    }
-	      })
-        }
+	type fields struct {
+		ctx    context.Context
+		svcCtx *svc.ServiceContext
+		Logger logx.Logger
+	}
+	type args struct {
+		in *bxbase.NewestBiddingReq
+	}
+	tests := []struct {
+		name    string
+		fields  fields
+		args    args
+		want    *bxbase.NewsetBiddingResp
+		wantErr bool
+	}{
+		// TODO: Add test cases.
+		{name: "app首页数据",
+			args: args{
+				in: &bxbase.NewestBiddingReq{
+					City:      "",
+					IsSearch:  0,
+					UserId:    "5e8eb60ae138234b4f91aacf",
+					AppId:     "10000",
+					EntUserId: "4530",
+					NewUserId: 11111,
+					EntId:     "15232",
+				},
+			}},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			l := &NewestBiddingLogic{
+				ctx:    tt.fields.ctx,
+				svcCtx: tt.fields.svcCtx,
+				Logger: tt.fields.Logger,
+			}
+			got, err := l.NewestBidding(tt.args.in)
+			if (err != nil) != tt.wantErr {
+				t.Errorf("NewestBidding() error = %v, wantErr %v", err, tt.wantErr)
+				return
+			}
+			if !reflect.DeepEqual(got, tt.want) {
+				t.Errorf("NewestBidding() got = %v, want %v", got, tt.want)
+			}
+		})
+	}
 }

jyBXBase/rpc/model/newestBidding.go

@@ -9,7 +9,7 @@ import (
 
 	MC "app.yhyue.com/moapp/jybase/common"
 	ME "app.yhyue.com/moapp/jybase/encrypt"
-	elastic "app.yhyue.com/moapp/jybase/esv1"
+	elastic "app.yhyue.com/moapp/jybase/es"
 	"app.yhyue.com/moapp/jybase/mongodb"
 	"app.yhyue.com/moapp/jybase/mysql"
 	"github.com/zeromicro/go-zero/core/logx"

jyBXBase/rpc/util/common.go

@@ -1,20 +1,21 @@
 package util
 
 import (
-	"app.yhyue.com/moapp/jybase/common"
-	"app.yhyue.com/moapp/jybase/encrypt"
-	"app.yhyue.com/moapp/jybase/esv1"
-	"app.yhyue.com/moapp/jybase/mongodb"
-	"app.yhyue.com/moapp/jybase/mysql"
-	"app.yhyue.com/moapp/jybase/redis"
 	"fmt"
-	"go.mongodb.org/mongo-driver/bson/primitive"
 	"jyBXBase/rpc/bxbase"
 	IC "jyBXBase/rpc/init"
 	"log"
 	"strconv"
 	"strings"
 	"time"
+
+	"app.yhyue.com/moapp/jybase/common"
+	"app.yhyue.com/moapp/jybase/encrypt"
+	elastic "app.yhyue.com/moapp/jybase/es"
+	"app.yhyue.com/moapp/jybase/mongodb"
+	"app.yhyue.com/moapp/jybase/mysql"
+	"app.yhyue.com/moapp/jybase/redis"
+	"go.mongodb.org/mongo-driver/bson/primitive"
 )
 
 const (

jyBXBuyer/api/bxbuyer.go

@@ -3,8 +3,10 @@ package main
 import (
 	MC "app.yhyue.com/moapp/jybase/common"
 	"app.yhyue.com/moapp/jybase/endless"
+	logrusx "app.yhyue.com/moapp/jylogx/logx"
 	"bp.jydev.jianyu360.cn/BaseService/gateway/core/node"
 	"fmt"
+	"github.com/zeromicro/go-zero/core/logx"
 	IC "jyBXBuyer/api/init"
 	"log"
 	"net/http"
@@ -44,6 +46,9 @@ func main() {
 		}
 	})
 
+	//日志记录
+	logx.SetWriter(logrusx.NewLogrusWriter())
+
 	handler.RegisterHandlers(server, ctx)
 	fmt.Printf("Starting server at %s:%d...\n", IC.C.Host, IC.C.Port)
 	server.Start()

jyBXBuyer/api/init/init.go

@@ -4,9 +4,7 @@ import (
 	MC "app.yhyue.com/moapp/jybase/common"
 	"flag"
 	"github.com/zeromicro/go-zero/core/conf"
-	"github.com/zeromicro/go-zero/core/logx"
 	"jyBXBuyer/api/internal/config"
-	"jyBXBuyer/entity"
 	"log"
 	"regexp"
 )
@@ -15,15 +13,9 @@ var configFile = flag.String("cf", "etc/bxbuyer-api.yaml", "the config file")
 
 var C config.Config
 
-//
-var logFile = flag.String("lf", "etc/logs.yaml", "the log file")
-var logc entity.Logc
-
-//
 var dbFile = flag.String("df", "etc/db.yaml", "the db file")
 var DB config.Db
 
-//
 var routesFile = flag.String("rf", "etc/routes.yaml", "the routes file")
 var Routes config.Routes
 var ExcludeUrl = []*regexp.Regexp{}
@@ -36,19 +28,6 @@ func init() {
 	conf.MustLoad(*dbFile, &DB)
 	//初始mongodb
 	MongoDBInit(&DB.Mongo)
-	//初始化日志信息
-	conf.MustLoad(*logFile, &logc)
-	if len(logc.Level) > 0 {
-		for _, v := range logc.Level {
-			logx.MustSetup(logx.LogConf{
-				Mode:     logc.Mode,
-				Path:     logc.Path,
-				Level:    v,
-				KeepDays: logc.KeepDays,
-			})
-			logx.Info(v, "--日志记录")
-		}
-	}
 	//读取路由配置
 	conf.MustLoad(*routesFile, &Routes)
 	if len(Routes.ExcludeRoute) > 0 {

jyBXBuyer/entity/db.go

@@ -41,6 +41,9 @@ type RedisStuct struct {
 
 //es
 type EsStruct struct {
-	Addr string `json:"addr"`
-	Size int    `json:"size"`
+	Addr     string `json:"addr"`
+	Size     int    `json:"size"`
+	Version  string `json:"version"`
+	UserName string `json:"userName"`
+	Password string `json:"password"`
 }

jyBXBuyer/go.mod

@@ -3,11 +3,19 @@ module jyBXBuyer
 go 1.16
 
 require (
-	app.yhyue.com/moapp/jybase v0.0.0-20220527072445-3116753a8f28
+	app.yhyue.com/moapp/jybase v0.0.0-20230420060106-a9c3f4187463
+	app.yhyue.com/moapp/jylogx v0.0.0-20230511070629-0ed867dc49d6
 	bp.jydev.jianyu360.cn/BaseService/gateway v1.3.4
-	github.com/go-sql-driver/mysql v1.6.0
-	github.com/golang/protobuf v1.5.2
-	github.com/zeromicro/go-zero v1.3.3
-	google.golang.org/grpc v1.46.0
-	google.golang.org/protobuf v1.28.0
+	github.com/go-sql-driver/mysql v1.7.0
+	github.com/golang/protobuf v1.5.3
+	github.com/zeromicro/go-zero v1.5.2
+	google.golang.org/grpc v1.54.0
+	google.golang.org/protobuf v1.30.0
+)
+
+require (
+	go.opentelemetry.io/otel/exporters/jaeger v1.15.1 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.15.1 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.15.1 // indirect
+	go.opentelemetry.io/otel/exporters/zipkin v1.15.1 // indirect
 )

jyBXBuyer/rpc/bxbuyer.go

@@ -3,7 +3,9 @@ package main
 import (
 	MC "app.yhyue.com/moapp/jybase/common"
 	"app.yhyue.com/moapp/jybase/endless"
+	logrusx "app.yhyue.com/moapp/jylogx/logx"
 	"fmt"
+	"github.com/zeromicro/go-zero/core/logx"
 	"jyBXBuyer/rpc/type/bxbuyer"
 	"log"
 
@@ -36,6 +38,8 @@ func main() {
 		}
 	})
 	defer s.Stop()
+	//日志记录
+	logx.SetWriter(logrusx.NewLogrusWriter())
 
 	fmt.Printf("Starting rpc server at %s...\n", IC.C.ListenOn)
 	s.Start()

jyBXBuyer/rpc/etc/db.yaml

@@ -12,6 +12,9 @@ redis:
 es:
     addr: http://192.168.3.206:9800
     size: 30
+    version: v7
+    userName: ""
+    password: ""
 mongo:
     main:
         dbName: qfw

jyBXBuyer/rpc/init/db.go

@@ -4,12 +4,13 @@
 package init
 
 import (
-	"github.com/zeromicro/go-zero/core/logx"
 	"strings"
 
+	"github.com/zeromicro/go-zero/core/logx"
+
 	"jyBXBuyer/entity"
 
-	"app.yhyue.com/moapp/jybase/esv1"
+	. "app.yhyue.com/moapp/jybase/es"
 	"app.yhyue.com/moapp/jybase/mongodb"
 	"app.yhyue.com/moapp/jybase/mysql"
 	"app.yhyue.com/moapp/jybase/redis"
@@ -65,6 +66,6 @@ func EsInit(es *entity.EsStruct) {
 	//初始化 elasticsearch
 	if es.Addr != "" {
 		logx.Info("--初始化 elasticsearch--")
-		elastic.InitElasticSize(es.Addr, es.Size)
+		NewEs(es.Version, es.Addr, es.Size, es.UserName, es.Password)
 	}
 }

jyBXBuyer/rpc/init/init.go

@@ -4,8 +4,6 @@ import (
 	"flag"
 	_ "github.com/go-sql-driver/mysql"
 	"github.com/zeromicro/go-zero/core/conf"
-	"github.com/zeromicro/go-zero/core/logx"
-	"jyBXBuyer/entity"
 	"jyBXBuyer/rpc/internal/config"
 )
 
@@ -13,14 +11,9 @@ var configFile = flag.String("cf", "etc/bxbuyer.yaml", "the config file")
 var C config.Config
 var err error
 
-//
 var dbFile = flag.String("df", "etc/db.yaml", "the db file")
 var DB config.Db
 
-//
-var logFile = flag.String("lf", "etc/logs.yaml", "the logs file")
-var logc entity.Logc
-
 func init() {
 	//基本配置
 	conf.MustLoad(*configFile, &C)
@@ -34,17 +27,4 @@ func init() {
 	RedisInit(&DB.Redis)
 	//初始es
 	EsInit(&DB.Es)
-	//初始化日志信息
-	conf.MustLoad(*logFile, &logc)
-	if len(logc.Level) > 0 {
-		for _, v := range logc.Level {
-			logx.MustSetup(logx.LogConf{
-				Mode:     logc.Mode,
-				Path:     logc.Path,
-				Level:    v,
-				KeepDays: logc.KeepDays,
-			})
-			logx.Info(v, "--日志记录")
-		}
-	}
 }

jyBXBuyer/rpc/model/buyerListBYEs.go

@@ -1,20 +1,19 @@
 package model
 
 import (
-	MC "app.yhyue.com/moapp/jybase/common"
-	"app.yhyue.com/moapp/jybase/encrypt"
-	"app.yhyue.com/moapp/jybase/esv1"
 	"encoding/json"
 	"fmt"
-	"github.com/zeromicro/go-zero/core/logx"
 	IC "jyBXBuyer/rpc/init"
 	"jyBXBuyer/rpc/type/bxbuyer"
-	"log"
-	"runtime"
 	"strconv"
 	"strings"
 	"sync"
 	"time"
+
+	MC "app.yhyue.com/moapp/jybase/common"
+	"app.yhyue.com/moapp/jybase/encrypt"
+	elastic "app.yhyue.com/moapp/jybase/es"
+	"github.com/zeromicro/go-zero/core/logx"
 )
 
 type BScope struct {
@@ -229,36 +228,8 @@ func GetBuyerList(qstr string, in *bxbuyer.BuyerListReq, isCache bool) (resp *bx
 }
 
 //聚合查询
-func GetAggs(index, itype, query string) (aggs map[string]*json.RawMessage) {
-	//count = elastic.Count(index, itype, query)
-	defer MC.Catch()
-	client := elastic.GetEsConn()
-	defer func() {
-		go elastic.DestoryEsConn(client)
-	}()
-	if client != nil {
-		defer func() {
-			if r := recover(); r != nil {
-				for skip := 1; ; skip++ {
-					_, file, line, ok := runtime.Caller(skip)
-					if !ok {
-						break
-					}
-					go log.Printf("%v,%v\n", file, line)
-				}
-			}
-		}()
-		searchResult, err := client.Search().Index(index).Type(itype).Source(query).Do()
-		if searchResult.TimedOut {
-			//请求超时
-			log.Println(err, "____________:::", searchResult.TimedOut)
-			return
-		}
-		if err != nil {
-			log.Println("从ES查询出错", err.Error())
-		}
-		aggs = searchResult.Aggregations
-	}
+func GetAggs(index, itype, query string) (aggs map[string]json.RawMessage) {
+	aggs, _, _ = elastic.GetAggs(index, itype, query)
 	return
 }
 

jyBXCore/api/bxcore.go

@@ -3,8 +3,10 @@ package main
 import (
 	MC "app.yhyue.com/moapp/jybase/common"
 	"app.yhyue.com/moapp/jybase/endless"
+	logrusx "app.yhyue.com/moapp/jylogx/logx"
 	"bp.jydev.jianyu360.cn/BaseService/gateway/core/node"
 	"fmt"
+	"github.com/zeromicro/go-zero/core/logx"
 	IC "jyBXCore/api/init"
 	"jyBXCore/api/internal/handler"
 	"jyBXCore/api/internal/svc"
@@ -42,6 +44,8 @@ func main() {
 			next.ServeHTTP(w, r)
 		}
 	})
+	//日志记录
+	logx.SetWriter(logrusx.NewLogrusWriter())
 
 	handler.RegisterHandlers(server, ctx)
 	fmt.Printf("Starting server at %s:%d...\n", IC.C.Host, IC.C.Port)

jyBXCore/api/init/init.go

@@ -4,9 +4,7 @@ import (
 	MC "app.yhyue.com/moapp/jybase/common"
 	"flag"
 	"github.com/zeromicro/go-zero/core/conf"
-	"github.com/zeromicro/go-zero/core/logx"
 	"jyBXCore/api/internal/config"
-	"jyBXCore/entity"
 	"log"
 	"regexp"
 )
@@ -15,15 +13,9 @@ var configFile = flag.String("cf", "etc/bxcore-api.yaml", "the config file")
 
 var C config.Config
 
-//
-var logFile = flag.String("lf", "etc/logs.yaml", "the log file")
-var logc entity.Logc
-
-//
 var dbFile = flag.String("df", "etc/db.yaml", "the db file")
 var DB config.Db
 
-//
 var routesFile = flag.String("rf", "etc/routes.yaml", "the routes file")
 var Routes config.Routes
 var ExcludeUrl = []*regexp.Regexp{}
@@ -36,19 +28,6 @@ func init() {
 	conf.MustLoad(*dbFile, &DB)
 	//初始mongodb
 	MongoDBInit(&DB.Mongo)
-	//初始化日志信息
-	conf.MustLoad(*logFile, &logc)
-	if len(logc.Level) > 0 {
-		for _, v := range logc.Level {
-			logx.MustSetup(logx.LogConf{
-				Mode:     logc.Mode,
-				Path:     logc.Path,
-				Level:    v,
-				KeepDays: logc.KeepDays,
-			})
-			logx.Info(v, "--日志记录")
-		}
-	}
 	//读取路由配置
 	conf.MustLoad(*routesFile, &Routes)
 	if len(Routes.ExcludeRoute) > 0 {

jyBXCore/entity/db.go

@@ -41,6 +41,9 @@ type RedisStuct struct {
 
 //es
 type EsStruct struct {
-	Addr string `json:"addr"`
-	Size int    `json:"size"`
+	Addr     string `json:"addr"`
+	Size     int    `json:"size"`
+	Version  string `json:"version"`
+	UserName string `json:"userName"`
+	Password string `json:"password"`
 }

jyBXCore/go.mod

@@ -3,118 +3,129 @@ module jyBXCore
 go 1.18
 
 require (
-	app.yhyue.com/moapp/jybase v0.0.0-20230117032034-ad7c00ffe11a
-	app.yhyue.com/moapp/jypkg v0.0.0-20230313120532-c305dbfd6a62
+	app.yhyue.com/moapp/jybase v0.0.0-20230509102020-7c97492d5b78
+	app.yhyue.com/moapp/jylogx v0.0.0-20230511070629-0ed867dc49d6
 	bp.jydev.jianyu360.cn/BaseService/gateway v1.3.4
 	bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20230222052351-9d6fad062447
 	github.com/go-sql-driver/mysql v1.7.0
-	github.com/zeromicro/go-zero v1.4.4
-	google.golang.org/grpc v1.53.0
-	google.golang.org/protobuf v1.28.1
+	github.com/zeromicro/go-zero v1.5.2
+	google.golang.org/grpc v1.54.0
+	google.golang.org/protobuf v1.30.0
 )
 
 require (
 	app.yhyue.com/moapp/esv1 v0.0.0-20220414031211-3da4123e648d // indirect
-	app.yhyue.com/moapp/jyMarketing v0.0.2-0.20230304035551-21bb1eedf547 // indirect
-	app.yhyue.com/moapp/message v0.0.0-20221223100203-6402e389d9ae // indirect
-	bp.jydev.jianyu360.cn/BaseService/entManageApplication v0.0.0-20230214091519-89a98c01ab0e // indirect
-	bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.0.7 // indirect
-	bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.13 // indirect
+	app.yhyue.com/moapp/jylog v0.0.0-20230511065424-895d5b2cedfd // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/cenkalti/backoff/v4 v4.1.3 // indirect
+	github.com/cenkalti/backoff/v4 v4.2.1 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
-	github.com/coreos/go-semver v0.3.0 // indirect
-	github.com/coreos/go-systemd/v22 v22.3.2 // indirect
+	github.com/coreos/go-semver v0.3.1 // indirect
+	github.com/coreos/go-systemd/v22 v22.5.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/dchest/captcha v0.0.0-20200903113550-03f5f0333e1f // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
-	github.com/fatih/color v1.13.0 // indirect
+	github.com/emicklei/go-restful/v3 v3.9.0 // indirect
+	github.com/fatih/color v1.15.0 // indirect
 	github.com/felixge/fgprof v0.9.3 // indirect
+	github.com/fsnotify/fsnotify v1.6.0 // indirect
 	github.com/garyburd/redigo v1.6.2 // indirect
-	github.com/go-logr/logr v1.2.3 // indirect
+	github.com/go-logr/logr v1.2.4 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
+	github.com/go-openapi/jsonpointer v0.19.6 // indirect
+	github.com/go-openapi/jsonreference v0.20.1 // indirect
+	github.com/go-openapi/swag v0.22.3 // indirect
 	github.com/go-redis/redis/v8 v8.11.5 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/golang-jwt/jwt/v4 v4.4.3 // indirect
+	github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
 	github.com/golang/mock v1.6.0 // indirect
-	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
 	github.com/gomodule/redigo v2.0.0+incompatible // indirect
+	github.com/google/gnostic v0.5.7-v3refs // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/google/pprof v0.0.0-20211214055906-6f57359322fd // indirect
 	github.com/google/uuid v1.3.0 // indirect
-	github.com/googleapis/gnostic v0.5.5 // indirect
-	github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.15.0 // indirect
+	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.1 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/klauspost/compress v1.13.6 // indirect
+	github.com/klauspost/compress v1.15.15 // indirect
+	github.com/magiconair/properties v1.8.7 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
-	github.com/mattn/go-colorable v0.1.9 // indirect
-	github.com/mattn/go-isatty v0.0.14 // indirect
-	github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
+	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/mattn/go-isatty v0.0.17 // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
+	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe // indirect
-	github.com/nsqio/go-nsq v1.1.0 // indirect
+	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/olivere/elastic v6.2.37+incompatible // indirect
 	github.com/olivere/elastic/v7 v7.0.22 // indirect
-	github.com/openzipkin/zipkin-go v0.4.0 // indirect
-	github.com/pelletier/go-toml/v2 v2.0.6 // indirect
+	github.com/openzipkin/zipkin-go v0.4.1 // indirect
+	github.com/pelletier/go-toml/v2 v2.0.7 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
-	github.com/prometheus/client_golang v1.13.0 // indirect
-	github.com/prometheus/client_model v0.2.0 // indirect
-	github.com/prometheus/common v0.37.0 // indirect
-	github.com/prometheus/procfs v0.8.0 // indirect
+	github.com/prometheus/client_golang v1.15.0 // indirect
+	github.com/prometheus/client_model v0.3.0 // indirect
+	github.com/prometheus/common v0.42.0 // indirect
+	github.com/prometheus/procfs v0.9.0 // indirect
+	github.com/sirupsen/logrus v1.9.0 // indirect
 	github.com/spaolacci/murmur3 v1.1.0 // indirect
-	github.com/tealeg/xlsx v1.0.5 // indirect
-	github.com/thinxer/go-word2vec v0.0.0-20150917053916-5c19ec7379ed // indirect
+	github.com/spf13/afero v1.9.3 // indirect
+	github.com/spf13/cast v1.5.0 // indirect
+	github.com/spf13/jwalterweatherman v1.1.0 // indirect
+	github.com/spf13/pflag v1.0.5 // indirect
+	github.com/spf13/viper v1.15.0 // indirect
+	github.com/subosito/gotenv v1.4.2 // indirect
 	github.com/xdg-go/pbkdf2 v1.0.0 // indirect
 	github.com/xdg-go/scram v1.1.1 // indirect
 	github.com/xdg-go/stringprep v1.0.3 // indirect
 	github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect
-	github.com/ziutek/blas v0.0.0-20190227122918-da4ca23e90bb // indirect
-	go.etcd.io/etcd/api/v3 v3.5.5 // indirect
-	go.etcd.io/etcd/client/pkg/v3 v3.5.5 // indirect
-	go.etcd.io/etcd/client/v3 v3.5.5 // indirect
-	go.mongodb.org/mongo-driver v1.11.1 // indirect
-	go.opentelemetry.io/otel v1.11.0 // indirect
-	go.opentelemetry.io/otel/exporters/jaeger v1.11.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.11.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.11.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.11.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.10.0 // indirect
-	go.opentelemetry.io/otel/exporters/zipkin v1.11.0 // indirect
-	go.opentelemetry.io/otel/sdk v1.11.0 // indirect
-	go.opentelemetry.io/otel/trace v1.11.0 // indirect
+	go.etcd.io/etcd/api/v3 v3.5.8 // indirect
+	go.etcd.io/etcd/client/pkg/v3 v3.5.8 // indirect
+	go.etcd.io/etcd/client/v3 v3.5.8 // indirect
+	go.mongodb.org/mongo-driver v1.11.4 // indirect
+	go.opentelemetry.io/otel v1.15.1 // indirect
+	go.opentelemetry.io/otel/exporters/jaeger v1.15.1 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.15.1 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.15.1 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.15.1 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.15.1 // indirect
+	go.opentelemetry.io/otel/exporters/zipkin v1.15.1 // indirect
+	go.opentelemetry.io/otel/sdk v1.15.1 // indirect
+	go.opentelemetry.io/otel/trace v1.15.1 // indirect
 	go.opentelemetry.io/proto/otlp v0.19.0 // indirect
-	go.uber.org/atomic v1.9.0 // indirect
-	go.uber.org/automaxprocs v1.5.1 // indirect
-	go.uber.org/multierr v1.8.0 // indirect
-	go.uber.org/zap v1.21.0 // indirect
-	golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d // indirect
-	golang.org/x/net v0.5.0 // indirect
-	golang.org/x/oauth2 v0.4.0 // indirect
+	go.uber.org/atomic v1.10.0 // indirect
+	go.uber.org/automaxprocs v1.5.2 // indirect
+	go.uber.org/multierr v1.9.0 // indirect
+	go.uber.org/zap v1.24.0 // indirect
+	golang.org/x/crypto v0.6.0 // indirect
+	golang.org/x/net v0.9.0 // indirect
+	golang.org/x/oauth2 v0.5.0 // indirect
 	golang.org/x/sync v0.1.0 // indirect
-	golang.org/x/sys v0.4.0 // indirect
-	golang.org/x/term v0.4.0 // indirect
-	golang.org/x/text v0.6.0 // indirect
+	golang.org/x/sys v0.7.0 // indirect
+	golang.org/x/term v0.7.0 // indirect
+	golang.org/x/text v0.9.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // indirect
-	gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
+	google.golang.org/genproto v0.0.0-20230123190316-2c411cf9d197 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
+	gopkg.in/ini.v1 v1.67.0 // indirect
+	gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	gorm.io/driver/mysql v1.0.5 // indirect
 	gorm.io/gorm v1.21.3 // indirect
-	k8s.io/api v0.22.9 // indirect
-	k8s.io/apimachinery v0.22.9 // indirect
-	k8s.io/client-go v0.22.9 // indirect
-	k8s.io/klog/v2 v2.80.1 // indirect
-	k8s.io/utils v0.0.0-20221108210102-8e77b1f39fe2 // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
-	sigs.k8s.io/yaml v1.2.0 // indirect
+	k8s.io/api v0.26.3 // indirect
+	k8s.io/apimachinery v0.27.0-alpha.3 // indirect
+	k8s.io/client-go v0.26.3 // indirect
+	k8s.io/klog/v2 v2.90.1 // indirect
+	k8s.io/kube-openapi v0.0.0-20230307230338-69ee2d25a840 // indirect
+	k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
+	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
+	sigs.k8s.io/yaml v1.3.0 // indirect
 )

jyBXCore/rpc/bxcore.go

@@ -3,7 +3,9 @@ package main
 import (
 	MC "app.yhyue.com/moapp/jybase/common"
 	"app.yhyue.com/moapp/jybase/endless"
+	logrusx "app.yhyue.com/moapp/jylogx/logx"
 	"fmt"
+	"github.com/zeromicro/go-zero/core/logx"
 	"jyBXCore/rpc/type/bxcore"
 	"jyBXCore/rpc/util"
 	"log"
@@ -39,9 +41,9 @@ func main() {
 			reflection.Register(grpcServer)
 		}
 	})
-	//日志记录
-	//s.AddUnaryInterceptors(util.CustomInterceptors)
 	defer s.Stop()
+	//日志记录
+	logx.SetWriter(logrusx.NewLogrusWriter())
 
 	fmt.Printf("Starting rpc server at %s...\n", IC.C.ListenOn)
 	s.Start()

jyBXCore/rpc/etc/db.yaml

@@ -13,6 +13,9 @@ redis:
 es:
     addr: http://192.168.3.206:9800
     size: 50
+    version: v7
+    userName: ""
+    password: ""
 mongo:
     main:
         dbName: qfw

jyBXCore/rpc/init/db.go

@@ -4,12 +4,13 @@
 package init
 
 import (
-	"github.com/zeromicro/go-zero/core/logx"
 	"strings"
 
+	"github.com/zeromicro/go-zero/core/logx"
+
 	"jyBXCore/entity"
 
-	"app.yhyue.com/moapp/jybase/esv1"
+	. "app.yhyue.com/moapp/jybase/es"
 	"app.yhyue.com/moapp/jybase/mongodb"
 	"app.yhyue.com/moapp/jybase/mysql"
 	"app.yhyue.com/moapp/jybase/redis"
@@ -78,6 +79,6 @@ func EsInit(es *entity.EsStruct) {
 	//初始化 elasticsearch
 	if es.Addr != "" {
 		logx.Info("--初始化 elasticsearch--")
-		elastic.InitElasticSize(es.Addr, es.Size)
+		NewEs(es.Version, es.Addr, es.Size, es.UserName, es.Password)
 	}
 }

jyBXCore/rpc/init/init.go

@@ -7,7 +7,6 @@ import (
 	_ "github.com/go-sql-driver/mysql"
 	"github.com/zeromicro/go-zero/core/conf"
 	"github.com/zeromicro/go-zero/core/discov"
-	"github.com/zeromicro/go-zero/core/logx"
 	"github.com/zeromicro/go-zero/zrpc"
 	"jyBXCore/entity"
 	"jyBXCore/rpc/internal/config"
@@ -20,9 +19,6 @@ var err error
 var dbFile = flag.String("df", "etc/db.yaml", "the db file")
 var DB config.Db
 
-var logFile = flag.String("lf", "etc/logs.yaml", "the logs file")
-var logc entity.Logc
-
 // 全文或附件搜索限制
 var SearchLimitKey = "jy_limitSearchText_new"
 var SearchLimitFlag = "jy_limitSearchText_%s"
@@ -40,19 +36,7 @@ func init() {
 	RedisInit(&DB.Redis)
 	//初始es
 	EsInit(&DB.Es)
-	//初始化日志信息
-	conf.MustLoad(*logFile, &logc)
-	if len(logc.Level) > 0 {
-		for _, v := range logc.Level {
-			logx.MustSetup(logx.LogConf{
-				Mode:     logc.Mode,
-				Path:     logc.Path,
-				Level:    v,
-				KeepDays: logc.KeepDays,
-			})
-			logx.Info(v, "--日志记录")
-		}
-	}
+
 	//初始化标签
 	LabelInit()
 	//

jyBXCore/rpc/model/es/es.go

@@ -1,11 +1,12 @@
 package es
 
 import (
-	elastic "app.yhyue.com/moapp/jybase/esv1"
 	"fmt"
-	"github.com/zeromicro/go-zero/core/logx"
 	"strconv"
 	"strings"
+
+	elastic "app.yhyue.com/moapp/jybase/es"
+	"github.com/zeromicro/go-zero/core/logx"
 )
 
 const (
@@ -15,8 +16,8 @@ const (
 	queryBoolShould         = `{"bool":{"should":[%s],"minimum_should_match": 1}}`
 	queryBoolMustBoolShould = `{"bool":{"must":[{"range":{"bidamount":{%s}}}]}},{"bool":{"must":[{"range":{"budget":{%s}}}],"must_not":[{"range":{"bidamount":{"gte":-1}}}]}}`
 	queryBoolMust           = `{"bool":{"must":[{"terms":{"s_subscopeclass":[%s]}}]}}`
-	queryBoolMustTerm       = `{"bool": {"must": [{ "term": {"isValidFile": %d }}]}}`
-	queryMissing            = `{"constant_score":{"filter":{"missing":{"field":"%s"}}}}`
+	queryBoolMustTerm       = `{"bool": {"must": [{ "term": {"isValidFile": %t }}]}}`
+	queryExists             = `{"constant_score":{"filter":{"exists":{"field":"%s"}}}}`
 	gte                     = `"gte": %s`
 	lte                     = `"lte": %s`
 	HighlightStr            = `"%s": {"fragment_size": %d,"number_of_fragments": 1}`
@@ -78,7 +79,7 @@ func (e *SearchByES) GetAllByNgramWithCount() (int64, *[]map[string]interface{})
 			queryStr = queryStr[:len(queryStr)-1] + `,"from":` + strconv.Itoa(e.Start) + `,"size":` + strconv.Itoa(e.Limit) + "}"
 		}
 		logx.Info("queryStr:", queryStr)
-		return elastic.GetWithCount(e.Index, e.IType, queryStr)
+		return elastic.GetWithCount(e.Index, e.IType, e.Query, queryStr)
 	} else {
 		return 0, nil
 	}

jyBXCore/rpc/model/es/search.go

@@ -1,15 +1,16 @@
 package es
 
 import (
-	MC "app.yhyue.com/moapp/jybase/common"
-	elastic "app.yhyue.com/moapp/jybase/esv1"
 	"fmt"
-	"github.com/zeromicro/go-zero/core/logx"
 	"jyBXCore/rpc/bxcore"
 	IC "jyBXCore/rpc/init"
 	"strconv"
 	"strings"
 	"time"
+
+	MC "app.yhyue.com/moapp/jybase/common"
+	elastic "app.yhyue.com/moapp/jybase/es"
+	"github.com/zeromicro/go-zero/core/logx"
 )
 
 // GetSearchQuery  整理关键词等查询条件
@@ -173,28 +174,27 @@ func GetSearchQuery(in *bxcore.SearchReq, mustQuery string) (qstr string) {
 	hasBuyerTel := in.BuyerTel
 	if hasBuyerTel != "" {
 		if hasBuyerTel == "y" {
-			mustNot = append(mustNot, fmt.Sprintf(queryMissing, "buyertel"))
+			musts = append(musts, fmt.Sprintf(queryExists, "buyertel"))
 		} else {
-			musts = append(musts, fmt.Sprintf(queryMissing, "buyertel"))
+			mustNot = append(mustNot, fmt.Sprintf(queryExists, "buyertel"))
 		}
 	}
 	//中标企业联系方式
 	hasWinnerTel := in.WinnerTel
 	if hasWinnerTel != "" {
 		if hasWinnerTel == "y" {
-			mustNot = append(mustNot, fmt.Sprintf(queryMissing, "winnertel"))
+			musts = append(musts, fmt.Sprintf(queryExists, "winnertel"))
 		} else {
-			musts = append(musts, fmt.Sprintf(queryMissing, "winnertel"))
+			mustNot = append(mustNot, fmt.Sprintf(queryExists, "winnertel"))
 		}
 	}
 	//附件
 	fileExists := in.FileExists
 	if !isFileSearch && fileExists != "" {
 		if fileExists == "1" { //有附件
-			mustNot = append(mustNot, fmt.Sprintf(queryMissing, "isValidFile"))
-			musts = append(musts, fmt.Sprintf(queryBoolMustTerm, 1))
+			musts = append(musts, fmt.Sprintf(queryBoolMustTerm, true))
 		} else if fileExists == "-1" { //无附件
-			musts = append(musts, fmt.Sprintf(queryMissing, "isValidFile"))
+			mustNot = append(mustNot, fmt.Sprintf(queryBoolMustTerm, true))
 		}
 	}
 	// 如果是领域化数据则需要加标签

jyBXCore/rpc/util/search.go

@@ -1,24 +1,19 @@
 package util
 
 import (
-	MC "app.yhyue.com/moapp/jybase/common"
-	ME "app.yhyue.com/moapp/jybase/encrypt"
-	"crypto/rand"
-	"encoding/json"
 	"fmt"
-	"github.com/zeromicro/go-zero/core/logx"
-	"io/ioutil"
 	IC "jyBXCore/rpc/init"
 	"jyBXCore/rpc/internal/config"
 	"jyBXCore/rpc/type/bxcore"
-	"math/big"
-	"net/http"
-	"net/url"
 	"regexp"
 	"strconv"
 	"strings"
 	"time"
-	"unicode"
+
+	MC "app.yhyue.com/moapp/jybase/common"
+	ME "app.yhyue.com/moapp/jybase/encrypt"
+	"app.yhyue.com/moapp/jybase/es"
+	"github.com/zeromicro/go-zero/core/logx"
 )
 
 var (
@@ -102,62 +97,7 @@ func InterceptSearchKW(word string, keywordsLimit int, isFilter bool) (bWord, aW
 }
 
 func HttpEs(ques, analyzer, esAddress string) (res string) {
-	var adders []string
-	curl := ""
-	for _, s := range strings.Split(esAddress, ",") {
-		adders = append(adders, s)
-	}
-	i, _ := rand.Int(rand.Reader, big.NewInt(int64(len(adders)))) //随机
-	curl = adders[int(i.Int64())] + "/bidding/_analyze"
-	URL, _ := url.Parse(curl)
-	Q := URL.Query()
-	Q.Add("text", ques)
-	Q.Add("analyzer", analyzer)
-	URL.RawQuery = Q.Encode()
-	resp, err := http.Get(URL.String())
-	if err != nil {
-		logx.Info("es连接失败 err1:", err)
-		resp, err = getESResp(ques, analyzer, adders)
-		if err != nil {
-			return
-		}
-	}
-	result, err1 := ioutil.ReadAll(resp.Body)
-	if err1 == nil {
-		defer resp.Body.Close()
-		var resMap map[string]interface{}
-		json.Unmarshal(result, &resMap)
-		if resMap != nil && resMap["tokens"] != nil {
-			tokens := MC.ObjArrToMapArr(resMap["tokens"].([]interface{}))
-			for _, v := range tokens {
-				token := MC.ObjToString(v["token"])
-				if len([]rune(token)) == 1 && !unicode.Is(unicode.Scripts["Han"], []rune(token)[0]) { //(P260保留单个汉字)
-					continue
-				}
-				if res != "" && token != "" {
-					res += IC.C.JYKeyMark
-				}
-				res += token
-			}
-		}
-	}
-	return
-}
-
-func getESResp(ques, analyzer string, adds []string) (resp *http.Response, err error) {
-	for _, v := range adds {
-		curl := v + "/bidding/_analyze"
-		URL, _ := url.Parse(curl)
-		Q := URL.Query()
-		Q.Add("text", ques)
-		Q.Add("analyzer", analyzer)
-		URL.RawQuery = Q.Encode()
-		resp, err = http.Get(URL.String())
-		if err == nil {
-			break
-		}
-	}
-	return resp, err
+	return strings.ReplaceAll(es.Analyze(ques, "bidding", analyzer), "+", IC.C.JYKeyMark)
 }
 
 const (

jyBXSubscribe/api/bxsubscribe.go

@@ -1,25 +1,26 @@
 package main
 
 import (
-        "app.yhyue.com/moapp/jybase/endless"
-        "bp.jydev.jianyu360.cn/BaseService/gateway/core/node"
-        "fmt"
-        "log"
-        "net/http"
-        "os"
-        "os/signal"
-        "syscall"
+	"app.yhyue.com/moapp/jybase/endless"
+	logrusx "app.yhyue.com/moapp/jylogx/logx"
+	"bp.jydev.jianyu360.cn/BaseService/gateway/core/node"
+	"fmt"
+	"github.com/zeromicro/go-zero/core/logx"
+	"jyBXSubscribe/api/internal/handler"
+	"jyBXSubscribe/api/internal/svc"
+	"log"
+	"net/http"
+	"os"
+	"os/signal"
+	"syscall"
 
-        "jyBXSubscribe/api/internal/handler"
-        "jyBXSubscribe/api/internal/svc"
-
-        MC "app.yhyue.com/moapp/jybase/common"
-        "github.com/zeromicro/go-zero/rest"
-        IC "jyBXSubscribe/api/init"
+	MC "app.yhyue.com/moapp/jybase/common"
+	"github.com/zeromicro/go-zero/rest"
+	IC "jyBXSubscribe/api/init"
 )
 
 func main() {
-        //注册代理服务
+	//注册代理服务
 	closeNotify, err := node.NewNode(IC.C.Gateway.Etcd...).Register(IC.C.Gateway.ServerCode, MC.InterfaceToStr(IC.C.Port))
 	if err != nil {
 		panic(err)
@@ -45,7 +46,8 @@ func main() {
 		}
 	})
 	handler.RegisterHandlers(server, ctx)
-
+	//日志记录
+	logx.SetWriter(logrusx.NewLogrusWriter())
 	fmt.Printf("Starting server at %s:%d...\n", IC.C.Host, IC.C.Port)
 	server.Start()
 

jyBXSubscribe/api/init/init.go

@@ -9,22 +9,18 @@ import (
 
 	MC "app.yhyue.com/moapp/jybase/common"
 	"github.com/zeromicro/go-zero/core/conf"
-	"github.com/zeromicro/go-zero/core/logx"
 )
 
 var configFile = flag.String("cf", "etc/bxsubscribe-api.yaml", "the config file")
 
 var C config.Config
 
-//
 var logFile = flag.String("lf", "etc/logs.yaml", "the log file")
 var logc entity.Logc
 
-//
 var dbFile = flag.String("df", "etc/db.yaml", "the db file")
 var DB config.Db
 
-//
 var routesFile = flag.String("rf", "etc/routes.yaml", "the routes file")
 var Routes config.Routes
 var ExcludeUrl = []*regexp.Regexp{}
@@ -38,17 +34,6 @@ func init() {
 	MongoDBInit(&DB.Mongo)
 	//初始化日志信息
 	conf.MustLoad(*logFile, &logc)
-	if len(logc.Level) > 0 {
-		for _, v := range logc.Level {
-			logx.MustSetup(logx.LogConf{
-				Mode:     logc.Mode,
-				Path:     logc.Path,
-				Level:    v,
-				KeepDays: logc.KeepDays,
-			})
-			logx.Info(v, "--日志记录")
-		}
-	}
 	//读取路由配置
 	conf.MustLoad(*routesFile, &Routes)
 	if len(Routes.ExcludeRoute) > 0 {

jyBXSubscribe/entity/db.go

@@ -43,6 +43,9 @@ type RedisStuct struct {
 
 //es
 type EsStruct struct {
-	Addr string `json:"addr"`
-	Size int    `json:"size"`
+	Addr     string `json:"addr"`
+	Size     int    `json:"size"`
+	Version  string `json:"version"`
+	UserName string `json:"userName"`
+	Password string `json:"password"`
 }

jyBXSubscribe/go.mod

@@ -3,119 +3,160 @@ module jyBXSubscribe
 go 1.18
 
 require (
+<<<<<<< HEAD
 	app.yhyue.com/moapp/jybase v0.0.0-20230504094413-7eab0c56bca0
 	app.yhyue.com/moapp/jypkg v0.0.0-20230218064127-1de4f4f3e6a3
 	bp.jydev.jianyu360.cn/BaseService/gateway v1.3.4
 	bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20230207054315-b05f3dd4c4d3
+=======
+	app.yhyue.com/moapp/jybase v0.0.0-20230420060106-a9c3f4187463
+	app.yhyue.com/moapp/jylogx v0.0.0-20230511070629-0ed867dc49d6
+	app.yhyue.com/moapp/jypkg v0.0.0-20230420060744-ff53e7ca6f47
+	bp.jydev.jianyu360.cn/BaseService/gateway v1.3.4
+	bp.jydev.jianyu360.cn/BaseService/jyCodeService v0.0.0-20220927093612-72958b15cdf0
+	bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20230222052351-9d6fad062447
+>>>>>>> feature/v1.1.18
 	github.com/go-sql-driver/mysql v1.7.0
 	github.com/gogf/gf/v2 v2.0.6
-	github.com/zeromicro/go-zero v1.4.4
-	go.mongodb.org/mongo-driver v1.11.1
-	google.golang.org/grpc v1.51.0
-	google.golang.org/protobuf v1.28.1
+	github.com/zeromicro/go-zero v1.5.2
+	go.mongodb.org/mongo-driver v1.11.4
+	google.golang.org/grpc v1.54.0
+	google.golang.org/protobuf v1.30.0
 )
 
 require (
 	app.yhyue.com/moapp/esv1 v0.0.0-20220414031211-3da4123e648d // indirect
+<<<<<<< HEAD
 	bp.jydev.jianyu360.cn/BaseService/entManageApplication v0.0.0-20230209051900-1e7dcb8f83b7 // indirect
+=======
+	app.yhyue.com/moapp/jyMarketing v0.0.2-0.20230304035551-21bb1eedf547 // indirect
+	app.yhyue.com/moapp/jylog v0.0.0-20230511065424-895d5b2cedfd // indirect
+	bp.jydev.jianyu360.cn/BaseService/entManageApplication v0.0.0-20230214091519-89a98c01ab0e // indirect
+>>>>>>> feature/v1.1.18
 	bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.0.7 // indirect
-	bp.jydev.jianyu360.cn/BaseService/userCenter v0.0.0-20230129060002-f69424aa14ba // indirect
+	bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.13 // indirect
 	github.com/BurntSushi/toml v0.4.1 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/cenkalti/backoff/v4 v4.1.3 // indirect
-	github.com/cespare/xxhash/v2 v2.1.2 // indirect
+	github.com/cenkalti/backoff/v4 v4.2.1 // indirect
+	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/clbanning/mxj/v2 v2.5.5 // indirect
-	github.com/coreos/go-semver v0.3.0 // indirect
-	github.com/coreos/go-systemd/v22 v22.3.2 // indirect
+	github.com/coreos/go-semver v0.3.1 // indirect
+	github.com/coreos/go-systemd/v22 v22.5.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/dchest/captcha v0.0.0-20200903113550-03f5f0333e1f // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
-	github.com/fatih/color v1.13.0 // indirect
+	github.com/emicklei/go-restful/v3 v3.9.0 // indirect
+	github.com/fatih/color v1.15.0 // indirect
 	github.com/felixge/fgprof v0.9.3 // indirect
-	github.com/fsnotify/fsnotify v1.5.1 // indirect
+	github.com/fsnotify/fsnotify v1.6.0 // indirect
 	github.com/garyburd/redigo v1.6.2 // indirect
-	github.com/go-logr/logr v1.2.3 // indirect
+	github.com/go-logr/logr v1.2.4 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
+	github.com/go-openapi/jsonpointer v0.19.6 // indirect
+	github.com/go-openapi/jsonreference v0.20.1 // indirect
+	github.com/go-openapi/swag v0.22.3 // indirect
 	github.com/go-redis/redis/v8 v8.11.5 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/golang-jwt/jwt/v4 v4.4.3 // indirect
+	github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
 	github.com/golang/mock v1.6.0 // indirect
-	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
-	github.com/gomodule/redigo v1.8.9 // indirect
+	github.com/gomodule/redigo v2.0.0+incompatible // indirect
+	github.com/google/gnostic v0.5.7-v3refs // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/google/pprof v0.0.0-20211214055906-6f57359322fd // indirect
 	github.com/google/uuid v1.3.0 // indirect
-	github.com/googleapis/gnostic v0.5.5 // indirect
 	github.com/gorilla/websocket v1.5.0 // indirect
 	github.com/grokify/html-strip-tags-go v0.0.1 // indirect
-	github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.15.0 // indirect
+	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.1 // indirect
+	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
+<<<<<<< HEAD
 	github.com/klauspost/compress v1.13.6 // indirect
 	github.com/kr/pretty v0.3.0 // indirect
+=======
+	github.com/klauspost/compress v1.15.15 // indirect
+>>>>>>> feature/v1.1.18
 	github.com/longbridgeapp/sqlparser v0.3.1 // indirect
+	github.com/magiconair/properties v1.8.7 // indirect
+	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
-	github.com/mattn/go-isatty v0.0.16 // indirect
+	github.com/mattn/go-isatty v0.0.17 // indirect
 	github.com/mattn/go-runewidth v0.0.13 // indirect
-	github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
+	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe // indirect
+	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/olekukonko/tablewriter v0.0.5 // indirect
 	github.com/olivere/elastic v6.2.37+incompatible // indirect
-	github.com/openzipkin/zipkin-go v0.4.0 // indirect
-	github.com/pelletier/go-toml/v2 v2.0.6 // indirect
+	github.com/olivere/elastic/v7 v7.0.22 // indirect
+	github.com/openzipkin/zipkin-go v0.4.1 // indirect
+	github.com/pelletier/go-toml/v2 v2.0.7 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
-	github.com/prometheus/client_golang v1.13.0 // indirect
-	github.com/prometheus/client_model v0.2.0 // indirect
-	github.com/prometheus/common v0.37.0 // indirect
-	github.com/prometheus/procfs v0.8.0 // indirect
+	github.com/prometheus/client_golang v1.15.0 // indirect
+	github.com/prometheus/client_model v0.3.0 // indirect
+	github.com/prometheus/common v0.42.0 // indirect
+	github.com/prometheus/procfs v0.9.0 // indirect
 	github.com/rivo/uniseg v0.2.0 // indirect
+	github.com/sirupsen/logrus v1.9.0 // indirect
 	github.com/spaolacci/murmur3 v1.1.0 // indirect
+	github.com/spf13/afero v1.9.3 // indirect
+	github.com/spf13/cast v1.5.0 // indirect
+	github.com/spf13/jwalterweatherman v1.1.0 // indirect
+	github.com/spf13/pflag v1.0.5 // indirect
+	github.com/spf13/viper v1.15.0 // indirect
+	github.com/subosito/gotenv v1.4.2 // indirect
 	github.com/xdg-go/pbkdf2 v1.0.0 // indirect
 	github.com/xdg-go/scram v1.1.1 // indirect
 	github.com/xdg-go/stringprep v1.0.3 // indirect
 	github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect
-	go.etcd.io/etcd/api/v3 v3.5.5 // indirect
-	go.etcd.io/etcd/client/pkg/v3 v3.5.5 // indirect
-	go.etcd.io/etcd/client/v3 v3.5.5 // indirect
-	go.opentelemetry.io/otel v1.11.0 // indirect
-	go.opentelemetry.io/otel/exporters/jaeger v1.11.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.11.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.11.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.11.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.10.0 // indirect
-	go.opentelemetry.io/otel/exporters/zipkin v1.11.0 // indirect
-	go.opentelemetry.io/otel/sdk v1.11.0 // indirect
-	go.opentelemetry.io/otel/trace v1.11.0 // indirect
+	go.etcd.io/etcd/api/v3 v3.5.8 // indirect
+	go.etcd.io/etcd/client/pkg/v3 v3.5.8 // indirect
+	go.etcd.io/etcd/client/v3 v3.5.8 // indirect
+	go.opentelemetry.io/otel v1.15.1 // indirect
+	go.opentelemetry.io/otel/exporters/jaeger v1.15.1 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.15.1 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.15.1 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.15.1 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.15.1 // indirect
+	go.opentelemetry.io/otel/exporters/zipkin v1.15.1 // indirect
+	go.opentelemetry.io/otel/sdk v1.15.1 // indirect
+	go.opentelemetry.io/otel/trace v1.15.1 // indirect
 	go.opentelemetry.io/proto/otlp v0.19.0 // indirect
-	go.uber.org/atomic v1.9.0 // indirect
-	go.uber.org/automaxprocs v1.5.1 // indirect
-	go.uber.org/multierr v1.8.0 // indirect
-	go.uber.org/zap v1.21.0 // indirect
-	golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90 // indirect
-	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
-	golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
+	go.uber.org/atomic v1.10.0 // indirect
+	go.uber.org/automaxprocs v1.5.2 // indirect
+	go.uber.org/multierr v1.9.0 // indirect
+	go.uber.org/zap v1.24.0 // indirect
+	golang.org/x/crypto v0.6.0 // indirect
+	golang.org/x/net v0.9.0 // indirect
+	golang.org/x/oauth2 v0.5.0 // indirect
 	golang.org/x/sync v0.1.0 // indirect
-	golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8 // indirect
-	golang.org/x/term v0.0.0-20220722155259-a9ba230a4035 // indirect
-	golang.org/x/text v0.4.0 // indirect
+	golang.org/x/sys v0.7.0 // indirect
+	golang.org/x/term v0.7.0 // indirect
+	golang.org/x/text v0.9.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/genproto v0.0.0-20221111202108-142d8a6fa32e // indirect
+	google.golang.org/genproto v0.0.0-20230123190316-2c411cf9d197 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
+	gopkg.in/ini.v1 v1.67.0 // indirect
+	gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	gorm.io/driver/mysql v1.0.5 // indirect
 	gorm.io/gorm v1.21.3 // indirect
-	k8s.io/api v0.22.9 // indirect
-	k8s.io/apimachinery v0.22.9 // indirect
-	k8s.io/client-go v0.22.9 // indirect
-	k8s.io/klog/v2 v2.80.1 // indirect
-	k8s.io/utils v0.0.0-20221108210102-8e77b1f39fe2 // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
-	sigs.k8s.io/yaml v1.2.0 // indirect
+	k8s.io/api v0.26.3 // indirect
+	k8s.io/apimachinery v0.27.0-alpha.3 // indirect
+	k8s.io/client-go v0.26.3 // indirect
+	k8s.io/klog/v2 v2.90.1 // indirect
+	k8s.io/kube-openapi v0.0.0-20230307230338-69ee2d25a840 // indirect
+	k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
+	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
+	sigs.k8s.io/yaml v1.3.0 // indirect
 )

jyBXSubscribe/rpc/bxsubscribe.go

@@ -1,25 +1,24 @@
 package main
 
 import (
+	MC "app.yhyue.com/moapp/jybase/common"
+	"app.yhyue.com/moapp/jybase/endless"
+	logrusx "app.yhyue.com/moapp/jylogx/logx"
 	"flag"
 	"fmt"
-	"log"
-
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gcfg"
-
-	IC "jyBXSubscribe/rpc/init"
-	"jyBXSubscribe/rpc/internal/server"
-	"jyBXSubscribe/rpc/internal/svc"
-	"jyBXSubscribe/rpc/type/bxsubscribe"
-
-	MC "app.yhyue.com/moapp/jybase/common"
-	"app.yhyue.com/moapp/jybase/endless"
 	"github.com/zeromicro/go-zero/core/conf"
+	"github.com/zeromicro/go-zero/core/logx"
 	"github.com/zeromicro/go-zero/core/service"
 	"github.com/zeromicro/go-zero/zrpc"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/reflection"
+	IC "jyBXSubscribe/rpc/init"
+	"jyBXSubscribe/rpc/internal/server"
+	"jyBXSubscribe/rpc/internal/svc"
+	"jyBXSubscribe/rpc/type/bxsubscribe"
+	"log"
 )
 
 var configF = flag.String("cf", "etc/bxsubscribe.yaml", "the config file")
@@ -27,9 +26,9 @@ var dbFile = flag.String("df", "etc/db.yaml", "the db file")
 var logFile = flag.String("lf", "etc/logs.yaml", "the log file")
 
 func main() {
-
 	//初始化基本配置
 	g.Cfg().GetAdapter().(*gcfg.AdapterFile).SetFileName("etc/config.yaml")
+	//logx.SetWriter(logx.NewWriter(jylog.GetWriter()))
 	conf.MustLoad(*configF, &IC.C)
 	//初始化数据库配置
 	conf.MustLoad(*dbFile, &IC.DB)
@@ -54,7 +53,9 @@ func main() {
 			reflection.Register(grpcServer)
 		}
 	})
+
 	//日志记录
+	logx.SetWriter(logrusx.NewLogrusWriter())
 	//s.AddUnaryInterceptors(util.CustomInterceptors)
 	defer s.Stop()
 	fmt.Printf("Starting rpc server at %s...\n", IC.C.ListenOn)

jyBXSubscribe/rpc/etc/db.yaml

@@ -30,6 +30,9 @@ redis:
 es:
     addr: http://192.168.3.206:9800
     size: 5
+    version: v7
+    userName: ""
+    password: ""
 mongo:
     main:
         dbName: qfw

jyBXSubscribe/rpc/init/db.go

@@ -4,12 +4,17 @@
 package init
 
 import (
+<<<<<<< HEAD
 	elastic "app.yhyue.com/moapp/jybase/esv1"
 	P "app.yhyue.com/moapp/jybase/mapping"
+=======
+	"strings"
+
+	elastic "app.yhyue.com/moapp/jybase/es"
+>>>>>>> feature/v1.1.18
 	"app.yhyue.com/moapp/jypkg/compatible"
 	"app.yhyue.com/moapp/jypkg/middleground"
 	"github.com/zeromicro/go-zero/core/logx"
-	"strings"
 
 	"jyBXSubscribe/entity"
 
@@ -112,6 +117,6 @@ func EsInit(es *entity.EsStruct) {
 	//初始化 elasticsearch
 	if es.Addr != "" {
 		logx.Info("--初始化 elasticsearch--")
-		elastic.InitElasticSize(es.Addr, es.Size)
+		elastic.NewEs(es.Version, es.Addr, es.Size, es.UserName, es.Password)
 	}
 }

jyBXSubscribe/rpc/init/init.go

@@ -1,22 +1,24 @@
 package init
 
 import (
-	"jyBXSubscribe/entity"
-	"jyBXSubscribe/rpc/internal/config"
-
 	"app.yhyue.com/moapp/jypkg/compatible"
 	"app.yhyue.com/moapp/jypkg/middleground"
 	_ "github.com/go-sql-driver/mysql"
 	"github.com/zeromicro/go-zero/core/logx"
+<<<<<<< HEAD
+=======
+	"github.com/zeromicro/go-zero/zrpc"
+	"jyBXSubscribe/entity"
+	"jyBXSubscribe/rpc/internal/config"
+>>>>>>> feature/v1.1.18
 )
 
 var C config.Config
 var err error
 
-//
 var DB config.Db
 
-//var codLib
+// var codLib
 var Logc entity.Logc
 
 func InitC() {
@@ -33,6 +35,7 @@ func InitC() {
 		RegPowerCheckCenter(C.PowerCheckCenterKey).
 		RegEntManageApplication(C.EntManageApplication)
 	Compatible = compatible.NewCompatible(&Mgo, BaseServiceMysql, MainMysql, Middleground)
+<<<<<<< HEAD
 	if len(Logc.Level) > 0 {
 		for _, v := range Logc.Level {
 			logx.MustSetup(logx.LogConf{
@@ -44,4 +47,28 @@ func InitC() {
 			logx.Info(v, "--日志记录")
 		}
 	}
+=======
+	//if len(Logc.Level) > 0 {
+	//	for _, v := range Logc.Level {
+	//		logx.MustSetup(logx.LogConf{
+	//			Mode:     Logc.Mode,
+	//			Path:     Logc.Path,
+	//			Level:    v,
+	//			KeepDays: Logc.KeepDays,
+	//		})
+	//		logx.Info(v, "--日志记录")
+	//	}
+	//}
+	//logx.SetWriter(logrusx.NewLogrusWriter())
+	//代码表服务加载
+	codeClient := zrpc.MustNewClient(zrpc.RpcClientConf{
+		Etcd: discov.EtcdConf{
+			Hosts: C.CodeServiceConf.Etcd.Hosts,
+			Key:   C.CodeServiceConf.Etcd.Key,
+		},
+	})
+	logx.Info("CodeService初始化")
+	CodeLib = codePb.NewCodeService(codeClient)
+
+>>>>>>> feature/v1.1.18
 }

jyBXSubscribe/rpc/model/push.go

@@ -15,8 +15,12 @@ import (
 	"app.yhyue.com/moapp/jybase/common"
 	"app.yhyue.com/moapp/jybase/date"
 	"app.yhyue.com/moapp/jybase/encrypt"
+<<<<<<< HEAD
 	"app.yhyue.com/moapp/jybase/esv1"
 	P "app.yhyue.com/moapp/jybase/mapping"
+=======
+	elastic "app.yhyue.com/moapp/jybase/es"
+>>>>>>> feature/v1.1.18
 	"app.yhyue.com/moapp/jybase/mongodb"
 	"app.yhyue.com/moapp/jybase/mysql"
 	"app.yhyue.com/moapp/jybase/redis"
@@ -582,6 +586,7 @@ func (s *subscribePush) getDatasFromMysql(spqp *SubPushQueryParam, starttime, en
 			} else if len(spqp.Staffs) > 0 {
 				staffs = spqp.Staffs
 			}
+<<<<<<< HEAD
 			//老板商机管理需要查询全部来源
 			isNew := true
 			//商机管理判断
@@ -596,19 +601,40 @@ func (s *subscribePush) getDatasFromMysql(spqp *SubPushQueryParam, starttime, en
 				//列表查询
 				findSql = fmt.Sprintf("select a.id,a.infoid,a.matchkeys,a.attachment_count from %s a  where  %s %s %s order by a.date desc,a.id desc",
 					aboutDbMsg[s.ModuleFlag].MysqlTable, strings.Join(querys, " and "), userStr, common.If(isNew, " and a.source = 2 ", ""))
+=======
+			// 空查询优化,不走关联表计算数量
+			if len(querys) == 1 {
+				countSql = fmt.Sprintf("select count(1) from %s a  %s where 1=1 %s ", aboutDbMsg[s.ModuleFlag].MysqlTable, leftJoinStr, userStr)
+				//列表查询
+				findSql = fmt.Sprintf("select a.id,a.infoid,a.matchkeys,b.isvalidfile as attachment_count, IF(a.source is NULL,1,a.source) as  source  from %s a LEFT JOIN %s b ON a.infoid = b.infoid  %s where 1=1 %s  order by a.date desc,a.id desc",
+					aboutDbMsg[s.ModuleFlag].MysqlTable, Baseinfo, leftJoinStr, userStr)
+>>>>>>> feature/v1.1.18
 			} else {
-				//查询分配人员或是否已读
-				staffQuery := " 1=1 "
-				if len(staffs) > 0 {
-					staffQuery += fmt.Sprintf(" and  a.userid in ('%s')  ", strings.Join(staffs, "','"))
-				}
-				if spqp.IsRead != "" {
-					if spqp.IsRead == "0" {
-						staffQuery += " and a.isvisit IS NULL"
-					} else if spqp.IsRead == "1" {
-						staffQuery += " and a.isvisit=1"
+				// 无查询分配人员、是否已读
+				if spqp.IsRead == "" && len(staffs) == 0 {
+					//查询数量（需要去重）
+					countSql = fmt.Sprintf("select count(1) from %s a STRAIGHT_JOIN %s b ON  a.infoid = b.infoid  %s where %s %s ", aboutDbMsg[s.ModuleFlag].MysqlTable, Baseinfo, leftJoinStr, strings.Join(querys, " and "), userStr)
+					//列表查询
+					findSql = fmt.Sprintf("select a.id,a.infoid,a.matchkeys,b.isvalidfile as attachment_count, IF(a.source is NULL,1,a.source) as  source  from %s a STRAIGHT_JOIN %s b ON a.infoid = b.infoid  %s where  %s %s order by a.date desc,a.id desc",
+						aboutDbMsg[s.ModuleFlag].MysqlTable, Baseinfo, leftJoinStr, strings.Join(querys, " and "), userStr)
+				} else {
+					//查询分配人员或是否已读
+					staffQuery := " 1=1 "
+					if len(staffs) > 0 {
+						staffQuery += fmt.Sprintf(" and  a.userid in ('%s')  ", strings.Join(staffs, "','"))
+					}
+					if spqp.IsRead != "" {
+						if spqp.IsRead == "0" {
+							staffQuery += " and a.isvisit IS NULL"
+						} else if spqp.IsRead == "1" {
+							staffQuery += " and a.isvisit=1"
+						}
 					}
+					countSql = fmt.Sprintf("select count(1) from %s a STRAIGHT_JOIN %s b ON  a.infoid = b.infoid  %s where %s %s and %s ", aboutDbMsg[s.ModuleFlag].MysqlTable, Baseinfo, leftJoinStr, strings.Join(querys, " and "), userStr, staffQuery)
+					//列表查询
+					findSql = fmt.Sprintf("select a.id,a.infoid,a.matchkeys,b.isvalidfile as attachment_count,IF(a.source is NULL,1,a.source) as  source from %s a STRAIGHT_JOIN %s b ON  a.infoid = b.infoid  %s where %s %s and %s order by a.date desc,a.id desc ", aboutDbMsg[s.ModuleFlag].MysqlTable, Baseinfo, leftJoinStr, strings.Join(querys, " and "), userStr, staffQuery)
 				}
+<<<<<<< HEAD
 				//countSql = fmt.Sprintf("select count(1) from %s a  where %s %s and ((%s) or EXISTS (SELECT 1 from %s c  WHERE c.source=3 %s and %s and a.id=c.pid and (%s))) ", aboutDbMsg[s.ModuleFlag].MysqlTable, strings.Join(querys, " and "), userStr, staffQuery, aboutDbMsg[s.ModuleFlag].MysqlTable, strings.ReplaceAll(userStr, "a.", "c."), strings.Join(querys, " and "), strings.ReplaceAll(staffQuery, "a.", "c."))
 				countSql = fmt.Sprintf("select count(1) from %s a  where %s %s and %s ", aboutDbMsg[s.ModuleFlag].MysqlTable, strings.Join(querys, " and "), userStr, staffQuery)
 
@@ -616,6 +642,8 @@ func (s *subscribePush) getDatasFromMysql(spqp *SubPushQueryParam, starttime, en
 				//findSql = fmt.Sprintf("select a.id,a.infoid,a.matchkeys,a.attachment_count from %s a where %s %s %s and ((%s) or EXISTS (SELECT 1 from %s c  WHERE c.source=3 %s and %s and a.id=c.pid and (%s))) order by a.date desc,a.id desc ", aboutDbMsg[s.ModuleFlag].MysqlTable, strings.Join(querys, " and "), userStr, common.If(isNew, " and a.source = 2 ", ""), staffQuery, aboutDbMsg[s.ModuleFlag].MysqlTable, strings.ReplaceAll(userStr, "a.", "c."), strings.Join(querys, " and "), strings.ReplaceAll(staffQuery, "a.", "c."))
 				findSql = fmt.Sprintf("select a.id,a.infoid,a.matchkeys,a.attachment_count,IF(a.source is NULL,1,a.source) as  source from %s a  where %s %s and %s order by a.date desc,a.id desc ", aboutDbMsg[s.ModuleFlag].MysqlTable, strings.Join(querys, " and "), userStr, staffQuery)
 
+=======
+>>>>>>> feature/v1.1.18
 			}
 		} else {
 			// 是否已读