Jason/heping-api
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	composer.json
#	composer.lock
This commit is contained in:
knowpia
2022-09-09 11:34:26 +08:00
parent b7bae45f07 c5f290bd5a
commit 0f9d6ded79
4 changed files with 93 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
composer.lock generated
View File

@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "e9f35a9e755994ce58619da2bf6d572b",
"content-hash": "c6bc90a1bccad5f43e5e82d326d82fe7",
"packages": [
{
"name": "adbario/php-dot-notation",
@@ -1913,100 +1913,6 @@
"source": "https://github.com/top-think/think-orm/tree/v2.0.54"
},
"time": "2022-07-05T05:25:51+00:00"
},
{
"name": "topthink/think-template",
"version": "v2.0.8",
"source": {
"type": "git",
"url": "https://github.com/top-think/think-template.git",
"reference": "abfc293f74f9ef5127b5c416310a01fe42e59368"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/top-think/think-template/zipball/abfc293f74f9ef5127b5c416310a01fe42e59368",
"reference": "abfc293f74f9ef5127b5c416310a01fe42e59368",
"shasum": "",
"mirrors": [
{
"url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
"preferred": true
}
]
},
"require": {
"php": ">=7.1.0",
"psr/simple-cache": "^1.0"
},
"type": "library",
"autoload": {
"psr-4": {
"think\\": "src"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"Apache-2.0"
],
"authors": [
{
"name": "liu21st",
"email": "liu21st@gmail.com"
}
],
"description": "the php template engine",
"support": {
"issues": "https://github.com/top-think/think-template/issues",
"source": "https://github.com/top-think/think-template/tree/v2.0.8"
},
"time": "2020-12-10T07:52:03+00:00"
},
{
"name": "topthink/think-view",
"version": "v1.0.14",
"source": {
"type": "git",
"url": "https://github.com/top-think/think-view.git",
"reference": "edce0ae2c9551ab65f9e94a222604b0dead3576d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/top-think/think-view/zipball/edce0ae2c9551ab65f9e94a222604b0dead3576d",
"reference": "edce0ae2c9551ab65f9e94a222604b0dead3576d",
"shasum": "",
"mirrors": [
{
"url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
"preferred": true
}
]
},
"require": {
"php": ">=7.1.0",
"topthink/think-template": "^2.0"
},
"type": "library",
"autoload": {
"psr-4": {
"think\\view\\driver\\": "src"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"Apache-2.0"
],
"authors": [
{
"name": "liu21st",
"email": "liu21st@gmail.com"
}
],
"description": "thinkphp template driver",
"support": {
"issues": "https://github.com/top-think/think-view/issues",
"source": "https://github.com/top-think/think-view/tree/v1.0.14"
},
"time": "2019-11-06T11:40:13+00:00"
}
],
"packages-dev": [