Update Class

Qii/Base/Controller.php

@@ -4,6 +4,11 @@
  */
 namespace Qii\Base;
 
+use \Qii\Autoloader\Psr4;
+
+use \Qi\Config\Register;
+use \Qi\Config\Consts;
+
 /**
  * Qii_Controller_Abstract class
  * @author Zhu Jinhui
@@ -68,8 +73,8 @@ abstract class Controller
 
     public function __construct()
     {
-        $this->load = \Qii\Autoloader\Psr4::getInstance()->loadClass('\Qii\Autoloader\Loader');
-        $this->request = \Qii\Autoloader\Psr4::getInstance()->loadClass('\Qii\Request\Http');
+        $this->load = Psr4::getInstance()->loadClass('\Qii\Autoloader\Loader');
+        $this->request = Psr4::getInstance()->loadClass('\Qii\Request\Http');
         $this->controllerId = $this->request->controller;
         $this->actionId = $this->request->action;
         //载入model
@@ -109,7 +114,7 @@ abstract class Controller
         if (!$policy) {
             $policy = array_merge($policy, $viewConfigure[$engine]);
         }
-        $viewEngine = \Qii\Autoloader\Psr4::getInstance()->loadClass('\Qii\View\Loader');
+        $viewEngine = Psr4::getInstance()->loadClass('\Qii\View\Loader');
         $viewEngine->setView($engine, $policy);
         $this->view = $viewEngine->getView();
         if(method_exists($this, 'initView'))
@@ -147,7 +152,7 @@ abstract class Controller
     {
         $data = array();
         if (!$cache) return $data;
-        $cacheInfo = \Qi\Config\Register::getAppConfigure(\Qi\Config\Register::get(\Qii\Config\Consts::APP_INI_FILE), $cache);
+        $cacheInfo = Register::getAppConfigure(Register::get(Consts::APP_INI_FILE), $cache);
         if (!$cacheInfo) return $data;
 
         $servers = explode(";", $cacheInfo['servers']);
@@ -162,7 +167,7 @@ abstract class Controller
      */
     final public function enableDB()
     {
-        return $this->db = \Qii\Autoloader\Psr4::getInstance()->loadClass('\Qii\Driver\Model');
+        return $this->db = Psr4::getInstance()->loadClass('\Qii\Driver\Model');
     }
 
     /**

Qii/Base/Dispatcher.php

@@ -1,6 +1,9 @@
 <?php
 namespace Qii\Base;
 
+use \Qii\Config\Register;
+use \Qii\Config\Consts;
+
 class Dispatcher
 {
     public $request;
@@ -31,7 +34,7 @@ class Dispatcher
         $controller = $controller != '' ? $controller : $this->request->getControllerName();
         $action = $action != '' ? $action : $this->request->getActionName();
 
-        $controllerName = \Qii\Config\Register::get(\Qii\Config\Consts::APP_DEFAULT_CONTROLLER_PREFIX) . '_' . $controller;
+        $controllerName = Register::get(Consts::APP_DEFAULT_CONTROLLER_PREFIX) . '_' . $controller;
         $funcArgs = array();
         if (count($args) > 2) {
             $funcArgs = array_slice($args, 2);
@@ -54,8 +57,8 @@ class Dispatcher
             $actionCls->actionId = $action;
             $actionCls->controllerId = $controllerCls->controllerId;
             //支持多个action对应到同一个文件，如果对应的文件中存在指定的方法就直接调用
-            if (method_exists($actionCls, $action . \Qii\Config\Register::get(\Qii\Config\Consts::APP_DEFAULT_ACTION_SUFFIX))) {
-                $actionCls->response = $response = call_user_func_array(array($actionCls, $action. \Qii\Config\Register::get(\Qii\Config\Consts::APP_DEFAULT_ACTION_SUFFIX)), $funcArgs);
+            if (method_exists($actionCls, $action . Register::get(Consts::APP_DEFAULT_ACTION_SUFFIX))) {
+                $actionCls->response = $response = call_user_func_array(array($actionCls, $action. Register::get(Consts::APP_DEFAULT_ACTION_SUFFIX)), $funcArgs);
             }
             if (!method_exists($actionCls, 'run')) {
                 throw new \Qii\Exceptions\MethodNotFound(\Qii::i(1101, $controllerCls->actions[$action] . '->run'), __LINE__);
@@ -63,7 +66,7 @@ class Dispatcher
             $response = call_user_func_array(array($actionCls, 'run'), $funcArgs);
         } else {
             array_shift($funcArgs);
-            $actionName = $action . \Qii\Config\Register::get(\Qii\Config\Consts::APP_DEFAULT_ACTION_SUFFIX);
+            $actionName = $action . Register::get(Consts::APP_DEFAULT_ACTION_SUFFIX);
             if (!method_exists($controllerCls, $actionName) && !method_exists($controllerCls, '__call')) {
                 throw new \Qii\Exceptions\MethodNotFound(\Qii::i(1101, $controller . '->' . $actionName), __LINE__);
             }

Qii/Cache/Memcache.php

@@ -74,7 +74,7 @@ class Memcache implements Intf
             $this->_default_policy['servers'][] = $this->_default_server;
         }
         if (!isset($this->_default_policy['persistent'])) $this->_default_policy['persistent'] = '';
-        $this->_conn = new Memcache();
+        $this->_conn = new \Memcache();
         foreach ($this->_default_policy['servers'] as $server) {
             $result = $this->_conn->addServer($server['host'], $server['port'], $this->_default_policy['persistent']);
             if (!$result) {

Qii/Config/Register.php

@@ -18,6 +18,7 @@
 namespace Qii\Config;
 
 use \Qii\Application;
+use \Qii\Autoloader\Psr4;
 
 use \Qii\Config\Register;
 use \Qii\Config\Consts;
@@ -43,8 +44,8 @@ class Register
 	 */
 	public static function set($key, $val, $overwrite = true)
 	{
-		if (!\Qii\Config\Register::isValid($key, $overwrite)) \Qii\Application::_e('Overwrite', $key, __LINE__);
-		\Qii\Config\Register::$_cache[$key] = $val;
+		if (!Register::isValid($key, $overwrite)) \Qii\Application::_e('Overwrite', $key, __LINE__);
+		Register::$_cache[$key] = $val;
 	}
 
 	/**
@@ -56,9 +57,9 @@ class Register
 	 */
 	public static function add($index, $key, $val)
 	{
-		$added = \Qii\Config\Register::get(\Qii\Config\Consts::APP_LOADED_FILE, array());
+		$added = Register::get(Consts::APP_LOADED_FILE, array());
 		$added[$index][$key] = $val;
-		\Qii\Config\Register::$_cache[$index] = $added;
+		Register::$_cache[$index] = $added;
 	}
 
 	/**
@@ -67,8 +68,8 @@ class Register
 	 */
 	public static function remove($key)
 	{
-		if (!isset(\Qii\Config\Register::$_cache[$key])) return;
-		unset(\Qii\Config\Register::$_cache[$key]);
+		if (!isset(Register::$_cache[$key])) return;
+		unset(Register::$_cache[$key]);
 	}
 
 	/**
@@ -84,10 +85,10 @@ class Register
 		if (!$key) throw new \Qii\Exceptions\Variable(\Qii::i(1003), __LINE__);
 		//优先调用存在的get方法
 		$method = 'get' . $key;
-		if (method_exists('\Qii\Config\Register', $method)) return \Qii\Config\Register::$method();
+		if (method_exists('\Qii\Config\Register', $method)) return Register::$method();
 
-		if (isset(\Qii\Config\Register::$_cache[$key])) {
-			return \Qii\Config\Register::$_cache[$key];
+		if (isset(Register::$_cache[$key])) {
+			return Register::$_cache[$key];
 		}
 		return $default;
 	}
@@ -102,7 +103,7 @@ class Register
 	public static function __callStatic($method, $argvs)
 	{
 		$default = array_shift($argvs);
-		return \Qii\Config\Register::get($method, $default);
+		return Register::get($method, $default);
 	}
 
 	/**
@@ -116,7 +117,7 @@ class Register
 		foreach ($array AS $key => $value) {
 			$keys = explode('.', $key);
 			if (is_array($value)) {
-				$string = "\$data['" . join("']['", $keys) . "']=" . var_export(\Qii\Config\Register::feval($value), true) . ";";
+				$string = "\$data['" . join("']['", $keys) . "']=" . var_export(Register::feval($value), true) . ";";
 			} else {
 				$string = "\$data['" . join("']['", $keys) . "']='" . $value . "';";
 			}
@@ -133,12 +134,12 @@ class Register
 	 */
 	public static function ini($fileName)
 	{
-		if (!$fileName) throw new Qii_Exceptions_Variable(\Qii::i(1408), __LINE__);
+		if (!$fileName) throw new \Qii\Exceptions\Variable(\Qii::i(1408), __LINE__);
 		$ini = parse_ini_file($fileName, true);
-		if (!$ini) throw new \Qii_Exceptions_InvalidFormat($fileName, __LINE__);
+		if (!$ini) throw new \Qii\Exceptions\InvalidFormat($fileName, __LINE__);
 		$config = array();
 		foreach ($ini AS $namespace => $properties) {
-			$properties = \Qii\Config\Register::feval($properties);
+			$properties = Register::feval($properties);
 			$extends = '';
 			$name = $namespace;
 			$namespaces = array();
@@ -171,7 +172,7 @@ class Register
 	public static function getCacheName($iniFile)
 	{
 		$cacheName = basename($iniFile);
-		$environs = \Qii\Config\Register::get(\Qii\Config\Consts::APP_ENVIRONS, array());
+		$environs = Register::get(Consts::APP_ENVIRONS, array());
 		if (isset($environs[$cacheName])) {
 			$environ = $environs[$cacheName];
 			$cacheName = $environ . '.' . $cacheName;
@@ -187,10 +188,10 @@ class Register
 	 */
 	public static function rewriteConfig($iniFile, $key, $val)
 	{
-		$config = \Qii\Config\Register::getIniConfigure($iniFile);
-		$cacheName = \Qii\Config\Register::getCacheName($iniFile);
+		$config = Register::getIniConfigure($iniFile);
+		$cacheName = Register::getCacheName($iniFile);
 		$config[$key] = $val;
-		\Qii\Config\Register::set($cacheName, $config);
+		Register::set($cacheName, $config);
 	}
 	/**
 	 * 删除ini配置文件中对应的key
@@ -199,10 +200,10 @@ class Register
 	 */
 	public static function removeAppConfigure($iniFile, $key)
 	{
-		$config = \Qii\Config\Register::getIniConfigure($iniFile);
-		$cacheName = \Qii\Config\Register::getCacheName($iniFile);
+		$config = Register::getIniConfigure($iniFile);
+		$cacheName = Register::getCacheName($iniFile);
 		unset($config[$key]);
-		\Qii\Config\Register::set($cacheName, $config);
+		Register::set($cacheName, $config);
 	}
 
 	/**
@@ -213,9 +214,9 @@ class Register
 	public static function mergeAppConfigure($iniFile, $array)
 	{
 		if (!is_array($array)) return;
-		$config = \Qii\Config\Register::getIniConfigure($iniFile);
+		$config = Register::getIniConfigure($iniFile);
 
-		$environs = \Qii\Config\Register::get(\Qii\Config\Consts::APP_ENVIRONS, array());
+		$environs = Register::get(Consts::APP_ENVIRONS, array());
 
 		$cacheName = basename($iniFile);
 		if (isset($environs[$cacheName])) {
@@ -223,7 +224,7 @@ class Register
 			$cacheName = $environ . '.' . $cacheName;
 		}
 		$config = array_merge($config, $array);
-		\Qii\Config\Register::set($cacheName, $config);
+		Register::set($cacheName, $config);
 	}
 
 	/**
@@ -235,23 +236,23 @@ class Register
 	public static function setConfig($iniFile, $environ = 'product')
 	{
 		$cacheName = basename($iniFile);
-		$environs = \Qii\Config\Register::get(\Qii\Config\Consts::APP_ENVIRONS, array());
+		$environs = Register::get(Consts::APP_ENVIRONS, array());
 		$environs[$cacheName] = $environ;
-		\Qii\Config\Register::set(\Qii\Config\Consts::APP_ENVIRONS, $environs);
+		Register::set(Consts::APP_ENVIRONS, $environs);
 
 		$cacheName = $environ . '.' . $cacheName;
 		if (!is_file($iniFile)) return false;
-		$cacheFile = \Qii\Autoloader\Psr4::getInstance()->getFileByPrefix(\Qii\Config\Register::get(\Qii\Config\Consts::APP_CACHE_PATH) . DS . $cacheName . '.php');
-		if (\Qii\Config\Register::get(\Qii\Config\Consts::APP_CACHE_PATH)) {
+		$cacheFile = Psr4::getInstance()->getFileByPrefix(Register::get(Consts::APP_CACHE_PATH) . DS . $cacheName . '.php');
+		if (Register::get(Consts::APP_CACHE_PATH)) {
 			if (is_file($cacheFile)) {
 				if (filemtime($cacheFile) == filemtime($iniFile)) {
 					$common = include($cacheFile);
-					\Qii\Config\Register::set($cacheName, $common);
+					Register::set($cacheName, $common);
 					return $common;
 				}
 			}
 		}
-		$array = \Qii\Config\Register::ini($iniFile);
+		$array = Register::ini($iniFile);
 		if (!$array) return false;
 
 		$common = $array['common'];
@@ -264,7 +265,7 @@ class Register
 			file_put_contents($cacheFile, "<?php \n return " . var_export($common, true) . "\n?>", LOCK_EX);
 			touch($iniFile);
 		}
-		\Qii\Config\Register::set($cacheName, $common);
+		Register::set($cacheName, $common);
 		return $common;
 	}
 
@@ -277,7 +278,7 @@ class Register
 	 */
 	public static function setAppConfigure($iniFile, $environ = 'product')
 	{
-		return \Qii\Config\Register::setConfig($iniFile, $environ);
+		return Register::setConfig($iniFile, $environ);
 	}
 
 	/**
@@ -288,11 +289,11 @@ class Register
 	public static function getIniConfigure($fileName)
 	{
 		$cacheName = basename($fileName);
-		$environs = \Qii\Config\Register::get(\Qii\Config\Consts::APP_ENVIRONS, array());
+		$environs = Register::get(Consts::APP_ENVIRONS, array());
 		if (isset($environs[$cacheName])) {
 			$cacheName = $environs[$cacheName] . '.' . $cacheName;
 		}
-		return \Qii\Config\Register::get($cacheName);
+		return Register::get($cacheName);
 	}
 
 	/**
@@ -300,9 +301,9 @@ class Register
 	 *
 	 * @return Array
 	 */
-	public static function getAppConfigure($iniFile = \Qii\Config\Consts::APP_INI, $key = NULL)
+	public static function getAppConfigure($iniFile = Consts::APP_INI, $key = NULL)
 	{
-		$appConfigure = \Qii\Config\Register::getIniConfigure($iniFile);
+		$appConfigure = Register::getIniConfigure($iniFile);
 		if ($key == null) return $appConfigure;
 		return isset($appConfigure[$key]) ? $appConfigure[$key] : NULL;
 	}
@@ -317,7 +318,7 @@ class Register
 	public static function isValid($key, $overwrite = false)
 	{
 		if ($overwrite) return true;
-		if (isset(\Qii\Config\Register::$_cache[$key])) return false;
+		if (isset(Register::$_cache[$key])) return false;
 		return true;
 	}
 
@@ -327,9 +328,9 @@ class Register
 	 */
 	public static function getAppEnviron()
 	{
-		return isset(\Qii\Config\Register::$_cache[\Qii\Config\Consts::APP_ENVIRON]) ?
-                    \Qii\Config\Register::$_cache[\Qii\Config\Consts::APP_ENVIRON]
-                    : \Qii\Config\Consts::APP_DEFAULT_ENVIRON;
+		return isset(Register::$_cache[Consts::APP_ENVIRON]) ?
+                    Register::$_cache[Consts::APP_ENVIRON]
+                    : Consts::APP_DEFAULT_ENVIRON;
 	}
 
 	public function __call($method, $argvs)

Qii/Config/Setting.php

@@ -1,9 +1,15 @@
 <?php
-namespace Qii\Config;
 /**
  * 系统设置
  *
  */
+namespace Qii\Config;
+
+use \Qii\Autoloader\Psr4;
+
+use \Qii\Config\Register;
+use \Qii\Config\Consts;
+
 class Setting
 {
     protected static $instance;
@@ -33,7 +39,7 @@ class Setting
      */
     public function setDefaultLanguage()
     {
-        $this->language = \Qii\Autoloader\Psr4::getInstance()->loadClass('\Qii\Language\Loader');
+        $this->language = Psr4::getInstance()->loadClass('\Qii\Language\Loader');
         //加载语言包
         $this->language->load('error', Qii_DIR);
         $this->language->load('exception', Qii_DIR);
@@ -59,12 +65,12 @@ class Setting
     public function setDefaultControllerAction()
     {
         //设置默认controller及controller方法前缀
-        \Qii\Config\Register::set(\Qii\Config\Consts::APP_DEFAULT_CONTROLLER, \Qii::getInstance()->appConfigure('controller')['default']);
-        \Qii\Config\Register::set(\Qii\Config\Consts::APP_DEFAULT_CONTROLLER_PREFIX, \Qii::getInstance()->appConfigure('controller')['prefix']);
+        Register::set(Consts::APP_DEFAULT_CONTROLLER, \Qii::getInstance()->appConfigure('controller')['default']);
+        Register::set(Consts::APP_DEFAULT_CONTROLLER_PREFIX, \Qii::getInstance()->appConfigure('controller')['prefix']);
 
         //设置默认action及方法名后缀
-        \Qii\Config\Register::set(\Qii\Config\Consts::APP_DEFAULT_ACTION, \Qii::getInstance()->appConfigure('action')['default']);
-        \Qii\Config\Register::set(\Qii\Config\Consts::APP_DEFAULT_ACTION_SUFFIX, \Qii::getInstance()->appConfigure('action')['suffix']);
+        Register::set(Consts::APP_DEFAULT_ACTION, \Qii::getInstance()->appConfigure('action')['default']);
+        Register::set(Consts::APP_DEFAULT_ACTION_SUFFIX, \Qii::getInstance()->appConfigure('action')['suffix']);
         return $this;
     }
 

private/configure/db.ini

@@ -9,17 +9,17 @@ use_db_driver = mysql
 master[db] = wecv
 master[host] = 127.0.0.1
 master[user] = root
-master[password] = A119328118a
+master[password] = 119328118
 
 slave[0.db] = istudy
 slave[0.host] = 127.0.0.1
 slave[0.user] = wecv
-slave[0.password] = A119328118a
+slave[0.password] = 119328118
 
 
 slave[1.db] = istudy
 slave[1.host] = 127.0.0.1
 slave[1.user] = wecv
-slave[1.password] = A119328118a
+slave[1.password] = 119328118
 
 [product:common]