Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
I
iqdevTranningProgram
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Адлан Шамавов
iqdevTranningProgram
Commits
1ba87398
Commit
1ba87398
authored
11 months ago
by
Адлан Шамавов
Browse files
Options
Downloads
Patches
Plain Diff
fix
parent
ed7de07e
No related branches found
Branches containing commit
No related tags found
1 merge request
!8
Ptps controller 8
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
compose.override.yaml
+0
-19
0 additions, 19 deletions
compose.override.yaml
compose.yaml
+0
-26
0 additions, 26 deletions
compose.yaml
src/Controller/HomeController.php
+2
-3
2 additions, 3 deletions
src/Controller/HomeController.php
src/Service/FileUploader.php
+0
-33
0 additions, 33 deletions
src/Service/FileUploader.php
with
2 additions
and
81 deletions
compose.override.yaml
deleted
100644 → 0
+
0
−
19
View file @
ed7de07e
version
:
'
3'
services
:
###> doctrine/doctrine-bundle ###
database
:
ports
:
-
"
5432"
###< doctrine/doctrine-bundle ###
###> symfony/mailer ###
mailer
:
image
:
axllent/mailpit
ports
:
-
"
1025"
-
"
8025"
environment
:
MP_SMTP_AUTH_ACCEPT_ANY
:
1
MP_SMTP_AUTH_ALLOW_INSECURE
:
1
###< symfony/mailer ###
This diff is collapsed.
Click to expand it.
compose.yaml
deleted
100644 → 0
+
0
−
26
View file @
ed7de07e
version
:
'
3'
services
:
###> doctrine/doctrine-bundle ###
database
:
image
:
postgres:${POSTGRES_VERSION:-16}-alpine
environment
:
POSTGRES_DB
:
${POSTGRES_DB:-app}
# You should definitely change the password in production
POSTGRES_PASSWORD
:
${POSTGRES_PASSWORD:-!ChangeMe!}
POSTGRES_USER
:
${POSTGRES_USER:-app}
healthcheck
:
test
:
[
"
CMD"
,
"
pg_isready"
]
timeout
:
5s
retries
:
5
start_period
:
60s
volumes
:
-
database_data:/var/lib/postgresql/data:rw
# You may use a bind-mounted host directory instead, so that it is harder to accidentally remove the volume and lose all your data!
# - ./docker/db/data:/var/lib/postgresql/data:rw
###< doctrine/doctrine-bundle ###
volumes
:
###> doctrine/doctrine-bundle ###
database_data
:
###< doctrine/doctrine-bundle ###
This diff is collapsed.
Click to expand it.
src/Controller/HomeController.php
+
2
−
3
View file @
1ba87398
...
...
@@ -96,11 +96,10 @@ class HomeController extends AbstractController
}
#[Route('/readLogFile', name: 'readLogFile')]
public
function
readLogFile
(
Request
$request
,
FileUploader
$fileUploader
):
Response
public
function
readLogFile
(
Request
$request
):
Response
{
$file
=
$request
->
files
->
get
(
'file'
);
$fileName
=
$fileUploader
->
upload
(
$file
);
$text
=
$this
->
functions
->
readLogFile
(
$fileName
);
$text
=
$this
->
functions
->
readLogFile
(
$file
);
$response
=
new
JsonResponse
(
$text
);
$response
->
setEncodingOptions
(
JSON_UNESCAPED_UNICODE
);
return
$response
;
...
...
This diff is collapsed.
Click to expand it.
src/Service/FileUploader.php
deleted
100644 → 0
+
0
−
33
View file @
ed7de07e
<?php
namespace
App\Service
;
use
Symfony\Component\HttpFoundation\File\Exception\FileException
;
use
Symfony\Component\HttpFoundation\File\UploadedFile
;
class
FileUploader
{
private
$targetDirectory
;
public
function
__construct
(
$targetDirectory
)
{
$this
->
targetDirectory
=
$targetDirectory
;
}
public
function
upload
(
UploadedFile
$file
)
{
$fileName
=
pathinfo
(
$file
->
getClientOriginalName
(),
PATHINFO_FILENAME
)
.
'.'
.
$file
->
guessExtension
();
try
{
$file
->
move
(
$this
->
getTargetDirectory
(),
$fileName
);
}
catch
(
FileException
$e
)
{
throw
new
FileException
(
$e
->
getMessage
());
}
return
$this
->
getTargetDirectory
()
.
$fileName
;
}
public
function
getTargetDirectory
()
{
return
$this
->
targetDirectory
;
}
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment