Skip to content

Commit

Permalink
[SERVER] final release v2.5.2
Browse files Browse the repository at this point in the history
  • Loading branch information
Huynh Thanh Binh committed Sep 20, 2020
1 parent 314d651 commit 0ae6da0
Show file tree
Hide file tree
Showing 21 changed files with 66 additions and 39 deletions.
16 changes: 8 additions & 8 deletions .env
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ SERVICE_DISCOVERY_HOST=service-discovery
SERVICE_DISCOVERY_PORT=8500

# version control
MESSAGE_QUEUE_VERSION=v2.5.1
SERVICE_DISCOVERY_VERSION=v2.5.1
MESSAGE_QUEUE_VERSION=v2.5.2
SERVICE_DISCOVERY_VERSION=v2.5.2

MAIL_SERVICE_VERSION=v2.5.1
AUTH_SERVICE_VERSION=v2.5.1
USER_SERVICE_VERSION=v2.5.1
PARKING_LOT_SERVICE_VERSION=v2.5.1
CONTACT_SERVICE_VERSION=v2.5.1
BOOKING_SERVICE_VERSION=v2.5.1
MAIL_SERVICE_VERSION=v2.5.2
AUTH_SERVICE_VERSION=v2.5.2
USER_SERVICE_VERSION=v2.5.2
PARKING_LOT_SERVICE_VERSION=v2.5.2
CONTACT_SERVICE_VERSION=v2.5.2
BOOKING_SERVICE_VERSION=v2.5.2

