|
@@ -54,6 +54,7 @@ define([ 'toaster', 'ui.bootstrap', 'services' ], function() {
|
|
|
}
|
|
}
|
|
|
return url;
|
|
return url;
|
|
|
};
|
|
};
|
|
|
|
|
+ // 自动登录
|
|
|
var loginAndRedirect = function() {
|
|
var loginAndRedirect = function() {
|
|
|
var path = $location.path();
|
|
var path = $location.path();
|
|
|
if(path) {
|
|
if(path) {
|
|
@@ -61,11 +62,11 @@ define([ 'toaster', 'ui.bootstrap', 'services' ], function() {
|
|
|
angular.forEach(params, function(param){
|
|
angular.forEach(params, function(param){
|
|
|
param && _params.push(param);
|
|
param && _params.push(param);
|
|
|
});
|
|
});
|
|
|
- if(_params.length == 4 && _params[0] == 'redirect') {
|
|
|
|
|
|
|
+ if(_params.length > 2 && _params[0] == 'redirect') {
|
|
|
$scope.login({
|
|
$scope.login({
|
|
|
j_username: _params[1],
|
|
j_username: _params[1],
|
|
|
j_password: _params[2]
|
|
j_password: _params[2]
|
|
|
- }, decodeUrl(_params[3]));
|
|
|
|
|
|
|
+ }, decodeUrl(_params[3] || '/'));
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
};
|
|
};
|