diff --git a/pkg/sumdb/sum.golang.org/latest b/pkg/sumdb/sum.golang.org/latest index 1e5111e..be3b7fe 100644 --- a/pkg/sumdb/sum.golang.org/latest +++ b/pkg/sumdb/sum.golang.org/latest @@ -1,5 +1,5 @@ go.sum database tree -32942193 -w2bagSDcPg17V7idw+dz/e6iewHU3QHDYMRtLADf53s= +34772607 +lpXW8gAxq8Z2ZpvLo39QPFgPcGyIBlBnXBMGCmlv8c4= -— sum.golang.org Az3grpc3QQdm7P8WO0eXAUwCo90TYNrle+fPHO17/OXti6RgFOhb62oM/WxbO7n3nCS4zj4XgmKKWJmTvI2iufFpeQc= +— sum.golang.org Az3grgonBcBZYCTjLyPCZoxILUgQU8sUtuvSjg6eUokDeSTeBI/Ia2KPvC9f0WvPARcioB5HBneKzSUbk8u3AP1KgQg= diff --git a/src/utils/router/index.ts b/src/utils/router/index.ts index 1b52711..efadc5c 100644 --- a/src/utils/router/index.ts +++ b/src/utils/router/index.ts @@ -28,6 +28,7 @@ export const staticRouting : RouteRecordRaw[] = [ { path: '/login', component: () => import('@/views/login/index.vue'), + // component: () => import('@/views/login/silentlogin.vue'), meta: { hidden: true }, }, { @@ -90,8 +91,9 @@ const router = createRouter({ //路由执行前检查路由 router.beforeEach(async (to:any, from:any, next:any) => { NProgress.start(); - // console.log("路由执行前检查路由---0",appTokenKey) - const hasToken = localStorage.getItem(appTokenKey); + console.log("路由执行前检查路由---0",appTokenKey) + const hasToken = localStorage.getItem(appTokenKey); + console.log("路由执行前检查路由---1",hasToken) // if(to.name === "1"){ // next(false) // }else{ @@ -99,7 +101,7 @@ router.beforeEach(async (to:any, from:any, next:any) => { // } // console.log("路由执行前检查路由",hasToken,"appTokenKey:",appTokenKey) if (hasToken) { - // console.log("路由执行前检查路由---1",hasToken) + console.log("路由执行前检查路由---4",hasToken,to.path) switch(to.path){ case "/login": // 如果已登录,跳转首页 @@ -117,6 +119,10 @@ router.beforeEach(async (to:any, from:any, next:any) => { default: const userStore = useUserStoreHook(); const hasRoles = userStore.userKeying && userStore.userKeying.length > 0; + + console.log("路由执行前检查路由---3",userStore.userKeying,hasRoles) + + if (hasRoles) { //判断Key是否存在!好判断是否已经登录! if (to.matched.length === 0) { from.name ? next({ name: from.name }) : next("/404"); @@ -140,7 +146,7 @@ router.beforeEach(async (to:any, from:any, next:any) => { break; } } else { - // console.log("路由执行前检查路由---2",hasToken) + console.log("路由执行前检查路由---2",hasToken,to.path,whiteList.indexOf(to.path)) //未登录的情况下可以访问白名单的数据 if(whiteList.indexOf(to.path) !== -1){ next(); diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 860d558..009ba75 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -35,6 +35,10 @@ const getSignCode = () => { } onBeforeMount(() => { + let xingzhi = judgingEnvironment(); + if(xingzhi == 3){ + window.location.href="http://wab.hxgk.group/systemapi/wechat/obtainAuthorization?systemapp="+import.meta.env.VITE_APP_SYSTEM_APP+"&isagain="+import.meta.env.VITE_APP_AGAIN+"&userid="+route.query.userid + } getSignCode() }) const loginForm = ref(ElForm); //表单实例化 @@ -108,6 +112,23 @@ const submitLoginForm = () => { } }); } + +/** +@ 作者: 秦东 +@ 时间: 2024-10-23 13:46:25 +@ 功能: 判断登录环境 +*/ +const judgingEnvironment = () => { + let huanjing = window.navigator.userAgent.toLowerCase() + if( (huanjing.match(/MicroMessenger/i) == 'micromessenger') && (huanjing.match(/wxwork/i) == 'wxwork') ){ + return 3; + }else if( huanjing.match(/MicroMessenger/i) == 'micromessenger' ){ + return 2; + }else{ + return 1; + } + return 3; +}