提交

jydocs-back/config.json

@@ -1,7 +1,12 @@
 {
   "webport": "821",
   "appid": "10000",
-  "ossAdmin": "",
+  "ossAdmin": "oss-cn-beijing.aliyuncs.com",
+  "ossBucket": {
+    "std": "jydocs-std",
+    "user": "jydocs-priv",
+    "priv": "jydocs-previewimg"
+  },
   "rpcServers": {
     "stdDoc": {
       "key": "jydocs.stdlib.rpc",

jydocs-back/config/config.go

@@ -3,9 +3,14 @@ package config
 import "app.yhyue.com/moapp/jybase/common"
 
 type appConfig struct {
-	WebPort    string `json:"webport"`  //程序端口
-	AppId      string `json:"appid"`    //程序标识
-	OssAdmin   string `json:"ossAdmin"` //阿里云oss域名
+	WebPort   string `json:"webport"`  //程序端口
+	AppId     string `json:"appid"`    //程序标识
+	OssAdmin  string `json:"ossAdmin"` //阿里云oss域名
+	OssBucket struct {
+		Std  string `json:"std"`  //标准库bucket
+		User string `json:"user"` //用户库
+		Priv string `json:"priv"` //缩略图片
+	} `json:"ossBucket"` //阿里云ossbucket
 	RpcServers struct {
 		StdDoc  rpcConfig `json:"stdDoc"`  //标准库rpc接口
 		UserDoc rpcConfig `json:"userDoc"` //用户收藏rpc接口

jydocs-back/filter/filter.go

@@ -8,6 +8,7 @@ import (
 
 func init() {
 	xweb.AddFilter(&Filter{})
+	xweb.AddFilter(&sessionfilter{App: xweb.RootApp()})
 	time.AfterFunc(1*time.Minute, SaveLogTask)
 }
 
@@ -15,8 +16,6 @@ type Filter struct {
 }
 
 func (f *Filter) Do(w http.ResponseWriter, r *http.Request) bool {
-	xweb.AddFilter(&sessionfilter{App: xweb.RootApp()})
-
 	session := xweb.RootApp().SessionManager.Session(r, w)
 	getSession := session.GetMultiple()
 	if !(&logFilter{w, r, session, getSession, make(map[string]interface{})}).Do() {

jydocs-back/filter/logfilter.go

@@ -55,7 +55,7 @@ func SaveLogTask() {
 		arr = make([]map[string]interface{}, 0)
 		go func() {
 			log.Println("timer..save..visit..log", len(tmp))
-			public.Mgo_Log.SaveBulk("jy_logs", tmp...)
+			public.Mgo_Log.SaveBulk("jy_docs_logs", tmp...)
 		}()
 	}
 
@@ -115,7 +115,7 @@ func (l *logFilter) addLog() {
 		arr = make([]map[string]interface{}, 0)
 		go func() {
 			log.Println("save..visit..log", len(tmp))
-			public.Mgo_Log.SaveBulk("jy_logs", tmp...)
+			public.Mgo_Log.SaveBulk("jy_docs_logs", tmp...)
 		}()
 	}
 	lock.Unlock()

jydocs-back/go.mod

@@ -3,8 +3,8 @@ module jy-docs
 go 1.13
 
 require (
-	app.yhyue.com/moapp/jyPoints v0.0.0-20210319020458-484a38074edd
-	app.yhyue.com/moapp/jy_docs v0.0.0-20210319060022-e324f5108395
+	app.yhyue.com/moapp/jyPoints v0.0.0-20210319072011-5430a201e0aa
+	app.yhyue.com/moapp/jy_docs v0.0.0-20210319063914-d48d51e0cc46
 	app.yhyue.com/moapp/jybase v0.0.0-20210319015107-fe59d2046cf8
 	app.yhyue.com/moapp/jyfs v0.0.0-20210319011832-6cf539ddc5cd
 	github.com/tal-tech/go-zero v1.1.5

jydocs-back/rpc/fileSystemRpc.go

@@ -15,7 +15,7 @@ import (
 var jyFilelLib filesystemclient.FileSystem
 
 func init() {
-	filesystemclient.NewFileSystem(zrpc.MustNewClient(zrpc.RpcClientConf{
+	jyFilelLib = filesystemclient.NewFileSystem(zrpc.MustNewClient(zrpc.RpcClientConf{
 		Etcd: discov.EtcdConf{
 			Key:   config.JyDocsAppConfig.RpcServers.JyFile.Key,
 			Hosts: config.JyDocsAppConfig.RpcServers.JyFile.Address,

jydocs-back/rpc/stdDocRpc.go

@@ -78,14 +78,13 @@ param
 return
 	文库列表、异常
 */
-func GeActivityList(userId string, code, pageNum, pageSize int64) (interface{}, error) {
+func GeActivityList(userId string, code, pageNum, pageSize int64) ([]*stdlib.DocActivity, error) {
 	resp, err := jyStdDocStdlib.DocActivity(context.Background(), &stdlib.DocActivityReq{
 		AppId:      config.JyDocsAppConfig.AppId,
 		ActivityId: code,
 		PageNum:    pageNum,
 		PageSize:   pageSize,
 	})
-	log.Println(config.JyDocsAppConfig.AppId, int32(code), int32(pageNum), int32(pageSize))
 	if err != nil {
 		log.Printf("%s GeActivityList call error %v\n", userId, err)
 		return nil, err
@@ -112,7 +111,6 @@ func GetDocDetail(userId, docId string) (*stdlib.DocInfo, bool, error) {
 		UserId: userId,
 		DocId:  docId,
 	})
-	log.Println(config.JyDocsAppConfig.AppId, userId, docId)
 	if err != nil {
 		log.Printf("%s GetDocDetail call error %v\n", userId, err)
 		return nil, false, err
@@ -123,16 +121,3 @@ func GetDocDetail(userId, docId string) (*stdlib.DocInfo, bool, error) {
 	}
 	return resp.DocDeail, resp.IsBuy, nil
 }
-
-/*
-获取文库内容
-param
-	userId  用户id
-	docId	文库id
-return
-	interface 文库内容
-	error 异常
-*/
-func GetDocContent(userId, docId string) (interface{}, error) {
-	return nil, nil
-}

jydocs-back/servers/stdDoc.go

@@ -5,6 +5,7 @@ import (
 	"app.yhyue.com/moapp/jybase/common"
 	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
 	"fmt"
+	"jy-docs/config"
 	"jy-docs/public"
 	"jy-docs/rpc"
 	"log"
@@ -141,11 +142,13 @@ func (stdDoc *StdDoc) ActivityList() {
 			return nil, err
 		}
 		//存入redis缓存
-
 		list, err := rpc.GeActivityList(userId, code, pageNum, pageSize)
 		if err != nil {
 			return nil, err
 		}
+		for i := 0; i < len(list); i++ {
+			list[i].DocImg = fmt.Sprintf("https://%s.%s/%s", config.JyDocsAppConfig.OssBucket.Priv, config.JyDocsAppConfig.OssAdmin, list[i].DocImg)
+		}
 		return list, nil
 	}()
 	if errMsg != nil {