Compare commits

..

No commits in common. "e820990a5c07a64cff65ea5924302a172a340a02b6259833feb1fc6fd586e7a9" and "dfdabcbe1c4c31443eac56ef53b434b2ceeb8510dafdf42ee53a5575cc0b2c34" have entirely different histories.

3 changed files with 33 additions and 1 deletions

View File

@ -756,7 +756,6 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
bikeInfo.setUsageStatus(BikeUsageStatus.WAIT);
bikeInfoMapper.update(bikeInfo);
updateById(bikeOrder);
//TODO部件废弃换绑逻辑
}
@Override

View File

@ -121,6 +121,17 @@ logging:
name: logs/${spring.application.name}.log
pattern:
dateformat: yyyy-MM-dd HH:mm:ss.SSS # 包含毫秒
#logging:
# level:
# root: INFO
# org.springframework.web: WARN
# org.mybatis: DEBUG # 查看MyBatis SQL语句
# file:
# name: logs/${spring.application.name}.log # 输出到文件(默认追加)
# pattern:
# console: "%d{yyyy-MM-dd HH:mm:ss} - %highlight(%-5level) [%thread] %cyan(%logger{36}) : %msg%n"
# file: "%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n"
geo-coding:
api-url: https://restapi.amap.com/v3/geocode
access-key: c9bc51e353b49acd42a560f37121929a

View File

@ -41,6 +41,28 @@ spring:
connection-test-query: SELECT 1
##此属性控制池中连接的最长生命周期值0表示无限生命周期默认1800000即30分钟
max-lifetime: 1800000
data:
# redis配置
redis:
# Redis数据库索引默认为0
database: 1
# Redis服务器地址
host: 47.109.71.130
# Redis服务器连接端口
port: 6379
# Redis服务器连接密码默认为空
password: 970529
# 连接超时时间
lettuce:
pool:
# 连接池最大连接数
max-active: 200
# 连接池最大阻塞等待时间(使用负值表示没有限制)
max-wait: -1ms
# 连接池中的最大空闲连接
max-idle: 10
# 连接池中的最小空闲连接
min-idle: 0
mybatis-flex:
mapper-locations: classpath:mapper/*.xml