wangggziwen пре 2 година
родитељ
комит
0651b69578
2 измењених фајлова са 32 додато и 2 уклоњено
  1. 11 1
      ui/src/views/azureLogin.vue
  2. 21 1
      ui/src/views/login.vue

+ 11 - 1
ui/src/views/azureLogin.vue

@@ -38,18 +38,28 @@ export default {
   },
   methods: {
     getCode() {
+      console.log("===> azureLogin.vue getCode()方法开始执行")
       this.code = window.location.search.replace("?code=" , '');
+      console.log("this.code:");
+      console.log(this.code);
       this.code = this.code.substring(0, this.code.indexOf("&"));
+      console.log("this.code:");
+      console.log(this.code);
+      console.log("===> azureLogin.vue getCode()方法执行结束")
     },
     getAzureAccessToken(){
+      console.log("===> azureLogin.vue getAzureAccessToken()方法开始执行")
+      console.log("===> request")
       getAzureAccessToken(this.code).then(response => { // 200
+        console.log("===> response:");
+        console.log(response);
         Cookies.set('Admin-Token', response.token);
         this.$router.push({path: "/index" || "/404"});
       }).catch(err => { // 500
         // window.location.href = 'https://cpms.seashoreept.cn/cpms/index.html?message=' + err.message;
         window.location.href = 'https://cpms.basf-ypc.net.cn/cpms/index.html?message=' + err.message;
       });
-
+      console.log("===> azureLogin.vue getAzureAccessToken()方法执行结束")
     //   // getAzureAccessToken(this.code).then(response => {
     //   //   window.location.href = 'http://localhost/cpms/index.html?message='+ '登录失败';
     //   // });

+ 21 - 1
ui/src/views/login.vue

@@ -181,6 +181,7 @@ export default {
     },
     /** Azure登录 */
     doAzureLogin() {
+      console.log("===> login.vue doAzureLogin()方法开始执行")
       // 1. authorize请求链接
       // https://login.microsoftonline.com/ecaa386b-c8df-4ce0-ad01-740cbdb5ba55/oauth2/v2.0/authorize
 
@@ -196,27 +197,46 @@ export default {
 
       // window.location.href = 'https://login.microsoftonline.com/7503e40a-97ec-4eb9-bf6d-2836e57e882d/oauth2/v2.0/authorize?client_id=3db6f125-db4d-456b-a76e-a6d03182e845&redirect_uri=http%3A%2F%2Flocalhost%2Fcpms%2Findex.html&scope=api://3db6f125-db4d-456b-a76e-a6d03182e845/User.Read&response_type=code';
       window.location.href = 'https://login.microsoftonline.com/ecaa386b-c8df-4ce0-ad01-740cbdb5ba55/oauth2/v2.0/authorize?client_id=13848745-b09e-4105-a48b-180c0c9d13fd&redirect_uri=http%3A%2F%2Fcpms.basf-ypc.net.cn%2Fcpms%2Findex.html&scope=openid%20profile&response_type=code';
-    },
+      console.log("===> login.vue doAzureLogin()方法执行结束")
+      },
     /** Azure登录跳转 */
     toggleAzureLogin() {
+      console.log("===> login.vue toggleAzureLogin()方法开始执行")
       let code = window.location.search.replace("?code=" , '');
+      console.log("code:");
+      console.log(code);
       let messageIndex = code.indexOf("message");
+      console.log("messageIndex:");
+      console.log(messageIndex);
       if (messageIndex == -1) { // url不包含message参数
         if (code) { // url包含code参数
           // authorization_code
           code = code.substring(0, code.indexOf("&"));
+          console.log("===> messageIndex == -1");
+          console.log("code:");
+          console.log(code);
           // redirect_url
           window.location.href = '#/azureLogin?code='+code;
         }
       } else {
+        console.log("===> messageIndex != -1");
         // 解决中文参数乱码问题
         let questionMarkSplitStrings = decodeURI(window.location.href).split("?");
+        console.log("questionMarkSplitStrings:");
+        console.log(questionMarkSplitStrings);
         let hashTagSplitStrings = questionMarkSplitStrings[1].split("#");
+        console.log("hashTagSplitStrings:");
+        console.log(hashTagSplitStrings);
         let equalSignSplitStrings = hashTagSplitStrings[0].split("=");
+        console.log("equalSignSplitStrings:");
+        console.log(equalSignSplitStrings);
         // ajax error message
         let message = equalSignSplitStrings[1];
+        console.log("message:");
+        console.log(message);
         this.msgError(message + ",请联系管理员");
       }
+      console.log("===> login.vue toggleAzureLogin()方法执行结束")
     },
   }
 };