Merge branch 'master' of https://github.com/Zihe33Huang/lisayoga-server

Zihe33Huang · Nov 17, 2023 · e078c7c · e078c7c
2 parents 4796cd3 + 1a7c787
commit e078c7c
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 3 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -4,7 +4,7 @@ env:
   MY_APPNAME: lisayoga_server
 on:
   push:
-    branches: [ master ]
+    branches: [master]
 
 jobs:
   build: #name of the job
@@ -17,8 +17,8 @@ jobs:
       - name: Setup JDK
         uses: actions/setup-java@v2
         with:
-          java-version: '8'
-          distribution: 'adopt'
+          java-version: "8"
+          distribution: "adopt"
 
       - name: Build with Maven
         run: mvn -B package --file pom.xml

diff --git a/README.md b/README.md
@@ -8,5 +8,26 @@ SpringBoot
 Docker
 Docker-Compose
 MySQL
+Nginx
 
 
+# Nginx 
+
+Used for Port Forwarding.  
+PS:  server_name is necessary, otherwise nginx may not work 
+
+```
+server {
+    listen 80;
+    server_name 13.42.17.166;  
+
+    location /lisayoga/ {
+        proxy_pass http://127.0.0.1:12010/;
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+    }
+}
+
+```