Merge remote-tracking branch 'origin/master'

src/app/App.jsx

@@ -23,7 +23,7 @@ import WxCreate from "./wechatService/wxCreate/WxCreate";
 
 import {SHOW_ALL_SCHEMA, SHOW_ALL_WXCONFIG} from "../gql";
 import axios from 'axios';
-import {getCookie} from "../cookie";
+import {getCookie, setCookie} from "../cookie";
 
 axios.defaults.withCredentials = true;
 
@@ -56,6 +56,19 @@ class App extends Component {
                 this.setState({sideBar: urlList[3]});
             }
         }
+
+        let userID = getCookie('user_id');
+        if (userID === undefined || '') {
+            axios.get(this.state.getIdUrl)
+                .then((res) => {
+                    if (res.data !== '') {
+                        setCookie("user_id", res.data);
+                    }
+                })
+                .catch(function (err) {
+                    console.log(err);
+                });
+        }
     }
 
     onCollapse = (collapsed) => {

src/app/graphqlService/component/schema/Create.js

@@ -21,6 +21,12 @@ class Create extends Component {
         };
     }
 
+    redirectToLogin = () => {
+        this.props.history.push({
+            pathname: `/login`,
+        });
+    };
+
     componentWillReceiveProps(nextProps) {
         this.setState({
             visible: nextProps.visible,
@@ -102,6 +108,10 @@ class Create extends Component {
                                             this.setState({
                                                 schemaName: e.target.value,
                                             });
+                                            if(userID === '' || undefined) {
+                                                this.redirectToLogin();
+                                                this.props.hideModal();
+                                            }
                                         }}
                                     />
                                 </div>

src/app/wechatService/wxCreate/WxCreate.js

@@ -38,6 +38,11 @@ class WxCreate extends Component {
         });
     }
 
+    redirectToLogin = () => {
+        this.props.history.push({
+            pathname: `/login`,
+        });
+    };
 
     handleOk = (userID, create_wxConfig) => {
         let {mch_id, notify_url, appSecret, appID, token, spbill_create_ip, enter_url, pay_api_key, body, welcome_words, attach} = this.state;
@@ -126,6 +131,10 @@ class WxCreate extends Component {
                                             this.setState({
                                                 appName: e.target.value,
                                             });
+                                            if(userID === '' || undefined) {
+                                                this.redirectToLogin();
+                                                this.props.hideModal();
+                                            }
                                         }}
                                     />
                                 </div>

src/language/en_US.js

