Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into feature/web-list

--Subproject commit 75bbc3b075de19f239532f60c5995d06c5f814e2

 <?php
 <?php
-namespace WebPlugin\DataProcess\WebChannel;
+namespace WebPlugin\DataProcess;
 
 
 class Channel
 class Channel
 {
 {
 
 
     public static $formatChannel = array(
     public static $formatChannel = array(
-        'boys' => '\WebPlugin\DataProcess\WebChannel\Channel\Boys',
-        'girls' => '\WebPlugin\DataProcess\WebChannel\Channel\Girls',
-        'kids' => '\WebPlugin\DataProcess\WebChannel\Channel\Kids',
-        'lifestyle' => '\WebPlugin\DataProcess\WebChannel\Channel\Lifestyle'
+        'boys' => '\WebPlugin\DataProcess\Channel\Boys',
+        'girls' => '\WebPlugin\DataProcess\Channel\Girls',
+        'kids' => '\WebPlugin\DataProcess\Channel\Kids',
+        'lifestyle' => '\WebPlugin\DataProcess\Channel\Lifestyle'
     );
     );
 
 
     public static function getFormat($channel, $data)
     public static function getFormat($channel, $data)

 <?php
 <?php
-namespace WebPlugin\DataProcess\WebChannel\Channel;
+namespace WebPlugin\DataProcess\Channel;
 abstract class AbstractChannel
 abstract class AbstractChannel
 {
 {
     /***
     /***

 <?php
 <?php
-namespace WebPlugin\DataProcess\WebChannel\Channel;
+namespace WebPlugin\DataProcess\Channel;
 class Boys extends AbstractChannel
 class Boys extends AbstractChannel
 {
 {
     /**
     /**

 <?php
 <?php
-namespace WebPlugin\DataProcess\WebChannel\Channel;
+namespace WebPlugin\DataProcess\Channel;
 class Girls extends AbstractChannel
 class Girls extends AbstractChannel
 {
 {
     public static function format($resource)
     public static function format($resource)

 <?php
 <?php
-namespace WebPlugin\DataProcess\WebChannel\Channel;
+namespace WebPlugin\DataProcess\Channel;
 class Kids extends AbstractChannel
 class Kids extends AbstractChannel
 {
 {
     /**
     /**

 <?php
 <?php
-namespace WebPlugin\DataProcess\WebChannel\Channel;
+namespace WebPlugin\DataProcess\Channel;
 class Lifestyle extends AbstractChannel
 class Lifestyle extends AbstractChannel
 {
 {
     /**
     /**

 <?php
 <?php
-namespace WebPlugin\DataProcess\WebChannel;
+namespace WebPlugin\DataProcess;
 
 
-use Plugin\Images;
+use WebPlugin\Images;
 use WebPlugin\Helpers;
 use WebPlugin\Helpers;
 use WebPlugin\Cache;
 use WebPlugin\Cache;
 use Configs\CacheConfig;
 use Configs\CacheConfig;

@@ -7,7 +7,7 @@ use WebPlugin\Helpers;
 use WebPlugin\Cache;
 use WebPlugin\Cache;
 use LibModels\Web\Home\IndexData;
 use LibModels\Web\Home\IndexData;
 use LibModels\Web\Product\SearchData;
 use LibModels\Web\Product\SearchData;
-use WebPlugin\DataProcess\WebChannel\Channel as ChannelProcess;
+use WebPlugin\DataProcess\Channel as ChannelProcess;
 
 
 /**
 /**
  * web首页模板数据模型
  * web首页模板数据模型

@@ -5,7 +5,7 @@ define('SITE_MAIN', 'http://web.dev.yohobuy.com'); // 网站主域名
 define('OLD_MAIN', 'http://www.yohobuy.com'); // 网站旧域名
 define('OLD_MAIN', 'http://www.yohobuy.com'); // 网站旧域名
 define('COOKIE_DOMAIN', '.yohobuy.com'); // COOKIE作用域
 define('COOKIE_DOMAIN', '.yohobuy.com'); // COOKIE作用域
 define('SUB_DOMAIN', '.yohobuy.com'); // 子域名后缀
 define('SUB_DOMAIN', '.yohobuy.com'); // 子域名后缀
-define('USE_CACHE', true); // 缓存的开关
+define('USE_CACHE', false); // 缓存的开关
 define('APPLICATION_PATH', dirname(__DIR__)); // 应用目录
 define('APPLICATION_PATH', dirname(__DIR__)); // 应用目录
 define('ROOT_PATH', dirname(dirname(APPLICATION_PATH))); // 根目录
 define('ROOT_PATH', dirname(dirname(APPLICATION_PATH))); // 根目录
 defined('APPLICATION_ENV') || define('APPLICATION_ENV', 'developer');
 defined('APPLICATION_ENV') || define('APPLICATION_ENV', 'developer');