Merge branch 'master' of http://192.168.3.207:10080/jianyu/jy-docs

jydocs-back/servers/share.go

@@ -47,7 +47,7 @@ func (share *Share) ShareImg() {
 }
 
 func getDocShareUrl(userId, docId string) string {
-	enUserId := encrypt.SE.EncodeString(userId)
+	enUserId := encrypt.SE.EncodeStringByCheck(userId)
 	toHref := url.QueryEscape(fmt.Sprintf("/page_docs_app/details/%s?from=%s", docId, enUserId)) //关注跳转页面
 	unHref := url.QueryEscape(fmt.Sprintf("/swordfish/about?from=%s", enUserId))                 //为关注跳转页面
 	log.Println(fmt.Sprintf(config.JyDocsAppConfig.ShareUrl+"?toHref=%s&unHref=%s", toHref, unHref))

jydocs-back/servers/stdDoc.go

@@ -4,6 +4,7 @@ import (
 	. "app.yhyue.com/moapp/jybase/api"
 	"app.yhyue.com/moapp/jybase/common"
 	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
+	"app.yhyue.com/moapp/jybase/redis"
 	"fmt"
 	"jy-docs/config"
 	"jy-docs/public"
@@ -143,7 +144,6 @@ func (stdDoc *StdDoc) GetDoc(sign string) {
 		fileId := detail.OssPdfId
 		if sign == "Down" {
 			fileId = detail.OssDocId
-			go rpc.DocStatistics(userId, docId, rpc.Down) //统计下载次数
 		}
 		url, err := rpc.GetFileContext(userId, fileId)
 		if err != nil {
@@ -176,11 +176,19 @@ func (stdDoc *StdDoc) TopList() {
 		} else {
 			return nil, fmt.Errorf("未知请求")
 		}
-		//存入redis缓存
+		topKey := fmt.Sprintf("jydoc_indexCache_%s_%d", reqSort, num)
+		listCache := redis.Get("other", topKey)
+		if listCache != nil {
+			return listCache, nil
+		}
+		log.Println("flush", topKey)
 		list, _, err := rpc.GetDocQuery(userId, "", "", 1, num, reqSort)
 		if err != nil {
 			return nil, err
 		}
+		if len(list) > 0 { //存入redis缓存
+			redis.Put("other", topKey, list, 60*5)
+		}
 		return list, nil
 	}()
 	if errMsg != nil {

jydocs-pc/src/views/purchase/purchase.vue

@@ -145,10 +145,10 @@ export default {
       getDocPays({ docId: this.sessioninfor.query, phone: this.tel }).then((res) => {
         console.log(res)
         if (res.data.error_code === 0) {
-          this.sessioninfor.balance = res.data.balance
-          this.sessioninfor.code = res.data.code
-          this.sessioninfor.payTime = res.data.payTime
-          this.sessioninfor.payWay = res.data.payWay
+          this.sessioninfor.balance = res.data.data.balance
+          this.sessioninfor.code = res.data.data.code
+          this.sessioninfor.payTime = res.data.data.payTime
+          this.sessioninfor.payWay = res.data.data.payWay
           sessionStorage.setItem('paydata', JSON.stringify(this.sessioninfor))
           this.$router.push('/purchasesuccess/' + this.response.price)
         }

jydocs-pc/src/views/purchase/purchasesuccess.vue

@@ -82,7 +82,7 @@ export default {
       }
     },
     runDownLoad () {
-      getDown({ docId: this.payinfor.docIds }).then(res => {
+      getDown({ docId: this.payinfor.docId }).then(res => {
         if (res.data.error_code === 0) {
           window.location.href = res.data.data
         }
@@ -156,7 +156,7 @@ export default {
             display: flex;
             flex-direction: column;
             justify-content: space-between;
-            width: 215px;
+            width: 247px;
             height: 96px;
             .bill_list{
               display: flex;