'limiter-2-edition'

@@ -70,7 +70,7 @@ module.exports = (req, res, next) => {
     // 排除条件：ip白名单/路径白名单/异步请求/登录用户
     const excluded = _.includes(IP_WHITE_LIST, remoteIp) ||
         _.includes(PATH_WHITE_LIST, req.path) || req.xhr || !_.isEmpty(_.get(req, 'user.uid'));
-    const enabled = !_.get(req.app.locals, 'wap.sys.noLimite');
+    const enabled = !_.get(req.app.locals, 'pc.sys.noLimiter');
 
     logger.debug(`request remote ip: ${remoteIp}; excluded: ${excluded}; enabled: ${enabled}`);
 

@@ -2,6 +2,7 @@
 
 const helpers = global.yoho.helpers;
 const _ = require('lodash');
+
 const WHITE_LIST = [
     '/3party/check',
     '/3party/check/submit',
@@ -27,8 +28,7 @@ module.exports = (req, res, next) => {
     }
 
     if (req.xhr) {
-        return res.json({
-            code: 400,
+        return res.status(510).json({
             data: {refer: limitAPI}
         });
     }

@@ -26,9 +26,9 @@ function isNormalSpider(userAgent) {
 
 module.exports = (limiter, policy) => {
     const ua = limiter.req.header('User-Agent');
-    const synchronizeKey = `wap:limiter:synchronize:${limiter.remoteIp}`; // 同步
-    const asynchronousKey = `wap:limiter:asynchronous:${limiter.remoteIp}`; // 异步
-    const spiderKey = `wap:limiter:spider:${limiter.remoteIp}`; // 异步
+    const synchronizeKey = `pc:limiter:synchronize:${limiter.remoteIp}`; // 同步
+    const asynchronousKey = `pc:limiter:asynchronous:${limiter.remoteIp}`; // 异步
+    const spiderKey = `pc:limiter:spider:${limiter.remoteIp}`; // 异步
 
     // 正常蜘蛛直接过
     if (isNormalSpider(ua)) {

@@ -9,7 +9,7 @@ module.exports = (limiter, policy) => {
         res = limiter.res,
         next = limiter.next; // eslint-disable-line
 
-    const key = `wap:limiter:faker:${limiter.remoteIp}`;
+    const key = `pc:limiter:faker:${limiter.remoteIp}`;
 
     if (req.header('X-Requested-With') === 'XMLHttpRequest') {
         cache.decrAsync(key, 1);

@@ -2,16 +2,16 @@
 
 const cache = global.yoho.cache.master;
 const _ = require('lodash');
+const config = global.yoho.config;
 const logger = global.yoho.logger;
 
 module.exports = (limiter, policy) => {
-    // 和pc共用
-    const key = `pc:limiter:${limiter.remoteIp}`;
+    const key = `${config.app}:limiter:${limiter.remoteIp}`;
 
     return cache.getAsync(key).then((result) => {
         logger.debug(key, result);
 
-        if (result && _.isNumber(result) && result !== -1) {
+        if (result && _.isNumber(result)) {
             return Promise.resolve(policy);
         } else {
             return Promise.resolve(true);

@@ -27,12 +27,18 @@ module.exports = (limiter, policy) => {
         getOp[key] = cache.getAsync(ruleKeys[key]);
     });
 
+    getOp.human = cache.getAsync(`${config.app}:limiter:ishuman:${limiter.remoteIp}`);
+
     return Promise.props(getOp).then((results) => {
 
         logger.debug(MAX_TIMES);
         logger.debug(_.values(ruleKeys));
         logger.debug(results);
 
+        if (results.human) { // 经过验证码之后1小时有效期内不再验证qps
+            return Promise.resolve(true);
+        }
+
         // 遍历限制规则，若满足返回相应处理策略， 否则页面访问次数加1
         let operation = [];
 
@@ -42,9 +48,10 @@ module.exports = (limiter, policy) => {
             if (!results[key]) {
                 operation.push(cache.setAsync(cacheKey, 1, +key));
             } else if (+results[key] > +val) {
+                logger.warn(`${config.app}:limiter:${limiter.remoteIp}`);
 
                 // ip限制1小时
-                operation.push(cache.setAsync(`pc:limiter:${limiter.remoteIp}`, 1, limiterIpTime));
+                operation.push(cache.setAsync(`${config.app}:limiter:${limiter.remoteIp}`, 1, limiterIpTime));
                 return Promise.resolve(policy);
             } else {
                 operation.push(cache.incrAsync(cacheKey, 1));

@@ -49,6 +49,8 @@ $(document).ajaxError((event, xhr) => {
                 window.location.href = `/signin.html?refer=${encodeURIComponent(window.location.href)}`;
             }
         }
+    } else if (xhr.status === 510 && xhr.responseJSON.data && xhr.responseJSON.data.refer) {
+        window.location.href = xhr.responseJSON.data.refer;
     } else if (xhr.status === 403 && xhr.responseJSON.code === 4403) {
         tip.show(xhr.responseJSON.message);
         setTimeout(function() {