Merge branch 'dev' of http://git.dayaedu.com/huangqiyong/classroom

src/api/user.api.ts

@@ -70,3 +70,11 @@ export const logout_gyt = () => {
       url: "/api-teacher/user/logout"
    })
 }
+
+// 安全证书
+export const mutualTLSQuery_gyt = () => {
+   return httpAxios_gyt.axioseRquest({
+      method: "get",
+      url: "/api-teacher/open/mutualTLS/query?isLogin=true" // 后面跟参数来区分是不是登录511
+   })
+}

src/hooks/useSecureAnth/secureAnth.vue

@@ -36,13 +36,13 @@
                   <div class="stepNum">03</div>
                   <div class="titleCon">
                      输入证书密码：
-                     <span class="colorTwo">{{ userStoreHook.roles === "GYM" ? "dayaedu.com" : "lexiaoya.cn" }}</span>
+                     <span class="colorTwo">{{ userType === "GYM" ? "dayaedu.com" : "lexiaoya.cn" }}</span>
                      ，点击
                      <span class="colorOne">【好】</span>
                   </div>
                </div>
                <div class="contentBox">
-                  <img class="mac3Img" :src="userStoreHook.roles === 'GYM' ? require('./img/mac3_1.png') : require('./img/mac3.png')" />
+                  <img class="mac3Img" :src="userType === 'GYM' ? require('./img/mac3_1.png') : require('./img/mac3.png')" />
                </div>
             </div>
             <div class="stepCon" v-if="stepNum === 3">
@@ -69,7 +69,7 @@
                   </div>
                </div>
                <div class="contentBox">
-                  <img class="mac5Img" src="./img/mac5.png" />
+                  <img class="mac5Img" :src="userType === 'GYM' ? require('./img/mac5_1.png') : require('./img/mac5.png')" />
                </div>
             </div>
             <div class="stepCon" v-if="stepNum === 5">
@@ -186,7 +186,7 @@
                   <div class="titleCon">在【选择证书】弹窗中点击【确定】按钮，证书安装完成，开始使用乐教通吧！</div>
                </div>
                <div class="contentBox">
-                  <img class="win8Img" src="./img/win8.png" />
+                  <img class="win8Img" :src="userType === 'GYM' ? require('./img/win8_1.png') : require('./img/win8.png')" />
                </div>
             </div>
          </template>
@@ -202,9 +202,10 @@
 import { ref } from "vue"
 import { ElScrollbar } from "element-plus"
 import { URL_MAC_GYM_SECUREANTH, URL_MAC_GYT_SECUREANTH, URL_WIN_SECUREANTH } from "@/config"
-import userStore from "@/store/modules/user"
+import { getUserType } from "@/libs/auth"
 
-const userStoreHook = userStore()
+// 因为没有登录页面没有获取用户信息也会弹窗，所以这里取cookie里面的 userType
+const userType = getUserType()
 const emits = defineEmits<{
    (e: "onCancel"): void
 }>()
@@ -220,7 +221,7 @@ const elScrollbarDom = ref<InstanceType<typeof ElScrollbar>>()
 // 下载证书
 function handleDownload() {
    if (isMac) {
-      window.open(userStoreHook.roles === "GYM" ? URL_MAC_GYM_SECUREANTH : URL_MAC_GYT_SECUREANTH)
+      window.open(userType === "GYM" ? URL_MAC_GYM_SECUREANTH : URL_MAC_GYT_SECUREANTH)
    } else {
       window.open(URL_WIN_SECUREANTH)
    }

src/plugin/httpAjax.ts

@@ -32,11 +32,13 @@ export const httpAjaxErrMsg = function <T extends axiosApiType, P extends Parame
             resolve(res.data)
          })
          .catch(err => {
-            ElMessage({
-               showClose: true,
-               message: err.message,
-               type: "error"
-            })
+            if (err.code !== 511) {
+               ElMessage({
+                  showClose: true,
+                  message: err.message,
+                  type: "error"
+               })
+            }
             resolve(err)
          })
    })
