diff --git a/admin/pom.xml b/admin/pom.xml index e188f455..e2b538db 100644 --- a/admin/pom.xml +++ b/admin/pom.xml @@ -6,7 +6,7 @@ cn.lili lili-shop-parent - 1.0.1 + 4.2.0 admin diff --git a/buyer-api/pom.xml b/buyer-api/pom.xml index 7499e497..22afda90 100644 --- a/buyer-api/pom.xml +++ b/buyer-api/pom.xml @@ -10,14 +10,14 @@ cn.lili lili-shop-parent - 1.0.1 + 4.2.0 cn.lili framework - 1.0.1 + 4.2.0 diff --git a/common-api/pom.xml b/common-api/pom.xml index 4e5c7d8d..fe5a4ae7 100644 --- a/common-api/pom.xml +++ b/common-api/pom.xml @@ -7,7 +7,7 @@ cn.lili lili-shop-parent - 1.0.1 + 4.2.0 cn.lili @@ -17,7 +17,7 @@ cn.lili framework - 1.0.1 + 4.2.0 diff --git a/config/application.yml b/config/application.yml index 5a9316c8..0e645d6b 100644 --- a/config/application.yml +++ b/config/application.yml @@ -77,7 +77,7 @@ spring: default-datasource: type: com.alibaba.druid.pool.DruidDataSource driverClassName: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://192.168.0.116:3306/Bulbasaur?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai + url: jdbc:mysql://192.168.0.116:3306/lilishop?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai username: root password: lilishop maxActive: 20 @@ -194,9 +194,9 @@ logging: # 输出级别 level: cn.lili: info - # org.hibernate: debug - # org.springframework: debug - # org.springframework.data.mongodb.core: debug + org.hibernate: debug + org.springframework: debug + org.springframework.data.mongodb.core: debug file: # 指定路径 path: lili-logs diff --git a/consumer/pom.xml b/consumer/pom.xml index dd25a81b..b9b34c24 100644 --- a/consumer/pom.xml +++ b/consumer/pom.xml @@ -8,14 +8,14 @@ cn.lili lili-shop-parent - 1.0.1 + 4.2.0 cn.lili framework - 1.0.1 + 4.2.0 diff --git a/framework/pom.xml b/framework/pom.xml index 4873ab05..ba3991db 100644 --- a/framework/pom.xml +++ b/framework/pom.xml @@ -7,7 +7,7 @@ cn.lili lili-shop-parent - 1.0.1 + 4.2.0 framework diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dos/Goods.java b/framework/src/main/java/cn/lili/modules/goods/entity/dos/Goods.java index 8c7c43c0..142c2298 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/dos/Goods.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/dos/Goods.java @@ -235,19 +235,19 @@ public class Goods extends BaseEntity { if (sku.get("sn") == null) { throw new ServiceException(ResultCode.GOODS_SKU_SN_ERROR); } - if (StringUtil.isEmpty(sku.get("price").toString()) || Convert.toDouble( sku.get("price").toString()) <= 0) { + if (StringUtil.isEmpty(sku.get("price").toString()) || Convert.toDouble(sku.get("price")) <= 0) { throw new ServiceException(ResultCode.GOODS_SKU_PRICE_ERROR); } - if (StringUtil.isEmpty(sku.get("cost").toString()) || Convert.toDouble( sku.get("cost").toString()) <= 0) { + if (StringUtil.isEmpty(sku.get("cost").toString()) || Convert.toDouble(sku.get("cost")) <= 0) { throw new ServiceException(ResultCode.GOODS_SKU_COST_ERROR); } //虚拟商品没有重量字段 - if(sku.containsKey("weight")) { + if (sku.containsKey("weight")) { if (StringUtil.isEmpty(sku.get("weight").toString()) || Convert.toDouble(sku.get("weight").toString()) < 0) { throw new ServiceException(ResultCode.GOODS_SKU_WEIGHT_ERROR); } } - if (StringUtil.isEmpty(sku.get("quantity").toString()) || Convert.toInt( sku.get("quantity").toString()) < 0) { + if (StringUtil.isEmpty(sku.get("quantity").toString()) || Convert.toInt(sku.get("quantity").toString()) < 0) { throw new ServiceException(ResultCode.GOODS_SKU_QUANTITY_ERROR); } diff --git a/manager-api/pom.xml b/manager-api/pom.xml index bf583500..f896a62f 100644 --- a/manager-api/pom.xml +++ b/manager-api/pom.xml @@ -8,14 +8,14 @@ cn.lili lili-shop-parent - 1.0.1 + 4.2.0 cn.lili framework - 1.0.1 + 4.2.0 diff --git a/pom.xml b/pom.xml index 44ab8a88..c40ec9a4 100644 --- a/pom.xml +++ b/pom.xml @@ -12,11 +12,11 @@ cn.lili lili-shop-parent - 1.0.1 + 4.2.0 registry.cn-beijing.aliyuncs.com/lili-images - 0.0.5 + 0.0.1 framework diff --git a/seller-api/pom.xml b/seller-api/pom.xml index 934079d4..9efa6d45 100644 --- a/seller-api/pom.xml +++ b/seller-api/pom.xml @@ -8,14 +8,14 @@ cn.lili lili-shop-parent - 1.0.1 + 4.2.0 cn.lili framework - 1.0.1 + 4.2.0