diff --git a/bff/etc/product.pb b/bff/etc/product.pb index be7cd82..3c80fbe 100644 Binary files a/bff/etc/product.pb and b/bff/etc/product.pb differ diff --git a/product/etc/product.yaml b/product/etc/product.yaml index fad8e92..0b2fe32 100644 --- a/product/etc/product.yaml +++ b/product/etc/product.yaml @@ -22,22 +22,22 @@ Nacos: RegisterIP: product Mysql: - # Host: mysql - # Port: 3306 - # User: root - # Password: "123123" - # Database: dms-product - # Charset: utf8mb4 - # Prefix: - - Host: "39.106.171.204" - Port: 33066 + Host: mysql + Port: 3306 User: root - Password: "MOLXRZNOU4Y4" + Password: "123123" Database: dms-product Charset: utf8mb4 Prefix: + # Host: "39.106.171.204" + # Port: 33066 + # User: root + # Password: "MOLXRZNOU4Y4" + # Database: dms-product + # Charset: utf8mb4 + # Prefix: + # ReadHost: mysql-slave # ReadPort: 3306 # ReadUser: root diff --git a/product/internal/dao/product.go b/product/internal/dao/product.go index d020610..c3fea9b 100644 --- a/product/internal/dao/product.go +++ b/product/internal/dao/product.go @@ -194,15 +194,15 @@ type ProductNames struct { } type ProductStatusUpdate struct { - Status uint8 `gorm:"column:status"` - Reason string `gorm:"column:reason"` - AdminName string `gorm:"column:admin_name"` - AdminId int `gorm:"column:admin_id"` + Status uint8 `gorm:"column:status" json:"status"` + Reason string `gorm:"column:reason" json:"reason"` + AdminName string `gorm:"column:admin_name" json:"admin_name"` + AdminId int `gorm:"column:admin_id" json:"admin_id"` } type ProductSort struct { - Id int `gorm:"column:id"` - Sort uint16 `gorm:"column:sort"` - AdminName string `gorm:"column:admin_name"` - AdminId int `gorm:"column:admin_id"` + Id int `gorm:"column:id" json:"id"` + Sort uint16 `gorm:"column:sort" json:"sort"` + AdminName string `gorm:"column:admin_name" json:"admin_name"` + AdminId int `gorm:"column:admin_id" json:"admin_id"` } diff --git a/product/product/product.pb.go b/product/product/product.pb.go index 156c1fa..0c6d0b1 100644 --- a/product/product/product.pb.go +++ b/product/product/product.pb.go @@ -1122,11 +1122,11 @@ const file_proto_admin_product_proto_rawDesc = "" + "\x06reason\x18\" \x01(\tR\x06reason\x12\x1d\n" + "\n" + "admin_name\x18# \x01(\tR\tadminName\x12\x12\n" + - "\x04edit\x18$ \x01(\rR\x04edit2\xfb\x03\n" + - "\aProduct\x12T\n" + - "\x06Create\x12\x12.product.CreateReq\x1a\x11.product.Response\"#\x82\xd3\xe4\x93\x02\x1d:\x01*\"\x18/admin/v3/product/create\x12N\n" + - "\x04Info\x12\x10.product.InfoReq\x1a\x11.product.Response\"!\x82\xd3\xe4\x93\x02\x1b:\x01*\x12\x16/admin/v3/product/info\x12Q\n" + - "\x05Items\x12\x11.product.ItemsReq\x1a\x11.product.Response\"\"\x82\xd3\xe4\x93\x02\x1c:\x01*\x12\x17/admin/v3/product/items\x12Q\n" + + "\x04edit\x18$ \x01(\rR\x04edit2\xee\x03\n" + + "\aProduct\x12M\n" + + "\x06Create\x12\x12.product.CreateReq\x1a\x11.product.Response\"\x1c\x82\xd3\xe4\x93\x02\x16:\x01*\"\x11/admin/v3/product\x12N\n" + + "\x04Info\x12\x10.product.InfoReq\x1a\x11.product.Response\"!\x82\xd3\xe4\x93\x02\x1b:\x01*\x12\x16/admin/v3/product/info\x12K\n" + + "\x05Items\x12\x11.product.ItemsReq\x1a\x11.product.Response\"\x1c\x82\xd3\xe4\x93\x02\x16:\x01*\x12\x11/admin/v3/product\x12Q\n" + "\x05Names\x12\x11.product.NamesReq\x1a\x11.product.Response\"\"\x82\xd3\xe4\x93\x02\x1c:\x01*\x12\x17/admin/v3/product/names\x12T\n" + "\x06Status\x12\x12.product.StatusReq\x1a\x11.product.Response\"#\x82\xd3\xe4\x93\x02\x1d:\x01*\x1a\x18/admin/v3/product/status\x12N\n" + "\x04Sort\x12\x10.product.SortReq\x1a\x11.product.Response\"!\x82\xd3\xe4\x93\x02\x1b:\x01*\x1a\x16/admin/v3/product/sortB\vZ\t./productb\x06proto3" diff --git a/product/proto/admin/product.proto b/product/proto/admin/product.proto index e06ab6c..304a1e6 100644 --- a/product/proto/admin/product.proto +++ b/product/proto/admin/product.proto @@ -8,7 +8,7 @@ import "google/api/annotations.proto"; service Product { rpc Create(CreateReq) returns (Response) { option (google.api.http) = { - post: "/admin/v3/product/create" + post: "/admin/v3/product" body: "*" }; }