Merge remote-tracking branch 'origin/master'

This commit is contained in:
sin
2019-05-15 20:02:15 +08:00
31 changed files with 347 additions and 144 deletions

View File

@@ -7,19 +7,18 @@ spring:
password: ${MALL_MYSQL_PASSWORD}
# mybatis
mybatis:
config-location: classpath:mybatis-config.xml
mapper-locations: classpath:mapper/*.xml
type-aliases-package: cn.iocoder.mall.user.biz.dataobject
#mybatis:
# config-location: classpath:mybatis-config.xml
# mapper-locations: classpath:mapper/*.xml
# type-aliases-package: cn.iocoder.mall.user.biz.dataobject
# mybatis-plus
#mybatis-plus:
# configuration:
# mapUnderscoreToCamelCase: true # 虽然默认为 true ,但是还是显示去指定下。
# mapperLocations: classpath*:mapper/*.xml
# typeAliasesPackage: cn.iocoder.mall.user.biz.dataobject
# mapper-locations: classpath*:mapper/*.xml
# type-aliases-package: cn.iocoder.mall.user.biz.dataobject
mybatis-plus:
configuration:
mapUnderscoreToCamelCase: true # 虽然默认为 true ,但是还是显示去指定下。
mapperLocations: classpath*:mapper/*.xml
typeAliasesPackage: cn.iocoder.mall.user.biz.dataobject
config-location: classpath:mybatis-config.xml
# dubbo
dubbo:

View File

@@ -17,7 +17,7 @@
AND valid = 1
</update>
<select id="selectById" parameterType="String" resultType="OAuth2RefreshTokenDO">
<select id="selectById" parameterType="string" resultType="cn.iocoder.mall.user.biz.dataobject.OAuth2RefreshTokenDO">
SELECT
id, user_id, valid, expires_time, create_time
FROM oauth2_refresh_token