diff --git a/WebContent/js/main.js b/WebContent/js/main.js
index 1e5fee8afc38742050cc9b9782944df1efbcc6f4..16db487aa68d11b5ffc5da1b1e20923131ca0b62 100644
--- a/WebContent/js/main.js
+++ b/WebContent/js/main.js
@@ -39,22 +39,20 @@ var Api = (function(conf, $) {
};
var blog_tpl = [
'',
- '',
- '',
- '
',
- '
',
-
- '',
- '',
- '',
- '',
- '',
- '',
- ''].join('\n');
+ '',
+ '',
+ '',
+ '',
+
+ '',
+ '',
+ '',
+ '',
+ '', '', '' ].join('\n');
var getCookie = function(name, value) {
var arr, reg = new RegExp("(^| )" + name + "=([^;]*)(;|$)");
@@ -120,7 +118,7 @@ var Api = (function(conf, $) {
};
var getUserInfo = function(callback) {
-
+
var user_id = getCookie('user');
return ajax(uri.user, callback, {
user_id : user_id
@@ -145,20 +143,22 @@ var Api = (function(conf, $) {
url : url
});
};
-
- var getBlogType = function(){
- $.getJSON('http://www.moveblog.com:8080/action/syscatalog',function(data){
- var options="";
- $.each(data.blog_sys_catalog_list,function(optionindex,option){
- options = options+ "";
+
+ var getBlogType = function() {
+ $.getJSON('http://www.moveblog.com:8081/action/syscatalog', function(
+ data) {
+ var options = "";
+ $.each(data.blog_sys_catalog_list, function(optionindex, option) {
+ options = options + "";
});
return options;
- },false);
+ }, false);
return Options;
};
var detectBlogType = function(url) {
- var blog_types = [ 'csdn', 'cnblogs', '51cto', 'iteye','jianshu'];
+ var blog_types = [ 'csdn', 'cnblogs', '51cto', 'iteye', 'jianshu' ];
return $.map(blog_types, function(type) {
return url.indexOf(type) > -1 ? type : '';
}).join('');
@@ -166,7 +166,7 @@ var Api = (function(conf, $) {
var generateBlogList = function(arr) {
var ul = $('');
- for ( var i = 0; i < arr.length; i++) {
+ for (var i = 0; i < arr.length; i++) {
var blog = arr[i];
var li = blog_tpl.replace(/\{link\}/ig, blog.link).replace(
/\{id\}/ig, i).replace(/\{title\}/ig, blog.title);
@@ -187,10 +187,10 @@ var Api = (function(conf, $) {
importBlog(arr, len, before, callback);
}, {
link : url,
- user_catalog:obj.user_catalog,
- sys_catalog:obj.sys_catalog,
- reprint:obj.reprint,
- priva:obj.priva
+ user_catalog : obj.user_catalog,
+ sys_catalog : obj.sys_catalog,
+ reprint : obj.reprint,
+ priva : obj.priva
});
};
@@ -208,33 +208,27 @@ var Api = (function(conf, $) {
api.blog_list_tpl = generateBlogList;
api.importBlog = importBlog;
api.on_error = ajaxErrorHandler;
-
+
return api;
})(Conf, jQuery);
$(function() {
- var $user_info = $('.user-info'),
- $blog_provider = $('.blog-providers'),
- $input_url = $('input[name="url"]'),
- //$blog_list_loading=$('.blog-list-loading'),
+ var $user_info = $('.user-info'), $blog_provider = $('.blog-providers'), $input_url = $('input[name="url"]'),
+ // $blog_list_loading=$('.blog-list-loading'),
$blog_list = $('.blog-list');
- $submit = $('#submit'),
- $cancel = $('#cancel'),
- $importBlog = $('#importBlog'),
- $choose_all = $('.choose-all'),
- $selete_all = $('.selete-all'),
- $reprint = $('#reprint'),
- $img_without_wp = $('.blog-providers ul li').not(".wordpress").find('img');
+ $submit = $('#submit'), $cancel = $('#cancel'),
+ $importBlog = $('#importBlog'), $choose_all = $('.choose-all'),
+ $selete_all = $('.selete-all'), $reprint = $('#reprint'),
+ $img_without_wp = $('.blog-providers ul li').not(".wordpress")
+ .find('img');
$wp_image = $('.blog-providers ul li.wordpress img'),
- $upload_form = $('.search-control form'),
- $input_file = $('input[name="file"]'),
-
- $all_sys = $('#all_sys_catalog'),
- $all_user = $('#all_user_catalog');
-
-
+ $upload_form = $('.search-control form'),
+ $input_file = $('input[name="file"]'),
+
+ $all_sys = $('#all_sys_catalog'),
+ $all_user = $('#all_user_catalog');
// 查询 login user 信息
Api.user(function(user) {
@@ -247,7 +241,7 @@ $(function() {
var tmplogin = $user_info.find('span.login');
tmplogin.hide();
login.attr('href', user.url + '/blog').attr('target', '_blank').text(
- user.name + '的博客');
+ user.name + '的博客');
logout.show().removeAttr('disabled');
$input_url.removeAttr('disabled');
$input_url.focus();
@@ -256,7 +250,7 @@ $(function() {
// 识别博客归属
$input_url.on('keyup change', function() {
var self = $(this);
- var url = self.val();
+ var url = self.val().trim();
var type = Api.blog_type(url);
var img = $blog_provider.find('li img');
img.addClass('gray');
@@ -306,15 +300,15 @@ $(function() {
$upload_form.submit();
return;
}
- var url = $input_url.val();
+ var url = $input_url.val().trim();
if (url.length == 0)
return;
$blog_list.html('');
- //$blog_list_loading.show().removeAttr('disabled');
+ // $blog_list_loading.show().removeAttr('disabled');
$blog_list.addClass('loading');
Api.blog_list(url, function(list) {
- //$blog_list_loading.hide();
- //$blog_list_loading.removeClass('loading');
+ // $blog_list_loading.hide();
+ // $blog_list_loading.removeClass('loading');
$blog_list.removeClass('loading');
$input_url.attr('disabled', 'disabled');
$submit.hide().attr('disabled', 'disabled');
@@ -324,19 +318,25 @@ $(function() {
$choose_all.show().removeAttr('disabled');
if (list != null) {
$blog_list.html(Api.blog_list_tpl(list));
- $.getJSON('http://www.moveblog.com:8080/action/syscatalog',function(data){
- var options="";
- var user_options="";
- $.each(data.blog_sys_catalog_list,function(optionindex,option){
- options="";
- $('.select_box').append(options);
- });
- $.each(data.blog_user_catalog_list,function(optionindex,user_option){
- user_options="";
- $('.person_select_box').append(user_options);
- });
-
- });
+ $.getJSON('http://www.moveblog.com:8081/action/syscatalog',
+ function(data) {
+ var options = "";
+ var user_options = "";
+ $.each(data.blog_sys_catalog_list, function(
+ optionindex, option) {
+ options = "";
+ $('.select_box').append(options);
+ });
+ $.each(data.blog_user_catalog_list, function(
+ optionindex, user_option) {
+ user_options = "";
+ $('.person_select_box').append(user_options);
+ });
+
+ });
}
});
});
@@ -350,8 +350,8 @@ $(function() {
return;
}
$blog_list.removeClass('loading');
- //$blog_list_loading.hide().attr('disabled', 'disabled');
- //$blog_list_loading.removeClass('loading');
+ // $blog_list_loading.hide().attr('disabled', 'disabled');
+ // $blog_list_loading.removeClass('loading');
$(this).hide().attr('disabled', 'disabled');
$submit.show().removeAttr('disabled');
$importBlog.hide().attr('disabled', 'disabled');
@@ -370,23 +370,26 @@ $(function() {
alert('先选定一篇博客吧！');
return;
}
- var urls = import_tasks.map(function() {
- //return $(this).data('url');
- //这里返回每个列表的所有信息
- var obj={
- 'url':'',
- 'user_catalog':'',
- 'sys_catalog':'',
- 'reprint':'',
- 'priva':''
+ var urls = import_tasks.map(
+ function() {
+ // return $(this).data('url');
+ // 这里返回每个列表的所有信息
+ var obj = {
+ 'url' : '',
+ 'user_catalog' : '',
+ 'sys_catalog' : '',
+ 'reprint' : '',
+ 'priva' : ''
};
- obj.url = $(this).data('url');
- obj.user_catalog = $(this).parent().next().children(".person_select_box").val();
- obj.sys_catalog = $(this).parent().next().children(".select_box").val();
- obj.reprint = $('.reprint').val();
- obj.priva = $('.private').val();
- return obj;
- }).toArray();
+ obj.url = $(this).data('url');
+ obj.user_catalog = $(this).parent().next().children(
+ ".person_select_box").val();
+ obj.sys_catalog = $(this).parent().next().children(
+ ".select_box").val();
+ obj.reprint = $('.reprint').val();
+ obj.priva = $('.private').val();
+ return obj;
+ }).toArray();
Api.importBlog(urls, urls.length, function(url, index) {
var input = import_tasks.eq(index);
var li = input.parents('li');
@@ -400,7 +403,7 @@ $(function() {
} else {
li.attr('class', 'imported');
input.remove();
- }
+ }
});
});
@@ -429,17 +432,17 @@ $(function() {
inputs.attr('checked', true);
}
});
-
+
$upload_form.ajaxForm({
dataType : 'json',
beforeSubmit : function() {
$blog_list.html('');
$blog_list.addClass('loading');
- //$blog_list_loading.show().removeAttr('disabled');
+ // $blog_list_loading.show().removeAttr('disabled');
},
success : function(data) {
Api.on_error(data, function(list) {
- //$blog_list_loading.hide();
+ // $blog_list_loading.hide();
$blog_list.removeClass('loading');
$submit.hide().attr('disabled', 'disabled');
$cancel.show().removeAttr('disabled');
@@ -447,19 +450,26 @@ $(function() {
$choose_all.show().removeAttr('disabled');
if (list != null) {
$blog_list.html(Api.blog_list_tpl(list));
- $.getJSON('http://www.moveblog.com:8080/action/syscatalog',function(data){
- var options="";
- var user_options="";
- $.each(data.blog_sys_catalog_list,function(optionindex,option){
- options="";
- $('.select_box').append(options);
- });
- $.each(data.blog_user_catalog_list,function(optionindex,user_option){
- user_options="";
- $('.person_select_box').append(user_options);
- });
- });
-
+ $.getJSON('http://www.moveblog.com:8080/action/syscatalog',
+ function(data) {
+ var options = "";
+ var user_options = "";
+ $.each(data.blog_sys_catalog_list, function(
+ optionindex, option) {
+ options = "";
+ $('.select_box').append(options);
+ });
+ $.each(data.blog_user_catalog_list, function(
+ optionindex, user_option) {
+ user_options = "";
+ $('.person_select_box')
+ .append(user_options);
+ });
+ });
+
}
}, function(data) {
alert(data.error);
@@ -470,22 +480,20 @@ $(function() {
Api.on_error(xhr);
}
});
-
-
- $all_sys.on('change',function(){
+
+ $all_sys.on('change', function() {
var num = $all_sys.val();
- $('.select_box').each(function(){
+ $('.select_box').each(function() {
$(this).val(num);
- });
-
+ });
+
});
-
-
- $all_user.on('change',function(){
+
+ $all_user.on('change', function() {
var num = $all_user.val();
- $('.person_select_box').each(function(){
+ $('.person_select_box').each(function() {
$(this).val(num);
- });
-
+ });
+
});
});
\ No newline at end of file
diff --git a/src/action/Oauth2Action.java b/src/action/Oauth2Action.java
index c18460207f0bb9c1ea968bd24b2601ce5c03146d..58f1da77401ff21389048ae24a7677f1cf8b53fb 100644
--- a/src/action/Oauth2Action.java
+++ b/src/action/Oauth2Action.java
@@ -62,14 +62,15 @@ public class Oauth2Action extends HttpServlet {
Users().put(Long.valueOf(user.getId()), access_token);
Cookie u = new Cookie("user",user.getId()) ;
- u.setMaxAge(600) ;
+ int maxAge = 60*10*6;//设置最长的Cookie时间为60分钟（1个小时）
+ u.setMaxAge(maxAge) ;
u.setPath("/") ;
String userhref = user.getUrl();
Cookie linkcookie = new Cookie("href",userhref) ;
- linkcookie.setMaxAge(600) ;
+ linkcookie.setMaxAge(maxAge) ;
linkcookie.setPath("/") ;
Cookie username = new Cookie("username",URLEncoder.encode(user.getName(),"UTF-8")) ;
- username.setMaxAge(600) ;
+ username.setMaxAge(maxAge) ;
username.setPath("/") ;
response.addCookie(u) ;
response.sendRedirect("/index.html");