From 66824d76207b5a21576e0d146d13972200b02492 Mon Sep 17 00:00:00 2001 From: zhaoxiang <756958008@qq.com> Date: Tue, 6 Mar 2018 00:13:21 +0800 Subject: [PATCH 1/5] modified For composer --- composer.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/composer.json b/composer.json index c8f16ee..6a96c3e 100644 --- a/composer.json +++ b/composer.json @@ -1,22 +1,22 @@ { - "name": "topthink/think", - "description": "the new thinkphp framework", + "name": "apiadmin/apiadmin", + "description": "the api manager", "type": "project", "keywords": [ - "framework", - "thinkphp", - "ORM" + "API", + "ApiAdmin", + "TP5" ], - "homepage": "http://thinkphp.cn/", + "homepage": "http://www.apiadmin.org/", "license": "Apache-2.0", "authors": [ { - "name": "liu21st", - "email": "liu21st@gmail.com" + "name": "zhao", + "email": "756958008@qq.com" } ], "require": { - "php": ">=5.4.0", + "php": ">=5.6.0", "topthink/framework": "~5.0.0" }, "extra": { From 652b3d76687547b33511074e17c239470e891186 Mon Sep 17 00:00:00 2001 From: zhaoxiang <756958008@qq.com> Date: Tue, 6 Mar 2018 00:13:39 +0800 Subject: [PATCH 2/5] modified For composer --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 6a96c3e..dc6e539 100644 --- a/composer.json +++ b/composer.json @@ -1,5 +1,5 @@ { - "name": "apiadmin/apiadmin", + "name": "apiadmin/apiadmin3", "description": "the api manager", "type": "project", "keywords": [ From 1a09cfc1415660f39c7b66caba194c6a5c8d4e95 Mon Sep 17 00:00:00 2001 From: zhaoxiang <756958008@qq.com> Date: Tue, 6 Mar 2018 00:24:25 +0800 Subject: [PATCH 3/5] modified For composer --- composer.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/composer.json b/composer.json index dc6e539..955dafe 100644 --- a/composer.json +++ b/composer.json @@ -15,6 +15,11 @@ "email": "756958008@qq.com" } ], + "autoload": { + "psr-4": { + "app\\": "application" + } + }, "require": { "php": ">=5.6.0", "topthink/framework": "~5.0.0" From c3bd810f361a93f49d953d1eba8aa7c668234628 Mon Sep 17 00:00:00 2001 From: zhaoxiang <756958008@qq.com> Date: Tue, 6 Mar 2018 00:32:37 +0800 Subject: [PATCH 4/5] modified For composer --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 955dafe..5379052 100644 --- a/composer.json +++ b/composer.json @@ -3,9 +3,9 @@ "description": "the api manager", "type": "project", "keywords": [ - "API", - "ApiAdmin", - "TP5" + "api", + "apiadmin", + "tp5" ], "homepage": "http://www.apiadmin.org/", "license": "Apache-2.0", From af9d1a176cd1ffd1f12a0a8000ff8f8323508cf9 Mon Sep 17 00:00:00 2001 From: zhaoxiang <756958008@qq.com> Date: Tue, 6 Mar 2018 01:24:09 +0800 Subject: [PATCH 5/5] =?UTF-8?q?modified=20=E5=AE=89=E8=A3=85=E4=B8=89?= =?UTF-8?q?=E6=96=B9=E5=BA=93curl?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/api/controller/Index.php | 4 ++++ composer.json | 3 ++- thinkphp/.gitignore | 0 thinkphp/.htaccess | 0 thinkphp/.travis.yml | 0 thinkphp/CONTRIBUTING.md | 0 thinkphp/LICENSE.txt | 0 thinkphp/README.md | 0 thinkphp/base.php | 0 thinkphp/codecov.yml | 0 thinkphp/composer.json | 0 thinkphp/console.php | 0 thinkphp/convention.php | 0 thinkphp/helper.php | 0 thinkphp/lang/zh-cn.php | 0 thinkphp/library/think/App.php | 0 thinkphp/library/think/Build.php | 0 thinkphp/library/think/Cache.php | 0 thinkphp/library/think/Collection.php | 0 thinkphp/library/think/Config.php | 0 thinkphp/library/think/Console.php | 0 thinkphp/library/think/Controller.php | 0 thinkphp/library/think/Cookie.php | 0 thinkphp/library/think/Db.php | 0 thinkphp/library/think/Debug.php | 0 thinkphp/library/think/Env.php | 0 thinkphp/library/think/Error.php | 0 thinkphp/library/think/Exception.php | 0 thinkphp/library/think/File.php | 0 thinkphp/library/think/Hook.php | 0 thinkphp/library/think/Lang.php | 0 thinkphp/library/think/Loader.php | 0 thinkphp/library/think/Log.php | 0 thinkphp/library/think/Model.php | 0 thinkphp/library/think/Paginator.php | 0 thinkphp/library/think/Process.php | 0 thinkphp/library/think/Request.php | 0 thinkphp/library/think/Response.php | 0 thinkphp/library/think/Route.php | 0 thinkphp/library/think/Session.php | 0 thinkphp/library/think/Template.php | 0 thinkphp/library/think/Url.php | 0 thinkphp/library/think/Validate.php | 0 thinkphp/library/think/View.php | 0 thinkphp/library/think/cache/Driver.php | 0 thinkphp/library/think/cache/driver/File.php | 0 thinkphp/library/think/cache/driver/Lite.php | 0 thinkphp/library/think/cache/driver/Memcache.php | 0 thinkphp/library/think/cache/driver/Memcached.php | 0 thinkphp/library/think/cache/driver/Redis.php | 0 thinkphp/library/think/cache/driver/Sqlite.php | 0 thinkphp/library/think/cache/driver/Wincache.php | 0 thinkphp/library/think/cache/driver/Xcache.php | 0 thinkphp/library/think/config/driver/Ini.php | 0 thinkphp/library/think/config/driver/Json.php | 0 thinkphp/library/think/config/driver/Xml.php | 0 thinkphp/library/think/console/Command.php | 0 thinkphp/library/think/console/Input.php | 0 thinkphp/library/think/console/LICENSE | 0 thinkphp/library/think/console/Output.php | 0 thinkphp/library/think/console/bin/README.md | 0 thinkphp/library/think/console/bin/hiddeninput.exe | Bin thinkphp/library/think/console/command/Build.php | 0 thinkphp/library/think/console/command/Clear.php | 0 thinkphp/library/think/console/command/Help.php | 0 thinkphp/library/think/console/command/Lists.php | 0 thinkphp/library/think/console/command/Make.php | 0 .../think/console/command/make/Controller.php | 0 .../library/think/console/command/make/Model.php | 0 .../command/make/stubs/controller.plain.stub | 0 .../console/command/make/stubs/controller.stub | 0 .../think/console/command/make/stubs/model.stub | 0 .../think/console/command/optimize/Autoload.php | 0 .../think/console/command/optimize/Config.php | 0 .../think/console/command/optimize/Route.php | 0 .../think/console/command/optimize/Schema.php | 0 thinkphp/library/think/console/input/Argument.php | 0 thinkphp/library/think/console/input/Definition.php | 0 thinkphp/library/think/console/input/Option.php | 0 thinkphp/library/think/console/output/Ask.php | 0 .../library/think/console/output/Descriptor.php | 0 thinkphp/library/think/console/output/Formatter.php | 0 thinkphp/library/think/console/output/Question.php | 0 .../think/console/output/descriptor/Console.php | 0 .../library/think/console/output/driver/Buffer.php | 0 .../library/think/console/output/driver/Console.php | 0 .../library/think/console/output/driver/Nothing.php | 0 .../think/console/output/formatter/Stack.php | 0 .../think/console/output/formatter/Style.php | 0 .../think/console/output/question/Choice.php | 0 .../think/console/output/question/Confirmation.php | 0 thinkphp/library/think/controller/Rest.php | 0 thinkphp/library/think/controller/Yar.php | 0 thinkphp/library/think/db/Builder.php | 0 thinkphp/library/think/db/Connection.php | 0 thinkphp/library/think/db/Query.php | 0 thinkphp/library/think/db/builder/Mysql.php | 0 thinkphp/library/think/db/builder/Pgsql.php | 0 thinkphp/library/think/db/builder/Sqlite.php | 0 thinkphp/library/think/db/builder/Sqlsrv.php | 0 thinkphp/library/think/db/connector/Mysql.php | 0 thinkphp/library/think/db/connector/Pgsql.php | 0 thinkphp/library/think/db/connector/Sqlite.php | 0 thinkphp/library/think/db/connector/Sqlsrv.php | 0 thinkphp/library/think/db/connector/pgsql.sql | 0 .../think/db/exception/BindParamException.php | 0 .../think/db/exception/DataNotFoundException.php | 0 .../think/db/exception/ModelNotFoundException.php | 0 thinkphp/library/think/debug/Console.php | 0 thinkphp/library/think/debug/Html.php | 0 .../think/exception/ClassNotFoundException.php | 0 thinkphp/library/think/exception/DbException.php | 0 thinkphp/library/think/exception/ErrorException.php | 0 thinkphp/library/think/exception/Handle.php | 0 thinkphp/library/think/exception/HttpException.php | 0 .../think/exception/HttpResponseException.php | 0 thinkphp/library/think/exception/PDOException.php | 0 .../think/exception/RouteNotFoundException.php | 0 .../think/exception/TemplateNotFoundException.php | 0 thinkphp/library/think/exception/ThrowableError.php | 0 .../library/think/exception/ValidateException.php | 0 thinkphp/library/think/log/driver/File.php | 0 thinkphp/library/think/log/driver/Socket.php | 0 thinkphp/library/think/log/driver/Test.php | 0 thinkphp/library/think/model/Collection.php | 0 thinkphp/library/think/model/Merge.php | 0 thinkphp/library/think/model/Pivot.php | 0 thinkphp/library/think/model/Relation.php | 0 thinkphp/library/think/model/relation/BelongsTo.php | 0 .../library/think/model/relation/BelongsToMany.php | 0 thinkphp/library/think/model/relation/HasMany.php | 0 .../library/think/model/relation/HasManyThrough.php | 0 thinkphp/library/think/model/relation/HasOne.php | 0 thinkphp/library/think/model/relation/MorphMany.php | 0 thinkphp/library/think/model/relation/MorphOne.php | 0 thinkphp/library/think/model/relation/MorphTo.php | 0 thinkphp/library/think/model/relation/OneToOne.php | 0 .../library/think/paginator/driver/Bootstrap.php | 0 thinkphp/library/think/process/Builder.php | 0 thinkphp/library/think/process/Utils.php | 0 thinkphp/library/think/process/exception/Failed.php | 0 .../library/think/process/exception/Timeout.php | 0 thinkphp/library/think/process/pipes/Pipes.php | 0 thinkphp/library/think/process/pipes/Unix.php | 0 thinkphp/library/think/process/pipes/Windows.php | 0 thinkphp/library/think/response/Json.php | 0 thinkphp/library/think/response/Jsonp.php | 0 thinkphp/library/think/response/Redirect.php | 0 thinkphp/library/think/response/View.php | 0 thinkphp/library/think/response/Xml.php | 0 thinkphp/library/think/session/driver/Memcache.php | 0 thinkphp/library/think/session/driver/Memcached.php | 0 thinkphp/library/think/session/driver/Redis.php | 0 thinkphp/library/think/template/TagLib.php | 0 thinkphp/library/think/template/driver/File.php | 0 thinkphp/library/think/template/taglib/Cx.php | 0 thinkphp/library/think/view/driver/Php.php | 0 thinkphp/library/think/view/driver/Think.php | 0 thinkphp/library/traits/controller/Jump.php | 0 thinkphp/library/traits/model/SoftDelete.php | 0 thinkphp/library/traits/think/Instance.php | 0 thinkphp/logo.png | Bin thinkphp/phpunit.xml | 0 thinkphp/start.php | 0 thinkphp/tpl/default_index.tpl | 0 thinkphp/tpl/dispatch_jump.tpl | 0 thinkphp/tpl/page_trace.tpl | 0 thinkphp/tpl/think_exception.tpl | 0 168 files changed, 6 insertions(+), 1 deletion(-) mode change 100755 => 100644 thinkphp/.gitignore mode change 100755 => 100644 thinkphp/.htaccess mode change 100755 => 100644 thinkphp/.travis.yml mode change 100755 => 100644 thinkphp/CONTRIBUTING.md mode change 100755 => 100644 thinkphp/LICENSE.txt mode change 100755 => 100644 thinkphp/README.md mode change 100755 => 100644 thinkphp/base.php mode change 100755 => 100644 thinkphp/codecov.yml mode change 100755 => 100644 thinkphp/composer.json mode change 100755 => 100644 thinkphp/console.php mode change 100755 => 100644 thinkphp/convention.php mode change 100755 => 100644 thinkphp/helper.php mode change 100755 => 100644 thinkphp/lang/zh-cn.php mode change 100755 => 100644 thinkphp/library/think/App.php mode change 100755 => 100644 thinkphp/library/think/Build.php mode change 100755 => 100644 thinkphp/library/think/Cache.php mode change 100755 => 100644 thinkphp/library/think/Collection.php mode change 100755 => 100644 thinkphp/library/think/Config.php mode change 100755 => 100644 thinkphp/library/think/Console.php mode change 100755 => 100644 thinkphp/library/think/Controller.php mode change 100755 => 100644 thinkphp/library/think/Cookie.php mode change 100755 => 100644 thinkphp/library/think/Db.php mode change 100755 => 100644 thinkphp/library/think/Debug.php mode change 100755 => 100644 thinkphp/library/think/Env.php mode change 100755 => 100644 thinkphp/library/think/Error.php mode change 100755 => 100644 thinkphp/library/think/Exception.php mode change 100755 => 100644 thinkphp/library/think/File.php mode change 100755 => 100644 thinkphp/library/think/Hook.php mode change 100755 => 100644 thinkphp/library/think/Lang.php mode change 100755 => 100644 thinkphp/library/think/Loader.php mode change 100755 => 100644 thinkphp/library/think/Log.php mode change 100755 => 100644 thinkphp/library/think/Model.php mode change 100755 => 100644 thinkphp/library/think/Paginator.php mode change 100755 => 100644 thinkphp/library/think/Process.php mode change 100755 => 100644 thinkphp/library/think/Request.php mode change 100755 => 100644 thinkphp/library/think/Response.php mode change 100755 => 100644 thinkphp/library/think/Route.php mode change 100755 => 100644 thinkphp/library/think/Session.php mode change 100755 => 100644 thinkphp/library/think/Template.php mode change 100755 => 100644 thinkphp/library/think/Url.php mode change 100755 => 100644 thinkphp/library/think/Validate.php mode change 100755 => 100644 thinkphp/library/think/View.php mode change 100755 => 100644 thinkphp/library/think/cache/Driver.php mode change 100755 => 100644 thinkphp/library/think/cache/driver/File.php mode change 100755 => 100644 thinkphp/library/think/cache/driver/Lite.php mode change 100755 => 100644 thinkphp/library/think/cache/driver/Memcache.php mode change 100755 => 100644 thinkphp/library/think/cache/driver/Memcached.php mode change 100755 => 100644 thinkphp/library/think/cache/driver/Redis.php mode change 100755 => 100644 thinkphp/library/think/cache/driver/Sqlite.php mode change 100755 => 100644 thinkphp/library/think/cache/driver/Wincache.php mode change 100755 => 100644 thinkphp/library/think/cache/driver/Xcache.php mode change 100755 => 100644 thinkphp/library/think/config/driver/Ini.php mode change 100755 => 100644 thinkphp/library/think/config/driver/Json.php mode change 100755 => 100644 thinkphp/library/think/config/driver/Xml.php mode change 100755 => 100644 thinkphp/library/think/console/Command.php mode change 100755 => 100644 thinkphp/library/think/console/Input.php mode change 100755 => 100644 thinkphp/library/think/console/LICENSE mode change 100755 => 100644 thinkphp/library/think/console/Output.php mode change 100755 => 100644 thinkphp/library/think/console/bin/README.md mode change 100755 => 100644 thinkphp/library/think/console/bin/hiddeninput.exe mode change 100755 => 100644 thinkphp/library/think/console/command/Build.php mode change 100755 => 100644 thinkphp/library/think/console/command/Clear.php mode change 100755 => 100644 thinkphp/library/think/console/command/Help.php mode change 100755 => 100644 thinkphp/library/think/console/command/Lists.php mode change 100755 => 100644 thinkphp/library/think/console/command/Make.php mode change 100755 => 100644 thinkphp/library/think/console/command/make/Controller.php mode change 100755 => 100644 thinkphp/library/think/console/command/make/Model.php mode change 100755 => 100644 thinkphp/library/think/console/command/make/stubs/controller.plain.stub mode change 100755 => 100644 thinkphp/library/think/console/command/make/stubs/controller.stub mode change 100755 => 100644 thinkphp/library/think/console/command/make/stubs/model.stub mode change 100755 => 100644 thinkphp/library/think/console/command/optimize/Autoload.php mode change 100755 => 100644 thinkphp/library/think/console/command/optimize/Config.php mode change 100755 => 100644 thinkphp/library/think/console/command/optimize/Route.php mode change 100755 => 100644 thinkphp/library/think/console/command/optimize/Schema.php mode change 100755 => 100644 thinkphp/library/think/console/input/Argument.php mode change 100755 => 100644 thinkphp/library/think/console/input/Definition.php mode change 100755 => 100644 thinkphp/library/think/console/input/Option.php mode change 100755 => 100644 thinkphp/library/think/console/output/Ask.php mode change 100755 => 100644 thinkphp/library/think/console/output/Descriptor.php mode change 100755 => 100644 thinkphp/library/think/console/output/Formatter.php mode change 100755 => 100644 thinkphp/library/think/console/output/Question.php mode change 100755 => 100644 thinkphp/library/think/console/output/descriptor/Console.php mode change 100755 => 100644 thinkphp/library/think/console/output/driver/Buffer.php mode change 100755 => 100644 thinkphp/library/think/console/output/driver/Console.php mode change 100755 => 100644 thinkphp/library/think/console/output/driver/Nothing.php mode change 100755 => 100644 thinkphp/library/think/console/output/formatter/Stack.php mode change 100755 => 100644 thinkphp/library/think/console/output/formatter/Style.php mode change 100755 => 100644 thinkphp/library/think/console/output/question/Choice.php mode change 100755 => 100644 thinkphp/library/think/console/output/question/Confirmation.php mode change 100755 => 100644 thinkphp/library/think/controller/Rest.php mode change 100755 => 100644 thinkphp/library/think/controller/Yar.php mode change 100755 => 100644 thinkphp/library/think/db/Builder.php mode change 100755 => 100644 thinkphp/library/think/db/Connection.php mode change 100755 => 100644 thinkphp/library/think/db/Query.php mode change 100755 => 100644 thinkphp/library/think/db/builder/Mysql.php mode change 100755 => 100644 thinkphp/library/think/db/builder/Pgsql.php mode change 100755 => 100644 thinkphp/library/think/db/builder/Sqlite.php mode change 100755 => 100644 thinkphp/library/think/db/builder/Sqlsrv.php mode change 100755 => 100644 thinkphp/library/think/db/connector/Mysql.php mode change 100755 => 100644 thinkphp/library/think/db/connector/Pgsql.php mode change 100755 => 100644 thinkphp/library/think/db/connector/Sqlite.php mode change 100755 => 100644 thinkphp/library/think/db/connector/Sqlsrv.php mode change 100755 => 100644 thinkphp/library/think/db/connector/pgsql.sql mode change 100755 => 100644 thinkphp/library/think/db/exception/BindParamException.php mode change 100755 => 100644 thinkphp/library/think/db/exception/DataNotFoundException.php mode change 100755 => 100644 thinkphp/library/think/db/exception/ModelNotFoundException.php mode change 100755 => 100644 thinkphp/library/think/debug/Console.php mode change 100755 => 100644 thinkphp/library/think/debug/Html.php mode change 100755 => 100644 thinkphp/library/think/exception/ClassNotFoundException.php mode change 100755 => 100644 thinkphp/library/think/exception/DbException.php mode change 100755 => 100644 thinkphp/library/think/exception/ErrorException.php mode change 100755 => 100644 thinkphp/library/think/exception/Handle.php mode change 100755 => 100644 thinkphp/library/think/exception/HttpException.php mode change 100755 => 100644 thinkphp/library/think/exception/HttpResponseException.php mode change 100755 => 100644 thinkphp/library/think/exception/PDOException.php mode change 100755 => 100644 thinkphp/library/think/exception/RouteNotFoundException.php mode change 100755 => 100644 thinkphp/library/think/exception/TemplateNotFoundException.php mode change 100755 => 100644 thinkphp/library/think/exception/ThrowableError.php mode change 100755 => 100644 thinkphp/library/think/exception/ValidateException.php mode change 100755 => 100644 thinkphp/library/think/log/driver/File.php mode change 100755 => 100644 thinkphp/library/think/log/driver/Socket.php mode change 100755 => 100644 thinkphp/library/think/log/driver/Test.php mode change 100755 => 100644 thinkphp/library/think/model/Collection.php mode change 100755 => 100644 thinkphp/library/think/model/Merge.php mode change 100755 => 100644 thinkphp/library/think/model/Pivot.php mode change 100755 => 100644 thinkphp/library/think/model/Relation.php mode change 100755 => 100644 thinkphp/library/think/model/relation/BelongsTo.php mode change 100755 => 100644 thinkphp/library/think/model/relation/BelongsToMany.php mode change 100755 => 100644 thinkphp/library/think/model/relation/HasMany.php mode change 100755 => 100644 thinkphp/library/think/model/relation/HasManyThrough.php mode change 100755 => 100644 thinkphp/library/think/model/relation/HasOne.php mode change 100755 => 100644 thinkphp/library/think/model/relation/MorphMany.php mode change 100755 => 100644 thinkphp/library/think/model/relation/MorphOne.php mode change 100755 => 100644 thinkphp/library/think/model/relation/MorphTo.php mode change 100755 => 100644 thinkphp/library/think/model/relation/OneToOne.php mode change 100755 => 100644 thinkphp/library/think/paginator/driver/Bootstrap.php mode change 100755 => 100644 thinkphp/library/think/process/Builder.php mode change 100755 => 100644 thinkphp/library/think/process/Utils.php mode change 100755 => 100644 thinkphp/library/think/process/exception/Failed.php mode change 100755 => 100644 thinkphp/library/think/process/exception/Timeout.php mode change 100755 => 100644 thinkphp/library/think/process/pipes/Pipes.php mode change 100755 => 100644 thinkphp/library/think/process/pipes/Unix.php mode change 100755 => 100644 thinkphp/library/think/process/pipes/Windows.php mode change 100755 => 100644 thinkphp/library/think/response/Json.php mode change 100755 => 100644 thinkphp/library/think/response/Jsonp.php mode change 100755 => 100644 thinkphp/library/think/response/Redirect.php mode change 100755 => 100644 thinkphp/library/think/response/View.php mode change 100755 => 100644 thinkphp/library/think/response/Xml.php mode change 100755 => 100644 thinkphp/library/think/session/driver/Memcache.php mode change 100755 => 100644 thinkphp/library/think/session/driver/Memcached.php mode change 100755 => 100644 thinkphp/library/think/session/driver/Redis.php mode change 100755 => 100644 thinkphp/library/think/template/TagLib.php mode change 100755 => 100644 thinkphp/library/think/template/driver/File.php mode change 100755 => 100644 thinkphp/library/think/template/taglib/Cx.php mode change 100755 => 100644 thinkphp/library/think/view/driver/Php.php mode change 100755 => 100644 thinkphp/library/think/view/driver/Think.php mode change 100755 => 100644 thinkphp/library/traits/controller/Jump.php mode change 100755 => 100644 thinkphp/library/traits/model/SoftDelete.php mode change 100755 => 100644 thinkphp/library/traits/think/Instance.php mode change 100755 => 100644 thinkphp/logo.png mode change 100755 => 100644 thinkphp/phpunit.xml mode change 100755 => 100644 thinkphp/start.php mode change 100755 => 100644 thinkphp/tpl/default_index.tpl mode change 100755 => 100644 thinkphp/tpl/dispatch_jump.tpl mode change 100755 => 100644 thinkphp/tpl/page_trace.tpl mode change 100755 => 100644 thinkphp/tpl/think_exception.tpl diff --git a/application/api/controller/Index.php b/application/api/controller/Index.php index 3404a4c..e7be5e4 100644 --- a/application/api/controller/Index.php +++ b/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 ]); diff --git a/composer.json b/composer.json index 5379052..4f42256 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,8 @@ }, "require": { "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" diff --git a/thinkphp/.gitignore b/thinkphp/.gitignore old mode 100755 new mode 100644 diff --git a/thinkphp/.htaccess b/thinkphp/.htaccess old mode 100755 new mode 100644 diff --git a/thinkphp/.travis.yml b/thinkphp/.travis.yml old mode 100755 new mode 100644 diff --git a/thinkphp/CONTRIBUTING.md b/thinkphp/CONTRIBUTING.md old mode 100755 new mode 100644 diff --git a/thinkphp/LICENSE.txt b/thinkphp/LICENSE.txt old mode 100755 new mode 100644 diff --git a/thinkphp/README.md b/thinkphp/README.md old mode 100755 new mode 100644 diff --git a/thinkphp/base.php b/thinkphp/base.php old mode 100755 new mode 100644 diff --git a/thinkphp/codecov.yml b/thinkphp/codecov.yml old mode 100755 new mode 100644 diff --git a/thinkphp/composer.json b/thinkphp/composer.json old mode 100755 new mode 100644 diff --git a/thinkphp/console.php b/thinkphp/console.php old mode 100755 new mode 100644 diff --git a/thinkphp/convention.php b/thinkphp/convention.php old mode 100755 new mode 100644 diff --git a/thinkphp/helper.php b/thinkphp/helper.php old mode 100755 new mode 100644 diff --git a/thinkphp/lang/zh-cn.php b/thinkphp/lang/zh-cn.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/App.php b/thinkphp/library/think/App.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/Build.php b/thinkphp/library/think/Build.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/Cache.php b/thinkphp/library/think/Cache.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/Collection.php b/thinkphp/library/think/Collection.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/Config.php b/thinkphp/library/think/Config.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/Console.php b/thinkphp/library/think/Console.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/Controller.php b/thinkphp/library/think/Controller.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/Cookie.php b/thinkphp/library/think/Cookie.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/Db.php b/thinkphp/library/think/Db.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/Debug.php b/thinkphp/library/think/Debug.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/Env.php b/thinkphp/library/think/Env.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/Error.php b/thinkphp/library/think/Error.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/Exception.php b/thinkphp/library/think/Exception.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/File.php b/thinkphp/library/think/File.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/Hook.php b/thinkphp/library/think/Hook.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/Lang.php b/thinkphp/library/think/Lang.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/Loader.php b/thinkphp/library/think/Loader.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/Log.php b/thinkphp/library/think/Log.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/Model.php b/thinkphp/library/think/Model.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/Paginator.php b/thinkphp/library/think/Paginator.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/Process.php b/thinkphp/library/think/Process.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/Request.php b/thinkphp/library/think/Request.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/Response.php b/thinkphp/library/think/Response.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/Route.php b/thinkphp/library/think/Route.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/Session.php b/thinkphp/library/think/Session.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/Template.php b/thinkphp/library/think/Template.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/Url.php b/thinkphp/library/think/Url.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/Validate.php b/thinkphp/library/think/Validate.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/View.php b/thinkphp/library/think/View.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/cache/Driver.php b/thinkphp/library/think/cache/Driver.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/cache/driver/File.php b/thinkphp/library/think/cache/driver/File.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/cache/driver/Lite.php b/thinkphp/library/think/cache/driver/Lite.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/cache/driver/Memcache.php b/thinkphp/library/think/cache/driver/Memcache.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/cache/driver/Memcached.php b/thinkphp/library/think/cache/driver/Memcached.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/cache/driver/Redis.php b/thinkphp/library/think/cache/driver/Redis.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/cache/driver/Sqlite.php b/thinkphp/library/think/cache/driver/Sqlite.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/cache/driver/Wincache.php b/thinkphp/library/think/cache/driver/Wincache.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/cache/driver/Xcache.php b/thinkphp/library/think/cache/driver/Xcache.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/config/driver/Ini.php b/thinkphp/library/think/config/driver/Ini.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/config/driver/Json.php b/thinkphp/library/think/config/driver/Json.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/config/driver/Xml.php b/thinkphp/library/think/config/driver/Xml.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/console/Command.php b/thinkphp/library/think/console/Command.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/console/Input.php b/thinkphp/library/think/console/Input.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/console/LICENSE b/thinkphp/library/think/console/LICENSE old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/console/Output.php b/thinkphp/library/think/console/Output.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/console/bin/README.md b/thinkphp/library/think/console/bin/README.md old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/console/bin/hiddeninput.exe b/thinkphp/library/think/console/bin/hiddeninput.exe old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/console/command/Build.php b/thinkphp/library/think/console/command/Build.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/console/command/Clear.php b/thinkphp/library/think/console/command/Clear.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/console/command/Help.php b/thinkphp/library/think/console/command/Help.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/console/command/Lists.php b/thinkphp/library/think/console/command/Lists.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/console/command/Make.php b/thinkphp/library/think/console/command/Make.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/console/command/make/Controller.php b/thinkphp/library/think/console/command/make/Controller.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/console/command/make/Model.php b/thinkphp/library/think/console/command/make/Model.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/console/command/make/stubs/controller.plain.stub b/thinkphp/library/think/console/command/make/stubs/controller.plain.stub old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/console/command/make/stubs/controller.stub b/thinkphp/library/think/console/command/make/stubs/controller.stub old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/console/command/make/stubs/model.stub b/thinkphp/library/think/console/command/make/stubs/model.stub old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/console/command/optimize/Autoload.php b/thinkphp/library/think/console/command/optimize/Autoload.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/console/command/optimize/Config.php b/thinkphp/library/think/console/command/optimize/Config.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/console/command/optimize/Route.php b/thinkphp/library/think/console/command/optimize/Route.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/console/command/optimize/Schema.php b/thinkphp/library/think/console/command/optimize/Schema.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/console/input/Argument.php b/thinkphp/library/think/console/input/Argument.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/console/input/Definition.php b/thinkphp/library/think/console/input/Definition.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/console/input/Option.php b/thinkphp/library/think/console/input/Option.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/console/output/Ask.php b/thinkphp/library/think/console/output/Ask.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/console/output/Descriptor.php b/thinkphp/library/think/console/output/Descriptor.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/console/output/Formatter.php b/thinkphp/library/think/console/output/Formatter.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/console/output/Question.php b/thinkphp/library/think/console/output/Question.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/console/output/descriptor/Console.php b/thinkphp/library/think/console/output/descriptor/Console.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/console/output/driver/Buffer.php b/thinkphp/library/think/console/output/driver/Buffer.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/console/output/driver/Console.php b/thinkphp/library/think/console/output/driver/Console.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/console/output/driver/Nothing.php b/thinkphp/library/think/console/output/driver/Nothing.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/console/output/formatter/Stack.php b/thinkphp/library/think/console/output/formatter/Stack.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/console/output/formatter/Style.php b/thinkphp/library/think/console/output/formatter/Style.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/console/output/question/Choice.php b/thinkphp/library/think/console/output/question/Choice.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/console/output/question/Confirmation.php b/thinkphp/library/think/console/output/question/Confirmation.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/controller/Rest.php b/thinkphp/library/think/controller/Rest.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/controller/Yar.php b/thinkphp/library/think/controller/Yar.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/db/Builder.php b/thinkphp/library/think/db/Builder.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/db/Connection.php b/thinkphp/library/think/db/Connection.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/db/Query.php b/thinkphp/library/think/db/Query.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/db/builder/Mysql.php b/thinkphp/library/think/db/builder/Mysql.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/db/builder/Pgsql.php b/thinkphp/library/think/db/builder/Pgsql.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/db/builder/Sqlite.php b/thinkphp/library/think/db/builder/Sqlite.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/db/builder/Sqlsrv.php b/thinkphp/library/think/db/builder/Sqlsrv.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/db/connector/Mysql.php b/thinkphp/library/think/db/connector/Mysql.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/db/connector/Pgsql.php b/thinkphp/library/think/db/connector/Pgsql.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/db/connector/Sqlite.php b/thinkphp/library/think/db/connector/Sqlite.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/db/connector/Sqlsrv.php b/thinkphp/library/think/db/connector/Sqlsrv.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/db/connector/pgsql.sql b/thinkphp/library/think/db/connector/pgsql.sql old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/db/exception/BindParamException.php b/thinkphp/library/think/db/exception/BindParamException.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/db/exception/DataNotFoundException.php b/thinkphp/library/think/db/exception/DataNotFoundException.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/db/exception/ModelNotFoundException.php b/thinkphp/library/think/db/exception/ModelNotFoundException.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/debug/Console.php b/thinkphp/library/think/debug/Console.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/debug/Html.php b/thinkphp/library/think/debug/Html.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/exception/ClassNotFoundException.php b/thinkphp/library/think/exception/ClassNotFoundException.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/exception/DbException.php b/thinkphp/library/think/exception/DbException.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/exception/ErrorException.php b/thinkphp/library/think/exception/ErrorException.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/exception/Handle.php b/thinkphp/library/think/exception/Handle.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/exception/HttpException.php b/thinkphp/library/think/exception/HttpException.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/exception/HttpResponseException.php b/thinkphp/library/think/exception/HttpResponseException.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/exception/PDOException.php b/thinkphp/library/think/exception/PDOException.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/exception/RouteNotFoundException.php b/thinkphp/library/think/exception/RouteNotFoundException.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/exception/TemplateNotFoundException.php b/thinkphp/library/think/exception/TemplateNotFoundException.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/exception/ThrowableError.php b/thinkphp/library/think/exception/ThrowableError.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/exception/ValidateException.php b/thinkphp/library/think/exception/ValidateException.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/log/driver/File.php b/thinkphp/library/think/log/driver/File.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/log/driver/Socket.php b/thinkphp/library/think/log/driver/Socket.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/log/driver/Test.php b/thinkphp/library/think/log/driver/Test.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/model/Collection.php b/thinkphp/library/think/model/Collection.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/model/Merge.php b/thinkphp/library/think/model/Merge.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/model/Pivot.php b/thinkphp/library/think/model/Pivot.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/model/Relation.php b/thinkphp/library/think/model/Relation.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/model/relation/BelongsTo.php b/thinkphp/library/think/model/relation/BelongsTo.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/model/relation/BelongsToMany.php b/thinkphp/library/think/model/relation/BelongsToMany.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/model/relation/HasMany.php b/thinkphp/library/think/model/relation/HasMany.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/model/relation/HasManyThrough.php b/thinkphp/library/think/model/relation/HasManyThrough.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/model/relation/HasOne.php b/thinkphp/library/think/model/relation/HasOne.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/model/relation/MorphMany.php b/thinkphp/library/think/model/relation/MorphMany.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/model/relation/MorphOne.php b/thinkphp/library/think/model/relation/MorphOne.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/model/relation/MorphTo.php b/thinkphp/library/think/model/relation/MorphTo.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/model/relation/OneToOne.php b/thinkphp/library/think/model/relation/OneToOne.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/paginator/driver/Bootstrap.php b/thinkphp/library/think/paginator/driver/Bootstrap.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/process/Builder.php b/thinkphp/library/think/process/Builder.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/process/Utils.php b/thinkphp/library/think/process/Utils.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/process/exception/Failed.php b/thinkphp/library/think/process/exception/Failed.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/process/exception/Timeout.php b/thinkphp/library/think/process/exception/Timeout.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/process/pipes/Pipes.php b/thinkphp/library/think/process/pipes/Pipes.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/process/pipes/Unix.php b/thinkphp/library/think/process/pipes/Unix.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/process/pipes/Windows.php b/thinkphp/library/think/process/pipes/Windows.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/response/Json.php b/thinkphp/library/think/response/Json.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/response/Jsonp.php b/thinkphp/library/think/response/Jsonp.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/response/Redirect.php b/thinkphp/library/think/response/Redirect.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/response/View.php b/thinkphp/library/think/response/View.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/response/Xml.php b/thinkphp/library/think/response/Xml.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/session/driver/Memcache.php b/thinkphp/library/think/session/driver/Memcache.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/session/driver/Memcached.php b/thinkphp/library/think/session/driver/Memcached.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/session/driver/Redis.php b/thinkphp/library/think/session/driver/Redis.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/template/TagLib.php b/thinkphp/library/think/template/TagLib.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/template/driver/File.php b/thinkphp/library/think/template/driver/File.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/template/taglib/Cx.php b/thinkphp/library/think/template/taglib/Cx.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/view/driver/Php.php b/thinkphp/library/think/view/driver/Php.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/think/view/driver/Think.php b/thinkphp/library/think/view/driver/Think.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/traits/controller/Jump.php b/thinkphp/library/traits/controller/Jump.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/traits/model/SoftDelete.php b/thinkphp/library/traits/model/SoftDelete.php old mode 100755 new mode 100644 diff --git a/thinkphp/library/traits/think/Instance.php b/thinkphp/library/traits/think/Instance.php old mode 100755 new mode 100644 diff --git a/thinkphp/logo.png b/thinkphp/logo.png old mode 100755 new mode 100644 diff --git a/thinkphp/phpunit.xml b/thinkphp/phpunit.xml old mode 100755 new mode 100644 diff --git a/thinkphp/start.php b/thinkphp/start.php old mode 100755 new mode 100644 diff --git a/thinkphp/tpl/default_index.tpl b/thinkphp/tpl/default_index.tpl old mode 100755 new mode 100644 diff --git a/thinkphp/tpl/dispatch_jump.tpl b/thinkphp/tpl/dispatch_jump.tpl old mode 100755 new mode 100644 diff --git a/thinkphp/tpl/page_trace.tpl b/thinkphp/tpl/page_trace.tpl old mode 100755 new mode 100644 diff --git a/thinkphp/tpl/think_exception.tpl b/thinkphp/tpl/think_exception.tpl old mode 100755 new mode 100644