From 2365bed6f407146ee62df9d19e1d547b607dcd1f Mon Sep 17 00:00:00 2001 From: linlinjava Date: Sun, 5 Jul 2020 13:30:49 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E6=95=B0=E6=8D=AE=E5=BA=93=E9=A9=B1?= =?UTF-8?q?=E5=8A=A8=E5=90=8D=E7=A7=B0=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- deploy/litemall/application.yml | 2 +- docker/litemall/application.yml | 2 +- litemall-db/mybatis-generator/generatorConfig.xml | 2 +- litemall-db/src/main/resources/application-db.yml | 2 +- .../org/linlinjava/litemall/wx/web/WxGoodsController.java | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/deploy/litemall/application.yml b/deploy/litemall/application.yml index a3b9d922..4ef7446b 100644 --- a/deploy/litemall/application.yml +++ b/deploy/litemall/application.yml @@ -6,7 +6,7 @@ spring: datasource: druid: url: jdbc:mysql://localhost:3306/litemall?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC&allowPublicKeyRetrieval=true&verifyServerCertificate=false&useSSL=false - driver-class-name: com.mysql.jdbc.Driver + driver-class-name: com.mysql.cj.jdbc.Driver username: litemall password: litemall123456 initial-size: 10 diff --git a/docker/litemall/application.yml b/docker/litemall/application.yml index f5f797ae..9f4434b0 100644 --- a/docker/litemall/application.yml +++ b/docker/litemall/application.yml @@ -6,7 +6,7 @@ spring: datasource: druid: url: jdbc:mysql://mysql:3306/litemall?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC&allowPublicKeyRetrieval=true&verifyServerCertificate=false&useSSL=true - driver-class-name: com.mysql.jdbc.Driver + driver-class-name: com.mysql.cj.jdbc.Driver username: litemall password: litemall123456 initial-size: 10 diff --git a/litemall-db/mybatis-generator/generatorConfig.xml b/litemall-db/mybatis-generator/generatorConfig.xml index 5ed3c8ad..e8ef27f5 100644 --- a/litemall-db/mybatis-generator/generatorConfig.xml +++ b/litemall-db/mybatis-generator/generatorConfig.xml @@ -42,7 +42,7 @@ - diff --git a/litemall-db/src/main/resources/application-db.yml b/litemall-db/src/main/resources/application-db.yml index ef526211..e4a25b33 100644 --- a/litemall-db/src/main/resources/application-db.yml +++ b/litemall-db/src/main/resources/application-db.yml @@ -8,7 +8,7 @@ spring: datasource: druid: url: jdbc:mysql://localhost:3306/litemall?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC&allowPublicKeyRetrieval=true&verifyServerCertificate=false&useSSL=false - driver-class-name: com.mysql.jdbc.Driver + driver-class-name: com.mysql.cj.jdbc.Driver username: litemall password: litemall123456 initial-size: 10 diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxGoodsController.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxGoodsController.java index a3442dfd..ff8c352f 100644 --- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxGoodsController.java +++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxGoodsController.java @@ -1,7 +1,6 @@ package org.linlinjava.litemall.wx.web; import com.github.pagehelper.PageInfo; -import com.mysql.jdbc.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.linlinjava.litemall.core.system.SystemConfig; @@ -12,6 +11,7 @@ import org.linlinjava.litemall.db.domain.*; import org.linlinjava.litemall.db.service.*; import org.linlinjava.litemall.wx.annotation.LoginUser; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.StringUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -259,7 +259,7 @@ public class WxGoodsController { @Order @RequestParam(defaultValue = "desc") String order) { //添加到搜索历史 - if (userId != null && !StringUtils.isNullOrEmpty(keyword)) { + if (userId != null && !StringUtils.isEmpty(keyword)) { LitemallSearchHistory searchHistoryVo = new LitemallSearchHistory(); searchHistoryVo.setKeyword(keyword); searchHistoryVo.setUserId(userId);