From c27e92d681515e93d004069062d90a42a8d97c2b Mon Sep 17 00:00:00 2001
From: life <lifephp@gmail.com>
Date: Thu, 19 Mar 2015 21:07:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=86=85=E5=AE=B9=E7=9B=B8=E5=90=8C=E6=97=B6,?=
 =?UTF-8?q?=20=E4=B8=8D=E5=86=B2=E7=AA=81,=20=E5=85=B6=E5=AE=83=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E7=94=A8=E6=9C=8D=E5=8A=A1=E5=99=A8=E4=B8=8A=E7=9A=84?=
 =?UTF-8?q?,=20=E5=A4=84=E7=90=86=E4=BA=86=E5=9B=BE=E7=89=87url?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 node_modules/note.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/node_modules/note.js b/node_modules/note.js
index 3ccbfa81..9e55b2fd 100644
--- a/node_modules/note.js
+++ b/node_modules/note.js
@@ -1057,7 +1057,11 @@ var Note = {
 			Api.getNoteContent(serverNote.NoteId, function(noteContent) {
 				// 同步到本地
 				if(Common.isOk(noteContent)) {
-					var serverContent = noteContent.Content;
+					var serverContent = me.fixNoteContent(noteContent.Content); // 图片, 附件的链接
+					// var serverContent = noteContent.Content; // 图片, 附件的链接
+
+					// console.error(serverContent);
+					// console.error(localNote.Content);
 
 					// 没有冲突, 好, 用服务器端的其它值
 					if(serverContent == localNote.Content) {