diff --git a/hiver-admin/src/main/resources/application.yml b/hiver-admin/src/main/resources/application.yml index 2553c28f..190a95e2 100644 --- a/hiver-admin/src/main/resources/application.yml +++ b/hiver-admin/src/main/resources/application.yml @@ -25,8 +25,8 @@ spring: timeout-per-shutdown-phase: 10S # 数据源 datasource: -# url: jdbc:mysql://154.8.162.157:3306/hiver_shop?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true&allowMultiQueries=true - url: jdbc:mysql://8.140.198.243:3306/hiver_shop?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true&allowMultiQueries=true + url: jdbc:mysql://154.8.162.157:3306/hiver_shop?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true&allowMultiQueries=true +# url: jdbc:mysql://8.140.198.243:3306/hiver_shop?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true&allowMultiQueries=true username: reddoor # Jasypt加密 可到common-utils中找到JasyptUtil加解密工具类生成加密结果 格式为ENC(加密结果) 以下解密结果为123456 password: ENC(Zla4U4+yRLPhicvuX2TmiEgxEpzP4dk8BHzFDEtiEhwLQIIaftZrrEUJZce6efoe) @@ -67,8 +67,8 @@ spring: ddl-auto: update # Redis 若设有密码自行添加配置password redis: -# host: 154.8.162.157 - host: 8.140.198.243 + host: 154.8.162.157 +# host: 8.140.198.243 password: reddoor168 # 数据库索引 默认0 database: 1 diff --git a/hiver-admin/test-output/test-report.html b/hiver-admin/test-output/test-report.html index 3c56bf13..9d63c7b5 100644 --- a/hiver-admin/test-output/test-report.html +++ b/hiver-admin/test-output/test-report.html @@ -5,7 +5,7 @@ -Hiver测试报告 +HiverԱ @@ -35,7 +35,7 @@ Hiver
  • -九月 26, 2024 22:44:51 + 27, 2024 09:25:36
    • @@ -84,7 +84,7 @@

    passTest

    -

    22:44:52 下午 / 0.012 secs

    +

    09:25:36 / 0.016 secs

    @@ -92,9 +92,9 @@
    #test-id=1
    passTest
    -09.26.2024 22:44:52 -09.26.2024 22:44:52 -0.012 secs +09.27.2024 09:25:36 +09.27.2024 09:25:36 +0.016 secs
    @@ -104,7 +104,7 @@ Pass - 22:44:52 + 9:25:36 Test passed @@ -128,13 +128,13 @@

    Started

    -

    九月 26, 2024 22:44:51

    +

    27, 2024 09:25:36

    Ended

    -

    九月 26, 2024 22:44:52

    +

    27, 2024 09:25:36

    diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/ProductServiceImpl.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/ProductServiceImpl.java index 763d4b25..39a2735d 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/ProductServiceImpl.java +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/ProductServiceImpl.java @@ -168,10 +168,12 @@ public class ProductServiceImpl extends ServiceImpl impl } for (Product product : byProductSn) { product.setBuyCount(buyCountMap.getOrDefault(product.getId(), 0)); - final List stockList = stockService.getProductStock(product.getId()); - product.setStockList(stockList); } } + for (Product product : byProductSn) { + final List stockList = stockService.getProductStock(product.getId()); + product.setStockList(stockList); + } return byProductSn; } diff --git a/hiver-modules/hiver-mall/src/main/resources/mapper/ProductCategoryMapper.xml b/hiver-modules/hiver-mall/src/main/resources/mapper/ProductCategoryMapper.xml index 10618aee..f6e36d17 100644 --- a/hiver-modules/hiver-mall/src/main/resources/mapper/ProductCategoryMapper.xml +++ b/hiver-modules/hiver-mall/src/main/resources/mapper/ProductCategoryMapper.xml @@ -285,7 +285,7 @@