Merge branch 'master' of https://app.yhyue.com/moapp/jy_docs

go.mod

@@ -1,4 +1,4 @@
-module app.yhyue.com/moapp/jydocs
+module app.yhyue.com/moapp/jy_docs
 
 go 1.14
 

jydocs.go

@@ -1,4 +1,4 @@
 /**
  剑鱼文库
 */
-package jydocs
+package jy_docs

rpc/stdlib/internal/config/config.go

@@ -1,7 +1,7 @@
 package config
 
 import "github.com/tal-tech/go-zero/zrpc"
-import jyDocRpcUtil "app.yhyue.com/moapp/jydocs/services/util"
+import jyDocRpcUtil "app.yhyue.com/moapp/jy_docs/services/util"
 
 type Config struct {
 	zrpc.RpcServerConf

rpc/stdlib/internal/logic/docactivitylogic.go

@@ -3,9 +3,9 @@ package logic
 import (
 	"context"
 
-	"app.yhyue.com/moapp/jydocs/rpc/stdlib/internal/svc"
-	"app.yhyue.com/moapp/jydocs/rpc/stdlib/stdlib"
-	stdlibService "app.yhyue.com/moapp/jydocs/services/stdlib"
+	"app.yhyue.com/moapp/jy_docs/rpc/stdlib/internal/svc"
+	"app.yhyue.com/moapp/jy_docs/rpc/stdlib/stdlib"
+	stdlibService "app.yhyue.com/moapp/jy_docs/services/stdlib"
 
 	"github.com/tal-tech/go-zero/core/logx"
 )

rpc/stdlib/internal/logic/docgetchecklogic.go

@@ -3,8 +3,8 @@ package logic
 import (
 	"context"
 
-	"app.yhyue.com/moapp/jydocs/rpc/stdlib/internal/svc"
-	"app.yhyue.com/moapp/jydocs/rpc/stdlib/stdlib"
+	"app.yhyue.com/moapp/jy_docs/rpc/stdlib/internal/svc"
+	"app.yhyue.com/moapp/jy_docs/rpc/stdlib/stdlib"
 
 	"github.com/tal-tech/go-zero/core/logx"
 )

rpc/stdlib/internal/logic/docgetcontentlogic.go

@@ -3,8 +3,8 @@ package logic
 import (
 	"context"
 
-	"app.yhyue.com/moapp/jydocs/rpc/stdlib/internal/svc"
-	"app.yhyue.com/moapp/jydocs/rpc/stdlib/stdlib"
+	"app.yhyue.com/moapp/jy_docs/rpc/stdlib/internal/svc"
+	"app.yhyue.com/moapp/jy_docs/rpc/stdlib/stdlib"
 
 	"github.com/tal-tech/go-zero/core/logx"
 )

rpc/stdlib/internal/logic/docofflogic.go

@@ -1,14 +1,12 @@
 package logic
 
 import (
-	stdlibService "app.yhyue.com/moapp/jydocs/services/stdlib"
+	"app.yhyue.com/moapp/jy_docs/rpc/stdlib/internal/svc"
+	"app.yhyue.com/moapp/jy_docs/rpc/stdlib/stdlib"
+	stdlibService "app.yhyue.com/moapp/jy_docs/services/stdlib"
 	"context"
-	"log"
-
-	"app.yhyue.com/moapp/jydocs/rpc/stdlib/internal/svc"
-	"app.yhyue.com/moapp/jydocs/rpc/stdlib/stdlib"
-
 	"github.com/tal-tech/go-zero/core/logx"
+	"log"
 )
 
 type DocOffLogic struct {
@@ -28,7 +26,7 @@ func NewDocOffLogic(ctx context.Context, svcCtx *svc.ServiceContext) *DocOffLogi
 func (l *DocOffLogic) DocOff(in *stdlib.DocChangeReq) (*stdlib.DocChangeResp, error) {
 	// todo: add your logic here and delete this line
 	status := stdlibService.ChangeDocumentOff(in.Id, in.Reason)
-	log.Println(status,"返回值-----------")
+	log.Println(status, "返回值-----------")
 	return &stdlib.DocChangeResp{State: status}, nil
 
 }

rpc/stdlib/internal/logic/doconlogic.go

@@ -1,9 +1,9 @@
 package logic
 
 import (
-	"app.yhyue.com/moapp/jydocs/rpc/stdlib/internal/svc"
-	"app.yhyue.com/moapp/jydocs/rpc/stdlib/stdlib"
-	stdlibService "app.yhyue.com/moapp/jydocs/services/stdlib"
+	"app.yhyue.com/moapp/jy_docs/rpc/stdlib/internal/svc"
+	"app.yhyue.com/moapp/jy_docs/rpc/stdlib/stdlib"
+	stdlibService "app.yhyue.com/moapp/jy_docs/services/stdlib"
 	"context"
 	"github.com/tal-tech/go-zero/core/logx"
 )

rpc/stdlib/internal/logic/docquerylogic.go

@@ -3,10 +3,10 @@ package logic
 import (
 	"context"
 
-	"app.yhyue.com/moapp/jydocs/rpc/stdlib/internal/svc"
-	"app.yhyue.com/moapp/jydocs/rpc/stdlib/stdlib"
+	"app.yhyue.com/moapp/jy_docs/rpc/stdlib/internal/svc"
+	"app.yhyue.com/moapp/jy_docs/rpc/stdlib/stdlib"
 
-	stdlibService "app.yhyue.com/moapp/jydocs/services/stdlib"
+	stdlibService "app.yhyue.com/moapp/jy_docs/services/stdlib"
 	"github.com/tal-tech/go-zero/core/logx"
 )
 

rpc/stdlib/internal/logic/docstatisticslogic.go

@@ -3,9 +3,9 @@ package logic
 import (
 	"context"
 
-	"app.yhyue.com/moapp/jydocs/rpc/stdlib/internal/svc"
-	"app.yhyue.com/moapp/jydocs/rpc/stdlib/stdlib"
-	stdlibService "app.yhyue.com/moapp/jydocs/services/stdlib"
+	"app.yhyue.com/moapp/jy_docs/rpc/stdlib/internal/svc"
+	"app.yhyue.com/moapp/jy_docs/rpc/stdlib/stdlib"
+	stdlibService "app.yhyue.com/moapp/jy_docs/services/stdlib"
 	"github.com/tal-tech/go-zero/core/logx"
 )
 

rpc/stdlib/internal/server/stdlibserver.go

@@ -6,9 +6,9 @@ package server
 import (
 	"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"
+	"app.yhyue.com/moapp/jy_docs/rpc/stdlib/internal/logic"
+	"app.yhyue.com/moapp/jy_docs/rpc/stdlib/internal/svc"
+	"app.yhyue.com/moapp/jy_docs/rpc/stdlib/stdlib"
 )
 
 type StdlibServer struct {

rpc/stdlib/internal/svc/servicecontext.go

@@ -1,7 +1,7 @@
 package svc
 
 import (
-	"app.yhyue.com/moapp/jydocs/rpc/stdlib/internal/config"
+	"app.yhyue.com/moapp/jy_docs/rpc/stdlib/internal/config"
 )
 
 type ServiceContext struct {

rpc/stdlib/stdlib.go

@@ -1,11 +1,11 @@
 package main
 
 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"
-	jyDocsRpcUtil "app.yhyue.com/moapp/jydocs/services/util"
+	"app.yhyue.com/moapp/jy_docs/rpc/stdlib/internal/config"
+	"app.yhyue.com/moapp/jy_docs/rpc/stdlib/internal/server"
+	"app.yhyue.com/moapp/jy_docs/rpc/stdlib/internal/svc"
+	"app.yhyue.com/moapp/jy_docs/rpc/stdlib/stdlib"
+	jyDocsRpcUtil "app.yhyue.com/moapp/jy_docs/services/util"
 	"flag"
 	"github.com/tal-tech/go-zero/core/conf"
 	"github.com/tal-tech/go-zero/zrpc"

rpc/stdlib/stdlib.proto

@@ -8,9 +8,9 @@ message DocQueryRequest {
   string keyWords = 3; //检索词  文档名检索  模糊
   repeated string itemArr = 4;  // 分类 []string
   repeated string tagArr = 5;  // 标签 []string
-  int32 publishTimeSort = 6;  // 发布时间排序 1正序 2倒序
-  int32 downloadSort = 7;		// 下载次数排序 1正序 2倒序
-  int32	viewSort = 8;			// 浏览量排序 1正序 2倒序
+  int32 publishTimeSort = 6;  // 发布时间排序 1正序 -1倒序
+  int32 downloadSort = 7;		// 下载次数排序 1正序 -1倒序
+  int32	viewSort = 8;			// 浏览量排序 1正序 -1倒序
 }
 
 message DocQueryResponse {

rpc/stdlib/stdlib/stdlib.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.23.0
-// 	protoc        v3.11.4
+// 	protoc-gen-go v1.25.0
+// 	protoc        v3.15.5
 // source: stdlib.proto
 
 package stdlib
@@ -39,9 +39,9 @@ type DocQueryRequest struct {
 	KeyWords        string   `protobuf:"bytes,3,opt,name=keyWords,proto3" json:"keyWords,omitempty"`                //检索词  文档名检索  模糊
 	ItemArr         []string `protobuf:"bytes,4,rep,name=itemArr,proto3" json:"itemArr,omitempty"`                  // 分类 []string
 	TagArr          []string `protobuf:"bytes,5,rep,name=tagArr,proto3" json:"tagArr,omitempty"`                    // 标签 []string
-	PublishTimeSort int32    `protobuf:"varint,6,opt,name=publishTimeSort,proto3" json:"publishTimeSort,omitempty"` // 发布时间排序 1正序 2倒序
-	DownloadSort    int32    `protobuf:"varint,7,opt,name=downloadSort,proto3" json:"downloadSort,omitempty"`       // 下载次数排序 1正序 2倒序
-	ViewSort        int32    `protobuf:"varint,8,opt,name=viewSort,proto3" json:"viewSort,omitempty"`               // 浏览量排序 1正序 2倒序
+	PublishTimeSort int32    `protobuf:"varint,6,opt,name=publishTimeSort,proto3" json:"publishTimeSort,omitempty"` // 发布时间排序 1正序 -1倒序
+	DownloadSort    int32    `protobuf:"varint,7,opt,name=downloadSort,proto3" json:"downloadSort,omitempty"`       // 下载次数排序 1正序 -1倒序
+	ViewSort        int32    `protobuf:"varint,8,opt,name=viewSort,proto3" json:"viewSort,omitempty"`               // 浏览量排序 1正序 -1倒序
 }
 
 func (x *DocQueryRequest) Reset() {

rpc/stdlib/stdlibclient/stdlib.go

@@ -8,24 +8,24 @@ package stdlibclient
 import (
 	"context"
 
-	"app.yhyue.com/moapp/jydocs/rpc/stdlib/stdlib"
+	"app.yhyue.com/moapp/jy_docs/rpc/stdlib/stdlib"
 
 	"github.com/tal-tech/go-zero/zrpc"
 )
 
 type (
-	Doc               = stdlib.Doc
 	DocChangeReq      = stdlib.DocChangeReq
-	DocChangeResp     = stdlib.DocChangeResp
+	DocStatisticsReq  = stdlib.DocStatisticsReq
 	DocGetCheckResp   = stdlib.DocGetCheckResp
 	DocActivity       = stdlib.DocActivity
+	DocGetContentResp = stdlib.DocGetContentResp
+	DocActivityReq    = stdlib.DocActivityReq
 	DocActivityResp   = stdlib.DocActivityResp
 	DocQueryRequest   = stdlib.DocQueryRequest
 	DocQueryResponse  = stdlib.DocQueryResponse
-	DocStatisticsReq  = stdlib.DocStatisticsReq
+	Doc               = stdlib.Doc
+	DocChangeResp     = stdlib.DocChangeResp
 	DocGetCheckReq    = stdlib.DocGetCheckReq
-	DocGetContentResp = stdlib.DocGetContentResp
-	DocActivityReq    = stdlib.DocActivityReq
 
 	Stdlib interface {
 		DocQuery(ctx context.Context, in *DocQueryRequest) (*DocQueryResponse, error)

rpc/stdlib/test/doc_test.go

@@ -1,8 +1,8 @@
 package test
 
 import (
-	"app.yhyue.com/moapp/jydocs/rpc/stdlib/stdlib"
-	"app.yhyue.com/moapp/jydocs/rpc/stdlib/stdlibclient"
+	"app.yhyue.com/moapp/jy_docs/rpc/stdlib/stdlib"
+	"app.yhyue.com/moapp/jy_docs/rpc/stdlib/stdlibclient"
 	"context"
 	"github.com/tal-tech/go-zero/core/discov"
 	"github.com/tal-tech/go-zero/zrpc"

rpc/userlib/internal/config/config.go

@@ -1,7 +1,7 @@
 package config
 
 import (
-	jyDocRpcUtil "app.yhyue.com/moapp/jydocs/services/util"
+	jyDocRpcUtil "app.yhyue.com/moapp/jy_docs/services/util"
 	"github.com/tal-tech/go-zero/zrpc"
 )
 

rpc/userlib/internal/logic/doccollectlogic.go

@@ -1,14 +1,14 @@
 package logic
 
 import (
-	"app.yhyue.com/moapp/jydocs/services/model"
+	"app.yhyue.com/moapp/jy_docs/services/model"
 	"context"
 	"log"
 
-	"app.yhyue.com/moapp/jydocs/rpc/userlib/internal/svc"
-	"app.yhyue.com/moapp/jydocs/rpc/userlib/userlib"
+	"app.yhyue.com/moapp/jy_docs/rpc/userlib/internal/svc"
+	"app.yhyue.com/moapp/jy_docs/rpc/userlib/userlib"
 
-	userLibService "app.yhyue.com/moapp/jydocs/services/userlib"
+	userLibService "app.yhyue.com/moapp/jy_docs/services/userlib"
 	"github.com/tal-tech/go-zero/core/logx"
 )
 

rpc/userlib/internal/logic/docdeletelogic.go

@@ -1,11 +1,11 @@
 package logic
 
 import (
-	userLibService "app.yhyue.com/moapp/jydocs/services/userlib"
+	userLibService "app.yhyue.com/moapp/jy_docs/services/userlib"
 	"context"
 
-	"app.yhyue.com/moapp/jydocs/rpc/userlib/internal/svc"
-	"app.yhyue.com/moapp/jydocs/rpc/userlib/userlib"
+	"app.yhyue.com/moapp/jy_docs/rpc/userlib/internal/svc"
+	"app.yhyue.com/moapp/jy_docs/rpc/userlib/userlib"
 
 	"github.com/tal-tech/go-zero/core/logx"
 )

rpc/userlib/internal/logic/docrestorelogic.go

@@ -3,8 +3,8 @@ package logic
 import (
 	"context"
 
-	"app.yhyue.com/moapp/jydocs/rpc/userlib/internal/svc"
-	"app.yhyue.com/moapp/jydocs/rpc/userlib/userlib"
+	"app.yhyue.com/moapp/jy_docs/rpc/userlib/internal/svc"
+	"app.yhyue.com/moapp/jy_docs/rpc/userlib/userlib"
 
 	"github.com/tal-tech/go-zero/core/logx"
 )

rpc/userlib/internal/logic/userdocslogic.go

@@ -3,8 +3,8 @@ package logic
 import (
 	"context"
 
-	"app.yhyue.com/moapp/jydocs/rpc/userlib/internal/svc"
-	"app.yhyue.com/moapp/jydocs/rpc/userlib/userlib"
+	"app.yhyue.com/moapp/jy_docs/rpc/userlib/internal/svc"
+	"app.yhyue.com/moapp/jy_docs/rpc/userlib/userlib"
 
 	"github.com/tal-tech/go-zero/core/logx"
 )

rpc/userlib/internal/server/userlibserver.go

@@ -6,9 +6,9 @@ package server
 import (
 	"context"
 
-	"app.yhyue.com/moapp/jydocs/rpc/userlib/internal/logic"
-	"app.yhyue.com/moapp/jydocs/rpc/userlib/internal/svc"
-	"app.yhyue.com/moapp/jydocs/rpc/userlib/userlib"
+	"app.yhyue.com/moapp/jy_docs/rpc/userlib/internal/logic"
+	"app.yhyue.com/moapp/jy_docs/rpc/userlib/internal/svc"
+	"app.yhyue.com/moapp/jy_docs/rpc/userlib/userlib"
 )
 
 type UserLibServer struct {

rpc/userlib/internal/svc/servicecontext.go

@@ -1,6 +1,6 @@
 package svc
 
-import "app.yhyue.com/moapp/jydocs/rpc/userlib/internal/config"
+import "app.yhyue.com/moapp/jy_docs/rpc/userlib/internal/config"
 
 type ServiceContext struct {
 	Config config.Config

rpc/userlib/test/userLib_test.go

@@ -1,8 +1,7 @@
 package test
 
 import (
-	"app.yhyue.com/moapp/jydocs/rpc/userlib/userlib"
-	"app.yhyue.com/moapp/jydocs/rpc/userlib/userlibclient"
+	"app.yhyue.com/moapp/jy_docs/rpc/userlib/userlibclient"
 	"context"
 	"github.com/tal-tech/go-zero/core/discov"
 	"github.com/tal-tech/go-zero/zrpc"
@@ -20,7 +19,8 @@ func Test_UserDocCollect(t *testing.T) {
 	})
 	userLib := userlibclient.NewUserLib(client)
 	resp, err := userLib.DocCollect(context.Background(), &userlibclient.UserCollectRequest{
-		DocId:        "1",
+
+		/*DocId:        "1",
 		UserId:       "1",
 		SourceUserId: "2",
 		DocName:      "2020招标文件白皮书.docx",
@@ -29,7 +29,7 @@ func Test_UserDocCollect(t *testing.T) {
 		DocPageSize:  20,
 		DocCategory:  userlib.UserDocCategory_Collect,
 		DocFileSuffix:"docx",
-		Cost:0,
+		Cost:0,*/
 	})
 	if err != nil {
 		log.Println("UserDoc Collect call error:", err)
@@ -46,7 +46,7 @@ func Test_UserDocDelete(t *testing.T)  {
 	})
 	userLib := userlibclient.NewUserLib(client)
 	resp, err := userLib.DocDelete(context.Background(), &userlibclient.UserDeleteRequest{
-		DocId: "8",
+		//DocId: "8",
 	})
 	if err != nil {
 		log.Println("UserDoc Collect call error:", err)

rpc/userlib/userlib.go

@@ -1,15 +1,15 @@
 package main
 
 import (
-	jyDocsRpcUtil "app.yhyue.com/moapp/jydocs/services/util"
+	jyDocsRpcUtil "app.yhyue.com/moapp/jy_docs/services/util"
 	"flag"
 	"fmt"
 	"log"
 
-	"app.yhyue.com/moapp/jydocs/rpc/userlib/internal/config"
-	"app.yhyue.com/moapp/jydocs/rpc/userlib/internal/server"
-	"app.yhyue.com/moapp/jydocs/rpc/userlib/internal/svc"
-	"app.yhyue.com/moapp/jydocs/rpc/userlib/userlib"
+	"app.yhyue.com/moapp/jy_docs/rpc/userlib/internal/config"
+	"app.yhyue.com/moapp/jy_docs/rpc/userlib/internal/server"
+	"app.yhyue.com/moapp/jy_docs/rpc/userlib/internal/svc"
+	"app.yhyue.com/moapp/jy_docs/rpc/userlib/userlib"
 
 	"github.com/tal-tech/go-zero/core/conf"
 	"github.com/tal-tech/go-zero/zrpc"

rpc/userlib/userlib/userlib.pb.go

@@ -83,30 +83,30 @@ func (UserDocCategory) EnumDescriptor() ([]byte, []int) {
 type UserDocFileType int32
 
 const (
-	UserDocFileType_Doc   UserDocFileType = 0
-	UserDocFileType_Pdf   UserDocFileType = 1
-	UserDocFileType_Xls   UserDocFileType = 2
-	UserDocFileType_Ppt   UserDocFileType = 3
-	UserDocFileType_Txt   UserDocFileType = 4
+	UserDocFileType_Word  UserDocFileType = 0
+	UserDocFileType_PDF   UserDocFileType = 1
+	UserDocFileType_EXCEL UserDocFileType = 2
+	UserDocFileType_PPT   UserDocFileType = 3
+	UserDocFileType_TXT   UserDocFileType = 4
 	UserDocFileType_Other UserDocFileType = 5
 )
 
 // Enum value maps for UserDocFileType.
 var (
 	UserDocFileType_name = map[int32]string{
-		0: "Doc",
-		1: "Pdf",
-		2: "Xls",
-		3: "Ppt",
-		4: "Txt",
+		0: "Word",
+		1: "PDF",
+		2: "EXCEL",
+		3: "PPT",
+		4: "TXT",
 		5: "Other",
 	}
 	UserDocFileType_value = map[string]int32{
-		"Doc":   0,
-		"Pdf":   1,
-		"Xls":   2,
-		"Ppt":   3,
-		"Txt":   4,
+		"Word":  0,
+		"PDF":   1,
+		"EXCEL": 2,
+		"PPT":   3,
+		"TXT":   4,
 		"Other": 5,
 	}
 )
@@ -277,7 +277,7 @@ func (x *UserCollectRequest) GetDocFileType() UserDocFileType {
 	if x != nil {
 		return x.DocFileType
 	}
-	return UserDocFileType_Doc
+	return UserDocFileType_Word
 }
 
 func (x *UserCollectRequest) GetDocFileSuffix() string {
@@ -828,35 +828,35 @@ var file_userlib_proto_rawDesc = []byte{
 	0x2a, 0x3c, 0x0a, 0x0f, 0x55, 0x73, 0x65, 0x72, 0x44, 0x6f, 0x63, 0x43, 0x61, 0x74, 0x65, 0x67,
 	0x6f, 0x72, 0x79, 0x12, 0x0e, 0x0a, 0x0a, 0x53, 0x65, 0x6c, 0x66, 0x55, 0x70, 0x6c, 0x6f, 0x61,
 	0x64, 0x10, 0x00, 0x12, 0x0c, 0x0a, 0x08, 0x44, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x10,
-	0x01, 0x12, 0x0b, 0x0a, 0x07, 0x43, 0x6f, 0x6c, 0x6c, 0x65, 0x63, 0x74, 0x10, 0x02, 0x2a, 0x49,
+	0x01, 0x12, 0x0b, 0x0a, 0x07, 0x43, 0x6f, 0x6c, 0x6c, 0x65, 0x63, 0x74, 0x10, 0x02, 0x2a, 0x4c,
 	0x0a, 0x0f, 0x55, 0x73, 0x65, 0x72, 0x44, 0x6f, 0x63, 0x46, 0x69, 0x6c, 0x65, 0x54, 0x79, 0x70,
-	0x65, 0x12, 0x07, 0x0a, 0x03, 0x44, 0x6f, 0x63, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x50, 0x64,
-	0x66, 0x10, 0x01, 0x12, 0x07, 0x0a, 0x03, 0x58, 0x6c, 0x73, 0x10, 0x02, 0x12, 0x07, 0x0a, 0x03,
-	0x50, 0x70, 0x74, 0x10, 0x03, 0x12, 0x07, 0x0a, 0x03, 0x54, 0x78, 0x74, 0x10, 0x04, 0x12, 0x09,
-	0x0a, 0x05, 0x4f, 0x74, 0x68, 0x65, 0x72, 0x10, 0x05, 0x2a, 0x43, 0x0a, 0x0d, 0x55, 0x73, 0x65,
-	0x72, 0x44, 0x6f, 0x63, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x0a, 0x0a, 0x06, 0x4e, 0x6f,
-	0x72, 0x6d, 0x61, 0x6c, 0x10, 0x00, 0x12, 0x0f, 0x0a, 0x0b, 0x4c, 0x6f, 0x67, 0x69, 0x63, 0x44,
-	0x65, 0x6c, 0x65, 0x74, 0x65, 0x10, 0x01, 0x12, 0x15, 0x0a, 0x11, 0x50, 0x65, 0x72, 0x6d, 0x61,
-	0x6e, 0x65, 0x6e, 0x74, 0x6c, 0x79, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x10, 0x02, 0x32, 0xa2,
-	0x02, 0x0a, 0x07, 0x55, 0x73, 0x65, 0x72, 0x4c, 0x69, 0x62, 0x12, 0x3f, 0x0a, 0x08, 0x55, 0x73,
-	0x65, 0x72, 0x44, 0x6f, 0x63, 0x73, 0x12, 0x18, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x6c, 0x69, 0x62,
-	0x2e, 0x55, 0x73, 0x65, 0x72, 0x44, 0x6f, 0x63, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x1a, 0x19, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x6c, 0x69, 0x62, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x44,
-	0x6f, 0x63, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x47, 0x0a, 0x0a, 0x44,
-	0x6f, 0x63, 0x43, 0x6f, 0x6c, 0x6c, 0x65, 0x63, 0x74, 0x12, 0x1b, 0x2e, 0x75, 0x73, 0x65, 0x72,
+	0x65, 0x12, 0x08, 0x0a, 0x04, 0x57, 0x6f, 0x72, 0x64, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x50,
+	0x44, 0x46, 0x10, 0x01, 0x12, 0x09, 0x0a, 0x05, 0x45, 0x58, 0x43, 0x45, 0x4c, 0x10, 0x02, 0x12,
+	0x07, 0x0a, 0x03, 0x50, 0x50, 0x54, 0x10, 0x03, 0x12, 0x07, 0x0a, 0x03, 0x54, 0x58, 0x54, 0x10,
+	0x04, 0x12, 0x09, 0x0a, 0x05, 0x4f, 0x74, 0x68, 0x65, 0x72, 0x10, 0x05, 0x2a, 0x43, 0x0a, 0x0d,
+	0x55, 0x73, 0x65, 0x72, 0x44, 0x6f, 0x63, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x0a, 0x0a,
+	0x06, 0x4e, 0x6f, 0x72, 0x6d, 0x61, 0x6c, 0x10, 0x00, 0x12, 0x0f, 0x0a, 0x0b, 0x4c, 0x6f, 0x67,
+	0x69, 0x63, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x10, 0x01, 0x12, 0x15, 0x0a, 0x11, 0x50, 0x65,
+	0x72, 0x6d, 0x61, 0x6e, 0x65, 0x6e, 0x74, 0x6c, 0x79, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x10,
+	0x02, 0x32, 0xa2, 0x02, 0x0a, 0x07, 0x55, 0x73, 0x65, 0x72, 0x4c, 0x69, 0x62, 0x12, 0x3f, 0x0a,
+	0x08, 0x55, 0x73, 0x65, 0x72, 0x44, 0x6f, 0x63, 0x73, 0x12, 0x18, 0x2e, 0x75, 0x73, 0x65, 0x72,
+	0x6c, 0x69, 0x62, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x44, 0x6f, 0x63, 0x73, 0x52, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x1a, 0x19, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x6c, 0x69, 0x62, 0x2e, 0x55, 0x73,
+	0x65, 0x72, 0x44, 0x6f, 0x63, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x47,
+	0x0a, 0x0a, 0x44, 0x6f, 0x63, 0x43, 0x6f, 0x6c, 0x6c, 0x65, 0x63, 0x74, 0x12, 0x1b, 0x2e, 0x75,
+	0x73, 0x65, 0x72, 0x6c, 0x69, 0x62, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x43, 0x6f, 0x6c, 0x6c, 0x65,
+	0x63, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1c, 0x2e, 0x75, 0x73, 0x65, 0x72,
 	0x6c, 0x69, 0x62, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x43, 0x6f, 0x6c, 0x6c, 0x65, 0x63, 0x74, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1c, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x6c, 0x69, 0x62,
-	0x2e, 0x55, 0x73, 0x65, 0x72, 0x43, 0x6f, 0x6c, 0x6c, 0x65, 0x63, 0x74, 0x52, 0x65, 0x73, 0x70,
-	0x6f, 0x6e, 0x73, 0x65, 0x12, 0x44, 0x0a, 0x09, 0x44, 0x6f, 0x63, 0x44, 0x65, 0x6c, 0x65, 0x74,
-	0x65, 0x12, 0x1a, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x6c, 0x69, 0x62, 0x2e, 0x55, 0x73, 0x65, 0x72,
-	0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1b, 0x2e,
-	0x75, 0x73, 0x65, 0x72, 0x6c, 0x69, 0x62, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x44, 0x65, 0x6c, 0x65,
-	0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x47, 0x0a, 0x0a, 0x44, 0x6f,
-	0x63, 0x52, 0x65, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x12, 0x1b, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x6c,
+	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x44, 0x0a, 0x09, 0x44, 0x6f, 0x63, 0x44, 0x65,
+	0x6c, 0x65, 0x74, 0x65, 0x12, 0x1a, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x6c, 0x69, 0x62, 0x2e, 0x55,
+	0x73, 0x65, 0x72, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+	0x1a, 0x1b, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x6c, 0x69, 0x62, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x44,
+	0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x47, 0x0a,
+	0x0a, 0x44, 0x6f, 0x63, 0x52, 0x65, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x12, 0x1b, 0x2e, 0x75, 0x73,
+	0x65, 0x72, 0x6c, 0x69, 0x62, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x73, 0x74, 0x6f, 0x72,
+	0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1c, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x6c,
 	0x69, 0x62, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x52, 0x65,
-	0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1c, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x6c, 0x69, 0x62, 0x2e,
-	0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f,
-	0x6e, 0x73, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (

rpc/userlib/userlibclient/userlib.go

@@ -8,21 +8,21 @@ package userlibclient
 import (
 	"context"
 
-	"app.yhyue.com/moapp/jydocs/rpc/userlib/userlib"
+	"app.yhyue.com/moapp/jy_docs/rpc/userlib/userlib"
 
 	"github.com/tal-tech/go-zero/zrpc"
 )
 
 type (
-	UserDocsRequest     = userlib.UserDocsRequest
-	UserDoc             = userlib.UserDoc
-	UserRestoreRequest  = userlib.UserRestoreRequest
-	UserRestoreResponse = userlib.UserRestoreResponse
+	UserCollectRequest  = userlib.UserCollectRequest
+	UserCollectResponse = userlib.UserCollectResponse
 	UserDeleteRequest   = userlib.UserDeleteRequest
+	UserRestoreRequest  = userlib.UserRestoreRequest
+	UserDoc             = userlib.UserDoc
 	UserDeleteResponse  = userlib.UserDeleteResponse
+	UserRestoreResponse = userlib.UserRestoreResponse
+	UserDocsRequest     = userlib.UserDocsRequest
 	UserDocsResponse    = userlib.UserDocsResponse
-	UserCollectRequest  = userlib.UserCollectRequest
-	UserCollectResponse = userlib.UserCollectResponse
 
 	UserLib interface {
 		UserDocs(ctx context.Context, in *UserDocsRequest) (*UserDocsResponse, error)

services/stdlib/docActivity.go

@@ -1,8 +1,8 @@
 package stdlib
 
 import (
-	"app.yhyue.com/moapp/jydocs/services/model"
-	jyDocsRpcUtil "app.yhyue.com/moapp/jydocs/services/util"
+	"app.yhyue.com/moapp/jy_docs/services/model"
+	jyDocsRpcUtil "app.yhyue.com/moapp/jy_docs/services/util"
 )
 
 func DocActivityList(pageSize, pageNum int) ([]model.DocActivity, int) {

services/stdlib/docChangeService.go

@@ -1,8 +1,8 @@
 package stdlib
 
 import (
+	jyDocsRpcUtil "app.yhyue.com/moapp/jy_docs/services/util"
 	elastic "app.yhyue.com/moapp/jybase/esv7"
-	jyDocsRpcUtil "app.yhyue.com/moapp/jydocs/services/util"
 	"errors"
 	"gorm.io/gorm"
 	"log"
@@ -48,7 +48,7 @@ func ChangeDocumentOn(id string, reason int32) bool {
 		log.Println("上架文档 error:"+id, err)
 		return false
 	}
-	log.Println("上架文档成功:"+id)
+	log.Println("上架文档成功:" + id)
 	return true
 }
 
@@ -88,6 +88,6 @@ func ChangeDocumentOff(id string, reason int32) bool {
 		log.Println("下架文档 error:"+id, err)
 		return false
 	}
-	log.Println("下架文档成功:"+id)
+	log.Println("下架文档成功:" + id)
 	return true
 }

services/stdlib/docService.go

@@ -1,7 +1,7 @@
 package stdlib
 
 import (
-	jyDocsRpcUtil "app.yhyue.com/moapp/jydocs/services/util"
+	jyDocsRpcUtil "app.yhyue.com/moapp/jy_docs/services/util"
 	"log"
 )
 

services/stdlib/docStatistics.go

@@ -5,7 +5,7 @@ import (
 	"time"
 
 	elastic "app.yhyue.com/moapp/jybase/esv7"
-	jyDocsRpcUtil "app.yhyue.com/moapp/jydocs/services/util"
+	jyDocsRpcUtil "app.yhyue.com/moapp/jy_docs/services/util"
 )
 
 func DocStatistics(docId string, dtype int) bool {

services/userlib/userDocService.go

@@ -1,8 +1,8 @@
 package userlib
 
 import (
-	"app.yhyue.com/moapp/jydocs/services/model"
-	docRpcUtil "app.yhyue.com/moapp/jydocs/services/util"
+	"app.yhyue.com/moapp/jy_docs/services/model"
+	docRpcUtil "app.yhyue.com/moapp/jy_docs/services/util"
 	"gorm.io/gorm"
 	"log"
 	"time"