diff --git a/.gitea/workflows/master_buyer_build_manual.yaml b/.gitea/workflows/master_buyer_build_manual.yaml index 47af259..765713e 100644 --- a/.gitea/workflows/master_buyer_build_manual.yaml +++ b/.gitea/workflows/master_buyer_build_manual.yaml @@ -69,10 +69,8 @@ jobs: volumes: # 数据挂载 - ./log:/log - - ./temp:/temp - - ./uploads:/temp/uploads ports: - - '10097:10093' + - '10097:10097' restart: always EOF # 验证docker-compose.yml生成 diff --git a/src/main/java/com/aida/buyer/model/vo/AuthPrincipalVo.java b/src/main/java/com/aida/buyer/model/vo/AuthPrincipalVo.java index 020a51e..4b47045 100644 --- a/src/main/java/com/aida/buyer/model/vo/AuthPrincipalVo.java +++ b/src/main/java/com/aida/buyer/model/vo/AuthPrincipalVo.java @@ -1,6 +1,8 @@ package com.aida.buyer.model.vo; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.Data; import java.io.Serializable; @@ -12,6 +14,7 @@ public class AuthPrincipalVo implements Serializable { private static final long serialVersionUID = 1L; + @JsonSerialize(using = ToStringSerializer.class) private Long id; private String username; private String avatarUrl; diff --git a/src/main/java/com/aida/buyer/module/account/entity/BuyerAccount.java b/src/main/java/com/aida/buyer/module/account/entity/BuyerAccount.java index 00f41d7..af36c34 100644 --- a/src/main/java/com/aida/buyer/module/account/entity/BuyerAccount.java +++ b/src/main/java/com/aida/buyer/module/account/entity/BuyerAccount.java @@ -1,6 +1,8 @@ package com.aida.buyer.module.account.entity; import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler; import lombok.Data; @@ -15,6 +17,7 @@ public class BuyerAccount implements Serializable { private static final long serialVersionUID = 1L; @TableId(type = IdType.ASSIGN_ID) + @JsonSerialize(using = ToStringSerializer.class) private Long id; private String firstName; diff --git a/src/main/java/com/aida/buyer/module/cart/dto/CartItemDTO.java b/src/main/java/com/aida/buyer/module/cart/dto/CartItemDTO.java index 4936e1f..d1f9174 100644 --- a/src/main/java/com/aida/buyer/module/cart/dto/CartItemDTO.java +++ b/src/main/java/com/aida/buyer/module/cart/dto/CartItemDTO.java @@ -1,5 +1,7 @@ package com.aida.buyer.module.cart.dto; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -15,9 +17,11 @@ public class CartItemDTO implements Serializable { private static final long serialVersionUID = 1L; @Schema(description = "购物车记录ID") + @JsonSerialize(using = ToStringSerializer.class) private Long cartId; @Schema(description = "商品ID") + @JsonSerialize(using = ToStringSerializer.class) private Long listingId; @Schema(description = "商品标题") diff --git a/src/main/java/com/aida/buyer/module/cart/entity/CartEntity.java b/src/main/java/com/aida/buyer/module/cart/entity/CartEntity.java index d6b9ea9..fcd0d4b 100644 --- a/src/main/java/com/aida/buyer/module/cart/entity/CartEntity.java +++ b/src/main/java/com/aida/buyer/module/cart/entity/CartEntity.java @@ -18,8 +18,10 @@ public class CartEntity implements Serializable { @JsonSerialize(using = ToStringSerializer.class) private Long id; + @JsonSerialize(using = ToStringSerializer.class) private Long buyerId; + @JsonSerialize(using = ToStringSerializer.class) private Long listingId; private LocalDateTime addTime; diff --git a/src/main/java/com/aida/buyer/module/designer/vo/DesignerSearchVO.java b/src/main/java/com/aida/buyer/module/designer/vo/DesignerSearchVO.java index 04f4213..1734a38 100644 --- a/src/main/java/com/aida/buyer/module/designer/vo/DesignerSearchVO.java +++ b/src/main/java/com/aida/buyer/module/designer/vo/DesignerSearchVO.java @@ -1,5 +1,7 @@ package com.aida.buyer.module.designer.vo; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.Data; import java.io.Serializable; @@ -14,6 +16,7 @@ public class DesignerSearchVO implements Serializable { private static final long serialVersionUID = 1L; /** 用户ID */ + @JsonSerialize(using = ToStringSerializer.class) private Long sellerId; /** 店铺名称 */ diff --git a/src/main/java/com/aida/buyer/module/listing/vo/ListingDetailVO.java b/src/main/java/com/aida/buyer/module/listing/vo/ListingDetailVO.java index 4f80972..1d92fb1 100644 --- a/src/main/java/com/aida/buyer/module/listing/vo/ListingDetailVO.java +++ b/src/main/java/com/aida/buyer/module/listing/vo/ListingDetailVO.java @@ -41,4 +41,13 @@ public class ListingDetailVO implements Serializable { @Schema(description = "图片列表,key 为 category,value 为该分类下所有图片 URL") private Map> images; + + @Schema(description = "适用性别: male/female") + private String designFor; + + @Schema(description = "商品分类列表") + private List productCategory; + + @Schema(description = "店铺头像URL") + private String avatar; } diff --git a/src/main/java/com/aida/buyer/module/listing/vo/ListingMallVO.java b/src/main/java/com/aida/buyer/module/listing/vo/ListingMallVO.java index affa986..790d2d0 100644 --- a/src/main/java/com/aida/buyer/module/listing/vo/ListingMallVO.java +++ b/src/main/java/com/aida/buyer/module/listing/vo/ListingMallVO.java @@ -16,6 +16,7 @@ public class ListingMallVO implements Serializable { private static final long serialVersionUID = 1L; + @JsonSerialize(using = ToStringSerializer.class) private Long id; private String cover; diff --git a/src/main/java/com/aida/buyer/module/listing/vo/ListingPageVO.java b/src/main/java/com/aida/buyer/module/listing/vo/ListingPageVO.java index 84e2636..9ed31ee 100644 --- a/src/main/java/com/aida/buyer/module/listing/vo/ListingPageVO.java +++ b/src/main/java/com/aida/buyer/module/listing/vo/ListingPageVO.java @@ -1,5 +1,7 @@ package com.aida.buyer.module.listing.vo; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.Data; import java.io.Serializable; @@ -14,6 +16,7 @@ public class ListingPageVO implements Serializable { private static final long serialVersionUID = 1L; + @JsonSerialize(using = ToStringSerializer.class) private Long id; private String cover; diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 3c1da61..831aff7 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,5 +1,5 @@ server: - port: 10095 + port: 10097 spring: application: