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
9ac44151
Commit
9ac44151
authored
Aug 07, 2018
by
Junling Bu
Browse files
fix[litemall-admin-api, litemall-wx-api]: 微调代码
parent
b268df0d
Changes
3
Hide whitespace changes
Inline
Side-by-side
litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminAuthController.java
View file @
9ac44151
...
...
@@ -2,7 +2,6 @@ package org.linlinjava.litemall.admin.web;
import
org.apache.commons.logging.Log
;
import
org.apache.commons.logging.LogFactory
;
import
org.hibernate.validator.constraints.NotEmpty
;
import
org.linlinjava.litemall.admin.dao.AdminToken
;
import
org.linlinjava.litemall.admin.annotation.LoginAdmin
;
import
org.linlinjava.litemall.admin.service.AdminTokenManager
;
...
...
@@ -19,8 +18,6 @@ import org.springframework.web.bind.annotation.PostMapping;
import
org.springframework.web.bind.annotation.RequestBody
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
import
javax.validation.constraints.NotNull
;
import
java.util.List
;
@RestController
...
...
litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxGoodsController.java
View file @
9ac44151
...
...
@@ -230,7 +230,7 @@ public class WxGoodsController {
@LoginUser
Integer
userId
,
@RequestParam
(
defaultValue
=
"1"
)
Integer
page
,
@RequestParam
(
defaultValue
=
"10"
)
Integer
size
,
@Sort
@RequestParam
(
defaultValue
=
"add_time"
)
String
sort
,
@Sort
(
accepts
=
{
"add_time"
,
"retail_price"
})
@RequestParam
(
defaultValue
=
"add_time"
)
String
sort
,
@Order
@RequestParam
(
defaultValue
=
"desc"
)
String
order
){
//添加到搜索历史
...
...
litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxSearchController.java
View file @
9ac44151
package
org.linlinjava.litemall.wx.web
;
import
org.hibernate.validator.constraints.NotEmpty
;
import
org.linlinjava.litemall.db.domain.LitemallKeyword
;
import
org.linlinjava.litemall.db.domain.LitemallSearchHistory
;
import
org.linlinjava.litemall.db.service.LitemallKeywordService
;
...
...
@@ -11,6 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import
org.springframework.validation.annotation.Validated
;
import
org.springframework.web.bind.annotation.*
;
import
javax.validation.constraints.NotEmpty
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Map
;
...
...
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