部分修改

app/controller/order/goods.go

@@ -2,7 +2,6 @@ package order
 
 import (
 	"github.com/gin-gonic/gin"
-	"live/app/common"
 	"live/app/lib"
 	"live/app/lib/back"
 	"live/app/lib/recook"
@@ -13,17 +12,12 @@ type Goods struct {
 }
 
 func (g *Goods) Histroy(c *gin.Context) {
-	uid := common.GetUserId(c)
-	if uid <= 0 {
-		back.Fail(c, "未登录")
-		return
-	}
 	page := lib.Page{}
 	if err := tools.ParseParams(&page, c); err != nil {
 		back.Fail(c, err.Error())
 		return
 	}
-	list, err := recook.Order.GetHistoryGoods(uid, c.Request.Header.Get("X-Recook-Token"), page)
+	list, err := recook.Order.GetHistoryGoods(c.Request.Header.Get("X-Recook-Id"), c.Request.Header.Get("X-Recook-Token"), page)
 	if err != nil {
 		back.Fail(c, err.Error())
 		return

app/controller/user/trend/comment.go

@@ -1,4 +1,4 @@
-package grend
+package trend
 
 import (
 	"github.com/gin-gonic/gin"

app/controller/user/trend/praise.go

@@ -1,4 +1,4 @@
-package grend
+package trend
 
 import (
 	"github.com/gin-gonic/gin"

app/lib/recook/order.go

@@ -26,13 +26,13 @@ type ArgsHistoryList struct {
 }
 
 // @Title 获取会员购买历史商品
-func (o *order) GetHistoryGoods(id uint, token string, page lib.Page) (result *ArgsHistoryList, err error) {
+func (o *order) GetHistoryGoods(id string, token string, page lib.Page) (result *ArgsHistoryList, err error) {
 	result = &ArgsHistoryList{}
 	err = RecookClient.Exec(actionHistory, url.Values{
 		"page":  []string{strconv.Itoa(page.GetPage())},
 		"limit": []string{strconv.Itoa(page.GetLimit())},
 	}, result, map[string]string{
-		"X-Recook-ID":    strconv.FormatUint(uint64(id), 10),
+		"X-Recook-ID":    id,
 		"X-Recook-Token": token,
 	})
 	if err != nil {

app/lib/secure/decrypt.go

@@ -1,7 +1,12 @@
 package secure
 
 import (
+	"crypto/rand"
+	"crypto/rsa"
+	"crypto/x509"
 	"encoding/base64"
+	"encoding/pem"
+	"errors"
 	jsoniter "github.com/json-iterator/go"
 	"github.com/nanjishidu/gomini/gocrypto"
 	"live/app/lib/config"
@@ -20,7 +25,7 @@ func Decrypt(text []byte) ([]byte, error) {
 	}
 
 	originalKey, _ := base64.StdEncoding.DecodeString(np.Key)
-	key, err := gocrypto.RSADecrypt(originalKey, config.Config.Section("").Key("private_key").String())
+	key, err := RSADecrypt(originalKey, config.Config.Section("recook").Key("private_key").String())
 	if err != nil {
 		return nil, err
 	}
@@ -42,3 +47,25 @@ func Decrypt(text []byte) ([]byte, error) {
 
 	return body, nil
 }
+
+func RSADecrypt(data []byte, privateStr string) ([]byte, error) {
+	privateKey := "-----BEGIN RSA PRIVATE KEY-----\n"
+	lenPrivate := len(privateStr)
+	for i := 0; i < lenPrivate; i += 64 {
+		if i+64 <= lenPrivate {
+			privateKey += privateStr[i:i+64] + "\n"
+		} else {
+			privateKey += privateStr[i:] + "\n"
+		}
+	}
+	privateKey += "-----END RSA PRIVATE KEY-----"
+	block, _ := pem.Decode([]byte(privateKey))
+	if block == nil {
+		return nil, errors.New("private key error")
+	}
+	priv, err := x509.ParsePKCS1PrivateKey(block.Bytes)
+	if err != nil {
+		return nil, err
+	}
+	return rsa.DecryptPKCS1v15(rand.Reader, priv, data)
+}

app/router/router.go

@@ -7,8 +7,8 @@ import (
 	"live/app/controller/short"
 	"live/app/controller/topic"
 	"live/app/controller/user"
-	"live/app/controller/user/grend"
+	"live/app/controller/user/trend"
-	grend2 "live/app/controller/user/grend/comment"
+	grend2 "live/app/controller/user/trend/comment"
 	"live/app/router/middleware"
 )
 
@@ -58,7 +58,7 @@ func Router(router *gin.Engine) {
 			trendC := &user.Trend{}
 			userR.POST("trend/list", trendC.List) // 会员动态列表
 
-			commentC := &grend.Comment{}
+			commentC := &trend.Comment{}
 			userR.POST("trend/comment/list", middleware.BothAuth(), commentC.List) // 评论列表
 			userR.POST("trend/comment/add", middleware.Auth(), commentC.Add)       // 评论列表
 			// 评论点赞
@@ -66,7 +66,7 @@ func Router(router *gin.Engine) {
 			userR.POST("trend/comment/praise/add", middleware.Auth(), commentPraiseC.Add)       // 评论点赞
 			userR.POST("trend/comment/praise/cancel", middleware.Auth(), commentPraiseC.Cancel) // 评论取消点赞
 
-			praiseC := &grend.Praise{}
+			praiseC := &trend.Praise{}
 			userR.POST("trend/praise/add", middleware.Auth(), praiseC.Add)       // 动态点赞
 			userR.POST("trend/praise/cancel", middleware.Auth(), praiseC.Cancel) // 动态取消点赞
 		}

config/app.test.ini

@@ -30,4 +30,5 @@ oneTimeValid=1
 key=c3nyGkDcot8aXKcgUZLe
 
 [recook]
-url=https://testapi.reecook.cn/api/v1
+url=https://testapi.reecook.cn/api/v1
+private_key=MIIEowIBAAKCAQEAzNWyjYe3qt4YRTDwANxDPNLAJ9TZBuHsSqSjJM5B35fABwN3gwm5Q/SCz/6kgKTqeSgCVPFYhO/zOD6G8K7EJLgx95ZIeAB9EkW+xrhFDDthUZAkA03zHJO6SkFKOciLFVi94BdCdGlNFlnaBBqA+8XvCpD1V8DFc/9cpb5icZvngu8vEkwkbYceCXKUMNxoXY/E2cFe8f2tVFR5pRkQgRLbM70jt4yBGOD8pbuk6fcnD7ghGWgzMq/845N3wISSTp/gAQg8403Fk+8AoL+FKgxUkjUOpPI2XrcpQm0EphuAX4J0Xvo3Hu6TEPZYyqULEXGT2Jukmh0NSkNO0F39xwIDAQABAoIBAQCAqRYPWhkexYQ/Kb8G+1NsiABUxJhRf2UZeZJUEw5DcKEYhq/x6hCpw5LLLOqNN4lj8qKMUlBEqCeAw52k3lGrstsH5ii836mv6YksbyBHz6CQR9anELZM0+nmrF4AL5xVGzmg4VtHncDi8itD+pXcD3bXjzfcF+SuuM6r+QsCykgTc/jw+R6GqOHvD48mUQCI0/Xw6jjAWUUh0jRX2BvLQwcccan5ZCZD3C7M8gGuRFO2vr8lFliQwyFNgwrpE+brLeMNeLHz1S6vMwfqr3r4Mq78wTihoze+3kIs5tdE0YRkJpaPLdeCsvQ8iFfD9nat7wnNHgcQBU+3B+KjOJCZAoGBAOVC8AY8q0UeTFreo44Fgda9Jg+BsR0UwTzTxzozdwSMhIfzb6oDa6tWd8VO0V6FaqK+Urxj6UP3JshAQT8hsq6Hh8tEmUx3rxpQnWZ5bdFJD291apKwTVgDzcf7mo77Ypjpko+Y4Og3weUGOnM+hTdPiToUmkZv78OPgbRR+utdAoGBAOS5c3f7gdfd60mlABPIgpHQccaTyEg3YoCQoB1oXTMk881vzC6w8xwYR0gpKGj6/vG9FeEpgYLi+ydWiNnzH8ZknPiACYZ6g18CzlCUcHUG1PZhKot1zgXQN9/WAvjWZ62Ym4FcPrEaF3+u88Pjj27vQE5MDO8O2uVRQwIGXh9zAoGAGLjGHzYNle91dlsJsffgD2LoJsXqbmNdjwybMCh6jhAE/o/+m4uw4ZH6allcdF/YpuH1FAGGFuEg2nkrT/53QSC2QPINwdQqGqFUx8cSU34YXwF/U4AVZwdJ+mWkPgTXlfuh5UAsCH5ytxqb1O+J9/PorU2pcS0C4sinyOUKNLUCgYBFJNsHVnz2KRxL8xmG4YK3WfBLO7m8OyIIA7Cjsz0ZjP43CKkNJGkaASzrX6XbtqUDp0nJ+6YvTzbluX89hAYDD790UCCRCtBUFKESMw2cEyimItGdv0s87qk1fZkAaLCHBi9cd+pr15tq+hSvD0f5HVKvWMZALpl14Y8EObCSiQKBgCiSKMsn7W5eGVR4cHO5NQ8P6V20ZOGIKvUsJUtlzRtneJERqVXZqVp9MctpLzNluQMGzTR1dEngdnOa2sYgdd8ATYy0NGiZuBDMA3h0f0aVsQublPfUG+0QH/3qryNISWN+m8DnCtkpkUG1GI5/0x9ZVVlSybIvz7H8NltIxXr/