diff options
| -rw-r--r-- | main_server.go | 10 | ||||
| -rw-r--r-- | web_page/main.js | 6 | ||||
| -rw-r--r-- | web_server/web_server.go | 14 |
3 files changed, 20 insertions, 10 deletions
diff --git a/main_server.go b/main_server.go index 00d3938..a17d788 100644 --- a/main_server.go +++ b/main_server.go @@ -50,13 +50,13 @@ func gen_hash(url string) string{ } func correct_url(url string) string { - if(len(url) <= 7) { - return "https://" + url; + if(url[:7] == "https:/") { + return "https://" + url[7:]; } - if(url[:8] != "https://") { - return "https://" + url; + if(url[:6] == "http:/") { + return "http://" + url[:6]; } - return url; + return "https://" + url; } func add_url(url string) string{ diff --git a/web_page/main.js b/web_page/main.js index 5b0bf05..8d83b4c 100644 --- a/web_page/main.js +++ b/web_page/main.js @@ -2,7 +2,7 @@ function click_send(){ data = document.getElementById("inp1").value; console.log(data); - fetch("http://localhost:5556/add/"+data).then(response => { + fetch("https://sl.azuminha.com/add/"+encodeURIComponent(data)).then(response => { if (!response.ok) { throw new Error('Network response was not ok'); } @@ -10,7 +10,7 @@ function click_send(){ }).then(result => { console.log(result); const res = document.createElement("p"); - res.textContent = data + " => " + "localhost:5556/" + result; + res.textContent = data + " => " + "sl.azuminha.com/" + result; document.body.appendChild(res); }) return 10 * 3; @@ -23,4 +23,4 @@ document.addEventListener("DOMContentLoaded", function () { if (event.key === "Enter") click_send(); }); -});
\ No newline at end of file +}); diff --git a/web_server/web_server.go b/web_server/web_server.go index fd98697..d3bf79e 100644 --- a/web_server/web_server.go +++ b/web_server/web_server.go @@ -18,18 +18,28 @@ func handler(w http.ResponseWriter, r *http.Request) { w.Header().Set("Access-Control-Allow-Methods", "GET, POST, OPTIONS") w.Header().Set("Access-Control-Allow-Headers", "Content-Type") + fmt.Println(r.URL.Path); tmp := strings.Split(r.URL.Path, "/"); fmt.Println(tmp); if tmp[1] == "add" && len(tmp[2]) != 0 { + add_url := tmp[2]; + fmt.Println(tmp[2]); + for i := 3; i < len(tmp); i++ { + fmt.Println(tmp[3]); + if tmp[i] == "" { + break + } + add_url += "/" + tmp[i] + } fmt.Println("Request add:"); - fmt.Println("Sending a request to add: " + tmp[2] + "..."); + fmt.Println("Sending a request to add: " + add_url + "..."); conn, err := net.Dial("tcp", "localhost:5555"); if err != nil { log.Fatal(err); } defer conn.Close(); - fmt.Fprintf(conn, "{\"type\": 1, \"url\": \"%s\"}", tmp[2]); + fmt.Fprintf(conn, "{\"type\": 1, \"url\": \"%s\"}", add_url); res, _ := bufio.NewReader(conn).ReadBytes('\n'); fmt.Println(string(res)); |