feat(server|admin): 完成后台登录

front/config/local.json

@@ -1,7 +1,7 @@
 {
   "development": {
     "serverHost": "127.0.0.1",
-    "serverPort": 80,
+    "serverPort": 3000,
     "title": "",
     "description": "",
     "keyword": "",
@@ -36,4 +36,4 @@
     "publicPath": "/",
     "basename": "/"
   }
-}
+}

front/project/admin/index.js

@@ -1,9 +1,9 @@
 export default {
   mode: 'adminLeft',
-  rootPath: '/system/dashboard',
+  rootPath: '/dashboard',
   apiToken: 'token',
   loginAuth(route, { user }) {
-    if (route.needLogin && !user.login) return true;
+    if (route.needLogin && !user.login) return false;
     return true;
   },
 };

front/project/admin/local.json

@@ -3,12 +3,12 @@
     "scripts": [],
     "proxy": [
       {
-        "target": "http://127.0.0.1",
+        "target": "http://127.0.0.1:8080",
         "from": "/api",
-        "to": "/"
+        "to": "/admin"
       }
     ]
   },
   "test": {},
   "production": {}
-}
+}

front/project/admin/routes/index.js

@@ -1,6 +1,9 @@
 // We only need to import the modules necessary for initial render
 
 import Page from './page';
+import subject from './subject';
+import user from './user';
+import setting from './setting';
 import System from './system';
 
-export default [...Page, ...System];
+export default [...Page, ...subject, ...user, ...setting, ...System];

front/project/admin/routes/system/user/mockList/index.js

@@ -1,9 +1,9 @@
 import module from '../../module';
-import group from '../group';
+import group from './group';
 
 export default {
-  path: '/system/user/mockList',
-  key: 'system-user-mockList',
+  path: '/dashboard',
+  key: 'dashboard',
   title: '控制台',
   needLogin: true,
   module,

front/project/admin/routes/page/dashboard/index.less

@@ -0,0 +1,3 @@
+@charset "utf-8";
+
+.dashboard {}

front/project/admin/routes/page/home/index.less

@@ -1,4 +1,3 @@
 @charset "utf-8";
 
-#index {
-}
+#index {}

front/project/admin/routes/page/index.js

@@ -1,3 +1,4 @@
+import dashboard from './dashboard';
 import home from './home';
 
-export default [home];
+export default [dashboard, home];

front/project/admin/routes/setting/index.js

@@ -0,0 +1,7 @@
+import struct from './struct';
+import explain from './explain';
+import report from './report';
+import service from './service';
+import index from './index/';
+
+export default [struct, explain, report, service, index];

front/project/admin/routes/system/setting/main/index.js

