Leadfyy.co
/
lianjie_admin
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

框架升级

master
desion 5 years ago
parent
ec05042734
commit
b932fcee12
2 changed files with 597 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 598
      composer.lock
  2. 2
      config/app.php

598
composer.lock
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "a9fe5983d07b33755016777d63217c0a",
"content-hash": "854b617e7a44365e7cb38038beee8645",
"packages": [ "packages": [
{ {
"name": "adbario/php-dot-notation", "name": "adbario/php-dot-notation",
@ -1127,6 +1127,188 @@
], ],
"time": "2020-06-16T20:11:17+00:00" "time": "2020-06-16T20:11:17+00:00"
}, },
{
"name": "elasticsearch/elasticsearch",
"version": "v7.9.0",
"source": {
"type": "git",
"url": "https://github.com/elastic/elasticsearch-php.git",
"reference": "1380925ccd276ab897c76596cf3705cb9714a78c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/elastic/elasticsearch-php/zipball/1380925ccd276ab897c76596cf3705cb9714a78c",
"reference": "1380925ccd276ab897c76596cf3705cb9714a78c",
"shasum": "",
"mirrors": [
{
"url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
"preferred": true
}
]
},
"require": {
"ext-json": ">=1.3.7",
"ezimuel/ringphp": "^1.1.2",
"php": "^7.1",
"psr/log": "~1.0"
},
"require-dev": {
"cpliakas/git-wrapper": "~2.0",
"doctrine/inflector": "^1.3",
"mockery/mockery": "^1.2",
"phpstan/phpstan": "^0.12",
"phpunit/phpunit": "^7.5",
"squizlabs/php_codesniffer": "^3.4",
"symfony/finder": "~4.0",
"symfony/yaml": "~4.0"
},
"suggest": {
"ext-curl": "*",
"monolog/monolog": "Allows for client-level logging and tracing"
},
"type": "library",
"autoload": {
"files": [
"src/autoload.php"
],
"psr-4": {
"Elasticsearch\\": "src/Elasticsearch/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"Apache-2.0"
],
"authors": [
{
"name": "Zachary Tong"
},
{
"name": "Enrico Zimuel"
}
],
"description": "PHP Client for Elasticsearch",
"keywords": [
"client",
"elasticsearch",
"search"
],
"time": "2020-08-18T13:44:18+00:00"
},
{
"name": "ezimuel/guzzlestreams",
"version": "3.0.1",
"source": {
"type": "git",
"url": "https://github.com/ezimuel/guzzlestreams.git",
"reference": "abe3791d231167f14eb80d413420d1eab91163a8"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/ezimuel/guzzlestreams/zipball/abe3791d231167f14eb80d413420d1eab91163a8",
"reference": "abe3791d231167f14eb80d413420d1eab91163a8",
"shasum": "",
"mirrors": [
{
"url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
"preferred": true
}
]
},
"require": {
"php": ">=5.4.0"
},
"require-dev": {
"phpunit/phpunit": "~4.0"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "3.0-dev"
}
},
"autoload": {
"psr-4": {
"GuzzleHttp\\Stream\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Michael Dowling",
"email": "mtdowling@gmail.com",
"homepage": "https://github.com/mtdowling"
}
],
"description": "Fork of guzzle/streams (abandoned) to be used with elasticsearch-php",
"homepage": "http://guzzlephp.org/",
"keywords": [
"Guzzle",
"stream"
],
"time": "2020-02-14T23:11:50+00:00"
},
{
"name": "ezimuel/ringphp",
"version": "1.1.2",
"source": {
"type": "git",
"url": "https://github.com/ezimuel/ringphp.git",
"reference": "0b78f89d8e0bb9e380046c31adfa40347e9f663b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/ezimuel/ringphp/zipball/0b78f89d8e0bb9e380046c31adfa40347e9f663b",
"reference": "0b78f89d8e0bb9e380046c31adfa40347e9f663b",
"shasum": "",
"mirrors": [
{
"url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
"preferred": true
}
]
},
"require": {
"ezimuel/guzzlestreams": "^3.0.1",
"php": ">=5.4.0",
"react/promise": "~2.0"
},
"require-dev": {
"ext-curl": "*",
"phpunit/phpunit": "~4.0"
},
"suggest": {
"ext-curl": "Guzzle will use specific adapters if cURL is present"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.1-dev"
}
},
"autoload": {
"psr-4": {
"GuzzleHttp\\Ring\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Michael Dowling",
"email": "mtdowling@gmail.com",
"homepage": "https://github.com/mtdowling"
}
],
"description": "Fork of guzzle/RingPHP (abandoned) to be used with elasticsearch-php",
"time": "2020-02-14T23:51:21+00:00"
},
{ {
"name": "fideloper/proxy", "name": "fideloper/proxy",
"version": "4.4.0", "version": "4.4.0",
@ -1642,6 +1824,82 @@
"description": "Oss storage filesystem for Laravel.", "description": "Oss storage filesystem for Laravel.",
"time": "2020-03-28T15:21:51+00:00" "time": "2020-03-28T15:21:51+00:00"
}, },
{
"name": "intervention/image",
"version": "2.5.1",
"source": {
"type": "git",
"url": "https://github.com/Intervention/image.git",
"reference": "abbf18d5ab8367f96b3205ca3c89fb2fa598c69e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/Intervention/image/zipball/abbf18d5ab8367f96b3205ca3c89fb2fa598c69e",
"reference": "abbf18d5ab8367f96b3205ca3c89fb2fa598c69e",
"shasum": "",
"mirrors": [
{
"url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
"preferred": true
}
]
},
"require": {
"ext-fileinfo": "*",
"guzzlehttp/psr7": "~1.1",
"php": ">=5.4.0"
},
"require-dev": {
"mockery/mockery": "~0.9.2",
"phpunit/phpunit": "^4.8 || ^5.7"
},
"suggest": {
"ext-gd": "to use GD library based image processing.",
"ext-imagick": "to use Imagick based image processing.",
"intervention/imagecache": "Caching extension for the Intervention Image library"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.4-dev"
},
"laravel": {
"providers": [
"Intervention\\Image\\ImageServiceProvider"
],
"aliases": {
"Image": "Intervention\\Image\\Facades\\Image"
}
}
},
"autoload": {
"psr-4": {
"Intervention\\Image\\": "src/Intervention/Image"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Oliver Vogel",
"email": "oliver@olivervogel.com",
"homepage": "http://olivervogel.com/"
}
],
"description": "Image handling and manipulation library with support for Laravel integration",
"homepage": "http://image.intervention.io/",
"keywords": [
"gd",
"image",
"imagick",
"laravel",
"thumbnail",
"watermark"
],
"time": "2019-11-02T09:15:47+00:00"
},
{ {
"name": "laravel/framework", "name": "laravel/framework",
"version": "v7.22.4", "version": "v7.22.4",
@ -1805,6 +2063,78 @@
], ],
"time": "2020-07-27T18:25:06+00:00" "time": "2020-07-27T18:25:06+00:00"
}, },
{
"name": "laravel/scout",
"version": "v8.3.1",
"source": {
"type": "git",
"url": "https://github.com/laravel/scout.git",
"reference": "e168e5cf3e26372bcfe770e01577903a6fa05077"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/scout/zipball/e168e5cf3e26372bcfe770e01577903a6fa05077",
"reference": "e168e5cf3e26372bcfe770e01577903a6fa05077",
"shasum": "",
"mirrors": [
{
"url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
"preferred": true
}
]
},
"require": {
"illuminate/bus": "^6.0|^7.0|^8.0",
"illuminate/contracts": "^6.0|^7.0|^8.0",
"illuminate/database": "^6.0|^7.0|^8.0",
"illuminate/http": "^6.0|^7.0|^8.0",
"illuminate/pagination": "^6.0|^7.0|^8.0",
"illuminate/queue": "^6.0|^7.0|^8.0",
"illuminate/support": "^6.0|^7.0|^8.0",
"php": "^7.2"
},
"require-dev": {
"algolia/algoliasearch-client-php": "^2.2",
"mockery/mockery": "^1.0",
"phpunit/phpunit": "^8.0|^9.3"
},
"suggest": {
"algolia/algoliasearch-client-php": "Required to use the Algolia engine (^2.2)."
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "8.x-dev"
},
"laravel": {
"providers": [
"Laravel\\Scout\\ScoutServiceProvider"
]
}
},
"autoload": {
"psr-4": {
"Laravel\\Scout\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Taylor Otwell",
"email": "taylor@laravel.com"
}
],
"description": "Laravel Scout provides a driver based solution to searching your Eloquent models.",
"keywords": [
"algolia",
"laravel",
"search"
],
"time": "2020-09-01T16:19:15+00:00"
},
{ {
"name": "laravel/tinker", "name": "laravel/tinker",
"version": "v2.4.1", "version": "v2.4.1",
@ -2040,6 +2370,72 @@
], ],
"time": "2020-07-26T07:20:36+00:00" "time": "2020-07-26T07:20:36+00:00"
}, },
{
"name": "matchish/laravel-scout-elasticsearch",
"version": "4.0.1",
"source": {
"type": "git",
"url": "https://github.com/matchish/laravel-scout-elasticsearch.git",
"reference": "f65731880ac8c2c42c6790e8917550cdca8e30ab"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/matchish/laravel-scout-elasticsearch/zipball/f65731880ac8c2c42c6790e8917550cdca8e30ab",
"reference": "f65731880ac8c2c42c6790e8917550cdca8e30ab",
"shasum": "",
"mirrors": [
{
"url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
"preferred": true
}
]
},
"require": {
"elasticsearch/elasticsearch": ">=7.2",
"laravel/scout": "^8.0",
"ongr/elasticsearch-dsl": "^7.0",
"php": "^7.2"
},
"require-dev": {
"fzaninotto/faker": "^1.8",
"illuminate/support": "^6.0|^7.0",
"nunomaduro/larastan": "~0.5",
"orchestra/testbench": "^4.0|^5.0",
"phpunit/phpunit": "^8.0|^9.0"
},
"type": "library",
"extra": {
"laravel": {
"providers": [
"Matchish\\ScoutElasticSearch\\ScoutElasticSearchServiceProvider"
]
}
},
"autoload": {
"psr-4": {
"Matchish\\ScoutElasticSearch\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Sergey Shliakhov",
"email": "shlyakhov.up@gmail.com"
}
],
"description": "Search among multiple models with ElasticSearch and Laravel Scout",
"keywords": [
"elasticsearch",
"extended",
"laravel",
"scout",
"search"
],
"time": "2020-03-26T04:06:20+00:00"
},
{ {
"name": "monolog/monolog", "name": "monolog/monolog",
"version": "2.1.1", "version": "2.1.1",
@ -2333,6 +2729,64 @@
], ],
"time": "2020-07-25T13:18:53+00:00" "time": "2020-07-25T13:18:53+00:00"
}, },
{
"name": "ongr/elasticsearch-dsl",
"version": "v7.2.0",
"source": {
"type": "git",
"url": "https://github.com/ongr-io/ElasticsearchDSL.git",
"reference": "b7653ed32d6d5b65aeef3b7ef4f46e7ac069c393"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/ongr-io/ElasticsearchDSL/zipball/b7653ed32d6d5b65aeef3b7ef4f46e7ac069c393",
"reference": "b7653ed32d6d5b65aeef3b7ef4f46e7ac069c393",
"shasum": "",
"mirrors": [
{
"url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
"preferred": true
}
]
},
"require": {
"elasticsearch/elasticsearch": "^7.0",
"paragonie/random_compat": "*",
"php": "^7.2",
"symfony/serializer": "^5.0"
},
"require-dev": {
"phpunit/phpunit": "^7.0",
"squizlabs/php_codesniffer": "^3.0"
},
"suggest": {
"elasticsearch/elasticsearch": "This library is for elasticsearch/elasticsearch client to enhance it with DSL functionality."
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "7.1-dev"
}
},
"autoload": {
"psr-4": {
"ONGR\\ElasticsearchDSL\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "ONGR team",
"homepage": "http://www.ongr.io"
}
],
"description": "Elasticsearch DSL library",
"homepage": "http://ongr.io",
"time": "2020-02-20T20:35:10+00:00"
},
{ {
"name": "opis/closure", "name": "opis/closure",
"version": "3.5.5", "version": "3.5.5",
@ -3360,6 +3814,58 @@
], ],
"time": "2020-07-28T16:51:01+00:00" "time": "2020-07-28T16:51:01+00:00"
}, },
{
"name": "react/promise",
"version": "v2.8.0",
"source": {
"type": "git",
"url": "https://github.com/reactphp/promise.git",
"reference": "f3cff96a19736714524ca0dd1d4130de73dbbbc4"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/reactphp/promise/zipball/f3cff96a19736714524ca0dd1d4130de73dbbbc4",
"reference": "f3cff96a19736714524ca0dd1d4130de73dbbbc4",
"shasum": "",
"mirrors": [
{
"url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
"preferred": true
}
]
},
"require": {
"php": ">=5.4.0"
},
"require-dev": {
"phpunit/phpunit": "^7.0 || ^6.5 || ^5.7 || ^4.8.36"
},
"type": "library",
"autoload": {
"psr-4": {
"React\\Promise\\": "src/"
},
"files": [
"src/functions_include.php"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Jan Sorgalla",
"email": "jsorgalla@gmail.com"
}
],
"description": "A lightweight implementation of CommonJS Promises/A for PHP",
"keywords": [
"promise",
"promises"
],
"time": "2020-05-12T15:16:56+00:00"
},
{ {
"name": "spatie/eloquent-sortable", "name": "spatie/eloquent-sortable",
"version": "3.8.2", "version": "3.8.2",
@ -5322,6 +5828,95 @@
], ],
"time": "2020-06-18T18:24:02+00:00" "time": "2020-06-18T18:24:02+00:00"
}, },
{
"name": "symfony/serializer",
"version": "v5.1.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/serializer.git",
"reference": "bcda9e50d058db10ef149c987edff06c142d07d1"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/serializer/zipball/bcda9e50d058db10ef149c987edff06c142d07d1",
"reference": "bcda9e50d058db10ef149c987edff06c142d07d1",
"shasum": "",
"mirrors": [
{
"url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
"preferred": true
}
]
},
"require": {
"php": ">=7.2.5",
"symfony/polyfill-ctype": "~1.8",
"symfony/polyfill-php80": "^1.15"
},
"conflict": {
"phpdocumentor/type-resolver": "<0.2.1",
"symfony/dependency-injection": "<4.4",
"symfony/property-access": "<4.4",
"symfony/property-info": "<4.4",
"symfony/yaml": "<4.4"
},
"require-dev": {
"doctrine/annotations": "~1.0",
"doctrine/cache": "~1.0",
"phpdocumentor/reflection-docblock": "^3.2|^4.0",
"symfony/cache": "^4.4|^5.0",
"symfony/config": "^4.4|^5.0",
"symfony/dependency-injection": "^4.4|^5.0",
"symfony/error-handler": "^4.4|^5.0",
"symfony/http-foundation": "^4.4|^5.0",
"symfony/mime": "^4.4|^5.0",
"symfony/property-access": "^4.4|^5.0",
"symfony/property-info": "^4.4|^5.0",
"symfony/validator": "^4.4|^5.0",
"symfony/yaml": "^4.4|^5.0"
},
"suggest": {
"doctrine/annotations": "For using the annotation mapping. You will also need doctrine/cache.",
"doctrine/cache": "For using the default cached annotation reader and metadata cache.",
"psr/cache-implementation": "For using the metadata cache.",
"symfony/config": "For using the XML mapping loader.",
"symfony/mime": "For using a MIME type guesser within the DataUriNormalizer.",
"symfony/property-access": "For using the ObjectNormalizer.",
"symfony/property-info": "To deserialize relations.",
"symfony/yaml": "For using the default YAML mapping loader."
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "5.1-dev"
}
},
"autoload": {
"psr-4": {
"Symfony\\Component\\Serializer\\": ""
},
"exclude-from-classmap": [
"/Tests/"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony Serializer Component",
"homepage": "https://symfony.com",
"time": "2020-09-01T05:52:18+00:00"
},
{ {
"name": "symfony/service-contracts", "name": "symfony/service-contracts",
"version": "v2.1.3", "version": "v2.1.3",
@ -7212,7 +7807,6 @@
"keywords": [ "keywords": [
"tokenizer" "tokenizer"
], ],
"abandoned": true,
"time": "2019-09-17T06:23:10+00:00" "time": "2019-09-17T06:23:10+00:00"
}, },
{ {

2
config/app.php
View File

@ -175,7 +175,7 @@ return [
App\Providers\EventServiceProvider::class, App\Providers\EventServiceProvider::class,
App\Providers\RouteServiceProvider::class, App\Providers\RouteServiceProvider::class,
Iidestiny\LaravelFilesystemOss\OssStorageServiceProvider::class, Iidestiny\LaravelFilesystemOss\OssStorageServiceProvider::class,
\Matchish\ScoutElasticSearch\ElasticSearchServiceProvider::class,
//\Matchish\ScoutElasticSearch\ElasticSearchServiceProvider::class,
], ],
/* /*

Write Preview
Loading…
Cancel
Save