fix(用户登录): 权限设置

权限为undefined时不缓存
jetlinks · Sep 25, 2020 · 047296f · 047296f
1 parent 0f8a7d6
commit 047296f
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/config/proxy.ts b/config/proxy.ts
@@ -8,10 +8,10 @@
 export default {
   dev: {
     '/jetlinks': {
-      // target: 'http://127.0.0.1:8848/',
-      // ws: 'ws://127.0.0.1:8848/',
-      ws: 'ws://demo.jetlinks.cn/jetlinks',
-      target: 'http://demo.jetlinks.cn/jetlinks',
+      target: 'http://127.0.0.1:8848/',
+      ws: 'ws://127.0.0.1:8848/',
+      // ws: 'ws://demo.jetlinks.cn/jetlinks',
+      // target: 'http://demo.jetlinks.cn/jetlinks',
       changeOrigin: true,
       pathRewrite: { '^/jetlinks': '' },
     },

diff --git a/src/layouts/BasicLayout.tsx b/src/layouts/BasicLayout.tsx
@@ -89,8 +89,7 @@ const menuDataRender = (menuList: MenuDataItem[]): MenuDataItem[] => {
   //     };
   //     return localItem?.version && version === 'community' ? [] : Authorized.check(item.authority, localItem, null) as MenuDataItem;
   //   });
-  // }
-  console.log(getAuthority(),'fff');
+  // } 
   return menuList.map(item => {
     const localItem: any = {
       ...item,
@@ -139,9 +138,6 @@ const BasicLayout: React.FC<BasicLayoutProps> = props => {
     },
   } = props;
 
-
-const auth = localStorage.getItem('hsweb-autz');
-
   useEffect(() => {
     if (dispatch) {
       dispatch({

diff --git a/src/models/user.ts b/src/models/user.ts
@@ -53,7 +53,9 @@ const UserModel: UserModelType = {
     *fetchCurrent(_, { call, put }) {
       const response = yield call(queryCurrent);
       if (response) {
-        localStorage.setItem('hsweb-autz', JSON.stringify(response.result));
+        if(response.result){
+          localStorage.setItem('hsweb-autz', JSON.stringify(response.result));
+        }
         yield put({
           type: 'saveCurrentUser',
           payload: response.result.user,

diff --git a/src/utils/authority.ts b/src/utils/authority.ts
@@ -191,6 +191,8 @@ export function clearAutz() {
 export function setAutz(info: Authentication): Authentication {
   window.top.hsweb_autz = new Authentication(info);
   const autz = new Authentication(info);
-  localStorage.setItem('hsweb-autz', JSON.stringify(info));
+  if(JSON.stringify(info)!=='undefined'){
+    localStorage.setItem('hsweb-autz', JSON.stringify(info));
+  }
   return autz;
 }