dos

Application/Common/Conf/config.php

@@ -13,7 +13,11 @@ return array(
     'AUTH_CLIENT_ID' => 'zhida_app',
     'AUTH_CLIENT_ID' => 'zhida_app',
     'AUTH_CLIENT_PASSWORD' => 'izhida',
     'AUTH_CLIENT_PASSWORD' => 'izhida',
     /* CDN路径配置。配置之后可以在模版文件中使用__CDN__ */
     /* CDN路径配置。配置之后可以在模版文件中使用__CDN__ */
+<<<<<<< HEAD
    '__CDN__' => 'http://cdn.iacode.cn/citic-mdrt4/v1.0.7/Public/static',
    '__CDN__' => 'http://cdn.iacode.cn/citic-mdrt4/v1.0.7/Public/static',
+=======
+    '__CDN__' => 'http://cdn.iacode.cn/citic-mdrt4/v1.0.6/Public/static',
+>>>>>>> 685ca97d8e33f630b7e49b9a3ea4bcbbac3970cd
     // '__CDN__' => '/Public/static', // @readme <-- 上线时修改这里
     // '__CDN__' => '/Public/static', // @readme <-- 上线时修改这里
     'URL_MODEL' => 3,
     'URL_MODEL' => 3,
     'STORAGE_PATH' => WEB_ROOT_PATH . '/Data/Storage',
     'STORAGE_PATH' => WEB_ROOT_PATH . '/Data/Storage',

Application/Common/Conf/db.php

 <?php
 <?php
 return array(
 return array(
+<<<<<<< HEAD
    'DB_TYPE' => 'mysqli',
    'DB_TYPE' => 'mysqli',
    'DB_HOST' => 'mysql-sh',
    'DB_HOST' => 'mysql-sh',
    'DB_PORT' => '3306',
    'DB_PORT' => '3306',
@@ -8,6 +9,16 @@ return array(
    'DB_PWD' => 'zhida_app_1212', // <--- 修改这里
    'DB_PWD' => 'zhida_app_1212', // <--- 修改这里
    'DB_PREFIX' => '',
    'DB_PREFIX' => '',
    'DB_CHARSET' => 'utf8mb4',
    'DB_CHARSET' => 'utf8mb4',
+=======
+    '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',
+>>>>>>> 685ca97d8e33f630b7e49b9a3ea4bcbbac3970cd
    
    
 );
 );