model

go.mod

@@ -3,7 +3,7 @@ module app.yhyue.com/moapp/jydocs
 go 1.14
 
 require (
-	app.yhyue.com/moapp/jybase v0.0.0-20210311095311-3f0f4dec1f3d
+	app.yhyue.com/moapp/jybase v0.0.0-20210312055531-9bf805cce8ab
 	github.com/golang/protobuf v1.4.2
 	github.com/tal-tech/go-zero v1.1.2
 	google.golang.org/grpc v1.29.1

go.sum

@@ -1,5 +1,7 @@
 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=
+app.yhyue.com/moapp/jybase v0.0.0-20210312055531-9bf805cce8ab h1:e0w9yaAu+xiwtSebZDYa0kog3QptpLK+4iKxRhq9vyE=
+app.yhyue.com/moapp/jybase v0.0.0-20210312055531-9bf805cce8ab/go.mod h1:K2jMm63fzsEtUjGwtww36U2+0ZFUiZu3AdVm2KZvbUI=
 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=
@@ -15,6 +17,7 @@ github.com/alicebob/miniredis/v2 v2.14.1 h1:GjlbSeoJ24bzdLRs13HoMEeaRZx9kg5nHoRW
 github.com/alicebob/miniredis/v2 v2.14.1/go.mod h1:uS970Sw5Gs9/iK3yBg0l9Uj9s25wXxSpQUE9EaJ/Blg=
 github.com/antihax/optional v0.0.0-20180407024304-ca021399b1a6/go.mod h1:V8iCPQYkqmusNa815XgQio277wI47sdRh1dUOLdyC6Q=
 github.com/aws/aws-sdk-go v1.34.28/go.mod h1:H7NKnBqNVzoTJpGfLrQkkD+ytBA93eiDYi/+8rV9s48=
+github.com/aws/aws-sdk-go v1.35.20/go.mod h1:tlPOdRjfxPBpNIwqDj61rmsnA85v9jc0Ps9+muhnW+k=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
@@ -103,6 +106,7 @@ github.com/gogo/protobuf v1.3.1 h1:DqDEcV5aeaTmdFBePNpYsp3FlcVH/2ISVVM9Qf8PSls=
 github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e h1:1r7pUrabqp18hOBcwBwiTsbnFeTZHV9eER/QT5JVZxY=
 github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
@@ -163,6 +167,7 @@ github.com/jmoiron/sqlx v1.2.0/go.mod h1:1FEQNm3xlJgrMD+FBdI9+xvCksHtbpVBBw5dYhB
 github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg=
 github.com/jonboulle/clockwork v0.1.0 h1:VKV+ZcuP6l3yW9doeqz6ziZGgcynBVQO+obU0+0hcPo=
 github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
+github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
 github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
 github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
@@ -192,6 +197,8 @@ github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.3.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/logrusorgru/aurora v2.0.3+incompatible/go.mod h1:7rIyQOR62GCctdiQpZ/zOJlFyk6y+94wXzv6RNZgaR4=
+github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
+github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
 github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
 github.com/markbates/oncer v0.0.0-20181203154359-bf2de49a0be2/go.mod h1:Ld9puTsIW75CHf65OeIOkyKbteujpZVXDpWK6YGZbxE=
 github.com/markbates/safe v1.0.1/go.mod h1:nAqgmRi7cY2nqMc92/bSEeQA+R4OheNU2T1kNSCBdG0=
@@ -220,12 +227,16 @@ github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32 h1:W6apQkHrMkS0Muv8G/TipAy
 github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32/go.mod h1:9wM+0iRr9ahx58uYLpLIr5fm8diHn0JbqRycJi6w0Ms=
 github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo=
 github.com/olekukonko/tablewriter v0.0.4/go.mod h1:zq6QwlOf5SlnkVbMSr5EoBv3636FWnp+qbPhuoO21uA=
+github.com/olivere/elastic v6.2.35+incompatible h1:MMklYDy2ySi01s123CB2WLBuDMzFX4qhFcA5tKWJPgM=
 github.com/olivere/elastic v6.2.35+incompatible/go.mod h1:J+q1zQJTgAz9woqsbVRqGeB5G1iqDKVBWLNSYW8yfJ8=
+github.com/olivere/elastic/v7 v7.0.22 h1:esBA6JJwvYgfms0EVlH7Z+9J4oQ/WUADF2y/nCNDw7s=
+github.com/olivere/elastic/v7 v7.0.22/go.mod h1:VDexNy9NjmtAkrjNoI7tImv7FR4tf5zUA3ickqu5Pc8=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.7.0 h1:WSHQ+IS43OoUrWtD1/bbclrwK8TTH5hzp+umCiuxHgs=
 github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/gomega v1.5.0 h1:izbySO9zDPmjJ8rDjLvkA2zJHIo+HkYXHnf7eN7SSyo=
 github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
+github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc=
 github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE=
 github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
 github.com/pierrec/lz4 v2.5.1+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
@@ -266,6 +277,9 @@ github.com/sirupsen/logrus v1.4.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPx
 github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
 github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
+github.com/smartystreets/assertions v1.1.1/go.mod h1:tcbTF8ujkAEcZ8TElKY+i30BzYlVhC/LOxJk7iOWnoo=
+github.com/smartystreets/go-aws-auth v0.0.0-20180515143844-0c1422d1fdb9/go.mod h1:SnhjPscd9TpLiy1LpzGSKh3bXCfxxXuqd9xmQJy3slM=
+github.com/smartystreets/gunit v1.4.2/go.mod h1:ZjM1ozSIMJlAz/ay4SG8PeKF00ckUp+zMHZXV9/bvak=
 github.com/soheilhy/cmux v0.1.4 h1:0HKaf1o97UwFjHH9o5XsHUOF+tqmdA7KEzXLpiyaw0E=
 github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
 github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI=
@@ -307,6 +321,7 @@ go.etcd.io/bbolt v1.3.4/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ=
 go.etcd.io/etcd v0.0.0-20200402134248-51bdeb39e698 h1:jWtjCJX1qxhHISBMLRztWwR+EXkI7MJAF2HjHAE/x/I=
 go.etcd.io/etcd v0.0.0-20200402134248-51bdeb39e698/go.mod h1:YoUyTScD3Vcv2RBm3eGVOq7i1ULiz3OuXoQFWOirmAM=
 go.mongodb.org/mongo-driver v1.5.0/go.mod h1:boiGPFqyBs5R0R5qf2ErokGRekMfwn+MqKaUyHs7wy0=
+go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
 go.uber.org/atomic v1.6.0 h1:Ezj3JGmsOnG1MoRWQkPBsKLe9DwWD9QeXzTRzzldNVk=
 go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
 go.uber.org/automaxprocs v1.3.0 h1:II28aZoGdaglS5vVNnspf28lnZpXScxtIozx1lAjdb0=
@@ -372,6 +387,7 @@ golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190419153524-e8e3143a4f4a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190531175056-4c3a928424d2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -414,6 +430,7 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IV
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
+google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20190927181202-20e1ac93f88c/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=

rpc/stdlib/etc/stdlib.yaml

@@ -6,6 +6,9 @@ JyDocsMysqlDB:
   MaxOpenConn: 20
   MaxIdleConn: 10
   MaxConnLifeTime: 100
+EsConfig:
+  Addr: "http://192.168.3.241:9200,http://192.168.3.242:9200"
+  Pool: 15
 Etcd:
   Hosts:
     - 192.168.3.240:2379

rpc/stdlib/internal/config/config.go

@@ -5,6 +5,7 @@ import "github.com/tal-tech/go-zero/zrpc"
 type Config struct {
 	zrpc.RpcServerConf
 	JyDocsMysqlDB MysqlDBConfig
+	EsConfig      EsConfig
 }
 
 type MysqlDBConfig struct {
@@ -14,3 +15,8 @@ type MysqlDBConfig struct {
 	MaxIdleConn     int
 	MaxConnLifeTime int
 }
+
+type EsConfig struct {
+	Addr string
+	Pool int
+}

rpc/stdlib/internal/logic/docofflogic.go

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

rpc/stdlib/internal/logic/doconlogic.go

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

rpc/stdlib/internal/logic/docquerylogic.go

@@ -4,10 +4,10 @@ import (
 	"context"
 
 	"app.yhyue.com/moapp/jydocs/rpc/stdlib/internal/svc"
-	"app.yhyue.com/moapp/jydocs/rpc/stdlib/stdlib_pb"
+	"app.yhyue.com/moapp/jydocs/rpc/stdlib/stdlib"
 
-	"github.com/tal-tech/go-zero/core/logx"
 	stdlibService "app.yhyue.com/moapp/jydocs/services/stdlib"
+	"github.com/tal-tech/go-zero/core/logx"
 )
 
 type DocQueryLogic struct {
@@ -26,6 +26,10 @@ 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)
+	pageNum := 0
+	if in.PageNum <= 0 {
+		pageNum = 0
+	}
+	stdlibService.FindDocumentsByKeyWords(in.KeyWords, pageNum)
 	return &stdlib.DocQueryResponse{}, nil
 }

rpc/stdlib/internal/server/stdlibserver.go

@@ -8,7 +8,7 @@ import (
 
 	"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_pb"
+	"app.yhyue.com/moapp/jydocs/rpc/stdlib/stdlib"
 )
 
 type StdlibServer struct {

rpc/stdlib/internal/svc/servicecontext.go

@@ -1,10 +1,12 @@
 package svc
 
 import (
+	"log"
+
+	elastic "app.yhyue.com/moapp/jybase/esv7"
 	"app.yhyue.com/moapp/jybase/mysql"
 	"app.yhyue.com/moapp/jydocs/rpc/stdlib/internal/config"
 	"gorm.io/gorm"
-	"log"
 )
 
 type ServiceContext struct {
@@ -15,6 +17,7 @@ type ServiceContext struct {
 func NewServiceContext(c config.Config) *ServiceContext {
 	jyDBConfig := c.JyDocsMysqlDB
 	db := initDB(jyDBConfig.DriverName, jyDBConfig.DataSourceName, jyDBConfig.MaxOpenConn, jyDBConfig.MaxIdleConn)
+	elastic.InitElasticSize(c.EsConfig.Addr, c.EsConfig.Pool)
 	return &ServiceContext{
 		Config: c,
 		DB:     db,

rpc/stdlib/stdlib.proto

@@ -36,7 +36,6 @@ message DocChangeResp {
 	bool state = 1; //是否成功
 }
 
-
 service Stdlib {
   	rpc DocQuery(DocQueryRequest) returns(DocQueryResponse); //文档检索
 	rpc DocOn(DocChangeReq) returns(DocChangeResp); //文档上架

rpc/stdlib/stdlibclient/stdlib.go

@@ -14,11 +14,11 @@ import (
 )
 
 type (
-	DocChangeResp    = stdlib.DocChangeResp
-	DocQueryRequest  = stdlib.DocQueryRequest
 	DocQueryResponse = stdlib.DocQueryResponse
 	Doc              = stdlib.Doc
 	DocChangeReq     = stdlib.DocChangeReq
+	DocChangeResp    = stdlib.DocChangeResp
+	DocQueryRequest  = stdlib.DocQueryRequest
 
 	Stdlib interface {
 		DocQuery(ctx context.Context, in *DocQueryRequest) (*DocQueryResponse, error)

services/stdlib/docService.go

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

services/util/stdlib.go

@@ -0,0 +1,26 @@
+package util
+
+type UserMoneyRecord struct {
+	Id               string `json:"id"`
+	UserId           string `json:"userId"`
+	DocName          string `json:"before"`
+	DocFileType      int    `json:"docFileType"`
+	DocFileSuffix    string `json:"docFileSuffix"`
+	DocFileSize      int    `json:"docFileSize"`
+	DocPageSize      int    `json:"docPageSize"`
+	DocTags          string `json:"docTags"`
+	DocClassLevelOne string `json:"docClassLevelOne"`
+	DocClassLevelTwo string `json:"docClassLevelTwo"`
+	UploadDate       string `json:"uploadDate"`
+	IsDelete         int    `json:"isDelete"`
+	OssDocId         string `json:"ossDocId"`
+	OssDocUrl        string `json:"ossDocUrl"`
+	Md5              string `json:"md5"`
+	OssPdfId         string `json:"ossPdfId"`
+	OssPdfUrl        string `json:"ossPdfUrl"`
+	OssTxtId         string `json:"ossTxtId"`
+	OssTxtUrl        string `json:"ossTxtUrl"`
+	Price            int    `json:"price"`
+	DownOrUp         int    `json:"downOrUp"`
+	DocSummary       string `json:"docSummary"`
+}