Bladeren bron

change to https

huaisianhuang 3 jaren geleden
bovenliggende
commit
dadfeff62a
4 gewijzigde bestanden met toevoegingen van 24 en 11 verwijderingen
  1. 1 1
      html/login.js
  2. 1 1
      html/register.js
  3. 1 1
      html/script_profile.js
  4. 21 8
      html/static/script_util.js

+ 1 - 1
html/login.js

@@ -20,7 +20,7 @@ function loginByEnter(e) {
 
 function login(){
     console.log('login!');
-    var url = "http://www.choozmo.com:8887/login";
+    var url = "https://www.choozmo.com:8887/login";
     var xhr = new XMLHttpRequest();
     xhr.open("POST", url);
     xhr.setRequestHeader("accept", "application/json");

+ 1 - 1
html/register.js

@@ -64,7 +64,7 @@ function register() {
         }
         axios({
             method: 'post',
-            url: 'http://www.choozmo.com:8887/register',
+            url: 'https://www.choozmo.com:8887/register',
             headers: headers,
             data: userObj
         }).then(res => {

+ 1 - 1
html/script_profile.js

@@ -16,7 +16,7 @@ function renderView() {
     // axios.defaults.withCredentials = false;
     axios({
         method: 'post',
-        url: 'http://www.choozmo.com:8887/user_profile',
+        url: 'https://www.choozmo.com:8887/user_profile',
         headers: { 
             'accept': 'text/html',
             'Authorization': `Bearer ${token}`

+ 21 - 8
html/static/script_util.js

@@ -1,13 +1,13 @@
 checkRoute();
 
 function checkRoute() {
-  jwt_token = get_jwt_token();
+  let jwt_token = get_jwt_token();
   if(jwt_token == undefined) {
     window.location.replace("login.html");
   }
   axios({
     method: 'post',
-    url: 'http://www.choozmo.com:8887/user_profile',
+    url: 'https://www.choozmo.com:8887/user_profile',
     headers: { 
         'accept': 'text/html',
         'Authorization': `Bearer ${jwt_token}`
@@ -95,7 +95,7 @@ function prepareUpload(event) {
     processData: false, // important
     contentType: false, // important
     data: data,
-    url: 'http://www.choozmo.com:8887/uploadfile',
+    url: 'https://www.choozmo.com:8887/uploadfile',
     dataType: 'json',
     success: function (jsonData) {
       event.target.previousSibling.value = jsonData.msg;
@@ -144,7 +144,7 @@ $(".next").click(function () {
   console.log(dataOBJ)
   jwt_token =  get_jwt_token()
   var xhr = new XMLHttpRequest();
-  xhr.open("POST", "http://www.choozmo.com:8887/make_anchor_video");
+  xhr.open("POST", "https://www.choozmo.com:8887/make_anchor_video");
   xhr.setRequestHeader("accept", "application/json");
   xhr.setRequestHeader("Authorization","Bearer "+jwt_token)
   xhr.setRequestHeader("Content-Type", "application/json");
@@ -205,7 +205,7 @@ $("#sendBTN").click(function () {
   console.log(dataOBJ)
   jwt_token =  get_jwt_token()
   var xhr = new XMLHttpRequest();
-  xhr.open("POST", "http://www.choozmo.com:8887/make_anchor_video_long");
+  xhr.open("POST", "https://www.choozmo.com:8887/make_anchor_video_long");
   xhr.setRequestHeader("accept", "application/json");
   xhr.setRequestHeader("Authorization","Bearer "+jwt_token)
   xhr.setRequestHeader("Content-Type", "application/json");
@@ -251,7 +251,7 @@ $("#send_slide").click(function () {
   objstr = JSON.stringify(dataOBJ);
   jwt_token =  get_jwt_token()
   var xhr = new XMLHttpRequest();
-  xhr.open("POST", "http://www.choozmo.com:8887/make_anchor_video_gSlide");
+  xhr.open("POST", "https://www.choozmo.com:8887/make_anchor_video_gSlide");
   xhr.setRequestHeader("accept", "application/json");
   xhr.setRequestHeader("Authorization","Bearer "+jwt_token);
   xhr.setRequestHeader("Content-Type", "application/json");
@@ -276,7 +276,7 @@ $(".gen_avatar").click(function () {
   console.log(dataOBJ)
   //alert('資料已送出! 請耐心等候')
   $.ajax({
-    url: 'http://www.choozmo.com:8887/swapFace',
+    url: 'https://www.choozmo.com:8887/swapFace',
     dataType: 'json', // 預期從server接收的資料型態
     contentType: 'application/json; charset=utf-8', // 要送到server的資料型態
     type: 'post',
@@ -295,7 +295,20 @@ var loaded_data = ''
 function openNav() {
   document.getElementById("mySidenav").style.width = "250px";
   document.querySelector('.loader').style.display = "block";
-  $.get("http://www.choozmo.com:8887/history_input", function (data, status) {
+  /* let jwt_token = get_jwt_token();
+  axios({
+    method: 'post',
+    url: 'https://www.choozmo.com:8887/history_input',
+    headers: { 
+        'accept': 'text/html',
+        'Authorization': `Bearer ${jwt_token}`
+     }
+  }).then(res => {
+    console.log(res.data);
+  }).catch(err => {
+    console.log(err);
+  }); */
+  $.get("https://www.choozmo.com:8887/history_input", function (data, status) {
     console.log(data)
     loaded_data = data
     for (var obj of data) {