xuzhiheng 4 éve
szülő
commit
11ff9d6628

+ 3 - 1
rpc/stdlib/etc/stdlib.yaml

@@ -1,6 +1,8 @@
 Name: jydocs.stdlib.rpc
 ListenOn: 127.0.0.1:8080
+DriverName: "mysql"
+DbUrl: "root:Topnet123@tcp(192.168.3.11:3366)/jydocs?charset=utf8mb4&parseTime=true&loc=Local"
 Etcd:
   Hosts:
     - 192.168.3.240:2379
-  Key: moapp.jydocs.stdlibrpc
+  Key: jydocs.stdlib.rpc

+ 2 - 0
rpc/stdlib/internal/config/config.go

@@ -4,4 +4,6 @@ import "github.com/tal-tech/go-zero/zrpc"
 
 type Config struct {
 	zrpc.RpcServerConf
+	DriverName string
+	DbUrl      string
 }

+ 1 - 1
rpc/stdlib/internal/logic/docquerylogic.go

@@ -4,7 +4,7 @@ import (
 	"context"
 
 	"app.yhyue.com/moapp/jydocs/rpc/stdlib/internal/svc"
-	"app.yhyue.com/moapp/jydocs/rpc/stdlib/stdlib"
+	"app.yhyue.com/moapp/jydocs/rpc/stdlib/stdlib_pb"
 
 	"github.com/tal-tech/go-zero/core/logx"
 )

+ 3 - 18
rpc/stdlib/internal/server/stdlibserver.go

@@ -4,25 +4,20 @@
 package server
 
 import (
-	"app.yhyue.com/moapp/jybase/mysql"
+	"context"
+
 	"app.yhyue.com/moapp/jydocs/rpc/stdlib/internal/logic"
 	"app.yhyue.com/moapp/jydocs/rpc/stdlib/internal/svc"
-	"app.yhyue.com/moapp/jydocs/rpc/stdlib/stdlib"
-	"context"
-	"gorm.io/gorm"
-	"log"
+	"app.yhyue.com/moapp/jydocs/rpc/stdlib/stdlib_pb"
 )
 
 type StdlibServer struct {
 	svcCtx *svc.ServiceContext
-	DB     *gorm.DB
 }
 
 func NewStdlibServer(svcCtx *svc.ServiceContext) *StdlibServer {
-	db := initDB()
 	return &StdlibServer{
 		svcCtx: svcCtx,
-		DB:     db,
 	}
 }
 
@@ -30,13 +25,3 @@ func (s *StdlibServer) DocQuery(ctx context.Context, in *stdlib.DocQueryRequest)
 	l := logic.NewDocQueryLogic(ctx, s.svcCtx)
 	return l.DocQuery(in)
 }
-
-func initDB() *gorm.DB {
-	log.Println("----------->【jy_docs】 rpc base init start<--------------")
-	docDB := mysql.GormMysql("", "", 10, 10, nil)
-	if docDB != nil {
-		log.Println("----------->【jy_docs】 DB初始化成功!<--------------")
-		return docDB
-	}
-	return nil
-}

+ 20 - 1
rpc/stdlib/internal/svc/servicecontext.go

@@ -1,13 +1,32 @@
 package svc
 
-import "app.yhyue.com/moapp/jydocs/rpc/stdlib/internal/config"
+import (
+	"log"
+
+	"app.yhyue.com/moapp/jybase/mysql"
+	"app.yhyue.com/moapp/jydocs/rpc/stdlib/internal/config"
+	"gorm.io/gorm"
+)
 
 type ServiceContext struct {
 	Config config.Config
+	DB     *gorm.DB
 }
 
 func NewServiceContext(c config.Config) *ServiceContext {
+	db := initDB(c.DriverName, c.DbUrl)
 	return &ServiceContext{
 		Config: c,
+		DB:     db,
+	}
+}
+
+func initDB(driverName, url string) *gorm.DB {
+	log.Println("----------->【jy_docs】 rpc base init start<--------------")
+	docDB := mysql.GormMysql(driverName, url, 10, 10, nil)
+	if docDB != nil {
+		log.Println("----------->【jy_docs】 DB初始化成功!<--------------")
+		return docDB
 	}
+	return nil
 }

+ 1 - 2
rpc/stdlib/stdlib.go

@@ -7,7 +7,7 @@ import (
 	"app.yhyue.com/moapp/jydocs/rpc/stdlib/internal/config"
 	"app.yhyue.com/moapp/jydocs/rpc/stdlib/internal/server"
 	"app.yhyue.com/moapp/jydocs/rpc/stdlib/internal/svc"
-	"app.yhyue.com/moapp/jydocs/rpc/stdlib/stdlib"
+	"app.yhyue.com/moapp/jydocs/rpc/stdlib/stdlib_pb"
 
 	"github.com/tal-tech/go-zero/core/conf"
 	"github.com/tal-tech/go-zero/zrpc"
@@ -16,7 +16,6 @@ import (
 
 var configFile = flag.String("f", "etc/stdlib.yaml", "the config file")
 
-
 func main() {
 	flag.Parse()
 

BIN
rpc/stdlib/stdlib_pb/.DS_Store


+ 3 - 2
rpc/stdlib/stdlib/stdlib.pb.go → rpc/stdlib/stdlib_pb/stdlib.pb.go

@@ -8,14 +8,15 @@ package stdlib
 
 import (
 	context "context"
+	reflect "reflect"
+	sync "sync"
+
 	proto "github.com/golang/protobuf/proto"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
 )
 
 const (