3.10 工程代码同步master

src/pages/Loading/BasDicData.ts

@@ -0,0 +1,6 @@
+import request from '@/utils/request';
+
+// 获取字典信息
+export async function getDictionaries(){
+    return request('/api/biz-service-ebtp-project/v1/dictProject/refreshDictCache');
+}

src/pages/Loading/index.tsx

@@ -0,0 +1,43 @@
+import React, { useEffect } from 'react';
+import { message, Spin } from 'antd';
+import { history } from 'umi';
+import { fgetUserMsg } from './service';
+import { getDictionaries } from './BasDicData';
+const Loading: React.FC<{}> = () => {
+  useEffect(() => {
+    sessionStorage.removeItem("roleData")
+    sessionStorage.removeItem("userData")
+    getDictionaries().then(res => {
+      if (res.code == 200) {
+        const DicData = res.data;
+        const DicDataSearch: any = sessionStorage.setItem('DicData', JSON.stringify(DicData));
+        return DicDataSearch;
+
+      }
+    })
+    let url = './login';
+    fgetUserMsg(`Bearer ${sessionStorage.getItem('Authorization')}`).then(res=>{ 
+      if(res) {
+        res.roleIds = res.authorityList[0].roleCode;    
+        sessionStorage.setItem('userData', JSON.stringify(res));
+        sessionStorage.setItem('roleData',JSON.stringify(res.authorityList[0]))
+        //1：从测试登录口进入，2：从正式三个口进入，为了区别获取菜单的地址
+        sessionStorage.setItem('loginType', '1');
+        setTimeout(()=>{
+          history.push(url)
+        }, 2000)
+      } else {
+        message.error("登录信息有误，请重新登录")
+        history.push('/user/login')
+      }
+    })
+  }, []);
+  return (
+    <div style={{textAlign:'center', height: '100%', background: 'rgba(0,0,0,.05)', position: 'relative'}}>
+      <div style={{position: 'absolute', left: '50%', top:'48%'}}>
+      <Spin tip="Loading..."/>
+      </div>
+    </div>
+  );
+}
+export default Loading;

src/pages/Loading/service.ts

@@ -0,0 +1,9 @@
+import request from '@/utils/request';
+
+export async function fgetUserMsg(params: any) {  
+  return request('/api/biz-service-ebtp-extend/v1/userinfo/get', {
+    method: 'GET',
+    headers: {'Authorization': params},
+    data: params,
+  });
+}