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

rpc/stdlib/test/doc_test.go

@@ -1,14 +1,15 @@
 package test
 
 import (
-	"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"
 	"log"
 	"testing"
 	"time"
+
+	"app.yhyue.com/moapp/jy_docs/rpc/stdlib/stdlib"
+	"app.yhyue.com/moapp/jy_docs/rpc/stdlib/stdlibclient"
+	"github.com/tal-tech/go-zero/core/discov"
+	"github.com/tal-tech/go-zero/zrpc"
 )
 
 func Test_DocOn(t *testing.T) {
@@ -37,3 +38,39 @@ func Test_DocOff(t *testing.T) {
 	//log.Println("err ", err)
 	//log.Println("req ", res)
 }
+
+func Test_DocActivity(t *testing.T) {
+	ctx, _ := context.WithTimeout(context.Background(), 10*time.Second)
+	std := stdlibclient.NewStdlib(zrpc.MustNewClient(zrpc.RpcClientConf{Etcd: discov.EtcdConf{Hosts: []string{"192.168.3.240:2379"}, Key: "jydocs.stdlib.rpc"}}))
+	req := &stdlib.DocActivityReq{PageNum: 0, PageSize: 10}
+	res, err := std.DocActivity(ctx, req)
+	log.Println("err ", err)
+	log.Println("req ", res)
+}
+
+func Test_DocStatistics(t *testing.T) {
+	ctx, _ := context.WithTimeout(context.Background(), 10*time.Second)
+	std := stdlibclient.NewStdlib(zrpc.MustNewClient(zrpc.RpcClientConf{Etcd: discov.EtcdConf{Hosts: []string{"192.168.3.240:2379"}, Key: "jydocs.stdlib.rpc"}}))
+	req := &stdlib.DocStatisticsReq{DocId: "111", DocStatisticsType: 1}
+	res, err := std.DocStatistics(ctx, req)
+	log.Println("err ", err)
+	log.Println("req ", res)
+}
+
+func Test_DocGetCheck(t *testing.T) {
+	ctx, _ := context.WithTimeout(context.Background(), 10*time.Second)
+	std := stdlibclient.NewStdlib(zrpc.MustNewClient(zrpc.RpcClientConf{Etcd: discov.EtcdConf{Hosts: []string{"192.168.3.240:2379"}, Key: "jydocs.stdlib.rpc"}}))
+	req := &stdlib.DocGetCheckReq{DocId: "111", UserId: "123"}
+	res, err := std.DocGetCheck(ctx, req)
+	log.Println("err ", err)
+	log.Println("req ", res)
+}
+
+func Test_DocGetContent(t *testing.T) {
+	ctx, _ := context.WithTimeout(context.Background(), 10*time.Second)
+	std := stdlibclient.NewStdlib(zrpc.MustNewClient(zrpc.RpcClientConf{Etcd: discov.EtcdConf{Hosts: []string{"192.168.3.240:2379"}, Key: "jydocs.stdlib.rpc"}}))
+	req := &stdlib.DocGetCheckReq{DocId: "111", UserId: "123"}
+	res, err := std.DocGetContent(ctx, req)
+	log.Println("err ", err)
+	log.Println("req ", res)
+}

services/stdlib/docStatistics.go

@@ -4,7 +4,6 @@ import (
 	"log"
 	"time"
 
-	elastic "app.yhyue.com/moapp/jybase/esv7"
 	jyDocsRpcUtil "app.yhyue.com/moapp/jy_docs/services/util"
 )
 
@@ -21,16 +20,7 @@ func DocStatistics(docId string, dtype int) bool {
 	updateDate := time.Now().Format("2006-01-02 15:04:05")
 	err := jyDocsRpcUtil.GetJyDocsDB().Exec(sqlStr, updateDate, docId).Error
 	if err != nil {
-		//es
-		data := map[string]interface{}{}
-		jyDocsRpcUtil.GetJyDocsDB().Table("doc_statistics").Where("docId = ?", docId).Find(&data)
-		if len(data) > 0 {
-			//是否缓存
-			//TODO
-			if ok := elastic.UpdateNewDoc("jydocs", "jydocs", data); ok {
-				state = true
-			}
-		}
+		state = true
 	}
 	return state
 }