diff --git a/WebContent/WEB-INF/lib/httpclient-4.3.1.jar b/WebContent/WEB-INF/lib/httpclient-4.3.1.jar deleted file mode 100644 index cdd1e3874c4b45fc52c0a3ae21431514c4e3eb23..0000000000000000000000000000000000000000 Binary files a/WebContent/WEB-INF/lib/httpclient-4.3.1.jar and /dev/null differ diff --git a/WebContent/WEB-INF/lib/httpclient-4.5.2.jar b/WebContent/WEB-INF/lib/httpclient-4.5.2.jar new file mode 100644 index 0000000000000000000000000000000000000000..701609fcc8469ca07a507bb7306d6d4f2572a00d Binary files /dev/null and b/WebContent/WEB-INF/lib/httpclient-4.5.2.jar differ diff --git a/WebContent/WEB-INF/lib/httpcore-4.3.jar b/WebContent/WEB-INF/lib/httpcore-4.3.jar deleted file mode 100644 index ddfe6dacbc477129f424b9408b35e8959d0ebbf4..0000000000000000000000000000000000000000 Binary files a/WebContent/WEB-INF/lib/httpcore-4.3.jar and /dev/null differ diff --git a/WebContent/WEB-INF/lib/httpcore-4.4.4.jar b/WebContent/WEB-INF/lib/httpcore-4.4.4.jar new file mode 100644 index 0000000000000000000000000000000000000000..ac4a8773022b9ddda58d878bae26ff182de8b7a4 Binary files /dev/null and b/WebContent/WEB-INF/lib/httpcore-4.4.4.jar differ diff --git a/WebContent/WEB-INF/lib/webmagic-core-0.4.2-fix.jar b/WebContent/WEB-INF/lib/webmagic-core-0.4.2-fix.jar new file mode 100644 index 0000000000000000000000000000000000000000..5b74420c1fb78efda612660ba5decb54bf2b1f1b Binary files /dev/null and b/WebContent/WEB-INF/lib/webmagic-core-0.4.2-fix.jar differ diff --git a/WebContent/WEB-INF/lib/webmagic-core-0.4.2.jar b/WebContent/WEB-INF/lib/webmagic-core-0.4.2.jar deleted file mode 100644 index 0f07572e7cb71a9ca860e2a5632039f1dbf25945..0000000000000000000000000000000000000000 Binary files a/WebContent/WEB-INF/lib/webmagic-core-0.4.2.jar and /dev/null differ diff --git a/WebContent/index.html b/WebContent/index.html index 3a177a0128892bb2761aa49665e97c7871eef61f..aa2ab8846db83929b4c37235e415a016bfc51f53 100644 --- a/WebContent/index.html +++ b/WebContent/index.html @@ -5,8 +5,8 @@ OSChina.Net 博客搬家 - - + + diff --git a/WebContent/js/main.js b/WebContent/js/main.js index 6bef35edf1bd4ecd3f29a0a3731250453f0ec50f..f28bed8a38a01e8fc20724f61cc72ae593d7b969 100644 --- a/WebContent/js/main.js +++ b/WebContent/js/main.js @@ -254,7 +254,7 @@ $(function() { var logout = $user_info.find('a.logout'); var tmplogin = $user_info.find('span.login'); tmplogin.hide(); - login.attr('href', user.url + '/blog').attr('target', '_blank').text( + login.attr('href', user.url ).attr('target', '_blank').text( user.name + '的博客'); logout.show().removeAttr('disabled'); $input_url.removeAttr('disabled'); diff --git a/src/action/SpiderAction.java b/src/action/SpiderAction.java index 3b28dd4469afa56c7473cf70a9f26645c15e8f5b..5d840219106470fe3882df8a6b430f7f0f0c36a8 100644 --- a/src/action/SpiderAction.java +++ b/src/action/SpiderAction.java @@ -42,7 +42,7 @@ public class SpiderAction extends HttpServlet { return; } - if(!url.contains("http://")){ + if(!url.contains("http://") && !url.contains("https://")){ url="http://"+url; }