Update

LeraFoxQueen/main.py

@@ -1,13 +1,14 @@
 # import pathlib
-from fastapi import FastAPI, Request
-from fastapi.templating import Jinja2Templates
-from fastapi.staticfiles import StaticFiles
-from fastapi.responses import HTMLResponse
+import datetime
 import uuid
-
 from contextlib import asynccontextmanager
-from .database import create_tables, delete_tables
 
+from fastapi import FastAPI, Request
+from fastapi.responses import HTMLResponse
+from fastapi.staticfiles import StaticFiles
+from fastapi.templating import Jinja2Templates
+
+from .database import create_tables, delete_tables
 from .router import router as datings_router
 from .validity import is_valid_uuid
 
@@ -31,13 +32,21 @@ app.include_router(datings_router)
 
 app.mount("/static", StaticFiles(directory="static"), name="static")
 
+
 @app.get("/", response_class=HTMLResponse)
 async def index(request: Request):
     response = templates.TemplateResponse("index.html", {"request": request})
-
     sessionKey = request.cookies.get("sessionkey")
     if isinstance(sessionKey, str) and is_valid_uuid(sessionKey):
         pass
     else:
-        response.set_cookie(key="sessionkey", value=str(uuid.uuid4()))
+        days = 365
+        expires_t_obj = datetime.datetime.now(datetime.timezone.utc) + datetime.timedelta(
+            days=days
+        )
+        expires_t_str = expires_t_obj.strftime("%a, %d %b %Y %H:%M:%S GMT")
+
+        response.set_cookie(
+            key="sessionkey", value=str(uuid.uuid4()), expires=expires_t_str
+        )
     return response

push.sh

@@ -1,6 +1,30 @@
 #!/bin/bash
 
-git add . && git commit -m "Update"
-git push
+cd $(dirname $0)
+
+ip1="10.120.152.1"
+ip2="192.168.1.250"
+
+ip r | grep 10.120.152.1
+if [[ $? == 0 ]]; then
+    ping -c 1 10.120.152.1
+    if [[ $? == 0 ]]; then
+        ip=$ip1
+        git='work'
+    fi
+else
+    ping -c 1 192.168.1.250
+    if [[ $? == 0 ]]; then
+        ip=$ip2
+        git='origin'
+    fi
+fi
+
+git add .
+git commit -m "Update"
+git push $git
+
+ssh ${ip} -f '~/update-lerafoxqueen.sh'
+status=$?
 
 echo "Finish!"