Merge branch 'master' into 'release'

Master

See merge request !5

Application/Common/Conf/config.php

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

Application/Home/View/default/layout.tpl

@@ -71,7 +71,7 @@
             language: (navigator.browserLanguage || navigator.language).toLowerCase()
             language: (navigator.browserLanguage || navigator.language).toLowerCase()
         }
         }
     </script>
     </script>
-    <title>{:block name='title'}热火战三月春季攻势活力推荐官{:/block}</title>
+    <title>{:block name='title'}热火战三月活力推荐官{:/block}</title>
     {:if $projectId &&  strpos( $smarty.server.HTTP_HOST , 'dev.iacode.cn') !== false}
     {:if $projectId &&  strpos( $smarty.server.HTTP_HOST , 'dev.iacode.cn') !== false}
     <link rel="stylesheet" type="text/css"
     <link rel="stylesheet" type="text/css"
           href="http://projectx.dev.iacode.cn/api/css/rem/{:$rem}/id/{:$projectId}?version={:$version}" media="all" />
           href="http://projectx.dev.iacode.cn/api/css/rem/{:$rem}/id/{:$projectId}?version={:$version}" media="all" />