Skip to content

Commit

Permalink
Merge branch 'hotfix'
Browse files Browse the repository at this point in the history
  • Loading branch information
djccnt15 committed Oct 15, 2024
2 parents e71ae39 + f51abe7 commit dc57a58
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 37 deletions.
4 changes: 2 additions & 2 deletions docs/blog/posts/2022-11-08-git_handling_branch.md
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ git rebase --onto <newbase> <oldbase> <branch> # (1)!

```mermaid
gitGraph
commit id: "A"
commit id: "A"
commit id: "B"
branch feature/a
commit id: "C"
Expand All @@ -155,7 +155,7 @@ git rebase --onto <newbase> <oldbase> <branch> # (1)!

```mermaid
gitGraph
commit id: "A"
commit id: "A"
commit id: "B"
branch feature/a
commit id: "C"
Expand Down
51 changes: 27 additions & 24 deletions docs/blog/posts/2024-07-25-web_client_server.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,15 @@ sequenceDiagram
activate Client
activate DNS Resolver
alt if data in DNS Resolver Cache
DNS Resolver ->> Client : service server IP
DNS Resolver -->> Client : service server IP
else if not data in DNS Resolver Cache
DNS Resolver ->> Root DNS : request TLD IP
Root DNS ->> DNS Resolver : return TLD IP
Root DNS -->> DNS Resolver : return TLD IP
DNS Resolver ->> Top Level DNS : request Second Level DNS IP
Top Level DNS ->> DNS Resolver : return Second Level DNS IP
Top Level DNS -->> DNS Resolver : return Second Level DNS IP
DNS Resolver ->> Second Level DNS : request service server IP
Second Level DNS ->> DNS Resolver : return service server IP
DNS Resolver ->> Client : service server IP
Second Level DNS -->> DNS Resolver : return service server IP
DNS Resolver -->> Client : service server IP
deactivate DNS Resolver
end
Client ->> service server : request
Expand All @@ -70,16 +70,16 @@ sequenceDiagram
activate Client
activate DNS Resolver
alt if data in DNS Resolver Cache
DNS Resolver ->> Client : service server IP
DNS Resolver -->> Client : service server IP
else if not data in DNS Resolver Cache
DNS Resolver ->> Root DNS : request TLD IP
Root DNS ->> DNS Resolver : return TLD IP
DNS Resolver ->> Client : return TLD IP
Root DNS -->> DNS Resolver : return TLD IP
DNS Resolver -->> Client : return TLD IP
deactivate DNS Resolver
Client ->> Top Level DNS : request Second Level DNS IP
Top Level DNS ->> Client : return Second Level DNS IP
Top Level DNS -->> Client : return Second Level DNS IP
Client ->> Second Level DNS : request service server IP
Second Level DNS ->> Client : return service server IP
Second Level DNS -->> Client : return service server IP
end
Client ->> service server : request
deactivate Client
Expand All @@ -98,12 +98,12 @@ title: 3-way handshake
sequenceDiagram
Client ->> Server : SYN
Note over Client, Server : TCP 헤더에 SYN 플래그 지정한 세그먼트 발송
Server ->> Client : SYN-ACK
Server -->> Client : SYN-ACK
Note over Client, Server : 연결 수락 시 SYN과 ACK 플래그 지정 세그먼트 발송
Client ->> Server : ACK
Note over Client, Server : 연결 수락 세그먼트 수신 확인
Client ->> Server : HTTP request
Server ->> Client : HTTP response
Server -->> Client : HTTP response
```

- SYN: SYNchronize
Expand All @@ -121,15 +121,15 @@ title: SSL handshake
sequenceDiagram
Client ->> Server : Client Hello
Note over Client, Server : 사용할 암호화 알고리즘 목록(cipher sweet)과 난수, 세션 ID 등을 전송
Server ->> Client : Server Hello
Server -->> Client : Server Hello
Note over Client, Server : 암호화 알고리즘 중 사용할 알고리즘 선택 결과, 난수, 세션 ID 등을 전송
Server ->> Client : Certificate
Server -->> Client : Certificate
Note over Client, Server : 인증서를 전송하며 암호화에 사용할 공개키 전송
Server ->> Client : Server Key Exchange
Server -->> Client : Server Key Exchange
opt
Server ->> Client : Certificate Request
Server -->> Client : Certificate Request
end
Server ->> Client : Server Hello Done
Server -->> Client : Server Hello Done
opt
Client ->> Server : Certificate
end
Expand All @@ -139,26 +139,29 @@ sequenceDiagram
end
Client ->> Server : Change Cipher spec
Client ->> Server : Finished
Server ->> Client : Change Cipher spec
Server ->> Client : Finished
Server -->> Client : Change Cipher spec
Server -->> Client : Finished
Client ->> Server : HTTPS request
Server ->> Client : HTTPS response
Server -->> Client : HTTPS response
```

