w3yyb · w3yyb · Nov 23, 2016 · Nov 23, 2016 · Nov 23, 2016 · Nov 23, 2016
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+*.css linguist-language=php
diff --git a/README.md b/README.md
@@ -1,7 +1,9 @@
-phalphp 
+phalphp    
 =================
+v2.0
 
  基于phalcon框架的PHP应用，可用于Restful API,命令行应用及Web应用。
+ 支持分模块，支持访问权限控制，行为日志记录
 
 A PHP  application  for APIs,cli,and webapp using the Phalcon framework.
 

diff --git a/api/.htaccess b/api/.htaccess
@@ -0,0 +1,8 @@
+AddDefaultCharset UTF-8
+
+<IfModule mod_rewrite.c>
+    RewriteEngine On
+    RewriteCond %{REQUEST_FILENAME} !-d
+    RewriteCond %{REQUEST_FILENAME} !-f
+    RewriteRule ^(.*)$ index.php?_url=/$1 [QSA,L]
+</IfModule>
diff --git a/public/api.php → api/index.php b/public/api.php → api/index.php
@@ -5,15 +5,16 @@
  * Driver for PHP HMAC Restful API using PhalconPHP's Micro framework
  * 
  * @package None
- * @author Lenix 
+ * @author Itv 
  * @license none
  */
 
 
 // Setup configuration files
 $dir = dirname(__DIR__);
 $appDir = $dir . '/app';
-
+$apiDir = $dir . '/app/modules/Api';
+define('API_PATH',$apiDir);
 // Necessary requires to get things going
 require $appDir . '/library/utilities/debugapi/PhpError.php';
 require $appDir . '/library/interfaces/IRun.php';
@@ -23,13 +24,14 @@
 register_shutdown_function(['Utilities\Debugapi\PhpError','runtimeShutdown']);
 
 // Necessary paths to autoload & config settings
-$configPath = $appDir . '/config/';
-$config = $configPath . 'config.php';
-$autoLoad = $configPath . 'autoload-api.php';
-$routes = $configPath . 'routes-api.php';
-
-use \Models\Api as Api;
-
+$configPath = $apiDir . '/config/';
+$configfile = $apiDir . '/config/';
+$config = $appDir . '/config/config.php';
+$autoLoad = $configPath . 'autoload.php';
+$routes = $configPath . 'routes.php';
+
+use Models\Api as Api;
+use Models\Monitorsolution as Monitorsolution;
 try {
 	$app = new Application\Micro();
 
@@ -46,7 +48,7 @@
 	$hash = $app->request->getHeader('API_HASH');
 
 	$privateKey = Api::findFirst($clientId)->private_key;
-	
+
         switch ($_SERVER['REQUEST_METHOD']) {
 
             case 'GET':
@@ -66,7 +68,7 @@
 
 	// Setup HMAC Authentication callback to validate user before routing message
 	// Failure to validate will stop the process before going to proper Restful Route
-	$app->setEvents(new \Events\Api\HmacAuthenticate($message, $privateKey));	
+	$app->setEvents(new \Events\Api\HmacAuthenticate($message, $privateKey));
 
 	// Setup RESTful Routes
 	$app->setRoutes($routes);

diff --git a/app/cache/_library_webserver_documents_phalcon-framework_app_views_admin_index.volt.php b/app/cache/_library_webserver_documents_phalcon-framework_app_views_admin_index.volt.php
diff --git a/app/cache/_library_webserver_documents_phalcon-framework_app_views_index.volt.php b/app/cache/_library_webserver_documents_phalcon-framework_app_views_index.volt.php
diff --git a/app/cache/volt/index.html b/app/cache/volt/index.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<title>new page 1</title>
+</head>
+
+<body>
+
+
+</body>
+</html>
+
+
diff --git a/app/config/config.php b/app/config/config.php
@@ -4,19 +4,43 @@
  * api & cli & webapp
  * Settings to be stored in dependency injector
  */
-
+//define('APP_MODULE_LIST','Admin,Api');
+//define('ADMIN_MODULE','Admin');
+//define('API_MODULE','Admin');
+//define('APP_MODULE_PATH','Modules');
 return [
 	'database' => array(
 		'adapter' => 'Mysql', /* Possible Values: Mysql, Postgres, Sqlite */
 		'host' => 'localhost',
 		'username' => 'root',
-		'password' => '39552041',
-		'name' => 'phalconframework',
+		'password' => '111111',
+		'name' => 'database',
 		'port' => 3306
     ),
+	'db2' => array(
+		'adapter'     => 'Mysql',
+		'host'        => 'localhost',
+		'username'    => 'root',
+		'password'    => '111111!',
+		'name'      => 'database',
+		'port' => 3306,
+		'tablePrefix' => 'smt_'
+	),
+	'logdb' => array(
+		'adapter' => 'Mysql', /* Possible Values: Mysql, Postgres, Sqlite */
+		'host' => 'localhost',
+		'username' => 'root',
+		'password' => '111111!',
+		'name' => 'database',
+		'port' => 3306
+	),
     'app' => array(
-       'debug' => FALSE
-    )
+        'debug' => false,
+        'publicKey' => 'uitv'
+    ),
+	'tasktime' => 5,
+	'communityset' => 1, //1开启，0关闭
+   'serverowner'=>array('1'=>'a','2'=>'b','3'=>'c')
 
 ];
-
+  
diff --git a/app/config/routes-api.php b/app/config/routes-api.php
diff --git a/app/controllers/AdminController.php b/app/controllers/AdminController.php
diff --git a/app/controllers/ControllerBase.php b/app/controllers/ControllerBase.php
diff --git a/app/controllers/IndexController.php b/app/controllers/IndexController.php
diff --git a/app/controllers/LoginController.php b/app/controllers/LoginController.php