Merge branch 'master' of http://47.100.234.193:9527/wuhao/ems3.3

config/proxy.js

@@ -13,7 +13,7 @@ export default {
   dev: {
     [defaultSetting.proxypath]: {
       // 要代理的地址
-      target: 'http://192.168.40.64:28001', //jf哥
+      target: 'http://ems-test.nangaoyun.com/', //jf哥
       // target: 'http://192.168.40.203:8000', //dj哥
       changeOrigin: true,
     },

src/app.jsx

@@ -26,7 +26,7 @@ function strToHump(str) {
 }
 
 export async function getInitialState() {
-  let token = localStorage.getItem('TOKENES');
+  let token = true;
   const fetchUserInfo = async () => {
     try {
       const msg = await queryCurrentUser();
@@ -73,8 +73,7 @@ export async function getInitialState() {
 
 // ProLayout 支持的api https://procomponents.ant.design/components/layout
 export const layout = ({ initialState, setInitialState }) => {
-  let token = localStorage.getItem('TOKENES');
-  console.log(initialState, history);
+  let token = true;
   return {
     disableContentMargin: false,
     waterMarkProps: {

src/pages/User/Login/index.jsx

@@ -77,6 +77,8 @@ const Login = () => {
       password: values.password,
     };
     try {
+      history.push('/');
+      return;
       // 登录
       const res = await doFetch({
         url: `/token/oauth/token?grant_type=password&client_id=NGEMS3&client_secret=ems_Nangao@2022&username=${values?.userName}&password=${values?.password}`,