列表开发

rpc/knowledge/etc/knowledge.yaml

@@ -17,7 +17,7 @@ Es:
   size: 5
   index: smart_new
   type: smart
-Segment: http://192.168.3.204:9070/api/segment
+Segment: http://192.168.3.149:9070/api/segment
 
 TestConf:
   Etcd:

rpc/knowledge/internal/logic/commonphrasesaddlogic.go

@@ -1,41 +0,0 @@
-package logic
-
-import "C"
-import (
-	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/internal/service"
-	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/knowledgeclient"
-	"context"
-	"github.com/zeromicro/go-zero/core/logx"
-
-	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/internal/svc"
-)
-
-type CommonPhrasesAddLogic struct {
-	ctx    context.Context
-	svcCtx *svc.ServiceContext
-	logx.Logger
-}
-
-func NewCommonPhrasesAddLogic(ctx context.Context, svcCtx *svc.ServiceContext) *CommonPhrasesAddLogic {
-	return &CommonPhrasesAddLogic{
-		ctx:    ctx,
-		svcCtx: svcCtx,
-		Logger: logx.WithContext(ctx),
-	}
-}
-
-// CommonPhrasesAdd 客服话术添加、编辑
-func (l *CommonPhrasesAddLogic) CommonPhrasesAdd(in *knowledgeclient.CommonPhrasesAddReq) (*knowledgeclient.AddResponse, error) {
-	result := &knowledgeclient.AddResponse{}
-	c := service.CommonPhrasesService{}
-	ok := c.CommonPhrasesAdd(in)
-	if ok > -1 {
-		result.ErrorCode = 0
-		result.ErrorMsg = "插入成功"
-
-	} else {
-		result.ErrorCode = -1
-		result.ErrorMsg = "插入失败"
-	}
-	return result, nil
-}

rpc/knowledge/internal/logic/commonphraseslistlogic.go

@@ -1,11 +1,11 @@
 package logic
 
 import (
+	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/knowledgeclient"
 	"context"
 	"github.com/zeromicro/go-zero/core/logx"
 
 	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/internal/svc"
-	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/knowledge"
 )
 
 type CommonPhrasesListLogic struct {
@@ -22,9 +22,9 @@ func NewCommonPhrasesListLogic(ctx context.Context, svcCtx *svc.ServiceContext)
 	}
 }
 
