login

config/config.js

@@ -273,13 +273,13 @@ export default {
     basePath: '/',
   },
   chainWebpack: webpackPlugin,
-  /*
+  
   proxy: {
-    '/server/api/': {
-      target: 'https://preview.pro.ant.design/',
+    '/api/': {
+      target: 'http://192.168.0.84:8080/',
       changeOrigin: true,
-      pathRewrite: { '^/server': '' },
+      // pathRewrite: { '^/server': '' },
     },
   },
-  */
+  
 };

package.json

@@ -47,6 +47,7 @@
     "classnames": "^2.2.6",
     "dva": "^2.4.1",
     "lodash": "^4.17.11",
+    "md5": "^2.2.1",
     "moment": "^2.24.0",
     "omit.js": "^1.0.2",
     "path-to-regexp": "^3.0.0",

src/app.js

@@ -0,0 +1,8 @@
+export const dva = {
+  config: {
+    onError(e) {
+      e.preventDefault();
+      console.error(e);
+    },
+  },
+};

src/layouts/BlankLayout.jsx

@@ -9,6 +9,7 @@ const Layout = ({ children }) => (
         padding: '32PX 28px',
         boxShadow: '0px 0px 16px 2px rgba(0,0,0,0.12)',
         borderRadius: '12px',
+        minHeight:'60vh'
       }}
     >
       {children}

src/layouts/SecurityLayout.jsx

@@ -24,6 +24,7 @@ class SecurityLayout extends React.Component {
   render() {
     const { isReady } = this.state;
     const { children, loading, currentUser } = this.props;
+    console.log('------------>', loading, currentUser)
 
     if ((!currentUser.userid && loading) || !isReady) {
       return <PageLoading />;

src/layouts/UserLayout.jsx

@@ -4,7 +4,6 @@ import Link from 'umi/link';
 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 styles from './UserLayout.less';
 
@@ -32,22 +31,10 @@ const UserLayout = props => {
       })}
     >
       <div className={styles.container}>
-        <div className={styles.lang}>
-          <SelectLang />
-        </div>
         <div className={styles.content}>
-          <div className={styles.top}>
-            <div className={styles.header}>
-              <Link to="/">
-                <img alt="logo" className={styles.logo} src={logo} />
-                <span className={styles.title}>Ant Design</span>
-              </Link>
-            </div>
-            <div className={styles.desc}>Ant Design 是西湖区最具影响力的 Web 设计规范</div>
-          </div>
           {children}
         </div>
-        <DefaultFooter />
+        {/* <DefaultFooter /> */}
       </div>
     </DocumentTitle>
   );

src/layouts/UserLayout.less