## 3. Web Server/WAS

클라이언트가 서버로 요청을 보낼 경우 웹서버가 정적 요청을 처리하고, Web Application Server와 TCP/IP 통신을 통해 복잡한 로직을 처리하여 처리 결과를 회신함

```mermaid
---
title: How response working with Web Server, WAS
---
sequenceDiagram
Client ->> Web Server : request
activate Client
Web Server ->> Client : static response
Web Server ->> WAS(WSGI) : request
activate Web Server
WAS(WSGI) ->> Web Server : response
Web Server -->> Client : static response
Web Server ->> WAS(WSGI) : request
WAS(WSGI) -->> Web Server : response
Web Server -->> Client : response
deactivate Web Server
Web Server ->> Client : response
deactivate Client
```

Expand Down
6 changes: 3 additions & 3 deletions docs/portfolio/board.md
Original file line number Diff line number Diff line change
Expand Up @@ -341,13 +341,13 @@ DB 호출 빈도가 가장 높은 API에 [Cache Aside 패턴](../blog/posts/2023
title: Cache Aside Pattern - Read Sequence
---
sequenceDiagram
Client ->> FastAPI: API request
Client -) FastAPI: API request
activate FastAPI
alt if cached data
FastAPI -->> Cache Server: check data
FastAPI -) Cache Server: check data
Cache Server --) FastAPI: response data
else if not cached data
FastAPI -->> Database: query
FastAPI -) Database: query
Database --) FastAPI: result
end
FastAPI --) Client: response
Expand Down
16 changes: 8 additions & 8 deletions docs/portfolio/vision.md
Original file line number Diff line number Diff line change
Expand Up @@ -163,14 +163,14 @@ erDiagram
title: Image Upload Process
---
sequenceDiagram
Client ->> FastAPI: API request
Client -) FastAPI: API request
activate FastAPI
FastAPI -->> BLOB Database: upload thumbnail
FastAPI -) BLOB Database: upload thumbnail
BLOB Database --) FastAPI: thumbnail id
FastAPI -->> BLOB Database: upload image
FastAPI -) BLOB Database: upload image
BLOB Database --) FastAPI: image id
FastAPI -->> Database: insert image meta data
FastAPI ->> Client: response
FastAPI -) Database: insert image meta data
FastAPI --) Client: response
deactivate FastAPI
```

Expand All @@ -179,11 +179,11 @@ sequenceDiagram
title: Document OCR Process
---
sequenceDiagram
Client ->> FastAPI: API request
Client -) FastAPI: API request
activate FastAPI
FastAPI -->> Database: query
FastAPI -) Database: query
Database --) FastAPI: image meta data
FastAPI -->> BLOB Database: query
FastAPI -) BLOB Database: query
BLOB Database --) FastAPI: image data
FastAPI ->> Tesseract: ocr request
Tesseract ->> FastAPI: result
Expand Down

0 comments on commit dc57a58

Please sign in to comment.