From 4988b273806a8e1422839f758201fdeb86890041 Mon Sep 17 00:00:00 2001
From: daihh <seastar@bjxask.com>
Date: Thu, 15 Dec 2022 11:53:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E7=99=BD=E5=90=8D=E5=8D=95?=
 =?UTF-8?q?=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/whiteuser.js        |  8 ++---
 src/components/UserCenter/menu.vue | 12 +++++---
 src/security.js                    |  3 ++
 src/utils/testUsers.js             | 49 ++++++++++++++++--------------
 4 files changed, 40 insertions(+), 32 deletions(-)

diff --git a/src/api/system/whiteuser.js b/src/api/system/whiteuser.js
index 274a1320..79e7eff3 100644
--- a/src/api/system/whiteuser.js
+++ b/src/api/system/whiteuser.js
@@ -4,14 +4,12 @@ import ajax from '@/utils/xajax.js'
 /**
  * 查询白名单
  * @param {
- * code:'',
- * name:'',
- * environment:0
+ * env:'开发环境'
  * } data
  * @returns
  */
-const getList = function(data) {
-    return ajax.post('/xboe/sys/whiteuser/list',data);
+const getList =function(env) {
+    return ajax.post('/xboe/sys/whiteuser/codes',env);
 }
 
 
diff --git a/src/components/UserCenter/menu.vue b/src/components/UserCenter/menu.vue
index 59cf75e7..e1c7c655 100644
--- a/src/components/UserCenter/menu.vue
+++ b/src/components/UserCenter/menu.vue
@@ -410,10 +410,14 @@ export default {
     this.getLastStudy();
   },
   mounted() {
-    console.log(this.userInfo.loginName,'this.userInfo.loginName')
-    if(testUser.isTest(this.userInfo.loginName)){
-      this.isTest=true;
-    }
+    console.log(this.userInfo.loginName,'this.userInfo.loginName');
+    let flag=testUser.isTest(this.userInfo.loginName);
+    console.log(flag,'this.isTest22');
+    this.isTest=flag;
+    // if(testUser.isTest(this.userInfo.loginName)){
+    //   console.log(this.isTest,'this.isTest');
+    //   this.isTest=true;
+    // }
   },
   methods: {
     toCourseDetail(item){
diff --git a/src/security.js b/src/security.js
index f414634e..194a9258 100644
--- a/src/security.js
+++ b/src/security.js
@@ -6,6 +6,7 @@ import 'nprogress/nprogress.css'
 import { getToken } from '@/utils/token'
 import { routers } from "@/data/pages"
 import watermark from './utils/warterMark.js'
+import testUser from './utils/testUsers.js'
 import xpage from '@/utils/xpage'
 
 NProgress.configure({ showSpinner: false })
@@ -37,6 +38,8 @@ router.beforeEach((to, from, next) => {
           if (!store.getters.init) {
             // 判断当前控制台是否已拉取完数据
             store.dispatch('InitData').then(res => {
+              //加载白名单信息
+              testUser.init();
               //加载信息资源归属，系统分类信息
               store.dispatch('resOwner/loadResOwners');
               store.dispatch('sysType/loadSysTypes');
diff --git a/src/utils/testUsers.js b/src/utils/testUsers.js
index 512c7fd8..76c0d031 100644
--- a/src/utils/testUsers.js
+++ b/src/utils/testUsers.js
@@ -1,3 +1,4 @@
+import apiWhiteuser from '@/api/system/whiteuser'
 /**测试人员名单*/
 const userCodes=[
   '12345601',
@@ -13,34 +14,36 @@ const userCodesPro=[
   '10181457'
 ]
 
-/**是否是测试人员*/
-const isTest=function(code){
-   var testUser=false;
-   var mode=process.env.NODE_ENV;
+const init=function(){
+  let data=sessionStorage.getItem('whiteuser-session');
+  if(!data){
+    apiWhiteuser.getList({}).then(rs=>{
+       if(rs.status==200){
+         if(rs.result && rs.result.length>0){
+           data = JSON.stringify(rs.result);
+           sessionStorage.setItem('whiteuser-session',data);
+         }
+       }else{
+         console.log('获取白名单错误:'+rs.message);
+       }
+    })
+  }
+}
 
-   if(mode=='testing' || mode=='development'){
-      userCodes.some(item=>{
-        if(item===code){
-          testUser=true;
-          return true;
-        }else{
-          return false;
-        }
-      })
-   }else{
-      userCodesPro.some(item=>{
-        if(item===code){
-          testUser=true;
-          return true;
-        }else{
-          return false;
-        }
+/**是否是测试人员*/
+const isTest= function(code){
+   let data=sessionStorage.getItem('whiteuser-session');
+   var flag=false;
+   if(data){
+      var codes=JSON.parse(data);
+      flag=codes.some(item=>{
+         return (item==code);
       })
    }
-
-   return testUser;
+   return flag;
 }
 
 export default {
+  init,
   isTest
 }