module-menu 0.3.12 → 0.3.14

package/.umirc.js

@@ -7,5 +7,5 @@ module.exports = defineConfig({
   },
   routes: [{ path: '/', component: '@/pages/index' }],
   fastRefresh: {},
-  ...config.default,
+  ...config,
 });

package/config/config.js

@@ -1,6 +1,6 @@
 // https://umijs.org/config/
-import { defineConfig } from 'umi';
-export default defineConfig({
+const { defineConfig } = require('umi');
+module.exports = defineConfig({
   proxy: {
     // localhost:8000/cmcc/data/** -> http://192.168.108.88:30808/cmcc/data/**
     '/cmcc/data/': {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "module-menu",
-  "version": "0.3.12",
+  "version": "0.3.14",
   "description": "城市大数据平台公共头部及尾部",
   "main": "src/pages/index.jsx",
   "scripts": {

package/src/pages/ModuleUser/index.jsx

@@ -10,6 +10,7 @@ import { Spin, Menu, Avatar } from 'antd';
 import HeaderDropdown from './HeaderDropdown';
 import Axios from '../util/axios';
 import getStore, { getUserName } from '../util/userInfo';
+import { getLoginUrl } from '../util/permessionUtils';
 import './index.less';
 import cn from 'classnames'
 import userLogo1 from '../../assets/userLogo1.png';
@@ -27,7 +28,7 @@ const ModuleUser = ({ stash = '' }) => {
   }, []);
   const handleClickmenu = (url) => {
     window.location.href = url;
-  };  
+  };
   const handleClickSysManage = () => {
     if(['integration', 'LNRD', 'HBJK'].includes(stash)){
       Axios('get', '/admin-api/system/auth/homePage', '', {})
@@ -123,7 +124,24 @@ const ModuleUser = ({ stash = '' }) => {
         console.log('退出登录接口调用成功');
         localStorage.clear();
         sessionStorage.clear();
-        window.location.href = DEFAULT_LOGOUT_URL;
+        if (['integration', 'LNRD', 'HBJK'].includes(stash)) {
+          getLoginUrl()
+            .then((res) => {
+              if (res?.data?.data?.loginoutUrl) {
+                console.log('Login URL found:', res.data.data.loginoutUrl);
+                window.location.replace(res.data.data.loginoutUrl);
+              } else {
+                console.log('No login URL found, redirect to default login page.');
+                window.location.replace('/admin-ui/login');
+              }
+            })
+            .catch((e) => {
+              console.log('GetLoginUrl error: ', e);
+              window.location.replace('/admin-ui/login');
+            });
+        } else {
+          window.location.href = DEFAULT_LOGOUT_URL;
+        }
       })
       .catch((error) => {
         console.error('Error while logging out, error:', error);
@@ -159,7 +177,7 @@ const ModuleUser = ({ stash = '' }) => {
         key="personalCenter"
         onClick={() =>
           handleClickmenu(
-            ['integration', 'LNRD', 'HBJK'].includes(stash) ? 
+            ['integration', 'LNRD', 'HBJK'].includes(stash) ?
             '/admin-ui/data-share-portal/personal/info':
             (stash === 'GZW'? '/data-platform/#/info/index' : '/#/info/index')
           )
@@ -209,7 +227,7 @@ const ModuleUser = ({ stash = '' }) => {
   return (
     <div className={cn(stash !== 'LNRD'? 'right_size':'right_size_LNRD', 'right')}>
       {['integration', 'LNRD', 'HBJK'].includes(stash) && [
-        <Button type="link" onClick={jumpToExterHome} 
+        <Button type="link" onClick={jumpToExterHome}
         className={cn(stash === 'LNRD'? 'fwmh_color_LNRD': stash === 'HBJK'? 'fwmh_color_HBJK' : null)}>
           服务门户
         </Button>,

package/src/pages/util/axios.js

@@ -2,7 +2,8 @@ import { message } from 'antd';
 import axios from 'axios';
 import baseCof from './config';
 import getStore from './userInfo';
-import { checkToken } from './permessionUtils';
+import { checkToken, getLoginUrl } from './permessionUtils';
+import CONSTANT from './constant';
 
 let tokenValue = '5de3ef8171364d6ba756221655fe1310';
 // 轻量级tokenInSessionStor存在（GZW跳/data-platform/#/login，否则/#/login）,一体化tokenInSessionStor不存在
@@ -15,6 +16,23 @@ const stash = localStorage.getItem('stash');
 axios.interceptors.response.use(
   (response) => {
     if (response.status === 200) {
+      if (!tokenInSessionStor && response?.data?.code === 401) {
+        getLoginUrl()
+          .then((res) => {
+            if (res?.data?.data?.loginoutUrl) {
+              console.log('Login URL found:', res.data.data.loginoutUrl);
+              window.location.replace(res.data.data.loginoutUrl);
+            } else {
+              console.log('No login URL found, redirect to default login page.');
+              window.location.replace('/admin-ui/login');
+            }
+          })
+          .catch((e) => {
+            console.log('GetLoginUrl error: ', e);
+            window.location.replace('/admin-ui/login');
+          });
+        return
+      }
       return response;
     } else if (
       response.status === 401 ||
@@ -47,7 +65,7 @@ axios.interceptors.response.use(
     console.log('error', error);
     if (error.response) {
       if (error.response.status === 401) {
-        if (tokenInSessionStor) {
+        if (!tokenInSessionStor) {
           if (process.env.NODE_ENV === 'production') {
             tokenValue = getStore({ name: 'access_token' });
           }
@@ -58,7 +76,7 @@ axios.interceptors.response.use(
             onClose: () => {
               localStorage.clear();
               sessionStorage.clear();
-              window.location.href = DEFAULT_LOGOUT_URL;
+              window.location.href = CONSTANT.DEFAULT_LOGOUT_URL_COMPACT;
             },
           });
         }

package/src/pages/util/constant.js

@@ -0,0 +1,5 @@
+const CONSTANT = {
+    // 轻量级登录页地址
+    DEFAULT_LOGOUT_URL_COMPACT: '/#/login',
+};                                                                                                                                                     
+export default CONSTANT;

package/src/pages/util/permessionUtils.js

@@ -9,7 +9,28 @@ export const checkToken = (token) => {
         message.error({content:'用户凭证已过期，请重新登录', onClose: ()=>{
           localStorage.clear();
           sessionStorage.clear();
-          window.location.href = '/admin-ui/login';
+          getLoginUrl()
+            .then((res) => {
+              if (res?.data?.data?.loginoutUrl) {
+                console.log('Login URL found:', res.data.data.loginoutUrl);
+                window.location.replace(res.data.data.loginoutUrl);
+              } else {
+                console.log('No login URL found, redirect to default login page.');
+                window.location.replace('/admin-ui/login');
+              }
+            })
+            .catch((e) => {
+              console.log('GetLoginUrl error: ', e);
+              window.location.replace('/admin-ui/login');
+            });
         }});
       })
 }
+
+// 获取登录地址信息
+export function getLoginUrl() {
+  return Axios(
+    'get',
+    '/admin-api/system/auth/getCodeUrl',
+  )
+}

package/src/.umi/core/devScripts.ts

@@ -1,53 +0,0 @@
-// @ts-nocheck
-
-if (window.g_initWebpackHotDevClient) {
-  function tryApplyUpdates(onHotUpdateSuccess?: Function) {
-    // @ts-ignore
-    if (!module.hot) {
-      window.location.reload();
-      return;
-    }
-
-    function isUpdateAvailable() {
-      // @ts-ignore
-      return window.g_getMostRecentCompilationHash() !== __webpack_hash__;
-    }
-
-    // TODO: is update available?
-    // @ts-ignore
-    if (!isUpdateAvailable() || module.hot.status() !== 'idle') {
-      return;
-    }
-
-    function handleApplyUpdates(err: Error | null, updatedModules: any) {
-      if (err || !updatedModules || window.g_getHadRuntimeError()) {
-        window.location.reload();
-        return;
-      }
-
-      onHotUpdateSuccess?.();
-
-      if (isUpdateAvailable()) {
-        // While we were updating, there was a new update! Do it again.
-        tryApplyUpdates();
-      }
-    }
-
-    // @ts-ignore
-    module.hot.check(true).then(
-      function (updatedModules: any) {
-        handleApplyUpdates(null, updatedModules);
-      },
-      function (err: Error) {
-        handleApplyUpdates(err, null);
-      },
-    );
-  }
-
-  window.g_initWebpackHotDevClient({
-    tryApplyUpdates,
-  });
-}
-
-export const __mfsu = 1;
-      

package/src/.umi/core/history.ts

@@ -1,21 +0,0 @@
-// @ts-nocheck
-import { createBrowserHistory, History } from 'D:/E_Drive/gitlab/bigdata/jikong/module-menu/node_modules/@umijs/runtime';
-
-let options = {
-  "basename": "/"
-};
-if ((<any>window).routerBase) {
-  options.basename = (<any>window).routerBase;
-}
-
-// remove initial history because of ssr
-let history: History = process.env.__IS_SERVER ? null : createBrowserHistory(options);
-export const createHistory = (hotReload = false) => {
-  if (!hotReload) {
-    history = createBrowserHistory(options);
-  }
-
-  return history;
-};
-
-export { history };

package/src/.umi/core/plugin.ts

@@ -1,8 +0,0 @@
-// @ts-nocheck
-import { Plugin } from 'D:/E_Drive/gitlab/bigdata/jikong/module-menu/node_modules/@umijs/runtime';
-
-const plugin = new Plugin({
-  validKeys: ['modifyClientRenderOpts','patchRoutes','rootContainer','render','onRouteChange','__mfsu','getInitialState','initialStateConfig','request',],
-});
-
-export { plugin };