Merge branch 'master' of git.iacode.cn:php/citic-fighting

Application/Common/Conf/config.php

@@ -13,8 +13,8 @@ return array(
     'AUTH_CLIENT_ID' => 'zhida_app',
     'AUTH_CLIENT_PASSWORD' => 'izhida',
     /* CDN路径配置。配置之后可以在模版文件中使用__CDN__ */
-    // '__CDN__' => 'https://static.iacode.cn/cdn/citic-fighting/tag/dc668d2753/Public/static',
-    '__CDN__' => '/Public/static', // @readme <-- 上线时修改这里
+    '__CDN__' => 'https://static.iacode.cn/cdn/citic-fighting/tag/dc668d2754/Public/static',
+    // '__CDN__' => '/Public/static', // @readme <-- 上线时修改这里
     'URL_MODEL' => 3,
     'STORAGE_PATH' => WEB_ROOT_PATH . '/Data/Storage',
     'DEFAULT_FILTER' => '', // 默认参数过滤方法 用于I函数...。注意这块不能修改！！！！