<perf>:增加了为商品上传多个图片的接口

trading-go/controller/chatcontroller.go

@@ -7,6 +7,7 @@ import (
 	"github.com/gorilla/websocket"
 	"net/http"
 	"strconv"
+	"time"
 	"trading-go/model"
 	"trading-go/response"
 )
@@ -104,31 +105,31 @@ func reception(conn *websocket.Conn, uid uint) {
 //	}
 //}
 
-//func heartBeat(conn *websocket.Conn, uid uint) {
-//	defer func() {
-//		delete(Conns, uid)
-//	}()
-//	for {
-//		msg := model.Message{
-//			MsgType: 4,
-//			From:    0,
-//			To:      uid,
-//			Time:    uint(time.Now().Unix()),
-//			Content: "alive",
-//		}
-//		data, err := json.Marshal(msg)
-//		if err != nil {
-//			fmt.Println(err.Error())
-//			break
-//		}
-//		err = conn.WriteMessage(websocket.TextMessage, data)
-//		if err != nil {
-//			fmt.Println(err.Error())
-//			break
-//		}
-//		time.Sleep(time.Second * 5)
-//	}
-//}
+func heartBeat(conn *websocket.Conn, uid uint) {
+	defer func() {
+		delete(Conns, uid)
+	}()
+	for {
+		msg := model.Message{
+			MsgType: 4,
+			From:    0,
+			To:      uid,
+			Time:    uint(time.Now().Unix()),
+			Content: "alive",
+		}
+		data, err := json.Marshal(msg)
+		if err != nil {
+			fmt.Println(err.Error())
+			break
+		}
+		err = conn.WriteMessage(websocket.TextMessage, data)
+		if err != nil {
+			fmt.Println(err.Error())
+			break
+		}
+		time.Sleep(time.Second * 5)
+	}
+}
 
 func Chat(w http.ResponseWriter, rq *http.Request, uid uint) {
 	// 升级为websocket
@@ -148,7 +149,7 @@ func Chat(w http.ResponseWriter, rq *http.Request, uid uint) {
 
 	go send(conn, uid)
 	go reception(conn, uid)
-	//go heartBeat(conn, uid)
+	go heartBeat(conn, uid)
 
 	response.Success(w, "success", nil)
 }
@@ -233,10 +234,11 @@ func GetMsgToPaged(c *gin.Context) {
 
 // GetMsg
 // @Tags 聊天模块
-// @Summary 获取与特定用户相关的所有聊天记录
+// @Summary 获取与特定两个用户之间的所有聊天记录
 // @Param uid query string true "用户id"
+// @Param target query string true "对象id"
 // @Success 200 {object} response.Response
-// @Router /chat/msg/ [get]
+// @Router /chat/msg [get]
 func GetMsg(c *gin.Context) {
 	var ms model.Message
 	id := c.Query("uid")
@@ -246,7 +248,14 @@ func GetMsg(c *gin.Context) {
 		response.Fail(c.Writer, msg, 500)
 		return
 	}
-	msgs, err := ms.GetMsg(uint(uid))
+	t := c.Query("target")
+	target, err := strconv.ParseUint(t, 10, 64)
+	if err != nil {
+		msg := err.Error()
+		response.Fail(c.Writer, msg, 500)
+		return
+	}
+	msgs, err := ms.GetMsg(uint(uid), uint(target))
 	if err != nil {
 		msg := err.Error()
 		response.Fail(c.Writer, msg, 500)

trading-go/controller/goodscontroller.go

@@ -1,6 +1,7 @@
 package controller
 
 import (
+	"fmt"
 	"github.com/gin-gonic/gin"
 	"strconv"
 	"time"
@@ -45,6 +46,7 @@ func CreatGoods(c *gin.Context) {
 		response.Fail(c.Writer, msg, 500)
 		return
 	}
+	fmt.Println(goodsJson)
 	goods := goodsJson.Change()
 	id, err := goods.Create()
 	go util.NewItem(id, uint(time.Now().Unix()), goodsJson.Title, goodsJson.Desc)
@@ -68,6 +70,7 @@ func CreatGoods(c *gin.Context) {
 // @Router /goods/delete/{id} [delete]
 func DGoods(c *gin.Context) {
 	var goods model.Goods
+	var pic model.Pic
 	ids := c.Param("id")
 	id, err := strconv.Atoi(ids)
 
@@ -78,7 +81,19 @@ func DGoods(c *gin.Context) {
 		return
 	}
 	goods.Id = uint(id)
+	pic.Id = uint(id)
 	err = goods.Delete()
+	if err != nil {
+		msg := err.Error()
+		response.Fail(c.Writer, msg, 500)
+		return
+	}
+	err = pic.Delete()
+	if err != nil {
+		msg := err.Error()
+		response.Fail(c.Writer, msg, 500)
+		return
+	}
 	go util.DelIndex(goods.Id)
 	if err != nil {
 		msg := err.Error()
@@ -161,6 +176,7 @@ func GetRecommend(c *gin.Context) {
 // @Router /goods/revise [post]
 func ReviseGoods(c *gin.Context) {
 	var goods model.Goods
+	var pic model.Pic
 	err := c.ShouldBindJSON(&goods)
 	if err != nil {
 		msg := err.Error()
@@ -168,6 +184,19 @@ func ReviseGoods(c *gin.Context) {
 		return
 	}
 	err = goods.Revise()
+	if err != nil {
+		msg := err.Error()
+		response.Fail(c.Writer, msg, 500)
+		return
+	}
+	pic.Id = goods.Id
+	err = pic.Delete()
+	err = pic.Save(pic.Id, goods.Pic)
+	if err != nil {
+		msg := err.Error()
+		response.Fail(c.Writer, msg, 500)
+		return
+	}
 	go func() {
 		util.DelIndex(goods.Id)
 		util.NewIndex(goods.Id, goods.Desc+goods.Title)
@@ -176,11 +205,6 @@ func ReviseGoods(c *gin.Context) {
 		util.DelItem(goods.Id)
 		util.NewItem(goods.Id, uint(time.Now().Unix()), goods.Title, goods.Desc)
 	}()
-	if err != nil {
-		msg := err.Error()
-		response.Fail(c.Writer, msg, 500)
-		return
-	}
 	response.Success(c.Writer, "success", nil)
 }
 

trading-go/docs/docs.go

@@ -342,12 +342,12 @@ const docTemplate = `{
                 }
             }
         },
-        "/chat/msg/": {
+        "/chat/msg": {
             "get": {
                 "tags": [
                     "聊天模块"
                 ],
-                "summary": "获取与特定用户相关的所有聊天记录",
+                "summary": "获取与特定两个用户之间的所有聊天记录",
                 "parameters": [
                     {
                         "type": "string",
@@ -355,6 +355,13 @@ const docTemplate = `{
                         "name": "uid",
                         "in": "query",
                         "required": true
+                    },
+                    {
+                        "type": "string",
+                        "description": "对象id",
+                        "name": "target",
+                        "in": "query",
+                        "required": true
                     }
                 ],
                 "responses": {
@@ -1604,7 +1611,7 @@ const docTemplate = `{
 // SwaggerInfo holds exported Swagger Info so clients can modify it
 var SwaggerInfo = &swag.Spec{
 	Version:          "1.0",
-	Host:             "192.168.31.30:8084",
+	Host:             "192.168.31.27:8084",
 	BasePath:         "/WeChatTrading/trading-go",
 	Schemes:          []string{},
 	Title:            "二手交易",

trading-go/docs/swagger.json

@@ -11,7 +11,7 @@
         },
         "version": "1.0"
     },
-    "host": "192.168.31.30:8084",
+    "host": "192.168.31.27:8084",
     "basePath": "/WeChatTrading/trading-go",
     "paths": {
         "/appraise/create": {
@@ -335,12 +335,12 @@
                 }
             }
         },
-        "/chat/msg/": {
+        "/chat/msg": {
             "get": {
                 "tags": [
                     "聊天模块"
                 ],
-                "summary": "获取与特定用户相关的所有聊天记录",
+                "summary": "获取与特定两个用户之间的所有聊天记录",
                 "parameters": [
                     {
                         "type": "string",
@@ -348,6 +348,13 @@
                         "name": "uid",
                         "in": "query",
                         "required": true
+                    },
+                    {
+                        "type": "string",
+                        "description": "对象id",
+                        "name": "target",
+                        "in": "query",
+                        "required": true
                     }
                 ],
                 "responses": {

trading-go/docs/swagger.yaml

@@ -146,7 +146,7 @@ definitions:
       message:
         type: string
     type: object
-host: 192.168.31.30:8084
+host: 192.168.31.27:8084
 info:
   contact: {}
   description: 一个基于微信小程序的校园二手交易平台的api文档
@@ -364,7 +364,7 @@ paths:
       summary: 获取与特定用户相关的最后一条聊天记录
       tags:
       - 聊天模块
-  /chat/msg/:
+  /chat/msg:
     get:
       parameters:
       - description: 用户id
@@ -372,12 +372,17 @@ paths:
         name: uid
         required: true
         type: string
+      - description: 对象id
+        in: query
+        name: target
+        required: true
+        type: string
       responses:
         "200":
           description: OK
           schema:
             $ref: '#/definitions/response.Response'
-      summary: 获取与特定用户相关的所有聊天记录
+      summary: 获取与特定两个用户之间的所有聊天记录
       tags:
       - 聊天模块
   /chat/to/{page}/{pageSize}:

trading-go/main.go

@@ -15,12 +15,12 @@ import (
 // @license.name Apache 2.0
 // @license.url http://www.apache.org/licenses/LICENSE-2.0.html
 
-// @host 192.168.31.30:8084
+// @host 192.168.31.27:8084
 // @BasePath /WeChatTrading/trading-go
 func main() {
 
 	r := routine.GetRoutine()
 	port := viper.GetString("web.port")
-	fmt.Println("[api文档] =====>>> http://124.222.126.172:8084/swagger/index.html#/")
+	fmt.Println("[api文档] =====>>> http://192.168.31.27:8084/swagger/index.html#/")
 	r.Run(port)
 }

trading-go/model/goods.go

@@ -114,13 +114,13 @@ func (g *GoodsSurface) GetCnt() (cnt int, err error) {
 
 func (g *Goods) Revise() error {
 	db := common.DB
-	sqlStr := "UPDATE goods SET pic = ?, owner_id = ?, `desc` = ?, title = ?, price = ?, place = ?, state = ? WHERE id = ?"
-	_, err := db.Exec(sqlStr, g.Pic, g.OwnerId, g.Desc, g.Title, g.Price, g.Place, g.State, g.Id)
+	sqlStr := "UPDATE goods SET owner_id = ?, `desc` = ?, title = ?, price = ?, place = ?, state = ? WHERE id = ?"
+	_, err := db.Exec(sqlStr, g.OwnerId, g.Desc, g.Title, g.Price, g.Place, g.State, g.Id)
 	if err != nil {
 		return err
 	}
 	sqlStr = "UPDATE goods_surfaces SET pic = ?, owner_id = ?, title = ?, price = ?, state = ? WHERE id = ?"
-	_, err = db.Exec(sqlStr, g.Pic, g.OwnerId, g.Title, g.Price, g.State, g.Id)
+	_, err = db.Exec(sqlStr, g.Pic[0], g.OwnerId, g.Title, g.Price, g.State, g.Id)
 	return err
 }
 

trading-go/model/message.go

@@ -77,7 +77,7 @@ func (m Message) GetFrom(uid uint, page, pageSize int) (ms response.PageResponse
 	return
 }
 
-func (m Message) GetMsg(uid uint) (ms []Message, err error) {
+func (m Message) GetMsg(uid, target uint) (ms []Message, err error) {
 	mFrom, err := m.GetFrom(uid, 1, 10000000)
 	if err != nil {
 		return nil, err
@@ -87,7 +87,12 @@ func (m Message) GetMsg(uid uint) (ms []Message, err error) {
 		return nil, err
 	}
 	s1, s2 := mFrom.Data.([]Message), mTo.Data.([]Message)
-	ms = append(s1, s2...)
+	msgs := append(s1, s2...)
+	for _, msg := range msgs {
+		if msg.To == target || msg.From == target {
+			ms = append(ms, msg)
+		}
+	}
 	return ms, nil
 }
 

trading-go/model/table.go

@@ -1,37 +1,30 @@
 package model
 
-import (
-	"fmt"
-	"github.com/spf13/viper"
-	"gorm.io/driver/mysql"
-	"gorm.io/gorm"
-)
-
 func init() {
-	host := viper.GetString("mysql.host")
-	port := viper.GetString("mysql.port")
-	database := viper.GetString("mysql.database")
-	username := viper.GetString("mysql.username")
-	password := viper.GetString("mysql.password")
-	charset := viper.GetString("mysql.charset")
-	dsn := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=%s&parseTime=true",
-		username,
-		password,
-		host,
-		port,
-		database,
-		charset)
-	db, err := gorm.Open(mysql.Open(dsn), &gorm.Config{})
-	if err != nil {
-		panic(err.Error())
-	}
-	db.AutoMigrate(User{})
-	db.AutoMigrate(Category{})
-	db.AutoMigrate(Pic{})
-	db.AutoMigrate(Appraise{})
-	db.AutoMigrate(GoodsSurface{})
-	db.AutoMigrate(Goods{})
-	db.AutoMigrate(Relation{})
-	db.AutoMigrate(Order{})
-	db.AutoMigrate(CategoryOfGoods{})
+	//host := viper.GetString("mysql.host")
+	//port := viper.GetString("mysql.port")
+	//database := viper.GetString("mysql.database")
+	//username := viper.GetString("mysql.username")
+	//password := viper.GetString("mysql.password")
+	//charset := viper.GetString("mysql.charset")
+	//dsn := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=%s&parseTime=true",
+	//	username,
+	//	password,
+	//	host,
+	//	port,
+	//	database,
+	//	charset)
+	//db, err := gorm.Open(mysql.Open(dsn), &gorm.Config{})
+	//if err != nil {
+	//	panic(err.Error())
+	//}
+	////db.AutoMigrate(User{})
+	////db.AutoMigrate(Category{})
+	////db.AutoMigrate(Pic{})
+	////db.AutoMigrate(Appraise{})
+	////db.AutoMigrate(GoodsSurface{})
+	////db.AutoMigrate(Goods{})
+	////db.AutoMigrate(Relation{})
+	////db.AutoMigrate(Order{})
+	////db.AutoMigrate(CategoryOfGoods{})
 }