@@ -2,8 +2,8 @@ import module from '../../module';
 import group from '../group';
 
 export default {
-  path: '/system/setting/main',
-  key: 'system-setting-main',
+  path: '/system/setting/index',
+  key: 'system-setting-index',
   title: '首页设置',
   needLogin: true,
   module,

front/project/admin/routes/setting/index/index.less

@@ -0,0 +1,3 @@
+@charset "utf-8";
+
+.system-setting-index {}

front/project/admin/routes/system/subject/mockList/index.js

@@ -2,8 +2,8 @@ import module from '../../module';
 import group from '../group';
 
 export default {
-  path: '/system/subject/mockList',
-  key: 'system-subject-mockList',
+  path: '/subject/examination',
+  key: 'subject-examination',
   title: '模考列表',
   needLogin: true,
   module,

front/project/admin/routes/subject/examination/index.less

@@ -0,0 +1,3 @@
+@charset "utf-8";
+
+.subject-examination {}

front/project/admin/routes/system/subject/exercisesList/index.js

@@ -2,8 +2,8 @@ import module from '../../module';
 import group from '../group';
 
 export default {
-  path: '/system/subject/exercisesList',
-  key: 'system-subject-exercisesList',
+  path: '/subject/exercise',
+  key: 'subject-exercise',
   title: '练习题列表',
   needLogin: true,
   module,

front/project/admin/routes/subject/exercise/index.less

@@ -0,0 +1,3 @@
+@charset "utf-8";
+
+.subject-exercise {}

front/project/admin/routes/system/subject/group.js

@@ -1,5 +1,5 @@
 export default {
   key: 'subject',
-  name: '练习频道设置',
+  name: '练习管理',
   icon: 'dashboard',
 };

front/project/admin/routes/subject/index.js

@@ -0,0 +1,8 @@
+import question from './question';
+import exercise from './exercise';
+import examination from './examination';
+import textbook from './textbook';
+import sentence from './sentence';
+import preview from './preview';
+
+export default [question, exercise, examination, textbook, sentence, preview];

front/project/admin/routes/system/subject/taskList/index.js

@@ -2,8 +2,8 @@ import module from '../../module';
 import group from '../group';
 
 export default {
-  path: '/system/subject/taskList',
-  key: 'system-subject-taskList',
+  path: '/subject/preview',
+  key: 'subject-preview',
   title: '预习作业',
   needLogin: true,
   module,

front/project/admin/routes/subject/preview/index.less

@@ -0,0 +1,3 @@
+@charset "utf-8";
+
+.subject-preview {}

front/project/admin/routes/system/subject/add/index.js

@@ -2,8 +2,8 @@ import module from '../../module';
 import group from '../group';
 
 export default {
-  path: '/system/subject/add',
-  key: 'system-subject-add',
+  path: '/subject/question',
+  key: 'subject-question',
   title: '题目录入',
   needLogin: true,
   module,

front/project/admin/routes/subject/question/index.less

@@ -0,0 +1,3 @@
+@charset "utf-8";
+
+.subject-question {}

front/project/admin/routes/system/subject/materialList/index.js

@@ -2,8 +2,8 @@ import module from '../../module';
 import group from '../group';
 
 export default {
-  path: '/system/subject/materialList',
-  key: 'system-subject-materialList',
+  path: '/subject/sentence',
+  key: 'subject-sentence',
   title: '长难句教材',
   needLogin: true,
   module,

front/project/admin/routes/subject/sentence/index.less

@@ -0,0 +1,3 @@
+@charset "utf-8";
+
+.subject-sentence {}

front/project/admin/routes/system/subject/machineList/index.js

@@ -2,8 +2,8 @@ import module from '../../module';
 import group from '../group';
 
 export default {
-  path: '/system/subject/machineList',
-  key: 'system-subject-machineList',
+  path: '/subject/textbook',
+  key: 'subject-textbook',
   title: '机经列表',
   needLogin: true,
   module,

front/project/admin/routes/subject/textbook/index.less

@@ -0,0 +1,3 @@
+@charset "utf-8";
+
+.subject-textbook {}

front/project/admin/routes/system/dashboard/base/index.less

@@ -1,3 +0,0 @@
-@charset "utf-8";
-
-.system-dashboard {}

front/project/admin/routes/system/dashboard/index.js

@@ -1,3 +0,0 @@
-import base from './base';
-
-export default [base];

front/project/admin/routes/system/index.js

@@ -1,7 +1,3 @@
-import dashboard from './dashboard';
-import subject from './subject';
-import user from './user';
-import setting from './setting';
 import manager from './manager';
 
-export default [...dashboard, ...subject, ...user, ...setting, ...manager];
+export default [...manager];

front/project/admin/routes/system/manager/list/index.js

@@ -1,4 +1,4 @@
-import module from '../../module';
+import module from '../../../module';
 import group from '../group';
 
 export default {

front/project/admin/routes/system/setting/index.js

@@ -1,7 +0,0 @@
-import structure from './structure';
-import explain from './explain';
-import report from './report';
-import service from './service';
-import main from './main';
-
-export default [structure, explain, report, service, main];

front/project/admin/routes/system/setting/main/index.less

@@ -1,3 +0,0 @@
-@charset "utf-8";
-
-.system-setting-main {}

front/project/admin/routes/system/subject/add/index.less

@@ -1,3 +0,0 @@
-@charset "utf-8";
-
-.system-subject-add {}

front/project/admin/routes/system/subject/exercisesList/index.less

@@ -1,3 +0,0 @@
-@charset "utf-8";
-
-.system-subject-exercisesList {}

front/project/admin/routes/system/subject/index.js

@@ -1,8 +0,0 @@
-import add from './add';
-import exercisesList from './exercisesList';
-import mockList from './mockList';
-import machineList from './machineList';
-import materialList from './materialList';
-import taskList from './taskList';
-
-export default [add, exercisesList, mockList, machineList, materialList, taskList];

front/project/admin/routes/system/subject/machineList/index.less

@@ -1,3 +0,0 @@
-@charset "utf-8";
-
-.system-subject-machineList {}

front/project/admin/routes/system/subject/materialList/index.less

@@ -1,3 +0,0 @@
-@charset "utf-8";
-
-.system-subject-materialList {}

front/project/admin/routes/system/subject/mockList/index.less

@@ -1,3 +0,0 @@
-@charset "utf-8";
-
-.system-subject-mockList {}

front/project/admin/routes/system/subject/taskList/index.less

@@ -1,3 +0,0 @@
-@charset "utf-8";
-
-.system-subject-taskList {}

front/project/admin/routes/system/user/buyList/index.less

@@ -1,3 +0,0 @@
-@charset "utf-8";
-
-.system-user-buyList {}

front/project/admin/routes/system/user/exerciseList/index.less

@@ -1,3 +0,0 @@
-@charset "utf-8";
-
-.system-user-exerciseList {}

front/project/admin/routes/system/user/index.js

@@ -1,9 +0,0 @@
-import infoList from './infoList';
-import questionList from './questionList';
-import taskList from './taskList';
-import exerciseList from './exerciseList';
-import mockList from './mockList';
-import buyList from './buyList';
-import feedbackList from './feedbackList';
-
-export default [infoList, questionList, taskList, exerciseList, mockList, buyList, feedbackList];

front/project/admin/routes/system/user/infoList/index.js

@@ -1,15 +0,0 @@
-import module from '../../module';
-import group from '../group';
-
-export default {
-  path: '/system/user/infoList',
-  key: 'system-user-infoList',
-  title: '基本信息',
-  needLogin: true,
-  module,
-  group,
-  index: true,
-  component() {
-    return import('./page');
-  },
-};

front/project/admin/routes/system/user/infoList/index.less

@@ -1,3 +0,0 @@
-@charset "utf-8";
-
-.system-user-infoList {}

front/project/admin/routes/system/user/mockList/index.less

@@ -1,3 +0,0 @@
-@charset "utf-8";
-
-.system-user-mockList {}

front/project/admin/routes/system/user/questionList/index.less

@@ -1,3 +0,0 @@
-@charset "utf-8";
-
-.system-user-questionList {}

front/project/admin/routes/system/user/taskList/page.js

@@ -1,10 +0,0 @@
-import React from 'react';
-import './index.less';
-import Page from '@src/containers/Page';
-import Block from '@src/components/Block';
-
-export default class extends Page {
-  renderView() {
-    return <Block flex />;
-  }
-}

front/project/admin/routes/system/user/questionList/index.js

@@ -2,8 +2,8 @@ import module from '../../module';
 import group from '../group';
 
 export default {
-  path: '/system/user/questionList',
-  key: 'system-user-questionList',
+  path: '/user/askList',
+  key: 'user-askList',
   title: '学生提问',
   needLogin: true,
   module,

front/project/admin/routes/system/user/exerciseList/index.js

@@ -2,8 +2,8 @@ import module from '../../module';
 import group from '../group';
 
 export default {
-  path: '/system/user/exerciseList',
-  key: 'system-user-exerciseList',
+  path: '/user/exerciseList',
+  key: 'user-exerciseList',
   title: '练习记录',
   needLogin: true,
   module,

front/project/admin/routes/user/exerciseList/index.less

@@ -0,0 +1,3 @@
+@charset "utf-8";
+
+.user-exerciseList {}

front/project/admin/routes/system/user/feedbackList/index.js

@@ -2,8 +2,8 @@ import module from '../../module';
 import group from '../group';
 
 export default {
-  path: '/system/user/feedbackList',
-  key: 'system-user-feedbackList',
+  path: '/user/feedbackList',
+  key: 'user-feedbackList',
   title: '勘误反馈',
   needLogin: true,
   module,

front/project/admin/routes/user/feedbackList/index.less

@@ -0,0 +1,3 @@
+@charset "utf-8";
+
+.user-feedbackList {}

front/project/admin/routes/user/index.js

@@ -0,0 +1,8 @@
+import list from './list';
+import askList from './askList';
+import previewList from './previewList';
+import exerciseList from './exerciseList';
+import payList from './payList';
+import feedbackList from './feedbackList';
+
+export default [list, askList, previewList, exerciseList, payList, feedbackList];

front/project/admin/routes/system/dashboard/base/index.js

@@ -2,9 +2,9 @@ import module from '../../module';
 import group from '../group';
 
 export default {
-  path: '/system/dashboard',
-  key: 'system-dashboard',
-  title: '控制台',
+  path: '/user/list',
+  key: 'user-list',
+  title: '用户列表',
   needLogin: true,
   module,
   group,

front/project/admin/routes/user/list/index.less

@@ -0,0 +1,3 @@
+@charset "utf-8";
+
+.user-list {}

front/project/admin/routes/system/user/buyList/index.js

@@ -2,8 +2,8 @@ import module from '../../module';
 import group from '../group';
 
 export default {
-  path: '/system/user/buyList',
-  key: 'system-user-buyList',
+  path: '/user/payList',
+  key: 'user-payList',
   title: '购买记录',
   needLogin: true,
   module,

front/project/admin/routes/user/payList/index.less

@@ -0,0 +1,3 @@
+@charset "utf-8";
+
+.user-payList {}

front/project/admin/routes/system/user/taskList/index.js

@@ -2,8 +2,8 @@ import module from '../../module';
 import group from '../group';
 
 export default {
-  path: '/system/user/taskList',
-  key: 'system-user-taskList',
+  path: '/user/previewList',
+  key: 'user-previewList',
   title: '预习作业',
   needLogin: true,
   module,

front/project/admin/stores/system.js

@@ -10,7 +10,7 @@ export default class SystemStore extends BaseStore {
   }
 
   getManager(params) {
-    return this.apiGet('/manager/{manager_id}', { manager_id: params.id, ...params });
+    return this.apiGet('/manager/detail', { manager_id: params.id, ...params });
   }
 
   putManager(params) {

front/project/www/local.json

@@ -3,12 +3,12 @@
     "scripts": [],
     "proxy": [
       {
-        "target": "http://127.0.0.1",
+        "target": "http://127.0.0.1:8080",
         "from": "/api",
-        "to": "/"
+        "to": "/api"
       }
     ]
   },
   "test": {},
   "production": {}
-}
+}

front/src/containers/AdminLeft.js

@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 import { Link } from 'react-router-dom';
-import { Layout, Menu, Icon, Dropdown, Avatar, Breadcrumb, Tooltip, LocaleProvider } from 'antd';
+import { Layout, Menu, Icon, Dropdown, Avatar, Breadcrumb, LocaleProvider } from 'antd';
 import zhCN from 'antd/lib/locale-provider/zh_CN';
 import '../style/adminLeft.less';
 import { User } from '../stores/user';
@@ -155,12 +155,10 @@ export default class extends Component {
                         );
                       })}
                     </SubMenu>
-                  ) : (
-                    <Menu.Item key={group.key} path={group.path}>
-                      <Icon type={group.icon} />
-                      <span>{group.name}</span>
-                    </Menu.Item>
-                  );
+                  ) : (<Menu.Item key={group.key} path={group.path}>
+                    <Icon type={group.icon} />
+                    <span>{group.name}</span>
+                  </Menu.Item>);
                   return view;
                 })}
               </Menu>
@@ -174,13 +172,13 @@ export default class extends Component {
                 onClick={() => User.switchCollapse()}
               />
               <div className="f-r">
-                <Tooltip placement="bottom" title="使用文档">
+                {/* <Tooltip placement="bottom" title="使用文档">
                   <Icon className="icon" type="question-circle" />
                 </Tooltip>
 
                 <Tooltip placement="bottom" title="消息">
                   <Icon className="icon" type="bell" />
-                </Tooltip>
+                </Tooltip> */}
                 {project.otherLink && project.otherLink.length > 0 && (
                   <Dropdown overlay={this.getOtherLink()} placement="bottomCenter">
                     <Icon className="icon" type="link" />

front/src/routes/index.js

@@ -4,4 +4,4 @@ import Empty from './empty';
 import Power from './power';
 import Login from './login';
 
-export default [...project, Empty, Power, Login];
+export default [Empty, Power, Login, ...project];

front/src/services/Constant.js

@@ -11,3 +11,13 @@ export const STORE_LOADING = '@LOADING';
 export const STORE_LOADED = '@LOADED';
 
 export const FORM_LAYOUT = '@src/layouts/FormLayout';
+
+export const QuestionDifficult = [{ label: 'easy', value: 'easy' }, { label: 'medium', value: 'medium' }, { label: 'hard', value: 'hard' }];
+
+export const QuestionType = [{ label: 'SC/语法', value: 'sc' }, { label: 'RC/阅读', value: 'rc' }, { label: 'CR/逻辑', value: 'cr' }, { label: 'PS/数学', value: 'ps' }, { label: 'AWA/作文', value: 'awa' }];
+
+export const MoneyRange = [{ label: '0', value: 0 }, { label: '1-1000', value: 1 }, { label: '1000-5000', value: 2 }, { label: '5000-10000', value: 3 }, { label: '10000以上', value: 4 }];
+
+export const AskTarget = [{ label: '题目', value: 'question' }, { label: '官方', value: 'official' }, { label: '千行解析', value: 'qx' }, { label: '题源联想', value: 'association' }];
+
+export const PreviewStatus = [{ label: '全部', value: 0 }, { label: '未开始', value: 1 }, { label: '进行中', value: 2 }, { label: '已结束', value: 3 }];

server/data/src/main/java/com/qxgmat/data/MybatisConfig.java

@@ -1,14 +1,8 @@
 package com.qxgmat.data;
 
 
-import com.qxgmat.data.constants.SessionKey;
-import org.apache.ibatis.session.SqlSessionFactory;
-import org.mybatis.spring.SqlSessionFactoryBean;
-import org.mybatis.spring.annotation.MapperScan;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
+import tk.mybatis.spring.annotation.MapperScan;
 
 import javax.sql.DataSource;
 

server/data/src/main/java/com/qxgmat/data/constants/enums/PaperModule.java

@@ -1,9 +0,0 @@
-package com.qxgmat.data.constants.enums;
-
-public enum PaperModule {
-    EXERCISE("exercise"), EXAMINATION("examination"), COLLECT("collect"), ERROR("error");
-    public String key;
-    private PaperModule(String key){
-        this.key = key;
-    }
-}

server/data/src/main/java/com/qxgmat/data/constants/enums/QuestionDifficult.java

@@ -0,0 +1,16 @@
+package com.qxgmat.data.constants.enums;
+
+/**
+ * Created by gaojie on 2017/11/19.
+ */
+public enum QuestionDifficult {
+    EASY("easy", "简单"), MEDIUM("medium", "中等"), HARD("hard","困难");
+    final static public String message = "试卷难度";
+
+    public String key;
+    public String title;
+    private QuestionDifficult(String key, String title){
+        this.key = key;
+        this.title = title;
+    }
+}

server/data/src/main/java/com/qxgmat/data/constants/enums/QuestionType.java

@@ -0,0 +1,16 @@
+package com.qxgmat.data.constants.enums;
+
+/**
+ * Created by gaojie on 2017/11/19.
+ */
+public enum QuestionType {
+    SC("sc", "语法"), RC("rc", "阅读"), CR("cr","逻辑"), PS("ps", "数学"), AWA("awa", "作文");
+    final static public String message = "试卷类型";
+
+    public String key;
+    public String title;
+    private QuestionType(String key, String title){
+        this.key = key;
+        this.title = title;
+    }
+}

server/data/src/main/java/com/qxgmat/data/constants/enums/SettingKey.java

@@ -0,0 +1,14 @@
+package com.qxgmat.data.constants.enums;
+
+/**
+ * Created by gaojie on 2017/11/19.
+ */
+public enum SettingKey {
+    INDEX("index"), SENTENCE("sentence"), BUY_MESSAGE("buy_message"), PLACE("place"), TIME("time");
+    final static public String message = "设置key";
+
+    public String key;
+    private SettingKey(String key){
+        this.key = key;
+    }
+}