Merge branch 'dev' into dev(milestone2)

src/main/java/com/redxun/knowledge/service/KnowledgeCategoryServiceImpl.java

@@ -94,18 +94,12 @@ public class KnowledgeCategoryServiceImpl extends SuperServiceImpl<KnowledgeCate
      * @param filter
      * @return
      */
-    // @Cacheable(value = "knowledgeCategory",keyGenerator = "keyGenerator")
     public IPage findAllKnowledgeCategory(QueryFilter filter) {
         Map<String, Object> params = PageHelper.constructParams(filter);
         IPage page = knowledgeCategoryMapper.findAllKnowledgeCategory(filter.getPage(), filter.getParams(), params);
         List<KnowledgeCategoryAdminVo> knowledgeCategoryList = page.getRecords();
         // 如果有name参数,特殊处理
         if (filter.getParams().containsKey("name")){
-            // 查询顶级记录的所有子集合(顶级记录id为0)
-            //List<KnowledgeCategoryAdminVo> collect = knowledgeCategoryList.
-            //        stream().
-            //        filter(knowledgeCategoryAdminVo -> "0".equals(knowledgeCategoryAdminVo.getParent())).
-            //        collect(Collectors.toList());
             // 孩子节点集合
             List<String> childrenList = new ArrayList<>();
             // 查询其孩子节点
@@ -142,7 +136,6 @@ public class KnowledgeCategoryServiceImpl extends SuperServiceImpl<KnowledgeCate
             });
             page.setRecords(knowledgeCategoryList);
         }
-        //page.setTotal(collect.size());
         return page;
     }
 
@@ -172,10 +165,6 @@ public class KnowledgeCategoryServiceImpl extends SuperServiceImpl<KnowledgeCate
         if (BeanUtil.isEmpty(entity.getPkId())) {
             entity.setPkId(IdGenerator.getIdStr());
         }
-        //Integer count = this.baseMapper.selectCount(new QueryWrapper<KnowledgeCategory>().eq("NAME", entity.getName()));
-        //if (count > 0){
-        //    throw new RuntimeException("分类名称已存在,请重新输入");
-        //}
         // 没有parent默认为一级分类
         if (entity.getParent() == null){
             entity.setParent("0");

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

@@ -15,6 +15,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;
+import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -43,6 +44,7 @@ public class SearchServiceImpl implements SearchService {
     private KnowledgeMapper knowledgeMapper;
 
     @SneakyThrows
+    @Override
     public Map<String,Object> search(String keyword, Integer pageIndex, Integer pageSize,
                          Integer range, Integer secretType,Integer orderFiled,Integer orderSort, HttpServletRequest httpServletRequest) {
         Map<String,Object> result = new HashMap<>();
@@ -80,6 +82,7 @@ public class SearchServiceImpl implements SearchService {
         return result;
     }
 
+    @SneakyThrows
     @Override
     public Map<String,Object> notice(String pkId,String documentId,String documentTitle,String documentName,String documentPath,
                                      String documentUrl, String downloadUrl,String documentMd5,String uploaderName,
@@ -108,7 +111,7 @@ public class SearchServiceImpl implements SearchService {
         headerMap.put("signature", sign);
         headerMap.put("businessKey", "knowlege-manager");
         headerMap.put("userId",userService.queryLoginUser());
-        JSONObject respone = HttpRequestHelper.sendRequest(headerMap,paramMap,searchUrl+"/api-kmsearch/search/notice");
+        JSONObject respone = HttpRequestHelper.sendRequest(headerMap,paramsEncoder(paramMap),searchUrl+"/api-kmsearch/search/notice");
         if(null != respone && 200 == respone.getIntValue("code")) {
             result.put("code",respone.getIntValue("code"));
             result.put("message",respone.getString("message"));
@@ -230,4 +233,21 @@ public class SearchServiceImpl implements SearchService {
         log.info("加密后的secret -> {}",MD5.encrypt(sb.toString()).toLowerCase());
         return MD5.encrypt(sb.toString()).toLowerCase();
     }
+
+    /**
+     * 参数编码(httpclient处理发送特殊字符)
+     * @param params
+     * @return
+     */
+    private Map<String,Object> paramsEncoder(Map<String,Object> params) throws UnsupportedEncodingException {
+        log.info("请求参数 -> {}",params);
+        Map<String, Object> result = new HashMap<>();
+        Set<String> keySet = params.keySet();
+        for (String key : keySet){
+            Object value = params.get(key);
+            value = URLEncoder.encode(value.toString(),"utf-8");
+            result.put(key,value);
+        }
+        return result;
+    }
 }