Merge branch 'dev' into dev(milestone2)

src/main/java/com/redxun/search/api/SearchController.java

@@ -49,10 +49,12 @@ public class SearchController{
                         @RequestParam(defaultValue = "10") Integer pageSize,
                         @RequestParam("range") Integer range,
                         @RequestParam("secretType") Integer secretType,
+                        @RequestParam(value = "orderFiled",required = false) Integer orderFiled,
+                        @RequestParam(value = "orderSort",required = false) Integer orderSort,
                         HttpServletRequest httpServletRequest) {
         JsonPageResult jsonResult = JsonPageResult.getSuccess("返回数据成功!");
         try {
-            Map<String ,Object> result = searchService.search(keyword,pageIndex,pageSize,range,secretType,httpServletRequest);
+            Map<String ,Object> result = searchService.search(keyword,pageIndex,pageSize,range,secretType,orderFiled,orderSort,httpServletRequest);
             return result;
         } catch (Exception e) {
             jsonResult.setSuccess(false);

src/main/java/com/redxun/search/service/SearchService.java

@@ -26,7 +26,7 @@ public interface SearchService {
      * @return
      */
     Map<String,Object> search(String keyword, Integer pageIndex, Integer pageSize,
-                             Integer range, Integer secretType, HttpServletRequest httpServletRequest);
+                             Integer range, Integer secretType,Integer orderFiled,Integer orderSort, HttpServletRequest httpServletRequest);
 
 
     /**

src/main/java/com/redxun/search/service/impl/SearchServiceImpl.java

@@ -41,7 +41,7 @@ public class SearchServiceImpl implements SearchService {
     private KnowledgeMapper knowledgeMapper;
 
     public Map<String,Object> search(String keyword, Integer pageIndex, Integer pageSize,
-                         Integer range, Integer secretType, HttpServletRequest httpServletRequest) {
+                         Integer range, Integer secretType,Integer orderFiled,Integer orderSort, HttpServletRequest httpServletRequest) {
         Map<String,Object> result = new HashMap<>();
         Map<String,Object> paramMap = new HashMap<>();
         Map<String,Object> headerMap = new HashMap<>();
@@ -50,6 +50,12 @@ public class SearchServiceImpl implements SearchService {
         paramMap.put("pageSize",pageSize);
         paramMap.put("range",range);
         paramMap.put("secretType",secretType);
+        if (orderFiled != null){
+            paramMap.put("orderFiled",orderFiled);
+        }
+        if (orderSort != null){
+            paramMap.put("orderSort",orderSort);
+        }
         // 对signature进行加密
         Map<String, Object> params = getParams(httpServletRequest);
         String sign = makeSign(params, "uyjg4h61j5y3t59t");