wip:调整文件位置

api/knowledge/internal/logic/commonphrasesaddorupdatelogic.go

@@ -1,7 +1,7 @@
 package logic
 
 import (
-	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/knowledgeclient"
+	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/knowledge"
 	"context"
 	"github.com/zeromicro/go-zero/core/logx"
 
@@ -25,7 +25,7 @@ func NewCommonPhrasesAddOrUpdateLogic(ctx context.Context, svcCtx *svc.ServiceCo
 
 func (l *CommonPhrasesAddOrUpdateLogic) CommonPhrasesAddOrUpdate(req types.CommonPhrasesAddReq) (*types.CommonRes, error) {
 	// todo: add your logic here and delete this line
-	resp, err := l.svcCtx.Knowledge.CommonPhrasesAdd(l.ctx, &knowledgeclient.CommonPhrasesAddReq{
+	resp, err := l.svcCtx.Knowledge.CommonPhrasesAdd(l.ctx, &knowledge.CommonPhrasesAddReq{
 		Id:        req.Id,
 		Classify:  req.Classify,
 		Content:   req.Content,

api/knowledge/internal/logic/commonphrasesclasslistlogic.go

@@ -1,7 +1,7 @@
 package logic
 
 import (
-	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/knowledgeclient"
+	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/knowledge"
 	"context"
 	"github.com/zeromicro/go-zero/core/logx"
 
@@ -25,7 +25,7 @@ func NewCommonPhrasesClassListLogic(ctx context.Context, svcCtx *svc.ServiceCont
 
 func (l *CommonPhrasesClassListLogic) CommonPhrasesClassList(req types.CommonPhrasesClassListReq) (*types.CommonRes, error) {
 	// todo: add your logic here and delete this line
-	resp, err := l.svcCtx.Knowledge.CommonPhraseClassList(l.ctx, &knowledgeclient.CommonPhrasesClassListReq{
+	resp, err := l.svcCtx.Knowledge.CommonPhraseClassList(l.ctx, &knowledge.CommonPhrasesClassListReq{
 		EntId: req.EntId,
 		AppId: req.AppId,
 		Query: req.Query,

api/knowledge/internal/logic/commonphrasesdellogic.go

@@ -1,7 +1,7 @@
 package logic
 
 import (
-	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/knowledgeclient"
+	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/knowledge"
 	"context"
 	"github.com/zeromicro/go-zero/core/logx"
 
@@ -24,7 +24,7 @@ func NewCommonPhrasesDelLogic(ctx context.Context, svcCtx *svc.ServiceContext) C
 }
 
 func (l *CommonPhrasesDelLogic) CommonPhrasesDel(req types.CommonPhrasesInfoOrDelReq) (*types.CommonRes, error) {
-	resp, err := l.svcCtx.Knowledge.CommonPhrasesDel(l.ctx, &knowledgeclient.CommonPhrasesInfoReq{
+	resp, err := l.svcCtx.Knowledge.CommonPhrasesDel(l.ctx, &knowledge.CommonPhrasesInfoReq{
 		Id: req.Id,
 	})
 	if err != nil {

api/knowledge/internal/logic/commonphrasesinfologic.go

@@ -1,7 +1,7 @@
 package logic
 
 import (
-	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/knowledgeclient"
+	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/knowledge"
 	"context"
 	"github.com/zeromicro/go-zero/core/logx"
 
@@ -24,7 +24,7 @@ func NewCommonPhrasesInfoLogic(ctx context.Context, svcCtx *svc.ServiceContext)
 }
 
 func (l *CommonPhrasesInfoLogic) CommonPhrasesInfo(req types.CommonPhrasesInfoOrDelReq) (*types.CommonRes, error) {
-	resp, err := l.svcCtx.Knowledge.CommonPhrasesInfo(l.ctx, &knowledgeclient.CommonPhrasesInfoReq{
+	resp, err := l.svcCtx.Knowledge.CommonPhrasesInfo(l.ctx, &knowledge.CommonPhrasesInfoReq{
 		Id: req.Id,
 	})
 	if err != nil {

api/knowledge/internal/logic/commonphraseslistlogic.go

@@ -1,7 +1,7 @@
 package logic
 
 import (
-	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/knowledgeclient"
+	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/knowledge"
 	"context"
 	"github.com/zeromicro/go-zero/core/logx"
 
@@ -24,7 +24,7 @@ func NewCommonPhrasesListLogic(ctx context.Context, svcCtx *svc.ServiceContext)
 }
 
 func (l *CommonPhrasesListLogic) CommonPhrasesList(req types.CommonPhrasesListReq) (*types.CommonRes, error) {
-	resp, err := l.svcCtx.Knowledge.CommonPhrasesList(l.ctx, &knowledgeclient.CommonPhrasesListReq{
+	resp, err := l.svcCtx.Knowledge.CommonPhrasesList(l.ctx, &knowledge.CommonPhrasesListReq{
 		EntId:     req.EntId,
 		PageIndex: req.PageIndex,
 		PageSize:  req.PageSize,

api/knowledge/internal/logic/commonphrasesquerylogic.go

@@ -1,7 +1,7 @@
 package logic
 
 import (
-	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/knowledgeclient"
+	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/knowledge"
 	"context"
 	"github.com/zeromicro/go-zero/core/logx"
 
@@ -25,7 +25,7 @@ func NewCommonPhrasesQueryLogic(ctx context.Context, svcCtx *svc.ServiceContext)
 
 func (l *CommonPhrasesQueryLogic) CommonPhrasesQuery(req types.CommonPhrasesQueryReq) (*types.CommonRes, error) {
 	// todo: add your logic here and delete this line
-	resp, err := l.svcCtx.Knowledge.CommonPhraseQuery(l.ctx, &knowledgeclient.CommonPhraseQueryReq{
+	resp, err := l.svcCtx.Knowledge.CommonPhraseQuery(l.ctx, &knowledge.CommonPhraseQueryReq{
 		Query: req.Query,
 		EntId: req.EntId,
 		AppId: req.AppId,

api/knowledge/internal/logic/findanswerlogic.go

@@ -1,7 +1,7 @@
 package logic
 
 import (
-	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/knowledgeclient"
+	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/knowledge"
 	"context"
 	"github.com/zeromicro/go-zero/core/logx"
 
@@ -25,7 +25,7 @@ func NewFindAnswerLogic(ctx context.Context, svcCtx *svc.ServiceContext) FindAns
 
 func (l *FindAnswerLogic) FindAnswer(req types.FindAnswerReq) (*types.CommonRes, error) {
 	// todo: add your logic here and delete this line
-	resp, err := l.svcCtx.Knowledge.FindAnswer(l.ctx, &knowledgeclient.FindAnswerReq{
+	resp, err := l.svcCtx.Knowledge.FindAnswer(l.ctx, &knowledge.FindAnswerReq{
 		Type:       req.Type,
 		RobotEntId: req.RobotEntId,
 		Question:   req.Question,

api/knowledge/internal/logic/guesstoasklogic.go

@@ -2,7 +2,7 @@ package logic
 
 import (
 	. "app.yhyue.com/moapp/jybase/encrypt"
-	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/knowledgeclient"
+	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/knowledge"
 	"context"
 	"github.com/zeromicro/go-zero/core/logx"
 
@@ -26,7 +26,7 @@ func NewGuessToAskLogic(ctx context.Context, svcCtx *svc.ServiceContext) GuessTo
 
 func (l *GuessToAskLogic) GuessToAsk(req types.GuessToAskReq) (*types.CommonRes, error) {
 	// todo: add your logic here and delete this line
-	resp, err := l.svcCtx.Knowledge.RecommendAnswer(l.ctx, &knowledgeclient.FindAnswerReq{
+	resp, err := l.svcCtx.Knowledge.RecommendAnswer(l.ctx, &knowledge.FindAnswerReq{
 		Type:       req.Type,
 		RobotEntId: SE.Decode4Hex(req.EntId),
 		Question:   req.Question,

api/knowledge/internal/logic/keywordlistlogic.go

@@ -1,7 +1,7 @@
 package logic
 
 import (
-	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/knowledgeclient"
+	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/knowledge"
 	"context"
 
 	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/api/knowledge/internal/svc"
@@ -25,7 +25,7 @@ func NewKeywordListLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Keywo
 }
 
 func (l *KeywordListLogic) KeywordList(req *types.CommonPhrasesQueryReq) (resp *types.CommonRes, err error) {
-	res, rErr := l.svcCtx.Knowledge.KeywordList(l.ctx, &knowledgeclient.CommonPhraseQueryReq{
+	res, rErr := l.svcCtx.Knowledge.KeywordList(l.ctx, &knowledge.CommonPhraseQueryReq{
 		Query: req.Query,
 		EntId: req.EntId,
 		AppId: req.AppId,

api/knowledge/internal/logic/knowledgeaddlogic.go

@@ -3,7 +3,7 @@ package logic
 import (
 	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/api/knowledge/internal/svc"
 	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/api/knowledge/internal/types"
-	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/knowledgeclient"
+	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/knowledge"
 	"context"
 	"github.com/zeromicro/go-zero/core/logx"
 )
@@ -24,7 +24,7 @@ func NewKnowledgeAddLogic(ctx context.Context, svcCtx *svc.ServiceContext) Knowl
 
 func (l *KnowledgeAddLogic) KnowledgeAdd(req types.AddKnowledgeReq) (*types.CommonRes, error) {
 
-	resp, err := l.svcCtx.Knowledge.KnowledgeAdd(l.ctx, &knowledgeclient.AddRequest{
+	resp, err := l.svcCtx.Knowledge.KnowledgeAdd(l.ctx, &knowledge.AddRequest{
 		Question:  req.Question,
 		Answer:    req.Answer,
 		EntUserId: req.EntUserId,

api/knowledge/internal/logic/knowledgedellogic.go

@@ -1,7 +1,7 @@
 package logic
 
 import (
-	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/knowledgeclient"
+	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/knowledge"
 	"context"
 	"github.com/zeromicro/go-zero/core/logx"
 
@@ -25,7 +25,7 @@ func NewKnowledgeDelLogic(ctx context.Context, svcCtx *svc.ServiceContext) Knowl
 
 func (l *KnowledgeDelLogic) KnowledgeDel(req types.DeleteReq) (*types.CommonRes, error) {
 	// todo: add your logic here and delete this line
-	resp, err := l.svcCtx.Knowledge.KnowledgeDel(l.ctx, &knowledgeclient.KnowledgeDelReq{
+	resp, err := l.svcCtx.Knowledge.KnowledgeDel(l.ctx, &knowledge.KnowledgeDelReq{
 		AnswerId: req.AnswerId,
 	})
 	if err != nil {

api/knowledge/internal/logic/knowledgeeditlogic.go

@@ -1,7 +1,7 @@
 package logic
 
 import (
-	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/knowledgeclient"
+	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/knowledge"
 	"context"
 	"github.com/zeromicro/go-zero/core/logx"
 
@@ -25,7 +25,7 @@ func NewKnowledgeEditLogic(ctx context.Context, svcCtx *svc.ServiceContext) Know
 
 func (l *KnowledgeEditLogic) KnowledgeEdit(req types.EditReq) (*types.CommonRes, error) {
 	// todo: add your logic here and delete this line
-	resp, err := l.svcCtx.Knowledge.KnowledgeEdit(l.ctx, &knowledgeclient.KnowledgeEditReq{
+	resp, err := l.svcCtx.Knowledge.KnowledgeEdit(l.ctx, &knowledge.KnowledgeEditReq{
 		Question:    req.Question,
 		Answer:      req.Answer,
 		AnswerId:    req.AnswerId,

api/knowledge/internal/logic/knowledgeinfologic.go

@@ -1,7 +1,7 @@
 package logic
 
 import (
-	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/knowledgeclient"
+	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/knowledge"
 	"context"
 	"github.com/zeromicro/go-zero/core/logx"
 
@@ -25,7 +25,7 @@ func NewKnowledgeInfoLogic(ctx context.Context, svcCtx *svc.ServiceContext) Know
 
 func (l *KnowledgeInfoLogic) KnowledgeInfo(req types.InfoReq) (*types.CommonRes, error) {
 	// todo: add your logic here and delete this line
-	resp, err := l.svcCtx.Knowledge.KnowledgeInfo(l.ctx, &knowledgeclient.KnowledgeEntity{
+	resp, err := l.svcCtx.Knowledge.KnowledgeInfo(l.ctx, &knowledge.KnowledgeEntity{
 		AnswerId: req.AnswerId,
 	})
 	if err != nil {

api/knowledge/internal/logic/knowledgelistlogic.go

@@ -1,7 +1,7 @@
 package logic
 
 import (
-	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/knowledgeclient"
+	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/knowledge"
 	"context"
 	"github.com/zeromicro/go-zero/core/logx"
 	"log"
@@ -26,7 +26,7 @@ func NewKnowledgeListLogic(ctx context.Context, svcCtx *svc.ServiceContext) Know
 
 func (l *KnowledgeListLogic) KnowledgeList(req types.ListReq) (*types.CommonRes, error) {
 	// todo: add your logic here and delete this line
-	resp, err := l.svcCtx.Knowledge.KnowledgeList(l.ctx, &knowledgeclient.ListRequest{
+	resp, err := l.svcCtx.Knowledge.KnowledgeList(l.ctx, &knowledge.ListRequest{
 		EntId:     req.EntId,
 		PageIndex: req.PageIndex,
 		PageSize:  req.PageSize,

api/knowledge/internal/logic/recommendanswerlogic.go

@@ -3,7 +3,7 @@ package logic
 import (
 	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/api/knowledge/internal/svc"
 	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/api/knowledge/internal/types"
-	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/knowledgeclient"
+	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/knowledge"
 	"context"
 	"github.com/zeromicro/go-zero/core/logx"
 )
@@ -24,7 +24,7 @@ func NewRecommendAnswerLogic(ctx context.Context, svcCtx *svc.ServiceContext) Re
 
 func (l *RecommendAnswerLogic) RecommendAnswer(req types.RecommendAnswerReq) (*types.CommonRes, error) {
 	// todo: add your logic here and delete this line
-	resp, err := l.svcCtx.Knowledge.RecommendAnswer(l.ctx, &knowledgeclient.FindAnswerReq{
+	resp, err := l.svcCtx.Knowledge.RecommendAnswer(l.ctx, &knowledge.FindAnswerReq{
 		Type:       req.Type,
 		RobotEntId: req.RobotEntId,
 		Question:   req.Question,

api/knowledge/internal/svc/servicecontext.go

@@ -2,18 +2,18 @@ package svc
 
 import (
 	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/api/knowledge/internal/config"
-	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/knowledgeclient"
+	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/knowledge"
 	"github.com/zeromicro/go-zero/zrpc"
 )
 
 type ServiceContext struct {
 	Config    config.Config
-	Knowledge knowledgeclient.Knowledge
+	Knowledge knowledge.Knowledge
 }
 
 func NewServiceContext(c config.Config) *ServiceContext {
 	return &ServiceContext{
 		Config:    c,
-		Knowledge: knowledgeclient.NewKnowledge(zrpc.MustNewClient(c.Knowledge)),
+		Knowledge: knowledge.NewKnowledge(zrpc.MustNewClient(c.Knowledge)),
 	}
 }

rpc/knowledge/internal/logic/commonphraseclasslistlogic.go

@@ -2,7 +2,7 @@ package logic
 
 import (
 	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/internal/service"
-	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/knowledgeclient"
+	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/knowledge"
 	"context"
 	"github.com/zeromicro/go-zero/core/logx"
 
@@ -24,9 +24,9 @@ func NewCommonPhraseClassListLogic(ctx context.Context, svcCtx *svc.ServiceConte
 }
 
 // CommonPhraseClassList 客服话术分类查询
-func (l *CommonPhraseClassListLogic) CommonPhraseClassList(in *knowledgeclient.CommonPhrasesClassListReq) (*knowledgeclient.CommonPhrasesClassListResp, error) {
+func (l *CommonPhraseClassListLogic) CommonPhraseClassList(in *knowledge.CommonPhrasesClassListReq) (*knowledge.CommonPhrasesClassListResp, error) {
 	// todo: add your logic here and delete this line
-	result := &knowledgeclient.CommonPhrasesClassListResp{}
+	result := &knowledge.CommonPhrasesClassListResp{}
 	c := service.CommonPhrasesService{}
 	commonPhrasesClassList := c.CommonPhrasesClassList(in)
 	result.ErrorCode = 0

rpc/knowledge/internal/logic/commonphrasequerylogic.go

@@ -3,7 +3,7 @@ package logic
 import (
 	. "bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/init"
 	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/internal/service"
-	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/knowledgeclient"
+	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/knowledge"
 	"context"
 	"fmt"
 	"github.com/zeromicro/go-zero/core/logx"
@@ -26,10 +26,10 @@ func NewCommonPhraseQueryLogic(ctx context.Context, svcCtx *svc.ServiceContext)
 }
 
 // 客服输入文字，匹配话术
-func (l *CommonPhraseQueryLogic) CommonPhraseQuery(in *knowledgeclient.CommonPhraseQueryReq) (*knowledgeclient.CommonPhraseQueryResp, error) {
+func (l *CommonPhraseQueryLogic) CommonPhraseQuery(in *knowledge.CommonPhraseQueryReq) (*knowledge.CommonPhraseQueryResp, error) {
 	// todo: add your logic here and delete this line
 
-	var result = &knowledgeclient.CommonPhraseQueryResp{}
+	var result = &knowledge.CommonPhraseQueryResp{}
 	c := service.CommonPhrasesService{}
 	contents := c.CommonPhraseQuery(in, C.Segment, C.FindCount)
 	result.ErrorCode = 0

rpc/knowledge/internal/logic/commonphrasesaddlogic.go

@@ -3,7 +3,7 @@ package logic
 import (
 	. "bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/init"
 	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/internal/service"
-	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/knowledgeclient"
+	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/knowledge"
 	"context"
 	"github.com/zeromicro/go-zero/core/logx"
 
@@ -25,8 +25,8 @@ func NewCommonPhrasesAddLogic(ctx context.Context, svcCtx *svc.ServiceContext) *
 }
 
 // CommonPhrasesAdd 客服话术添加、编辑
-func (l *CommonPhrasesAddLogic) CommonPhrasesAdd(in *knowledgeclient.CommonPhrasesAddReq) (*knowledgeclient.AddResponse, error) {
-	result := &knowledgeclient.AddResponse{}
+func (l *CommonPhrasesAddLogic) CommonPhrasesAdd(in *knowledge.CommonPhrasesAddReq) (*knowledge.AddResponse, error) {
+	result := &knowledge.AddResponse{}
 	c := service.CommonPhrasesService{}
 	ok, msg := c.CommonPhrasesAdd(in, C.Segment)
 	if ok {

rpc/knowledge/internal/logic/commonphrasesdellogic.go

@@ -2,7 +2,7 @@ package logic
 
 import (
 	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/internal/service"
-	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/knowledgeclient"
+	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/knowledge"
 	"context"
 	"github.com/zeromicro/go-zero/core/logx"
 
@@ -24,8 +24,8 @@ func NewCommonPhrasesDelLogic(ctx context.Context, svcCtx *svc.ServiceContext) *
 }
 
 // CommonPhrasesDel 客服话术删除
-func (l *CommonPhrasesDelLogic) CommonPhrasesDel(in *knowledgeclient.CommonPhrasesInfoReq) (*knowledgeclient.AddResponse, error) {
-	result := &knowledgeclient.AddResponse{}
+func (l *CommonPhrasesDelLogic) CommonPhrasesDel(in *knowledge.CommonPhrasesInfoReq) (*knowledge.AddResponse, error) {
+	result := &knowledge.AddResponse{}
 	c := service.CommonPhrasesService{}
 	ok := c.CommonPhrasesDel(in.Id)
 	if ok {

rpc/knowledge/internal/logic/commonphrasesinfologic.go

@@ -2,7 +2,7 @@ package logic
 
 import (
 	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/internal/service"
-	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/knowledgeclient"
+	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/knowledge"
 	"context"
 	"github.com/zeromicro/go-zero/core/logx"
 
@@ -24,8 +24,8 @@ func NewCommonPhrasesInfoLogic(ctx context.Context, svcCtx *svc.ServiceContext)
 }
 
 // CommonPhrasesInfo 客服话术详情
-func (l *CommonPhrasesInfoLogic) CommonPhrasesInfo(in *knowledgeclient.CommonPhrasesInfoReq) (*knowledgeclient.CommonPhrasesInfoResp, error) {
-	result := &knowledgeclient.CommonPhrasesInfoResp{}
+func (l *CommonPhrasesInfoLogic) CommonPhrasesInfo(in *knowledge.CommonPhrasesInfoReq) (*knowledge.CommonPhrasesInfoResp, error) {
+	result := &knowledge.CommonPhrasesInfoResp{}
 	c := service.CommonPhrasesService{}
 	info, ok := c.CommonPhrasesInfo(in.Id)
 	if info != nil && ok {

rpc/knowledge/internal/logic/commonphraseslistlogic.go

@@ -2,7 +2,7 @@ package logic
 
 import (
 	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/internal/service"
-	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/knowledgeclient"
+	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/knowledge"
 	"context"
 	"github.com/zeromicro/go-zero/core/logx"
 
@@ -24,8 +24,8 @@ func NewCommonPhrasesListLogic(ctx context.Context, svcCtx *svc.ServiceContext)
 }
 
 // CommonPhrasesList 客服话术列表
-func (l *CommonPhrasesListLogic) CommonPhrasesList(in *knowledgeclient.CommonPhrasesListReq) (*knowledgeclient.CommonPhrasesListResp, error) {
-	result := &knowledgeclient.CommonPhrasesListResp{}
+func (l *CommonPhrasesListLogic) CommonPhrasesList(in *knowledge.CommonPhrasesListReq) (*knowledge.CommonPhrasesListResp, error) {
+	result := &knowledge.CommonPhrasesListResp{}
 	c := service.CommonPhrasesService{}
 	commonPhrasesList := c.CommonPhrasesList(in)
 	result.ErrorCode = 0

rpc/knowledge/internal/logic/findanswerlogic.go

@@ -4,7 +4,7 @@ import (
 	. "bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/init"
 	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/internal/service"
 	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/internal/svc"
-	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/knowledgeclient"
+	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/knowledge"
 	"context"
 	"github.com/zeromicro/go-zero/core/logx"
 )
@@ -24,11 +24,11 @@ func NewFindAnswerLogic(ctx context.Context, svcCtx *svc.ServiceContext) *FindAn
 }
 
 // FindAnswer 根据问题查询答案
-func (l *FindAnswerLogic) FindAnswer(in *knowledgeclient.FindAnswerReq) (*knowledgeclient.FindAnswerResp, error) {
+func (l *FindAnswerLogic) FindAnswer(in *knowledge.FindAnswerReq) (*knowledge.FindAnswerResp, error) {
 
 	k := service.KnowledgeService{}
 	question := k.FindAnswer(in, C.Es.Addr, C.Es.Index, C.Segment)
-	return &knowledgeclient.FindAnswerResp{
+	return &knowledge.FindAnswerResp{
 		ErrorCode: 0,
 		ErrorMsg:  "请求成功",
 		Data:      question,

rpc/knowledge/internal/logic/keywordlistlogic.go

@@ -5,7 +5,7 @@ import (
 	"context"
 
 	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/internal/svc"
-	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/knowledgeclient"
+	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/knowledge"
 
 	"github.com/zeromicro/go-zero/core/logx"
 )
@@ -25,6 +25,6 @@ func NewKeywordListLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Keywo
 }
 
 // 聊天框 关键词信息
-func (l *KeywordListLogic) KeywordList(in *knowledgeclient.CommonPhraseQueryReq) (*knowledgeclient.KeywordListResp, error) {
+func (l *KeywordListLogic) KeywordList(in *knowledge.CommonPhraseQueryReq) (*knowledge.KeywordListResp, error) {
 	return service.NewSKeywordService(in).GetKeywordList()
 }

rpc/knowledge/internal/logic/knowledgeaddlogic.go

@@ -4,7 +4,7 @@ import (
 	. "bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/init"
 	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/internal/service"
 	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/internal/svc"
-	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/knowledgeclient"
+	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/knowledge"
 	"context"
 	"github.com/zeromicro/go-zero/core/logx"
 )
@@ -29,8 +29,8 @@ type Question struct {
 }
 
 // KnowledgeAdd 知识新增
-func (l *KnowledgeAddLogic) KnowledgeAdd(in *knowledgeclient.AddRequest) (*knowledgeclient.AddResponse, error) {
-	result := &knowledgeclient.AddResponse{}
+func (l *KnowledgeAddLogic) KnowledgeAdd(in *knowledge.AddRequest) (*knowledge.AddResponse, error) {
+	result := &knowledge.AddResponse{}
 	k := service.KnowledgeService{}
 	ok, msg := k.KnowledgeAdd(in, C.Segment)
 	if !ok {

rpc/knowledge/internal/logic/knowledgedellogic.go

@@ -3,7 +3,7 @@ package logic
 import (
 	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/internal/service"
 	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/internal/svc"
-	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/knowledgeclient"
+	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/knowledge"
 	"context"
 	"github.com/zeromicro/go-zero/core/logx"
 )
@@ -23,9 +23,9 @@ func NewKnowledgeDelLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Know
 }
 
 // KnowledgeDel 知识删除
-func (l *KnowledgeDelLogic) KnowledgeDel(in *knowledgeclient.KnowledgeDelReq) (*knowledgeclient.AddResponse, error) {
+func (l *KnowledgeDelLogic) KnowledgeDel(in *knowledge.KnowledgeDelReq) (*knowledge.AddResponse, error) {
 	// todo: add your logic here and delete this line
-	result := &knowledgeclient.AddResponse{}
+	result := &knowledge.AddResponse{}
 	k := service.KnowledgeService{}
 	ok := k.KnowledgeDel(in.AnswerId)
 	if ok {

rpc/knowledge/internal/logic/knowledgeeditlogic.go

@@ -4,7 +4,7 @@ import (
 	. "bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/init"
 	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/internal/service"
 	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/internal/svc"
-	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/knowledgeclient"
+	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/knowledge"
 	"context"
 	"github.com/zeromicro/go-zero/core/logx"
 )
@@ -24,9 +24,9 @@ func NewKnowledgeEditLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Kno
 }
 
 // KnowledgeEdit 知识编辑
-func (l *KnowledgeEditLogic) KnowledgeEdit(in *knowledgeclient.KnowledgeEditReq) (*knowledgeclient.AddResponse, error) {
+func (l *KnowledgeEditLogic) KnowledgeEdit(in *knowledge.KnowledgeEditReq) (*knowledge.AddResponse, error) {
 
-	result := &knowledgeclient.AddResponse{}
+	result := &knowledge.AddResponse{}
 	k := service.KnowledgeService{}
 	ok := k.KnowledgeEdit(in, C.Segment)
 	if !ok {

rpc/knowledge/internal/logic/knowledgeinfologic.go

@@ -3,7 +3,7 @@ package logic
 import (
 	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/internal/service"
 	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/internal/svc"
-	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/knowledgeclient"
+	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/knowledge"
 	"context"
 	"github.com/zeromicro/go-zero/core/logx"
 )
@@ -23,10 +23,10 @@ func NewKnowledgeInfoLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Kno
 }
 
 // KnowledgeInfo 知识详情
-func (l *KnowledgeInfoLogic) KnowledgeInfo(in *knowledgeclient.KnowledgeEntity) (*knowledgeclient.InfoResponse, error) {
+func (l *KnowledgeInfoLogic) KnowledgeInfo(in *knowledge.KnowledgeEntity) (*knowledge.InfoResponse, error) {
 	// todo: add your logic here and delete this line
 	//答案问题详情
-	result := &knowledgeclient.InfoResponse{}
+	result := &knowledge.InfoResponse{}
 	k := service.KnowledgeService{}
 	knowledge, ok := k.KnowledgeInfo(in.AnswerId)
 	if knowledge != nil && ok {

rpc/knowledge/internal/logic/knowledgelistlogic.go

@@ -3,7 +3,7 @@ package logic
 import (
 	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/internal/service"
 	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/internal/svc"
-	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/knowledgeclient"
+	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/knowledge"
 	"context"
 	"github.com/zeromicro/go-zero/core/logx"
 )
@@ -23,9 +23,9 @@ func NewKnowledgeListLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Kno
 }
 
 // KnowledgeList 知识列表
-func (l *KnowledgeListLogic) KnowledgeList(in *knowledgeclient.ListRequest) (*knowledgeclient.ListResponse, error) {
+func (l *KnowledgeListLogic) KnowledgeList(in *knowledge.ListRequest) (*knowledge.ListResponse, error) {
 	// todo: add your logic here and delete this line
-	result := &knowledgeclient.ListResponse{}
+	result := &knowledge.ListResponse{}
 	k := service.KnowledgeService{}
 	knowledgeList := k.KnowledgeList(in)
 	result.ErrorCode = 0

rpc/knowledge/internal/logic/recommendanswerlogic.go

@@ -4,7 +4,7 @@ import (
 	. "bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/init"
 	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/internal/service"
 	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/internal/svc"
-	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/knowledgeclient"
+	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/knowledge"
 	"context"
 	"github.com/zeromicro/go-zero/core/logx"
 )
@@ -24,8 +24,8 @@ func NewRecommendAnswerLogic(ctx context.Context, svcCtx *svc.ServiceContext) *R
 }
 
 // RecommendAnswer 根据问题推荐3个答案
-func (l *RecommendAnswerLogic) RecommendAnswer(in *knowledgeclient.FindAnswerReq) (*knowledgeclient.RecommendAnswerResp, error) {
-	var result = &knowledgeclient.RecommendAnswerResp{}
+func (l *RecommendAnswerLogic) RecommendAnswer(in *knowledge.FindAnswerReq) (*knowledge.RecommendAnswerResp, error) {
+	var result = &knowledge.RecommendAnswerResp{}
 	k := service.KnowledgeService{}
 	answers := k.RecommendAnswer(in, C.Segment, C.RecommendQuestionCount)
 	//fmt.Println("推荐答案2", answers)

rpc/knowledge/internal/service/commonPhrasesService.go

@@ -4,7 +4,7 @@ import (
 	cm "app.yhyue.com/moapp/jybase/common"
 	elastic "app.yhyue.com/moapp/jybase/esv1"
 	. "bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/entity"
-	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/knowledgeclient"
+	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/knowledge"
 	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/util"
 	"github.com/zeromicro/go-zero/core/logx"
 	"log"
@@ -20,7 +20,7 @@ var (
 )
 
 // CommonPhrasesAdd 客服话术添加
-func (c *CommonPhrasesService) CommonPhrasesAdd(param *knowledgeclient.CommonPhrasesAddReq, segment string) (ok bool, msg string) {
+func (c *CommonPhrasesService) CommonPhrasesAdd(param *knowledge.CommonPhrasesAddReq, segment string) (ok bool, msg string) {
 	ok = true
 	msg = "操作成功"
 	//分词
@@ -101,11 +101,11 @@ func (c *CommonPhrasesService) CommonPhrasesAdd(param *knowledgeclient.CommonPhr
 }
 
 // CommonPhrasesInfo 客服话术详情
-func (c *CommonPhrasesService) CommonPhrasesInfo(id int64) (data *knowledgeclient.CommonPhrases, ok bool) {
+func (c *CommonPhrasesService) CommonPhrasesInfo(id int64) (data *knowledge.CommonPhrases, ok bool) {
 	info := Mysql.FindOne(util.COMMONPHRASES, map[string]interface{}{"id": id}, "", "")
 
 	if info != nil && len(*info) > 0 {
-		data = &knowledgeclient.CommonPhrases{}
+		data = &knowledge.CommonPhrases{}
 		data.Id = cm.Int64All((*info)["id"])
 		data.Classify = cm.ObjToString((*info)["classify"])
 		data.Content = cm.ObjToString((*info)["content"])
@@ -127,15 +127,15 @@ func (c *CommonPhrasesService) CommonPhrasesDel(id int64) bool {
 }
 
 // CommonPhrasesList 客服话术列表
-func (c *CommonPhrasesService) CommonPhrasesList(param *knowledgeclient.CommonPhrasesListReq) *knowledgeclient.CommonPhrasesList {
-	var commonPhrasesList knowledgeclient.CommonPhrasesList
-	var data []*knowledgeclient.CommonPhrases
+func (c *CommonPhrasesService) CommonPhrasesList(param *knowledge.CommonPhrasesListReq) *knowledge.CommonPhrasesList {
+	var commonPhrasesList knowledge.CommonPhrasesList
+	var data []*knowledge.CommonPhrases
 	count := Mysql.Count(util.COMMONPHRASES, map[string]interface{}{"status": 0, "appId": param.AppId, "entId": param.EntId})
 	if count > 0 {
 		dataList := Mysql.Find(util.COMMONPHRASES, map[string]interface{}{"status": 0, "appId": param.AppId, "entId": param.EntId}, "", "updateTime desc", cm.IntAll((param.PageIndex-1)*param.PageSize), cm.IntAll(param.PageSize))
 		if dataList != nil && len(*dataList) > 0 {
 			for _, val := range *dataList {
-				data = append(data, &knowledgeclient.CommonPhrases{
+				data = append(data, &knowledge.CommonPhrases{
 					Id:       cm.Int64All(val["id"]),
 					Content:  cm.ObjToString(val["content"]),
 					Classify: cm.ObjToString(val["classify"]),
@@ -149,8 +149,8 @@ func (c *CommonPhrasesService) CommonPhrasesList(param *knowledgeclient.CommonPh
 }
 
 // CommonPhrasesClassList 客服话术分类
-func (c *CommonPhrasesService) CommonPhrasesClassList(param *knowledgeclient.CommonPhrasesClassListReq) []*knowledgeclient.CommonPhrasesClassListData {
-	var classListArr []*knowledgeclient.CommonPhrasesClassListData
+func (c *CommonPhrasesService) CommonPhrasesClassList(param *knowledge.CommonPhrasesClassListReq) []*knowledge.CommonPhrasesClassListData {
+	var classListArr []*knowledge.CommonPhrasesClassListData
 	//先查询数据在分类、排序
 	data := &[]map[string]interface{}{}
 	if param.Query != "" {
@@ -167,10 +167,10 @@ func (c *CommonPhrasesService) CommonPhrasesClassList(param *knowledgeclient.Com
 		}
 		if m != nil && len(m) > 0 {
 			for k, v := range m {
-				classList := &knowledgeclient.CommonPhrasesClassListData{}
+				classList := &knowledge.CommonPhrasesClassListData{}
 				classList.Classify = k
 				for _, i := range v {
-					classList.ClassList = append(classList.ClassList, &knowledgeclient.Content{
+					classList.ClassList = append(classList.ClassList, &knowledge.Content{
 						Content: i,
 					})
 				}
@@ -183,11 +183,11 @@ func (c *CommonPhrasesService) CommonPhrasesClassList(param *knowledgeclient.Com
 	return classListArr
 }
 
-func (c *CommonPhrasesService) CommonPhraseQuery(param *knowledgeclient.CommonPhraseQueryReq, segment string, findCount int) []*knowledgeclient.Content {
+func (c *CommonPhrasesService) CommonPhraseQuery(param *knowledge.CommonPhraseQueryReq, segment string, findCount int) []*knowledge.Content {
 	var (
 		keyWords    = ""
 		searchField = `"content"`
-		contents    []*knowledgeclient.Content
+		contents    []*knowledge.Content
 	)
 	//根据问题进行分词
 	keywordsArr := util.HanlpGetNormalWords(param.Query, segment)
@@ -205,7 +205,7 @@ func (c *CommonPhrasesService) CommonPhraseQuery(param *knowledgeclient.CommonPh
 	res := elastic.GetAllByNgram(INDEX, TYPE, query, "", "", searchField, 0, findCount, 0, false)
 	if res != nil && len(*res) > 0 {
 		for _, val := range *res {
-			contents = append(contents, &knowledgeclient.Content{
+			contents = append(contents, &knowledge.Content{
 				Content: cm.ObjToString(val["content"]),
 			})
 		}

rpc/knowledge/internal/service/keywordlistService.go

@@ -2,27 +2,27 @@ package service
 
 import (
 	. "bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/entity"
-	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/knowledgeclient"
+	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/knowledge"
 	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/util"
 	"encoding/json"
 	"fmt"
 )
 
 type SKeywordService struct {
-	*knowledgeclient.CommonPhraseQueryReq
+	*knowledge.CommonPhraseQueryReq
 }
 
-func NewSKeywordService(in *knowledgeclient.CommonPhraseQueryReq) *SKeywordService {
+func NewSKeywordService(in *knowledge.CommonPhraseQueryReq) *SKeywordService {
 	return &SKeywordService{
 		in,
 	}
 }
-func (s *SKeywordService) GetKeywordList() (resp *knowledgeclient.KeywordListResp, err error) {
+func (s *SKeywordService) GetKeywordList() (resp *knowledge.KeywordListResp, err error) {
 	res := Mysql.SelectBySql(fmt.Sprintf(`SELECT sk.name,sk.state,sk.mold FROM %s sk`, util.TableKeyword))
 	if res != nil && len(*res) > 0 {
 		var (
 			b, e = json.Marshal(*res)
-			list []*knowledgeclient.KeywordList
+			list []*knowledge.KeywordList
 		)
 		if e == nil && len(b) > 0 {
 			e = json.Unmarshal(b, &list)

rpc/knowledge/internal/service/knowledgeService.go

@@ -6,7 +6,7 @@ import (
 	elastic "app.yhyue.com/moapp/jybase/esv1"
 	. "bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/entity"
 	ki "bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/init"
-	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/knowledgeclient"
+	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/knowledge"
 	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/util"
 	"database/sql"
 	"fmt"
@@ -24,7 +24,7 @@ var (
 )
 
 // KnowledgeAdd 添加问题
-func (k *KnowledgeService) KnowledgeAdd(param *knowledgeclient.AddRequest, segment string) (bool, string) {
+func (k *KnowledgeService) KnowledgeAdd(param *knowledge.AddRequest, segment string) (bool, string) {
 	//先查找知识库Id
 	query := map[string]interface{}{"status": 1, "appid": param.AppId, "ent_id": param.EntId}
 	datalist := Mysql.Find(util.KNOWLEDGE, query, "id", "", -1, -1)
@@ -111,7 +111,7 @@ func (k *KnowledgeService) KnowledgeAdd(param *knowledgeclient.AddRequest, segme
 }
 
 // KnowledgeEdit 编辑问题
-func (k *KnowledgeService) KnowledgeEdit(param *knowledgeclient.KnowledgeEditReq, segment string) (ok bool) {
+func (k *KnowledgeService) KnowledgeEdit(param *knowledge.KnowledgeEditReq, segment string) (ok bool) {
 	ok = false
 	//获取问题分词
 	keywords := ""
@@ -194,9 +194,9 @@ func (k *KnowledgeService) KnowledgeEdit(param *knowledgeclient.KnowledgeEditReq
 }
 
 // KnowledgeList 问题列表
-func (k *KnowledgeService) KnowledgeList(param *knowledgeclient.ListRequest) *knowledgeclient.ListData {
-	var knowledgeList knowledgeclient.ListData
-	var data []*knowledgeclient.KnowledgeEntity
+func (k *KnowledgeService) KnowledgeList(param *knowledge.ListRequest) *knowledge.ListData {
+	var knowledgeList knowledge.ListData
+	var data []*knowledge.KnowledgeEntity
 	countSql := fmt.Sprintf("SELECT COUNT(b.id) FROM %s a LEFT JOIN %s b ON a.id = b.knowledge_id LEFT JOIN %s c ON b.id = c.answer_id WHERE b.`status` =1 and a.ent_id=%d", util.KNOWLEDGE, util.ANSWER, util.QUESTION, param.EntId)
 	count := Mysql.CountBySql(countSql)
 	if count > 0 {
@@ -205,7 +205,7 @@ func (k *KnowledgeService) KnowledgeList(param *knowledgeclient.ListRequest) *kn
 		datalist := Mysql.SelectBySql(sql1, param.EntId, (param.PageIndex-1)*param.PageSize, param.PageSize)
 		if datalist != nil && *datalist != nil && len(*datalist) > 0 {
 			for _, value := range *datalist {
-				knowledge := knowledgeclient.KnowledgeEntity{}
+				knowledge := knowledge.KnowledgeEntity{}
 				knowledge.Answer = cm.ObjToString(value["answer"])
 				knowledge.Question = cm.ObjToString(value["question"])
 				knowledge.AnswerId = cm.Int64All(value["id"])
@@ -220,12 +220,12 @@ func (k *KnowledgeService) KnowledgeList(param *knowledgeclient.ListRequest) *kn
 }
 
 // KnowledgeInfo 问题详情
-func (k *KnowledgeService) KnowledgeInfo(answerId int64) (data *knowledgeclient.KnowledgeEntity, ok bool) {
+func (k *KnowledgeService) KnowledgeInfo(answerId int64) (data *knowledge.KnowledgeEntity, ok bool) {
 	//util.ANSWER,util.QUESTION
 	sql1 := fmt.Sprintf("SELECT b.content as answer,c.content as question,b.id,b.knowledge_id  FROM %s b LEFT JOIN %s c ON b.id = c.answer_id WHERE b.`status` =1 AND b.id = %d", util.ANSWER, util.QUESTION, answerId)
 	datalist := Mysql.SelectBySql(sql1)
 	if datalist != nil && *datalist != nil && len(*datalist) > 0 {
-		knowledge := knowledgeclient.KnowledgeEntity{}
+		knowledge := knowledge.KnowledgeEntity{}
 		knowledge.Answer = cm.ObjToString((*datalist)[0]["answer"])
 		knowledge.Question = cm.ObjToString((*datalist)[0]["question"])
 		knowledge.AnswerId = cm.Int64All((*datalist)[0]["id"])
@@ -258,8 +258,8 @@ func (k *KnowledgeService) KnowledgeDel(answerId int64) (ok bool) {
 }
 
 // FindAnswer 根据问题推荐一个答案
-func (k *KnowledgeService) FindAnswer(param *knowledgeclient.FindAnswerReq, addr, index, segment string) *knowledgeclient.Question {
-	var question knowledgeclient.Question
+func (k *KnowledgeService) FindAnswer(param *knowledge.FindAnswerReq, addr, index, segment string) *knowledge.Question {
+	var question knowledge.Question
 	if len([]rune(param.Question)) <= 1 {
 		return &question
 	}
@@ -295,9 +295,9 @@ func (k *KnowledgeService) FindAnswer(param *knowledgeclient.FindAnswerReq, addr
 }
 
 // RecommendAnswer 根据问题推荐三个答案
-func (k *KnowledgeService) RecommendAnswer(param *knowledgeclient.FindAnswerReq, segment string, recommendQuestionCount int) []*knowledgeclient.Question {
+func (k *KnowledgeService) RecommendAnswer(param *knowledge.FindAnswerReq, segment string, recommendQuestionCount int) []*knowledge.Question {
 	var (
-		answers []*knowledgeclient.Question
+		answers []*knowledge.Question
 	)
 	if len([]rune(param.Question)) <= 1 {
 		return answers
@@ -325,14 +325,14 @@ func (k *KnowledgeService) RecommendAnswer(param *knowledgeclient.FindAnswerReq,
 		if res != nil && len(*res) > 0 {
 			if i < 1 {
 				for _, val := range *res {
-					answers = append(answers, &knowledgeclient.Question{
+					answers = append(answers, &knowledge.Question{
 						Question: cm.ObjToString(val["question"]),
 						Answer:   cm.ObjToString(val["answer"]),
 					})
 				}
 				return answers
 			} else {
-				answers = append(answers, &knowledgeclient.Question{
+				answers = append(answers, &knowledge.Question{
 					Question: cm.ObjToString((*res)[0]["question"]),
 					Answer:   cm.ObjToString((*res)[0]["answer"]),
 				})

rpc/knowledge/internal/service/knowledgeService_test.go

@@ -5,7 +5,7 @@ import (
 	"app.yhyue.com/moapp/jybase/mysql"
 	"bp.jydev.jianyu360.cn/BaseService/userCenter/rpc/usercenter"
 	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/entity"
-	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/knowledgeclient"
+	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/knowledge"
 	"github.com/zeromicro/go-zero/core/discov"
 	"github.com/zeromicro/go-zero/zrpc"
 	"reflect"
@@ -41,7 +41,7 @@ func init() {
 
 func TestKnowledgeService_FindAnswer(t *testing.T) {
 	type args struct {
-		param   *knowledgeclient.FindAnswerReq
+		param   *knowledge.FindAnswerReq
 		addr    string
 		index   string
 		segment string
@@ -49,12 +49,12 @@ func TestKnowledgeService_FindAnswer(t *testing.T) {
 	tests := []struct {
 		name string
 		args args
-		want *knowledgeclient.Question
+		want *knowledge.Question
 	}{
 		{
 			name: "根据问题查询答案",
 			args: args{
-				param: &knowledgeclient.FindAnswerReq{
+				param: &knowledge.FindAnswerReq{
 					Type:       1,
 					Question:   "订阅购买",
 					RobotEntId: "455b495c5c",
@@ -67,7 +67,7 @@ func TestKnowledgeService_FindAnswer(t *testing.T) {
 		{
 			name: "根据问题查询答案",
 			args: args{
-				param: &knowledgeclient.FindAnswerReq{
+				param: &knowledge.FindAnswerReq{
 					Type:       1,
 					Question:   "大会员怎么收费",
 					RobotEntId: "455b495c5c",
@@ -80,7 +80,7 @@ func TestKnowledgeService_FindAnswer(t *testing.T) {
 		{
 			name: "根据问题查询答案",
 			args: args{
-				param: &knowledgeclient.FindAnswerReq{
+				param: &knowledge.FindAnswerReq{
 					Type:       2,
 					Question:   "超级订阅为什么购买不了",
 					RobotEntId: "455b495c5c",
@@ -93,7 +93,7 @@ func TestKnowledgeService_FindAnswer(t *testing.T) {
 		{
 			name: "根据问题查询答案",
 			args: args{
-				param: &knowledgeclient.FindAnswerReq{
+				param: &knowledge.FindAnswerReq{
 					Type:       1,
 					Question:   "我",
 					RobotEntId: "455b495c5c",
@@ -106,7 +106,7 @@ func TestKnowledgeService_FindAnswer(t *testing.T) {
 		{
 			name: "根据问题查询答案",
 			args: args{
-				param: &knowledgeclient.FindAnswerReq{
+				param: &knowledge.FindAnswerReq{
 					Type:       1,
 					Question:   "我得问题",
 					RobotEntId: "123",
@@ -129,7 +129,7 @@ func TestKnowledgeService_FindAnswer(t *testing.T) {
 
 func TestKnowledgeService_KnowledgeAdd(t *testing.T) {
 	type args struct {
-		param   *knowledgeclient.AddRequest
+		param   *knowledge.AddRequest
 		segment string
 	}
 	tests := []struct {
@@ -142,7 +142,7 @@ func TestKnowledgeService_KnowledgeAdd(t *testing.T) {
 		{
 			name: "知识添加",
 			args: args{
-				param: &knowledgeclient.AddRequest{
+				param: &knowledge.AddRequest{
 					Question:  "任姣姣测试的测添加问题",
 					Answer:    "答案",
 					AppId:     "10000",
@@ -157,7 +157,7 @@ func TestKnowledgeService_KnowledgeAdd(t *testing.T) {
 		{
 			name: "知识添加",
 			args: args{
-				param: &knowledgeclient.AddRequest{
+				param: &knowledge.AddRequest{
 					Question:  "我",
 					Answer:    "答案",
 					AppId:     "10000",
@@ -172,7 +172,7 @@ func TestKnowledgeService_KnowledgeAdd(t *testing.T) {
 		{
 			name: "知识添加",
 			args: args{
-				param: &knowledgeclient.AddRequest{
+				param: &knowledge.AddRequest{
 					Question:  "我",
 					Answer:    "答案",
 					AppId:     "10000",
@@ -187,7 +187,7 @@ func TestKnowledgeService_KnowledgeAdd(t *testing.T) {
 		{
 			name: "知识添加",
 			args: args{
-				param: &knowledgeclient.AddRequest{
+				param: &knowledge.AddRequest{
 					Question: "任姣姣测试的测添加问题",
 					Answer:   "答案",
 					AppId:    "10000",
@@ -201,7 +201,7 @@ func TestKnowledgeService_KnowledgeAdd(t *testing.T) {
 		{
 			name: "知识添加",
 			args: args{
-				param: &knowledgeclient.AddRequest{
+				param: &knowledge.AddRequest{
 					Question:  "拓普公司发展二十年，步入全新的发展阶段，随着数字化的发展，客户对于数字化转型的认知也不断提升，甲方对乙方的要求也发生了变化，只有真正解决问题的信息化，只有真正实现降本、提质、增效，才能真正实现数字化转型带来的治理能力的提升。拓普就是真正解决问题的公司！我们坚持“实体创新，数字倍增”的产品战略，提供走进用户、研究业务、解决问题、达成目标的数字化转型方案和产品，这种新型现代智能服务业态，才是符合当今时代要求的。新时代是新的机遇，也带来新的挑战。公司在二十多年的发展的同时，也积累了许多问题，我们要敢于直面问题并解决问题，这样才能抓住机遇、重装上阵、御风而行、高速发展。过去两年的公司改革并没有触及问题的核心，所以并没解决实质的问题。2022年公司开始痛定思痛直面问题，刀刃向内深度改革，解决影响公司发展的基层因素。2022年的拓普，就是中国发展历史的1992年，要拿出92年中国改革的决心和勇气，我们才有可能赢！这个过程中有质疑、不解和各种评判是正常的，只要我们把公司和集体利益放在第一位，把个人利益同步到公司利益上，做公司和集体利益的维护者，我们就能同心同德共赴拓普美好未来。",
 					Answer:    "答案",
 					AppId:     "10000",
@@ -265,7 +265,7 @@ func TestKnowledgeService_KnowledgeDel(t *testing.T) {
 
 func TestKnowledgeService_KnowledgeEdit(t *testing.T) {
 	type args struct {
-		param   *knowledgeclient.KnowledgeEditReq
+		param   *knowledge.KnowledgeEditReq
 		segment string
 	}
 	tests := []struct {
@@ -278,7 +278,7 @@ func TestKnowledgeService_KnowledgeEdit(t *testing.T) {
 		{
 			name: "知识编辑",
 			args: args{
-				param: &knowledgeclient.KnowledgeEditReq{
+				param: &knowledge.KnowledgeEditReq{
 					Question:    "任姣姣的编辑知识问题",
 					Answer:      "答案",
 					AnswerId:    30210,
@@ -293,7 +293,7 @@ func TestKnowledgeService_KnowledgeEdit(t *testing.T) {
 		{
 			name: "知识编辑",
 			args: args{
-				param: &knowledgeclient.KnowledgeEditReq{
+				param: &knowledge.KnowledgeEditReq{
 					Question:    "",
 					Answer:      "答案",
 					AnswerId:    30211,
@@ -308,7 +308,7 @@ func TestKnowledgeService_KnowledgeEdit(t *testing.T) {
 		{
 			name: "知识编辑",
 			args: args{
-				param: &knowledgeclient.KnowledgeEditReq{
+				param: &knowledge.KnowledgeEditReq{
 					Question:    "任姣姣的编辑知识问题",
 					Answer:      "答案",
 					AnswerId:    123,
@@ -323,7 +323,7 @@ func TestKnowledgeService_KnowledgeEdit(t *testing.T) {
 		{
 			name: "知识编辑",
 			args: args{
-				param: &knowledgeclient.KnowledgeEditReq{
+				param: &knowledge.KnowledgeEditReq{
 					Question:    "任姣姣的编辑知识问题",
 					Answer:      "答案",
 					AnswerId:    30210,
@@ -337,7 +337,7 @@ func TestKnowledgeService_KnowledgeEdit(t *testing.T) {
 		{
 			name: "知识编辑",
 			args: args{
-				param: &knowledgeclient.KnowledgeEditReq{
+				param: &knowledge.KnowledgeEditReq{
 					Question:    "拓普公司发展二十年，步入全新的发展阶段，随着数字化的发展，客户对于数字化转型的认知也不断提升，甲方对乙方的要求也发生了变化，只有真正解决问题的信息化，只有真正实现降本、提质、增效，才能真正实现数字化转型带来的治理能力的提升。拓普就是真正解决问题的公司！我们坚持“实体创新，数字倍增”的产品战略，提供走进用户、研究业务、解决问题、达成目标的数字化转型方案和产品，这种新型现代智能服务业态，才是符合当今时代要求的。新时代是新的机遇，也带来新的挑战。公司在二十多年的发展的同时，也积累了许多问题，我们要敢于直面问题并解决问题，这样才能抓住机遇、重装上阵、御风而行、高速发展。过去两年的公司改革并没有触及问题的核心，所以并没解决实质的问题。2022年公司开始痛定思痛直面问题，刀刃向内深度改革，解决影响公司发展的基层因素。2022年的拓普，就是中国发展历史的1992年，要拿出92年中国改革的决心和勇气，我们才有可能赢！这个过程中有质疑、不解和各种评判是正常的，只要我们把公司和集体利益放在第一位，把个人利益同步到公司利益上，做公司和集体利益的维护者，我们就能同心同德共赴拓普美好未来。",
 					Answer:      "答案",
 					AnswerId:    30210,
@@ -368,7 +368,7 @@ func TestKnowledgeService_KnowledgeInfo(t *testing.T) {
 	tests := []struct {
 		name     string
 		args     args
-		wantData *knowledgeclient.KnowledgeEntity
+		wantData *knowledge.KnowledgeEntity
 		wantOk   bool
 	}{
 		{
@@ -402,17 +402,17 @@ func TestKnowledgeService_KnowledgeInfo(t *testing.T) {
 
 func TestKnowledgeService_KnowledgeList(t *testing.T) {
 	type args struct {
-		param *knowledgeclient.ListRequest
+		param *knowledge.ListRequest
 	}
 	tests := []struct {
 		name string
 		args args
-		want *knowledgeclient.ListData
+		want *knowledge.ListData
 	}{
 		{
 			name: "知识列表",
 			args: args{
-				param: &knowledgeclient.ListRequest{
+				param: &knowledge.ListRequest{
 					PageSize:  20,
 					PageIndex: 1,
 					EntId:     14929,
@@ -432,18 +432,18 @@ func TestKnowledgeService_KnowledgeList(t *testing.T) {
 
 func TestKnowledgeService_RecommendAnswer(t *testing.T) {
 	type args struct {
-		param   *knowledgeclient.FindAnswerReq
+		param   *knowledge.FindAnswerReq
 		segment string
 	}
 	tests := []struct {
 		name string
 		args args
-		want []*knowledgeclient.Question
+		want []*knowledge.Question
 	}{
 		{
 			name: "根据问题查询答案",
 			args: args{
-				param: &knowledgeclient.FindAnswerReq{
+				param: &knowledge.FindAnswerReq{
 					Type:       1,
 					Question:   "订阅购买",
 					RobotEntId: "455b495c5c",
@@ -454,7 +454,7 @@ func TestKnowledgeService_RecommendAnswer(t *testing.T) {
 		{
 			name: "根据问题查询答案",
 			args: args{
-				param: &knowledgeclient.FindAnswerReq{
+				param: &knowledge.FindAnswerReq{
 					Type:       1,
 					Question:   "我的",
 					RobotEntId: "455b495c5c",
@@ -465,7 +465,7 @@ func TestKnowledgeService_RecommendAnswer(t *testing.T) {
 		{
 			name: "根据问题查询答案",
 			args: args{
-				param: &knowledgeclient.FindAnswerReq{
+				param: &knowledge.FindAnswerReq{
 					Type:       1,
 					Question:   "大会员怎么收费",
 					RobotEntId: "455b495c5c",

rpc/knowledge/knowledgeclient/knowledge.go → rpc/knowledge/knowledge/knowledge.go

@@ -1,7 +1,7 @@
 // Code generated by goctl. DO NOT EDIT!
 // Source: knowledge.proto
 
-package knowledgeclient
+package knowledge
 
 import (
 	"context"

rpc/knowledge/knowledgeclient/knowledge.pb.go → rpc/knowledge/knowledge/knowledge.pb.go

@@ -1,10 +1,10 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.28.0
-// 	protoc        v3.15.5
+// 	protoc        v3.19.4
 // source: knowledge.proto
 
-package knowledgeclient
+package knowledge
 
 import (
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"

rpc/knowledge/knowledgeclient/knowledge_grpc.pb.go → rpc/knowledge/knowledge/knowledge_grpc.pb.go

@@ -1,10 +1,10 @@
 // Code generated by protoc-gen-go-grpc. DO NOT EDIT.
 // versions:
 // - protoc-gen-go-grpc v1.2.0
-// - protoc             v3.15.5
+// - protoc             v3.19.4
 // source: knowledge.proto
 
-package knowledgeclient
+package knowledge
 
 import (
 	context "context"
@@ -18,7 +18,7 @@ import (
 // Requires gRPC-Go v1.32.0 or later.
 const _ = grpc.SupportPackageIsVersion7
 
-// KnowledgeClient is the client API for Knowledge service.
+// knowledge is the client API for Knowledge service.
 //
 // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.
 type KnowledgeClient interface {

rpc/knowledge/test/commonPhrases_test.go

@@ -1,7 +1,7 @@
 package test
 
 import (
-	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/knowledgeclient"
+	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/knowledge"
 	"context"
 	"github.com/zeromicro/go-zero/zrpc"
 	"log"
@@ -11,8 +11,8 @@ import (
 
 func Test_CommonPhrasesAddOrEdit(t *testing.T) {
 	ctx, _ := context.WithTimeout(context.Background(), 10*time.Second)
-	TestSystem := knowledgeclient.NewKnowledge(zrpc.MustNewClient(c.TestConf))
-	req := &knowledgeclient.CommonPhrasesAddReq{}
+	TestSystem := knowledge.NewKnowledge(zrpc.MustNewClient(c.TestConf))
+	req := &knowledge.CommonPhrasesAddReq{}
 	req.AppId = "10000"
 	req.EntId = 14929
 	req.Content = "排序看一下"
@@ -26,8 +26,8 @@ func Test_CommonPhrasesAddOrEdit(t *testing.T) {
 
 func Test_CommonPhrasesInfo(t *testing.T) {
 	ctx, _ := context.WithTimeout(context.Background(), 10*time.Second)
-	TestSystem := knowledgeclient.NewKnowledge(zrpc.MustNewClient(c.TestConf))
-	req := &knowledgeclient.CommonPhrasesInfoReq{}
+	TestSystem := knowledge.NewKnowledge(zrpc.MustNewClient(c.TestConf))
+	req := &knowledge.CommonPhrasesInfoReq{}
 	req.Id = 2
 	res, err := TestSystem.CommonPhrasesInfo(ctx, req)
 	log.Println("res ", res)
@@ -36,8 +36,8 @@ func Test_CommonPhrasesInfo(t *testing.T) {
 
 func Test_CommonPhrasesDel(t *testing.T) {
 	ctx, _ := context.WithTimeout(context.Background(), 10*time.Second)
-	TestSystem := knowledgeclient.NewKnowledge(zrpc.MustNewClient(c.TestConf))
-	req := &knowledgeclient.CommonPhrasesInfoReq{}
+	TestSystem := knowledge.NewKnowledge(zrpc.MustNewClient(c.TestConf))
+	req := &knowledge.CommonPhrasesInfoReq{}
 	req.Id = 32
 	res, err := TestSystem.CommonPhrasesDel(ctx, req)
 	log.Println("res ", res)
@@ -46,8 +46,8 @@ func Test_CommonPhrasesDel(t *testing.T) {
 
 func Test_CommonPhrasesList(t *testing.T) {
 	ctx, _ := context.WithTimeout(context.Background(), 10*time.Second)
-	TestSystem := knowledgeclient.NewKnowledge(zrpc.MustNewClient(c.TestConf))
-	req := &knowledgeclient.CommonPhrasesListReq{}
+	TestSystem := knowledge.NewKnowledge(zrpc.MustNewClient(c.TestConf))
+	req := &knowledge.CommonPhrasesListReq{}
 	req.PageIndex = 1
 	req.EntId = 14929
 	req.AppId = "10000"
@@ -59,8 +59,8 @@ func Test_CommonPhrasesList(t *testing.T) {
 
 func Test_CommonPhrasesQuery(t *testing.T) {
 	ctx, _ := context.WithTimeout(context.Background(), 10*time.Second)
-	TestSystem := knowledgeclient.NewKnowledge(zrpc.MustNewClient(c.TestConf))
-	req := &knowledgeclient.CommonPhraseQueryReq{}
+	TestSystem := knowledge.NewKnowledge(zrpc.MustNewClient(c.TestConf))
+	req := &knowledge.CommonPhraseQueryReq{}
 	req.EntId = 14929
 	req.AppId = "10000"
 	req.Query = "test"

rpc/knowledge/test/knowledge_test.go

@@ -5,7 +5,7 @@ import (
 	"app.yhyue.com/moapp/jybase/mysql"
 	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/entity"
 	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/internal/config"
-	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/knowledgeclient"
+	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/knowledge"
 	"context"
 	"flag"
 	"github.com/zeromicro/go-zero/core/conf"
@@ -37,8 +37,8 @@ func init() {
 
 func Test_KnowledgeAdd(t *testing.T) {
 	ctx, _ := context.WithTimeout(context.Background(), 10*time.Second)
-	TestSystem := knowledgeclient.NewKnowledge(zrpc.MustNewClient(c.TestConf))
-	req := &knowledgeclient.AddRequest{}
+	TestSystem := knowledge.NewKnowledge(zrpc.MustNewClient(c.TestConf))
+	req := &knowledge.AddRequest{}
 	req.AppId = "10000"
 	req.EntId = 14929
 	req.Question = "超级订阅为什么购买不了1111"
@@ -51,8 +51,8 @@ func Test_KnowledgeAdd(t *testing.T) {
 
 func Test_KnowledgeList(t *testing.T) {
 	ctx, _ := context.WithTimeout(context.Background(), 10*time.Second)
-	TestSystem := knowledgeclient.NewKnowledge(zrpc.MustNewClient(c.TestConf))
-	req := &knowledgeclient.ListRequest{}
+	TestSystem := knowledge.NewKnowledge(zrpc.MustNewClient(c.TestConf))
+	req := &knowledge.ListRequest{}
 	req.EntId = 14929
 	req.PageSize = 20
 	req.PageIndex = 3
@@ -63,8 +63,8 @@ func Test_KnowledgeList(t *testing.T) {
 
 func Test_KnowledgeInfo(t *testing.T) {
 	ctx, _ := context.WithTimeout(context.Background(), 10*time.Second)
-	TestSystem := knowledgeclient.NewKnowledge(zrpc.MustNewClient(c.TestConf))
-	req := &knowledgeclient.KnowledgeEntity{}
+	TestSystem := knowledge.NewKnowledge(zrpc.MustNewClient(c.TestConf))
+	req := &knowledge.KnowledgeEntity{}
 	req.AnswerId = 30238
 	res, err := TestSystem.KnowledgeInfo(ctx, req)
 	log.Println("res ", res)
@@ -73,8 +73,8 @@ func Test_KnowledgeInfo(t *testing.T) {
 
 func Test_KnowledgeEdit(t *testing.T) {
 	ctx, _ := context.WithTimeout(context.Background(), 10*time.Second)
-	TestSystem := knowledgeclient.NewKnowledge(zrpc.MustNewClient(c.TestConf))
-	req := &knowledgeclient.KnowledgeEditReq{}
+	TestSystem := knowledge.NewKnowledge(zrpc.MustNewClient(c.TestConf))
+	req := &knowledge.KnowledgeEditReq{}
 	req.AnswerId = 23
 	req.KnowledgeId = 1
 	req.EntId = 10000
@@ -87,8 +87,8 @@ func Test_KnowledgeEdit(t *testing.T) {
 
 func Test_KnowledgeDel(t *testing.T) {
 	ctx, _ := context.WithTimeout(context.Background(), 10*time.Second)
-	TestSystem := knowledgeclient.NewKnowledge(zrpc.MustNewClient(c.TestConf))
-	req := &knowledgeclient.KnowledgeDelReq{}
+	TestSystem := knowledge.NewKnowledge(zrpc.MustNewClient(c.TestConf))
+	req := &knowledge.KnowledgeDelReq{}
 	req.AnswerId = 32
 	res, err := TestSystem.KnowledgeDel(ctx, req)
 	log.Println("res ", res)
@@ -97,8 +97,8 @@ func Test_KnowledgeDel(t *testing.T) {
 
 func Test_FindAnswer(t *testing.T) {
 	ctx, _ := context.WithTimeout(context.Background(), 10*time.Second)
-	TestSystem := knowledgeclient.NewKnowledge(zrpc.MustNewClient(c.TestConf))
-	req := &knowledgeclient.FindAnswerReq{}
+	TestSystem := knowledge.NewKnowledge(zrpc.MustNewClient(c.TestConf))
+	req := &knowledge.FindAnswerReq{}
 	req.Question = "在"
 	req.RobotEntId = "455b495c5c"
 	req.Type = 1
@@ -109,8 +109,8 @@ func Test_FindAnswer(t *testing.T) {
 
 func Test_RecommendAnswer(t *testing.T) {
 	ctx, _ := context.WithTimeout(context.Background(), 10*time.Second)
-	TestSystem := knowledgeclient.NewKnowledge(zrpc.MustNewClient(c.TestConf))
-	req := &knowledgeclient.FindAnswerReq{}
+	TestSystem := knowledge.NewKnowledge(zrpc.MustNewClient(c.TestConf))
+	req := &knowledge.FindAnswerReq{}
 	req.Question = "订阅购买"
 	req.RobotEntId = "455b495c5c"
 	req.Type = 1
@@ -125,10 +125,10 @@ func Test_DataSync(t *testing.T) {
 	log.Println(data)
 	if data != nil && len(*data) > 0 {
 		ctx, _ := context.WithTimeout(context.Background(), 10*time.Second)
-		TestSystem := knowledgeclient.NewKnowledge(zrpc.MustNewClient(c.TestConf))
+		TestSystem := knowledge.NewKnowledge(zrpc.MustNewClient(c.TestConf))
 		for _, val := range *data {
 
-			req := &knowledgeclient.AddRequest{}
+			req := &knowledge.AddRequest{}
 			req.AppId = "10000"
 			req.EntId = cm.Int64All(val["ent_id"])
 			req.Question = cm.ObjToString(val["question"])