login.html page

node_modules/api.js

@@ -41,14 +41,20 @@ var Api = {
 				if(!ret['Ok'] && ret['Msg'] == 'NOTLOGIN') {
 					Web.notLogin();
 				}
+			} else {
+				// 出现问题
+				Web.unConnected();
 			}
-		} catch(e) {}
+		} catch(e) {
+			// 出错问题
+			Web.unConnected();
+		}
 	},
 	// 是否断网
 	unConnected: function(error) {
 		var me = this;
-		if(error && error.code == "ECONNREFUSED") {
-			console.log(error);
+		console.log(error);
+		if(error && (error.code == "ECONNREFUSED" || error.code == 'ECONNRESET')) { // socket hand up
 			Web.unConnected();
 			return true;
 		}
@@ -366,8 +372,8 @@ var Api = {
 				seq: notebook.Seq,
 				parentNotebookId: serverNotebookId
 			}
-			log('add notebook');
-			log(data);
+			console.log('add notebook');
+			console.log(data);
 			needle.post(me.getUrl('notebook/addNotebook'), data, {}, function(err, resp) {
 				me.checkError(err, resp);
 
@@ -375,7 +381,7 @@ var Api = {
 					return callback(false);
 				}
 				var ret = resp.body;
-				log(ret);
+				console.log(ret);
 				if(Common.isOk(ret)) {
 					callback(ret);
 				} else {
@@ -481,6 +487,12 @@ var Api = {
 		var me = this;
 		// note.NotebookId是本的, 要得到远程的
 		Notebook.getServerNotebookIdByNotebookId(note.NotebookId, function(serverNotebookId) {
+			if(!serverNotebookId) {
+				console.error('No serverNotebookId');
+				console.log(note);
+				callback && callback(false);
+				return;
+			}
 			var data = {
 				Title: note.Title,
 				NotebookId: serverNotebookId,

node_modules/note.js

@@ -586,6 +586,7 @@ var Note = {
 
 	// addNote, updateNote后的操作
 	// 添加修改ServerNoteId; 更新修改usn
+	// note是服务器传来的, note.NoteId, note.ServerNoteId已设置正确, note.NotebookId是服务器上的
 	updateNoteForceForSendChange: function(note, isAdd, callback) {
 		var me = this;
 		note.IsDirty = false;
@@ -602,6 +603,8 @@ var Note = {
 		delete note['Content'];
 		// }
 
+		delete note['NotebookId']; // 不要设置notebookId, 2/16 fixed
+
 		console.log('server data from::::');
 		console.log(note.NoteId);
 		console.log(note.Files);

node_modules/notebook.js

@@ -297,6 +297,10 @@ var Notebook = {
 		notebook.LocalIsNew = false;
 		notebook.LocalIsDelete = false;
 
+		delete note['NumberNotes'];
+		delete note['UpdatedTime'];
+		delete note['CreatedTime'];
+
 		var serverNotebookId = notebook.NotebookId;
 		me.getNotebookIdByServerNotebookId(notebook.ParentNotebookId, function(parentNotebookId) {
 			notebook.ParentNotebookId = parentNotebookId;
@@ -322,6 +326,8 @@ var Notebook = {
 		notebook.IsDirty = false;
 		notebook.LocalIsNew = false;
 		notebook.ServerNotebookId = notebook.NotebookId; // ? 怎么可能要改呢? 因为这可能是添加后的笔记本
+		notebook.NotebookId = notebookId; // 必须设为本地, 因为notebook.NotebookId是服务器传过来的 2/16 fixed
+
 		me.getNotebookIdByServerNotebookId(notebook.ParentNotebookId, function(parentNotebookId) {
 			notebook.ParentNotebookId = parentNotebookId;
 			NB.update({NotebookId: notebookId}, {$set: notebook}, {}, function (err, n) {

node_modules/user.js

@@ -58,9 +58,24 @@ User = {
 				});
 			}
 		});
+		// console.log(".........");
+		// console.log(user);
 		// 设值其它用户为非active
-		db.users.update({_id: {$ne: user.UserId}}, {$set: {IsActive: false}}, {multiple: true})
+		db.users.update({_id: {$ne: user.UserId}}, {$set: {IsActive: false}}, {multi: true}, function(err, n) { 
+			// console.log(err);
+			// console.log(n);
+		});
 	},
+
+	// for test
+	getAllUsers: function() {
+		var me = this;
+		db.users.find({}, function(err, users) {
+			console.log(err);
+			console.log(users);
+		});
+	},
+
 	// 打开软件时, 从db中获取当前用户
 	init: function(callback) {
 		console.log("......user init.......")