diff --git a/pom.xml b/pom.xml index 4d67f0aa..12535490 100644 --- a/pom.xml +++ b/pom.xml @@ -36,7 +36,6 @@ UTF-8 1.8 2.9.0 - 1.16 2.9.2 1.2.74 1.1.10 @@ -98,13 +97,6 @@ commons-lang3 - - - org.bgee.log4jdbc-log4j2 - log4jdbc-log4j2-jdbc4.1 - ${log4jdbc.version} - - io.springfox diff --git a/yshop-admin/src/main/resources/config/application-dev.yml b/yshop-admin/src/main/resources/config/application-dev.yml index af6aba5e..dd8f73e5 100644 --- a/yshop-admin/src/main/resources/config/application-dev.yml +++ b/yshop-admin/src/main/resources/config/application-dev.yml @@ -5,8 +5,8 @@ spring: datasource: druid: type: com.alibaba.druid.pool.DruidDataSource - driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy - url: jdbc:log4jdbc:mysql://localhost:3306/yshopb2c?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&zeroDateTimeBehavior=convertToNull + driverClassName: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://localhost:3306/yshopb2c?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&zeroDateTimeBehavior=convertToNull username: root password: 123456 diff --git a/yshop-admin/src/main/resources/config/application-prod.yml b/yshop-admin/src/main/resources/config/application-prod.yml index dc297bf2..5fd3bfed 100644 --- a/yshop-admin/src/main/resources/config/application-prod.yml +++ b/yshop-admin/src/main/resources/config/application-prod.yml @@ -5,8 +5,8 @@ spring: datasource: druid: type: com.alibaba.druid.pool.DruidDataSource - driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy - url: jdbc:log4jdbc:mysql://localhost:3306/yshopb2c?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&zeroDateTimeBehavior=convertToNull + driverClassName: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://localhost:3306/yshopb2c?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&zeroDateTimeBehavior=convertToNull username: root password: xxcs@!2019 diff --git a/yshop-admin/src/main/resources/logback.xml b/yshop-admin/src/main/resources/logback.xml index 1f293487..d75c1931 100644 --- a/yshop-admin/src/main/resources/logback.xml +++ b/yshop-admin/src/main/resources/logback.xml @@ -58,29 +58,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/yshop-app/src/main/resources/logback.xml b/yshop-app/src/main/resources/logback.xml index bf41a991..2a020c26 100644 --- a/yshop-app/src/main/resources/logback.xml +++ b/yshop-app/src/main/resources/logback.xml @@ -57,29 +57,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/yshop-shop/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java b/yshop-shop/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java index a9b61f6f..d4de0df1 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java @@ -29,7 +29,6 @@ import co.yixiang.modules.order.service.dto.*; import co.yixiang.tools.express.ExpressService; import co.yixiang.tools.express.config.ExpressAutoConfiguration; import co.yixiang.tools.express.dao.ExpressInfo; -import co.yixiang.utils.DateUtils; import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import io.swagger.annotations.Api;