Authored by weiqingting

提交

... ... @@ -3,7 +3,7 @@
* @type {Object}
*/
module.exports = {
url:'http://admin.yohobuy.com',//'http://admin.portal.yohobuy.com',
url:'http://admin.portal.yohobuy.com',
sessionKeep:'/account/profile/display',
timeout:30000
};
\ No newline at end of file
... ...
... ... @@ -25,20 +25,21 @@ var errorMessage = {
util.setLogger(res.app.logger);
var options = {
url:oldService.login,
form:'["'+user+'","'+password+'",1]'
form:{
account:user,
password:password,
website:WEBSITE
}
}
//调用登陆
util.httpCall(options,function(err,ret){
console.log("************************************");
console.log(ret);
if(err) {
res.json(errorMessage);
return;
} else {
//调用菜单
_callGetMenu(ret.data.pid,ret.data.role_id,function(err,data){
_callGetMenu(ret.data.pid,function(err,data){
if(err) {
res.json(errorMessage);
} else {
... ... @@ -65,18 +66,21 @@ var errorMessage = {
* @param {Number} pid 操作员ID
* @param {Function} callback 回调
*/
function _callGetMenu(pid,roleid,callback) {
function _callGetMenu(pid,callback) {
var options = {
url:oldService.getResourceByPid,
form:'['+pid+','+roleid+',1]'
form:{
pid:pid,
website:WEBSITE
}
console.log(options);
}
util.httpCall(options,function(err,ret){
if(err) {
callback(err);
} else {
var menuData = {menu:[],right:{}};
if(ret.data) {
if(ret.data && ret.data.length>0) {
menuData = _makeMenu(ret.data);
}
_getAllMenu(function(ret){
... ... @@ -99,9 +103,9 @@ function filterRight(ret,menuData) {
var noRight = {};
//匹配没有权限
_.forEach(ret,function(v,k){
if(v.menu_url!=='') {
if(!menuData.right[v.menu_url]) {
noRight[v.menu_url] = true;
if(v.module_url!=='') {
if(!menuData.right[v.module_url]) {
noRight[v.module_url] = true;
}
}
});
... ... @@ -136,51 +140,27 @@ function _getAllMenu (callback) {
function _makeMenu (data) {
var menu = [];
var right = {};
for(var key in data){
var v=data[key];
_.forEach(data,function(v){
var item = {
title:v.menu_name,
title:v.resource_name,
}
if(v.parent_id === "0") {
item.parent = 'menu-template';
var itemSubs = [];
_.forEach(v.sub,function(val) {
var sub = {
title:val.menu_name,
href:val.menu_url,
title:val.resource_name,
href:val.module_url,
icon: 'list-alt'
}
right[val.menu_url] = true;
right[val.module_url] = true;
itemSubs.push(sub);
});
item.menu = itemSubs;
}
menu.push(item);
}
// _.forEach(data,function(v){
// var item = {
// title:v.menu_name,
// }
// if(v.parent_id === "0") {
// item.parent = 'menu-template';
// var itemSubs = [];
// _.forEach(v.sub,function(val) {
// console.log(v.sub);
// var sub = {
// title:val.menu_name,
// href:val.menu_url,
// icon: 'list-alt'
// }
// right[val.menu_url] = true;
// itemSubs.push(sub);
// });
// item.menu = itemSubs;
// }
// menu.push(item);
// });
});
return {
menu:menu,
... ...
// var oldSerDomain = 'http://service.api.yohobuy.com';
// module.exports = {
// login: oldSerDomain + '/account/api/v1/profile/login',
// getResourceByPid: oldSerDomain + '/account/api/v1/profile/getResourceByPid',
// getAllResByWebsite: oldSerDomain + '/account/api/v1/resources/getAllResByWebsite'
// };
var oldSerDomain = 'http://lserve.yohobuy.com';
var oldSerDomain = 'http://service.api.yohobuy.com';
module.exports = {
login: oldSerDomain + '/service/account/v1/Profile/login',
getResourceByPid: oldSerDomain + '/service/account/v1/Profile/getMenuByPid',
getAllResByWebsite: oldSerDomain + '/service/setting/v1/menu/getAllMenu'
login: oldSerDomain + '/account/api/v1/profile/login',
getResourceByPid: oldSerDomain + '/account/api/v1/profile/getResourceByPid',
getAllResByWebsite: oldSerDomain + '/account/api/v1/resources/getAllResByWebsite'
};
\ No newline at end of file
... ...