提交

@@ -3,7 +3,11 @@ module.exports=function(Filter){
 		if(gray.code==200){
 		if(gray.code==200){
 			next();
 			next();
 		}else{
 		}else{
-			res.redirect('/login');
+			if(req.xhr){
+				res.json(gray);
+			}else{
+				res.redirect('/login');
+			}
 		}
 		}
 	});
 	});
 };
 };

@@ -65,12 +65,12 @@ var apiCofig = {
         views: path.resolve(__dirname,"apps", "0", "views/1")
         views: path.resolve(__dirname,"apps", "0", "views/1")
 	},
 	},
 	useToEntry:function(app){
 	useToEntry:function(app){
-		// if(process.env.NODE_ENV!="coding"){
-		// 	options.store=new Redis({
-	 //            port: 6379,
-	 //            host: 'localhost'
-	 //        });
-		// }
+		if(process.env.NODE_ENV!="coding"&&process.env.NODE_ENV!=="test"){
+			options.store=new Redis({
+	            port: 6379,
+	            host: 'localhost'
+	        });
+		}
 		app.use(session(options));
 		app.use(session(options));
 	},
 	},
 	useToOuter:function(app,controllers){
 	useToOuter:function(app,controllers){
@@ -93,6 +93,12 @@ if(process.env.NODE_ENV!="coding"){
         views: path.resolve(__dirname,"views", "0", "1")
         views: path.resolve(__dirname,"views", "0", "1")
 	}
 	}
 }
 }
+/*线下测试环境*/
+if(process.env.NODE_ENV==="test211"){
+	apiCofig.EnvConst.domain="http://192.168.102.202:8088/platform";
+	apiCofig.EnvConst.bigdata="http://192.168.102.202:8091/bigdata";
+}
+/*腾讯云*/
 if(process.env.NODE_ENV==="test"){
 if(process.env.NODE_ENV==="test"){
 	apiCofig.EnvConst.domain="http://10.66.100.6:8088/platform";
 	apiCofig.EnvConst.domain="http://10.66.100.6:8088/platform";
 	apiCofig.EnvConst.bigdata="http://10.66.100.7:8091/bigdata";
 	apiCofig.EnvConst.bigdata="http://10.66.100.7:8091/bigdata";

@@ -149,6 +149,9 @@ module.exports = {
                 if (path && user.right[path]) {
                 if (path && user.right[path]) {
                     common.isUsedMenuAuth(user.auth.pid,user.auth.role_id,path).done(function(isURes){
                     common.isUsedMenuAuth(user.auth.pid,user.auth.role_id,path).done(function(isURes){
                         result = { code: 200, message: "具有权限" };
                         result = { code: 200, message: "具有权限" };
+                        if(isURes.data){
+                            result={code:isURes.data.code,message:isURes.data.errmsg};
+                        }
                         return callback(null, result);
                         return callback(null, result);
                     },function(error){
                     },function(error){
                         return callback(error, result);
                         return callback(error, result);