test

go.mod

@@ -3,12 +3,12 @@ module app.yhyue.com/moapp/jydocs
 go 1.14
 
 require (
-	app.yhyue.com/moapp/jybase v0.0.0-20210311054309-b6e8812e8066
+	app.yhyue.com/moapp/jybase v0.0.0-20210311095311-3f0f4dec1f3d
 	github.com/golang/protobuf v1.4.2
 	github.com/tal-tech/go-zero v1.1.2
 	google.golang.org/grpc v1.29.1
 	google.golang.org/protobuf v1.25.0
-	gorm.io/gorm v1.21.3
+	gorm.io/gorm v1.20.8
 )
 
 replace google.golang.org/grpc => google.golang.org/grpc v1.29.1

go.sum

@@ -1,5 +1,5 @@
-app.yhyue.com/moapp/jybase v0.0.0-20210311054309-b6e8812e8066 h1:wRZ7p3mUSAf0aeCqHLCoR3TN4dCWRAQckSNcelnYR9o=
-app.yhyue.com/moapp/jybase v0.0.0-20210311054309-b6e8812e8066/go.mod h1:KTF+X6PEvE6ApsenIEpMkTS+Exnj6p5ARNOBCA10yGM=
+app.yhyue.com/moapp/jybase v0.0.0-20210311095311-3f0f4dec1f3d h1:Xo2DEB/fMU0N+xDxFHOcLITPYwFYOZ6GeeudjCg2RKU=
+app.yhyue.com/moapp/jybase v0.0.0-20210311095311-3f0f4dec1f3d/go.mod h1:z8Hrrhyj5C7bu4MIH0dmjL43oT/MM7FoR8ubjP4inSo=
 github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/ClickHouse/clickhouse-go v1.4.3/go.mod h1:EaI/sW7Azgz9UATzd5ZdZHRUhHgv5+JMS9NSr2smCJI=
@@ -459,9 +459,11 @@ gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gorm.io/driver/mysql v1.0.4 h1:TATTzt+kR+IV0+h3iUB3dHUe8omCvQ0rOkmfCsUBohk=
-gorm.io/driver/mysql v1.0.4/go.mod h1:MEgp8tk2n60cSBCq5iTcPDw3ns8Gs+zOva9EUhkknTs=
-gorm.io/gorm v1.20.12/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw=
+gorm.io/driver/mysql v1.0.3 h1:+JKBYPfn1tygR1/of/Fh2T8iwuVwzt+PEJmKaXzMQXg=
+gorm.io/driver/mysql v1.0.3/go.mod h1:twGxftLBlFgNVNakL7F+P/x9oYqoymG3YYT8cAfI9oI=
+gorm.io/gorm v1.20.4/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw=
+gorm.io/gorm v1.20.8 h1:iToaOdZgjNvlc44NFkxfLa3U9q63qwaxt0FdNCiwOMs=
+gorm.io/gorm v1.20.8/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw=
 gorm.io/gorm v1.21.3 h1:qDFi55ZOsjZTwk5eN+uhAmHi8GysJ/qCTichM/yO7ME=
 gorm.io/gorm v1.21.3/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=

rpc/stdlib/etc/stdlib.yaml

@@ -1,7 +1,11 @@
 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"
+JyDocsMysqlDB:
+  DriverName: "mysql"
+  DataSourceName: "root:Topnet123@tcp(192.168.3.11:3366)/jydocs?charset=utf8mb4&parseTime=true&loc=Local"
+  MaxOpenConn: 20
+  MaxIdleConn: 10
+  MaxConnLifeTime: 100
 Etcd:
   Hosts:
     - 192.168.3.240:2379

rpc/stdlib/internal/config/config.go

@@ -4,6 +4,13 @@ import "github.com/tal-tech/go-zero/zrpc"
 
 type Config struct {
 	zrpc.RpcServerConf
-	DriverName string
-	DbUrl      string
+	JyDocsMysqlDB MysqlDBConfig
+}
+
+type MysqlDBConfig struct {
+	DriverName      string
+	DataSourceName  string
+	MaxOpenConn     int
+	MaxIdleConn     int
+	MaxConnLifeTime int
 }

rpc/stdlib/internal/logic/docquerylogic.go

@@ -7,6 +7,7 @@ import (
 	"app.yhyue.com/moapp/jydocs/rpc/stdlib/stdlib_pb"
 
 	"github.com/tal-tech/go-zero/core/logx"
+	stdlibService "app.yhyue.com/moapp/jydocs/services/stdlib"
 )
 
 type DocQueryLogic struct {
@@ -25,6 +26,6 @@ func NewDocQueryLogic(ctx context.Context, svcCtx *svc.ServiceContext) *DocQuery
 
 func (l *DocQueryLogic) DocQuery(in *stdlib.DocQueryRequest) (*stdlib.DocQueryResponse, error) {
 	// todo: add your logic here and delete this line
-
+	stdlibService.FindDocumentById(0,l.svcCtx.DB)
 	return &stdlib.DocQueryResponse{}, nil
 }

rpc/stdlib/internal/svc/servicecontext.go

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

rpc/stdlib/stdlib.go

@@ -23,12 +23,10 @@ func main() {
 	conf.MustLoad(*configFile, &c)
 	ctx := svc.NewServiceContext(c)
 	srv := server.NewStdlibServer(ctx)
-
 	s := zrpc.MustNewServer(c.RpcServerConf, func(grpcServer *grpc.Server) {
 		stdlib.RegisterStdlibServer(grpcServer, srv)
 	})
 	defer s.Stop()
-
 	fmt.Printf("Starting rpc server at %s...\n", c.ListenOn)
 	s.Start()
 }

rpc/stdlib/stdlibclient/stdlib.go

@@ -6,10 +6,8 @@
 package stdlibclient
 
 import (
+	"app.yhyue.com/moapp/jydocs/rpc/stdlib/stdlib_pb"
 	"context"
-
-	"app.yhyue.com/moapp/jydocs/rpc/stdlib/stdlib"
-
 	"github.com/tal-tech/go-zero/zrpc"
 )
 

services/stdlib/docService.go

@@ -1,8 +1,14 @@
 package stdlib
 
+import (
+	"gorm.io/gorm"
+	"log"
+)
 
+func FindDocumentById(id int,db *gorm.DB) {
 
+}
 
-func FindDocumentById(id int) {
-
+func FindDocumentsByKeyWords(keyWords string, db *gorm.DB) {
+	log.Printf("")
 }