完善 System路径, 发布 v1.0

Author: zzfly256

App/Controller/apiController.php

@@ -9,78 +9,83 @@ class apiController extends Controller {
 
     public function testGet($id){
         $data = Demo::find($id);
-        return $this->response();
+        return $this->response($data);
     }
 
     // ORM 查询类方法演示
 
-    public function find($id){
+    public function findGet($id){
         // 通过 id 查询数据表
         $resultObject = Demo::find($id);
-        dd($resultObject);
+        return $this->response($resultObject);
     }
 
     public function whereGet(){
         // 条件检索数据表(条件数组)
         $conditionArray = ["author" => "Rytia"];
         $resultObjectArray = Demo::where($conditionArray)->get();
-        dd($resultObjectArray);
+        return $this->response($resultObjectArray);
     }
 
     public function whereRawGet(){
         // 条件检索数据表(SQL语句)
         $conditionStatement = 'author LIKE "Rytia"';
         $resultObjectArray = Demo::whereRaw($conditionStatement)->get();
-        dd($resultObjectArray);
+        return $this->response($resultObjectArray);
     }
 
     public function allGet(){
         // 显示全部数据
         $resultObjectArray = Demo::all();
-        dd($resultObjectArray);
+        return $this->response($resultObjectArray);
     }
 
     public function rawGet(){
         // 执行SQL语句
         $sqlStatement = 'SELECT * FROM {table} WHERE author LIKE "Rytia"';
         $resultObjectArray = Demo::raw($sqlStatement)->get();
         dd($resultObjectArray);
+        return $this->response($resultObjectArray);
     }
 
     public function searchGet(){
         // 数据表字段搜索
         $resultObjectArray = Demo::search("title", "%嗯%");
-        dd($resultObjectArray);
+        return $this->response($resultObjectArray);
     }
 
     public function orWhereGet(){
         // 多重条件检索数据表(条件数组)
         // 支持 where、whereRaw、orWhere、orWhereRaw
         $test = Demo::where(['title' => '还是标题'])->orWhere(['title' => '测试标题'])->get();
-        dd($test);
+        return $this->response($test);
     }
 
     public function deleteGet($id){
         // 删除条目
         $result = Demo::find($id)->delete();
-        dd($result);
+        return $this->response($result);
     }
 
-    public function paginateGet($pageNum){
+    public function paginateGet(){
         // 条目分页演示
 
         // 直接调用：相当于 Database 层分页，效率高
-        $test = Demo::paginate(3);
+        $test = Demo::paginate(5);
 
         // Collection 层分页：先把全部数据取出再通过 Collection 分页，效率低
-        $test = Demo::all()->paginate(3);
+        $test = Demo::all()->paginate(5);
 
         // Database 层分页：在 SQL 语句里添加 LIMIT，效率高
-        $test = Demo::where()->paginate(3);
-        $test = Database::table('demo')->where()->setModel(Demo::class)->paginate(3);
-        $test = Database::model(Demo::class)->where()->paginate(3);
+        $test = Demo::where()->paginate(5);
+        $test = Database::table('demo')->where()->setModel(Demo::class)->paginate(5);
+        $test = Database::model(Demo::class)->where()->paginate(5);
+
+        // 直接返回（前端无法判断分页，不推荐）
+        // return $this->response($test);
 
-        dd($test);
+        // 采用分页专用对象返回（带有 page 字段供前端使用，推荐）
+        return $this->response()->pageEncode($test);
     }
 
     public function databaseWhereGet(){
@@ -92,7 +97,7 @@ public function databaseWhereGet(){
             ->orWhereRaw('content LIKE "%测试%"')
             ->paginate(5);
 
-        dd($result);
+        return $this->response($result);
 
     }
 
@@ -104,7 +109,7 @@ public function databaseOnGet(){
             ->on('wiki.zhong=zhong.id')
             ->orderBy("coordinate", "DESC")
             ->fetchAll();
-        dd($result);
+        return $this->response($result);
 
     }
 

Public/index.php

@@ -15,7 +15,7 @@
 // 如果您已将产品真正投入使用，请将您的工作目录设置为 /Public，方便与静态文件的统一管理
 
 // 启动相应函数
-require_once __DIR__ . "/App/System/Utility/Functions.php";
+require_once __DIR__ . "/../System/Utility/Functions.php";
 
 // 设置错误与异常处理
 set_error_handler('\System\Utility\Exception::errorReport');

App/System/Collection.php renamed to System/Collection.php

@@ -11,7 +11,7 @@
  * @copyright 2018 PHP-QuickORM
  */
 
-class Collection implements ArrayAccess, Countable, IteratorAggregate
+class Collection implements ArrayAccess, Countable, IteratorAggregate, Jsonable
 {
 
     protected $collectionItems = [];
@@ -338,7 +338,7 @@ public function forPage($pageNum, $currentPage, $total, $furtherPageInfo = true)
             // 添加分页的属性
             $this->collectionPages = new \stdClass();
             $this->collectionPages->currentPage = $currentPage;
-            $this->collectionPages->totalItems = $total;
+            $this->collectionPages->totalItems = intval($total);
             $this->collectionPages->totalPages = ceil($total / $pageNum);
             $this->collectionPages->hasNext = ($this->collectionPages->totalPages > $currentPage) ? "true" : "false";
             $this->collectionPages->nextUrl =($this->collectionPages->hasNext == "true") ? parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH).'?page='.($currentPage+1) : NULL;

App/System/Controller.php renamed to System/Controller.php

@@ -65,7 +65,7 @@ public function back(){
      * @param int $errcode
      * @param string $errmsg
      */
-    public function dataEncode($data, $statusCode, $errcode = 0, $errmsg = ''){
+    public function dataEncode($data, $statusCode = 200, $errcode = 0, $errmsg = ''){
         // 同理，如果实现了 Jsonable 则先反转，这里是的简化版
         $data = ($data instanceof Jsonable) ? json_decode($data) : $data;
 
@@ -78,6 +78,32 @@ public function dataEncode($data, $statusCode, $errcode = 0, $errmsg = ''){
         $this->json($result,$statusCode);
     }
 
+    /**
+     * 将 Collection 集合以标准 JSON 对象返回并附带分页信息
+     * @param $data
+     * @param $statusCode
+     * @param int $errcode
+     * @param string $errmsg
+     */
+    public function pageEncode($data, $statusCode = 200, $errcode = 0, $errmsg = ''){
+
+        // 判断是否可分页（Collection对象）
+        if(!isset($data->collectionPages) || empty($data->collectionPages)){
+            trigger_error("data isn't the instance of Paginate", E_USER_ERROR);
+        }
+
+        // 将 Collection 自身的 collectionPages 合并到对象并返回
+        $result = [
+            'errcode'   =>  $errcode,
+            'errmsg'    =>  $errmsg,
+            'data'      =>  json_decode($data),
+            'page'      =>  $data->collectionPages
+        ];
+
+        $this->json($result,$statusCode);
+    }
+
+
     /**
      * 响应头部设置
      * @param string $key