-// 客服话术列表
-func (l *CommonPhrasesListLogic) CommonPhrasesList(in *knowledge.CommonPhrasesListReq) (*knowledge.CommonPhrasesListResp, error) {
+// CommonPhrasesList 客服话术列表
+func (l *CommonPhrasesListLogic) CommonPhrasesList(in *knowledgeclient.CommonPhrasesListReq) (*knowledgeclient.CommonPhrasesListResp, error) {
 	// todo: add your logic here and delete this line
 
-	return &knowledge.CommonPhrasesListResp{}, nil
+	return &knowledgeclient.CommonPhrasesListResp{}, nil
 }

rpc/knowledge/internal/server/knowledgeserver.go

@@ -4,11 +4,11 @@
 package server
 
 import (
+	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/knowledgeclient"
 	"context"
 
 	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/internal/logic"
 	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/internal/svc"
-	"bp.jydev.jianyu360.cn/SocialPlatform/knowledgeBase/rpc/knowledge/knowledge"
 )
 
 type KnowledgeServer struct {
@@ -22,67 +22,67 @@ func NewKnowledgeServer(svcCtx *svc.ServiceContext) *KnowledgeServer {
 }
 
 // 知识新增
-func (s *KnowledgeServer) KnowledgeAdd(ctx context.Context, in *knowledge.AddRequest) (*knowledge.AddResponse, error) {
+func (s *KnowledgeServer) KnowledgeAdd(ctx context.Context, in *knowledgeclient.AddRequest) (*knowledgeclient.AddResponse, error) {
 	l := logic.NewKnowledgeAddLogic(ctx, s.svcCtx)
 	return l.KnowledgeAdd(in)
 }
 
 // 知识列表
-func (s *KnowledgeServer) KnowledgeList(ctx context.Context, in *knowledge.ListRequest) (*knowledge.ListResponse, error) {
+func (s *KnowledgeServer) KnowledgeList(ctx context.Context, in *knowledgeclient.ListRequest) (*knowledgeclient.ListResponse, error) {
 	l := logic.NewKnowledgeListLogic(ctx, s.svcCtx)
 	return l.KnowledgeList(in)
 }
 
 // 知识编辑
-func (s *KnowledgeServer) KnowledgeEdit(ctx context.Context, in *knowledge.KnowledgeEditReq) (*knowledge.AddResponse, error) {
+func (s *KnowledgeServer) KnowledgeEdit(ctx context.Context, in *knowledgeclient.KnowledgeEditReq) (*knowledgeclient.AddResponse, error) {
 	l := logic.NewKnowledgeEditLogic(ctx, s.svcCtx)
 	return l.KnowledgeEdit(in)
 }
 
 // 知识详情
-func (s *KnowledgeServer) KnowledgeInfo(ctx context.Context, in *knowledge.KnowledgeEntity) (*knowledge.InfoResponse, error) {
+func (s *KnowledgeServer) KnowledgeInfo(ctx context.Context, in *knowledgeclient.KnowledgeEntity) (*knowledgeclient.InfoResponse, error) {
 	l := logic.NewKnowledgeInfoLogic(ctx, s.svcCtx)
 	return l.KnowledgeInfo(in)
 }
 
 // 知识删除
-func (s *KnowledgeServer) KnowledgeDel(ctx context.Context, in *knowledge.KnowledgeDelReq) (*knowledge.AddResponse, error) {
+func (s *KnowledgeServer) KnowledgeDel(ctx context.Context, in *knowledgeclient.KnowledgeDelReq) (*knowledgeclient.AddResponse, error) {
 	l := logic.NewKnowledgeDelLogic(ctx, s.svcCtx)
 	return l.KnowledgeDel(in)
 }
 
 // 根据问题匹配答案
-func (s *KnowledgeServer) FindAnswer(ctx context.Context, in *knowledge.FindAnswerReq) (*knowledge.FindAnswerResp, error) {
+func (s *KnowledgeServer) FindAnswer(ctx context.Context, in *knowledgeclient.FindAnswerReq) (*knowledgeclient.FindAnswerResp, error) {
 	l := logic.NewFindAnswerLogic(ctx, s.svcCtx)
 	return l.FindAnswer(in)
 }
 
 // 推荐答案
-func (s *KnowledgeServer) RecommendAnswer(ctx context.Context, in *knowledge.FindAnswerReq) (*knowledge.RecommendAnswerResp, error) {
+func (s *KnowledgeServer) RecommendAnswer(ctx context.Context, in *knowledgeclient.FindAnswerReq) (*knowledgeclient.RecommendAnswerResp, error) {
 	l := logic.NewRecommendAnswerLogic(ctx, s.svcCtx)
 	return l.RecommendAnswer(in)
 }
 
 // 客服话术添加、编辑
-func (s *KnowledgeServer) CommonPhrasesAdd(ctx context.Context, in *knowledge.CommonPhrasesAddReq) (*knowledge.AddResponse, error) {
+func (s *KnowledgeServer) CommonPhrasesAdd(ctx context.Context, in *knowledgeclient.CommonPhrasesAddReq) (*knowledgeclient.AddResponse, error) {
 	l := logic.NewCommonPhrasesAddLogic(ctx, s.svcCtx)
 	return l.CommonPhrasesAdd(in)
 }
 
 // 客服话术详情
-func (s *KnowledgeServer) CommonPhrasesInfo(ctx context.Context, in *knowledge.CommonPhrasesInfoReq) (*knowledge.CommonPhrasesInfoResp, error) {
+func (s *KnowledgeServer) CommonPhrasesInfo(ctx context.Context, in *knowledgeclient.CommonPhrasesInfoReq) (*knowledgeclient.CommonPhrasesInfoResp, error) {
 	l := logic.NewCommonPhrasesInfoLogic(ctx, s.svcCtx)
 	return l.CommonPhrasesInfo(in)
 }
 
 // 客服话术列表
-func (s *KnowledgeServer) CommonPhrasesList(ctx context.Context, in *knowledge.CommonPhrasesListReq) (*knowledge.CommonPhrasesListResp, error) {
+func (s *KnowledgeServer) CommonPhrasesList(ctx context.Context, in *knowledgeclient.CommonPhrasesListReq) (*knowledgeclient.CommonPhrasesListResp, error) {
 	l := logic.NewCommonPhrasesListLogic(ctx, s.svcCtx)
 	return l.CommonPhrasesList(in)
 }
 
 // 客服话术删除
-func (s *KnowledgeServer) CommonPhrasesDel(ctx context.Context, in *knowledge.CommonPhrasesInfoReq) (*knowledge.AddResponse, error) {
+func (s *KnowledgeServer) CommonPhrasesDel(ctx context.Context, in *knowledgeclient.CommonPhrasesInfoReq) (*knowledgeclient.AddResponse, error) {
 	l := logic.NewCommonPhrasesDelLogic(ctx, s.svcCtx)
 	return l.CommonPhrasesDel(in)
 }

rpc/knowledge/internal/service/commonPhrasesService.go

@@ -43,8 +43,8 @@ func (c *CommonPhrasesService) CommonPhrasesDel(id int64) bool {
 /*func (c *CommonPhrasesService) CommonPhrasesList(param *knowledgeclient.CommonPhrasesListReq) {
 	var commonPhrasesList knowledgeclient.CommonPhrasesList
 	var data []*knowledgeclient.CommonPhrases
-	count := Mysql.CountBySql(util.COMMONPHRASES, map[string]interface{}{})
+	count := Mysql.Count(util.COMMONPHRASES, map[string]interface{}{"status": 0})
 	if count > 0 {
-		dataList := Mysql.Find(util.COMMONPHRASES)
+		dataList := Mysql.Find(util.COMMONPHRASES, map[string]interface{}{"status": 0},"","desc id", cm.IntAll((param.PageIndex-1)*param.PageSize), cm.IntAll(param.PageSize))
 	}
 }*/

rpc/knowledge/knowledgeclient/knowledge.go

@@ -13,26 +13,26 @@ import (
 )
 
 type (
-	AddResponse           = knowledge.AddResponse
 	ListData              = knowledge.ListData
-	KnowledgeEntity       = knowledge.KnowledgeEntity
-	CommonPhrasesInfoReq  = knowledge.CommonPhrasesInfoReq
-	Question              = knowledge.Question
-	FindAnswerReq         = knowledge.FindAnswerReq
-	RecommendAnswerResp   = knowledge.RecommendAnswerResp
 	ListRequest           = knowledge.ListRequest
-	KnowledgeDelReq       = knowledge.KnowledgeDelReq
+	KnowledgeEditReq      = knowledge.KnowledgeEditReq
+	InfoResponse          = knowledge.InfoResponse
 	CommonPhrasesListReq  = knowledge.CommonPhrasesListReq
+	FindAnswerReq         = knowledge.FindAnswerReq
+	CommonPhrasesAddReq   = knowledge.CommonPhrasesAddReq
+	CommonPhrasesInfoReq  = knowledge.CommonPhrasesInfoReq
 	CommonPhrasesListResp = knowledge.CommonPhrasesListResp
-	InfoResponse          = knowledge.InfoResponse
-	CommonPhrases         = knowledge.CommonPhrases
-	CommonPhrasesInfoResp = knowledge.CommonPhrasesInfoResp
+	KnowledgeEntity       = knowledge.KnowledgeEntity
+	CommonPhrasesList     = knowledge.CommonPhrasesList
 	AddRequest            = knowledge.AddRequest
+	AddResponse           = knowledge.AddResponse
 	FindAnswerResp        = knowledge.FindAnswerResp
+	RecommendAnswerResp   = knowledge.RecommendAnswerResp
 	ListResponse          = knowledge.ListResponse
-	KnowledgeEditReq      = knowledge.KnowledgeEditReq
-	CommonPhrasesAddReq   = knowledge.CommonPhrasesAddReq
-	CommonPhrasesList     = knowledge.CommonPhrasesList
+	KnowledgeDelReq       = knowledge.KnowledgeDelReq
+	CommonPhrases         = knowledge.CommonPhrases
+	Question              = knowledge.Question
+	CommonPhrasesInfoResp = knowledge.CommonPhrasesInfoResp
 
 	Knowledge interface {
 		// 知识新增

rpc/knowledge/test/knowledge_test.go

@@ -1,6 +1,9 @@
 package test
 
 import (
+	cm "app.yhyue.com/moapp/jybase/common"
+	"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"
 	"context"
@@ -17,6 +20,19 @@ var c config.Config
 
 func init() {
 	conf.MustLoad(*configFile, &c)
+	mm := c.MysqlMain
+	if mm.Address != "" {
+		log.Println("--初始化 mysql--")
+		entity.Mysql = &mysql.Mysql{
+			Address:      mm.Address,
+			UserName:     mm.UserName,
+			PassWord:     mm.PassWord,
+			DBName:       mm.DbName,
+			MaxOpenConns: mm.MaxOpenConns,
+			MaxIdleConns: mm.MaxIdleConns,
+		}
+		entity.Mysql.Init()
+	}
 }
 
 func Test_KnowledgeAdd(t *testing.T) {
@@ -102,3 +118,24 @@ func Test_RecommendAnswer(t *testing.T) {
 	log.Println("res ", res)
 	log.Println("err ", err)
 }
+
+func Test_DataSync(t *testing.T) {
+	//查询mysql
+	data := entity.Mysql.SelectBySql("SELECT q.content as question,k.ent_id,a.content as answer,a.create_person FROM socialize_question q LEFT JOIN socialize_answer a ON q.answer_id = a.id LEFT JOIN socialize_knowledge k ON a.knowledge_id = k.id")
+	log.Println(data)
+	if data != nil && len(*data) > 0 {
+		ctx, _ := context.WithTimeout(context.Background(), 10*time.Second)
+		TestSystem := knowledgeclient.NewKnowledge(zrpc.MustNewClient(c.TestConf))
+		for _, val := range *data {
+
+			req := &knowledgeclient.AddRequest{}
+			req.AppId = "10000"
+			req.EntId = cm.Int64All(val["ent_id"])
+			req.Question = cm.ObjToString(val["question"])
+			req.Answer = cm.ObjToString(val["answer"])
+			req.EntUserId = cm.Int64All(val["create_person"])
+			res, err := TestSystem.KnowledgeAdd(ctx, req)
+			log.Println("res ", res, err)
+		}
+	}
+}