Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Q
qk_backend
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
quanku
qk_backend
Commits
20f6cf05
Commit
20f6cf05
authored
Jul 10, 2023
by
xiaoyao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
a06674d3
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
32 deletions
+7
-32
ch-core/src/main/java/com/wwdz/ch/core/util/ZincUtil.java
ch-core/src/main/java/com/wwdz/ch/core/util/ZincUtil.java
+3
-3
ch-wx-api/src/main/java/com/wwdz/ch/wx/web/WxGoodsController.java
...i/src/main/java/com/wwdz/ch/wx/web/WxGoodsController.java
+1
-1
ch-wx-api/src/main/java/com/wwdz/ch/wx/web/WxIndexController.java
...i/src/main/java/com/wwdz/ch/wx/web/WxIndexController.java
+0
-25
ch-wx-api/src/main/resources/application.yml
ch-wx-api/src/main/resources/application.yml
+3
-3
No files found.
ch-core/src/main/java/com/wwdz/ch/core/util/ZincUtil.java
View file @
20f6cf05
...
@@ -54,10 +54,10 @@ public class ZincUtil {
...
@@ -54,10 +54,10 @@ public class ZincUtil {
params
.
put
(
"from"
,
param
.
getPage
()*
param
.
getSize
());
params
.
put
(
"from"
,
param
.
getPage
()*
param
.
getSize
());
params
.
put
(
"page"
,
param
.
getSize
());
params
.
put
(
"page"
,
param
.
getSize
());
if
(
null
!=
param
.
getKey
())
{
if
(
null
!=
param
.
getKey
())
{
final
Map
<
String
,
String
>
matchParam
=
new
HashMap
<>();
final
Map
<
String
,
Object
>
matchParam
=
new
HashMap
<>();
matchParam
.
put
(
param
.
getField
(),
"*"
+
param
.
getKey
()+
"*"
);
matchParam
.
put
(
param
.
getField
(),
param
.
getKey
()
);
Map
<
String
,
Object
>
matchMap
=
new
HashMap
<>();
Map
<
String
,
Object
>
matchMap
=
new
HashMap
<>();
matchMap
.
put
(
"
wildcard
"
,
matchParam
);
matchMap
.
put
(
"
match_phrase
"
,
matchParam
);
params
.
put
(
"query"
,
matchMap
);
params
.
put
(
"query"
,
matchMap
);
}
}
if
(
null
!=
param
.
getSortField
())
{
if
(
null
!=
param
.
getSortField
())
{
...
...
ch-wx-api/src/main/java/com/wwdz/ch/wx/web/WxGoodsController.java
View file @
20f6cf05
...
@@ -229,7 +229,7 @@ public class WxGoodsController {
...
@@ -229,7 +229,7 @@ public class WxGoodsController {
public
Object
list
(
Integer
categoryId
,
String
keyword
,
public
Object
list
(
Integer
categoryId
,
String
keyword
,
@LoginUser
Long
userId
,
@RequestParam
(
defaultValue
=
"1"
)
Integer
page
,
@LoginUser
Long
userId
,
@RequestParam
(
defaultValue
=
"1"
)
Integer
page
,
@RequestParam
(
defaultValue
=
"10"
)
Integer
size
,
@RequestParam
(
defaultValue
=
"10"
)
Integer
size
,
@Sort
(
accepts
=
{
"sort"
,
"bid_time"
,
"price"
,
"name"
})
@RequestParam
(
defaultValue
=
"sort"
)
String
sort
,
@Sort
(
accepts
=
{
"sort"
,
"bid_time"
,
"price"
,
"name"
,
"_id"
})
@RequestParam
(
defaultValue
=
"sort"
)
String
sort
,
@Order
@RequestParam
(
defaultValue
=
"asc"
)
String
order
)
{
@Order
@RequestParam
(
defaultValue
=
"asc"
)
String
order
)
{
logger
.
info
(
"【请求开始】根据条件搜素商品,请求参数,categoryId:{},keyword:{}"
,
categoryId
,
keyword
);
logger
.
info
(
"【请求开始】根据条件搜素商品,请求参数,categoryId:{},keyword:{}"
,
categoryId
,
keyword
);
...
...
ch-wx-api/src/main/java/com/wwdz/ch/wx/web/WxIndexController.java
deleted
100644 → 0
View file @
a06674d3
package
com.wwdz.ch.wx.web
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
import
com.wwdz.ch.core.util.ResponseUtil
;
/**
* 测试服务
*/
@RestController
@RequestMapping
(
"/wx/index"
)
public
class
WxIndexController
{
/**
* 测试数据
*
* @return 测试数据
*/
@RequestMapping
(
"/index"
)
public
Object
index
()
{
return
ResponseUtil
.
ok
(
"hello dts"
);
}
}
\ No newline at end of file
ch-wx-api/src/main/resources/application.yml
View file @
20f6cf05
...
@@ -7,10 +7,10 @@ spring:
...
@@ -7,10 +7,10 @@ spring:
multipart
:
multipart
:
max-file-size
:
50Mb
max-file-size
:
50Mb
max-request-size
:
80Mb
max-request-size
:
80Mb
location
:
/
tmp/tomcat_upload
location
:
/
root/quanku/tmp
datasource
:
datasource
:
druid
:
druid
:
url
:
jdbc:mysql://1
01.37.172.120
:3306/dts-shop?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC&allowPublicKeyRetrieval=true&verifyServerCertificate=false&useSSL=false
url
:
jdbc:mysql://1
72.16.48.14
:3306/dts-shop?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.jdbc.Driver
username
:
root
username
:
root
password
:
zhuangdian123
password
:
zhuangdian123
...
@@ -29,7 +29,7 @@ spring:
...
@@ -29,7 +29,7 @@ spring:
# redis 配置
# redis 配置
redis
:
redis
:
# 地址
# 地址
host
:
1
01.37.172.120
host
:
1
72.16.48.14
# 端口,默认为6379
# 端口,默认为6379
port
:
6379
port
:
6379
# 密码
# 密码
...
...
Write
Preview
Markdown
is supported
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