Merge branch 'release' into 'master'

# Conflicts:
#   Application/Common/Conf/config.php

Application/Common/Conf/db.php

 <?php
 <?php
-// return array(
-//     'DB_TYPE' => 'mysqli',
-//     'DB_HOST' => 'mysql-sh',
-//     'DB_PORT' => '3306',
-//     'DB_NAME' => 'project_citic_20240626_fighting', // <--- 修改这里
-//     'DB_USER' => 'zhida', // <--- 修改这里
-//     'DB_PWD' => 'zhida_app_1212', // <--- 修改这里
-//     'DB_PREFIX' => '',
-//     'DB_CHARSET' => 'utf8mb4',
-   
-// );
-
 return array(
 return array(
     'DB_TYPE' => 'mysqli',
     'DB_TYPE' => 'mysqli',
-    'DB_HOST' => 'mariadb',
+    'DB_HOST' => 'mysql-sh',
     'DB_PORT' => '3306',
     'DB_PORT' => '3306',
-    'DB_NAME' => 'dev_citic_20240626_fighting', // <--- 修改这里
-    'DB_USER' => 'dev', // <--- 修改这里
-    'DB_PWD' => '1q2w3e', // <--- 修改这里
+    'DB_NAME' => 'project_citic_20240626_fighting', // <--- 修改这里
+    'DB_USER' => 'zhida', // <--- 修改这里
+    'DB_PWD' => 'zhida_app_1212', // <--- 修改这里
     'DB_PREFIX' => '',
     'DB_PREFIX' => '',
     'DB_CHARSET' => 'utf8mb4',
     'DB_CHARSET' => 'utf8mb4',
-
+   
 );
 );
+
+// return array(
+//     'DB_TYPE' => 'mysqli',
+//     'DB_HOST' => 'mariadb',
+//     'DB_PORT' => '3306',
+//     'DB_NAME' => 'dev_citic_20240626_fighting', // <--- 修改这里
+//     'DB_USER' => 'dev', // <--- 修改这里
+//     'DB_PWD' => '1q2w3e', // <--- 修改这里
+//     'DB_PREFIX' => '',
+//     'DB_CHARSET' => 'utf8mb4',
+
+// );