leanote/desktop-app
1
0
Fork 0
mirror of https://github.com/leanote/desktop-app.git synced 2025-10-18 01:16:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

自建服务 bug, 登录时没有传host

Browse Source
This commit is contained in:
life
2015-09-24 14:30:37 +08:00
parent d4dc79ab44
commit fe88973f09
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
login.html
View File

@@ -267,6 +267,7 @@ $(function() {
$('#customServer').click(function() { $('#customServer').click(function() {
$body.addClass('custom-server'); $body.addClass('custom-server');
$host.focus(); $host.focus();
hasHost = true;
hideMsg(); hideMsg();
}); });

2
node_modules/api.js generated vendored
View File

@@ -66,8 +66,6 @@ var Api = {
return false; return false;
}, },
getUrl: function(url, param) { getUrl: function(url, param) {
if(!User) {
}
var url = Evt.leanoteUrl + '/api/' + url; var url = Evt.leanoteUrl + '/api/' + url;
var token = User.getToken(); var token = User.getToken();
param = param || {}; param = param || {};

5
node_modules/user.js generated vendored
View File

@@ -52,9 +52,9 @@ User = {
login: function(username, password, host, callback) { login: function(username, password, host, callback) {
var me = this; var me = this;
// 先本地验证 // 先本地验证
console.log('login'); // console.log('login');
db.users.findOne({Username: username, IsLocal: true}, function(err, user) { db.users.findOne({Username: username, IsLocal: true}, function(err, user) {
console.log('login end'); // console.log('login end');
if(err || !user || !user.UserId || user.Pwd != password) { if(err || !user || !user.UserId || user.Pwd != password) {
if(!Api) { if(!Api) {
Api = require('api'); Api = require('api');
@@ -68,6 +68,7 @@ User = {
} }
}); });
} else { } else {
// 本地用户
me.saveCurUser(user, function() { me.saveCurUser(user, function() {
callback(true); callback(true);
}); });