@@ -64,7 +64,7 @@ const en_US = {
     "please input table remark": "please input table remark",
     "please input table name": "please input table name",
     "field name": 'field name',
-    "Confirm": '确认修改',
+    "Confirm": 'Confirm',
     "API Group": 'API Group',
     "API Path": 'API Path',
     "Notification": 'Notification',
@@ -72,7 +72,8 @@ const en_US = {
     "Welcome": 'Welcome',
     'register': 'register',
     'ok, login please': 'ok, login please',
-    'login filed': 'login filed',
+    'login failed': 'login filed',
+    'relogin': 'relogin',
     'nickname': 'nickname',
     'username has been used': 'username has been used, please change one'
 };

src/language/zh_CN.js

@@ -73,7 +73,8 @@ const zh_CN = {
     "Welcome": '欢迎',
     'register': '注册',
     'ok, login please': '完成，请登录',
-    'login filed': '登录失败',
+    'login failed': '登录失败',
+    'relogin': '重新登录',
     'nickname': '昵称',
     'username has been used': '用户名已被占用，请更换',
 };

src/login/AccountConfig.js

@@ -47,7 +47,7 @@ class AccountConfig extends Component {
                                     <Col span={20}>
                                         {
                                             this.state.editNickname ?
-                                                <EditNickname kind={'nickname'} cancelEdit={this.cancelEdit}/>
+                                                <EditNickname cancelEdit={this.cancelEdit}/>
                                                 :
                                                 <div className={'nickname'} onMouseOver={() => {
                                                     this.setState({overNickname: true})
@@ -149,7 +149,7 @@ class AccountConfig extends Component {
                                                                   }}>
                                                                 <Icon style={{fontSize: '18px'}} type="edit"
                                                                       theme="twoTone"/>
-                                                                <span className={'modify'}> modify</span>
+                                                                <span className={'modify'}> <FormattedMessage id="modify"/></span>
                                                             </span>
                                                             :
                                                             ''
@@ -179,7 +179,7 @@ class EditNickname extends Component {
         return (
             <Row className={'message-top'}>
                 <Col span={5}>
-                    <span className={'message-title message-title-high'}>{this.props.kind}</span>
+                    <span className={'message-title message-title-high'}><FormattedMessage id="nickname"/></span>
                 </Col>
                 <Col span={19}>
                     <span className={'message-content'}>

src/login/LoginInput.js

@@ -80,9 +80,9 @@ class LoginInput extends Component {
 
                     return (
                         <div>
-                            <span style={{marginRight: 20}}><b>register:</b></span>
+                            <span style={{marginRight: 20}}><b><FormattedMessage id="register"/>:</b></span>
                             <div style={{marginTop: 10}}>
-                                <span>username: </span>
+                                <span><FormattedMessage id="username"/>: </span>
                                 <Input
                                     placeholder=""
                                     onChange={(e) => {
@@ -95,13 +95,13 @@ class LoginInput extends Component {
                                 />
                                 {
                                     this.state.usernameTip ?
-                                        <span><b>username has been used!</b></span>
+                                        <span><b><FormattedMessage id="username has been used"/>!</b></span>
                                         :
                                         ''
                                 }
                             </div>
                             <div style={{marginTop: 10}}>
-                                <span>password: </span>
+                                <span><FormattedMessage id="password"/>: </span>
                                 <Input
                                     placeholder=""
                                     onChange={(e) => {
@@ -112,7 +112,7 @@ class LoginInput extends Component {
                                 />
                             </div>
                             <div style={{marginTop: 10}}>
-                                <span>nickname: </span>
+                                <span><FormattedMessage id="nickname"/>: </span>
                                 <Input
                                     placeholder=""
                                     onChange={(e) => {
@@ -217,9 +217,9 @@ class LoginInput extends Component {
                                 ''
                             :
                             <div>
-                                <span style={{marginRight: 20}}><b>login:</b></span>
+                                <span style={{marginRight: 20}}><b><FormattedMessage id="login"/>:</b></span>
                                 <div style={{marginTop: 10}}>
-                                    <span>username: </span>
+                                    <span><FormattedMessage id="username"/>: </span>
                                     <Input
                                         placeholder=""
                                         onChange={(e) => {
@@ -230,7 +230,7 @@ class LoginInput extends Component {
                                     />
                                 </div>
                                 <div style={{marginTop: 10}}>
-                                    <span>password: </span>
+                                    <span><FormattedMessage id="password"/>: </span>
                                     <Input
                                         placeholder=""
                                         onChange={(e) => {
@@ -251,7 +251,7 @@ class LoginInput extends Component {
                         this.state.loginStatus === 'logined' ?
                             <div>
                                                 <span
-                                                    style={{marginRight: '10px'}}>welcome, {this.state.nickname}</span>
+                                                    style={{marginRight: '10px'}}><FormattedMessage id="Welcome"/>, {this.state.nickname}</span>
                                 <Button onClick={() => {
                                     this.setState({
                                         hasLogin: false,
@@ -276,14 +276,14 @@ class LoginInput extends Component {
                             :
                             this.state.loginStatus === 'failed' ?
                                 <div>
-                                    <span style={{marginRight: '10px'}}>login failed</span>
+                                    <span style={{marginRight: '10px'}}><FormattedMessage id="login failed"/></span>
                                     <Button onClick={() => {
                                         this.setState({
                                             hasLogin: false,
                                             loginStatus: '',
                                             loginOnce: true
                                         })
-                                    }}>relogin</Button>
+                                    }}><FormattedMessage id="relogin"/></Button>
                                 </div>
                                 :
                                 ''
@@ -292,7 +292,7 @@ class LoginInput extends Component {
                 <div className='register' style={{marginTop: 20}}>
                     {
                         this.state.hasRegister ?
-                            <div>ok, login please</div>
+                            <div><FormattedMessage id="ok, login please"/></div>
                             :
                             this.state.loginStatus === 'logined' ?
                                 ''