@@ -77,11 +79,13 @@ export const httpAjaxLoadingErrMsg = function <T extends axiosApiType, P extends
          })
          .catch(err => {
             LoadingBar.loading(false)
-            ElMessage({
-               showClose: true,
-               message: err.message || err.msg,
-               type: "error"
-            })
+            if (err.code !== 511) {
+               ElMessage({
+                  showClose: true,
+                  message: err.message,
+                  type: "error"
+               })
+            }
             resolve(err)
          })
    })
@@ -118,7 +122,7 @@ export const httpAjaxCrud = function <T extends axiosApiType, P extends Paramete
             ElNotification({
                type: "error",
                title: "失败",
-               message: err.message || err.msg,
+               message: err.message,
                position: "top-right",
                duration: 3000
             })
@@ -178,10 +182,12 @@ export const httpAjaxDownload = function <T extends axiosApiType, P extends Para
       })
       .catch(err => {
          LoadingBar.loading(false)
-         ElMessage({
-            showClose: true,
-            message: err.message,
-            type: "error"
-         })
+         if (err.code !== 511) {
+            ElMessage({
+               showClose: true,
+               message: err.message,
+               type: "error"
+            })
+         }
       })
 }

src/views/cloudTextbooks/useData.ts

@@ -93,11 +93,13 @@ export const useDataList = () => {
             }, [])
             listData.value = chunkArray(data, 5)
          } else {
-            ElMessage({
-               showClose: true,
-               message: res.message,
-               type: "error"
-            })
+            if (res.code !== 511) {
+               ElMessage({
+                  showClose: true,
+                  message: res.message,
+                  type: "error"
+               })
+            }
          }
       })
    }

src/views/curriculum/curriculum.vue

@@ -107,11 +107,13 @@ function getCurriculumByDay(day: string) {
          if (res.code === 200) {
             curriculumByDay.value = res.data?.rows || []
          } else {
-            ElMessage({
-               showClose: true,
-               message: res.message,
-               type: "error"
-            })
+            if (res.code !== 511) {
+               ElMessage({
+                  showClose: true,
+                  message: res.message,
+                  type: "error"
+               })
+            }
          }
       })
    } else {
@@ -125,11 +127,13 @@ function getCurriculumByDay(day: string) {
          if (res.code === 200) {
             curriculumByDay.value = res.data?.rows || []
          } else {
-            ElMessage({
-               showClose: true,
-               message: res.message,
-               type: "error"
-            })
+            if (res.code !== 511) {
+               ElMessage({
+                  showClose: true,
+                  message: res.message,
+                  type: "error"
+               })
+            }
          }
       })
    }

src/viewsframe/login/login.vue

@@ -40,7 +40,7 @@ import { ref, computed } from "vue"
 import userStore from "@/store/modules/user"
 import { useRouter } from "vue-router"
 import useSecureAnth from "@/hooks/useSecureAnth"
-import { mutualTLSQuery_gym } from "@/api/user.api"
+import { mutualTLSQuery_gym, mutualTLSQuery_gyt } from "@/api/user.api"
 import { httpAjaxLoading } from "@/plugin/httpAjax"
 
 const userStoreHook = userStore()
@@ -69,20 +69,18 @@ function handleQrcodeStatus() {
          if (status === "FINISH") {
             // 登录成功
             userStoreHook.login(res.data).then(() => {
-               // 目前管乐迷才有安全证书
-               res.data.appKey === "GYM"
-                  ? httpAjaxLoading(mutualTLSQuery_gym).then(res => {
-                       if (res.code === 511) {
-                          useSecureAnth({
-                             onCancel() {
-                                router.push({ path: "/" })
-                             }
-                          })
-                       } else {
-                          router.push({ path: "/" })
-                       }
-                    })
-                  : router.push({ path: "/" })
+               // 安全证书
+               httpAjaxLoading(res.data.appKey === "GYM" ? mutualTLSQuery_gym : mutualTLSQuery_gyt).then(res => {
+                  if (res.code === 511) {
+                     useSecureAnth({
+                        onCancel() {
+                           router.push({ path: "/" })
+                        }
+                     })
+                  } else {
+                     router.push({ path: "/" })
+                  }
+               })
             })
             return
          }