diff --git a/src/main/java/com/lovenav/controller/UrlAndCateController.java b/src/main/java/com/lovenav/controller/UrlAndCateController.java index cbbcfbd..8b91a02 100644 --- a/src/main/java/com/lovenav/controller/UrlAndCateController.java +++ b/src/main/java/com/lovenav/controller/UrlAndCateController.java @@ -192,13 +192,6 @@ public class UrlAndCateController { Set parentSet = new HashSet<>(); for( int i = 0 ; i < urlLists.size() ; i++) { - CateAndUrl cateAndUrl = new CateAndUrl(); - cateAndUrl.setFloder("false"); - cateAndUrl.setName(urlLists.get(i).getName()); - cateAndUrl.setParentId(urlLists.get(i).getCateId()); - cateAndUrl.setUrlId(urlLists.get(i).getId()); - cateAndUrl.setUrl(urlLists.get(i).getUrl()); - cateAndUrlList.add(cateAndUrl); String parentString = urlCateListService.selectUrListCateByUrlCateId(urlLists.get(i).getCateId()); String [] parentList = parentString.split(","); System.out.println(parentString); @@ -220,7 +213,16 @@ public class UrlAndCateController { cateAndUrl.setCateId(urlCateList.getId()); cateAndUrlList.add(cateAndUrl); } - Collections.reverse(cateAndUrlList); +// for( int i = 0 ; i < urlLists.size() ; i++) +// { +// CateAndUrl cateAndUrl = new CateAndUrl(); +// cateAndUrl.setFloder("false"); +// cateAndUrl.setName(urlLists.get(i).getName()); +// cateAndUrl.setParentId(urlLists.get(i).getCateId()); +// cateAndUrl.setUrlId(urlLists.get(i).getId()); +// cateAndUrl.setUrl(urlLists.get(i).getUrl()); +// cateAndUrlList.add(cateAndUrl); +// } System.out.println(cateAndUrlList); List parentsList = new ArrayList<>(); @@ -399,6 +401,7 @@ public class UrlAndCateController { e.printStackTrace(); result.put("code", 500); result.put("msg", "url不可用"); + return JSONObject.toJSONString(result); // handle error } result.put("code", 200); diff --git a/src/main/java/com/lovenav/utils/UrlCheckUtil.java b/src/main/java/com/lovenav/utils/UrlCheckUtil.java index 1dcf885..6709e40 100644 --- a/src/main/java/com/lovenav/utils/UrlCheckUtil.java +++ b/src/main/java/com/lovenav/utils/UrlCheckUtil.java @@ -4,7 +4,6 @@ import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpGet; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClients; -import sun.net.www.protocol.http.HttpURLConnection; import java.io.IOException; import java.net.*;