update

3dshow/api/api.go

@@ -119,3 +119,13 @@ func (g GinRouter) DeleteJWTTEST(path string, httpHandler JWTHander) {
 func (g GinRouter) POSTJWTTest(path string, httpHandler JWTHander) {
 	g.group.POST(path, ResultJWTTestWrapper(httpHandler, g.svc))
 }
+
+
+// 代参数判断权限
+func (g GinRouter) GETJWTKEY(path string, httpHandler JWTHander, keys ...string) {
+	g.group.GET(path, g.svc.JWT.MiddleFunc(), ResultJWTWrapperKey(httpHandler, g.svc, keys))
+}
+
+func (g GinRouter) POSTJWTKEY(path string, httpHandler JWTHander, keys ...string) {
+	g.group.POST(path, g.svc.JWT.MiddleFunc(), ResultJWTWrapperKey(httpHandler, g.svc, keys))
+}

3dshow/api/controller.go

@@ -148,6 +148,80 @@ func ResultJWTTestWrapper(handle JWTHander, svc *Service) gin.HandlerFunc {
 	}
 }
 
+// ResultJWTWrapper JWT授权处理handler
+func ResultJWTWrapperKey(handle JWTHander, svc *Service, keys []string) gin.HandlerFunc {
+
+	return func(c *gin.Context) {
+
+		defer func() {
+			if r := recover(); r != nil {
+				fmt.Println("recover success.")
+				fmt.Println(r)
+
+				buf := make([]byte, 1<<16)
+				runtime.Stack(buf, true)
+				fmt.Println("buf", string(buf))
+
+				c.JSON(http.StatusOK, NewFailResultWithData("系统异常", r))
+			}
+		}()
+
+		claims := jwt.ExtractClaims(c)
+
+		var usr *JWTUser
+
+		if claims["id"] != nil {
+			id := claims["id"].(string)
+			phone := claims["phone"].(string)
+			name := claims["name"].(string)
+			role := claims["role"].(string)
+			parent := claims["parent"].(string)
+			state := int32(claims["state"].(float64))
+			key := ""
+			if claims["key"] != nil {
+				key = claims["key"].(string)
+			}
+
+			usr = &JWTUser{ID: id, Name: name, Phone: phone, Parent: parent, Role: role, State: state, Key: key}
+		}
+
+		var apis = &ApiSession{
+			Svc:  svc,
+			User: usr,
+		}
+
+		flag := false
+		for _, key := range keys {
+			if usr.Key == key {
+				flag = true
+				break
+			}
+		}
+		if !flag {
+			c.JSON(http.StatusForbidden, NewFailResult("您没有权限"))
+			c.Abort()
+			return
+		}
+
+		data, err := handle(c, apis)
+
+		if err != nil {
+			fmt.Println(err)
+			httpErr, ok := err.(HTTPError)
+			if ok {
+				c.JSON(http.StatusOK, NewFailResultWithCode(httpErr.Error(), httpErr.Code))
+				return
+			}
+
+			c.JSON(http.StatusOK, NewFailResult(err.Error()))
+			return
+		}
+		if data != nil {
+			c.JSON(http.StatusOK, NewOkResult(data))
+		}
+	}
+}
+
 // ResultSuc 成功
 func ResultSuc(c *gin.Context, data interface{}) {
 	c.JSON(http.StatusOK, NewOkResult(data))
@@ -296,12 +370,15 @@ func NewErrorWithCode(desc string, code int32) HTTPError {
 
 // JWTUser jwt登录用户
 type JWTUser struct {
-	ID     string `json:"id"`
-	Parent string `json:"parent"`
-	Phone  string `json:"phone"`
-	Role   string `json:"role"`
-	Perms  string `json:"perms"`
-	State  int32  `json:"state"`
+	ID       string `json:"id"`
+	Parent   string `json:"parent"`
+	Name     string `json:"name"`
+	Phone    string `json:"phone"`
+	Role     string `json:"role"`
+	Perms    string `json:"perms"`
+	State    int32  `json:"state"`
+	Key      string `json:"key"`
+	UserType int    `json:"userType"`
 }
 
 func UtilQueryMap(c *gin.Context) map[string]interface{} {

3dshow/api/order.go

@@ -4,6 +4,7 @@ import (
 	"3dshow/db/model"
 	"3dshow/db/repo"
 	"errors"
+	"fmt"
 	"time"
 
 	"github.com/gin-gonic/gin"
@@ -12,7 +13,6 @@ import (
 
 // 产品管理
 func Order(r *GinRouter) {
-	r.POSTJWT("/order/create", OrderAdd)
 	r.POSTJWT("/order/createBatch", OrderAddBatch)
 	r.GETJWT("/order/list", OrderList)
 	r.POSTJWT("/order/update", OrderUpdate)
@@ -26,6 +26,7 @@ func OrderAddBatch(c *gin.Context, apictx *ApiSession) (interface{}, error) {
 	var orders []*model.OrderAddReq
 	err := c.ShouldBindJSON(&orders)
 	if err != nil {
+		fmt.Println(err)
 		return nil, errors.New("参数错误！")
 	}
 	ctx := apictx.CreateRepoCtx()
@@ -73,30 +74,6 @@ func OrderAddBatch(c *gin.Context, apictx *ApiSession) (interface{}, error) {
 
 }
 
-// TODO 待移除 与前端确定
-func OrderAdd(c *gin.Context, apictx *ApiSession) (interface{}, error) {
-	var form model.Order
-	err := c.ShouldBindJSON(&form)
-	if err != nil {
-		return nil, errors.New("参数错误！")
-	}
-	ctx := apictx.CreateRepoCtx()
-	_userId := apictx.User.ID
-	userId, err := primitive.ObjectIDFromHex(_userId)
-	if err != nil {
-		return nil, errors.New("非法用户")
-	}
-	for _, v := range form.Products {
-		v.Status = -1
-	}
-	form.UserId = userId
-	form.Status = -1
-	form.CreateTime = time.Now()
-	form.UpdateTime = time.Now()
-	return repo.RepoAddDoc(ctx, repo.CollectionOrder, &form)
-
-}
-
 // 订单列表
 func OrderList(c *gin.Context, apictx *ApiSession) (interface{}, error) {
 	// customer
@@ -108,14 +85,28 @@ func OrderList(c *gin.Context, apictx *ApiSession) (interface{}, error) {
 	// if apictx.User.Role == "customer"{
 	query["userId"] = userId
 	// }
-	return repo.RepoPageSearch(apictx.CreateRepoCtx(), &repo.PageSearchOptions{
+	result, err := repo.RepoPageSearch(apictx.CreateRepoCtx(), &repo.PageSearchOptions{
 		CollectName: repo.CollectionOrder,
 		Page:        page,
 		Size:        size,
 		Query:       query,
 		// Project: []string{},
-		// Sort: repo.Map{"createTime": -1},
+		Sort: repo.Map{"createTime": -1},
 	})
+
+	if len(result.List) > 0 {
+		for _, v := range result.List {
+			supplyId := v["supplyId"].(primitive.ObjectID)
+			supply := model.Supply{}
+			repo.RepoSeachDoc(apictx.CreateRepoCtx(), &repo.DocSearchOptions{
+				CollectName: repo.CollectionSupply,
+				Query:       repo.Map{"_id": supplyId},
+			}, &supply)
+			v["supplyName"] = supply.Name
+		}
+	}
+
+	return result, err
 }
 
 // 个人页面数量展示

3dshow/app.yaml

@@ -6,21 +6,18 @@ jwt:
   realm: spu3d
   key: spu3d secret
   
-
-
 log:
   fileName: 3dshow.log
   level: 1
   serviceName: 3dshow
 
-
 debug: 
   userId: test
   userPhone: 15208364621
   UserRole: string
 
 nats:
-  # url: nats://124.71.139.24:14301
-  url: nats://127.0.0.1:14301
+  url: nats://124.71.139.24:14301
+  # url: nats://127.0.0.1:14301
   maxReconnect: 1000
   reconnDelaySecond: 5

3dshow/db/model/json/tmp.json

@@ -0,0 +1,43 @@
+[
+  {
+    "supply": {
+      "_id": "636b1269cd5efc036be2b782"
+    },
+    "products": [
+      {
+        "supplyId": "636b1269cd5efc036be2b782",
+        "senceId": "6369f46328c4bf8b14f47a6a",
+        "name": "32342",
+        "type": "shoes",
+        "unit": "SL-H-1989",
+        "price": 111,
+        "cover": "https://sku3d-test.obs.cn-east-3.myhuaweicloud.com/image/jpg/1656484424701GCYvHS_untitled.jpg",
+        "color": "#ff00ff",
+        "size": "38",
+        "thumbnail": [
+          "https://sku3d-test.obs.cn-east-3.myhuaweicloud.com/image/jpg/1656484424701GCYvHS_untitled.jpg"
+        ],
+        "status": -1,
+        "onsaleTimeTime": "0001-01-01T00:00:00Z",
+        "createTime": "2022-11-11T07:26:52.641Z",
+        "updateTime": "0001-01-01T00:00:00Z",
+        "isCollect": false,
+        "collectId": "000000000000000000000000",
+        "productId": "636df93c4fa01c203c478bb2"
+      }
+    ],
+    "deliveryMethod": "快递配送",
+    "remark": "请勿损坏",
+    "address": {
+      "_id": "637b3b62434c7a32bf6f9a6f",
+      "addr": "123",
+      "area": "东城区",
+      "city": "北京市",
+      "contact": "123u",
+      "createTime": "2022-11-21T16:48:34.786+08:00",
+      "defualt": 1,
+      "phone": "18981937200",
+      "province": "北京市"
+    }
+  }
+]