Merge branch 'feature/v1.1.55' of https://jygit.jydev.jianyu360.cn/BaseService/jyMicroservices into feature/v1.1.55

jyBXBase/api/bxbase.go

@@ -2,12 +2,10 @@ package main
 
 import (
 	MC "app.yhyue.com/moapp/jybase/common"
-	"app.yhyue.com/moapp/jybase/endless"
 	logrusx "app.yhyue.com/moapp/jylogx/logx"
 	IC "bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/api/init"
 	"fmt"
 	"github.com/zeromicro/go-zero/core/logx"
-	"log"
 	"net/http"
 	"os"
 	"os/signal"
@@ -27,12 +25,12 @@ func main() {
 	if err != nil {
 		panic(err.(interface{}))
 	}
-	go func() {
-		err := endless.ListenAndServe(":"+MC.InterfaceToStr(IC.C.Webrpcport), nil, func() {})
-		if err != nil {
-			log.Println("ListenAndServe: ", err)
-		}
-	}()
+	//go func() {
+	//	err := endless.ListenAndServe(":"+MC.InterfaceToStr(IC.C.Webrpcport), nil, func() {})
+	//	if err != nil {
+	//		log.Println("ListenAndServe: ", err)
+	//	}
+	//}()
 
 	ctx := svc.NewServiceContext(IC.C)
 	server := rest.MustNewServer(IC.C.RestConf)

jyBXBase/rpc/bxbase.go

@@ -2,16 +2,11 @@ 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"
-	"app.yhyue.com/moapp/jybase/endless"
-
 	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/rpc/internal/server"
 	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/rpc/internal/svc"
 	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/rpc/type/bxbase"
+	"fmt"
+	"github.com/zeromicro/go-zero/core/logx"
 
 	IC "bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/rpc/init"
 
@@ -22,12 +17,12 @@ import (
 )
 
 func main() {
-	go func() {
-		err := endless.ListenAndServe(":"+MC.InterfaceToStr(IC.C.Webrpcport), nil, func() {})
-		if err != nil {
-			log.Println("ListenAndServe: ", err)
-		}
-	}()
+	//go func() {
+	//	err := endless.ListenAndServe(":"+MC.InterfaceToStr(IC.C.Webrpcport), nil, func() {})
+	//	if err != nil {
+	//		log.Println("ListenAndServe: ", err)
+	//	}
+	//}()
 	ctx := svc.NewServiceContext(IC.C)
 	svr := server.NewBxbaseServer(ctx)
 

jyBXBuyer/api/bxbuyer.go

@@ -2,13 +2,11 @@ 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"
 	"os"
 	"os/signal"
@@ -27,12 +25,12 @@ func main() {
 		panic(err)
 	}
 	//
-	go func() {
-		err := endless.ListenAndServe(":"+MC.InterfaceToStr(IC.C.Webrpcport), nil, func() {})
-		if err != nil {
-			log.Println("ListenAndServe: ", err)
-		}
-	}()
+	//go func() {
+	//	err := endless.ListenAndServe(":"+MC.InterfaceToStr(IC.C.Webrpcport), nil, func() {})
+	//	if err != nil {
+	//		log.Println("ListenAndServe: ", err)
+	//	}
+	//}()
 	ctx := svc.NewServiceContext(IC.C)
 	server := rest.MustNewServer(IC.C.RestConf)
 	defer server.Stop()

jyBXBuyer/rpc/bxbuyer.go

@@ -1,14 +1,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"
-
 	"github.com/zeromicro/go-zero/core/service"
 	"github.com/zeromicro/go-zero/zrpc"
 	"google.golang.org/grpc"
@@ -16,16 +11,17 @@ import (
 	IC "jyBXBuyer/rpc/init"
 	"jyBXBuyer/rpc/internal/server"
 	"jyBXBuyer/rpc/internal/svc"
+	"jyBXBuyer/rpc/type/bxbuyer"
 )
 
 func main() {
 	//
-	go func() {
-		err := endless.ListenAndServe(":"+MC.InterfaceToStr(IC.C.Webrpcport), nil, func() {})
-		if err != nil {
-			log.Println("ListenAndServe: ", err)
-		}
-	}()
+	//go func() {
+	//	err := endless.ListenAndServe(":"+MC.InterfaceToStr(IC.C.Webrpcport), nil, func() {})
+	//	if err != nil {
+	//		log.Println("ListenAndServe: ", err)
+	//	}
+	//}()
 
 	ctx := svc.NewServiceContext(IC.C)
 	svr := server.NewBxbuyerServer(ctx)

jyBXCore/api/bxcore.go

@@ -2,7 +2,6 @@ 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"
 	IC "bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXCore/api/init"
@@ -11,7 +10,6 @@ import (
 	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXCore/entity"
 	"fmt"
 	"github.com/zeromicro/go-zero/core/logx"
-	"log"
 	"net/http"
 	"os"
 	"os/signal"
@@ -27,12 +25,12 @@ func main() {
 		panic(err.(interface{}))
 	}
 	//
-	go func() {
-		err := endless.ListenAndServe(":"+MC.InterfaceToStr(IC.C.Webrpcport), nil, func() {})
-		if err != nil {
-			log.Println("ListenAndServe: ", err)
-		}
-	}()
+	//go func() {
+	//	err := endless.ListenAndServe(":"+MC.InterfaceToStr(IC.C.Webrpcport), nil, func() {})
+	//	if err != nil {
+	//		log.Println("ListenAndServe: ", err)
+	//	}
+	//}()
 	ctx := svc.NewServiceContext(IC.C)
 	server := rest.MustNewServer(IC.C.RestConf)
 	defer server.Stop()

jyBXCore/rpc/bxcore.go

@@ -1,8 +1,6 @@
 package main
 
 import (
-	MC "app.yhyue.com/moapp/jybase/common"
-	"app.yhyue.com/moapp/jybase/endless"
 	logrusx "app.yhyue.com/moapp/jylogx/logx"
 	IC "bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXCore/rpc/init"
 	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXCore/rpc/internal/server"
@@ -15,7 +13,6 @@ import (
 	"github.com/zeromicro/go-zero/zrpc"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/reflection"
-	"log"
 )
 
 func main() {
@@ -23,10 +20,10 @@ func main() {
 	go func() {
 		//正文、附件搜索限制
 		util.LimitSearchInit()
-		err := endless.ListenAndServe(":"+MC.InterfaceToStr(IC.C.WebRpcPort), nil, func() {})
-		if err != nil {
-			log.Println("ListenAndServe: ", err)
-		}
+		//err := endless.ListenAndServe(":"+MC.InterfaceToStr(IC.C.WebRpcPort), nil, func() {})
+		//if err != nil {
+		//	log.Println("ListenAndServe: ", err)
+		//}
 	}()
 	//敏感词初始化
 	//fsw.ReadFswDict("./etc/mosaic_fsw.dict")

jyBXSubscribe/api/bxsubscribe.go

@@ -1,14 +1,12 @@
 package main
 
 import (
-	"app.yhyue.com/moapp/jybase/endless"
 	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXSubscribe/entity"
 
-	// logrusx "app.yhyue.com/moapp/jylogx/logx"
-	"fmt"
 	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXSubscribe/api/internal/handler"
 	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXSubscribe/api/internal/svc"
-	"log"
+	// logrusx "app.yhyue.com/moapp/jylogx/logx"
+	"fmt"
 	"net/http"
 	"os"
 	"os/signal"
@@ -30,12 +28,12 @@ func main() {
 		panic(err)
 	}
 	//
-	go func() {
-		err := endless.ListenAndServe(":"+MC.InterfaceToStr(IC.C.Webrpcport), nil, func() {})
-		if err != nil {
-			log.Println("ListenAndServe: ", err)
-		}
-	}()
+	//go func() {
+	//	err := endless.ListenAndServe(":"+MC.InterfaceToStr(IC.C.Webrpcport), nil, func() {})
+	//	if err != nil {
+	//		log.Println("ListenAndServe: ", err)
+	//	}
+	//}()
 	ctx := svc.NewServiceContext(IC.C)
 	server := rest.MustNewServer(IC.C.RestConf)
 	defer server.Stop()

jyBXSubscribe/rpc/bxsubscribe.go

@@ -1,8 +1,6 @@
 package main
 
 import (
-	MC "app.yhyue.com/moapp/jybase/common"
-	"app.yhyue.com/moapp/jybase/endless"
 	logrusx "app.yhyue.com/moapp/jylogx/logx"
 	IC "bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXSubscribe/rpc/init"
 	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXSubscribe/rpc/internal/server"
@@ -19,7 +17,6 @@ import (
 	"github.com/zeromicro/go-zero/zrpc"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/reflection"
-	"log"
 )
 
 var configF = flag.String("cf", "etc/bxsubscribe.yaml", "the config file")
@@ -36,12 +33,12 @@ func main() {
 	//初始化日志信息
 	conf.MustLoad(*logFile, &IC.Logc)
 	IC.InitC()
-	go func() {
-		err := endless.ListenAndServe(":"+MC.InterfaceToStr(IC.C.Webrpcport), nil, func() {})
-		if err != nil {
-			log.Println("ListenAndServe: ", err)
-		}
-	}()
+	//go func() {
+	//	err := endless.ListenAndServe(":"+MC.InterfaceToStr(IC.C.Webrpcport), nil, func() {})
+	//	if err != nil {
+	//		log.Println("ListenAndServe: ", err)
+	//	}
+	//}()
 	ctx := svc.NewServiceContext(IC.C)
 	svr := server.NewBxsubscribeServer(ctx)
 	s := zrpc.MustNewServer(IC.C.RpcServerConf, func(grpcServer *grpc.Server) {