合并

jyBXSubscribe/rpc/init/init.go

@@ -7,8 +7,6 @@ import (
 	"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"
-	"github.com/zeromicro/go-zero/zrpc"
 )
 
 var C config.Config
@@ -33,25 +31,4 @@ func InitC() {
 		RegPowerCheckCenter(C.PowerCheckCenterKey).
 		RegEntManageApplication(C.EntManageApplication)
 	Compatible = compatible.NewCompatible(&Mgo, BaseServiceMysql, MainMysql, Middleground)
-	//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)
 }

jyBXSubscribe/rpc/model/push.go

@@ -15,7 +15,7 @@ import (
 	"app.yhyue.com/moapp/jybase/common"
 	"app.yhyue.com/moapp/jybase/date"
 	"app.yhyue.com/moapp/jybase/encrypt"
-	"app.yhyue.com/moapp/jybase/esv1"
+	elastic "app.yhyue.com/moapp/jybase/es"
 	P "app.yhyue.com/moapp/jybase/mapping"
 	"app.yhyue.com/moapp/jybase/mongodb"
 	"app.yhyue.com/moapp/jybase/mysql"