From e761f67792c9925e6ec576c1194c1c1de5ea28d8 Mon Sep 17 00:00:00 2001
From: xiayt <x1027869635@gmail.com>
Date: Fri, 18 Nov 2022 14:43:41 +0800
Subject: [PATCH] fix:存在健壮性不足,如链接地址后面加上特殊参数

---
 src/common/index.js             |  2 --
 src/views/Home/Home.vue         | 11 ++++++++++-
 src/views/Service/ServiceKQ.vue | 68 +++++++++++++++++++++++++++++++++++---------------------------------
 3 files changed, 45 insertions(+), 36 deletions(-)

diff --git a/src/common/index.js b/src/common/index.js
index 9d17501..41cf202 100644
--- a/src/common/index.js
+++ b/src/common/index.js
@@ -2,10 +2,8 @@ var common = function() {
     return {
         //取地址参数方法
         getUrlParam: function(name) {
-            console.log(name)
             var url = new RegExp("(^|&)" + name + "=([^&]*)(&|$)");
             var newUrl = window.location.search.substr(1).match(url);
-            console.log(window.location)
             if (newUrl != null) {
                 return unescape(newUrl[2]);
             } else {
diff --git a/src/views/Home/Home.vue b/src/views/Home/Home.vue
index d9f5ac8..379d319 100644
--- a/src/views/Home/Home.vue
+++ b/src/views/Home/Home.vue
@@ -192,7 +192,16 @@ export default {
       localStorage.removeItem('schoolNames')
       localStorage.removeItem('centerNo')
       setTimeout(() => {
-        this.$router.replace({ path: '/' })
+        const sUserAgent = window.navigator.userAgent.toLowerCase()
+      const dtdreamweb = sUserAgent.indexOf('dtdreamweb') > -1
+      const miniprogram = sUserAgent.indexOf('miniprogram') > -1 && sUserAgent.indexOf('alipay') > -1
+        if (miniprogram) {
+          // alert('支付宝')
+          window.location.href = `https://puser.zjzwfw.gov.cn/sso/alipay.do?action=ssoLogin&servicecode=82a7a71edb794fc285895f9e33290ddc`
+        } else {
+          // alert('浙里办')
+          window.location.href = `https://puser.zjzwfw.gov.cn/sso/mobile.do?action=oauth&scope=1&servicecode=82a7a71edb794fc285895f9e33290ddc`
+        }
       }, 1000)
     },
     // 获取用户信息
diff --git a/src/views/Service/ServiceKQ.vue b/src/views/Service/ServiceKQ.vue
index 600e421..de463dc 100644
--- a/src/views/Service/ServiceKQ.vue
+++ b/src/views/Service/ServiceKQ.vue
@@ -41,14 +41,12 @@ export default {
       let centerNo = localStorage.getItem('centerNo')
       let ticket = this.common.getUrlParam('ticket') //浙里办app访问
       let ticketId = this.common.getUrlParam('ticketId') //浙里办微信小程序访问
-      console.log(ticket,ticketId)
-      // if (centerNo) {
-      //   // alert('有中台编号:' + centerNo)
-      //   this.centerNo = centerNo
-      //   localStorage.setItem('centerNo', centerNo)
-      //   this.getUserInfo()
-      // } else 
-      if (ticket) {
+      if (centerNo) {
+        // alert('有中台编号:' + centerNo)
+        this.centerNo = centerNo
+        localStorage.setItem('centerNo', centerNo)
+        this.getUserInfo()
+      } else if (ticket) {
         this.getCenterByTicket(ticket)
       } else if (ticketId) {
         // alert('getCenterByTicketId')
@@ -78,12 +76,13 @@ export default {
     // 通过ticket获取centerNo
     getCenterByTicket(ticket) {
       this.yxAxios.get(`${this.proxyUrl}/api/third/getCenterNo?ticket=${ticket}`).then((res) => {
-        console.log('通过ticket获取centerNo成功:', res)
         if (res.data.code == 200) {
+          console.log('通过ticket获取centerNo成功:', res.data)
           this.centerNo = res.data.message
           localStorage.setItem('centerNo', res.data.message)
           this.getUserInfo()
         } else {
+          console.log('通过ticket获取centerNo失败:', res.data.code)
           this.reLoad()
         }
       })
@@ -92,12 +91,13 @@ export default {
     getCenterByTicketId(ticketId) {
       // alert(ticketId)
       this.yxAxios.get(`${this.proxyUrl}/api/third/getCenterNoWx?ticket=${ticketId}`).then((res) => {
-        console.log('通过ticket获取centerNo成功:', res)
         if (res.data.code == 200) {
+          console.log('通过ticketId获取centerNo成功:', res.data)
           this.centerNo = res.data.message
           localStorage.setItem('centerNo', res.data.message)
           this.getUserInfo()
         } else {
+          console.log('通过ticketId获取centerNo失败:', res.data.code)
           this.reLoad()
         }
       })
@@ -107,31 +107,34 @@ export default {
       const sUserAgent = window.navigator.userAgent.toLowerCase()
       const dtdreamweb = sUserAgent.indexOf('dtdreamweb') > -1
       const miniprogram = sUserAgent.indexOf('miniprogram') > -1 && sUserAgent.indexOf('alipay') > -1
-      if (localStorage.getItem('reloadCount') == 2) {
-        localStorage.setItem('reloadCount', 1)
-        ZWJSBridge.confirm({
-          title: '警告',
-          buttonLabels: ['重新载入'],
-          message: '用户身份验证失败,请重新加载',
-        }).then((res) => {
-          if (dtdreamweb) {
-            // alert('浙里办')
-            window.location.href = `https://puser.zjzwfw.gov.cn/sso/mobile.do?action=oauth&scope=1&servicecode=82a7a71edb794fc285895f9e33290ddc`
-          } else if (miniprogram) {
-            // alert('支付宝')
-            window.location.href = `https://puser.zjzwfw.gov.cn/sso/alipay.do?action=ssoLogin&servicecode=82a7a71edb794fc285895f9e33290ddc`
-          }
-        })
-      } else {
-        localStorage.setItem('reloadCount', 2)
-        if (dtdreamweb) {
-          // alert('浙里办')
-          window.location.href = `https://puser.zjzwfw.gov.cn/sso/mobile.do?action=oauth&scope=1&servicecode=82a7a71edb794fc285895f9e33290ddc`
-        } else if (miniprogram) {
+      // if (localStorage.getItem('reloadCount') == 2) {
+      //   localStorage.setItem('reloadCount', 1)
+      //   ZWJSBridge.confirm({
+      //     title: '警告',
+      //     buttonLabels: ['重新载入'],
+      //     message: '用户身份验证失败,请重新加载',
+      //   }).then((res) => {
+      //     if (dtdreamweb) {
+      //       // alert('浙里办')
+      //       window.location.href = `https://puser.zjzwfw.gov.cn/sso/mobile.do?action=oauth&scope=1&servicecode=82a7a71edb794fc285895f9e33290ddc`
+      //     } else if (miniprogram) {
+      //       // alert('支付宝')
+      //       window.location.href = `https://puser.zjzwfw.gov.cn/sso/alipay.do?action=ssoLogin&servicecode=82a7a71edb794fc285895f9e33290ddc`
+      //     } else {
+      //       // alert('浙里办')
+      //       window.location.href = `https://puser.zjzwfw.gov.cn/sso/mobile.do?action=oauth&scope=1&servicecode=82a7a71edb794fc285895f9e33290ddc`
+      //     }
+      //   })
+      // } else {
+      //   localStorage.setItem('reloadCount', 2)
+         if (miniprogram) {
           // alert('支付宝')
           window.location.href = `https://puser.zjzwfw.gov.cn/sso/alipay.do?action=ssoLogin&servicecode=82a7a71edb794fc285895f9e33290ddc`
+        } else {
+          // alert('浙里办')
+          window.location.href = `https://puser.zjzwfw.gov.cn/sso/mobile.do?action=oauth&scope=1&servicecode=82a7a71edb794fc285895f9e33290ddc`
         }
-      }
+      // }
     },
     // 获取用户信息
     getUserInfo() {
@@ -142,7 +145,6 @@ export default {
         if (res.data.code == 200) {
           localStorage.setItem('userInfo', JSON.stringify(res.data.data.userInfo))
           this.userInfo = res.data.data.userInfo
-          
         }
       })
     },
--
libgit2 0.21.0