diff --git a/src/main/java/in/xiandan/magnetw/service/MagnetRuleService.java b/src/main/java/in/xiandan/magnetw/service/MagnetRuleService.java index 01636c5..170a649 100644 --- a/src/main/java/in/xiandan/magnetw/service/MagnetRuleService.java +++ b/src/main/java/in/xiandan/magnetw/service/MagnetRuleService.java @@ -112,7 +112,7 @@ public String getPathBySort(String sortType, MagnetRulePath rulePaths) { return rulePaths.getTime(); } else if (MagnetPageSiteSort.SORT_OPTION_DEFAULT.equals(sortType)) { return rulePaths.getPreset(); - }else{ + } else { return getSupportedSorts(rulePaths).get(0).getSort(); } } @@ -139,7 +139,10 @@ private Map getMagnetRule() { sites.add(rule); log.append("[加载]--->" + rule.getSite() + " : " + rule.getUrl() + "\n"); } - log.append(magnetRuleMap.size() + "个网站规则加载完成"); + log.append(rules.size()); + log.append("个网站规则加载完成,忽略"); + log.append(rules.size() - magnetRuleMap.size()); + log.append("个"); logger.info(log.toString()); } return magnetRuleMap; diff --git a/src/main/java/in/xiandan/magnetw/service/MagnetService.java b/src/main/java/in/xiandan/magnetw/service/MagnetService.java index 9f58805..85ce529 100644 --- a/src/main/java/in/xiandan/magnetw/service/MagnetService.java +++ b/src/main/java/in/xiandan/magnetw/service/MagnetService.java @@ -112,6 +112,7 @@ public List parser(MagnetRule rule, String keyword, String sort, int String url = String.format("%s%s", rule.getUrl(), sortPath); Connection connect = Jsoup.connect(url) + .ignoreContentType(true) .sslSocketFactory(DefaultSslSocketFactory.getDefaultSslSocketFactory()) .timeout(15000); Map cookies = mCacheCookies.get(rule.getUrl()); diff --git a/src/main/webapp/WEB-INF/views/index.jsp b/src/main/webapp/WEB-INF/views/index.jsp index 7f31182..201b107 100644 --- a/src/main/webapp/WEB-INF/views/index.jsp +++ b/src/main/webapp/WEB-INF/views/index.jsp @@ -258,6 +258,7 @@ if (this.current.keyword != null && this.current.keyword.length > 0) { keywordString = "&k=" + this.current.keyword + "&s=" + this.current.sort + "&p=" + this.current.page; } + return "?source=" + encodeURI(this.current.site + keywordString); }, redirectCurrentURL() { window.location.href = "search" + this.getParamsString()