From 01d78e69dbe1b3ed6cd7c203c341994d2ef7f113 Mon Sep 17 00:00:00 2001 From: yaoxin <1752800946@qq.com> Date: Fri, 29 Mar 2024 21:10:33 +0800 Subject: [PATCH] test --- .idea/compiler.xml | 1 + .idea/misc.xml | 1 + .idea/modules.xml | 2 +- logs/muyu-auth/error.log | 257 ++- logs/muyu-auth/info.log | 143 +- logs/muyu-file/error.log | 248 ++- logs/muyu-file/info.log | 61 +- logs/muyu-gateway/error.log | 407 +++- logs/muyu-gateway/info.log | 131 +- logs/muyu-product/error.log | 1548 ++++++++++++- logs/muyu-product/info.log | 491 +++-- logs/muyu-system/error.log | 1937 ++++++++++------- logs/muyu-system/info.log | 160 +- muyu-common-cache.iml | 62 +- muyu-ruoyi-server/pom.xml | 2 +- .../ruoyi-common/muyu-common-cache/pom.xml | 5 + .../java/com/muyu/common/cache/Cache.java | 4 +- .../com/muyu/common/cache/abs/CacheAbs.java | 6 +- muyu-ruoyi-server/ruoyi-modules/pom.xml | 1 + .../ruoyi-modules/ruoyi-product/pom.xml | 4 - .../ruoyi-product/ruoyi-product-cache/pom.xml | 6 +- .../product/cache/ProjectInfoCache.java | 7 +- .../product/cache/ProjectInfoData.java | 6 +- .../com/ruoyi/product/domain/ProductSku.java | 5 + .../product/domain/req/ProductSkuSaveReq.java | 3 + .../ruoyi/product/MuYuProductApplication.java | 3 +- .../src/main/java/com/ruoyi/product/Test.java | 2 +- .../cache/impl/ProjectInfoDataImpl.java | 6 +- .../controller/ProductInfoController.java | 9 +- .../product/service/ProductSkuService.java | 2 +- .../service/impl/ProductInfoServiceImpl.java | 4 +- ruoyi-product-cache.iml | 28 +- 32 files changed, 4243 insertions(+), 1309 deletions(-) rename muyu-ruoyi-server/ruoyi-modules/ruoyi-product/ruoyi-product-cache/src/main/java/com/{muyu => ruoyi}/product/cache/ProjectInfoCache.java (89%) rename muyu-ruoyi-server/ruoyi-modules/ruoyi-product/ruoyi-product-cache/src/main/java/com/{muyu => ruoyi}/product/cache/ProjectInfoData.java (76%) diff --git a/.idea/compiler.xml b/.idea/compiler.xml index cf08e7c..06ea8ae 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -2,6 +2,7 @@ + diff --git a/.idea/misc.xml b/.idea/misc.xml index bfbd4aa..412568e 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -4,6 +4,7 @@ \ No newline at end of file diff --git a/muyu-ruoyi-server/ruoyi-common/muyu-common-cache/src/main/java/com/muyu/common/cache/Cache.java b/muyu-ruoyi-server/ruoyi-common/muyu-common-cache/src/main/java/com/muyu/common/cache/Cache.java index d3da0ca..b3ea262 100644 --- a/muyu-ruoyi-server/ruoyi-common/muyu-common-cache/src/main/java/com/muyu/common/cache/Cache.java +++ b/muyu-ruoyi-server/ruoyi-common/muyu-common-cache/src/main/java/com/muyu/common/cache/Cache.java @@ -1,9 +1,9 @@ package com.muyu.common.cache; /** - * @author DongZl + * @author Yaoxin * @description: 缓存接口基类 - * @Date 2024-3-26 下午 03:25 + * @Date 2024-3-28 下午 02:25 */ public interface Cache { diff --git a/muyu-ruoyi-server/ruoyi-common/muyu-common-cache/src/main/java/com/muyu/common/cache/abs/CacheAbs.java b/muyu-ruoyi-server/ruoyi-common/muyu-common-cache/src/main/java/com/muyu/common/cache/abs/CacheAbs.java index 3b7af97..4a5dde0 100644 --- a/muyu-ruoyi-server/ruoyi-common/muyu-common-cache/src/main/java/com/muyu/common/cache/abs/CacheAbs.java +++ b/muyu-ruoyi-server/ruoyi-common/muyu-common-cache/src/main/java/com/muyu/common/cache/abs/CacheAbs.java @@ -3,14 +3,16 @@ package com.muyu.common.cache.abs; import com.muyu.common.cache.Cache; import com.ruoyi.common.redis.service.RedisService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; import java.util.concurrent.TimeUnit; /** - * @author DongZl + * @author Yaoxin * @description: 缓存抽象类 - * @Date 2024-3-27 下午 03:10 + * @Date 2024-3-28 下午 02:30 */ +@Component public abstract class CacheAbs implements Cache { @Autowired diff --git a/muyu-ruoyi-server/ruoyi-modules/pom.xml b/muyu-ruoyi-server/ruoyi-modules/pom.xml index f8733c6..fa4e13d 100644 --- a/muyu-ruoyi-server/ruoyi-modules/pom.xml +++ b/muyu-ruoyi-server/ruoyi-modules/pom.xml @@ -17,6 +17,7 @@ ruoyi-product/ruoyi-product-common ruoyi-product/ruoyi-product-remote ruoyi-product/ruoyi-product-server + ruoyi-product/ruoyi-product-cache ruoyi-modules diff --git a/muyu-ruoyi-server/ruoyi-modules/ruoyi-product/pom.xml b/muyu-ruoyi-server/ruoyi-modules/ruoyi-product/pom.xml index 02f75f6..2619811 100644 --- a/muyu-ruoyi-server/ruoyi-modules/ruoyi-product/pom.xml +++ b/muyu-ruoyi-server/ruoyi-modules/ruoyi-product/pom.xml @@ -11,10 +11,6 @@ ruoyi-modules-product pom - - - ruoyi-product-cache - 17 diff --git a/muyu-ruoyi-server/ruoyi-modules/ruoyi-product/ruoyi-product-cache/pom.xml b/muyu-ruoyi-server/ruoyi-modules/ruoyi-product/ruoyi-product-cache/pom.xml index 9ee467d..20f2cb7 100644 --- a/muyu-ruoyi-server/ruoyi-modules/ruoyi-product/ruoyi-product-cache/pom.xml +++ b/muyu-ruoyi-server/ruoyi-modules/ruoyi-product/ruoyi-product-cache/pom.xml @@ -5,12 +5,12 @@ 4.0.0 com.muyu - ruoyi-modules-product + ruoyi-modules 3.6.3 ruoyi-product-cache - + 1.0-SNAPSHOT 17 17 @@ -29,7 +29,7 @@ com.muyu ruoyi-product-common - 3.6.3 + 1.0-SNAPSHOT \ No newline at end of file diff --git a/muyu-ruoyi-server/ruoyi-modules/ruoyi-product/ruoyi-product-cache/src/main/java/com/muyu/product/cache/ProjectInfoCache.java b/muyu-ruoyi-server/ruoyi-modules/ruoyi-product/ruoyi-product-cache/src/main/java/com/ruoyi/product/cache/ProjectInfoCache.java similarity index 89% rename from muyu-ruoyi-server/ruoyi-modules/ruoyi-product/ruoyi-product-cache/src/main/java/com/muyu/product/cache/ProjectInfoCache.java rename to muyu-ruoyi-server/ruoyi-modules/ruoyi-product/ruoyi-product-cache/src/main/java/com/ruoyi/product/cache/ProjectInfoCache.java index baeeed6..56d5e5e 100644 --- a/muyu-ruoyi-server/ruoyi-modules/ruoyi-product/ruoyi-product-cache/src/main/java/com/muyu/product/cache/ProjectInfoCache.java +++ b/muyu-ruoyi-server/ruoyi-modules/ruoyi-product/ruoyi-product-cache/src/main/java/com/ruoyi/product/cache/ProjectInfoCache.java @@ -1,16 +1,15 @@ -package com.muyu.product.cache; +package com.ruoyi.product.cache; import com.muyu.common.cache.abs.CacheAbs; import com.ruoyi.common.core.text.Convert; import com.ruoyi.product.domain.ProductInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import org.springframework.stereotype.Service; /** - * @author DongZl + * @author Yaoxin * @description: 商品缓存 - * @Date 2024-3-27 下午 03:30 + * @Date 2024-3-28 下午 03:10 */ @Component public class ProjectInfoCache extends CacheAbs { diff --git a/muyu-ruoyi-server/ruoyi-modules/ruoyi-product/ruoyi-product-cache/src/main/java/com/muyu/product/cache/ProjectInfoData.java b/muyu-ruoyi-server/ruoyi-modules/ruoyi-product/ruoyi-product-cache/src/main/java/com/ruoyi/product/cache/ProjectInfoData.java similarity index 76% rename from muyu-ruoyi-server/ruoyi-modules/ruoyi-product/ruoyi-product-cache/src/main/java/com/muyu/product/cache/ProjectInfoData.java rename to muyu-ruoyi-server/ruoyi-modules/ruoyi-product/ruoyi-product-cache/src/main/java/com/ruoyi/product/cache/ProjectInfoData.java index c33c0ad..d654365 100644 --- a/muyu-ruoyi-server/ruoyi-modules/ruoyi-product/ruoyi-product-cache/src/main/java/com/muyu/product/cache/ProjectInfoData.java +++ b/muyu-ruoyi-server/ruoyi-modules/ruoyi-product/ruoyi-product-cache/src/main/java/com/ruoyi/product/cache/ProjectInfoData.java @@ -1,11 +1,11 @@ -package com.muyu.product.cache; +package com.ruoyi.product.cache; import com.ruoyi.product.domain.ProductInfo; /** - * @author DongZl + * @author Yaoxin * @description: 缓存数据获取 - * @Date 2024-3-27 下午 03:34 + * @Date 2024-3-28 下午 03:20 */ public interface ProjectInfoData { diff --git a/muyu-ruoyi-server/ruoyi-modules/ruoyi-product/ruoyi-product-common/src/main/java/com/ruoyi/product/domain/ProductSku.java b/muyu-ruoyi-server/ruoyi-modules/ruoyi-product/ruoyi-product-common/src/main/java/com/ruoyi/product/domain/ProductSku.java index ac5f1e0..98db120 100644 --- a/muyu-ruoyi-server/ruoyi-modules/ruoyi-product/ruoyi-product-common/src/main/java/com/ruoyi/product/domain/ProductSku.java +++ b/muyu-ruoyi-server/ruoyi-modules/ruoyi-product/ruoyi-product-common/src/main/java/com/ruoyi/product/domain/ProductSku.java @@ -55,6 +55,10 @@ public class ProductSku extends BaseEntity { @ApiModelProperty(name = "商品图片", value = "商品图片") private String image; + @Excel(name = "商品sku") + @ApiModelProperty(name = "商品sku", value = "商品sku") + private String sku; + /** 商品单价 */ @Excel(name = "商品单价") @ApiModelProperty(name = "商品单价", value = "商品单价", required = true) @@ -95,6 +99,7 @@ public class ProductSku extends BaseEntity { .price(productSkuSaveReq.getPrice()) .inventory(productSkuSaveReq.getInventory()) .status(productSkuSaveReq.getStatus()) + .sku(productSkuSaveReq.getSku()) .createBy(createBy.get()) .createTime(new Date()) .build(); diff --git a/muyu-ruoyi-server/ruoyi-modules/ruoyi-product/ruoyi-product-common/src/main/java/com/ruoyi/product/domain/req/ProductSkuSaveReq.java b/muyu-ruoyi-server/ruoyi-modules/ruoyi-product/ruoyi-product-common/src/main/java/com/ruoyi/product/domain/req/ProductSkuSaveReq.java index 4ab2f58..3832c1c 100644 --- a/muyu-ruoyi-server/ruoyi-modules/ruoyi-product/ruoyi-product-common/src/main/java/com/ruoyi/product/domain/req/ProductSkuSaveReq.java +++ b/muyu-ruoyi-server/ruoyi-modules/ruoyi-product/ruoyi-product-common/src/main/java/com/ruoyi/product/domain/req/ProductSkuSaveReq.java @@ -29,6 +29,9 @@ public class ProductSkuSaveReq extends BaseEntity { @ApiModelProperty(name = "商品图片", value = "商品图片") private String image; + @ApiModelProperty(name = "商品sku", value = "商品sku") + private String sku; + /** 商品单价 */ @ApiModelProperty(name = "商品单价", value = "商品单价", required = true) diff --git a/muyu-ruoyi-server/ruoyi-modules/ruoyi-product/ruoyi-product-server/src/main/java/com/ruoyi/product/MuYuProductApplication.java b/muyu-ruoyi-server/ruoyi-modules/ruoyi-product/ruoyi-product-server/src/main/java/com/ruoyi/product/MuYuProductApplication.java index 28a2d99..85745e8 100644 --- a/muyu-ruoyi-server/ruoyi-modules/ruoyi-product/ruoyi-product-server/src/main/java/com/ruoyi/product/MuYuProductApplication.java +++ b/muyu-ruoyi-server/ruoyi-modules/ruoyi-product/ruoyi-product-server/src/main/java/com/ruoyi/product/MuYuProductApplication.java @@ -5,6 +5,7 @@ import com.ruoyi.common.security.annotation.EnableMyFeignClients; import com.ruoyi.common.swagger.annotation.EnableCustomSwagger2; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.ComponentScan; /** * 系统模块 @@ -14,7 +15,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; @EnableCustomConfig @EnableCustomSwagger2 @EnableMyFeignClients -@SpringBootApplication +@SpringBootApplication(scanBasePackages = "com.ruoyi.product") public class MuYuProductApplication { public static void main (String[] args) { SpringApplication.run(MuYuProductApplication.class, args); diff --git a/muyu-ruoyi-server/ruoyi-modules/ruoyi-product/ruoyi-product-server/src/main/java/com/ruoyi/product/Test.java b/muyu-ruoyi-server/ruoyi-modules/ruoyi-product/ruoyi-product-server/src/main/java/com/ruoyi/product/Test.java index a01d7ef..4b26b5d 100644 --- a/muyu-ruoyi-server/ruoyi-modules/ruoyi-product/ruoyi-product-server/src/main/java/com/ruoyi/product/Test.java +++ b/muyu-ruoyi-server/ruoyi-modules/ruoyi-product/ruoyi-product-server/src/main/java/com/ruoyi/product/Test.java @@ -7,7 +7,7 @@ import java.util.concurrent.CompletableFuture; /** * @ClassName Test * @Description 描述 - * @Author Xin.Yao + * @Author Yaoxin * @Date 2024/3/28 17:02 */ public class Test { diff --git a/muyu-ruoyi-server/ruoyi-modules/ruoyi-product/ruoyi-product-server/src/main/java/com/ruoyi/product/cache/impl/ProjectInfoDataImpl.java b/muyu-ruoyi-server/ruoyi-modules/ruoyi-product/ruoyi-product-server/src/main/java/com/ruoyi/product/cache/impl/ProjectInfoDataImpl.java index 90d2378..8bda7ba 100644 --- a/muyu-ruoyi-server/ruoyi-modules/ruoyi-product/ruoyi-product-server/src/main/java/com/ruoyi/product/cache/impl/ProjectInfoDataImpl.java +++ b/muyu-ruoyi-server/ruoyi-modules/ruoyi-product/ruoyi-product-server/src/main/java/com/ruoyi/product/cache/impl/ProjectInfoDataImpl.java @@ -1,15 +1,15 @@ package com.ruoyi.product.cache.impl; -import com.muyu.product.cache.ProjectInfoData; +import com.ruoyi.product.cache.ProjectInfoData; import com.ruoyi.product.domain.ProductInfo; import com.ruoyi.product.service.ProductInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; /** - * @author DongZl + * @author Yaoxin * @description: 缓存数据获取 - * @Date 2024-3-27 下午 03:37 + * @Date 2024-3-28 下午 03:37 */ @Service public class ProjectInfoDataImpl implements ProjectInfoData { diff --git a/muyu-ruoyi-server/ruoyi-modules/ruoyi-product/ruoyi-product-server/src/main/java/com/ruoyi/product/controller/ProductInfoController.java b/muyu-ruoyi-server/ruoyi-modules/ruoyi-product/ruoyi-product-server/src/main/java/com/ruoyi/product/controller/ProductInfoController.java index f830a47..d75c665 100644 --- a/muyu-ruoyi-server/ruoyi-modules/ruoyi-product/ruoyi-product-server/src/main/java/com/ruoyi/product/controller/ProductInfoController.java +++ b/muyu-ruoyi-server/ruoyi-modules/ruoyi-product/ruoyi-product-server/src/main/java/com/ruoyi/product/controller/ProductInfoController.java @@ -5,7 +5,7 @@ import java.util.List; import javax.servlet.http.HttpServletResponse; -import com.muyu.product.cache.ProjectInfoCache; +import com.ruoyi.product.cache.ProjectInfoCache; import com.ruoyi.product.domain.model.ProductInfoEditModel; import com.ruoyi.product.domain.model.ProductInfoSaveModel; import com.ruoyi.product.domain.resp.Product; @@ -49,14 +49,15 @@ public class ProductInfoController extends BaseController { @Autowired private ProjectInfoCache projectInfoCache; -// -// + + + @ApiOperation("获取商品信息详细信息") @GetMapping("/GetProjectInfo/{id}") @ApiImplicitParam(name = "id", value = "id", required = true, dataType = "Long", paramType = "path", dataTypeClass = Long.class) public Result getProjectInfo(@PathVariable("id") Long id) { - ProjectInfoCache projectInfoCache = new ProjectInfoCache(); +// ProjectInfoCache projectInfoCache = new ProjectInfoCache(); return Result.success(projectInfoCache.get(id)); } diff --git a/muyu-ruoyi-server/ruoyi-modules/ruoyi-product/ruoyi-product-server/src/main/java/com/ruoyi/product/service/ProductSkuService.java b/muyu-ruoyi-server/ruoyi-modules/ruoyi-product/ruoyi-product-server/src/main/java/com/ruoyi/product/service/ProductSkuService.java index a09a2b3..606b7c2 100644 --- a/muyu-ruoyi-server/ruoyi-modules/ruoyi-product/ruoyi-product-server/src/main/java/com/ruoyi/product/service/ProductSkuService.java +++ b/muyu-ruoyi-server/ruoyi-modules/ruoyi-product/ruoyi-product-server/src/main/java/com/ruoyi/product/service/ProductSkuService.java @@ -1,8 +1,8 @@ package com.ruoyi.product.service; import java.util.List; -import com.ruoyi.product.domain.ProductSku; import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.product.domain.ProductSku; /** * 商品SKU数据Service接口 diff --git a/muyu-ruoyi-server/ruoyi-modules/ruoyi-product/ruoyi-product-server/src/main/java/com/ruoyi/product/service/impl/ProductInfoServiceImpl.java b/muyu-ruoyi-server/ruoyi-modules/ruoyi-product/ruoyi-product-server/src/main/java/com/ruoyi/product/service/impl/ProductInfoServiceImpl.java index 31fb2c3..83a2a6a 100644 --- a/muyu-ruoyi-server/ruoyi-modules/ruoyi-product/ruoyi-product-server/src/main/java/com/ruoyi/product/service/impl/ProductInfoServiceImpl.java +++ b/muyu-ruoyi-server/ruoyi-modules/ruoyi-product/ruoyi-product-server/src/main/java/com/ruoyi/product/service/impl/ProductInfoServiceImpl.java @@ -123,6 +123,7 @@ public class ProductInfoServiceImpl extends ServiceImpl { String s = ""; for (AsSpecificationInfoGroup asSpecificationInfoGroup : asSpecificationInfoGroupList) { - if (asSpecificationInfoGroup.getSpecificationGroupId() == productSku.getSpecificationGroupId()) { + if (asSpecificationInfoGroup.getSpecificationGroupId().equals(productSku.getSpecificationGroupId())) { s += "-" + asSpecificationInfoGroup.getValue(); } } diff --git a/ruoyi-product-cache.iml b/ruoyi-product-cache.iml index d5f7a34..392d7a4 100644 --- a/ruoyi-product-cache.iml +++ b/ruoyi-product-cache.iml @@ -19,11 +19,25 @@ + + + + + + + + + + + + + + @@ -54,8 +68,6 @@ - - @@ -71,7 +83,6 @@ - @@ -105,21 +116,10 @@ - - - - - - - - - - -