Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
jinli gu
Litemall
Commits
2365bed6
Commit
2365bed6
authored
Jul 05, 2020
by
linlinjava
Browse files
chore: 数据库驱动名称更新
parent
c0d5ebc5
Changes
5
Show whitespace changes
Inline
Side-by-side
deploy/litemall/application.yml
View file @
2365bed6
...
...
@@ -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
...
...
docker/litemall/application.yml
View file @
2365bed6
...
...
@@ -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
...
...
litemall-db/mybatis-generator/generatorConfig.xml
View file @
2365bed6
...
...
@@ -42,7 +42,7 @@
</commentGenerator>
<!--数据库连接信息-->
<jdbcConnection
driverClass=
"com.mysql.jdbc.Driver"
<jdbcConnection
driverClass=
"com.mysql.
cj.
jdbc.Driver"
connectionURL=
"jdbc:mysql://127.0.0.1:3306/litemall?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC&verifyServerCertificate=false&useSSL=false"
userId=
"litemall"
password=
"litemall123456"
/>
...
...
litemall-db/src/main/resources/application-db.yml
View file @
2365bed6
...
...
@@ -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
...
...
litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxGoodsController.java
View file @
2365bed6
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
.
is
NullOr
Empty
(
keyword
))
{
if
(
userId
!=
null
&&
!
StringUtils
.
isEmpty
(
keyword
))
{
LitemallSearchHistory
searchHistoryVo
=
new
LitemallSearchHistory
();
searchHistoryVo
.
setKeyword
(
keyword
);
searchHistoryVo
.
setUserId
(
userId
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment