update all to local

This commit is contained in:
life
2017-06-12 10:17:13 +08:00
parent 2f07e80ff2
commit 2840598cf1
2 changed files with 62 additions and 2 deletions

5
node_modules/api.js generated vendored
View File

@@ -380,7 +380,7 @@ var Api = {
parentNotebookId: serverNotebookId parentNotebookId: serverNotebookId
} }
console.log('add notebook'); console.log('add notebook');
console.log(data); console.log(data, me.getUrl('notebook/addNotebook'));
needle.post(me.getUrl('notebook/addNotebook'), data, {}, function(err, resp) { needle.post(me.getUrl('notebook/addNotebook'), data, {}, function(err, resp) {
me.checkError(err, resp); me.checkError(err, resp);
if(err) { if(err) {
@@ -498,6 +498,7 @@ var Api = {
callback && callback('No serverNotebookId'); callback && callback('No serverNotebookId');
return; return;
} }
console.log('serverNotebookId', serverNotebookId)
var data = { var data = {
Title: note.Title, Title: note.Title,
NotebookId: serverNotebookId, NotebookId: serverNotebookId,
@@ -520,7 +521,7 @@ var Api = {
} }
// 最终传递的数据 // 最终传递的数据
console.log(' end transfer data', data); console.log(' end transfer data', data, me.getUrl('note/addNote'));
try { try {
needle.post(me.getUrl('note/addNote'), data, needle.post(me.getUrl('note/addNote'), data,

59
node_modules/user.js generated vendored
View File

@@ -706,6 +706,65 @@ User = {
}); });
}); });
}, },
// 1. User.updateAllBeLocal('tests3@a.com', 'abc123', 'http://localhost:9000');
// 2. 同步之
// 仅仅是为了强制本地化
// 先同步到server, 再重新同步到本地
updateAllBeLocal: function (email, password, host) {
var me = this;
if(!Api) {
Api = require('api');
}
Api.auth(email, password, host, function(user) {
if(user.Ok) {
var everUserId = me.userId;
me.token = user.Token;
// me.userId = user.UserId;
// me.email = user.Email;
// me.username = user.Username;
me.host = host; // http://leanote.com, http://localhost
me.local = false;
me.LastSyncUsn = -1;
// 判断当前用户是否有文件夹
// me.setUserDataPath();
var data = {
// UserId: user.UserId,
Token: me.token,
// Email: user.Email,
// Username: user.Username,
Host: host,
Local: false,
IsActive: true,
LastSyncUsn: -1,
};
db.users.update({_id: everUserId}, {$set: data}, function(err, cnt) {
if(err || cnt == 0) {
console.log('用户信息更新失败', err);
} else {
Evt.setHost(me.host);
console.log('用户信息更新成功');
db.notes.update({UserId: everUserId}, {$set: {UserId: me.userId, IsDirty: true, ServerNoteId: '', LocalIsNew: true}}, {multi: true}, function () {
console.log('数据更新成功');
});
db.notebooks.update({UserId: everUserId}, {$set: {UserId: me.userId, IsDirty: true, ServerNotebookId: '', LocalIsNew: true}}, {multi: true});
db.tags.update({UserId: everUserId}, {$set: {UserId: me.userId, IsDirty: true}}, {multi: true});
}
});
} else {
console.log('错误! 用户名密码不正确');
}
});
},
}; };
module.exports = User; module.exports = User;