# port config: local port != docker port
MESSAGE_QUEUE_MANAGEMENT_PORT=15672
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/maven.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
runs-on: ubuntu-16.04
continue-on-error: false
env:
SAIGONPARKING_VERSION: v2.5.1
SAIGONPARKING_VERSION: v2.5.2
steps:
- uses: actions/checkout@v2
- name: Set up JDK 1.8
Expand Down
43 changes: 35 additions & 8 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
/\__/ /| (_| || || (_| || (_) || | | | | | | (_| || | | < | || | | || (_| | |_/ \_________/ \___|
\____/ \__,_||_| \__, | \___/ |_| |_| \_| \__,_||_| |_|\_\|_||_| |_| \__, | ____\_/_________\_/_____
__/ | __/ |
|___/ |___/ v2.5.1 - ©Copyright 2020
|___/ |___/ v2.5.2 - ©Copyright 2020
</pre>

[![saigonparking-master action-status](https://github.com/huynhthanhbinh/saigonparking/workflows/saigonparking-master/badge.svg)](https://github.com/huynhthanhbinh/saigonparking/actions)

<h2>0. Project's modules:</h2>
<h2>1. Project's modules:</h2>
<table>
<tbody>
<tr>
Expand All @@ -39,7 +39,7 @@
</table>

<br/>
<h2>1. Project's members:</h2>
<h2>2. Project's members:</h2>
<table>
<tbody>
<tr>
Expand Down Expand Up @@ -76,26 +76,53 @@
</table>

<br/>
<h2>2. Project's workflow:</h2>
<h2>3. Project's workflow:</h2>

![workflow_img](documents/workflow.png)

<br/>
<h2>3. Project's architecture:</h2>
<h2>4. Project's architecture:</h2>

![architecture_img](documents/architecture.png)

<br/>
<h2>4. Authentication &#38; Authorization:</h2>
<h2>5. Authentication &#38; Authorization:</h2>

![authentication_img](documents/authentication.png)

<br/>
<h2>5. Project's deployment:</h2>
<h2>6. Project's deployment:</h2>

![deployment_img](documents/deployment.png)

<br/>
<h2>6. Project's technology stack:</h2>
<h2>7. Project's technology stack:</h2>

![technology_img](documents/technology.png)

<br/>
<h2>8. Project's registered domains</h2>
<table>
<tbody>
<tr>
<td>1</td>
<td>Official Website</td>
<td>https://www.saigonparking.wtf</td>
</tr>
<tr>
<td>2</td>
<td>Administrator's Website</td>
<td>http://admin.saigonparking.wtf</td>
</tr>
<tr>
<td>3</td>
<td>Parking-lot's Website</td>
<td>http://parkinglot.saigonparking.wtf</td>
</tr>
</tbody>
</table>

<br/>
<h2>9. Demo</h2>
Available on YouTube at:
<a href="https://www.youtube.com/playlist?list=PLVRbjVojJrqCCQQcYG_h4df_M0nUXVGdV">Saigon Parking Demo Final</a>
20 changes: 10 additions & 10 deletions dev/.env
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,16 @@ SERVICE_DISCOVERY_HOST=service-discovery
SERVICE_DISCOVERY_PORT=8500

# Version control
PROXY_VERSION=v2.5.1
GATEWAY_VERSION=v2.5.1
MESSAGE_QUEUE_VERSION=v2.5.1
SERVICE_DISCOVERY_VERSION=v2.5.1
MAIL_SERVICE_VERSION=v2.5.1
AUTH_SERVICE_VERSION=v2.5.1
USER_SERVICE_VERSION=v2.5.1
PARKING_LOT_SERVICE_VERSION=v2.5.1
CONTACT_SERVICE_VERSION=v2.5.1
BOOKING_SERVICE_VERSION=v2.5.1
PROXY_VERSION=v2.5.2
GATEWAY_VERSION=v2.5.2
MESSAGE_QUEUE_VERSION=v2.5.2
SERVICE_DISCOVERY_VERSION=v2.5.2
MAIL_SERVICE_VERSION=v2.5.2
AUTH_SERVICE_VERSION=v2.5.2
USER_SERVICE_VERSION=v2.5.2
PARKING_LOT_SERVICE_VERSION=v2.5.2
CONTACT_SERVICE_VERSION=v2.5.2
BOOKING_SERVICE_VERSION=v2.5.2

# port config
PROXY_ADMIN_PORT=9901
Expand Down
2 changes: 1 addition & 1 deletion discovery/.env
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
TIMEZONE=Asia/Bangkok
DOCKER_HUB_ID=saigonparkingmap

SERVICE_DISCOVERY_VERSION=v2.5.1
SERVICE_DISCOVERY_VERSION=v2.5.2

SERVICE_DISCOVERY_DNS_PORT=8600
SERVICE_DISCOVERY_HTTP_PORT=8500
Expand Down
Binary file modified documents/papers/SaigonParking.docx
100644 → 100755
View file
Binary file not shown.
Binary file modified documents/papers/SaigonParking.pdf
100644 → 100755
View file
Binary file not shown.
Binary file added documents/posters/architecture.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added documents/posters/authentication.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added documents/posters/deployment.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added documents/posters/workflow.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion emulator/src/main/resources/banner.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
/\__/ /| (_| || || (_| || (_) || | | | | | | (_| || | | < | || | | || (_| | |_/ \_________/ \___|
\____/ \__,_||_| \__, | \___/ |_| |_| \_| \__,_||_| |_|\_\|_||_| |_| \__, | ____\_/_________\_/_____
__/ | __/ |
|___/ |___/ v2.5.1 - ©Copyright 2020
|___/ |___/ v2.5.2 - ©Copyright 2020
4 changes: 2 additions & 2 deletions gateway/.env
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ TIMEZONE=Asia/Bangkok
DOCKER_HUB_ID=saigonparkingmap

# Version control
PROXY_VERSION=v2.5.1
GATEWAY_VERSION=v2.5.1
PROXY_VERSION=v2.5.2
GATEWAY_VERSION=v2.5.2
WEB_SERVER_VERSION=prod

# port config
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
</developers>

<properties>
<revision>v2.5.1</revision> <!-- version of project -->
<revision>v2.5.2</revision> <!-- version of project -->
<java.version>1.8</java.version> <!-- version of java (jdk) -->

<project.docker.hub-id>saigonparkingmap</project.docker.hub-id>
Expand Down
2 changes: 1 addition & 1 deletion queue/.env
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Global environment
TIMEZONE=Asia/Bangkok
DOCKER_HUB_ID=saigonparkingmap
MESSAGE_QUEUE_VERSION=v2.5.1
MESSAGE_QUEUE_VERSION=v2.5.2

RABBITMQ_CONFIG_FILE=/etc/rabbitmq/rabbitmq.conf
RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS=-rabbit log[{console,[{level,debug}]}]
Expand Down
2 changes: 1 addition & 1 deletion service/auth-service/src/main/resources/banner.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
/\__/ /| (_| || || (_| || (_) || | | | | | | (_| || | | < | || | | || (_| | |_/ \_________/ \___|
\____/ \__,_||_| \__, | \___/ |_| |_| \_| \__,_||_| |_|\_\|_||_| |_| \__, | ____\_/_________\_/_____
__/ | __/ |
|___/ |___/ v2.5.1 - ©Copyright 2020
|___/ |___/ v2.5.2 - ©Copyright 2020
2 changes: 1 addition & 1 deletion service/booking-service/src/main/resources/banner.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
/\__/ /| (_| || || (_| || (_) || | | | | | | (_| || | | < | || | | || (_| | |_/ \_________/ \___|
\____/ \__,_||_| \__, | \___/ |_| |_| \_| \__,_||_| |_|\_\|_||_| |_| \__, | ____\_/_________\_/_____
__/ | __/ |
|___/ |___/ v2.5.1 - ©Copyright 2020
|___/ |___/ v2.5.2 - ©Copyright 2020
2 changes: 1 addition & 1 deletion service/contact-service/src/main/resources/banner.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
/\__/ /| (_| || || (_| || (_) || | | | | | | (_| || | | < | || | | || (_| | |_/ \_________/ \___|
\____/ \__,_||_| \__, | \___/ |_| |_| \_| \__,_||_| |_|\_\|_||_| |_| \__, | ____\_/_________\_/_____
__/ | __/ |
|___/ |___/ v2.5.1 - ©Copyright 2020
|___/ |___/ v2.5.2 - ©Copyright 2020
2 changes: 1 addition & 1 deletion service/mail-service/src/main/resources/banner.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
/\__/ /| (_| || || (_| || (_) || | | | | | | (_| || | | < | || | | || (_| | |_/ \_________/ \___|
\____/ \__,_||_| \__, | \___/ |_| |_| \_| \__,_||_| |_|\_\|_||_| |_| \__, | ____\_/_________\_/_____
__/ | __/ |
|___/ |___/ v2.5.1 - ©Copyright 2020
|___/ |___/ v2.5.2 - ©Copyright 2020
2 changes: 1 addition & 1 deletion service/parkinglot-service/src/main/resources/banner.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
/\__/ /| (_| || || (_| || (_) || | | | | | | (_| || | | < | || | | || (_| | |_/ \_________/ \___|
\____/ \__,_||_| \__, | \___/ |_| |_| \_| \__,_||_| |_|\_\|_||_| |_| \__, | ____\_/_________\_/_____
__/ | __/ |
|___/ |___/ v2.5.1 - ©Copyright 2020
|___/ |___/ v2.5.2 - ©Copyright 2020
2 changes: 1 addition & 1 deletion service/user-service/src/main/resources/banner.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
/\__/ /| (_| || || (_| || (_) || | | | | | | (_| || | | < | || | | || (_| | |_/ \_________/ \___|
\____/ \__,_||_| \__, | \___/ |_| |_| \_| \__,_||_| |_|\_\|_||_| |_| \__, | ____\_/_________\_/_____
__/ | __/ |
|___/ |___/ v2.5.1 - ©Copyright 2020
|___/ |___/ v2.5.2 - ©Copyright 2020

0 comments on commit 0ae6da0

Please sign in to comment.