bug fix

config/config.js

@@ -24,11 +24,11 @@ const plugins = [
         // default true, when it is true, will use `navigator.language` overwrite default
         baseNavigator: true,
       },
-      // dynamicImport: {
-      //   loadingComponent: './components/PageLoading/index',
-      //   webpackChunkName: true,
-      //   level: 3,
-      // },
+      dynamicImport: {
+        loadingComponent: './components/PageLoading/index',
+        webpackChunkName: true,
+        level: 3,
+      },
       pwa: pwa
         ? {
             workboxPluginMode: 'InjectManifest',

src/global.less

@@ -46,16 +46,18 @@ ol {
   }
 }
 
-.ant-pro-top-nav-header.light {
-  background:rgba(2,134,213,1);
-}
-
-.ant-pro-top-nav-header-menu .ant-menu {
-  display: none;
-}
-
-.antd-pro-components-global-header-index-right,
-.ant-pro-top-nav-header.light h1
-{
-  color: #fff;
+.ant-layout {
+  .ant-pro-top-nav-header.light {
+    background:rgba(2,134,213,1);
+  }
+  
+  .ant-pro-top-nav-header-menu .ant-menu {
+    display: none;
+  }
+  
+  .antd-pro-components-global-header-index-right,
+  .ant-pro-top-nav-header.light h1
+  {
+    color: #fff;
+  }
 }

src/layouts/BasicLayout.jsx

@@ -11,7 +11,8 @@ import { formatMessage } from 'umi-plugin-react/locale';
 import Authorized from '@/utils/Authorized';
 import RightContent from '@/components/GlobalHeader/RightContent';
 import { isAntDesignPro } from '@/utils/utils';
-import logo from '../assets/logo.svg';
+// import logo from '../assets/logo.svg';
+import logo from '../assets/logo.png';
 
 /**
  * use Authorized check all menu item

src/layouts/UserLayout.jsx

@@ -5,7 +5,8 @@ import React from 'react';
 import { connect } from 'dva';
 import { formatMessage } from 'umi-plugin-react/locale';
 import SelectLang from '@/components/SelectLang';
-import logo from '../assets/logo.svg';
+// import logo from '../assets/logo.svg';
+import logo from '../assets/logo.png';
 import styles from './UserLayout.less';
 
 const UserLayout = props => {

src/models/login.js

@@ -3,8 +3,10 @@ import { stringify } from 'querystring';
 import { setAuthority } from '@/utils/authority';
 import { getPageQuery } from '@/utils/utils';
 
-import request from '../utils/request';
-import apis from '../services/apis';
+import { fetch, apis } from '../utils/request';
+
+const signin = fetch(apis.user.login)
+const signoff = fetch(apis.user.logoff)
 
 const Model = {
   namespace: 'login',
@@ -13,7 +15,7 @@ const Model = {
   },
   effects: {
     *login({ payload }, { call, put }) {
-      const response = yield call(request, { ...apis.user.login, data: payload });
+      const response = yield call(signin, { data: payload });
       yield put({
         type: 'changeLoginStatus',
         payload: response,
@@ -45,9 +47,11 @@ const Model = {
       yield call(getFakeCaptcha, payload);
     },
 
-    *logout(_, { put }) {
+    *logout(_, { put, call }) {
       const { redirect } = getPageQuery(); // redirect
 
+      yield call(signoff, { logout: true });
+
       if (window.location.pathname !== '/user/login' && !redirect) {
         yield put(
           routerRedux.replace({

src/pages/UserManage/Editor/Menus.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Checkbox, Card, Button, notification } from 'antd';
+import { Checkbox, Card, Button, notification, Modal } from 'antd';
 import { fetch, apis } from '../../../utils/request';
 
 const getModules = fetch(apis.member.menus);
@@ -41,6 +41,13 @@ const Menus = (props) => {
     }
   }, [user.userId])
 
+  useEffect(() => {
+    Modal.warning({
+      title: '权限操作有风险, 请谨慎!',
+      onOk() {},
+    });
+  }, [])
+
   const handleChange = (checkedList) => {
     setCheckOptions({
       checkedList,
@@ -71,6 +78,15 @@ const Menus = (props) => {
       menus: checkOpts.checkedList
     }
 
+    if (!data.menus || !data.menus.length) {
+      Modal.warning({
+        title: '操作非法',
+        content: '如果您要取消所有授权, 请进行账号关闭来实现相同的目的',
+        onOk() {},
+      });
+      return
+    }
+
     authorizeMenus({ data }).then(() => {
       notification.success({ message: '更新授权成功' })
     }).catch(x => x)

src/pages/UserManage/Editor/Miniapp.jsx

@@ -75,6 +75,15 @@ const Miniapp = (props) => {
         { pattern: /^[a-zA-Z0-9]+$/, message: 'token 只能由字母与数字组成' }
       ]
     },
+    {
+      label: 'AES_KEY',
+      name: 'aesKey',
+      value: appdata.aesKey,
+      type: FieldTypes.Text,
+      rules: [
+        { pattern: /^[a-zA-Z0-9]+$/, message: 'AES_KEY 只能由字母与数字组成' }
+      ]
+    },
     // {
     //   label: '业务受理',
     //   name: 'mainbiz',

src/utils/mixStr.js

@@ -0,0 +1,31 @@
+
+const fill2Len = (str, len) => {
+  if (!str) {
+    return '*'.repeat(len)
+  }
+
+  const orginLen = str.length
+  if (len <= orginLen) {
+    return str.substr(0, len)
+  }
+
+  return str.repeat(Math.floor(len / orginLen)) + str.substr(0, len % orginLen)
+}
+
+const mixChars = window.navigator.userAgent //+ (new Date).toUTCString().replace(/\d{2}:\d{2}:\d{2}/, '')
+
+const strXOR = (str, mix) => {
+  if (!str) return str
+
+  const strLen = str.length
+  const mixStr = fill2Len(mix, strLen)
+
+  const result = []
+  for (let i = 0; i < strLen; i ++) {
+    result.push(String.fromCharCode(str.charCodeAt(i) ^ mixStr.charCodeAt(i)))
+  }
+
+  return result.join('')
+}
+
+export default str => strXOR(str, mixChars)

src/utils/request.js

@@ -5,6 +5,7 @@
 import request from 'umi-request';
 import { notification } from 'antd';
 import apis from '../services/apis';
+import mixStr from './mixStr';
 
 const codeMessage = {
   200: '服务器成功返回请求的数据。',
@@ -34,11 +35,11 @@ const replaceURLParams = (url, params = {}) => {
 request.interceptors.request.use((url, options) => {
   const { urlData, headers = {}, logout = false, data, ...opts } = options
   const apiURL = urlData ? replaceURLParams(url, urlData) : url
-  const token = window.localStorage.getItem('x-token')
+  const token = mixStr(window.localStorage.getItem('test-foobar'))
   const authHeader = token ? { Authorization: `Bearer ${token}` } : {}
 
   if (logout) {
-    window.localStorage.removeItem('x-token')
+    window.localStorage.removeItem('test-foobar')
   }
 
   return (
@@ -81,7 +82,7 @@ request.interceptors.response.use(async (response, options) => {
       }
 
       if (data && data.token) {
-        window.localStorage.setItem('x-token', data.token)
+        window.localStorage.setItem('test-foobar', mixStr(data.token))
       }
 
       return data;