From 3670ad0c8e0637a1ec1f0b751bb5f332214ed302 Mon Sep 17 00:00:00 2001 From: sunyaming <1178889246@qq.com> Date: Fri, 16 Nov 2018 14:42:10 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=96=B0=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- composer.lock | 731 ++++++----------------- resources/views/Api/tool/index.blade.php | 12 - 2 files changed, 175 insertions(+), 568 deletions(-) diff --git a/composer.lock b/composer.lock index 6f8cdb4..ca00cfe 100644 --- a/composer.lock +++ b/composer.lock @@ -4,10 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "17152d9479810c153aa04763988a4123", - "hash": "812b59c4cefda3667669756ed4e5c036", - "content-hash": "32730ccd9b331e228ad65e54fb4432d0", "packages": [ { "name": "bacon/bacon-qr-code", @@ -126,7 +123,7 @@ "phpstorm", "sublime" ], - "time": "2018-02-08 07:56:07" + "time": "2018-02-08T07:56:07+00:00" }, { "name": "barryvdh/reflection-docblock", @@ -175,11 +172,7 @@ "email": "mike.vanriel@naenius.com" } ], -<<<<<<< HEAD "time": "2018-10-25T19:09:52+00:00" -======= - "time": "2016-06-13 19:28:20" ->>>>>>> b32fe0ee785349997ed6e9dad1c83a69a0f2d463 }, { "name": "defuse/php-encryption", @@ -242,7 +235,7 @@ "security", "symmetric key cryptography" ], - "time": "2018-07-24 23:27:56" + "time": "2018-07-24T23:27:56+00:00" }, { "name": "dnoegel/php-xdg-base-dir", @@ -275,24 +268,24 @@ "MIT" ], "description": "implementation of xdg base directory specification for php", - "time": "2014-10-24 07:27:01" + "time": "2014-10-24T07:27:01+00:00" }, { "name": "doctrine/inflector", - "version": "v1.2.0", + "version": "v1.3.0", "source": { "type": "git", "url": "https://github.com/doctrine/inflector.git", - "reference": "e11d84c6e018beedd929cff5220969a3c6d1d462" + "reference": "5527a48b7313d15261292c149e55e26eae771b0a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/inflector/zipball/e11d84c6e018beedd929cff5220969a3c6d1d462", - "reference": "e11d84c6e018beedd929cff5220969a3c6d1d462", + "url": "https://api.github.com/repos/doctrine/inflector/zipball/5527a48b7313d15261292c149e55e26eae771b0a", + "reference": "5527a48b7313d15261292c149e55e26eae771b0a", "shasum": "" }, "require": { - "php": "^7.0" + "php": "^7.1" }, "require-dev": { "phpunit/phpunit": "^6.2" @@ -300,7 +293,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.2.x-dev" + "dev-master": "1.3.x-dev" } }, "autoload": { @@ -342,7 +335,7 @@ "singularize", "string" ], - "time": "2017-07-22 12:18:28" + "time": "2018-01-09T20:05:19+00:00" }, { "name": "erusev/parsedown", @@ -388,7 +381,7 @@ "markdown", "parser" ], - "time": "2018-03-08 01:11:30" + "time": "2018-03-08T01:11:30+00:00" }, { "name": "firebase/php-jwt", @@ -434,7 +427,7 @@ ], "description": "A simple library to encode and decode JSON Web Tokens (JWT) in PHP. Should conform to the current spec.", "homepage": "https://github.com/firebase/php-jwt", - "time": "2017-06-27 22:17:23" + "time": "2017-06-27T22:17:23+00:00" }, { "name": "guzzlehttp/guzzle", @@ -499,7 +492,7 @@ "rest", "web service" ], - "time": "2018-04-22 15:46:56" + "time": "2018-04-22T15:46:56+00:00" }, { "name": "guzzlehttp/promises", @@ -550,7 +543,7 @@ "keywords": [ "promise" ], - "time": "2016-12-20 10:07:11" + "time": "2016-12-20T10:07:11+00:00" }, { "name": "guzzlehttp/psr7", @@ -615,44 +608,7 @@ "uri", "url" ], - "time": "2017-03-20 17:10:46" - }, - { - "name": "iwanli/wxxcx", - "version": "v1.0", - "source": { - "type": "git", - "url": "https://github.com/lanceWan/wxxcx.git", - "reference": "146fc6d2f468c3ebb0e2734c40020b8cb9f7e850" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/lanceWan/wxxcx/zipball/146fc6d2f468c3ebb0e2734c40020b8cb9f7e850", - "reference": "146fc6d2f468c3ebb0e2734c40020b8cb9f7e850", - "shasum": "" - }, - "require": { - "illuminate/support": "~5", - "php": ">=5.5.9" - }, - "type": "library", - "autoload": { - "psr-4": { - "Iwanli\\Wxxcx\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "晚黎", - "email": "ibanya@126.com" - } - ], - "description": "A WeChat applet (xiaochengxu) plugins for Laravel 5.", - "time": "2017-05-27 07:03:14" + "time": "2017-03-20T17:10:46+00:00" }, { "name": "intervention/image", @@ -801,11 +757,7 @@ "email": "jakub.onderka@gmail.com" } ], -<<<<<<< HEAD "time": "2018-09-29T17:23:10+00:00" -======= - "time": "2018-09-29 17:23:10" ->>>>>>> b32fe0ee785349997ed6e9dad1c83a69a0f2d463 }, { "name": "jakub-onderka/php-console-highlighter", @@ -851,11 +803,7 @@ } ], "description": "Highlight PHP code in terminal", -<<<<<<< HEAD "time": "2018-09-29T18:48:56+00:00" -======= - "time": "2018-09-29 18:48:56" ->>>>>>> b32fe0ee785349997ed6e9dad1c83a69a0f2d463 }, { "name": "laravel/framework", @@ -984,7 +932,7 @@ "framework", "laravel" ], - "time": "2017-08-30 09:26:16" + "time": "2017-08-30T09:26:16+00:00" }, { "name": "laravel/passport", @@ -1053,7 +1001,7 @@ "oauth", "passport" ], - "time": "2017-09-24 14:21:39" + "time": "2017-09-24T14:21:39+00:00" }, { "name": "laravel/tinker", @@ -1116,11 +1064,7 @@ "laravel", "psysh" ], -<<<<<<< HEAD "time": "2018-10-12T19:39:35+00:00" -======= - "time": "2018-10-12 19:39:35" ->>>>>>> b32fe0ee785349997ed6e9dad1c83a69a0f2d463 }, { "name": "lcobucci/jwt", @@ -1170,7 +1114,7 @@ { "name": "Luís Otávio Cobucci Oblonczyk", "email": "lcobucci@gmail.com", - "role": "developer" + "role": "Developer" } ], "description": "A simple library to work with JSON Web Token and JSON Web Signature", @@ -1178,11 +1122,7 @@ "JWS", "jwt" ], -<<<<<<< HEAD "time": "2018-11-11T12:22:26+00:00" -======= - "time": "2018-08-03 11:23:50" ->>>>>>> b32fe0ee785349997ed6e9dad1c83a69a0f2d463 }, { "name": "league/event", @@ -1232,7 +1172,7 @@ "event", "listener" ], - "time": "2015-05-21 12:24:47" + "time": "2015-05-21T12:24:47+00:00" }, { "name": "league/flysystem", @@ -1316,11 +1256,7 @@ "sftp", "storage" ], -<<<<<<< HEAD "time": "2018-10-15T13:53:10+00:00" -======= - "time": "2018-10-15 13:53:10" ->>>>>>> b32fe0ee785349997ed6e9dad1c83a69a0f2d463 }, { "name": "league/oauth2-server", @@ -1388,7 +1324,7 @@ "secure", "server" ], - "time": "2017-12-23 23:33:42" + "time": "2017-12-23T23:33:42+00:00" }, { "name": "mews/captcha", @@ -1533,11 +1469,7 @@ "logging", "psr-3" ], -<<<<<<< HEAD "time": "2018-11-05T09:00:11+00:00" -======= - "time": "2017-06-19 01:22:40" ->>>>>>> b32fe0ee785349997ed6e9dad1c83a69a0f2d463 }, { "name": "mtdowling/cron-expression", @@ -1581,7 +1513,7 @@ "cron", "schedule" ], - "time": "2017-01-23 04:29:33" + "time": "2017-01-23T04:29:33+00:00" }, { "name": "nesbot/carbon", @@ -1639,11 +1571,7 @@ "datetime", "time" ], -<<<<<<< HEAD "time": "2018-11-14T21:55:58+00:00" -======= - "time": "2018-09-20 19:36:25" ->>>>>>> b32fe0ee785349997ed6e9dad1c83a69a0f2d463 }, { "name": "nikic/php-parser", @@ -1694,11 +1622,7 @@ "parser", "php" ], -<<<<<<< HEAD "time": "2018-10-10T09:24:14+00:00" -======= - "time": "2018-10-10 09:24:14" ->>>>>>> b32fe0ee785349997ed6e9dad1c83a69a0f2d463 }, { "name": "paragonie/random_compat", @@ -1747,7 +1671,7 @@ "pseudorandom", "random" ], - "time": "2018-07-04 16:31:37" + "time": "2018-07-04T16:31:37+00:00" }, { "name": "phpseclib/phpseclib", @@ -1839,11 +1763,7 @@ "x.509", "x509" ], -<<<<<<< HEAD "time": "2018-11-04T05:45:48+00:00" -======= - "time": "2018-04-15 16:55:05" ->>>>>>> b32fe0ee785349997ed6e9dad1c83a69a0f2d463 }, { "name": "psr/http-message", @@ -1893,7 +1813,7 @@ "request", "response" ], - "time": "2016-08-06 14:39:51" + "time": "2016-08-06T14:39:51+00:00" }, { "name": "psr/log", @@ -1940,7 +1860,7 @@ "psr", "psr-3" ], - "time": "2016-10-10 12:19:37" + "time": "2016-10-10T12:19:37+00:00" }, { "name": "psy/psysh", @@ -2014,11 +1934,7 @@ "interactive", "shell" ], -<<<<<<< HEAD "time": "2018-10-13T15:16:03+00:00" -======= - "time": "2018-10-13 15:16:03" ->>>>>>> b32fe0ee785349997ed6e9dad1c83a69a0f2d463 }, { "name": "qiniu/php-sdk", @@ -2069,11 +1985,7 @@ "sdk", "storage" ], -<<<<<<< HEAD "time": "2018-11-06T13:34:32+00:00" -======= - "time": "2018-05-18 04:37:29" ->>>>>>> b32fe0ee785349997ed6e9dad1c83a69a0f2d463 }, { "name": "ramsey/uuid", @@ -2155,7 +2067,7 @@ "identifier", "uuid" ], - "time": "2018-07-19 23:38:55" + "time": "2018-07-19T23:38:55+00:00" }, { "name": "simplesoftwareio/simple-qrcode", @@ -2263,11 +2175,7 @@ "stevenyangecho", "ueditor" ], -<<<<<<< HEAD "time": "2016-11-06T16:25:59+00:00" -======= - "time": "2017-06-21 06:29:09" ->>>>>>> b32fe0ee785349997ed6e9dad1c83a69a0f2d463 }, { "name": "swiftmailer/swiftmailer", @@ -2321,11 +2229,10 @@ "mail", "mailer" ], - "time": "2018-07-31 09:26:32" + "time": "2018-07-31T09:26:32+00:00" }, { "name": "symfony/class-loader", -<<<<<<< HEAD "version": "v3.4.18", "source": { "type": "git", @@ -2336,25 +2243,13 @@ "type": "zip", "url": "https://api.github.com/repos/symfony/class-loader/zipball/5605edec7b8f034ead2497ff4aab17bb70d558c1", "reference": "5605edec7b8f034ead2497ff4aab17bb70d558c1", -======= - "version": "v3.3.6", - "source": { - "type": "git", - "url": "https://github.com/symfony/class-loader.git", - "reference": "386a294d621576302e7cc36965d6ed53b8c73c4f" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/class-loader/zipball/386a294d621576302e7cc36965d6ed53b8c73c4f", - "reference": "386a294d621576302e7cc36965d6ed53b8c73c4f", ->>>>>>> b32fe0ee785349997ed6e9dad1c83a69a0f2d463 "shasum": "" }, "require": { - "php": ">=5.5.9" + "php": "^5.5.9|>=7.0.8" }, "require-dev": { - "symfony/finder": "~2.8|~3.0", + "symfony/finder": "~2.8|~3.0|~4.0", "symfony/polyfill-apcu": "~1.1" }, "suggest": { @@ -2363,7 +2258,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.3-dev" + "dev-master": "3.4-dev" } }, "autoload": { @@ -2390,7 +2285,6 @@ ], "description": "Symfony ClassLoader Component", "homepage": "https://symfony.com", -<<<<<<< HEAD "time": "2018-10-31T09:06:03+00:00" }, { @@ -2405,51 +2299,35 @@ "type": "zip", "url": "https://api.github.com/repos/symfony/console/zipball/1d228fb4602047d7b26a0554e0d3efd567da5803", "reference": "1d228fb4602047d7b26a0554e0d3efd567da5803", -======= - "time": "2017-06-02 09:51:43" - }, - { - "name": "symfony/console", - "version": "v3.3.6", - "source": { - "type": "git", - "url": "https://github.com/symfony/console.git", - "reference": "b0878233cb5c4391347e5495089c7af11b8e6201" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/b0878233cb5c4391347e5495089c7af11b8e6201", - "reference": "b0878233cb5c4391347e5495089c7af11b8e6201", ->>>>>>> b32fe0ee785349997ed6e9dad1c83a69a0f2d463 "shasum": "" }, "require": { - "php": ">=5.5.9", - "symfony/debug": "~2.8|~3.0", + "php": "^5.5.9|>=7.0.8", + "symfony/debug": "~2.8|~3.0|~4.0", "symfony/polyfill-mbstring": "~1.0" }, "conflict": { - "symfony/dependency-injection": "<3.3" + "symfony/dependency-injection": "<3.4", + "symfony/process": "<3.3" }, "require-dev": { "psr/log": "~1.0", - "symfony/config": "~3.3", - "symfony/dependency-injection": "~3.3", - "symfony/event-dispatcher": "~2.8|~3.0", - "symfony/filesystem": "~2.8|~3.0", - "symfony/http-kernel": "~2.8|~3.0", - "symfony/process": "~2.8|~3.0" + "symfony/config": "~3.3|~4.0", + "symfony/dependency-injection": "~3.4|~4.0", + "symfony/event-dispatcher": "~2.8|~3.0|~4.0", + "symfony/lock": "~3.4|~4.0", + "symfony/process": "~3.3|~4.0" }, "suggest": { - "psr/log": "For using the console logger", + "psr/log-implementation": "For using the console logger", "symfony/event-dispatcher": "", - "symfony/filesystem": "", + "symfony/lock": "", "symfony/process": "" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.3-dev" + "dev-master": "3.4-dev" } }, "autoload": { @@ -2476,7 +2354,6 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", -<<<<<<< HEAD "time": "2018-10-30T16:50:50+00:00" }, { @@ -2491,31 +2368,15 @@ "type": "zip", "url": "https://api.github.com/repos/symfony/css-selector/zipball/d67de79a70a27d93c92c47f37ece958bf8de4d8a", "reference": "d67de79a70a27d93c92c47f37ece958bf8de4d8a", -======= - "time": "2017-07-29 21:27:59" - }, - { - "name": "symfony/css-selector", - "version": "v3.3.6", - "source": { - "type": "git", - "url": "https://github.com/symfony/css-selector.git", - "reference": "4d882dced7b995d5274293039370148e291808f2" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/4d882dced7b995d5274293039370148e291808f2", - "reference": "4d882dced7b995d5274293039370148e291808f2", ->>>>>>> b32fe0ee785349997ed6e9dad1c83a69a0f2d463 "shasum": "" }, "require": { - "php": ">=5.5.9" + "php": "^7.1.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.3-dev" + "dev-master": "4.1-dev" } }, "autoload": { @@ -2546,7 +2407,6 @@ ], "description": "Symfony CssSelector Component", "homepage": "https://symfony.com", -<<<<<<< HEAD "time": "2018-10-02T16:36:10+00:00" }, { @@ -2561,38 +2421,22 @@ "type": "zip", "url": "https://api.github.com/repos/symfony/debug/zipball/fe9793af008b651c5441bdeab21ede8172dab097", "reference": "fe9793af008b651c5441bdeab21ede8172dab097", -======= - "time": "2017-05-01 15:01:29" - }, - { - "name": "symfony/debug", - "version": "v3.3.6", - "source": { - "type": "git", - "url": "https://github.com/symfony/debug.git", - "reference": "7c13ae8ce1e2adbbd574fc39de7be498e1284e13" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/7c13ae8ce1e2adbbd574fc39de7be498e1284e13", - "reference": "7c13ae8ce1e2adbbd574fc39de7be498e1284e13", ->>>>>>> b32fe0ee785349997ed6e9dad1c83a69a0f2d463 "shasum": "" }, "require": { - "php": ">=5.5.9", + "php": "^5.5.9|>=7.0.8", "psr/log": "~1.0" }, "conflict": { "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2" }, "require-dev": { - "symfony/http-kernel": "~2.8|~3.0" + "symfony/http-kernel": "~2.8|~3.0|~4.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.3-dev" + "dev-master": "3.4-dev" } }, "autoload": { @@ -2619,7 +2463,6 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", -<<<<<<< HEAD "time": "2018-10-31T09:06:03+00:00" }, { @@ -2634,36 +2477,20 @@ "type": "zip", "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/552541dad078c85d9414b09c041ede488b456cd5", "reference": "552541dad078c85d9414b09c041ede488b456cd5", -======= - "time": "2017-07-28 15:27:31" - }, - { - "name": "symfony/event-dispatcher", - "version": "v3.3.6", - "source": { - "type": "git", - "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "67535f1e3fd662bdc68d7ba317c93eecd973617e" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/67535f1e3fd662bdc68d7ba317c93eecd973617e", - "reference": "67535f1e3fd662bdc68d7ba317c93eecd973617e", ->>>>>>> b32fe0ee785349997ed6e9dad1c83a69a0f2d463 "shasum": "" }, "require": { - "php": ">=5.5.9" + "php": "^7.1.3" }, "conflict": { - "symfony/dependency-injection": "<3.3" + "symfony/dependency-injection": "<3.4" }, "require-dev": { "psr/log": "~1.0", - "symfony/config": "~2.8|~3.0", - "symfony/dependency-injection": "~3.3", - "symfony/expression-language": "~2.8|~3.0", - "symfony/stopwatch": "~2.8|~3.0" + "symfony/config": "~3.4|~4.0", + "symfony/dependency-injection": "~3.4|~4.0", + "symfony/expression-language": "~3.4|~4.0", + "symfony/stopwatch": "~3.4|~4.0" }, "suggest": { "symfony/dependency-injection": "", @@ -2672,7 +2499,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.3-dev" + "dev-master": "4.1-dev" } }, "autoload": { @@ -2699,7 +2526,6 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", -<<<<<<< HEAD "time": "2018-10-10T13:52:42+00:00" }, { @@ -2714,31 +2540,15 @@ "type": "zip", "url": "https://api.github.com/repos/symfony/finder/zipball/54ba444dddc5bd5708a34bd095ea67c6eb54644d", "reference": "54ba444dddc5bd5708a34bd095ea67c6eb54644d", -======= - "time": "2017-06-09 14:53:08" - }, - { - "name": "symfony/finder", - "version": "v3.3.6", - "source": { - "type": "git", - "url": "https://github.com/symfony/finder.git", - "reference": "baea7f66d30854ad32988c11a09d7ffd485810c4" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/baea7f66d30854ad32988c11a09d7ffd485810c4", - "reference": "baea7f66d30854ad32988c11a09d7ffd485810c4", ->>>>>>> b32fe0ee785349997ed6e9dad1c83a69a0f2d463 "shasum": "" }, "require": { - "php": ">=5.5.9" + "php": "^5.5.9|>=7.0.8" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.3-dev" + "dev-master": "3.4-dev" } }, "autoload": { @@ -2765,7 +2575,6 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", -<<<<<<< HEAD "time": "2018-10-03T08:46:40+00:00" }, { @@ -2780,35 +2589,20 @@ "type": "zip", "url": "https://api.github.com/repos/symfony/http-foundation/zipball/5aea7a86ca3203dd7a257e765b4b9c9cfd01c6c0", "reference": "5aea7a86ca3203dd7a257e765b4b9c9cfd01c6c0", -======= - "time": "2017-06-01 21:01:25" - }, - { - "name": "symfony/http-foundation", - "version": "v3.3.6", - "source": { - "type": "git", - "url": "https://github.com/symfony/http-foundation.git", - "reference": "49e8cd2d59a7aa9bfab19e46de680c76e500a031" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/49e8cd2d59a7aa9bfab19e46de680c76e500a031", - "reference": "49e8cd2d59a7aa9bfab19e46de680c76e500a031", ->>>>>>> b32fe0ee785349997ed6e9dad1c83a69a0f2d463 "shasum": "" }, "require": { - "php": ">=5.5.9", - "symfony/polyfill-mbstring": "~1.1" + "php": "^5.5.9|>=7.0.8", + "symfony/polyfill-mbstring": "~1.1", + "symfony/polyfill-php70": "~1.6" }, "require-dev": { - "symfony/expression-language": "~2.8|~3.0" + "symfony/expression-language": "~2.8|~3.0|~4.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.3-dev" + "dev-master": "3.4-dev" } }, "autoload": { @@ -2835,7 +2629,6 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "https://symfony.com", -<<<<<<< HEAD "time": "2018-10-31T08:57:11+00:00" }, { @@ -2850,58 +2643,45 @@ "type": "zip", "url": "https://api.github.com/repos/symfony/http-kernel/zipball/4bf0be7c7fe63eff6a5eae2f21c83e77e31a56fb", "reference": "4bf0be7c7fe63eff6a5eae2f21c83e77e31a56fb", -======= - "time": "2017-07-21 11:04:46" - }, - { - "name": "symfony/http-kernel", - "version": "v3.3.6", - "source": { - "type": "git", - "url": "https://github.com/symfony/http-kernel.git", - "reference": "db10d05f1d95e4168e638db7a81c79616f568ea5" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/db10d05f1d95e4168e638db7a81c79616f568ea5", - "reference": "db10d05f1d95e4168e638db7a81c79616f568ea5", ->>>>>>> b32fe0ee785349997ed6e9dad1c83a69a0f2d463 "shasum": "" }, "require": { - "php": ">=5.5.9", + "php": "^5.5.9|>=7.0.8", "psr/log": "~1.0", - "symfony/debug": "~2.8|~3.0", - "symfony/event-dispatcher": "~2.8|~3.0", - "symfony/http-foundation": "~3.3" + "symfony/debug": "~2.8|~3.0|~4.0", + "symfony/event-dispatcher": "~2.8|~3.0|~4.0", + "symfony/http-foundation": "~3.4.12|~4.0.12|^4.1.1", + "symfony/polyfill-ctype": "~1.8" }, "conflict": { "symfony/config": "<2.8", - "symfony/dependency-injection": "<3.3", + "symfony/dependency-injection": "<3.4.10|<4.0.10,>=4", "symfony/var-dumper": "<3.3", "twig/twig": "<1.34|<2.4,>=2" }, + "provide": { + "psr/log-implementation": "1.0" + }, "require-dev": { "psr/cache": "~1.0", - "symfony/browser-kit": "~2.8|~3.0", + "symfony/browser-kit": "~2.8|~3.0|~4.0", "symfony/class-loader": "~2.8|~3.0", - "symfony/config": "~2.8|~3.0", - "symfony/console": "~2.8|~3.0", - "symfony/css-selector": "~2.8|~3.0", - "symfony/dependency-injection": "~3.3", - "symfony/dom-crawler": "~2.8|~3.0", - "symfony/expression-language": "~2.8|~3.0", - "symfony/finder": "~2.8|~3.0", - "symfony/process": "~2.8|~3.0", - "symfony/routing": "~2.8|~3.0", - "symfony/stopwatch": "~2.8|~3.0", - "symfony/templating": "~2.8|~3.0", - "symfony/translation": "~2.8|~3.0", - "symfony/var-dumper": "~3.3" + "symfony/config": "~2.8|~3.0|~4.0", + "symfony/console": "~2.8|~3.0|~4.0", + "symfony/css-selector": "~2.8|~3.0|~4.0", + "symfony/dependency-injection": "^3.4.10|^4.0.10", + "symfony/dom-crawler": "~2.8|~3.0|~4.0", + "symfony/expression-language": "~2.8|~3.0|~4.0", + "symfony/finder": "~2.8|~3.0|~4.0", + "symfony/process": "~2.8|~3.0|~4.0", + "symfony/routing": "~3.4|~4.0", + "symfony/stopwatch": "~2.8|~3.0|~4.0", + "symfony/templating": "~2.8|~3.0|~4.0", + "symfony/translation": "~2.8|~3.0|~4.0", + "symfony/var-dumper": "~3.3|~4.0" }, "suggest": { "symfony/browser-kit": "", - "symfony/class-loader": "", "symfony/config": "", "symfony/console": "", "symfony/dependency-injection": "", @@ -2911,7 +2691,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.3-dev" + "dev-master": "3.4-dev" } }, "autoload": { @@ -2938,11 +2718,7 @@ ], "description": "Symfony HttpKernel Component", "homepage": "https://symfony.com", -<<<<<<< HEAD "time": "2018-11-03T10:03:02+00:00" -======= - "time": "2017-08-01 10:25:59" ->>>>>>> b32fe0ee785349997ed6e9dad1c83a69a0f2d463 }, { "name": "symfony/polyfill-ctype", @@ -3000,7 +2776,7 @@ "polyfill", "portable" ], - "time": "2018-08-06 14:22:27" + "time": "2018-08-06T14:22:27+00:00" }, { "name": "symfony/polyfill-mbstring", @@ -3059,7 +2835,6 @@ "portable", "shim" ], -<<<<<<< HEAD "time": "2018-09-21T13:07:52+00:00" }, { @@ -3133,31 +2908,15 @@ "type": "zip", "url": "https://api.github.com/repos/symfony/process/zipball/35c2914a9f50519bd207164c353ae4d59182c2cb", "reference": "35c2914a9f50519bd207164c353ae4d59182c2cb", -======= - "time": "2018-08-06 14:22:27" - }, - { - "name": "symfony/process", - "version": "v3.3.6", - "source": { - "type": "git", - "url": "https://github.com/symfony/process.git", - "reference": "07432804942b9f6dd7b7377faf9920af5f95d70a" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/07432804942b9f6dd7b7377faf9920af5f95d70a", - "reference": "07432804942b9f6dd7b7377faf9920af5f95d70a", ->>>>>>> b32fe0ee785349997ed6e9dad1c83a69a0f2d463 "shasum": "" }, "require": { - "php": ">=5.5.9" + "php": "^5.5.9|>=7.0.8" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.3-dev" + "dev-master": "3.4-dev" } }, "autoload": { @@ -3184,42 +2943,39 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", -<<<<<<< HEAD "time": "2018-10-14T17:33:21+00:00" -======= - "time": "2017-07-13 13:05:09" ->>>>>>> b32fe0ee785349997ed6e9dad1c83a69a0f2d463 }, { "name": "symfony/psr-http-message-bridge", - "version": "v1.0.2", + "version": "v1.1.0", "source": { "type": "git", "url": "https://github.com/symfony/psr-http-message-bridge.git", - "reference": "c2b757934f2d9681a287e662efbc27c41fe8ef86" + "reference": "53c15a6a7918e6c2ab16ae370ea607fb40cab196" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/psr-http-message-bridge/zipball/c2b757934f2d9681a287e662efbc27c41fe8ef86", - "reference": "c2b757934f2d9681a287e662efbc27c41fe8ef86", + "url": "https://api.github.com/repos/symfony/psr-http-message-bridge/zipball/53c15a6a7918e6c2ab16ae370ea607fb40cab196", + "reference": "53c15a6a7918e6c2ab16ae370ea607fb40cab196", "shasum": "" }, "require": { - "php": ">=5.3.3", - "psr/http-message": "~1.0", - "symfony/http-foundation": "~2.3|~3.0|~4.0" + "php": "^5.3.3 || ^7.0", + "psr/http-message": "^1.0", + "symfony/http-foundation": "^2.3.42 || ^3.4 || ^4.0" }, "require-dev": { - "symfony/phpunit-bridge": "~3.2|4.0" + "symfony/phpunit-bridge": "^3.4 || 4.0" }, "suggest": { + "psr/http-factory-implementation": "To use the PSR-17 factory", "psr/http-message-implementation": "To use the HttpFoundation factory", "zendframework/zend-diactoros": "To use the Zend Diactoros factory" }, "type": "symfony-bridge", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "1.1-dev" } }, "autoload": { @@ -3248,11 +3004,10 @@ "http-message", "psr-7" ], - "time": "2017-12-19 00:31:44" + "time": "2018-08-30T16:28:28+00:00" }, { "name": "symfony/routing", -<<<<<<< HEAD "version": "v3.4.18", "source": { "type": "git", @@ -3263,37 +3018,24 @@ "type": "zip", "url": "https://api.github.com/repos/symfony/routing/zipball/585f6e2d740393d546978769dd56e496a6233e0b", "reference": "585f6e2d740393d546978769dd56e496a6233e0b", -======= - "version": "v3.3.6", - "source": { - "type": "git", - "url": "https://github.com/symfony/routing.git", - "reference": "4aee1a917fd4859ff8b51b9fd1dfb790a5ecfa26" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/4aee1a917fd4859ff8b51b9fd1dfb790a5ecfa26", - "reference": "4aee1a917fd4859ff8b51b9fd1dfb790a5ecfa26", ->>>>>>> b32fe0ee785349997ed6e9dad1c83a69a0f2d463 "shasum": "" }, "require": { - "php": ">=5.5.9" + "php": "^5.5.9|>=7.0.8" }, "conflict": { - "symfony/config": "<2.8", + "symfony/config": "<3.3.1", "symfony/dependency-injection": "<3.3", - "symfony/yaml": "<3.3" + "symfony/yaml": "<3.4" }, "require-dev": { "doctrine/annotations": "~1.0", - "doctrine/common": "~2.2", "psr/log": "~1.0", - "symfony/config": "~2.8|~3.0", - "symfony/dependency-injection": "~3.3", - "symfony/expression-language": "~2.8|~3.0", - "symfony/http-foundation": "~2.8|~3.0", - "symfony/yaml": "~3.3" + "symfony/config": "^3.3.1|~4.0", + "symfony/dependency-injection": "~3.3|~4.0", + "symfony/expression-language": "~2.8|~3.0|~4.0", + "symfony/http-foundation": "~2.8|~3.0|~4.0", + "symfony/yaml": "~3.4|~4.0" }, "suggest": { "doctrine/annotations": "For using the annotation loader", @@ -3306,7 +3048,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.3-dev" + "dev-master": "3.4-dev" } }, "autoload": { @@ -3339,7 +3081,6 @@ "uri", "url" ], -<<<<<<< HEAD "time": "2018-10-02T12:28:39+00:00" }, { @@ -3354,47 +3095,35 @@ "type": "zip", "url": "https://api.github.com/repos/symfony/translation/zipball/aa04dc1c75b7d3da7bd7003104cd0cfc5dff635c", "reference": "aa04dc1c75b7d3da7bd7003104cd0cfc5dff635c", -======= - "time": "2017-07-21 17:43:13" - }, - { - "name": "symfony/translation", - "version": "v3.3.6", - "source": { - "type": "git", - "url": "https://github.com/symfony/translation.git", - "reference": "35dd5fb003c90e8bd4d8cabdf94bf9c96d06fdc3" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/35dd5fb003c90e8bd4d8cabdf94bf9c96d06fdc3", - "reference": "35dd5fb003c90e8bd4d8cabdf94bf9c96d06fdc3", ->>>>>>> b32fe0ee785349997ed6e9dad1c83a69a0f2d463 "shasum": "" }, "require": { - "php": ">=5.5.9", + "php": "^7.1.3", "symfony/polyfill-mbstring": "~1.0" }, "conflict": { - "symfony/config": "<2.8", - "symfony/yaml": "<3.3" + "symfony/config": "<3.4", + "symfony/dependency-injection": "<3.4", + "symfony/yaml": "<3.4" }, "require-dev": { "psr/log": "~1.0", - "symfony/config": "~2.8|~3.0", - "symfony/intl": "^2.8.18|^3.2.5", - "symfony/yaml": "~3.3" + "symfony/config": "~3.4|~4.0", + "symfony/console": "~3.4|~4.0", + "symfony/dependency-injection": "~3.4|~4.0", + "symfony/finder": "~2.8|~3.0|~4.0", + "symfony/intl": "~3.4|~4.0", + "symfony/yaml": "~3.4|~4.0" }, "suggest": { - "psr/log": "To use logging capability in translator", + "psr/log-implementation": "To use logging capability in translator", "symfony/config": "", "symfony/yaml": "" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.3-dev" + "dev-master": "4.1-dev" } }, "autoload": { @@ -3421,7 +3150,6 @@ ], "description": "Symfony Translation Component", "homepage": "https://symfony.com", -<<<<<<< HEAD "time": "2018-10-28T18:38:52+00:00" }, { @@ -3436,26 +3164,10 @@ "type": "zip", "url": "https://api.github.com/repos/symfony/var-dumper/zipball/ff8ac19e97e5c7c3979236b584719a1190f84181", "reference": "ff8ac19e97e5c7c3979236b584719a1190f84181", -======= - "time": "2017-06-24 16:45:30" - }, - { - "name": "symfony/var-dumper", - "version": "v3.3.6", - "source": { - "type": "git", - "url": "https://github.com/symfony/var-dumper.git", - "reference": "b2623bccb969ad595c2090f9be498b74670d0663" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/b2623bccb969ad595c2090f9be498b74670d0663", - "reference": "b2623bccb969ad595c2090f9be498b74670d0663", ->>>>>>> b32fe0ee785349997ed6e9dad1c83a69a0f2d463 "shasum": "" }, "require": { - "php": ">=5.5.9", + "php": "^5.5.9|>=7.0.8", "symfony/polyfill-mbstring": "~1.0" }, "conflict": { @@ -3467,12 +3179,13 @@ }, "suggest": { "ext-iconv": "To convert non-UTF-8 strings to UTF-8 (or symfony/polyfill-iconv in case ext-iconv cannot be used).", + "ext-intl": "To show region name in time zone dump", "ext-symfony_debug": "" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.3-dev" + "dev-master": "3.4-dev" } }, "autoload": { @@ -3506,11 +3219,7 @@ "debug", "dump" ], -<<<<<<< HEAD "time": "2018-10-02T16:33:53+00:00" -======= - "time": "2017-07-28 06:06:09" ->>>>>>> b32fe0ee785349997ed6e9dad1c83a69a0f2d463 }, { "name": "tijsverkoyen/css-to-inline-styles", @@ -3557,7 +3266,7 @@ ], "description": "CssToInlineStyles is a class that enables you to convert HTML-pages/files into HTML-pages/files with inline styles. This is very useful when you're sending emails.", "homepage": "https://github.com/tijsverkoyen/CssToInlineStyles", - "time": "2017-11-27 11:13:29" + "time": "2017-11-27T11:13:29+00:00" }, { "name": "vlucas/phpdotenv", @@ -3607,11 +3316,10 @@ "env", "environment" ], - "time": "2018-07-29 20:33:41" + "time": "2018-07-29T20:33:41+00:00" }, { "name": "yansongda/pay", -<<<<<<< HEAD "version": "v1.3.4", "source": { "type": "git", @@ -3627,27 +3335,6 @@ "require": { "guzzlehttp/guzzle": "^6.3", "php": ">=5.6" -======= - "version": "v2.5.1", - "source": { - "type": "git", - "url": "https://github.com/yansongda/pay.git", - "reference": "c0466d7762f5fbb761478f6b20453256fb8706f2" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/yansongda/pay/zipball/c0466d7762f5fbb761478f6b20453256fb8706f2", - "reference": "c0466d7762f5fbb761478f6b20453256fb8706f2", - "shasum": "" - }, - "require": { - "ext-openssl": "*", - "ext-simplexml": "*", - "monolog/monolog": "^1.23", - "php": ">=7.0", - "symfony/http-foundation": "^3.0|^4.0", - "yansongda/supports": "^1.8" ->>>>>>> b32fe0ee785349997ed6e9dad1c83a69a0f2d463 }, "require-dev": { "phpunit/phpunit": "^6.2" @@ -3674,57 +3361,7 @@ "pay", "wechat" ], -<<<<<<< HEAD "time": "2018-08-25T07:22:30+00:00" -======= - "time": "2018-10-10 16:05:22" - }, - { - "name": "yansongda/supports", - "version": "v1.8.3", - "source": { - "type": "git", - "url": "https://github.com/yansongda/supports.git", - "reference": "2e295667942f7bb2453b09fba8f86a5a03cba55e" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/yansongda/supports/zipball/2e295667942f7bb2453b09fba8f86a5a03cba55e", - "reference": "2e295667942f7bb2453b09fba8f86a5a03cba55e", - "shasum": "" - }, - "require": { - "guzzlehttp/guzzle": "^6.2", - "monolog/monolog": "^1.23", - "php": ">=5.5" - }, - "type": "library", - "autoload": { - "psr-4": { - "Yansongda\\Supports\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "yansongda", - "email": "me@yansongda.cn" - } - ], - "description": "common components", - "keywords": [ - "Guzzle", - "array", - "collection", - "config", - "http", - "support" - ], - "time": "2018-09-13 06:47:49" ->>>>>>> b32fe0ee785349997ed6e9dad1c83a69a0f2d463 }, { "name": "zendframework/zend-diactoros", @@ -3788,11 +3425,7 @@ "psr", "psr-7" ], -<<<<<<< HEAD "time": "2018-09-05T19:29:37+00:00" -======= - "time": "2018-09-05 19:29:37" ->>>>>>> b32fe0ee785349997ed6e9dad1c83a69a0f2d463 }, { "name": "zgldh/qiniu-laravel-storage", @@ -3851,42 +3484,38 @@ "sdk", "storage" ], -<<<<<<< HEAD "time": "2018-09-15T15:25:43+00:00" -======= - "time": "2018-09-15 15:25:43" ->>>>>>> b32fe0ee785349997ed6e9dad1c83a69a0f2d463 } ], "packages-dev": [ { "name": "doctrine/instantiator", - "version": "1.0.5", + "version": "1.1.0", "source": { "type": "git", "url": "https://github.com/doctrine/instantiator.git", - "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d" + "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d", - "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda", + "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda", "shasum": "" }, "require": { - "php": ">=5.3,<8.0-DEV" + "php": "^7.1" }, "require-dev": { "athletic/athletic": "~0.1.8", "ext-pdo": "*", "ext-phar": "*", - "phpunit/phpunit": "~4.0", - "squizlabs/php_codesniffer": "~2.0" + "phpunit/phpunit": "^6.2.3", + "squizlabs/php_codesniffer": "^3.0.2" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.2.x-dev" } }, "autoload": { @@ -3911,7 +3540,7 @@ "constructor", "instantiate" ], - "time": "2015-06-14 21:17:01" + "time": "2017-07-22T11:58:36+00:00" }, { "name": "fzaninotto/faker", @@ -3961,7 +3590,7 @@ "faker", "fixtures" ], - "time": "2018-07-12 10:23:15" + "time": "2018-07-12T10:23:15+00:00" }, { "name": "hamcrest/hamcrest-php", @@ -4006,7 +3635,7 @@ "keywords": [ "test" ], - "time": "2015-05-11 14:41:42" + "time": "2015-05-11T14:41:42+00:00" }, { "name": "mockery/mockery", @@ -4071,29 +3700,32 @@ "test double", "testing" ], - "time": "2017-02-28 12:52:32" + "time": "2017-02-28T12:52:32+00:00" }, { "name": "myclabs/deep-copy", - "version": "1.7.0", + "version": "1.8.1", "source": { "type": "git", "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e" + "reference": "3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e", - "reference": "3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8", + "reference": "3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8", "shasum": "" }, "require": { - "php": "^5.6 || ^7.0" + "php": "^7.1" + }, + "replace": { + "myclabs/deep-copy": "self.version" }, "require-dev": { "doctrine/collections": "^1.0", "doctrine/common": "^2.6", - "phpunit/phpunit": "^4.1" + "phpunit/phpunit": "^7.1" }, "type": "library", "autoload": { @@ -4116,7 +3748,7 @@ "object", "object graph" ], - "time": "2017-10-19 19:58:43" + "time": "2018-06-11T23:09:50+00:00" }, { "name": "phpdocumentor/reflection-common", @@ -4170,7 +3802,7 @@ "reflection", "static analysis" ], - "time": "2017-09-11 18:02:19" + "time": "2017-09-11T18:02:19+00:00" }, { "name": "phpdocumentor/reflection-docblock", @@ -4221,7 +3853,7 @@ } ], "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", - "time": "2017-11-30 07:14:17" + "time": "2017-11-30T07:14:17+00:00" }, { "name": "phpdocumentor/type-resolver", @@ -4268,7 +3900,7 @@ "email": "me@mikevanriel.com" } ], - "time": "2017-07-14 14:27:02" + "time": "2017-07-14T14:27:02+00:00" }, { "name": "phpspec/prophecy", @@ -4331,7 +3963,7 @@ "spy", "stub" ], - "time": "2018-08-05 17:53:17" + "time": "2018-08-05T17:53:17+00:00" }, { "name": "phpunit/php-code-coverage", @@ -4394,7 +4026,7 @@ "testing", "xunit" ], - "time": "2017-04-02 07:44:40" + "time": "2017-04-02T07:44:40+00:00" }, { "name": "phpunit/php-file-iterator", @@ -4441,7 +4073,7 @@ "filesystem", "iterator" ], - "time": "2017-11-27 13:52:08" + "time": "2017-11-27T13:52:08+00:00" }, { "name": "phpunit/php-text-template", @@ -4482,7 +4114,7 @@ "keywords": [ "template" ], - "time": "2015-06-21 13:50:34" + "time": "2015-06-21T13:50:34+00:00" }, { "name": "phpunit/php-timer", @@ -4531,7 +4163,7 @@ "keywords": [ "timer" ], - "time": "2017-02-26 11:10:40" + "time": "2017-02-26T11:10:40+00:00" }, { "name": "phpunit/php-token-stream", @@ -4580,7 +4212,7 @@ "keywords": [ "tokenizer" ], - "time": "2017-11-27 05:48:46" + "time": "2017-11-27T05:48:46+00:00" }, { "name": "phpunit/phpunit", @@ -4662,7 +4294,7 @@ "testing", "xunit" ], - "time": "2018-02-01 05:50:59" + "time": "2018-02-01T05:50:59+00:00" }, { "name": "phpunit/phpunit-mock-objects", @@ -4721,7 +4353,7 @@ "mock", "xunit" ], - "time": "2017-06-30 09:13:00" + "time": "2017-06-30T09:13:00+00:00" }, { "name": "sebastian/code-unit-reverse-lookup", @@ -4766,7 +4398,7 @@ ], "description": "Looks up which function or method a line of code belongs to", "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/", - "time": "2017-03-04 06:30:41" + "time": "2017-03-04T06:30:41+00:00" }, { "name": "sebastian/comparator", @@ -4830,7 +4462,7 @@ "compare", "equality" ], - "time": "2017-01-29 09:50:25" + "time": "2017-01-29T09:50:25+00:00" }, { "name": "sebastian/diff", @@ -4882,7 +4514,7 @@ "keywords": [ "diff" ], - "time": "2017-05-22 07:24:03" + "time": "2017-05-22T07:24:03+00:00" }, { "name": "sebastian/environment", @@ -4932,7 +4564,7 @@ "environment", "hhvm" ], - "time": "2016-11-26 07:53:53" + "time": "2016-11-26T07:53:53+00:00" }, { "name": "sebastian/exporter", @@ -4999,7 +4631,7 @@ "export", "exporter" ], - "time": "2016-11-19 08:54:04" + "time": "2016-11-19T08:54:04+00:00" }, { "name": "sebastian/global-state", @@ -5050,7 +4682,7 @@ "keywords": [ "global state" ], - "time": "2015-10-12 03:26:01" + "time": "2015-10-12T03:26:01+00:00" }, { "name": "sebastian/object-enumerator", @@ -5096,7 +4728,7 @@ ], "description": "Traverses array structures and object graphs to enumerate all referenced objects", "homepage": "https://github.com/sebastianbergmann/object-enumerator/", - "time": "2017-02-18 15:18:39" + "time": "2017-02-18T15:18:39+00:00" }, { "name": "sebastian/recursion-context", @@ -5149,7 +4781,7 @@ ], "description": "Provides functionality to recursively process PHP variables", "homepage": "http://www.github.com/sebastianbergmann/recursion-context", - "time": "2016-11-19 07:33:16" + "time": "2016-11-19T07:33:16+00:00" }, { "name": "sebastian/resource-operations", @@ -5191,7 +4823,7 @@ ], "description": "Provides a list of PHP built-in functions that operate on resources", "homepage": "https://www.github.com/sebastianbergmann/resource-operations", - "time": "2015-07-28 20:34:47" + "time": "2015-07-28T20:34:47+00:00" }, { "name": "sebastian/version", @@ -5234,11 +4866,10 @@ ], "description": "Library that helps with managing the version number of Git-hosted PHP projects", "homepage": "https://github.com/sebastianbergmann/version", - "time": "2016-10-03 07:35:21" + "time": "2016-10-03T07:35:21+00:00" }, { "name": "symfony/yaml", -<<<<<<< HEAD "version": "v4.1.7", "source": { "type": "git", @@ -5249,25 +4880,17 @@ "type": "zip", "url": "https://api.github.com/repos/symfony/yaml/zipball/367e689b2fdc19965be435337b50bc8adf2746c9", "reference": "367e689b2fdc19965be435337b50bc8adf2746c9", -======= - "version": "v3.3.6", - "source": { - "type": "git", - "url": "https://github.com/symfony/yaml.git", - "reference": "ddc23324e6cfe066f3dd34a37ff494fa80b617ed" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/ddc23324e6cfe066f3dd34a37ff494fa80b617ed", - "reference": "ddc23324e6cfe066f3dd34a37ff494fa80b617ed", ->>>>>>> b32fe0ee785349997ed6e9dad1c83a69a0f2d463 "shasum": "" }, "require": { - "php": ">=5.5.9" + "php": "^7.1.3", + "symfony/polyfill-ctype": "~1.8" + }, + "conflict": { + "symfony/console": "<3.4" }, "require-dev": { - "symfony/console": "~2.8|~3.0" + "symfony/console": "~3.4|~4.0" }, "suggest": { "symfony/console": "For validating YAML files using the lint command" @@ -5275,7 +4898,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.3-dev" + "dev-master": "4.1-dev" } }, "autoload": { @@ -5302,11 +4925,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", -<<<<<<< HEAD "time": "2018-10-02T16:36:10+00:00" -======= - "time": "2017-07-23 12:43:26" ->>>>>>> b32fe0ee785349997ed6e9dad1c83a69a0f2d463 }, { "name": "webmozart/assert", @@ -5356,7 +4975,7 @@ "check", "validate" ], - "time": "2018-01-29 19:49:41" + "time": "2018-01-29T19:49:41+00:00" } ], "aliases": [], diff --git a/resources/views/Api/tool/index.blade.php b/resources/views/Api/tool/index.blade.php index 0497049..f496ea2 100644 --- a/resources/views/Api/tool/index.blade.php +++ b/resources/views/Api/tool/index.blade.php @@ -93,11 +93,8 @@ EOF;
扩展说明 : 多附件上传
-<<<<<<< HEAD 使用范例 : >>>>>> b32fe0ee785349997ed6e9dad1c83a69a0f2d463 @component('Api.tool.file',["id"=>"","file"=>obj]) @endcomponent
@@ -118,11 +115,8 @@ EOF;
扩展说明 : 单附件上传
-<<<<<<< HEAD 使用范例 : >>>>>> b32fe0ee785349997ed6e9dad1c83a69a0f2d463 @component('Api.tool.one',["id"=>"","file"=>obj]) @endcomponent
@@ -143,11 +137,8 @@ EOF;
扩展说明 : 视频上传
-<<<<<<< HEAD 使用说明 : >>>>>> b32fe0ee785349997ed6e9dad1c83a69a0f2d463 @component('Api.tool.video') @endcomponent EOF; @@ -159,7 +150,6 @@ EOF; @endif -<<<<<<< HEAD @if($type ==7)
@@ -236,6 +226,4 @@ EOF;
@endif -======= ->>>>>>> b32fe0ee785349997ed6e9dad1c83a69a0f2d463 @endsection \ No newline at end of file -- Gitee From 0cd3b1d5029e190de9bf4cd80da0889578a6b51d Mon Sep 17 00:00:00 2001 From: sunyaming <1178889246@qq.com> Date: Fri, 16 Nov 2018 15:35:25 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=96=B0=E5=A2=9E=E5=92=8C=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/Api/UserController.php | 50 +++++++++++---------- resources/views/Api/user/create.blade.php | 34 +++++++++++++- 2 files changed, 59 insertions(+), 25 deletions(-) diff --git a/app/Http/Controllers/Api/UserController.php b/app/Http/Controllers/Api/UserController.php index 82d2d91..aa0f98f 100644 --- a/app/Http/Controllers/Api/UserController.php +++ b/app/Http/Controllers/Api/UserController.php @@ -10,6 +10,7 @@ use App\Utils\ConstantUtil; use Illuminate\Http\Request; use App\Http\Controllers\Controller; use App\Models\User; + class UserController extends Controller { /** @@ -18,17 +19,17 @@ class UserController extends Controller function index(Request $request) { $select['id'] = $request->input("id"); - $page = $request->input("page",1); - $list = User::where("type",ConstantUtil::USER_NORMAL)->orderBy("id","desc"); - if (!empty($select['id'])) $list = $list->where("id",$select['id']); + $page = $request->input("page", 1); + $list = User::where("type", ConstantUtil::USER_NORMAL)->orderBy("id", "desc"); + if (!empty($select['id'])) $list = $list->where("id", $select['id']); $num = ConstantUtil::PAGE_SHOW; $list = $list->paginate($num); $count = $list->total(); - foreach($list as &$lists) { - $lists["xh"] = $count - ($page-1)*$num; + foreach ($list as &$lists) { + $lists["xh"] = $count - ($page - 1) * $num; $count--; } - return view('Api/user/index',["list"=>$list,"select"=>$select]); + return view('Api/user/index', ["list" => $list, "select" => $select]); } /** @@ -46,14 +47,17 @@ class UserController extends Controller { $input = $request->input(); $obj = new User(); - foreach($input as $key => $val) { - $obj->$key = $val; - } + $obj->name = $input['name']; + $obj->email = $input['name']; + $obj->realname = $input['realname']; + $obj->openid = $input['openid']; + $obj->sex = $input['sex']; + $obj->mobile = $input['mobile']; $result = $obj->save(); if ($result) { - return response()->json(['code'=> CodeUtil::SUCCESS,"msg"=> "操作成功!"]); + return response()->json(['code' => CodeUtil::SUCCESS, "msg" => "操作成功!"]); } else { - return response()->json(['code'=> CodeUtil::API_ERROR,"msg"=> "操作失败!"]); + return response()->json(['code' => CodeUtil::API_ERROR, "msg" => "操作失败!"]); } } @@ -62,9 +66,9 @@ class UserController extends Controller */ function read(Request $request) { - $list = User::where("id",$request->input("id"))->first(); - if(empty($list)) return response()->json(['code'=> CodeUtil::API_ERROR,"msg"=> "数据不存在!"]); - return view('Api/user/read',["list"=>$list]); + $list = User::where("id", $request->input("id"))->first(); + if (empty($list)) return response()->json(['code' => CodeUtil::API_ERROR, "msg" => "数据不存在!"]); + return view('Api/user/read', ["list" => $list]); } /** @@ -74,9 +78,9 @@ class UserController extends Controller { $id = $request->input("id"); $list = User::find($id); - if(empty($list)) return response()->view("errors::数据不存在"); - return view('Api/user/edit',[ - 'list' => $list, + if (empty($list)) return response()->view("errors::数据不存在"); + return view('Api/user/edit', [ + 'list' => $list, ]); } @@ -88,8 +92,8 @@ class UserController extends Controller $id = $request->input("id"); $data = $request->input(); unset($data["id"]); - User::where("id",$id)->update($data); - return response()->json(['code'=> CodeUtil::SUCCESS,"msg"=> "操作成功!"]); + User::where("id", $id)->update($data); + return response()->json(['code' => CodeUtil::SUCCESS, "msg" => "操作成功!"]); } /** @@ -97,10 +101,10 @@ class UserController extends Controller */ function delete(Request $request) { - $id = $request->input("id"); + $id = $request->input("id"); if (!is_array($id)) $id = [$id]; - if(empty($id)) return response()->view("errors::数据不存在"); - User::whereIn("id",$id)->delete(); - return response()->json(['code'=> CodeUtil::SUCCESS,"msg"=> "删除成功!"]); + if (empty($id)) return response()->view("errors::数据不存在"); + User::whereIn("id", $id)->delete(); + return response()->json(['code' => CodeUtil::SUCCESS, "msg" => "删除成功!"]); } } diff --git a/resources/views/Api/user/create.blade.php b/resources/views/Api/user/create.blade.php index 4db75d9..e7f9277 100644 --- a/resources/views/Api/user/create.blade.php +++ b/resources/views/Api/user/create.blade.php @@ -6,10 +6,40 @@
- +
+ class="layui-input" lay-verify="required" lay-verType="tips"> +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
-- Gitee From facace8030dc32106c6178dce318ff78be821e69 Mon Sep 17 00:00:00 2001 From: sunyaming <1178889246@qq.com> Date: Fri, 16 Nov 2018 15:35:47 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=96=B0=E5=A2=9E=E5=92=8C=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- laravel_system.sql | 458 ++++++++++++----------- resources/views/Api/user/edit.blade.php | 42 ++- resources/views/Api/user/index.blade.php | 32 +- 3 files changed, 305 insertions(+), 227 deletions(-) diff --git a/laravel_system.sql b/laravel_system.sql index 3e2bb9d..0cae9b1 100644 --- a/laravel_system.sql +++ b/laravel_system.sql @@ -1,390 +1,418 @@ /* - Navicat Premium Data Transfer +Navicat MySQL Data Transfer - Source Server : 47.104.81.185 - Source Server Type : MySQL - Source Server Version : 50553 - Source Host : 47.104.81.185:3306 - Source Schema : laravel_system +Source Server : 127.0.0.1 +Source Server Version : 50718 +Source Host : localhost:3306 +Source Database : laravel_system - Target Server Type : MySQL - Target Server Version : 50553 - File Encoding : 65001 +Target Server Type : MYSQL +Target Server Version : 50718 +File Encoding : 65001 - Date: 30/10/2018 08:47:16 +Date: 2018-11-16 14:51:57 */ -SET NAMES utf8mb4; -SET FOREIGN_KEY_CHECKS = 0; +SET FOREIGN_KEY_CHECKS=0; -- ---------------------------- -- Table structure for auth_relations -- ---------------------------- DROP TABLE IF EXISTS `auth_relations`; -CREATE TABLE `auth_relations` ( - `id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT, +CREATE TABLE `auth_relations` ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, `uid` int(11) DEFAULT NULL, `group_id` int(11) DEFAULT NULL, - `created_at` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', - `updated_at` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `created_at` timestamp NULL DEFAULT '0000-00-00 00:00:00' ON UPDATE CURRENT_TIMESTAMP, + `updated_at` timestamp NULL DEFAULT '0000-00-00 00:00:00' ON UPDATE CURRENT_TIMESTAMP, PRIMARY KEY (`id`) USING BTREE -) ENGINE = MyISAM AUTO_INCREMENT = 17 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '关联表' ROW_FORMAT = Fixed; +) ENGINE=MyISAM AUTO_INCREMENT=17 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=FIXED COMMENT='关联表'; -- ---------------------------- -- Records of auth_relations -- ---------------------------- -INSERT INTO `auth_relations` VALUES (16, 6, 2, '2018-10-29 21:54:17', '2018-10-29 21:54:23'); -INSERT INTO `auth_relations` VALUES (15, 6, 1, '2018-10-29 21:54:17', '2018-10-29 21:54:23'); +INSERT INTO `auth_relations` VALUES ('16', '6', '2', '2018-10-29 21:54:17', '2018-10-29 21:54:23'); +INSERT INTO `auth_relations` VALUES ('15', '6', '1', '2018-10-29 21:54:17', '2018-10-29 21:54:23'); -- ---------------------------- -- Table structure for auth_roles -- ---------------------------- DROP TABLE IF EXISTS `auth_roles`; -CREATE TABLE `auth_roles` ( - `id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT, - `title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, - `rules` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, - `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, - `status` int(11) NOT NULL DEFAULT 1 COMMENT '1[启用]2[禁用]', - `created_at` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', - `updated_at` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', +CREATE TABLE `auth_roles` ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `title` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL, + `rules` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL, + `remark` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL, + `status` int(11) NOT NULL DEFAULT '1' COMMENT '1[启用]2[禁用]', + `created_at` timestamp NULL DEFAULT '0000-00-00 00:00:00' ON UPDATE CURRENT_TIMESTAMP, + `updated_at` timestamp NULL DEFAULT '0000-00-00 00:00:00' ON UPDATE CURRENT_TIMESTAMP, PRIMARY KEY (`id`) USING BTREE -) ENGINE = MyISAM AUTO_INCREMENT = 6 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '角色表' ROW_FORMAT = Dynamic; +) ENGINE=MyISAM AUTO_INCREMENT=6 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='角色表'; -- ---------------------------- -- Records of auth_roles -- ---------------------------- -INSERT INTO `auth_roles` VALUES (1, '管理员', '1,2,34,36,35,8,9,32,10,11,12,13,14,15,24,31,25,26,27,28,29,16,30,17,18,19,20,21,22,23,37,41,42,43,44,45,46,47,38,39,40', '系统初始化数据，不能修改删除!', 1, '0000-00-00 00:00:00', '0000-00-00 00:00:00'); -INSERT INTO `auth_roles` VALUES (2, '新闻编辑', '2,34,36,1', '', 1, '0000-00-00 00:00:00', '0000-00-00 00:00:00'); +INSERT INTO `auth_roles` VALUES ('1', '管理员', '1,2,34,36,35,8,9,32,10,11,12,13,14,15,24,31,25,26,27,28,29,16,30,17,18,19,20,21,22,23,37,41,42,43,44,45,46,47,38,39,40', '系统初始化数据，不能修改删除!', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'); +INSERT INTO `auth_roles` VALUES ('2', '新闻编辑', '2,34,36,1', '', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'); -- ---------------------------- -- Table structure for auth_rules -- ---------------------------- DROP TABLE IF EXISTS `auth_rules`; -CREATE TABLE `auth_rules` ( - `id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT, - `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, - `title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, - `type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, - `condition` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, - `parent_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, - `level` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, +CREATE TABLE `auth_rules` ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `name` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL, + `title` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL, + `type` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL, + `condition` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL, + `parent_id` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL, + `level` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL, `sort` int(11) DEFAULT NULL, - `status` int(11) DEFAULT 1 COMMENT '1[启用]2[禁用]', - `created_at` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', - `updated_at` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `status` int(11) DEFAULT '1' COMMENT '1[启用]2[禁用]', + `created_at` timestamp NULL DEFAULT '0000-00-00 00:00:00' ON UPDATE CURRENT_TIMESTAMP, + `updated_at` timestamp NULL DEFAULT '0000-00-00 00:00:00' ON UPDATE CURRENT_TIMESTAMP, PRIMARY KEY (`id`) USING BTREE -) ENGINE = MyISAM AUTO_INCREMENT = 63 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '规则表' ROW_FORMAT = Dynamic; +) ENGINE=MyISAM AUTO_INCREMENT=63 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='规则表'; -- ---------------------------- -- Records of auth_rules -- ---------------------------- -INSERT INTO `auth_rules` VALUES (1, 'Index_index', '控制台', '1', NULL, '0', '1', 100, 1, '0000-00-00 00:00:00', '2018-09-25 03:23:08'); -INSERT INTO `auth_rules` VALUES (2, 'SysConfig', '系统设置', '1', '', '0', '1', 99, 1, '0000-00-00 00:00:00', '0000-00-00 00:00:00'); -INSERT INTO `auth_rules` VALUES (8, 'Admin', '用户管理', '1', '', '0', '1', 90, 1, '0000-00-00 00:00:00', '0000-00-00 00:00:00'); -INSERT INTO `auth_rules` VALUES (9, 'Admin_index', '管理员列表', '1', NULL, '8', '2', 1, 1, '0000-00-00 00:00:00', '2018-10-29 08:51:52'); -INSERT INTO `auth_rules` VALUES (10, 'Admin_create', '用户列表-新增C', '1', '', '9', '3', 1, 1, '0000-00-00 00:00:00', '0000-00-00 00:00:00'); -INSERT INTO `auth_rules` VALUES (11, 'Admin_save', '用户列表-新增S', '1', '', '9', '3', 1, 1, '0000-00-00 00:00:00', '0000-00-00 00:00:00'); -INSERT INTO `auth_rules` VALUES (12, 'Admin_edit', '用户列表-编辑E', '1', '', '9', '3', 1, 1, '0000-00-00 00:00:00', '0000-00-00 00:00:00'); -INSERT INTO `auth_rules` VALUES (13, 'Admin_update', '用户列表-编辑U', '1', '', '9', '3', 1, 1, '0000-00-00 00:00:00', '0000-00-00 00:00:00'); -INSERT INTO `auth_rules` VALUES (14, 'Admin_delete', '用户列表-删除D', '1', '', '9', '3', 1, 1, '0000-00-00 00:00:00', '0000-00-00 00:00:00'); -INSERT INTO `auth_rules` VALUES (15, 'Auth', '权限管理', '1', '', '0', '1', 4, 1, '0000-00-00 00:00:00', '0000-00-00 00:00:00'); -INSERT INTO `auth_rules` VALUES (16, 'Role_index', '角色列表', '1', '', '15', '2', 1, 1, '0000-00-00 00:00:00', '0000-00-00 00:00:00'); -INSERT INTO `auth_rules` VALUES (17, 'Role_create', '角色列表-新增C', '1', '', '16', '3', 1, 1, '0000-00-00 00:00:00', '0000-00-00 00:00:00'); -INSERT INTO `auth_rules` VALUES (18, 'Role_save', '角色列表-新增S', '1', '', '16', '3', 1, 1, '0000-00-00 00:00:00', '0000-00-00 00:00:00'); -INSERT INTO `auth_rules` VALUES (19, 'Role_edit', '角色列表-编辑E', '1', '', '16', '3', 1, 1, '0000-00-00 00:00:00', '0000-00-00 00:00:00'); -INSERT INTO `auth_rules` VALUES (20, 'Role_update', '角色列表-编辑U', '1', '', '16', '3', 1, 1, '0000-00-00 00:00:00', '0000-00-00 00:00:00'); -INSERT INTO `auth_rules` VALUES (21, 'Role_delete', '角色列表-删除D', '1', '', '16', '3', 1, 1, '0000-00-00 00:00:00', '0000-00-00 00:00:00'); -INSERT INTO `auth_rules` VALUES (22, 'Role_permission', '角色列表-分配权限E', '1', '', '16', '3', 1, 1, '0000-00-00 00:00:00', '0000-00-00 00:00:00'); -INSERT INTO `auth_rules` VALUES (23, 'Role_setPermission', '角色列表-分配权限U', '1', '', '16', '3', 1, 1, '0000-00-00 00:00:00', '0000-00-00 00:00:00'); -INSERT INTO `auth_rules` VALUES (24, 'Rule_index', '规则列表', '1', '', '15', '2', 2, 1, '0000-00-00 00:00:00', '0000-00-00 00:00:00'); -INSERT INTO `auth_rules` VALUES (25, 'Rule_create', '规则列表-新增C', '1', '', '24', '3', 1, 1, '0000-00-00 00:00:00', '0000-00-00 00:00:00'); -INSERT INTO `auth_rules` VALUES (26, 'Rule_save', '规则列表-新增S', '1', '', '24', '3', 1, 1, '0000-00-00 00:00:00', '0000-00-00 00:00:00'); -INSERT INTO `auth_rules` VALUES (27, 'Rule_edit', '规则列表-编辑E', '1', '', '24', '3', 1, 1, '0000-00-00 00:00:00', '0000-00-00 00:00:00'); -INSERT INTO `auth_rules` VALUES (28, 'Rule_update', '规则列表-编辑U', '1', '', '24', '3', 1, 1, '0000-00-00 00:00:00', '0000-00-00 00:00:00'); -INSERT INTO `auth_rules` VALUES (29, 'Rule_delete', '规则列表-删除D', '1', '', '24', '3', 1, 1, '0000-00-00 00:00:00', '0000-00-00 00:00:00'); -INSERT INTO `auth_rules` VALUES (30, 'Role_list', '角色列表', '1', '', '16', '3', 2, 1, '0000-00-00 00:00:00', '0000-00-00 00:00:00'); -INSERT INTO `auth_rules` VALUES (31, 'Rule_list', '规则列表', '1', '', '24', '3', 2, 1, '0000-00-00 00:00:00', '0000-00-00 00:00:00'); -INSERT INTO `auth_rules` VALUES (32, 'Admin_list', '用户列表', '1', '', '9', '3', 2, 1, '0000-00-00 00:00:00', '0000-00-00 00:00:00'); -INSERT INTO `auth_rules` VALUES (34, 'SysConfig_index', '系统变量', '1', '', '2', '2', 1, 1, '0000-00-00 00:00:00', '0000-00-00 00:00:00'); -INSERT INTO `auth_rules` VALUES (35, 'SysConfig_update', '系统变量--编辑U', '1', '', '34', '3', 1, 1, '0000-00-00 00:00:00', '0000-00-00 00:00:00'); -INSERT INTO `auth_rules` VALUES (36, 'SysConfig_list', '系统变量', '1', '', '34', '3', 2, 1, '0000-00-00 00:00:00', '0000-00-00 00:00:00'); -INSERT INTO `auth_rules` VALUES (37, 'System', '系统管理', '1', NULL, '0', '1', 1, 2, '0000-00-00 00:00:00', '2018-10-29 08:29:29'); -INSERT INTO `auth_rules` VALUES (38, 'AdminLog_index', '操作日志', '1', '', '37', '2', 1, 1, '0000-00-00 00:00:00', '0000-00-00 00:00:00'); -INSERT INTO `auth_rules` VALUES (39, 'AdminLog_list', '操作日志', '1', '', '38', '3', 1, 1, '0000-00-00 00:00:00', '0000-00-00 00:00:00'); -INSERT INTO `auth_rules` VALUES (40, 'AdminLog_delete', '操作日志-删除D', '1', '', '38', '3', 1, 1, '0000-00-00 00:00:00', '0000-00-00 00:00:00'); -INSERT INTO `auth_rules` VALUES (41, 'Backup_index', '数据库备份', '1', '', '37', '2', 100, 1, '0000-00-00 00:00:00', '0000-00-00 00:00:00'); -INSERT INTO `auth_rules` VALUES (42, 'Backup_list', '数据库备份', '1', '', '41', '3', 1, 1, '0000-00-00 00:00:00', '0000-00-00 00:00:00'); -INSERT INTO `auth_rules` VALUES (43, 'Backup_update', '设置备份时间', '1', '', '41', '3', 1, 1, '0000-00-00 00:00:00', '0000-00-00 00:00:00'); -INSERT INTO `auth_rules` VALUES (44, 'Backup_detail', '数据库还原', '1', '', '37', '2', 90, 1, '0000-00-00 00:00:00', '0000-00-00 00:00:00'); -INSERT INTO `auth_rules` VALUES (45, 'Backup_details', '数据库还原', '1', '', '44', '3', 1, 1, '0000-00-00 00:00:00', '0000-00-00 00:00:00'); -INSERT INTO `auth_rules` VALUES (46, 'Backup_import', '还原数据', '1', '', '44', '3', 1, 1, '0000-00-00 00:00:00', '0000-00-00 00:00:00'); -INSERT INTO `auth_rules` VALUES (47, 'Backup_delete', '删除备份', '1', '', '44', '3', 1, 1, '0000-00-00 00:00:00', '0000-00-00 00:00:00'); -INSERT INTO `auth_rules` VALUES (62, 'User_delete', '用户列表-删除', '1', NULL, '57', '3', NULL, 1, '2018-10-29 08:53:02', '2018-10-29 08:53:02'); -INSERT INTO `auth_rules` VALUES (50, 'SysConfig_delete', '删除', NULL, NULL, '34', '3', 1, 1, '2018-10-29 21:55:01', '2018-10-29 21:55:05'); -INSERT INTO `auth_rules` VALUES (49, 'SysConfig_save', '添加保存', NULL, NULL, '34', '3', 1, 1, '2018-10-29 21:55:01', '2018-10-29 21:55:05'); -INSERT INTO `auth_rules` VALUES (48, 'SysConfig_create', '添加', '1', '', '34', '3', 1, 1, '2018-09-13 11:42:55', '2018-09-13 11:42:57'); -INSERT INTO `auth_rules` VALUES (57, 'User_index', '用户列表', '1', NULL, '8', '2', NULL, 1, '2018-10-29 08:53:02', '2018-10-29 08:53:02'); -INSERT INTO `auth_rules` VALUES (58, 'User_create', '用户列表-新增显示', '1', NULL, '57', '3', NULL, 1, '2018-10-29 08:53:02', '2018-10-29 08:53:02'); -INSERT INTO `auth_rules` VALUES (59, 'User_save', '用户列表-新增保存', '1', NULL, '57', '3', NULL, 1, '2018-10-29 08:53:02', '2018-10-29 08:53:02'); -INSERT INTO `auth_rules` VALUES (60, 'User_edit', '用户列表-编辑显示', '1', NULL, '57', '3', NULL, 1, '2018-10-29 08:53:02', '2018-10-29 08:53:02'); -INSERT INTO `auth_rules` VALUES (61, 'User_update', '用户列表-编辑保存', '1', NULL, '57', '3', NULL, 1, '2018-10-29 08:53:02', '2018-10-29 08:53:02'); +INSERT INTO `auth_rules` VALUES ('1', 'Index_index', '控制台', '1', null, '0', '1', '100', '1', '0000-00-00 00:00:00', '2018-09-25 03:23:08'); +INSERT INTO `auth_rules` VALUES ('2', 'SysConfig', '系统设置', '1', '', '0', '1', '99', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'); +INSERT INTO `auth_rules` VALUES ('8', 'Admin', '用户管理', '1', '', '0', '1', '90', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'); +INSERT INTO `auth_rules` VALUES ('9', 'Admin_index', '管理员列表', '1', null, '8', '2', '1', '1', '0000-00-00 00:00:00', '2018-10-29 08:51:52'); +INSERT INTO `auth_rules` VALUES ('10', 'Admin_create', '用户列表-新增C', '1', '', '9', '3', '1', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'); +INSERT INTO `auth_rules` VALUES ('11', 'Admin_save', '用户列表-新增S', '1', '', '9', '3', '1', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'); +INSERT INTO `auth_rules` VALUES ('12', 'Admin_edit', '用户列表-编辑E', '1', '', '9', '3', '1', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'); +INSERT INTO `auth_rules` VALUES ('13', 'Admin_update', '用户列表-编辑U', '1', '', '9', '3', '1', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'); +INSERT INTO `auth_rules` VALUES ('14', 'Admin_delete', '用户列表-删除D', '1', '', '9', '3', '1', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'); +INSERT INTO `auth_rules` VALUES ('15', 'Auth', '权限管理', '1', '', '0', '1', '4', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'); +INSERT INTO `auth_rules` VALUES ('16', 'Role_index', '角色列表', '1', '', '15', '2', '1', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'); +INSERT INTO `auth_rules` VALUES ('17', 'Role_create', '角色列表-新增C', '1', '', '16', '3', '1', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'); +INSERT INTO `auth_rules` VALUES ('18', 'Role_save', '角色列表-新增S', '1', '', '16', '3', '1', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'); +INSERT INTO `auth_rules` VALUES ('19', 'Role_edit', '角色列表-编辑E', '1', '', '16', '3', '1', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'); +INSERT INTO `auth_rules` VALUES ('20', 'Role_update', '角色列表-编辑U', '1', '', '16', '3', '1', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'); +INSERT INTO `auth_rules` VALUES ('21', 'Role_delete', '角色列表-删除D', '1', '', '16', '3', '1', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'); +INSERT INTO `auth_rules` VALUES ('22', 'Role_permission', '角色列表-分配权限E', '1', '', '16', '3', '1', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'); +INSERT INTO `auth_rules` VALUES ('23', 'Role_setPermission', '角色列表-分配权限U', '1', '', '16', '3', '1', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'); +INSERT INTO `auth_rules` VALUES ('24', 'Rule_index', '规则列表', '1', '', '15', '2', '2', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'); +INSERT INTO `auth_rules` VALUES ('25', 'Rule_create', '规则列表-新增C', '1', '', '24', '3', '1', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'); +INSERT INTO `auth_rules` VALUES ('26', 'Rule_save', '规则列表-新增S', '1', '', '24', '3', '1', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'); +INSERT INTO `auth_rules` VALUES ('27', 'Rule_edit', '规则列表-编辑E', '1', '', '24', '3', '1', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'); +INSERT INTO `auth_rules` VALUES ('28', 'Rule_update', '规则列表-编辑U', '1', '', '24', '3', '1', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'); +INSERT INTO `auth_rules` VALUES ('29', 'Rule_delete', '规则列表-删除D', '1', '', '24', '3', '1', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'); +INSERT INTO `auth_rules` VALUES ('30', 'Role_list', '角色列表', '1', '', '16', '3', '2', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'); +INSERT INTO `auth_rules` VALUES ('31', 'Rule_list', '规则列表', '1', '', '24', '3', '2', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'); +INSERT INTO `auth_rules` VALUES ('32', 'Admin_list', '用户列表', '1', '', '9', '3', '2', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'); +INSERT INTO `auth_rules` VALUES ('34', 'SysConfig_index', '系统变量', '1', '', '2', '2', '1', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'); +INSERT INTO `auth_rules` VALUES ('35', 'SysConfig_update', '系统变量--编辑U', '1', '', '34', '3', '1', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'); +INSERT INTO `auth_rules` VALUES ('36', 'SysConfig_list', '系统变量', '1', '', '34', '3', '2', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'); +INSERT INTO `auth_rules` VALUES ('37', 'System', '系统管理', '1', null, '0', '1', '1', '2', '0000-00-00 00:00:00', '2018-10-29 08:29:29'); +INSERT INTO `auth_rules` VALUES ('38', 'AdminLog_index', '操作日志', '1', '', '37', '2', '1', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'); +INSERT INTO `auth_rules` VALUES ('39', 'AdminLog_list', '操作日志', '1', '', '38', '3', '1', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'); +INSERT INTO `auth_rules` VALUES ('40', 'AdminLog_delete', '操作日志-删除D', '1', '', '38', '3', '1', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'); +INSERT INTO `auth_rules` VALUES ('41', 'Backup_index', '数据库备份', '1', '', '37', '2', '100', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'); +INSERT INTO `auth_rules` VALUES ('42', 'Backup_list', '数据库备份', '1', '', '41', '3', '1', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'); +INSERT INTO `auth_rules` VALUES ('43', 'Backup_update', '设置备份时间', '1', '', '41', '3', '1', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'); +INSERT INTO `auth_rules` VALUES ('44', 'Backup_detail', '数据库还原', '1', '', '37', '2', '90', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'); +INSERT INTO `auth_rules` VALUES ('45', 'Backup_details', '数据库还原', '1', '', '44', '3', '1', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'); +INSERT INTO `auth_rules` VALUES ('46', 'Backup_import', '还原数据', '1', '', '44', '3', '1', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'); +INSERT INTO `auth_rules` VALUES ('47', 'Backup_delete', '删除备份', '1', '', '44', '3', '1', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'); +INSERT INTO `auth_rules` VALUES ('62', 'User_delete', '用户列表-删除', '1', null, '57', '3', null, '1', '2018-10-29 08:53:02', '2018-10-29 08:53:02'); +INSERT INTO `auth_rules` VALUES ('50', 'SysConfig_delete', '删除', null, null, '34', '3', '1', '1', '2018-10-29 21:55:01', '2018-10-29 21:55:05'); +INSERT INTO `auth_rules` VALUES ('49', 'SysConfig_save', '添加保存', null, null, '34', '3', '1', '1', '2018-10-29 21:55:01', '2018-10-29 21:55:05'); +INSERT INTO `auth_rules` VALUES ('48', 'SysConfig_create', '添加', '1', '', '34', '3', '1', '1', '2018-09-13 11:42:55', '2018-09-13 11:42:57'); +INSERT INTO `auth_rules` VALUES ('57', 'User_index', '用户列表', '1', null, '8', '2', null, '1', '2018-10-29 08:53:02', '2018-10-29 08:53:02'); +INSERT INTO `auth_rules` VALUES ('58', 'User_create', '用户列表-新增显示', '1', null, '57', '3', null, '1', '2018-10-29 08:53:02', '2018-10-29 08:53:02'); +INSERT INTO `auth_rules` VALUES ('59', 'User_save', '用户列表-新增保存', '1', null, '57', '3', null, '1', '2018-10-29 08:53:02', '2018-10-29 08:53:02'); +INSERT INTO `auth_rules` VALUES ('60', 'User_edit', '用户列表-编辑显示', '1', null, '57', '3', null, '1', '2018-10-29 08:53:02', '2018-10-29 08:53:02'); +INSERT INTO `auth_rules` VALUES ('61', 'User_update', '用户列表-编辑保存', '1', null, '57', '3', null, '1', '2018-10-29 08:53:02', '2018-10-29 08:53:02'); -- ---------------------------- -- Table structure for backups -- ---------------------------- DROP TABLE IF EXISTS `backups`; -CREATE TABLE `backups` ( - `id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT, - `type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, - `number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, +CREATE TABLE `backups` ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `type` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL, + `number` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL, `created_at` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', `updated_at` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', PRIMARY KEY (`id`) USING BTREE -) ENGINE = MyISAM AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '数据库备份时间表' ROW_FORMAT = Dynamic; +) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='数据库备份时间表'; + +-- ---------------------------- +-- Records of backups +-- ---------------------------- -- ---------------------------- -- Table structure for files -- ---------------------------- DROP TABLE IF EXISTS `files`; -CREATE TABLE `files` ( - `id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT, - `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '文件名称', +CREATE TABLE `files` ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `name` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '文件名称', `type` int(11) DEFAULT NULL COMMENT '1[图片] 2[文件] 3[视频] 4[语音]', - `uri` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '图片地址', - `mime` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '文件类型', - `size` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '大小', - `created_at` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', - `updated_at` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `uri` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '图片地址', + `mime` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '文件类型', + `size` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '大小', + `created_at` timestamp NULL DEFAULT '0000-00-00 00:00:00' ON UPDATE CURRENT_TIMESTAMP, + `updated_at` timestamp NULL DEFAULT '0000-00-00 00:00:00' ON UPDATE CURRENT_TIMESTAMP, PRIMARY KEY (`id`) USING BTREE -) ENGINE = MyISAM AUTO_INCREMENT = 6 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = Dynamic; +) ENGINE=MyISAM AUTO_INCREMENT=6 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC; -- ---------------------------- -- Records of files -- ---------------------------- -INSERT INTO `files` VALUES (1, '03248bf18c9409e190373569c6a41382.png', 1, '/upload/image/2018/10/29/ea25cbcba4f710713ff6359690996c78.png', 'image/png', '359120', '2018-10-29 08:49:30', '2018-10-29 08:49:30'); -INSERT INTO `files` VALUES (2, 'dllcbg.jpg', 1, '/upload/image/2018/10/29/a8f0c3cc51d4c20084d43623b580916b.jpg', 'image/jpeg', '210992', '2018-10-29 08:49:36', '2018-10-29 08:49:36'); -INSERT INTO `files` VALUES (3, 'dllcbg.jpg', 1, '/upload/image/2018/10/29/4f8f97ad446280b568fa1eefd241a83e.jpg', 'image/jpeg', '210992', '2018-10-29 08:50:44', '2018-10-29 08:50:44'); -INSERT INTO `files` VALUES (4, '640_wx_fm.png', 1, '/upload/image/2018/10/29/f9077714ebc61963aa6d58e8c10a83c3.png', 'image/png', '9253', '2018-10-29 08:51:06', '2018-10-29 08:51:06'); -INSERT INTO `files` VALUES (5, '03248bf18c9409e190373569c6a41382.png', 1, '/upload/image/2018/10/29/40e2953fe42bab78950129d4119aed17.png', 'image/png', '359120', '2018-10-29 08:51:06', '2018-10-29 08:51:06'); +INSERT INTO `files` VALUES ('1', '03248bf18c9409e190373569c6a41382.png', '1', '/upload/image/2018/10/29/ea25cbcba4f710713ff6359690996c78.png', 'image/png', '359120', '2018-10-29 08:49:30', '2018-10-29 08:49:30'); +INSERT INTO `files` VALUES ('2', 'dllcbg.jpg', '1', '/upload/image/2018/10/29/a8f0c3cc51d4c20084d43623b580916b.jpg', 'image/jpeg', '210992', '2018-10-29 08:49:36', '2018-10-29 08:49:36'); +INSERT INTO `files` VALUES ('3', 'dllcbg.jpg', '1', '/upload/image/2018/10/29/4f8f97ad446280b568fa1eefd241a83e.jpg', 'image/jpeg', '210992', '2018-10-29 08:50:44', '2018-10-29 08:50:44'); +INSERT INTO `files` VALUES ('4', '640_wx_fm.png', '1', '/upload/image/2018/10/29/f9077714ebc61963aa6d58e8c10a83c3.png', 'image/png', '9253', '2018-10-29 08:51:06', '2018-10-29 08:51:06'); +INSERT INTO `files` VALUES ('5', '03248bf18c9409e190373569c6a41382.png', '1', '/upload/image/2018/10/29/40e2953fe42bab78950129d4119aed17.png', 'image/png', '359120', '2018-10-29 08:51:06', '2018-10-29 08:51:06'); -- ---------------------------- -- Table structure for links -- ---------------------------- DROP TABLE IF EXISTS `links`; -CREATE TABLE `links` ( - `id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT, - `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, - `created_at` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', - `updated_at` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', +CREATE TABLE `links` ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `name` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL, + `created_at` timestamp NULL DEFAULT '0000-00-00 00:00:00' ON UPDATE CURRENT_TIMESTAMP, + `updated_at` timestamp NULL DEFAULT '0000-00-00 00:00:00' ON UPDATE CURRENT_TIMESTAMP, PRIMARY KEY (`id`) USING BTREE -) ENGINE = MyISAM AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '友情链接表' ROW_FORMAT = Dynamic; +) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='友情链接表'; + +-- ---------------------------- +-- Records of links +-- ---------------------------- -- ---------------------------- -- Table structure for migrations -- ---------------------------- DROP TABLE IF EXISTS `migrations`; -CREATE TABLE `migrations` ( - `id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT, - `migration` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, +CREATE TABLE `migrations` ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `migration` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, `batch` int(11) NOT NULL, PRIMARY KEY (`id`) USING BTREE -) ENGINE = MyISAM AUTO_INCREMENT = 17 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = Dynamic; +) ENGINE=MyISAM AUTO_INCREMENT=17 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC; -- ---------------------------- -- Records of migrations -- ---------------------------- -INSERT INTO `migrations` VALUES (1, '2014_10_12_000000_create_users_table', 1); -INSERT INTO `migrations` VALUES (2, '2014_10_12_100000_create_password_resets_table', 1); -INSERT INTO `migrations` VALUES (3, '2018_09_10_091554_create_user_log', 1); -INSERT INTO `migrations` VALUES (4, '2018_09_10_091620_create_auth_relation', 1); -INSERT INTO `migrations` VALUES (5, '2018_09_10_091813_create_auth_role', 1); -INSERT INTO `migrations` VALUES (6, '2018_09_10_091842_create_auth_rule', 1); -INSERT INTO `migrations` VALUES (7, '2018_09_10_091857_create_backup', 1); -INSERT INTO `migrations` VALUES (8, '2018_09_10_091921_create_link', 1); -INSERT INTO `migrations` VALUES (9, '2018_09_10_091940_create_sys_config', 1); -INSERT INTO `migrations` VALUES (10, '2016_06_01_000001_create_oauth_auth_codes_table', 2); -INSERT INTO `migrations` VALUES (11, '2016_06_01_000002_create_oauth_access_tokens_table', 2); -INSERT INTO `migrations` VALUES (12, '2016_06_01_000003_create_oauth_refresh_tokens_table', 2); -INSERT INTO `migrations` VALUES (13, '2016_06_01_000004_create_oauth_clients_table', 2); -INSERT INTO `migrations` VALUES (14, '2016_06_01_000005_create_oauth_personal_access_clients_table', 2); -INSERT INTO `migrations` VALUES (15, '2018_09_11_083518_create_sessions_table', 2); -INSERT INTO `migrations` VALUES (16, '2018_10_10_085506_create_file', 3); +INSERT INTO `migrations` VALUES ('1', '2014_10_12_000000_create_users_table', '1'); +INSERT INTO `migrations` VALUES ('2', '2014_10_12_100000_create_password_resets_table', '1'); +INSERT INTO `migrations` VALUES ('3', '2018_09_10_091554_create_user_log', '1'); +INSERT INTO `migrations` VALUES ('4', '2018_09_10_091620_create_auth_relation', '1'); +INSERT INTO `migrations` VALUES ('5', '2018_09_10_091813_create_auth_role', '1'); +INSERT INTO `migrations` VALUES ('6', '2018_09_10_091842_create_auth_rule', '1'); +INSERT INTO `migrations` VALUES ('7', '2018_09_10_091857_create_backup', '1'); +INSERT INTO `migrations` VALUES ('8', '2018_09_10_091921_create_link', '1'); +INSERT INTO `migrations` VALUES ('9', '2018_09_10_091940_create_sys_config', '1'); +INSERT INTO `migrations` VALUES ('10', '2016_06_01_000001_create_oauth_auth_codes_table', '2'); +INSERT INTO `migrations` VALUES ('11', '2016_06_01_000002_create_oauth_access_tokens_table', '2'); +INSERT INTO `migrations` VALUES ('12', '2016_06_01_000003_create_oauth_refresh_tokens_table', '2'); +INSERT INTO `migrations` VALUES ('13', '2016_06_01_000004_create_oauth_clients_table', '2'); +INSERT INTO `migrations` VALUES ('14', '2016_06_01_000005_create_oauth_personal_access_clients_table', '2'); +INSERT INTO `migrations` VALUES ('15', '2018_09_11_083518_create_sessions_table', '2'); +INSERT INTO `migrations` VALUES ('16', '2018_10_10_085506_create_file', '3'); -- ---------------------------- -- Table structure for oauth_access_tokens -- ---------------------------- DROP TABLE IF EXISTS `oauth_access_tokens`; -CREATE TABLE `oauth_access_tokens` ( - `id` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, +CREATE TABLE `oauth_access_tokens` ( + `id` varchar(100) COLLATE utf8mb4_unicode_ci NOT NULL, `user_id` int(11) DEFAULT NULL, `client_id` int(11) NOT NULL, - `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, - `scopes` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci, + `name` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL, + `scopes` text COLLATE utf8mb4_unicode_ci, `revoked` tinyint(1) NOT NULL, `created_at` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', `updated_at` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', `expires_at` datetime DEFAULT NULL, PRIMARY KEY (`id`) USING BTREE, - INDEX `oauth_access_tokens_user_id_index`(`user_id`) USING BTREE -) ENGINE = MyISAM CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = Dynamic; + KEY `oauth_access_tokens_user_id_index` (`user_id`) USING BTREE +) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC; + +-- ---------------------------- +-- Records of oauth_access_tokens +-- ---------------------------- -- ---------------------------- -- Table structure for oauth_auth_codes -- ---------------------------- DROP TABLE IF EXISTS `oauth_auth_codes`; -CREATE TABLE `oauth_auth_codes` ( - `id` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, +CREATE TABLE `oauth_auth_codes` ( + `id` varchar(100) COLLATE utf8mb4_unicode_ci NOT NULL, `user_id` int(11) NOT NULL, `client_id` int(11) NOT NULL, - `scopes` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci, + `scopes` text COLLATE utf8mb4_unicode_ci, `revoked` tinyint(1) NOT NULL, `expires_at` datetime DEFAULT NULL, PRIMARY KEY (`id`) USING BTREE -) ENGINE = MyISAM CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = Dynamic; +) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC; + +-- ---------------------------- +-- Records of oauth_auth_codes +-- ---------------------------- -- ---------------------------- -- Table structure for oauth_clients -- ---------------------------- DROP TABLE IF EXISTS `oauth_clients`; -CREATE TABLE `oauth_clients` ( - `id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT, +CREATE TABLE `oauth_clients` ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, `user_id` int(11) DEFAULT NULL, - `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, - `secret` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, - `redirect` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, + `name` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, + `secret` varchar(100) COLLATE utf8mb4_unicode_ci NOT NULL, + `redirect` text COLLATE utf8mb4_unicode_ci NOT NULL, `personal_access_client` tinyint(1) NOT NULL, `password_client` tinyint(1) NOT NULL, `revoked` tinyint(1) NOT NULL, `created_at` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', `updated_at` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', PRIMARY KEY (`id`) USING BTREE, - INDEX `oauth_clients_user_id_index`(`user_id`) USING BTREE -) ENGINE = MyISAM AUTO_INCREMENT = 3 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = Dynamic; + KEY `oauth_clients_user_id_index` (`user_id`) USING BTREE +) ENGINE=MyISAM AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC; -- ---------------------------- -- Records of oauth_clients -- ---------------------------- -INSERT INTO `oauth_clients` VALUES (1, NULL, 'Laravel Personal Access Client', 'qStyk1sYVj85KrYE1s7ZHp1T0PXV0ZdmQEuAR6j7', 'http://localhost', 1, 0, 0, '2018-09-25 01:36:14', '2018-09-25 01:36:14'); -INSERT INTO `oauth_clients` VALUES (2, NULL, 'Laravel Password Grant Client', 'YgX0thv89V1k1WEYU2Bj6ioTSOYr6BE2kmvBQhGd', 'http://localhost', 0, 1, 0, '2018-09-25 01:36:14', '2018-09-25 01:36:14'); +INSERT INTO `oauth_clients` VALUES ('1', null, 'Laravel Personal Access Client', 'qStyk1sYVj85KrYE1s7ZHp1T0PXV0ZdmQEuAR6j7', 'http://localhost', '1', '0', '0', '2018-09-25 01:36:14', '2018-09-25 01:36:14'); +INSERT INTO `oauth_clients` VALUES ('2', null, 'Laravel Password Grant Client', 'YgX0thv89V1k1WEYU2Bj6ioTSOYr6BE2kmvBQhGd', 'http://localhost', '0', '1', '0', '2018-09-25 01:36:14', '2018-09-25 01:36:14'); -- ---------------------------- -- Table structure for oauth_personal_access_clients -- ---------------------------- DROP TABLE IF EXISTS `oauth_personal_access_clients`; -CREATE TABLE `oauth_personal_access_clients` ( - `id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT, +CREATE TABLE `oauth_personal_access_clients` ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, `client_id` int(11) NOT NULL, `created_at` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', `updated_at` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', PRIMARY KEY (`id`) USING BTREE, - INDEX `oauth_personal_access_clients_client_id_index`(`client_id`) USING BTREE -) ENGINE = MyISAM AUTO_INCREMENT = 2 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = Fixed; + KEY `oauth_personal_access_clients_client_id_index` (`client_id`) USING BTREE +) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=FIXED; -- ---------------------------- -- Records of oauth_personal_access_clients -- ---------------------------- -INSERT INTO `oauth_personal_access_clients` VALUES (1, 1, '2018-09-25 01:36:14', '2018-09-25 01:36:14'); +INSERT INTO `oauth_personal_access_clients` VALUES ('1', '1', '2018-09-25 01:36:14', '2018-09-25 01:36:14'); -- ---------------------------- -- Table structure for oauth_refresh_tokens -- ---------------------------- DROP TABLE IF EXISTS `oauth_refresh_tokens`; -CREATE TABLE `oauth_refresh_tokens` ( - `id` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, - `access_token_id` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, +CREATE TABLE `oauth_refresh_tokens` ( + `id` varchar(100) COLLATE utf8mb4_unicode_ci NOT NULL, + `access_token_id` varchar(100) COLLATE utf8mb4_unicode_ci NOT NULL, `revoked` tinyint(1) NOT NULL, `expires_at` datetime DEFAULT NULL, PRIMARY KEY (`id`) USING BTREE, - INDEX `oauth_refresh_tokens_access_token_id_index`(`access_token_id`) USING BTREE -) ENGINE = MyISAM CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = Dynamic; + KEY `oauth_refresh_tokens_access_token_id_index` (`access_token_id`) USING BTREE +) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC; + +-- ---------------------------- +-- Records of oauth_refresh_tokens +-- ---------------------------- -- ---------------------------- -- Table structure for password_resets -- ---------------------------- DROP TABLE IF EXISTS `password_resets`; -CREATE TABLE `password_resets` ( - `email` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, - `token` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, +CREATE TABLE `password_resets` ( + `email` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, + `token` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, `created_at` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', - INDEX `password_resets_email_index`(`email`(250)) USING BTREE -) ENGINE = MyISAM CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = Dynamic; + KEY `password_resets_email_index` (`email`(250)) USING BTREE +) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC; + +-- ---------------------------- +-- Records of password_resets +-- ---------------------------- -- ---------------------------- -- Table structure for sessions -- ---------------------------- DROP TABLE IF EXISTS `sessions`; -CREATE TABLE `sessions` ( - `id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, - `user_id` int(10) UNSIGNED DEFAULT NULL, - `ip_address` varchar(45) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, - `user_agent` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci, - `payload` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, +CREATE TABLE `sessions` ( + `id` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, + `user_id` int(10) unsigned DEFAULT NULL, + `ip_address` varchar(45) COLLATE utf8mb4_unicode_ci DEFAULT NULL, + `user_agent` text COLLATE utf8mb4_unicode_ci, + `payload` text COLLATE utf8mb4_unicode_ci NOT NULL, `last_activity` int(11) NOT NULL -) ENGINE = MyISAM CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = Dynamic; +) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC; + +-- ---------------------------- +-- Records of sessions +-- ---------------------------- -- ---------------------------- -- Table structure for sys_configs -- ---------------------------- DROP TABLE IF EXISTS `sys_configs`; -CREATE TABLE `sys_configs` ( - `id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT, - `varname` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, - `info` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, - `type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, - `value` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, - `created_at` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', - `updated_at` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', +CREATE TABLE `sys_configs` ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `varname` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL, + `info` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL, + `type` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL, + `value` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL, + `created_at` timestamp NULL DEFAULT '0000-00-00 00:00:00' ON UPDATE CURRENT_TIMESTAMP, + `updated_at` timestamp NULL DEFAULT '0000-00-00 00:00:00' ON UPDATE CURRENT_TIMESTAMP, PRIMARY KEY (`id`) USING BTREE -) ENGINE = MyISAM AUTO_INCREMENT = 3 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '系统基本信息表' ROW_FORMAT = Dynamic; +) ENGINE=MyISAM AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='系统基本信息表'; -- ---------------------------- -- Records of sys_configs -- ---------------------------- -INSERT INTO `sys_configs` VALUES (1, 'web_name', '系统名称', 'string', 'Laravel后台管理系统', '2018-09-11 03:10:33', '2018-10-29 08:30:02'); +INSERT INTO `sys_configs` VALUES ('1', 'web_name', '系统名称', 'string', 'Laravel后台管理系统', '2018-09-11 03:10:33', '2018-10-29 08:30:02'); -- ---------------------------- -- Table structure for users -- ---------------------------- DROP TABLE IF EXISTS `users`; -CREATE TABLE `users` ( - `id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT, - `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, - `email` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, - `password` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, - `realname` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, - `openid` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, - `status` int(11) DEFAULT 1 COMMENT '1[启用]2[禁用]', - `sex` int(11) DEFAULT 1 COMMENT '性别1[男] 2[女]', - `mobile` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '手机号', - `remember_token` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, - `created_at` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', - `updated_at` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', - `type` int(11) DEFAULT 5 COMMENT '1[管理员] 5[普通会员]', +CREATE TABLE `users` ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `name` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, + `email` varchar(100) COLLATE utf8mb4_unicode_ci NOT NULL, + `password` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL, + `realname` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL, + `openid` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL, + `status` int(11) DEFAULT '1' COMMENT '1[启用]2[禁用]', + `sex` int(11) DEFAULT '1' COMMENT '性别1[男] 2[女]', + `mobile` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '手机号', + `remember_token` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT NULL, + `created_at` timestamp NULL DEFAULT '0000-00-00 00:00:00' ON UPDATE CURRENT_TIMESTAMP, + `updated_at` timestamp NULL DEFAULT '0000-00-00 00:00:00' ON UPDATE CURRENT_TIMESTAMP, + `type` int(11) DEFAULT '5' COMMENT '1[管理员] 5[普通会员]', PRIMARY KEY (`id`) USING BTREE, - UNIQUE INDEX `users_email_unique`(`email`) USING BTREE -) ENGINE = MyISAM AUTO_INCREMENT = 7 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = Dynamic; + UNIQUE KEY `users_email_unique` (`email`) USING BTREE +) ENGINE=MyISAM AUTO_INCREMENT=7 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC; -- ---------------------------- -- Records of users -- ---------------------------- -INSERT INTO `users` VALUES (1, 'admin', 'admin', '$2y$10$bLIIo5MiiRlfoxkPjq4ireUtvM8PwHtvKwB3TgCmpfoKCKAXbJoOe', '关旭4', NULL, 1, NULL, NULL, NULL, '2018-09-11 11:22:58', '2018-09-25 03:14:53', 1); -INSERT INTO `users` VALUES (4, 'asdasdasd', 'asdasdasd', '$2y$10$fv88THGS00qqBFvwQ0VXhOcIlrAtBZLlgq9KROsx9WuIsYS2sVb5q', NULL, NULL, 1, 1, NULL, NULL, '2018-09-19 08:37:07', '2018-09-19 08:37:07', 5); -INSERT INTO `users` VALUES (5, 'ddddddaaaaa', 'ddddddaaaaa', '$2y$10$nNzvoYd6QedA979s07yqruTo6t/TPUSEK5R2ANlJWHauajdAKyKry', NULL, NULL, 1, 1, NULL, NULL, '2018-09-19 08:37:58', '2018-09-19 08:37:58', 5); -INSERT INTO `users` VALUES (6, 'ggggg', 'ddddddaaaaa333', '$2y$10$uPAiv7qNPQRLnXsHZ69JBuaayDRrgL3sVOCM6/1tz99I7Bv999MuG', NULL, NULL, 1, 1, NULL, NULL, '2018-09-19 08:39:55', '2018-09-19 08:52:10', 5); +INSERT INTO `users` VALUES ('1', 'admin', 'admin', '$2y$10$bLIIo5MiiRlfoxkPjq4ireUtvM8PwHtvKwB3TgCmpfoKCKAXbJoOe', '关旭4', null, '1', null, null, null, '2018-09-11 11:22:58', '2018-09-25 03:14:53', '1'); +INSERT INTO `users` VALUES ('4', 'asdasdasd', 'asdasdasd', '$2y$10$fv88THGS00qqBFvwQ0VXhOcIlrAtBZLlgq9KROsx9WuIsYS2sVb5q', null, null, '1', '1', null, null, '2018-09-19 08:37:07', '2018-09-19 08:37:07', '5'); +INSERT INTO `users` VALUES ('5', 'ddddddaaaaa', 'ddddddaaaaa', '$2y$10$nNzvoYd6QedA979s07yqruTo6t/TPUSEK5R2ANlJWHauajdAKyKry', null, null, '1', '1', null, null, '2018-09-19 08:37:58', '2018-09-19 08:37:58', '5'); +INSERT INTO `users` VALUES ('6', 'ggggg', 'ddddddaaaaa333', '$2y$10$uPAiv7qNPQRLnXsHZ69JBuaayDRrgL3sVOCM6/1tz99I7Bv999MuG', null, null, '1', '1', null, null, '2018-09-19 08:39:55', '2018-09-19 08:52:10', '5'); -- ---------------------------- -- Table structure for users_log -- ---------------------------- DROP TABLE IF EXISTS `users_log`; -CREATE TABLE `users_log` ( - `id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT, - `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, +CREATE TABLE `users_log` ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `name` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL, `admin_id` int(11) DEFAULT NULL, `log_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - `created_at` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', - `updated_at` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `created_at` timestamp NULL DEFAULT '0000-00-00 00:00:00' ON UPDATE CURRENT_TIMESTAMP, + `updated_at` timestamp NULL DEFAULT '0000-00-00 00:00:00' ON UPDATE CURRENT_TIMESTAMP, PRIMARY KEY (`id`) USING BTREE -) ENGINE = MyISAM AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '管理员操作日志' ROW_FORMAT = Dynamic; +) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='管理员操作日志'; -SET FOREIGN_KEY_CHECKS = 1; +-- ---------------------------- +-- Records of users_log +-- ---------------------------- diff --git a/resources/views/Api/user/edit.blade.php b/resources/views/Api/user/edit.blade.php index 4721e94..5f114a1 100644 --- a/resources/views/Api/user/edit.blade.php +++ b/resources/views/Api/user/edit.blade.php @@ -9,7 +9,47 @@
+ class="layui-input" lay-verify="required" lay-verType="tips" + value="{{$list['name']}}"> +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
diff --git a/resources/views/Api/user/index.blade.php b/resources/views/Api/user/index.blade.php index af8723e..aefdeb8 100644 --- a/resources/views/Api/user/index.blade.php +++ b/resources/views/Api/user/index.blade.php @@ -21,12 +21,14 @@
- - + + dw-width="600px" dw-height="400px" + dw-url="edit?id={{$vo['id']}}" + dw-title="编辑用户"> + 编辑 + @if($vo['id'] == 1)