diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/aa b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/aa index 9cb06e2..e02cb19 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/aa +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/aa @@ -33,3 +33,11 @@ 自由属性:[] } + + +购物车 + id + user_id + 商品id + sku_id + 数量 diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/resp/ProjectDetailResp.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/resp/ProjectDetailResp.java index ee7d35d..85aef3d 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/resp/ProjectDetailResp.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/resp/ProjectDetailResp.java @@ -22,40 +22,44 @@ import java.util.List; @AllArgsConstructor @NoArgsConstructor public class ProjectDetailResp { -/** - * 品类集合 - */ -private List categoryInfoList; -/** - * 商品信息 - */ -private ProjectInfo projectInfo; -/** - * 品牌信息 - */ -private BrandInfo brandInfo; + /** + * 品类集合 + */ + private List categoryInfoList; -/** - * 商品sku集合 - */ -private List projectSkuInfoList; + /** + * 商品信息 + */ + private ProjectInfo projectInfo; -/** - * 商品和属性集合 - */ -private List productAttributeInfoList; + /** + * 品牌信息 + */ + private BrandInfo brandInfo; -/** - * 商品规格 - */ -private List ruleAttrAddModelList; -/** - * 属性集合 - */ -private List attributeInfoList; -/** - * 属性组集合 - */ -private List attributeGroupList; + /** + * 商品Sku集合 + */ + private List projectSkuInfoList; + + /** + * 商品和属性集合 + */ + private List productAttributeInfoList; + + /** + * 商品规格 + */ + private List ruleAttrModelList; + + /** + * 属性集合 + */ + private List attributeInfoList; + + /** + * 属性组集合 + */ + private List attributeGroupList; } diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/MuYuProductApplication.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/MuYuProductApplication.java index 84b6d80..cf793c9 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/MuYuProductApplication.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/MuYuProductApplication.java @@ -5,6 +5,7 @@ import com.muyu.common.security.annotation.EnableMyFeignClients; import com.muyu.common.swagger.annotation.EnableCustomSwagger2; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.ComponentScan; /** * @author DongZl diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/ProjectInfoController.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/ProjectInfoController.java index c66b798..0e216f0 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/ProjectInfoController.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/ProjectInfoController.java @@ -4,7 +4,6 @@ import java.util.List; import javax.servlet.http.HttpServletResponse; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.muyu.product.cache.ProjectInfoCache; import com.muyu.product.domain.AsProductAttributeInfo; import com.muyu.product.domain.ProjectSkuInfo; import com.muyu.product.domain.model.CategoryInfoSaveModel; @@ -98,40 +97,37 @@ public class ProjectInfoController extends BaseController { public Result getCacheInfo(@PathVariable("id") Long id) { return Result.success(projectInfoService.getById(id)); } - @Autowired - private ProjectInfoCache projectInfoCache; - @ApiOperation("获取商品信息详细信息") - @RequiresPermissions("product:info:query") - @GetMapping(value = "/{id}") - @ApiImplicitParam(name = "id", value = "id", required = true, dataType = "Long", paramType = "path", dataTypeClass = Long.class) - public Result getInfo(@PathVariable("id") Long id) { - return Result.success(projectInfoCache.get(id)); - } - -// /** -// * 获取商品信息详细信息 -// */ // @ApiOperation("获取商品信息详细信息") // @RequiresPermissions("product:info:query") // @GetMapping(value = "/{id}") // @ApiImplicitParam(name = "id", value = "id", required = true, dataType = "Long", paramType = "path", dataTypeClass = Long.class) -// public Result getInfo(@PathVariable("id") Long id) { -// -// LambdaQueryWrapper asProductAttributeInfoLambdaQueryWrapper = new LambdaQueryWrapper<>(); -// asProductAttributeInfoLambdaQueryWrapper.eq(AsProductAttributeInfo::getProductId, id); -// List list = asProductAttributeInfoService.list(asProductAttributeInfoLambdaQueryWrapper); -// -// ProjectInfo projectInfo = projectInfoService.getById(id); -// LambdaQueryWrapper projectSkuInfoLambdaQueryWrapper = new LambdaQueryWrapper<>(); -// projectSkuInfoLambdaQueryWrapper.eq(ProjectSkuInfo::getProjectId,id); -// List projectSkuInfos = projectSkuInfoService.list(projectSkuInfoLambdaQueryWrapper); -// ProjectAddModel projectAddModel = ProjectAddModel.queryBuild(projectInfo, -// list, projectSkuInfos -// ); -// projectAddModel.setId(id); -// return Result.success(projectAddModel); +// public Result getInfo(@PathVariable("id") Long id) { +// return Result.success(projectInfoService.get(id)); // } + /** + * 获取商品信息详细信息 + */ + @ApiOperation("获取商品信息详细信息") + @RequiresPermissions("product:info:query") + @GetMapping(value = "/{id}") + @ApiImplicitParam(name = "id", value = "id", required = true, dataType = "Long", paramType = "path", dataTypeClass = Long.class) + public Result getInfo(@PathVariable("id") Long id) { + + LambdaQueryWrapper asProductAttributeInfoLambdaQueryWrapper = new LambdaQueryWrapper<>(); + asProductAttributeInfoLambdaQueryWrapper.eq(AsProductAttributeInfo::getProductId, id); + List list = asProductAttributeInfoService.list(asProductAttributeInfoLambdaQueryWrapper); + ProjectInfo projectInfo = projectInfoService.getById(id); + LambdaQueryWrapper projectSkuInfoLambdaQueryWrapper = new LambdaQueryWrapper<>(); + projectSkuInfoLambdaQueryWrapper.eq(ProjectSkuInfo::getProjectId,id); + List projectSkuInfos = projectSkuInfoService.list(projectSkuInfoLambdaQueryWrapper); + ProjectAddModel projectAddModel = ProjectAddModel.queryBuild(projectInfo, + list, projectSkuInfos + ); + projectAddModel.setId(id); + return Result.success(projectAddModel); + } + /** * 新增商品信息 */ diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/ProjectInfoServiceImpl.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/ProjectInfoServiceImpl.java index 4e236d3..a7a28db 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/ProjectInfoServiceImpl.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/ProjectInfoServiceImpl.java @@ -213,36 +213,39 @@ private AsBrandProjectService asBrandProjectService; @Override public ProjectDetailResp getDetailInfo(Long id) { - //商品信息获取 + // 商品信息获取 ProjectInfo projectInfo = this.getById(id); - //品牌信息 - BrandInfo brandInfo =this.brandInfoService.getById(projectInfo.getBrandId()); - //品类集合 + // 品牌信息 + BrandInfo brandInfo = this.brandInfoService.getById(projectInfo.getBrandId()); + // 品类集合 List categoryInfoList = categoryInfoService.listByIds(new ArrayList<>() {{ add(projectInfo.getMianType()); add(projectInfo.getParentType()); add(projectInfo.getType()); }}); - //商品sku集合 + // 商品Sku集合 List projectSkuInfoList = this.projectSkuInfoService.list(new LambdaQueryWrapper<>() {{ eq(ProjectSkuInfo::getProjectId, id); }}); - //商品和属性集合 - List productAttributeInfoList = this.asProductAttributeInfoService.list(new LambdaQueryWrapper() {{ + + // 商品和属性集合 + List productAttributeInfoList = this.asProductAttributeInfoService.list(new LambdaQueryWrapper<>() {{ eq(AsProductAttributeInfo::getProductId, id); }}); - //商品规格 - List ruleAttrModelList = this.ruleAttrInfoService.list(new LambdaQueryWrapper() {{ + // 商品规格 + List ruleAttrModelList = ruleAttrInfoService.list(new LambdaQueryWrapper<>() {{ eq(RuleAttrInfo::getRuleId, projectInfo.getRuleId()); }}).stream() .map(RuleAttrAddModel::infoBuild).toList(); + + CategoryCommonElementResp templateAttribute = this.categoryInfoService.getTemplateAttributeByCateGoryId(projectInfo.getType()); List templateAttributeGroupList = templateAttribute.getTemplateAttributeGroupList(); - ArrayList templateAttributeList = new ArrayList<>() {{ + List templateAttributeList = new ArrayList<>(){{ addAll(templateAttribute.getTemplateAttributeList()); }}; - //属性组和商品属性的id - ArrayList notInAttributeIdList = new ArrayList<>(); + // 属性组和商品属性的ID + List notInAttributeIdList = new ArrayList<>(); List attributeGroupIdList = templateAttributeGroupList.stream() .flatMap(templateAttributeGroupModel -> templateAttributeGroupModel.getAttributeList().stream()) .map(TemplateAttributeModel::getId) @@ -251,12 +254,12 @@ private AsBrandProjectService asBrandProjectService; .map(TemplateAttributeModel::getId) .toList(); if (!attributeGroupIdList.isEmpty()){ - notInAttributeIdList.addAll(attributeGroupIdList); + notInAttributeIdList.addAll( attributeGroupIdList ); } if (!attributeIdList.isEmpty()){ - notInAttributeIdList.addAll(attributeIdList); + notInAttributeIdList.addAll( attributeIdList ); } - + // 添加上，商品的自有属性 List productAttributeList = this.asProductAttributeInfoService.list( new LambdaQueryWrapper<>() {{ eq(AsProductAttributeInfo::getProductId, projectInfo.getId()); @@ -265,27 +268,29 @@ private AsBrandProjectService asBrandProjectService; ); List projectAttributeList = new ArrayList<>(); - if (!projectAttributeList.isEmpty()){ + if (!productAttributeList.isEmpty()){ List attrIdList = productAttributeList.stream() .map(AsProductAttributeInfo::getAttributeId) .toList(); - projectAttributeList = attributeInfoService.list(new LambdaQueryWrapper<>(){{ - in(AttributeInfo::getId, attrIdList); - }}).stream() + projectAttributeList = attributeInfoService.list( + new LambdaQueryWrapper<>() {{ + in(AttributeInfo::getId, attrIdList); + }} + ).stream() .map(TemplateAttributeModel::attributeInfoBuild) .toList(); } - //把自由属性添加到商品属性的集合当中,进行合并 + // 把自有属性添加到商品属性的集合当中，进行合并 if (!projectAttributeList.isEmpty()){ templateAttributeList.addAll(projectAttributeList); } - return ProjectDetailResp.builder() + return ProjectDetailResp.builder() .projectInfo(projectInfo) .brandInfo(brandInfo) .categoryInfoList(categoryInfoList) .projectSkuInfoList(projectSkuInfoList) .productAttributeInfoList(productAttributeInfoList) - .ruleAttrAddModelList(ruleAttrModelList) + .ruleAttrModelList(ruleAttrModelList) .attributeInfoList(templateAttributeList) .attributeGroupList(templateAttributeGroupList) .build(); diff --git a/muyu-modules/muyu-shop-cart/muyu-shop-cart-common/pom.xml b/muyu-modules/muyu-shop-cart/muyu-shop-cart-common/pom.xml new file mode 100644 index 0000000..061e192 --- /dev/null +++ b/muyu-modules/muyu-shop-cart/muyu-shop-cart-common/pom.xml @@ -0,0 +1,26 @@ + + + 4.0.0 + + com.muyu + muyu-shop-cart + 3.6.3 + + + muyu-shop-cart-common + + + 17 + 17 + UTF-8 + + + + + com.muyu + muyu-common-core + + + diff --git a/muyu-modules/muyu-shop-cart/muyu-shop-cart-common/src/main/java/com/muyu/shop/cart/domain/CartInfo.java b/muyu-modules/muyu-shop-cart/muyu-shop-cart-common/src/main/java/com/muyu/shop/cart/domain/CartInfo.java new file mode 100644 index 0000000..1132d3c --- /dev/null +++ b/muyu-modules/muyu-shop-cart/muyu-shop-cart-common/src/main/java/com/muyu/shop/cart/domain/CartInfo.java @@ -0,0 +1,105 @@ +package com.muyu.shop.cart.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.AllArgsConstructor; +import lombok.experimental.SuperBuilder; +import io.swagger.annotations.*; +import com.muyu.common.core.annotation.Excel; +import com.muyu.shop.cart.domain.req.CartInfoQueryReq; +import com.muyu.shop.cart.domain.req.CartInfoSaveReq; +import com.muyu.shop.cart.domain.req.CartInfoEditReq; +import com.muyu.common.core.web.domain.BaseEntity; + +/** + * 购物车对象 cart_info + * + * @author muyu + * @date 2024-03-29 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@TableName("cart_info") +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "CartInfo", description = "购物车") +public class CartInfo extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** 主键 */ + @TableId(value = "id",type = IdType.AUTO) + @ApiModelProperty(name = "主键", value = "主键") + private Long id; + + /** 商品 */ + @Excel(name = "商品") + @ApiModelProperty(name = "商品", value = "商品", required = true) + private Long projectId; + + /** sku */ + @Excel(name = "sku") + @ApiModelProperty(name = "sku", value = "sku", required = true) + private String projectSku; + + /** 用户 */ + @Excel(name = "用户") + @ApiModelProperty(name = "用户", value = "用户", required = true) + private Long userId; + + /** 数量 */ + @Excel(name = "数量") + @ApiModelProperty(name = "数量", value = "数量", required = true) + private Long num; + + /** 是否选中 */ + @Excel(name = "是否选中") + @ApiModelProperty(name = "是否选中", value = "是否选中", required = true) + private String isSelected; + + /** + * 查询构造器 + */ + public static CartInfo queryBuild( CartInfoQueryReq cartInfoQueryReq){ + return CartInfo.builder() + .projectId(cartInfoQueryReq.getProjectId()) + .projectSku(cartInfoQueryReq.getProjectSku()) + .userId(cartInfoQueryReq.getUserId()) + .num(cartInfoQueryReq.getNum()) + .isSelected(cartInfoQueryReq.getIsSelected()) + .build(); + } + + /** + * 添加构造器 + */ + public static CartInfo saveBuild(CartInfoSaveReq cartInfoSaveReq){ + return CartInfo.builder() + .projectId(cartInfoSaveReq.getProjectId()) + .projectSku(cartInfoSaveReq.getProjectSku()) + .userId(cartInfoSaveReq.getUserId()) + .num(cartInfoSaveReq.getNum()) + .isSelected(cartInfoSaveReq.getIsSelected()) + .build(); + } + + /** + * 修改构造器 + */ + public static CartInfo editBuild(Long id, CartInfoEditReq cartInfoEditReq){ + return CartInfo.builder() + .id(id) + .projectId(cartInfoEditReq.getProjectId()) + .projectSku(cartInfoEditReq.getProjectSku()) + .userId(cartInfoEditReq.getUserId()) + .num(cartInfoEditReq.getNum()) + .isSelected(cartInfoEditReq.getIsSelected()) + .build(); + } + +} diff --git a/muyu-modules/muyu-shop-cart/muyu-shop-cart-common/src/main/java/com/muyu/shop/cart/domain/req/CartInfoEditReq.java b/muyu-modules/muyu-shop-cart/muyu-shop-cart-common/src/main/java/com/muyu/shop/cart/domain/req/CartInfoEditReq.java new file mode 100644 index 0000000..9ecabad --- /dev/null +++ b/muyu-modules/muyu-shop-cart/muyu-shop-cart-common/src/main/java/com/muyu/shop/cart/domain/req/CartInfoEditReq.java @@ -0,0 +1,46 @@ +package com.muyu.shop.cart.domain.req; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.AllArgsConstructor; +import lombok.experimental.SuperBuilder; +import io.swagger.annotations.*; +import com.muyu.common.core.web.domain.BaseEntity; + +/** + * 购物车对象 cart_info + * + * @author muyu + * @date 2024-03-29 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(value = "CartInfoEditReq", description = "购物车") +public class CartInfoEditReq extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** 商品 */ + @ApiModelProperty(name = "商品", value = "商品", required = true) + private Long projectId; + + /** sku */ + @ApiModelProperty(name = "sku", value = "sku", required = true) + private String projectSku; + + /** 用户 */ + @ApiModelProperty(name = "用户", value = "用户", required = true) + private Long userId; + + /** 数量 */ + @ApiModelProperty(name = "数量", value = "数量", required = true) + private Long num; + + /** 是否选中 */ + @ApiModelProperty(name = "是否选中", value = "是否选中", required = true) + private String isSelected; + +} diff --git a/muyu-modules/muyu-shop-cart/muyu-shop-cart-common/src/main/java/com/muyu/shop/cart/domain/req/CartInfoQueryReq.java b/muyu-modules/muyu-shop-cart/muyu-shop-cart-common/src/main/java/com/muyu/shop/cart/domain/req/CartInfoQueryReq.java new file mode 100644 index 0000000..27cf97c --- /dev/null +++ b/muyu-modules/muyu-shop-cart/muyu-shop-cart-common/src/main/java/com/muyu/shop/cart/domain/req/CartInfoQueryReq.java @@ -0,0 +1,46 @@ +package com.muyu.shop.cart.domain.req; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.AllArgsConstructor; +import lombok.experimental.SuperBuilder; +import io.swagger.annotations.*; +import com.muyu.common.core.web.domain.BaseEntity; + +/** + * 购物车对象 cart_info + * + * @author muyu + * @date 2024-03-29 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(value = "CartInfoQueryReq", description = "购物车") +public class CartInfoQueryReq extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** 商品 */ + @ApiModelProperty(name = "商品", value = "商品") + private Long projectId; + + /** sku */ + @ApiModelProperty(name = "sku", value = "sku") + private String projectSku; + + /** 用户 */ + @ApiModelProperty(name = "用户", value = "用户") + private Long userId; + + /** 数量 */ + @ApiModelProperty(name = "数量", value = "数量") + private Long num; + + /** 是否选中 */ + @ApiModelProperty(name = "是否选中", value = "是否选中") + private String isSelected; + +} diff --git a/muyu-modules/muyu-shop-cart/muyu-shop-cart-common/src/main/java/com/muyu/shop/cart/domain/req/CartInfoSaveReq.java b/muyu-modules/muyu-shop-cart/muyu-shop-cart-common/src/main/java/com/muyu/shop/cart/domain/req/CartInfoSaveReq.java new file mode 100644 index 0000000..6affb81 --- /dev/null +++ b/muyu-modules/muyu-shop-cart/muyu-shop-cart-common/src/main/java/com/muyu/shop/cart/domain/req/CartInfoSaveReq.java @@ -0,0 +1,56 @@ +package com.muyu.shop.cart.domain.req; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.AllArgsConstructor; +import lombok.experimental.SuperBuilder; +import io.swagger.annotations.*; +import com.muyu.common.core.web.domain.BaseEntity; + +/** + * 购物车对象 cart_info + * + * @author muyu + * @date 2024-03-29 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(value = "CartInfoSaveReq", description = "购物车") +public class CartInfoSaveReq extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** 主键 */ + + @ApiModelProperty(name = "主键", value = "主键") + private Long id; + + /** 商品 */ + + @ApiModelProperty(name = "商品", value = "商品", required = true) + private Long projectId; + + /** sku */ + + @ApiModelProperty(name = "sku", value = "sku", required = true) + private String projectSku; + + /** 用户 */ + + @ApiModelProperty(name = "用户", value = "用户", required = true) + private Long userId; + + /** 数量 */ + + @ApiModelProperty(name = "数量", value = "数量", required = true) + private Long num; + + /** 是否选中 */ + + @ApiModelProperty(name = "是否选中", value = "是否选中", required = true) + private String isSelected; + +} diff --git a/muyu-modules/muyu-shop-cart/muyu-shop-cart-remote/pom.xml b/muyu-modules/muyu-shop-cart/muyu-shop-cart-remote/pom.xml new file mode 100644 index 0000000..fc359c7 --- /dev/null +++ b/muyu-modules/muyu-shop-cart/muyu-shop-cart-remote/pom.xml @@ -0,0 +1,29 @@ + + + 4.0.0 + + com.muyu + muyu-shop-cart + 3.6.3 + + + muyu-shop-cart-remote + + + 17 + 17 + UTF-8 + + + + + + com.muyu + muyu-shop-cart-common + ${muyu.version} + + + + diff --git a/muyu-modules/muyu-shop-cart/muyu-shop-cart-server/pom.xml b/muyu-modules/muyu-shop-cart/muyu-shop-cart-server/pom.xml new file mode 100644 index 0000000..540f5a5 --- /dev/null +++ b/muyu-modules/muyu-shop-cart/muyu-shop-cart-server/pom.xml @@ -0,0 +1,116 @@ + + + 4.0.0 + + com.muyu + muyu-shop-cart + 3.6.3 + + + muyu-shop-cart-server + + + 17 + 17 + UTF-8 + + + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-sentinel + + + + + org.springframework.boot + spring-boot-starter-actuator + + + + + io.springfox + springfox-swagger-ui + ${swagger.fox.version} + + + + + com.mysql + mysql-connector-j + + + + + com.muyu + muyu-common-datasource + + + + + com.muyu + muyu-common-datascope + + + + + com.muyu + muyu-common-log + + + + + com.muyu + muyu-common-swagger + + + + + com.muyu + muyu-shop-cart-common + ${muyu.version} + + + + + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + + diff --git a/muyu-modules/muyu-shop-cart/muyu-shop-cart-server/src/main/resources/banner.txt b/muyu-modules/muyu-shop-cart/muyu-shop-cart-server/src/main/resources/banner.txt new file mode 100644 index 0000000..0dd5eee --- /dev/null +++ b/muyu-modules/muyu-shop-cart/muyu-shop-cart-server/src/main/resources/banner.txt @@ -0,0 +1,2 @@ +Spring Boot Version: ${spring-boot.version} +Spring Application Name: ${spring.application.name} diff --git a/muyu-modules/muyu-shop-cart/muyu-shop-cart-server/src/main/resources/bootstrap.yml b/muyu-modules/muyu-shop-cart/muyu-shop-cart-server/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..544b1a2 --- /dev/null +++ b/muyu-modules/muyu-shop-cart/muyu-shop-cart-server/src/main/resources/bootstrap.yml @@ -0,0 +1,29 @@ +# Tomcat +server: + port: 9506 + +# Spring +spring: + application: + # 应用名称 + name: muyu-shop-cart + profiles: + # 环境配置 + active: dev + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: 115.159.211.196:8848 + config: + # 配置中心地址 + server-addr: 115.159.211.196:8848 + namespace: b8ace5a6-28a3-4126-b109-9b6623c58dc0 + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} +logging: + level: + com.muyu.shop.cart.mapper: DEBUG diff --git a/muyu-modules/muyu-shop-cart/muyu-shop-cart-server/src/main/resources/logback.xml b/muyu-modules/muyu-shop-cart/muyu-shop-cart-server/src/main/resources/logback.xml new file mode 100644 index 0000000..aa340cd --- /dev/null +++ b/muyu-modules/muyu-shop-cart/muyu-shop-cart-server/src/main/resources/logback.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + ${log.pattern} + + + + + + ${log.path}/info.log + + + + ${log.path}/info.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + INFO + + ACCEPT + + DENY + + + + + ${log.path}/error.log + + + + ${log.path}/error.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + ERROR + + ACCEPT + + DENY + + + + + + + + + + + + + + + + + + diff --git a/muyu-modules/muyu-shop-cart/pom.xml b/muyu-modules/muyu-shop-cart/pom.xml new file mode 100644 index 0000000..d944d40 --- /dev/null +++ b/muyu-modules/muyu-shop-cart/pom.xml @@ -0,0 +1,26 @@ + + + 4.0.0 + + com.muyu + muyu-modules + 3.6.3 + + + muyu-shop-cart + pom + + muyu-shop-cart-common + muyu-shop-cart-remote + muyu-shop-cart-server + + + + 17 + 17 + UTF-8 + + + diff --git a/muyu-modules/pom.xml b/muyu-modules/pom.xml index 760c5c2..24447f2 100644 --- a/muyu-modules/pom.xml +++ b/muyu-modules/pom.xml @@ -14,6 +14,7 @@ muyu-job muyu-file muyu-product + muyu-shop-cart muyu-modules diff --git a/pom.xml b/pom.xml index 0e81d24..e4eda55 100644 --- a/pom.xml +++ b/pom.xml @@ -234,6 +234,20 @@ ${muyu.version} + + + com.muyu + muyu-shop-cart-common + ${muyu.version} + + + + + com.muyu + muyu-shop-cart-remote + ${muyu.version} + +