no message

@@ -50,6 +50,7 @@ exports = module.exports = function () {
         proxy: {
         proxy: {
             target: 'http://47.110.158.110:20000',
             target: 'http://47.110.158.110:20000',
             apiRouteRegexp: '/api',
             apiRouteRegexp: '/api',
+            ignoreRouters: ['/api/uaa/v1/auth/tokens'],
             authUrl: '/uaa/v1/auth/tokens',
             authUrl: '/uaa/v1/auth/tokens',
             refreshUrl: '/uaa/v1/auth/tokens',
             refreshUrl: '/uaa/v1/auth/tokens',
             signOutUrl: '/signOut',
             signOutUrl: '/signOut',

 //代理RESTful API
 //代理RESTful API
 var express = require('express');
 var express = require('express');
-exports = module.exports = function (settings, proxy) {
+exports = module.exports = function (settings, proxy, logger) {
 
 
     var app = this;
     var app = this;
     var router = express.Router();
     var router = express.Router();
+    var checkAuth = function (req) {
+        var flag = true, ignore = false;
+        if (settings.proxy && settings.proxy.ignoreRouters) {
+            settings.proxy.ignoreRouters.map(function (ignoreR, i) {
+                ignore = req.originalUrl.indexOf(ignoreR) != -1;
+            });
+        }
+        if (ignore) {
+            flag = true
+        } else if (req.session && req.session.token) {
+            var token = {};
+            try {
+                token = JSON.parse(req.session.token);
+            } catch (error) {
+                flag = false;
+                logger.error("token 字符串不能被解析", error);
+            }
+            if (token && token.access_token && token.refresh_token)
+                flag = true;
+        } else {
+            logger.debug("token 不存在");
+            flag = false;
+        }
+        return flag;
+    }
+
     if (settings.proxy) {
     if (settings.proxy) {
         app.use(settings.proxy.apiRouteRegexp, router);
         app.use(settings.proxy.apiRouteRegexp, router);
         router.all('*', function (req, res, next) {
         router.all('*', function (req, res, next) {
-            proxy.web(req, res, next);
+            if (checkAuth(req))
+                proxy.web(req, res, next);
+            else
+                res.redirect(settings.proxy.signInUrl);
         });
         });
     }
     }
 };
 };
 
 
-exports['@require'] = ['igloo/settings', 'igloo/restler'];
+exports['@require'] = ['igloo/settings', 'igloo/restler', 'igloo/logger'];

@@ -77,7 +77,6 @@ exports = module.exports = function (logger, settings) {
                 if (err)
                 if (err)
                     logger.error(err);
                     logger.error(err);
                 else {
                 else {
-
                     res.send(data);
                     res.send(data);
                 }
                 }
             })
             })
@@ -90,6 +89,8 @@ exports = module.exports = function (logger, settings) {
         if (response.statusCode === 401) {
         if (response.statusCode === 401) {
             refreshToken(req, res, next, reqOption);
             refreshToken(req, res, next, reqOption);
         } else {
         } else {
+            var options = reqOption.options || {};
+            logger.error({ url: reqOption.url, method: options.method, headers: options.headers, query: options.query, data: JSON.parse(options.data), backdata: data });
             res.send(data);
             res.send(data);
         }
         }
     }
     }
@@ -123,11 +124,11 @@ exports = module.exports = function (logger, settings) {
                 handleFail(data, response, req, res, next, { url, options });
                 handleFail(data, response, req, res, next, { url, options });
             })
             })
             .on('error', function (err, response) {
             .on('error', function (err, response) {
-                logger.error(err);
+                logger.error({ 'message': '发生错误', url: url, method: options.method, headers: options.headers, query: options.query, data: JSON.parse(options.data), error: err });
                 res.send(err);
                 res.send(err);
             })
             })
             .on('timeout', function (ms) {
             .on('timeout', function (ms) {
-                logger.error('timeout', ms);
+                logger.error({ 'message': '请求超时', url: url, method: options.method, headers: options.headers, query: options.query, data: JSON.parse(options.data), timeout: ms });
                 res.send({ 'message': '请求超时' });
                 res.send({ 'message': '请求超时' });
             });
             });
     }
     }