|
@@ -219,26 +219,19 @@ class Register
|
|
|
Register::set($cacheName, $config);
|
|
|
}
|
|
|
|
|
|
- /**
|
|
|
- * 合并ini文件生成的数组
|
|
|
- * @param String $iniFile ini文件名
|
|
|
- * @param Array $array
|
|
|
- */
|
|
|
- public static function mergeAppConfigure($iniFile, $array)
|
|
|
- {
|
|
|
- if (!is_array($array)) return;
|
|
|
- $config = Register::getIniConfigure($iniFile);
|
|
|
-
|
|
|
- $environs = Register::get(Consts::APP_ENVIRONS, array());
|
|
|
-
|
|
|
- $cacheName = basename($iniFile);
|
|
|
- if (isset($environs[$cacheName])) {
|
|
|
- $environ = $environs[$cacheName];
|
|
|
- $cacheName = $environ . '.' . $cacheName;
|
|
|
- }
|
|
|
- $config = array_merge($config, $array);
|
|
|
- Register::set($cacheName, $config);
|
|
|
- }
|
|
|
+ /**
|
|
|
+ * 合并ini文件生成的数组
|
|
|
+ * @param String $iniFile ini文件名
|
|
|
+ * @param Array $array
|
|
|
+ */
|
|
|
+ public static function mergeAppConfigure($iniFile, $array)
|
|
|
+ {
|
|
|
+ if (!is_array($array)) return;
|
|
|
+ $config = Register::getIniConfigure($iniFile);
|
|
|
+ $cacheName = Register::getCacheName($iniFile);
|
|
|
+ $config = self::array_merge_recursive_distinct($config, $array);
|
|
|
+ Register::set($cacheName, $config);
|
|
|
+ }
|
|
|
|
|
|
/**
|
|
|
* 获取配置ini文件
|