Merge branch 'release/2.0' into 'master'

gray



See merge request !15

@@ -77,13 +77,13 @@ class UserController extends Context {
             shopsFeDomain: 'http://shops.yohobuy.com'
             shopsFeDomain: 'http://shops.yohobuy.com'
         };
         };
 
 
-        if (global.env.Production) {
+        if (global.env.Gray) {
             Object.assign(config, {
             Object.assign(config, {
-                shopsFeDomain: 'http://shops.yohobuy.com'
+                shopsFeDomain: 'http://shops.yohops.com'
             });
             });
-        } else if (global.env.Gray) {
+        } else if (global.env.Production) {
             Object.assign(config, {
             Object.assign(config, {
-                shopsFeDomain: 'http://shops.yohops.com'
+                shopsFeDomain: 'http://shops.yohobuy.com'
             });
             });
         }
         }
         res.json(config);
         res.json(config);