Merge branch 'develop/wap' into beta/wap

@@ -75,7 +75,7 @@ class Cache
             // 当接口异常，一级缓存没取到数据的情况
             if ($node === 'slave') {
                 $incrementKey = self::makeKey('_increment_' . $key, 'slave');
-                $incrementValue = HoodCache::Memcached('slave')->get($incrementKey, 'slave');
+                $incrementValue = HoodCache::Memcached('slave')->get($incrementKey);
                 // 接口调用失败累计5次之后，回填二级缓存数据到一级缓存, 重置计数值为0
                 if (is_int($incrementValue) && $incrementValue > 5) {
                     HoodCache::Memcached('master')->set(self::makeKey($key, 'master'), $result, 300);

@@ -18,7 +18,7 @@ server
         #cc: e0323a9039add2978bf5b49550572c7c oo:e47ca7a09cf6781e29634502345930a7
         #acecl:7ea6bdf07376a928c5d4677789c45463 opqcl:352f028bd6ecf28de1c285c573642659
         default_type application/json;
-        return 200 '{"code":200,"message":"Config Success","md5":"1231231231231","data":{"ae":"e0323a9039add2978bf5b49550572c7c","url":"http://m.yohobuy.com","tl":"352f028bd6ecf28de1c285c573642659"}}';
+        return 200 '{"code":200,"message":"Config Success","md5":"e0323a9039add2978bf5b49550572cff","data":{"ae":"e0323a9039add2978bf5b49550572c7c","url":"http://m.yohobuy.com","tl":"352f028bd6ecf28de1c285c573642659"}}';
     }
     # hotfix
     location = /hf/v1 {