From 23388eff6b21976428c114a2f850af76c88d7d74 Mon Sep 17 00:00:00 2001 From: Chopper Date: Wed, 30 Jun 2021 14:53:26 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/pom.xml | 2 +- buyer-api/pom.xml | 2 +- common-api/pom.xml | 2 +- config/application.yml | 8 ++++---- consumer/pom.xml | 2 +- framework/pom.xml | 2 +- manager-api/pom.xml | 2 +- pom.xml | 4 ++-- seller-api/pom.xml | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) 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..59b2d693 100644 --- a/buyer-api/pom.xml +++ b/buyer-api/pom.xml @@ -10,7 +10,7 @@ cn.lili lili-shop-parent - 1.0.1 + 4.2.0 diff --git a/common-api/pom.xml b/common-api/pom.xml index 4e5c7d8d..510c6865 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 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..da93e1f6 100644 --- a/consumer/pom.xml +++ b/consumer/pom.xml @@ -8,7 +8,7 @@ cn.lili lili-shop-parent - 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/manager-api/pom.xml b/manager-api/pom.xml index bf583500..6aefa5f4 100644 --- a/manager-api/pom.xml +++ b/manager-api/pom.xml @@ -8,7 +8,7 @@ cn.lili lili-shop-parent - 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..946b6eb2 100644 --- a/seller-api/pom.xml +++ b/seller-api/pom.xml @@ -8,7 +8,7 @@ cn.lili lili-shop-parent - 1.0.1 + 4.2.0 From 1a77b3cec7f0291a7e26841e688dc58dee4cdcd6 Mon Sep 17 00:00:00 2001 From: lifenlong Date: Wed, 30 Jun 2021 15:46:52 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=95=86=E5=93=81=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E8=BD=AC=E6=8D=A2=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/lili/modules/goods/entity/dos/Goods.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 e4f8eefa..efa1b8af 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 @@ -234,15 +234,15 @@ 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()) || Integer.parseInt( sku.get("price").toString()) <= 0) { + if (StringUtil.isEmpty(sku.get("price").toString()) || Double.parseDouble( sku.get("price").toString()) <= 0) { throw new ServiceException(ResultCode.GOODS_SKU_PRICE_ERROR); } - if (StringUtil.isEmpty(sku.get("cost").toString()) || Integer.parseInt( sku.get("cost").toString()) <= 0) { + if (StringUtil.isEmpty(sku.get("cost").toString()) || Double.parseDouble( sku.get("cost").toString()) <= 0) { throw new ServiceException(ResultCode.GOODS_SKU_COST_ERROR); } //虚拟商品没有重量字段 if(sku.containsKey("weight")) { - if (StringUtil.isEmpty(sku.get("weight").toString()) || Integer.parseInt(sku.get("weight").toString()) < 0) { + if (StringUtil.isEmpty(sku.get("weight").toString()) || Double.parseDouble(sku.get("weight").toString()) < 0) { throw new ServiceException(ResultCode.GOODS_SKU_WEIGHT_ERROR); } } From d7ce709ce6120ed877910843453e84b80f8d58d6 Mon Sep 17 00:00:00 2001 From: lifenlong Date: Wed, 30 Jun 2021 16:29:19 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BD=BF=E7=94=A8hutool=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E8=BD=AC=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/lili/modules/goods/entity/dos/Goods.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) 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 efa1b8af..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 @@ -1,5 +1,6 @@ package cn.lili.modules.goods.entity.dos; +import cn.hutool.core.convert.Convert; import cn.hutool.json.JSONUtil; import cn.lili.base.BaseEntity; import cn.lili.common.enums.ResultCode; @@ -234,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()) || Double.parseDouble( 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()) || Double.parseDouble( 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 (StringUtil.isEmpty(sku.get("weight").toString()) || Double.parseDouble(sku.get("weight").toString()) < 0) { + 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()) || Integer.parseInt( 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); } From 079437100d440ac3e2b0dd68704067c6c0dc4a90 Mon Sep 17 00:00:00 2001 From: Chopper Date: Wed, 30 Jun 2021 19:59:36 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=A5=BD=E5=8D=87?= =?UTF-8?q?=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- buyer-api/pom.xml | 2 +- common-api/pom.xml | 2 +- consumer/pom.xml | 2 +- manager-api/pom.xml | 2 +- seller-api/pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/buyer-api/pom.xml b/buyer-api/pom.xml index 59b2d693..22afda90 100644 --- a/buyer-api/pom.xml +++ b/buyer-api/pom.xml @@ -17,7 +17,7 @@ cn.lili framework - 1.0.1 + 4.2.0 diff --git a/common-api/pom.xml b/common-api/pom.xml index 510c6865..fe5a4ae7 100644 --- a/common-api/pom.xml +++ b/common-api/pom.xml @@ -17,7 +17,7 @@ cn.lili framework - 1.0.1 + 4.2.0 diff --git a/consumer/pom.xml b/consumer/pom.xml index da93e1f6..b9b34c24 100644 --- a/consumer/pom.xml +++ b/consumer/pom.xml @@ -15,7 +15,7 @@ cn.lili framework - 1.0.1 + 4.2.0 diff --git a/manager-api/pom.xml b/manager-api/pom.xml index 6aefa5f4..f896a62f 100644 --- a/manager-api/pom.xml +++ b/manager-api/pom.xml @@ -15,7 +15,7 @@ cn.lili framework - 1.0.1 + 4.2.0 diff --git a/seller-api/pom.xml b/seller-api/pom.xml index 946b6eb2..9efa6d45 100644 --- a/seller-api/pom.xml +++ b/seller-api/pom.xml @@ -15,7 +15,7 @@ cn.lili framework - 1.0.1 + 4.2.0