@@ -25,10 +25,10 @@
 
 @media (min-width: @screen-md-min) {
   .container {
-    background-image: url('https://gw.alipayobjects.com/zos/rmsportal/TVYTbAXWheQpRcWDaDMu.svg');
+    background-image: url('../assets/bg.jpg');
     background-repeat: no-repeat;
-    background-position: center 110px;
-    background-size: 100%;
+    background-position: center;
+    background-size: 100% 100%;
   }
 
   .content {

src/locales/pt-BR/settings.js

@@ -24,8 +24,8 @@ export default {
   'app.settings.security.strong': 'Forte',
   'app.settings.security.medium': 'Média',
   'app.settings.security.weak': 'Fraca',
-  'app.settings.security.password': 'Senha da Conta',
-  'app.settings.security.password-description': 'Força da senha',
+  'app.settings.security.loginPassword': 'Senha da Conta',
+  'app.settings.security.loginPassword-description': 'Força da senha',
   'app.settings.security.phone': 'Telefone de Seguraça',
   'app.settings.security.phone-description': 'Telefone vinculado',
   'app.settings.security.question': 'Pergunta de Segurança',

src/models/user.js

@@ -1,20 +1,22 @@
-import { queryCurrent, query as queryUsers } from '@/services/user';
+import request from '../utils/request';
+import apis from '../services/apis';
+
 const UserModel = {
   namespace: 'user',
   state: {
     currentUser: {},
   },
   effects: {
-    *fetch(_, { call, put }) {
-      const response = yield call(queryUsers);
-      yield put({
-        type: 'save',
-        payload: response,
-      });
-    },
+    // *fetch(_, { call, put }) {
+    //   const response = yield call(queryUsers);
+    //   yield put({
+    //     type: 'save',
+    //     payload: response,
+    //   });
+    // },
 
     *fetchCurrent(_, { call, put }) {
-      const response = yield call(queryCurrent);
+      const response = yield call(request, apis.user.current);
       yield put({
         type: 'saveCurrentUser',
         payload: response,
@@ -25,7 +27,6 @@ const UserModel = {
     saveCurrentUser(state, action) {
       return { ...state, currentUser: action.payload || {} };
     },
-
     changeNotifyCount(
       state = {
         currentUser: {},

src/pages/user/login/components/Login/index.jsx

@@ -4,17 +4,16 @@ import classNames from 'classnames';
 import LoginContext from './LoginContext';
 import LoginItem from './LoginItem';
 import LoginSubmit from './LoginSubmit';
-import LoginTab from './LoginTab';
 import styles from './index.less';
 
 class Login extends Component {
-  static Tab = LoginTab;
+
   static Submit = LoginSubmit;
   static defaultProps = {
     className: '',
     defaultActiveKey: '',
-    onTabChange: () => {},
-    onSubmit: () => {},
+    onTabChange: () => { },
+    onSubmit: () => { },
   };
 
   constructor(props) {
@@ -111,31 +110,12 @@ class Login extends Component {
         return;
       }
 
-      if (child.type.typeName === 'LoginTab') {
-        TabChildren.push(child);
-      } else {
-        otherChildren.push(child);
-      }
     });
     return (
       <LoginContext.Provider value={this.getContext()}>
         <div className={classNames(className, styles.login)}>
           <Form onSubmit={this.handleSubmit}>
-            {tabs.length ? (
-              <React.Fragment>
-                <Tabs
-                  animated={false}
-                  className={styles.tabs}
-                  activeKey={type}
-                  onChange={this.onSwitch}
-                >
-                  {TabChildren}
-                </Tabs>
-                {otherChildren}
-              </React.Fragment>
-            ) : (
-              children
-            )}
+            {children}
           </Form>
         </div>
       </LoginContext.Provider>

src/pages/user/login/components/Login/map.jsx

@@ -31,34 +31,4 @@ export default {
       },
     ],
   },
-  Mobile: {
-    props: {
-      size: 'large',
-      prefix: <Icon type="mobile" className={styles.prefixIcon} />,
-      placeholder: 'mobile number',
-    },
-    rules: [
-      {
-        required: true,
-        message: 'Please enter mobile number!',
-      },
-      {
-        pattern: /^1\d{10}$/,
-        message: 'Wrong mobile number format!',
-      },
-    ],
-  },
-  Captcha: {
-    props: {
-      size: 'large',
-      prefix: <Icon type="mail" className={styles.prefixIcon} />,
-      placeholder: 'captcha',
-    },
-    rules: [
-      {
-        required: true,
-        message: 'Please enter Captcha!',
-      },
-    ],
-  },
 };

src/pages/user/login/index.jsx

@@ -6,6 +6,7 @@ import { connect } from 'dva';
 import LoginComponents from './components/Login';
 import styles from './style.less';
 const { Tab, UserName, Password, Mobile, Captcha, Submit } = LoginComponents;
+import md5 from "md5";
 
 @connect(({ login, loading }) => ({
   userLogin: login,
@@ -14,7 +15,7 @@ const { Tab, UserName, Password, Mobile, Captcha, Submit } = LoginComponents;
 class Login extends Component {
   loginForm = undefined;
   state = {
-    type: 'account',
+    // type: 'account',
     autoLogin: true,
   };
   changeAutoLogin = e => {
@@ -29,7 +30,7 @@ class Login extends Component {
       const { dispatch } = this.props;
       dispatch({
         type: 'login/login',
-        payload: { ...values, type },
+        payload: { ...values, loginPassword: md5(values.loginPassword) },
       });
     }
   };
@@ -87,138 +88,44 @@ class Login extends Component {
             this.loginForm = form;
           }}
         >
-          <Tab
-            key="account"
-            tab={formatMessage({
-              id: 'user-login.login.tab-login-credentials',
-            })}
-          >
-            {status === 'error' &&
-              loginType === 'account' &&
-              !submitting &&
-              this.renderMessage(
-                formatMessage({
-                  id: 'user-login.login.message-invalid-credentials',
+          <UserName
+            name="loginName"
+            placeholder={`${formatMessage({
+              id: 'user-login.login.userName',
+            })}: admin or user`}
+            rules={[
+              {
+                required: true,
+                message: formatMessage({
+                  id: 'user-login.userName.required',
                 }),
-              )}
-            <UserName
-              name="userName"
-              placeholder={`${formatMessage({
-                id: 'user-login.login.userName',
-              })}: admin or user`}
-              rules={[
-                {
-                  required: true,
-                  message: formatMessage({
-                    id: 'user-login.userName.required',
-                  }),
-                },
-              ]}
-            />
-            <Password
-              name="password"
-              placeholder={`${formatMessage({
-                id: 'user-login.login.password',
-              })}: ant.design`}
-              rules={[
-                {
-                  required: true,
-                  message: formatMessage({
-                    id: 'user-login.password.required',
-                  }),
-                },
-              ]}
-              onPressEnter={e => {
-                e.preventDefault();
-
-                if (this.loginForm) {
-                  this.loginForm.validateFields(this.handleSubmit);
-                }
-              }}
-            />
-          </Tab>
-          <Tab
-            key="mobile"
-            tab={formatMessage({
-              id: 'user-login.login.tab-login-mobile',
-            })}
-          >
-            {status === 'error' &&
-              loginType === 'mobile' &&
-              !submitting &&
-              this.renderMessage(
-                formatMessage({
-                  id: 'user-login.login.message-invalid-verification-code',
+              },
+            ]}
+          />
+          <Password
+            name="loginPassword"
+            placeholder={`${formatMessage({
+              id: 'user-login.login.password',
+            })}: ant.design`}
+            rules={[
+              {
+                required: true,
+                message: formatMessage({
+                  id: 'user-login.password.required',
                 }),
-              )}
-            <Mobile
-              name="mobile"
-              placeholder={formatMessage({
-                id: 'user-login.phone-number.placeholder',
-              })}
-              rules={[
-                {
-                  required: true,
-                  message: formatMessage({
-                    id: 'user-login.phone-number.required',
-                  }),
-                },
-                {
-                  pattern: /^1\d{10}$/,
-                  message: formatMessage({
-                    id: 'user-login.phone-number.wrong-format',
-                  }),
-                },
-              ]}
-            />
-            <Captcha
-              name="captcha"
-              placeholder={formatMessage({
-                id: 'user-login.verification-code.placeholder',
-              })}
-              countDown={120}
-              onGetCaptcha={this.onGetCaptcha}
-              getCaptchaButtonText={formatMessage({
-                id: 'user-login.form.get-captcha',
-              })}
-              getCaptchaSecondText={formatMessage({
-                id: 'user-login.captcha.second',
-              })}
-              rules={[
-                {
-                  required: true,
-                  message: formatMessage({
-                    id: 'user-login.verification-code.required',
-                  }),
-                },
-              ]}
-            />
-          </Tab>
-          <div>
-            <Checkbox checked={autoLogin} onChange={this.changeAutoLogin}>
-              <FormattedMessage id="user-login.login.remember-me" />
-            </Checkbox>
-            <a
-              style={{
-                float: 'right',
-              }}
-              href=""
-            >
-              <FormattedMessage id="user-login.login.forgot-password" />
-            </a>
-          </div>
+              },
+            ]}
+            onPressEnter={e => {
+              e.preventDefault();
+
+              if (this.loginForm) {
+                this.loginForm.validateFields(this.handleSubmit);
+              }
+            }}
+          />
           <Submit loading={submitting}>
             <FormattedMessage id="user-login.login.login" />
           </Submit>
-          <div className={styles.other}>
-            <FormattedMessage id="user-login.login.sign-in-with" />
-            <Icon type="alipay-circle" className={styles.icon} theme="outlined" />
-            <Icon type="taobao-circle" className={styles.icon} theme="outlined" />
-            <Icon type="weibo-circle" className={styles.icon} theme="outlined" />
-            <Link className={styles.register} to="/user/register">
-              <FormattedMessage id="user-login.login.signup" />
-            </Link>
-          </div>
         </LoginComponents>
       </div>
     );

src/services/apis.js

@@ -0,0 +1,14 @@
+const prefix = '/api/admin'
+
+export default {
+  user: {
+    current: {
+      method: 'GET',
+      url: `${prefix}/taUser/current`,
+    },
+    signin: {
+      method: 'POST',
+      url: `${prefix}/taUser/signin`,
+    },
+  }
+}

src/services/login.js

@@ -1,9 +1,15 @@
 import request from 'umi-request';
+import { Redirect } from 'umi';
+
 export async function fakeAccountLogin(params) {
-  return request('/api/login/account', {
+  return request('/api/admin/taUser/signin', {
     method: 'POST',
     data: params,
+  }).then(res => {
+    return <Redirect to="/welcome"></Redirect>;
   });
+
+
 }
 export async function getFakeCaptcha(mobile) {
   return request(`/api/login/captcha?mobile=${mobile}`);