Merge branch 'master' of http://gogs.ioobot.com:6680/xy/online

src/components/app/App.jsx

@@ -34,7 +34,7 @@ class App extends Component {
         super(props);
         sessionStorage.setItem("language", "English");
         this.state = {
-            menuLevel1: "trail",
+            menuLevel1: "graphql-service",
             sideBar: "e-commerce",
             collapsed: false,
             inlineCollapsed: false,
@@ -58,7 +58,7 @@ class App extends Component {
         });
     };
 
-    switchMenuUser = (menuName, value) => {
+    switchMenuLevel = (menuName, value) => {
         this.setState({
             [menuName]: value,
         });
@@ -106,7 +106,7 @@ class App extends Component {
             <Router>
                 <Layout style={{minHeight: '100vh'}}>
                     <Header className="header" style={{position: 'fixed', zIndex: 1, width: '100%'}}>
-                        <Link to="/">
+                        <Link to="/"   onClick={() => this.switchMenuLevel('menuLevel1', "graphql-service")}>
                             <div className="logo-wrapper">
                                 <div className='logo'/>
                             </div>
@@ -119,10 +119,10 @@ class App extends Component {
                             onClick={(e) => this.switchMenu('menuLevel1', e)}
                         >
                             <Menu.Item key="graphql-service">
-                                <Link to="/"><FormattedMessage id="Graphql Service"/></Link>
+                                <Link to="/graphql-service/trial-case/index"><FormattedMessage id="Graphql Service"/></Link>
                             </Menu.Item>
                             <Menu.Item key="wechat-service">
-                                <Link to="/wechat-service/trial-case/wechat case"><FormattedMessage
+                                <Link to="/wechat-service/trial-case/index"><FormattedMessage
                                     id="Wechat Service"/></Link>
                             </Menu.Item>
                             <Menu.Item key="quantization-service">
@@ -131,7 +131,7 @@ class App extends Component {
                         </Menu>
 
                         <Link to="/login">
-                            <Button className='login-button' type='primary' onClick={()=>this.switchMenuUser('menuLevel1','user')} >Login</Button>
+                            <Button className='login-button' type='primary' onClick={()=>this.switchMenuLevel('menuLevel1','user')} >Login</Button>
                         </Link>
 
                         <div className="change-locale">

src/components/login/Login.js

@@ -46,8 +46,15 @@ class Login extends Component {
     login = () => {
         let _this = this;
         // todo: should be post
-        axios.get(`${this.state.login_url}?user-name=${this.state.login_username}&password=${this.state.login_password}`)
+        // axios.get(`${this.state.login_url}?user-name=${this.state.login_username}&password=${this.state.login_password}`)
+
+        axios.post(this.state.login_url,
+            {
+                'user-name': this.state.login_username,
+                password: this.state.login_password
+            })
             .then((res) => {
+            console.log('login result',res);
                 _this.setState({
                     userID: res.data,
                     loginStatus: 'logined',
@@ -146,7 +153,12 @@ class Login extends Component {
                                                 avatar: ''
                                             }
                                         });
-                                        axios.get(`${this.state.register_url}?user-id=${id}&password=${this.state.register_password}&token=WXgraphql4Io`)
+                                        axios.post(this.state.register_url,
+                                            {
+                                                'user-id': id,
+                                                password: this.state.register_password,
+                                                token:'WXgraphql4Io'
+                                            })
                                             .then(function (response) {
                                                 if (response.status === 200)
                                                     _this.setState({