yshop1.6发布:新增砍价功能,新增加锁功能,修复其他bug

This commit is contained in:
hupeng
2019-12-23 20:08:36 +08:00
parent e37cc2c952
commit a2942f608d
55 changed files with 2493 additions and 79 deletions

View File

@ -5,7 +5,7 @@
<parent>
<artifactId>yshop</artifactId>
<groupId>co.yixiang</groupId>
<version>1.5</version>
<version>1.6</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@ -20,7 +20,7 @@
<dependency>
<groupId>co.yixiang</groupId>
<artifactId>yshop-generator</artifactId>
<version>1.5</version>
<version>1.6</version>
<exclusions>
<exclusion>
<groupId>co.yixiang</groupId>
@ -32,12 +32,12 @@
<dependency>
<groupId>co.yixiang</groupId>
<artifactId>yshop-tools</artifactId>
<version>1.5</version>
<version>1.6</version>
</dependency>
<dependency>
<groupId>co.yixiang</groupId>
<artifactId>yshop-shop</artifactId>
<version>1.5</version>
<version>1.6</version>
</dependency>
<!--jwt-->

View File

@ -5,8 +5,8 @@ spring:
type: com.alibaba.druid.pool.DruidDataSource
driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
url: jdbc:log4jdbc:mysql://localhost:3306/yshop?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
username: root
password: System!1234
username: yshop
password:
# 初始化配置
initial-size: 3
@ -47,7 +47,7 @@ spring:
database: 0
host: 127.0.0.1
port: 6379
password: System!1234
password:
#连接超时时间
timeout: 5000