Elgato_dark/appwrite
1
0
Fork 0
mirror of https://github.com/appwrite/appwrite synced 2026-05-24 09:28:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge remote-tracking branch 'origin/1.1.x' into feat-graphql-support

Browse source 
# Conflicts:
#	app/config/specs/open-api3-latest-client.json
#	app/config/specs/open-api3-latest-console.json
#	app/config/specs/open-api3-latest-server.json
#	app/config/specs/swagger2-latest-client.json
#	app/config/specs/swagger2-latest-console.json
#	app/config/specs/swagger2-latest-server.json
#	composer.json
#	composer.lock
#	src/Appwrite/Utopia/Response/Model/Provider.php
This commit is contained in:
Jake Barnby 2022-11-01 11:07:51 +13:00
commit 03f85c3b74
No known key found for this signature in database
GPG key ID: C437A8CC85B96E9C
4 changed files with 2 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README-CN.md
View file

@ -21,6 +21,8 @@
[English](README.md) | 简体中文 [English](README.md) | 简体中文
[**我们发布了 Appwrite 1.0 版本！**](https://appwrite.io/1.0)
Appwrite是一个基于Docker的端到端开发者平台，其容器化的微服务库可应用于网页端，移动端，以及后端。Appwrite 通过视觉化界面极简了从零编写 API 的繁琐过程，在保证软件安全的前提下为开发者创造了一个高效的开发环境。 Appwrite是一个基于Docker的端到端开发者平台，其容器化的微服务库可应用于网页端，移动端，以及后端。Appwrite 通过视觉化界面极简了从零编写 API 的繁琐过程，在保证软件安全的前提下为开发者创造了一个高效的开发环境。
Appwrite 可以提供给开发者用户验证，外部授权，用户数据读写检索，文件储存，图像处理，云函数计算，[等多种服务](https://appwrite.io/docs). Appwrite 可以提供给开发者用户验证，外部授权，用户数据读写检索，文件储存，图像处理，云函数计算，[等多种服务](https://appwrite.io/docs).

5
app/controllers/general.php
View file

@ -403,11 +403,6 @@ App::error()
$version = App::getEnv('_APP_VERSION', 'UNKNOWN'); $version = App::getEnv('_APP_VERSION', 'UNKNOWN');
$route = $utopia->match($request); $route = $utopia->match($request);
/** Delegate PDO exceptions to the global handler so the database connection can be returned to the pool */
if ($error instanceof PDOException) {
throw $error;
}
if ($logger) { if ($logger) {
if ($error->getCode() >= 500 || $error->getCode() === 0) { if ($error->getCode() >= 500 || $error->getCode() === 0) {
try { try {

7
app/http.php
View file

@ -317,13 +317,6 @@ $http->on('request', function (SwooleRequest $swooleRequest, SwooleResponse $swo
Console::error('[Error] File: ' . $th->getFile()); Console::error('[Error] File: ' . $th->getFile());
Console::error('[Error] Line: ' . $th->getLine()); Console::error('[Error] Line: ' . $th->getLine());
/**
* Reset Database connection if PDOException was thrown.
*/
if ($th instanceof PDOException) {
$db = null;
}
$swooleResponse->setStatusCode(500); $swooleResponse->setStatusCode(500);
$output = ((App::isDevelopment())) ? [ $output = ((App::isDevelopment())) ? [

1
app/workers/builds.php
View file

@ -183,7 +183,6 @@ class BuildsV1 extends Worker
/* Also update the deployment buildTime */ /* Also update the deployment buildTime */
$deployment->setAttribute('buildTime', $response['duration']); $deployment->setAttribute('buildTime', $response['duration']);
$deployment = $dbForProject->updateDocument('deployments', $deployment->getId(), $deployment);
Console::success("Build id: $buildId created"); Console::success("Build id: $buildId created");