Merge remote-tracking branch 'origin/master'

application/api/controller/Index.php

@@ -3,8 +3,12 @@
 namespace app\api\controller;
 
 
+use Curl\Curl;
+
 class Index extends Base {
     public function index() {
+        $curl = new Curl();
+        dump($curl->get('http://www.apiadmin.org'));exit;
         $this->debug([
             'TpVersion' => THINK_VERSION
         ]);

composer.json

@@ -1,23 +1,29 @@
 {
-    "name": "topthink/think",
+    "name": "apiadmin/apiadmin3",
-    "description": "the new thinkphp framework",
+    "description": "the api manager",
     "type": "project",
     "keywords": [
-        "framework",
+        "api",
-        "thinkphp",
+        "apiadmin",
-        "ORM"
+        "tp5"
     ],
-    "homepage": "http://thinkphp.cn/",
+    "homepage": "http://www.apiadmin.org/",
     "license": "Apache-2.0",
     "authors": [
         {
-            "name": "liu21st",
+            "name": "zhao",
-            "email": "liu21st@gmail.com"
+            "email": "756958008@qq.com"
         }
     ],
+    "autoload": {
+        "psr-4": {
+            "app\\": "application"
+        }
+    },
     "require": {
-        "php": ">=5.4.0",
+        "php": ">=5.6.0",
-        "topthink/framework": "~5.0.0"
+        "topthink/framework": "~5.0.0",
+        "php-curl-class/php-curl-class": "^8.0"
     },
     "extra": {
         "think-path": "thinkphp"