处理protocol与host信息

HenryJi529 · Jun 5, 2024 · 000e39e · 000e39e
1 parent b11c2fc
commit 000e39e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 22 deletions.
diff --git a/Morningstar/views/base.py b/Morningstar/views/base.py
@@ -42,13 +42,7 @@ def create_activate_message(username, host):
         except:
             pass
         conn.set(f"{username}-activate", code, ex=60 * 10)
-
-        protocol = (
-            "https://"
-            if os.environ.get("DJANGO_SETTINGS_MODULE", "Morningstar.settings.dev")
-            == "Morningstar.settings.production"
-            else "http://"
-        )
+        protocol = "https://" if request.is_secure() else "http://"
         link = (
             protocol
             + host

diff --git a/Morningstar/views/tool.py b/Morningstar/views/tool.py
@@ -139,12 +139,7 @@ def get_login_token(request: HttpRequest, identity):
         username = user.username
         password = user.password
         token = html.escape(password[-20:])
-        protocol = (
-            "https://"
-            if os.environ.get("DJANGO_SETTINGS_MODULE", "Morningstar.settings.dev")
-            == "Morningstar.settings.production"
-            else "http://"
-        )
+        protocol = "https://" if request.is_secure() else "http://"
         link = (
             protocol
             + request.get_host()

diff --git a/apps/share/frontend/src/views/HomeView.vue b/apps/share/frontend/src/views/HomeView.vue
@@ -6,9 +6,6 @@ import Cookies from 'js-cookie'
 
 const route = useRoute()
 const BASE_URL = process.env.BASE_URL
-const currentPath = ref(window.location.href)
-
-const endpoint = "/submit/"
 
 const url = ref("")  // NOTE: 提交的信息
 const link = ref("") // NOTE: 返回的加密链接
@@ -24,7 +21,7 @@ const handleSubmit = async ()=>{
     return
   }
 
-  const response = await axios.post(endpoint,{
+  const response = await axios.post("/submit/",{
     "url": url.value,
   })
 
@@ -47,8 +44,8 @@ const handleSubmit = async ()=>{
   </div>
   <div v-else class="max-w-[100vw] overflow-hidden p-4">
     <div class="text-base md:text-2xl my-10 text-lime-600 break-words">
-      <a :href="`${currentPath}${link}`">
-        {{ currentPath + link }}
+      <a :href="`${link}`">
+        {{ link }}
       </a>
     </div>
     <div class="flex justify-center">

diff --git a/apps/share/views.py b/apps/share/views.py
@@ -65,7 +65,7 @@ def submit(request: HttpRequest):
     if request.method == "POST":
         item = Item(url=request.data["url"])
         item.save()
-        id = item.id
-        link = f"redirect/{id}/"
-        request.session["share-qrcode"] = "https://morningstar369.com/share/" + link
+        protocol = "https://" if request.is_secure() else "http://"
+        link = protocol + request.META["HTTP_HOST"] + f"/share/redirect/{item.id}/"
+        request.session["share-qrcode"] = link
         return Response({"link": link})