调整文件的目录结构

README.md

@@ -61,7 +61,7 @@
 			}
 		}
 		第二步，使用user_model
-		class user_controler extends Qii_Controller_Abstract
+		class user_controler extends \Qii\Controller\Abstract
 		{
 			public function __construct()
 			{
@@ -186,7 +186,7 @@
 		}
 		第三步，使用user_model：
 		
-		class index_controller extends Qii_Controller_Abstract
+		class index_controller extends \Qii\Controller\Abstract
 		{
 			public function __construct()
 			{
@@ -197,7 +197,7 @@
 		}
 	7) View的支持
 		view支持smarty及php
-		class index_controller extends Qii_Controller_Abstract
+		class index_controller extends \Qii\Controller\Abstract
 		{
 			public function __construct()
 			{
@@ -206,7 +206,7 @@
 			}
 		}
 	8) Controller的使用
-	class test_controller extends Qii_Controller_Abstract
+	class test_controller extends \Qii\Controller\Abstract
 	{
 		//为了避免Controller逻辑过于复杂，可以将Action拆到单独的文件
 		//当在调用dummy方法的时候会自动执行actions/dummy_action.php中的execute方法

_cli.php

@@ -74,7 +74,7 @@ class cmd
                 //创建目录工作区目录
                 if(!is_dir($param['workspace'] . '/public'))
                 {
-                    mkdir($param['workspace'] . '/public', 0755);
+                    mkdir($param['workspace'] . '/public', 0777);
                 }
                 foreach ($this->dir AS $d) {
                     $path = $param['workspace'] . '/private/' . $d;
@@ -126,7 +126,7 @@ class cmd
                 //--获取文件的相对路径
                 $realPath = $this->getRealPath($param['workspace']);
                 $this->stdout("真实路径 " . $realPath . "\n");
-                $QiiPath = $this->getRelatePath($realPath . "/index.php", dirname(__FILE__) . "/Qii/Qii.php");
+                $QiiPath = $this->getRelatePath($realPath . "/index.php", dirname(__FILE__) . "/src/Qii.php");
                 $this->stdout("Qii 路径 " . $QiiPath . "\n");
                 $date = date("Y/m/d H:i:s");
                 $indexPage = array();
@@ -292,7 +292,7 @@ class cmd
      */
     public function stdout($string)
     {
-        if(OS == 'WIN') $string = iconv('utf-8', 'gbk', $string);
+        if(strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') $string = iconv('utf-8', 'gbk', $string);
         fwrite(\STDOUT, $string);
     }
 }

private/plugins/loger.php → demo/private/plugins/loger.php

@@ -1,5 +1,6 @@
 <?php
-namespace Plugins;
+namespace plugins;
+
 class loger implements \Qii\Loger\Writer
 {
 	public $logerPath = 'tmp';

demo/private/tmp/compile/b541b7081a689b2c42974c2e59535e792944d246_0.file.index.tpl.php

@@ -0,0 +1,26 @@
+<?php
+/* Smarty version 3.1.30, created on 2017-06-28 15:56:16
+  from "E:\WebRoot\Qii\private\Controller\view\index.tpl" */
+
+/* @var Smarty_Internal_Template $_smarty_tpl */
+if ($_smarty_tpl->_decodeProperties($_smarty_tpl, array (
+  'version' => '3.1.30',
+  'unifunc' => 'content_59536120543292_82164805',
+  'has_nocache_code' => false,
+  'file_dependency' => 
+  array (
+    'b541b7081a689b2c42974c2e59535e792944d246' => 
+    array (
+      0 => 'E:\\WebRoot\\Qii\\private\\Controller\\view\\index.tpl',
+      1 => 1498636237,
+      2 => 'file',
+    ),
+  ),
+  'includes' => 
+  array (
+  ),
+),false)) {
+function content_59536120543292_82164805 (Smarty_Internal_Template $_smarty_tpl) {
+?>
+This is tpl from controller dir<?php }
+}

demo/private/tmp/product.app.ini.php

@@ -0,0 +1,108 @@
+<?php 
+ return array (
+  'namespace' => 
+  array (
+    'use' => '1',
+    'list' => 
+    array (
+      'controller' => '1',
+      'model' => '1',
+      'library' => '1',
+      'action' => '1',
+    ),
+  ),
+  'rewriteMethod' => 'Short',
+  'rewriteRules' => 'Normal',
+  'admin' => 
+  array (
+    'user' => 'admin',
+    'password' => '119328118',
+  ),
+  'debug' => '1',
+  'errorPage' => 'Error:Index',
+  'timezone' => 'Asia/Shanghai',
+  'contentType' => 'text/html',
+  'charset' => 'UTF-8',
+  'view' => 
+  array (
+    'engine' => 'smarty',
+    'path' => 'view',
+    'smarty' => 
+    array (
+      'view' => 'view',
+      'path' => 'view',
+      'ldelimiter' => '{#',
+      'rdelimiter' => '#}',
+      'compile' => 'tmp/compile',
+      'cache' => 'tmp/cache',
+      'lifetime' => '300',
+    ),
+  ),
+  'cache' => 'memcache',
+  'security' => 
+  array (
+    'enable' => '1',
+    'name' => 'security_sid',
+    'expired' => '3600',
+    'key' => '4cd780a986d5c30e03bdcb67d16c8320',
+  ),
+  'memcache' => 
+  array (
+    'servers' => '127.0.0.1',
+    'ports' => '11211',
+  ),
+  'xpath' => 
+  array (
+    0 => 'controller',
+    1 => 'model',
+    2 => 'class',
+    3 => 'plugin',
+  ),
+  'query' => 
+  array (
+    0 => 'controller',
+    1 => 'action',
+    2 => 'param',
+  ),
+  'controller' => 
+  array (
+    'name' => 'controller',
+    'prefix' => 'controller',
+    'default' => 'index',
+  ),
+  'action' => 
+  array (
+    'name' => 'action',
+    'suffix' => 'Action',
+    'default' => 'index',
+  ),
+  'password' => '119328118',
+  'uri' => 
+  array (
+    'mode' => 'short',
+    'controllerName' => 'controller',
+    'actionName' => 'action',
+    'normal' => 
+    array (
+      'mode' => 'normal',
+      'trim' => '0',
+      'symbol' => '&',
+      'extenstion' => '.html',
+    ),
+    'middle' => 
+    array (
+      'mode' => 'middle',
+      'trim' => '1',
+      'symbol' => '/',
+      'extenstion' => '.html',
+    ),
+    'short' => 
+    array (
+      'mode' => 'short',
+      'trim' => '1',
+      'symbol' => '/',
+      'extenstion' => '.html',
+    ),
+  ),
+)
+?>

demo/private/tmp/product.db.ini.php

@@ -0,0 +1,32 @@
+<?php 
+ return array (
+  'readOrWriteSeparation' => '0',
+  'driver' => 'pdo',
+  'debug' => '1',
+  'use_db_driver' => 'mysql',
+  'master' => 
+  array (
+    'db' => 'wecv',
+    'host' => '127.0.0.1',
+    'user' => 'root',
+    'password' => 'A119328118a',
+  ),
+  'slave' => 
+  array (
+    0 => 
+    array (
+      'db' => 'istudy',
+      'host' => '127.0.0.1',
+      'user' => 'wecv',
+      'password' => 'A119328118a',
+    ),
+    1 => 
+    array (
+      'db' => 'istudy',
+      'host' => '127.0.0.1',
+      'user' => 'wecv',
+      'password' => 'A119328118a',
+    ),
+  ),
+)
+?>

public/index.php → demo/public/index.php

@@ -1,11 +1,12 @@
 <?php
-require_once('../Qii/Qii.php');
+require_once('../../src/Qii.php');
+
 $app = \Qii::getInstance();
 $app->setWorkspace('../private')
 ->setCachePath('tmp')
 ->setAppConfigure('configure/app.ini')
 ->setUseNamespace('Bootstrap', false)
-->setLoger('Plugins\loger')
+->setLoger('plugins\loger')
 ->setDB('configure/db.ini')
 ->setRouter('configure/router.config.php')
 ->setBootstrap()

Qii/Application.php → src/Application.php

@@ -270,10 +270,6 @@ class Application
      */
     public function setLoger($logerCls)
     {
-        if (!class_exists($logerCls, false)) {
-            throw new \Qii_Exceptions_ClassNotFound(Qii::i(1405, $logerCls), __LINE__);
-        }
-
         $this->logerWriter = Instance::instance(
             '\Qii\Loger\Instance',
             Instance::instance($logerCls)