Commit 20f6cf05 authored by xiaoyao's avatar xiaoyao

fix

parent a06674d3
......@@ -54,10 +54,10 @@ public class ZincUtil {
params.put("from", param.getPage()*param.getSize());
params.put("page", param.getSize());
if (null != param.getKey()) {
final Map<String, String> matchParam = new HashMap<>();
matchParam.put(param.getField(), "*"+param.getKey()+"*");
final Map<String, Object> matchParam = new HashMap<>();
matchParam.put(param.getField(), param.getKey());
Map<String, Object> matchMap = new HashMap<>();
matchMap.put("wildcard", matchParam);
matchMap.put("match_phrase", matchParam);
params.put("query", matchMap);
}
if (null != param.getSortField()) {
......
......@@ -229,7 +229,7 @@ public class WxGoodsController {
public Object list(Integer categoryId, String keyword,
@LoginUser Long userId, @RequestParam(defaultValue = "1") Integer page,
@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) {
logger.info("【请求开始】根据条件搜素商品,请求参数,categoryId:{},keyword:{}", categoryId, keyword);
......
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
......@@ -7,10 +7,10 @@ spring:
multipart:
max-file-size: 50Mb
max-request-size: 80Mb
location: /tmp/tomcat_upload
location: /root/quanku/tmp
datasource:
druid:
url: jdbc:mysql://101.37.172.120:3306/dts-shop?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC&allowPublicKeyRetrieval=true&verifyServerCertificate=false&useSSL=false
url: jdbc:mysql://172.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
username: root
password: zhuangdian123
......@@ -29,7 +29,7 @@ spring:
# redis 配置
redis:
# 地址
host: 101.37.172.120
host: 172.16.48.14
# 端口,默认为6379
port: 6379
# 密码
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment