网络断开时, auth检查

sync还有问题
This commit is contained in:
life
2015-02-11 23:50:02 +08:00
parent 225bcd7cf0
commit 269f68620c
13 changed files with 322 additions and 72 deletions

58
node_modules/api.js generated vendored
View File

@@ -5,6 +5,7 @@ var Note = require('note');
var Tag = require('tag');
var Notebook = require('notebook');
var Common = require('common');
var Web = require('web');
var Tags = db.tags;
var needle = require('needle');
var fs = require('fs');
@@ -20,6 +21,39 @@ function log(o) {
var Api = {
leanoteUrl: 'http://localhost:9000',
baseUrl: 'http://localhost:9000/api',
// 检查错误
checkError: function(error, resp) {
var me = this;
me.unConnected(error);
// 是否需要重新登录
/*{
"Ok": false,
"Code": 1,
"Msg": "NOTLOGIN",
"Id": "",
"List": null,
"Item": null
}*/
var ret = resp;
try {
if(typeof ret == 'object') {
if(!ret['Ok'] && ret['Msg'] == 'NOTLOGIN') {
Web.notLogin();
}
}
} catch(e) {}
},
// 是否断网
unConnected: function(error) {
var me = this;
if(error && error.code == "ECONNREFUSED") {
console.log(error);
Web.unConnected();
return true;
}
return false;
},
getUrl: function(url, param) {
if(!User) {
}
@@ -44,6 +78,7 @@ var Api = {
// log({emai: email, pwd: pwd});
// log(this.getUrl('auth/login', {email: email, pwd: pwd}));
needle.get(this.getUrl('auth/login', {email: email, pwd: pwd}), function(error, response) {
me.checkError(error, response);
if(error) {
return callback && callback(false);
}
@@ -105,12 +140,14 @@ var Api = {
var me = this;
var url = this.getUrl('notebook/getSyncNotebooks', {afterUsn: afterUsn, maxEntry: maxEntry});
needle.get(url, function(error, response) {
me.checkError(error, response);
if(error) {
console.log(error);
return callback && callback(false);
}
var ret = response.body;
log(ret);
log(Common);
console.log(ret);
console.log(response);
if(Common.isOk(ret)) {
callback && callback(ret);
} else {
@@ -123,6 +160,7 @@ var Api = {
var url = this.getUrl('note/getSyncNotes', {afterUsn: afterUsn, maxEntry: maxEntry});
log(url);
needle.get(url, function(error, response) {
me.checkError(error, response);
if(error) {
console.log('note/getSyncNotes');
console.log(error);
@@ -141,6 +179,7 @@ var Api = {
var url = this.getUrl('tag/getSyncTags', {afterUsn: afterUsn, maxEntry: maxEntry});
log(url);
needle.get(url, function(error, response) {
me.checkError(error, response);
if(error) {
console.log('tag/getSyncTags');
console.log(error);
@@ -161,6 +200,7 @@ var Api = {
var url = this.getUrl('user/getSyncState');
log(url);
needle.get(url, function(error, response) {
me.checkError(error, response);
if(error) {
return callback && callback(false);
}
@@ -180,6 +220,7 @@ var Api = {
var url = this.getUrl('note/getNoteContent', {noteId: noteId});
log(url);
needle.get(url, function(error, response) {
me.checkError(error, response);
if(error) {
log(error);
return callback && callback(false);
@@ -206,6 +247,7 @@ var Api = {
var url = me.getUrl('file/getImage', {fileId: fileId});
log(url);
needle.get(url, function(err, resp) {
me.checkError(err, resp);
if(err) {
return callback && callback(false);
}
@@ -254,6 +296,7 @@ var Api = {
var url = me.getUrl('file/getAttach', {fileId: serverFileId});
console.log(url);
needle.get(url, function(err, resp) {
me.checkError(err, resp);
if(err) {
return callback && callback(false);
}
@@ -326,6 +369,8 @@ var Api = {
log('add notebook');
log(data);
needle.post(me.getUrl('notebook/addNotebook'), data, {}, function(err, resp) {
me.checkError(err, resp);
if(err) {
return callback(false);
}
@@ -353,6 +398,7 @@ var Api = {
log('update notebook');
log(data);
needle.post(me.getUrl('notebook/updateNotebook'), data, {}, function(err, resp) {
me.checkError(err, resp);
if(err) {
log('err');
log(err);
@@ -376,6 +422,7 @@ var Api = {
var data = {notebookId: notebook.ServerNotebookId, usn: notebook.Usn};
log('delete notebook');
needle.post(me.getUrl('notebook/deleteNotebook'), data, {}, function(err, resp) {
me.checkError(err, resp);
if(err) {
return callback(false);
}
@@ -412,7 +459,9 @@ var Api = {
// 获取笔记
// noteId是serverNoteId
getNote: function(noteId, callback) {
var me = this;
needle.get(this.getUrl('note/getNote', {NoteId: noteId}), function(error, response) {
me.checkError(error, response);
if(error) {
return callback && callback(false);
}
@@ -458,6 +507,7 @@ var Api = {
try {
needle.post(me.getUrl('note/addNote'), data, {multipart: needMultiple}, function(err, resp) {
me.checkError(err, resp);
if(err) {
return callback(false);
}
@@ -501,6 +551,7 @@ var Api = {
}
needle.post(me.getUrl('note/updateNote'), data, {multipart: needMultiple}, function(err, resp) {
me.checkError(err, resp);
if(err) {
log('err');
log(err);
@@ -528,6 +579,7 @@ var Api = {
// 这里要重新require下, 不然为{}
Note = require('note');
needle.post(me.getUrl('note/deleteTrash'), data, {}, function(err, resp) {
me.checkError(err, resp);
if(err) {
return callback(false);
}
@@ -560,6 +612,7 @@ var Api = {
addTag: function(title, callback) {
var me = this;
needle.post(me.getUrl('tag/addTag'), {tag: title}, {}, function(err, resp) {
me.checkError(err, resp);
if(err) {
return callback && callback(false);
}
@@ -579,6 +632,7 @@ var Api = {
deleteTag: function(tag, callback) {
var me = this;
needle.post(me.getUrl('tag/deleteTag'), {tag: tag.Tag, usn: tag.Usn}, {}, function(err, resp) {
me.checkError(err, resp);
if(err) {
return callback && callback(false);
}