Merge branch 'release' into 'master'

# Conflicts:
#   index.php

Application/Common/Conf/config.php

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

Application/Common/Conf/db.php

 <?php
-// return array(
-//    'DB_TYPE' => 'mysql',
-//    'DB_HOST' => 'izhidaicbc2.mysql.rds.aliyuncs.com',
-//    'DB_PORT' => '3306',
-//    'DB_NAME' => 'project_citic_20210413_mdrt3', // <--- 修改这里
-//    'DB_USER' => 'zhida', // <--- 修改这里
-//    'DB_PWD' => 'zhida_app_1212', // <--- 修改这里
-//    'DB_PREFIX' => '',
-//    'DB_CHARSET' => 'utf8mb4',
+return array(
+   'DB_TYPE' => 'mysqli',
+   'DB_HOST' => 'mysql-sh',
+   'DB_PORT' => '3306',
+   'DB_NAME' => 'project_citic_20210430_mdrt4', // <--- 修改这里
+   'DB_USER' => 'zhida', // <--- 修改这里
+   'DB_PWD' => 'zhida_app_1212', // <--- 修改这里
+   'DB_PREFIX' => '',
+   'DB_CHARSET' => 'utf8mb4',
    
-// );
+);
 
-return array(
-    'DB_TYPE' => 'mysqli',
-    'DB_HOST' => 'mariadb',
-    'DB_PORT' => '3306',
-    'DB_NAME' => 'dev_citic_20210429_mdrt4', // <--- 修改这里
-    'DB_USER' => 'dev', // <--- 修改这里
-    'DB_PWD' => '1q2w3e', // <--- 修改这里
-    'DB_PREFIX' => '',
-    'DB_CHARSET' => 'utf8mb4',
+// return array(
+//     'DB_TYPE' => 'mysqli',
+//     'DB_HOST' => 'mariadb',
+//     'DB_PORT' => '3306',
+//     'DB_NAME' => 'dev_citic_20210429_mdrt4', // <--- 修改这里
+//     'DB_USER' => 'dev', // <--- 修改这里
+//     'DB_PWD' => '1q2w3e', // <--- 修改这里
+//     'DB_PREFIX' => '',
+//     'DB_CHARSET' => 'utf8mb4',
 
-);
+// );

Application/Home/View/default/layout.tpl

@@ -9,7 +9,7 @@
     <meta name="format-detection" content="telephone=no">
     {:assign var=projectId value=0}
     {:assign var=rem value=false}
-    {:assign var=version value='5.0.4'}
+    {:assign var=version value='5.0.5'}
     {:block name='projectx'}{:/block}
     {:if $rem == true}
     <meta name="viewport" content="width=device-width, minimum-scale=1, maximum-scale=1, user-scalable=no">

index.php

@@ -19,6 +19,6 @@ define('APP_PATH', 'Application/');
 define('RUNTIME_PATH', WEB_ROOT_PATH . '/Runtime/');
 define('DATA_PATH', WEB_ROOT_PATH . '/Data/');
 define('THINK_PATH', WEB_ROOT_PATH . '/../framework/ThinkPHP_3.2.h/');
-define('APP_DEBUG', true); // @readme <-- 上线后修改这里
+define('APP_DEBUG', false); // @readme <-- 上线后修改这里
 // 引入ThinkPHP入口文件
 require THINK_PATH. '/ThinkPHP.php';