提交

jyBXCore/rpc/bxcore.go

@@ -1,46 +1,39 @@
 package main
 
 import (
-	logrusx "app.yhyue.com/moapp/jylogx/logx"
-	IC "bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXCore/rpc/init"
+	"flag"
+	"fmt"
+
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXCore/rpc/internal/config"
 	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXCore/rpc/internal/server"
 	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXCore/rpc/internal/svc"
 	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXCore/rpc/type/bxcore"
-	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXCore/rpc/util"
-	"fmt"
-	"github.com/zeromicro/go-zero/core/logx"
+
+	"github.com/zeromicro/go-zero/core/conf"
 	"github.com/zeromicro/go-zero/core/service"
 	"github.com/zeromicro/go-zero/zrpc"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/reflection"
 )
 
+var configFile = flag.String("f", "etc/bxcore.yaml", "the config file")
+
 func main() {
-	//
-	go func() {
-		//正文、附件搜索限制
-		util.LimitSearchInit()
-		//err := endless.ListenAndServe(":"+MC.InterfaceToStr(IC.C.WebRpcPort), nil, func() {})
-		//if err != nil {
-		//	log.Println("ListenAndServe: ", err)
-		//}
-	}()
-	//敏感词初始化
-	//fsw.ReadFswDict("./etc/mosaic_fsw.dict")
-	ctx := svc.NewServiceContext(IC.C)
-	svr := server.NewBxCoreServer(ctx)
-
-	s := zrpc.MustNewServer(IC.C.RpcServerConf, func(grpcServer *grpc.Server) {
-		bxcore.RegisterBxCoreServer(grpcServer, svr)
-
-		if IC.C.Mode == service.DevMode || IC.C.Mode == service.TestMode {
+	flag.Parse()
+
+	var c config.Config
+	conf.MustLoad(*configFile, &c)
+	ctx := svc.NewServiceContext(c)
+
+	s := zrpc.MustNewServer(c.RpcServerConf, func(grpcServer *grpc.Server) {
+		bxcore.RegisterBxCoreServer(grpcServer, server.NewBxCoreServer(ctx))
+
+		if c.Mode == service.DevMode || c.Mode == service.TestMode {
 			reflection.Register(grpcServer)
 		}
 	})
 	defer s.Stop()
-	//日志记录
-	logx.SetWriter(logrusx.NewLogrusWriter())
 
-	fmt.Printf("Starting rpc server at %s...\n", IC.C.ListenOn)
+	fmt.Printf("Starting rpc server at %s...\n", c.ListenOn)
 	s.Start()
 }