login.html不能通过window.open, 不然会有问题

node_modules/api.js

@@ -9,9 +9,10 @@ var Web = require('web');
 var Tags = db.tags;
 var needle = require('needle');
 var fs = require('fs');
+var Evt = require('evt');
 
 function log(o) {
-	console.log(o);
+	// console.log(o);
 }
 // log(Common);
 // log(db);
@@ -19,9 +20,6 @@ function log(o) {
 
 // 远程数据服务
 var Api = {
-	leanoteUrl: 'http://localhost:9000',
-	baseUrl: 'http://localhost:9000/api',
-
 	// 检查错误
 	checkError: function(error, resp) { 
 		var me = this;
@@ -53,7 +51,7 @@ var Api = {
 	// 是否断网
 	unConnected: function(error) {
 		var me = this;
-		console.log(error);
+		// console.log(error);
 		if(error && (error.code == "ECONNREFUSED" || error.code == 'ECONNRESET')) { // socket hand up
 			Web.unConnected();
 			return true;
@@ -63,7 +61,7 @@ var Api = {
 	getUrl: function(url, param) {
 		if(!User) {
 		}
-		var url = this.baseUrl + '/' + url;
+		var url = Evt.leanoteUrl + '/api/' + url;
 		var token = User.getToken();
 		param = param || {};
 		param.token = token;
@@ -74,31 +72,35 @@ var Api = {
 			}
 		}
 		if(url.indexOf('?') >= 0) {
-			return url + '&' + paramStr;
+			url =  url + '&' + paramStr;
 		}
-		return url + '?' + paramStr;
+		url =  url + '?' + paramStr;
+		console.log(url);
+		return url;
 	},
 	// 登录
 	auth: function(email, pwd, callback) { 
 		var me = this;
+
 		// log({emai: email, pwd: pwd});
-		// log(this.getUrl('auth/login', {email: email, pwd: pwd}));
+		console.log(this.getUrl('auth/login', {email: email, pwd: pwd}));
+		// console.log('????????????')
 		needle.get(this.getUrl('auth/login', {email: email, pwd: pwd}), function(error, response) {
 			me.checkError(error, response);
 			if(error) {
 				return callback && callback(false);
 			}
-		// needle.get('http://localhost/phpinfo.php?email=xx', {emai: email, pwd: pwd}, function(error, response) {
+			// needle.get('http://localhost/phpinfo.php?email=xx', {emai: email, pwd: pwd}, function(error, response) {
 			var ret = response.body;
 			// 登录成功, 保存token
-			// log('login ret');
-			// log(ret);
+			// console.log('login ret');
+			// console.log(ret);
 			if(Common.isOk(ret)) {
 				ret.Pwd = pwd;
 				User.setCurUser(ret);
 				callback && callback(ret);
 			} else {
-				log('log failed');
+				// console.log('log failed');
 				callback && callback(false);
 			}
 		});