Skip to content

S
spring-microservice-exam
Commit 06a9c8fd by tangyi
Options

调整开源协议为MIT、网关支持动态路由、优化其它功能

parent 3ea8a693
Showing with 1493 additions and 725 deletions
LICENSE
GNU LESSER GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
This version of the GNU Lesser General Public License incorporates
the terms and conditions of version 3 of the GNU General Public
License, supplemented by the additional permissions listed below.
0. Additional Definitions.
As used herein, "this License" refers to version 3 of the GNU Lesser
General Public License, and the "GNU GPL" refers to version 3 of the GNU
General Public License.
"The Library" refers to a covered work governed by this License,
other than an Application or a Combined Work as defined below.
An "Application" is any work that makes use of an interface provided
by the Library, but which is not otherwise based on the Library.
Defining a subclass of a class defined by the Library is deemed a mode
of using an interface provided by the Library.
A "Combined Work" is a work produced by combining or linking an
Application with the Library. The particular version of the Library
with which the Combined Work was made is also called the "Linked
Version".
The "Minimal Corresponding Source" for a Combined Work means the
Corresponding Source for the Combined Work, excluding any source code
for portions of the Combined Work that, considered in isolation, are
based on the Application, and not on the Linked Version.
The "Corresponding Application Code" for a Combined Work means the
object code and/or source code for the Application, including any data
and utility programs needed for reproducing the Combined Work from the
Application, but excluding the System Libraries of the Combined Work.
1. Exception to Section 3 of the GNU GPL.
You may convey a covered work under sections 3 and 4 of this License
without being bound by section 3 of the GNU GPL.
2. Conveying Modified Versions.
If you modify a copy of the Library, and, in your modifications, a
facility refers to a function or data to be supplied by an Application
that uses the facility (other than as an argument passed when the
facility is invoked), then you may convey a copy of the modified
version:
a) under this License, provided that you make a good faith effort to
ensure that, in the event an Application does not supply the
function or data, the facility still operates, and performs
whatever part of its purpose remains meaningful, or
b) under the GNU GPL, with none of the additional permissions of
this License applicable to that copy.
3. Object Code Incorporating Material from Library Header Files.
The object code form of an Application may incorporate material from
a header file that is part of the Library. You may convey such object
code under terms of your choice, provided that, if the incorporated
material is not limited to numerical parameters, data structure
layouts and accessors, or small macros, inline functions and templates
(ten or fewer lines in length), you do both of the following:
a) Give prominent notice with each copy of the object code that the
Library is used in it and that the Library and its use are
covered by this License.
b) Accompany the object code with a copy of the GNU GPL and this license
document.
4. Combined Works.
You may convey a Combined Work under terms of your choice that,
taken together, effectively do not restrict modification of the
portions of the Library contained in the Combined Work and reverse
engineering for debugging such modifications, if you also do each of
the following:
a) Give prominent notice with each copy of the Combined Work that
the Library is used in it and that the Library and its use are
covered by this License.
b) Accompany the Combined Work with a copy of the GNU GPL and this license
document.
c) For a Combined Work that displays copyright notices during
execution, include the copyright notice for the Library among
these notices, as well as a reference directing the user to the
copies of the GNU GPL and this license document.
d) Do one of the following:
0) Convey the Minimal Corresponding Source under the terms of this
License, and the Corresponding Application Code in a form
suitable for, and under terms that permit, the user to
recombine or relink the Application with a modified version of
the Linked Version to produce a modified Combined Work, in the
manner specified by section 6 of the GNU GPL for conveying
Corresponding Source.
1) Use a suitable shared library mechanism for linking with the
Library. A suitable mechanism is one that (a) uses at run time
a copy of the Library already present on the user's computer
system, and (b) will operate properly with a modified version
of the Library that is interface-compatible with the Linked
Version.
e) Provide Installation Information, but only if you would otherwise
be required to provide such information under section 6 of the
GNU GPL, and only to the extent that such information is
necessary to install and execute a modified version of the
Combined Work produced by recombining or relinking the
Application with a modified version of the Linked Version. (If
you use option 4d0, the Installation Information must accompany
the Minimal Corresponding Source and Corresponding Application
Code. If you use option 4d1, you must provide the Installation
Information in the manner specified by section 6 of the GNU GPL
for conveying Corresponding Source.)
5. Combined Libraries.
You may place library facilities that are a work based on the
Library side by side in a single library together with other library
facilities that are not Applications and are not covered by this
License, and convey such a combined library under terms of your
choice, if you do both of the following:
a) Accompany the combined library with a copy of the same work based
on the Library, uncombined with any other library facilities,
conveyed under the terms of this License.
b) Give prominent notice with the combined library that part of it
is a work based on the Library, and explaining where to find the
accompanying uncombined form of the same work.
6. Revised Versions of the GNU Lesser General Public License.
The Free Software Foundation may publish revised and/or new versions
of the GNU Lesser General Public License from time to time. Such new
versions will be similar in spirit to the present version, but may
differ in detail to address new problems or concerns.
Each version is given a distinguishing version number. If the
Library as you received it specifies that a certain numbered version
of the GNU Lesser General Public License "or any later version"
applies to it, you have the option of following the terms and
conditions either of that published version or of any later version
published by the Free Software Foundation. If the Library as you
received it does not specify a version number of the GNU Lesser
General Public License, you may choose any version of the GNU Lesser
General Public License ever published by the Free Software Foundation.
If the Library as you received it specifies that a proxy can decide
whether future versions of the GNU Lesser General Public License shall
apply, that proxy's public statement of acceptance of any version is
permanent authorization for you to choose that version for the
Library.
MIT License
Copyright (c) 2019 慕容若冰
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
README.md
......@@ -6,7 +6,7 @@
重写[spring-cloud-online-exam](https://gitee.com/wells2333/spring-cloud-online-exam)
采用前后端分离技术：
采用前后端分离技术
前端采用`vue2.0`，通过`jwt`和后端交互
......@@ -59,6 +59,7 @@
- 角色管理：角色信息增删改查、分配权限
- 菜单管理：菜单信息增删改查、导入导出
- 终端管理：管理OAuth2.0的客户端，如client_id、client_secret、access_token有效时间等
- 路由管理：网关路由管理，包括路由的增删改查、刷新路由等
系统监控：监控服务、日志等
- 日志监控：查看系统日志
......@@ -111,8 +112,7 @@
## 后续
- [ ] 网关实现基于数据库、Redis的动态路由
- [ ] zipkin链路监控
- [ ] zipkin链路监控完善
- [ ] 容器化部署文档
- [ ] 业务功能完善
- [ ] 补充相关中间件的文档
......
common/common-core/src/main/java/com/github/tangyi/common/core/constant/CommonConstant.java
......@@ -44,14 +44,24 @@ public class CommonConstant {
public static final String PAGE_NUM = "pageNum";
/**
* 默认页数
* 分页大小
*/
public static final String PAGE_NUM_DEFAULT = "1";
public static final String PAGE_SIZE = "pageSize";
/**
* 分页大小
* 排序
*/
public static final String PAGE_SIZE = "pageSize";
public static final String SORT = "sort";
/**
* 排序方向
*/
public static final String ORDER = "order";
/**
* 默认页数
*/
public static final String PAGE_NUM_DEFAULT = "1";
/**
* 默认分页大小
......@@ -127,5 +137,6 @@ public class CommonConstant {
* 保存code的前缀
*/
public static final String DEFAULT_CODE_KEY = "DEFAULT_CODE_KEY";
}
common/common-core/src/main/java/com/github/tangyi/common/core/constant/MqConstant.java 0 → 100644
package com.github.tangyi.common.core.constant;
/**
* @author tangyi
* @date 2019/4/2 20:48
*/
public class MqConstant {
/**
* 修改路由
*/
public static final String EDIT_GATEWAY_ROUTE_QUEUE = "edit_gateway_route_queue";
/**
* 删除路由
*/
public static final String DEL_GATEWAY_ROUTE_QUEUE = "del_gateway_route_queue";
/**
* 刷新路由
*/
public static final String REFRESH_GATEWAY_ROUTE_QUEUE = "refresh_gateway_route_queue";
}
common/common-core/src/main/java/com/github/tangyi/common/core/model/Route.java 0 → 100644
package com.github.tangyi.common.core.model;
import com.github.tangyi.common.core.persistence.BaseEntity;
/**
* 路由信息
*
* @author tangyi
* @date 2019/4/2 14:52
*/
public class Route extends BaseEntity<Route> {
/**
* 路由ID
*/
private String routeId;
/**
* 路由名称
*/
private String routeName;
/**
* 断言
*/
private String predicates;
/**
* 过滤器
*/
private String filters;
/**
* URI
*/
private String uri;
/**
* 排序
*/
private String sort;
/**
* 启用禁用
*/
private String status;
public String getRouteId() {
return routeId;
}
public void setRouteId(String routeId) {
this.routeId = routeId;
}
public String getRouteName() {
return routeName;
}
public void setRouteName(String routeName) {
this.routeName = routeName;
}
public String getPredicates() {
return predicates;
}
public void setPredicates(String predicates) {
this.predicates = predicates;
}
public String getFilters() {
return filters;
}
public void setFilters(String filters) {
this.filters = filters;
}
public String getUri() {
return uri;
}
public void setUri(String uri) {
this.uri = uri;
}
public String getSort() {
return sort;
}
public void setSort(String sort) {
this.sort = sort;
}
public String getStatus() {
return status;
}
public void setStatus(String status) {
this.status = status;
}
}
common/common-core/src/main/java/com/github/tangyi/common/core/utils/JsonMapper.java 0 → 100644
package com.github.tangyi.common.core.utils;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.databind.JavaType;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
/**
* Created by tangyi on 2017/3/14.
*/
public class JsonMapper extends ObjectMapper {
private static final long serialVersionUID = 1L;
private static Logger logger = LoggerFactory.getLogger(JsonMapper.class);
private static JsonMapper mapper;
public static JsonMapper getInstance() {
if (mapper == null){
mapper = new JsonMapper().enableSimple();
}
return mapper;
}
public String toJson(Object object) {
try {
return this.writeValueAsString(object);
} catch (IOException e) {
logger.warn("将解析JSON为字符串失败:" + object, e);
return null;
}
}
public <T> T fromJson(String jsonString, Class<T> clazz) {
if (StringUtils.isEmpty(jsonString)) {
return null;
}
try {
return this.readValue(jsonString, clazz);
} catch (IOException e) {
logger.warn("将解析JSON为对象失败:" + jsonString, e);
return null;
}
}
public <T> T fromJson(String jsonString, JavaType javaType) {
if (StringUtils.isEmpty(jsonString)) {
return null;
}
try {
return (T) this.readValue(jsonString, javaType);
} catch (IOException e) {
logger.warn("将解析JSON为对象失败:" + jsonString, e);
return null;
}
}
public static Object fromJsonObject(String jsonString, JavaType javaType){
return JsonMapper.getInstance().fromJson(jsonString, javaType);
}
public JavaType createCollectionType(Class<?> collectionClass, Class<?>... elementClasses) {
return this.getTypeFactory().constructParametricType(collectionClass, elementClasses);
}
public JsonMapper enableSimple() {
this.configure(JsonParser.Feature.ALLOW_SINGLE_QUOTES, true);
this.configure(JsonParser.Feature.ALLOW_UNQUOTED_FIELD_NAMES, true);
return this;
}
public ObjectMapper getMapper() {
return this;
}
public static String toJsonString(Object object){
return JsonMapper.getInstance().toJson(object);
}
public static Object fromJsonString(String jsonString, Class<?> clazz){
return JsonMapper.getInstance().fromJson(jsonString, clazz);
}
}
gateway-service/src/main/java/com/github/tangyi/gateway/module/GatewayFilterDefinition.java → common/common-core/src/main/java/com/github/tangyi/common/core/vo/RouteFilterVo.java
package com.github.tangyi.gateway.module;
package com.github.tangyi.common.core.vo;
import java.util.LinkedHashMap;
import java.util.Map;
......@@ -9,7 +9,7 @@ import java.util.Map;
* @author tangyi
* @date 2019/3/27 11:07
*/
public class GatewayFilterDefinition {
public class RouteFilterVo {
/**
* Filter Name
......@@ -19,7 +19,7 @@ public class GatewayFilterDefinition {
/**
* 对应的路由规则
*/
private Map<String, String> args = new LinkedHashMap<String, String>();
private Map<String, String> args = new LinkedHashMap<>();
public String getName() {
return name;
......
gateway-service/src/main/java/com/github/tangyi/gateway/module/GatewayPredicateDefinition.java → common/common-core/src/main/java/com/github/tangyi/common/core/vo/RoutePredicateVo.java
package com.github.tangyi.gateway.module;
package com.github.tangyi.common.core.vo;
import java.util.LinkedHashMap;
import java.util.Map;
......@@ -9,7 +9,7 @@ import java.util.Map;
* @author tangyi
* @date 2019/3/27 11:08
*/
public class GatewayPredicateDefinition {
public class RoutePredicateVo {
/**
* 断言对应的Name
......@@ -19,7 +19,7 @@ public class GatewayPredicateDefinition {
/**
* 配置的断言规则
*/
private Map<String, String> args = new LinkedHashMap<String, String>();
private Map<String, String> args = new LinkedHashMap<>();
public String getName() {
return name;
......
gateway-service/src/main/java/com/github/tangyi/gateway/module/GatewayRouteDefinition.java → common/common-core/src/main/java/com/github/tangyi/common/core/vo/RouteVo.java
package com.github.tangyi.gateway.module;
package com.github.tangyi.common.core.vo;
import java.util.ArrayList;
import java.util.List;
......@@ -9,22 +9,27 @@ import java.util.List;
* @author tangyi
* @date 2019/3/27 11:06
*/
public class GatewayRouteDefinition {
public class RouteVo {
/**
* 路由的Id
*/
private String id;
private String routeId;
/**
* 路由名称
*/
private String routeName;
/**
* 路由断言集合配置
*/
private List<GatewayPredicateDefinition> predicates = new ArrayList<>();
private List<RoutePredicateVo> predicates = new ArrayList<>();
/**
* 路由过滤器集合配置
*/
private List<GatewayFilterDefinition> filters = new ArrayList<>();
private List<RouteFilterVo> filters = new ArrayList<>();
/**
* 路由规则转发的目标uri
......@@ -36,27 +41,37 @@ public class GatewayRouteDefinition {
*/
private int order = 0;
public String getId() {
return id;
/**
* 排序
*/
private String sort;
/**
* 启用禁用
*/
private String status;
public String getRouteId() {
return routeId;
}
public void setId(String id) {
this.id = id;
public void setRouteId(String routeId) {
this.routeId = routeId;
}
public List<GatewayPredicateDefinition> getPredicates() {
public List<RoutePredicateVo> getPredicates() {
return predicates;
}
public void setPredicates(List<GatewayPredicateDefinition> predicates) {
public void setPredicates(List<RoutePredicateVo> predicates) {
this.predicates = predicates;
}
public List<GatewayFilterDefinition> getFilters() {
public List<RouteFilterVo> getFilters() {
return filters;
}
public void setFilters(List<GatewayFilterDefinition> filters) {
public void setFilters(List<RouteFilterVo> filters) {
this.filters = filters;
}
......@@ -75,4 +90,28 @@ public class GatewayRouteDefinition {
public void setOrder(int order) {
this.order = order;
}
public String getRouteName() {
return routeName;
}
public void setRouteName(String routeName) {
this.routeName = routeName;
}
public String getSort() {
return sort;
}
public void setSort(String sort) {
this.sort = sort;
}
public String getStatus() {
return status;
}
public void setStatus(String status) {
this.status = status;
}
}
common/common-security/src/main/java/com/github/tangyi/common/security/constant/SecurityConstant.java
......@@ -12,6 +12,16 @@ public class SecurityConstant {
public static final String BASE_ROLE = "ROLE_USER";
/**
* 管理员角色
*/
public static final String ROLE_ADMIN = "ROLE_ADMIN";
/**
* 老师角色
*/
public static final String ROLE_TEACHER = "ROLE_TEACHER";
/**
* token
*/
public static final String TOKEN_USER_DETAIL = "token-user-detail";
......
config-service/src/main/resources/config/auth-service.yml
......@@ -75,7 +75,7 @@ ignore:
- /v2/api-docs
- /csrf
- /actuator/**
- /hystrix.stream
- /hystrix.sender
- /v1/user/findUserByUsername/**
- /v1/code/**
- /v1/attachment/download
......
config-service/src/main/resources/config/exam-service.yml
......@@ -89,7 +89,7 @@ ignore:
- /v2/api-docs
- /csrf
- /actuator/**
- /hystrix.stream
- /hystrix.sender
- /v1/user/findUserByUsername/**
- /v1/code/**
- /v1/attachment/download
......
config-service/src/main/resources/config/gateway-service.yml
......@@ -4,6 +4,11 @@ spring:
redis:
host: ${REDIS_HOST:192.168.0.213}
port: ${REDIS_PORT:6379}
rabbitmq:
host: ${RABBIT_HOST:localhost}
port: ${RABBIT_PORT:5672}
username: guest
password: guest
boot:
admin:
client:
......@@ -22,30 +27,6 @@ spring:
# zipkin 配置
zipkin:
base-url: http://localhost:9411 # 指定了Zipkin服务器的地址
cloud:
gateway:
routes:
- id: auth-service
uri: lb://auth-service
predicates:
- Path=/api/auth/**
filters:
- StripPrefix=2
- RemoveRequestHeader=Cookie, Set-Cookie
- id: user-service
uri: lb://user-service
predicates:
- Path=/api/user/**
filters:
- StripPrefix=2
- RemoveRequestHeader=Cookie, Set-Cookie
- id: exam-service
uri: lb://exam-service
predicates:
- Path=/api/exam/**
filters:
- StripPrefix=2
- RemoveRequestHeader=Cookie, Set-Cookie
security:
encode:
......
config-service/src/main/resources/config/user-service.yml
......@@ -107,8 +107,9 @@ ignore:
- /v2/api-docs
- /csrf
- /actuator/**
- /hystrix.stream
- /hystrix.sender
- /v1/user/findUserByUsername/**
- /v1/user/register
- /v1/code/**
- /v1/attachment/download
- /v1/log/**
......
doc/deploy/mysql/microservice-auth.sql
......@@ -11,7 +11,7 @@
Target Server Version : 50710
File Encoding : 65001
Date: 31/03/2019 15:16:50
Date: 07/04/2019 21:11:11
*/
SET NAMES utf8mb4;
......@@ -47,6 +47,6 @@ CREATE TABLE `oauth_client_details` (
-- ----------------------------
-- Records of oauth_client_details
-- ----------------------------
INSERT INTO `oauth_client_details` VALUES ('471037a0c1be4df99b40e3f84141cc56', 'web_app', NULL, 'spring-microservice-exam-secret', '$2a$10$S84wOzmAw4wqYBzAqNtmPOx1ZRWdDl9omm/W8T1hhW8S9EK2u57xG', 'read,write', 'password,authorization_code,refresh_token,implicit', NULL, NULL, '3600', '21600', NULL, NULL, 'admin', '2019-03-30 23:43:07', 'admin', '2019-03-31 15:06:55', '0', 'EXAM');
INSERT INTO `oauth_client_details` VALUES ('471037a0c1be4df99b40e3f84141cc56', 'web_app', NULL, 'spring-microservice-exam-secret', '$2a$10$eDZwlN8oMoExblOCDDLc2OIS1JFxYnn3iWScWOkvT9UommlXmBK.6', 'read,write', 'password,authorization_code,refresh_token,implicit', NULL, NULL, '3600', '21600', NULL, NULL, 'admin', '2019-03-30 23:43:07', 'admin', '2019-04-06 23:39:29', '0', 'EXAM');
SET FOREIGN_KEY_CHECKS = 1;
doc/deploy/mysql/microservice-exam.sql
......@@ -11,7 +11,7 @@
Target Server Version : 50710
File Encoding : 65001
Date: 31/03/2019 15:16:57
Date: 07/04/2019 21:11:20
*/
SET NAMES utf8mb4;
......@@ -40,25 +40,6 @@ CREATE TABLE `answer` (
) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
-- ----------------------------
-- Records of answer
-- ----------------------------
INSERT INTO `answer` VALUES ('018021d041964d269d2b421a007d722f', 'abd4dbe19faf4f7f8ff239b63acc5d34', 'fad663ea371f4250a81332bd3a346739', '220b2cece0834f359ab76ec42a888135', NULL, '4d654c576f534f349278806b046608d6', 'C', 'student', '2019-02-28 15:33:35', 'student', '2019-02-28 15:34:24', '0', 'EXAM');
INSERT INTO `answer` VALUES ('1b4d8379aeaf449dac176d04298d2afd', 'abd4dbe19faf4f7f8ff239b63acc5d34', 'fad663ea371f4250a81332bd3a346739', 'dc74d4c766a04895a10bc541aff40625', NULL, '4d654c576f534f349278806b046608d6', 'C', 'student', '2019-03-21 10:58:15', 'student', '2019-03-21 10:58:54', '0', 'EXAM');
INSERT INTO `answer` VALUES ('1ecd8bb1fbc54952a68e9dea55db045b', 'abd4dbe19faf4f7f8ff239b63acc5d34', 'fad663ea371f4250a81332bd3a346739', 'ec280a56142f4ea8b5cdbac774f9609a', NULL, '1a934e62942640459b3a66c05f6c09b2', 'D', 'student', '2019-03-11 20:51:28', 'student', '2019-03-11 20:51:28', '0', 'EXAM');
INSERT INTO `answer` VALUES ('3f0d4789b373404b98b78c60e83baaf2', '4f3ffc2924f740df93641063559842a6', 'fad663ea371f4250a81332bd3a346739', 'f3eb89b5c12941399466676a7341bf3a', NULL, 'e34926a94a4a4895817d7ea78aa63012', 'C', 'tangyi7', '2019-01-22 17:27:27', 'tangyi7', '2019-01-22 17:37:18', '0', 'EXAM');
INSERT INTO `answer` VALUES ('44fdf520d4f44ab0ad75bee7e2a16c0f', '4f3ffc2924f740df93641063559842a6', 'fad663ea371f4250a81332bd3a346739', 'f3eb89b5c12941399466676a7341bf3a', NULL, '1a934e62942640459b3a66c05f6c09b2', 'C', 'tangyi7', '2019-01-22 17:29:17', 'tangyi7', '2019-01-22 17:29:17', '0', 'EXAM');
INSERT INTO `answer` VALUES ('4cdbae2561414ee08c2fcab2a956e285', 'abd4dbe19faf4f7f8ff239b63acc5d34', 'fad663ea371f4250a81332bd3a346739', '4cd0985b7a0c4f23b405cdfaf89645f3', NULL, '4d654c576f534f349278806b046608d6', 'B', 'student', '2019-03-21 11:00:49', 'student', '2019-03-21 11:10:42', '0', 'EXAM');
INSERT INTO `answer` VALUES ('5befebfb0d6848e98e5caf60f15a505e', 'abd4dbe19faf4f7f8ff239b63acc5d34', 'fad663ea371f4250a81332bd3a346739', '220b2cece0834f359ab76ec42a888135', NULL, 'e34926a94a4a4895817d7ea78aa63012', 'C', 'student', '2019-02-28 15:33:33', 'student', '2019-02-28 15:34:22', '0', 'EXAM');
INSERT INTO `answer` VALUES ('5ebdf21e20e34b93b9b652d1f33d6cfb', 'abd4dbe19faf4f7f8ff239b63acc5d34', 'fad663ea371f4250a81332bd3a346739', 'dc74d4c766a04895a10bc541aff40625', NULL, '1a934e62942640459b3a66c05f6c09b2', 'D', 'student', '2019-03-21 10:58:18', 'student', '2019-03-21 10:58:18', '0', 'EXAM');
INSERT INTO `answer` VALUES ('66cc59a93acd4f80b30c5019569bc295', 'abd4dbe19faf4f7f8ff239b63acc5d34', 'fad663ea371f4250a81332bd3a346739', '4cd0985b7a0c4f23b405cdfaf89645f3', NULL, '1a934e62942640459b3a66c05f6c09b2', 'C', 'student', '2019-03-21 11:00:52', 'student', '2019-03-21 11:00:52', '0', 'EXAM');
INSERT INTO `answer` VALUES ('6d397fb7294b4ec2acaf52185ff082f9', 'abd4dbe19faf4f7f8ff239b63acc5d34', 'fad663ea371f4250a81332bd3a346739', 'ec280a56142f4ea8b5cdbac774f9609a', NULL, '4d654c576f534f349278806b046608d6', 'B', 'student', '2019-03-11 20:51:26', 'student', '2019-03-11 20:51:26', '0', 'EXAM');
INSERT INTO `answer` VALUES ('87de193973324cfdbc44938a9e897234', 'abd4dbe19faf4f7f8ff239b63acc5d34', 'fad663ea371f4250a81332bd3a346739', 'ec280a56142f4ea8b5cdbac774f9609a', NULL, 'e34926a94a4a4895817d7ea78aa63012', 'C', 'student', '2019-03-11 20:50:34', 'student', '2019-03-11 20:51:23', '0', 'EXAM');
INSERT INTO `answer` VALUES ('a0b32648aa3e48b29d1ac31513f50369', 'abd4dbe19faf4f7f8ff239b63acc5d34', 'fad663ea371f4250a81332bd3a346739', '4cd0985b7a0c4f23b405cdfaf89645f3', NULL, 'e34926a94a4a4895817d7ea78aa63012', 'B', 'student', '2019-03-21 11:00:48', 'student', '2019-03-21 11:10:39', '0', 'EXAM');
INSERT INTO `answer` VALUES ('db0c4b3b81c445e2a31d957f95cfac4a', 'abd4dbe19faf4f7f8ff239b63acc5d34', 'fad663ea371f4250a81332bd3a346739', 'dc74d4c766a04895a10bc541aff40625', NULL, 'e34926a94a4a4895817d7ea78aa63012', 'B', 'student', '2019-03-21 10:58:13', 'student', '2019-03-21 10:58:52', '0', 'EXAM');
INSERT INTO `answer` VALUES ('ee2a02497a04429d956174f099a2ddd0', 'abd4dbe19faf4f7f8ff239b63acc5d34', 'fad663ea371f4250a81332bd3a346739', '220b2cece0834f359ab76ec42a888135', NULL, '1a934e62942640459b3a66c05f6c09b2', 'C', 'student', '2019-02-28 15:33:38', 'student', '2019-02-28 15:34:25', '0', 'EXAM');
INSERT INTO `answer` VALUES ('fe49216810e846c8aeb70d08cdd564b6', '4f3ffc2924f740df93641063559842a6', 'fad663ea371f4250a81332bd3a346739', 'f3eb89b5c12941399466676a7341bf3a', NULL, '4d654c576f534f349278806b046608d6', 'C', 'tangyi7', '2019-01-22 17:29:07', 'tangyi7', '2019-01-22 17:37:21', '0', 'EXAM');
-- ----------------------------
-- Table structure for course
-- ----------------------------
DROP TABLE IF EXISTS `course`;
......@@ -84,10 +65,10 @@ CREATE TABLE `course` (
INSERT INTO `course` VALUES ('6dcccd4639bc49b88810be1d30a77f92', '测试课程', '测试学院', '测试专业', '陈老师', '测试课程', 'admin', '2018-11-12 22:31:28', 'admin', '2019-03-29 11:53:28', '0', 'EXAM');
-- ----------------------------
-- Table structure for exam_recode
-- Table structure for exam_record
-- ----------------------------
DROP TABLE IF EXISTS `exam_recode`;
CREATE TABLE `exam_recode` (
DROP TABLE IF EXISTS `exam_record`;
CREATE TABLE `exam_record` (
`id` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
`user_id` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '用户id',
`examination_id` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '考试id',
......@@ -108,21 +89,6 @@ CREATE TABLE `exam_recode` (
) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
-- ----------------------------
-- Records of exam_recode
-- ----------------------------
INSERT INTO `exam_recode` VALUES ('220b2cece0834f359ab76ec42a888135', 'abd4dbe19faf4f7f8ff239b63acc5d34', 'fad663ea371f4250a81332bd3a346739', '四川省2016年普通高考适应性测试文综历史试题', '6dcccd4639bc49b88810be1d30a77f92', '2019-02-28 15:31:54', '2019-02-28 15:34:28', '0', '0', '3', 'student', '2019-02-28 15:31:54', 'student', '2019-02-28 15:34:28', '0', 'EXAM');
INSERT INTO `exam_recode` VALUES ('4cd0985b7a0c4f23b405cdfaf89645f3', 'abd4dbe19faf4f7f8ff239b63acc5d34', 'fad663ea371f4250a81332bd3a346739', '四川省2016年普通高考适应性测试文综历史试题', '6dcccd4639bc49b88810be1d30a77f92', '2019-03-21 11:00:39', '2019-03-21 11:10:45', '8', '2', '1', 'student', '2019-03-21 11:00:39', 'student', '2019-03-21 11:10:45', '0', 'EXAM');
INSERT INTO `exam_recode` VALUES ('5d66f9627eac48a9a04e875671e4506f', 'abd4dbe19faf4f7f8ff239b63acc5d34', '4f9ced28ffe64fcea57a7367e9fd4c0c', '离散数学', '6dcccd4639bc49b88810be1d30a77f92', '2019-03-11 20:57:03', NULL, NULL, NULL, NULL, 'student', '2019-03-11 20:57:03', 'student', '2019-03-11 20:57:03', '0', 'EXAM');
INSERT INTO `exam_recode` VALUES ('7623b8694042405e9bacb767ced1fd20', 'abd4dbe19faf4f7f8ff239b63acc5d34', '4f9ced28ffe64fcea57a7367e9fd4c0c', '离散数学', '6dcccd4639bc49b88810be1d30a77f92', '2019-03-11 20:57:57', NULL, NULL, NULL, NULL, 'student', '2019-03-11 20:57:57', 'student', '2019-03-11 20:57:57', '0', 'EXAM');
INSERT INTO `exam_recode` VALUES ('862b7fb039b24925b3ec6f90a5f2dd0e', '2', 'fad663ea371f4250a81332bd3a346739', '四川省2016年普通高考适应性测试文综历史试题', '6dcccd4639bc49b88810be1d30a77f92', '2019-02-28 15:18:58', NULL, NULL, NULL, NULL, 'admin', '2019-02-28 15:18:58', 'admin', '2019-02-28 15:18:58', '0', 'EXAM');
INSERT INTO `exam_recode` VALUES ('8fb83f4b3f844ff1a9022deaedec2f47', 'abd4dbe19faf4f7f8ff239b63acc5d34', '4f9ced28ffe64fcea57a7367e9fd4c0c', '离散数学', '6dcccd4639bc49b88810be1d30a77f92', '2019-03-21 10:57:04', NULL, NULL, NULL, NULL, 'student', '2019-03-21 10:57:04', 'student', '2019-03-21 10:57:04', '0', 'EXAM');
INSERT INTO `exam_recode` VALUES ('dc74d4c766a04895a10bc541aff40625', 'abd4dbe19faf4f7f8ff239b63acc5d34', 'fad663ea371f4250a81332bd3a346739', '四川省2016年普通高考适应性测试文综历史试题', '6dcccd4639bc49b88810be1d30a77f92', '2019-03-21 10:58:10', '2019-03-21 10:58:58', '4', '1', '2', 'student', '2019-03-21 10:58:10', 'student', '2019-03-21 10:58:58', '0', 'EXAM');
INSERT INTO `exam_recode` VALUES ('ec280a56142f4ea8b5cdbac774f9609a', 'abd4dbe19faf4f7f8ff239b63acc5d34', 'fad663ea371f4250a81332bd3a346739', '四川省2016年普通高考适应性测试文综历史试题', '6dcccd4639bc49b88810be1d30a77f92', '2019-03-11 20:49:27', '2019-03-11 20:51:31', '4', '1', '2', 'student', '2019-03-11 20:49:27', 'student', '2019-03-11 20:51:31', '0', 'EXAM');
INSERT INTO `exam_recode` VALUES ('ec925a93ac9b4502b72973c7c12a66fe', 'abd4dbe19faf4f7f8ff239b63acc5d34', '4f9ced28ffe64fcea57a7367e9fd4c0c', '离散数学', '6dcccd4639bc49b88810be1d30a77f92', '2019-03-07 10:15:55', NULL, NULL, NULL, NULL, 'student', '2019-03-07 10:15:55', 'student', '2019-03-07 10:15:55', '0', 'EXAM');
INSERT INTO `exam_recode` VALUES ('f3eb89b5c12941399466676a7341bf3a', '4f3ffc2924f740df93641063559842a6', 'fad663ea371f4250a81332bd3a346739', '四川省2016年普通高考适应性测试文综历史试题', NULL, '2019-01-22 17:23:57', '2019-01-22 17:37:24', '0', '0', '3', 'tangyi7', '2019-01-22 17:23:57', 'tangyi7', '2019-01-22 17:37:24', '0', 'EXAM');
INSERT INTO `exam_recode` VALUES ('f586d49aaf2c4a82b8de43b659d6c908', '2', '4f9ced28ffe64fcea57a7367e9fd4c0c', '离散数学', '6dcccd4639bc49b88810be1d30a77f92', '2019-02-28 14:50:24', NULL, NULL, NULL, NULL, 'admin', '2019-02-28 14:50:24', 'admin', '2019-02-28 14:50:24', '0', 'EXAM');
-- ----------------------------
-- Table structure for examination
-- ----------------------------
DROP TABLE IF EXISTS `examination`;
......@@ -158,7 +124,7 @@ CREATE TABLE `examination` (
INSERT INTO `examination` VALUES ('4f9ced28ffe64fcea57a7367e9fd4c0c', '离散数学', '2', '离散数学', '2019-01-03 00:00', '2019-01-11 00:00', '', '100', '0', '1', 'group1/M00/00/00/wKgAX1x3gGqABz6cAAZyO2yzEwA450.jpg', 'da4b5623e9754abbb07320d8def18fe7', '信息学院', '软件工程', '6dcccd4639bc49b88810be1d30a77f92', '离散数学练习', 'admin', '2019-01-13 20:16:36', NULL, '2019-03-20 22:09:23', '0', 'EXAM');
INSERT INTO `examination` VALUES ('b5990bc1c48d49fcb0023de51772c309', '数学期末考试', '0', '期末考试', '2019-01-22 17:00', '2019-01-22 23:00', '', '150', '2', '1', 'group1/M00/00/00/wKgAX1x3gHWAa82wAAArtzxOXJ4599.jpg', '60df2d550bd9453a943122033a27fe72', '应用数学', '应用数学', '6dcccd4639bc49b88810be1d30a77f92', '期末考试', 'admin', '2018-11-20 22:48:40', NULL, '2019-03-18 14:09:49', '0', 'EXAM');
INSERT INTO `examination` VALUES ('f051f54621fc4812b929a7777a701712', '语文考试', '0', '语文考试', '2019-01-22 17:00', '2019-01-22 23:00', '', '150', '2', '1', 'group1/M00/00/00/wKgAX1x3gIOAIVzXAABrb92CxLk678.jpg', '45d2ac58eb21436692e8cdbdd64291dd', '中文', '中文', '6dcccd4639bc49b88810be1d30a77f92', '语文考试', 'admin', '2018-11-20 22:50:55', 'admin', '2019-02-28 14:33:27', '0', 'EXAM');
INSERT INTO `examination` VALUES ('fad663ea371f4250a81332bd3a346739', '四川省2016年普通高考适应性测试文综历史试题', '0', '文综历史试题', '2019-03-21 10:30', '2019-03-21 12:30', '', '100', '3', '0', 'group1/M00/00/00/wKgAX1x3f52AIE4IAADGq28ys0g361.jpg', 'a178c7b221524a89b44e884d8e3172cf', '文综历史试题', '文综历史试题', '6dcccd4639bc49b88810be1d30a77f92', '文综历史试题', 'admin', '2018-11-12 20:25:38', 'admin', '2019-03-06 13:57:13', '0', 'EXAM');
INSERT INTO `examination` VALUES ('fad663ea371f4250a81332bd3a346739', '四川省2016年普通高考适应性测试文综历史试题', '0', '文综历史试题', '2019-04-07 10:30', '2019-04-07 20:30', '', '100', '3', '0', 'group1/M00/00/00/wKgAX1x3f52AIE4IAADGq28ys0g361.jpg', 'a178c7b221524a89b44e884d8e3172cf', '文综历史试题', '文综历史试题', '6dcccd4639bc49b88810be1d30a77f92', '文综历史试题', 'admin', '2018-11-12 20:25:38', 'admin', '2019-03-06 13:57:13', '0', 'EXAM');
-- ----------------------------
-- Table structure for incorrect_answer
......@@ -182,30 +148,6 @@ CREATE TABLE `incorrect_answer` (
) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
-- ----------------------------
-- Records of incorrect_answer
-- ----------------------------
INSERT INTO `incorrect_answer` VALUES ('010fc8da1a7148e8bb7e616d2d5554b8', 'abd4dbe19faf4f7f8ff239b63acc5d34', 'fad663ea371f4250a81332bd3a346739', '220b2cece0834f359ab76ec42a888135', 'e34926a94a4a4895817d7ea78aa63012', '1', 'C', 'student', '2019-02-28 15:34:28', 'student', '2019-02-28 15:34:28', '0', 'EXAM');
INSERT INTO `incorrect_answer` VALUES ('2cf63de571e94c6b87f0672131275abb', 'abd4dbe19faf4f7f8ff239b63acc5d34', 'fad663ea371f4250a81332bd3a346739', 'dc74d4c766a04895a10bc541aff40625', '1a934e62942640459b3a66c05f6c09b2', '3', 'D', 'student', '2019-03-21 10:58:58', 'student', '2019-03-21 10:58:58', '0', 'EXAM');
INSERT INTO `incorrect_answer` VALUES ('3bb90efb9a3e4272a93df258da2f5575', 'abd4dbe19faf4f7f8ff239b63acc5d34', 'fad663ea371f4250a81332bd3a346739', 'ec280a56142f4ea8b5cdbac774f9609a', 'e34926a94a4a4895817d7ea78aa63012', '1', 'C', 'student', '2019-03-11 20:51:31', 'student', '2019-03-11 20:51:31', '0', 'EXAM');
INSERT INTO `incorrect_answer` VALUES ('423051d89b4449539619833af244c429', 'abd4dbe19faf4f7f8ff239b63acc5d34', 'fad663ea371f4250a81332bd3a346739', 'dc74d4c766a04895a10bc541aff40625', '1a934e62942640459b3a66c05f6c09b2', '3', 'D', 'student', '2019-03-21 10:58:26', 'student', '2019-03-21 10:58:26', '1', 'EXAM');
INSERT INTO `incorrect_answer` VALUES ('474736033b184374ad9c6046b2352f37', '4f3ffc2924f740df93641063559842a6', 'fad663ea371f4250a81332bd3a346739', 'f3eb89b5c12941399466676a7341bf3a', '4d654c576f534f349278806b046608d6', '2', 'C', 'tangyi7', '2019-01-22 17:37:24', 'tangyi7', '2019-01-22 17:37:24', '0', 'EXAM');
INSERT INTO `incorrect_answer` VALUES ('49f2f2313b5542379bb81cdc3c1e4cc8', '4f3ffc2924f740df93641063559842a6', 'fad663ea371f4250a81332bd3a346739', 'f3eb89b5c12941399466676a7341bf3a', '1a934e62942640459b3a66c05f6c09b2', '3', 'C', 'tangyi7', '2019-01-22 17:36:02', 'tangyi7', '2019-01-22 17:36:02', '1', 'EXAM');
INSERT INTO `incorrect_answer` VALUES ('57170973bf444ddf81db582850fd7ada', 'abd4dbe19faf4f7f8ff239b63acc5d34', 'fad663ea371f4250a81332bd3a346739', '4cd0985b7a0c4f23b405cdfaf89645f3', '1a934e62942640459b3a66c05f6c09b2', '3', 'C', 'student', '2019-03-21 11:10:45', 'student', '2019-03-21 11:10:45', '0', 'EXAM');
INSERT INTO `incorrect_answer` VALUES ('62ddd8c4d5134c2aa69a16483810f81e', '4f3ffc2924f740df93641063559842a6', 'fad663ea371f4250a81332bd3a346739', 'f3eb89b5c12941399466676a7341bf3a', 'e34926a94a4a4895817d7ea78aa63012', '1', 'C', 'tangyi7', '2019-01-22 17:36:13', 'tangyi7', '2019-01-22 17:36:13', '1', 'EXAM');
INSERT INTO `incorrect_answer` VALUES ('6c2c1eea83204e8fb617cadd7ce346b2', 'abd4dbe19faf4f7f8ff239b63acc5d34', 'fad663ea371f4250a81332bd3a346739', '220b2cece0834f359ab76ec42a888135', '1a934e62942640459b3a66c05f6c09b2', '3', 'C', 'student', '2019-02-28 15:34:28', 'student', '2019-02-28 15:34:28', '0', 'EXAM');
INSERT INTO `incorrect_answer` VALUES ('93d3d503daba4eefbc1c3d5c96745504', 'abd4dbe19faf4f7f8ff239b63acc5d34', 'fad663ea371f4250a81332bd3a346739', 'ec280a56142f4ea8b5cdbac774f9609a', '1a934e62942640459b3a66c05f6c09b2', '3', 'D', 'student', '2019-03-11 20:51:31', 'student', '2019-03-11 20:51:31', '0', 'EXAM');
INSERT INTO `incorrect_answer` VALUES ('94e330c215d6497fabab39d0a1520a4f', '4f3ffc2924f740df93641063559842a6', 'fad663ea371f4250a81332bd3a346739', 'f3eb89b5c12941399466676a7341bf3a', '1a934e62942640459b3a66c05f6c09b2', '3', 'C', 'tangyi7', '2019-01-22 17:37:24', 'tangyi7', '2019-01-22 17:37:24', '0', 'EXAM');
INSERT INTO `incorrect_answer` VALUES ('9cfc3052ae3c41028120c45f935664db', '4f3ffc2924f740df93641063559842a6', 'fad663ea371f4250a81332bd3a346739', 'f3eb89b5c12941399466676a7341bf3a', 'e34926a94a4a4895817d7ea78aa63012', '1', 'C', 'tangyi7', '2019-01-22 17:37:24', 'tangyi7', '2019-01-22 17:37:24', '0', 'EXAM');
INSERT INTO `incorrect_answer` VALUES ('9e4171c00be24258a1342177a2047e4a', 'abd4dbe19faf4f7f8ff239b63acc5d34', 'fad663ea371f4250a81332bd3a346739', '4cd0985b7a0c4f23b405cdfaf89645f3', '4d654c576f534f349278806b046608d6', '2', 'D', 'student', '2019-03-21 11:00:53', 'student', '2019-03-21 11:00:53', '1', 'EXAM');
INSERT INTO `incorrect_answer` VALUES ('a50d88d7049d4baaaa07b42d03f2bbd5', 'abd4dbe19faf4f7f8ff239b63acc5d34', 'fad663ea371f4250a81332bd3a346739', 'dc74d4c766a04895a10bc541aff40625', '4d654c576f534f349278806b046608d6', '2', 'C', 'student', '2019-03-21 10:58:26', 'student', '2019-03-21 10:58:26', '1', 'EXAM');
INSERT INTO `incorrect_answer` VALUES ('a7b1b40205b24abc9d56d9ab96de7acc', '4f3ffc2924f740df93641063559842a6', 'fad663ea371f4250a81332bd3a346739', 'f3eb89b5c12941399466676a7341bf3a', '1a934e62942640459b3a66c05f6c09b2', '3', 'C', 'tangyi7', '2019-01-22 17:36:13', 'tangyi7', '2019-01-22 17:36:13', '1', 'EXAM');
INSERT INTO `incorrect_answer` VALUES ('a91d3197f6bf46db86955704568b3bcb', 'abd4dbe19faf4f7f8ff239b63acc5d34', 'fad663ea371f4250a81332bd3a346739', 'dc74d4c766a04895a10bc541aff40625', '4d654c576f534f349278806b046608d6', '2', 'C', 'student', '2019-03-21 10:58:58', 'student', '2019-03-21 10:58:58', '0', 'EXAM');
INSERT INTO `incorrect_answer` VALUES ('b18878783a63480f9b6ceb13e63854af', 'abd4dbe19faf4f7f8ff239b63acc5d34', 'fad663ea371f4250a81332bd3a346739', '4cd0985b7a0c4f23b405cdfaf89645f3', '1a934e62942640459b3a66c05f6c09b2', '3', 'C', 'student', '2019-03-21 11:00:53', 'student', '2019-03-21 11:00:53', '1', 'EXAM');
INSERT INTO `incorrect_answer` VALUES ('ce9469020c2a4e7282fb5587475233a3', 'abd4dbe19faf4f7f8ff239b63acc5d34', 'fad663ea371f4250a81332bd3a346739', '220b2cece0834f359ab76ec42a888135', '1a934e62942640459b3a66c05f6c09b2', '3', 'C', 'student', '2019-02-28 15:33:47', 'student', '2019-02-28 15:33:47', '1', 'EXAM');
INSERT INTO `incorrect_answer` VALUES ('cf686f2a9eba4a02a01c222bb31a5767', '4f3ffc2924f740df93641063559842a6', 'fad663ea371f4250a81332bd3a346739', 'f3eb89b5c12941399466676a7341bf3a', '1a934e62942640459b3a66c05f6c09b2', '3', 'C', 'tangyi7', '2019-01-22 17:29:57', 'tangyi7', '2019-01-22 17:29:57', '1', 'EXAM');
INSERT INTO `incorrect_answer` VALUES ('f6bdf67b920744f7bb13f2551bb7469c', 'abd4dbe19faf4f7f8ff239b63acc5d34', 'fad663ea371f4250a81332bd3a346739', '220b2cece0834f359ab76ec42a888135', '4d654c576f534f349278806b046608d6', '2', 'C', 'student', '2019-02-28 15:34:28', 'student', '2019-02-28 15:34:28', '0', 'EXAM');
-- ----------------------------
-- Table structure for knowledge
-- ----------------------------
DROP TABLE IF EXISTS `knowledge`;
......@@ -225,11 +167,6 @@ CREATE TABLE `knowledge` (
) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
-- ----------------------------
-- Records of knowledge
-- ----------------------------
INSERT INTO `knowledge` VALUES ('d81ef4c730b6460f98a7898cdba8902b', '历史学习资料', '历史学习资料', '52f17901c5504c608ebb76c8202ca2eb', '1', 'admin', '2019-01-01 21:02:00', NULL, '2019-03-20 22:09:44', '0', 'EXAM');
-- ----------------------------
-- Table structure for subject
-- ----------------------------
DROP TABLE IF EXISTS `subject`;
......@@ -262,24 +199,9 @@ CREATE TABLE `subject` (
-- ----------------------------
-- Records of subject
-- ----------------------------
INSERT INTO `subject` VALUES ('157a7262a4534c7ba1a3bca970a4a59b', 'b5990bc1c48d49fcb0023de51772c309', '2', '2', '0', '', '2', '2', '2', '2', '', '', 'B', '2', '2', '2', 'admin', '2019-01-23 20:11:12', 'admin', '2019-01-23 20:11:12', '0', 'EXAM');
INSERT INTO `subject` VALUES ('185b6875ef694febadba8797fbd0ad29', 'b5990bc1c48d49fcb0023de51772c309', NULL, '232222', '0', '', '323fffff', '32', '32', '323', '', '', 'D', '5', '323', '2', 'admin', '2018-12-09 20:55:31', 'admin', '2019-01-23 20:09:00', '0', 'EXAM');
INSERT INTO `subject` VALUES ('1a934e62942640459b3a66c05f6c09b2', 'fad663ea371f4250a81332bd3a346739', '3', '唐前期的政治人物多为北方人，北宋时政治人物多出生于江西、福建、苏南等地。这一变化主要反映了', '0', '', '官僚集团重视本地域人才', '南北方士人志向差异', '科举制改变人才地域分布', '政治中心转移到南方', '', '', 'B', '4', '政治中心转移到南方', '2', 'admin', '2018-12-09 21:07:20', 'admin', '2018-12-29 20:32:20', '0', 'EXAM');
INSERT INTO `subject` VALUES ('235a2d7a8e9b469cbfdf0b86a02c9ae6', '4f9ced28ffe64fcea57a7367e9fd4c0c', '2', '2', '0', '', '2', '2', '2', '2', '', '', 'B', '2', '2', '2', 'admin', '2019-01-23 20:23:01', 'admin', '2019-01-23 20:23:01', '1', 'EXAM');
INSERT INTO `subject` VALUES ('2954ff84207542b395d2471e166cb414', 'fad663ea371f4250a81332bd3a346739', NULL, '1', '0', '', '1', '1', '1', '1', '', '', 'D', '5', '1', '2', 'admin', '2018-12-09 20:27:59', 'admin', '2018-12-09 20:27:59', '1', 'EXAM');
INSERT INTO `subject` VALUES ('4b388583cfd84a2eaddff902a7c444bd', '4f9ced28ffe64fcea57a7367e9fd4c0c', '3', '3', '0', '', '3', '3', '3', '3', '', '', 'B', '3', '3', '2', 'admin', '2019-01-23 20:24:20', 'admin', '2019-01-23 20:24:20', '1', 'EXAM');
INSERT INTO `subject` VALUES ('4d654c576f534f349278806b046608d6', 'fad663ea371f4250a81332bd3a346739', '2', '公元前212年，秦始皇坑杀“术士”，长子扶苏劝谏说：“远方黔首未集，诸生皆诵 法孔子，今上皆重法绳之，臣恐天下不安，唯上察之”。这反映当时', '0', '', '统一进程曲折', '地方治理不畅', '始皇灭儒崇法', '儒学影响较大', '', '', 'B', '4', '公元前212年，秦始皇坑杀“术士”，长子扶苏劝谏说：“远方黔首未集，诸生皆诵 法孔子，今上皆重法绳之，臣恐天下不安，唯上察之”。这反映当时', '4', 'admin', '2018-12-09 21:07:07', 'admin', '2019-01-01 14:42:12', '0', 'EXAM');
INSERT INTO `subject` VALUES ('6a2d2c870e884ffc8130003accb22eb8', '4f9ced28ffe64fcea57a7367e9fd4c0c', '8', '8', '0', '', '8', '8', '8', '8', '', '', 'B', '8', '8', '2', 'admin', '2019-01-23 20:46:29', 'admin', '2019-01-23 20:46:29', '1', 'EXAM');
INSERT INTO `subject` VALUES ('88040b225de84522ad88e1c9196a1ea5', '4f9ced28ffe64fcea57a7367e9fd4c0c', NULL, '2', '0', '', '2', '2', '2', '2', '', '', 'B', '2', '2', '2', 'admin', '2019-01-23 20:48:33', 'admin', '2019-01-23 20:48:33', '1', 'EXAM');
INSERT INTO `subject` VALUES ('a53b9ab6aa904d669be83daf17b33156', 'f051f54621fc4812b929a7777a701712', '44', '44', '0', '', '44', '44', '44', '44', '', '', 'B', '44', '44', '2', 'admin', '2019-01-23 20:35:13', 'admin', '2019-01-23 20:35:13', '0', 'EXAM');
INSERT INTO `subject` VALUES ('ac2787a9c86e4ca39d17e53348d6fccb', 'f051f54621fc4812b929a7777a701712', NULL, '33', '0', '', '33', '33', '33', '33', '', '', 'D', '5', '333', '2', 'admin', '2018-12-09 20:55:52', 'admin', '2019-01-07 22:11:19', '0', 'EXAM');
INSERT INTO `subject` VALUES ('b5d4f37380994d49ba57c508de0b5454', '4f9ced28ffe64fcea57a7367e9fd4c0c', '6', '6', '0', '', '6', '6', '6', '6', '', '', 'B', '6', '6', '2', 'admin', '2019-01-23 20:31:56', 'admin', '2019-01-23 20:31:56', '1', 'EXAM');
INSERT INTO `subject` VALUES ('c48ef0b956604af0830d813908898b9b', '4f9ced28ffe64fcea57a7367e9fd4c0c', '5', '5', '0', '', '5', '5', '5', '5', '', '', 'B', '5', '5', '2', 'admin', '2019-01-23 20:27:35', 'admin', '2019-01-23 20:27:35', '1', 'EXAM');
INSERT INTO `subject` VALUES ('cf52d0ac4ca14e7695a92b7aaacbb0d7', '4f9ced28ffe64fcea57a7367e9fd4c0c', '7', '7', '0', '', '7', '7', '7', '7', '', '', 'C', '7', '7', '2', 'admin', '2019-01-23 20:34:47', 'admin', '2019-01-23 20:34:47', '1', 'EXAM');
INSERT INTO `subject` VALUES ('e34926a94a4a4895817d7ea78aa63012', 'fad663ea371f4250a81332bd3a346739', '1', '《小雅·鹿鸣》本是西周贵族宣扬宴飨之仪的乐歌，后扩散到民间，在乡人宴会上也可传唱。这表明西周时期', '0', '', '周人生活较为富足', '礼乐文明得到广泛认同', '乡人社会地位提高', '贵族奢靡之风波及民间', '', '', 'B', '4', '材料涉及西周贵族宣扬宴飨之仪的乐歌扩散到民间，并不能由此说明周人生活较为富足，故A项错误；据材料“西周贵族宣扬宴飨之仪的乐歌，后扩散到民间，在乡人宴会上也可传唱”可知礼乐文明得到广泛认同，故B项正确；仅凭材料宴飨之仪的乐歌的扩散不足以说明乡人社会地位提高，故C项错误；材料涉及贵族宴飨之仪的乐歌的扩散，并未涉及贵族奢靡之风，故D项错误。', '2', 'admin', '2018-12-09 20:30:07', 'admin', '2018-12-29 20:50:12', '0', 'EXAM');
INSERT INTO `subject` VALUES ('e73e1cf4feaf47449ce982376afcdb03', 'fad663ea371f4250a81332bd3a346739', NULL, '232222', '0', '', '323fffff', '32', '32', '323', '', '', 'D', '5', '323', '2', 'admin', '2018-12-09 20:28:15', 'admin', '2018-12-09 20:28:15', '1', 'EXAM');
INSERT INTO `subject` VALUES ('ea1a81331e0b4ecfa39cb59813d11fa5', '4f9ced28ffe64fcea57a7367e9fd4c0c', '1', '测试', '0', '', '测试', '测试', '测试', '测试', '', '', 'A', '2', '测试', '2', 'admin', '2019-01-14 20:32:54', 'admin', '2019-01-14 20:32:54', '1', 'EXAM');
INSERT INTO `subject` VALUES ('f1856276d261426782dfd7793a9efdd0', '4f9ced28ffe64fcea57a7367e9fd4c0c', '4', '4', '0', '', '4', '4', '4', '4', '', '', 'B', '4', '4', '2', 'admin', '2019-01-23 20:25:43', 'admin', '2019-01-23 20:25:43', '1', 'EXAM');
-- ----------------------------
-- Table structure for subject_bank
......@@ -312,16 +234,6 @@ CREATE TABLE `subject_bank` (
) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '题库表' ROW_FORMAT = Dynamic;
-- ----------------------------
-- Records of subject_bank
-- ----------------------------
INSERT INTO `subject_bank` VALUES ('2612f127f8e74736a086e9ec18850852', '700556b5becd4091821644a5288d489c', NULL, '232222', '0', '', '323fffff', '32', '32', '323', '', '', '2', '323', '323', '2', 'admin', '2018-12-09 14:38:47', 'admin', '2018-12-09 14:49:43', '1', 'EXAM');
INSERT INTO `subject_bank` VALUES ('3600225f10114e40a07e4312d3f7f8ad', '700556b5becd4091821644a5288d489c', '1', '1', '0', '', '1', '1', '1', '1', '', '', 'B', '1444', '1', '2', 'admin', '2019-01-09 21:11:34', 'admin', '2019-03-20 22:21:07', '0', 'EXAM');
INSERT INTO `subject_bank` VALUES ('494fb828f270450690a82f23450f138f', '700556b5becd4091821644a5288d489c', '323', '23', '0', '', '323', '323', '323', '233', '', '', 'B', '323', '323', '2', 'admin', '2019-01-09 18:03:22', 'admin', '2019-01-09 18:03:22', '1', 'EXAM');
INSERT INTO `subject_bank` VALUES ('aeff7c505e374cbdbcecf79e7a587ddd', '', '1', '33', '0', '', '33', '33', '33', '33', '', '', '3', '4', '333', '4', 'admin', '2018-12-09 14:47:02', 'admin', '2019-01-09 17:45:30', '1', 'EXAM');
INSERT INTO `subject_bank` VALUES ('b1058acf24184bfd8c85c61d59dfdfd0', 'c664646337c345ac8a91e3b024ded8bb', NULL, '操作系统', '0', '', '操作系统', '操作系统', '操作系统', '操作系统', '', '', '1', '操作系统', '操作系统', '2', 'admin', '2018-12-09 20:26:59', 'admin', '2018-12-09 20:27:05', '1', 'EXAM');
INSERT INTO `subject_bank` VALUES ('f8cf3298c59045929c4c108251c66eb7', 'c664646337c345ac8a91e3b024ded8bb', NULL, '434', '0', '', '434', '434', '343', '4434', '', '', '2', '434', '434', '2', 'admin', '2018-12-09 20:27:32', 'admin', '2018-12-09 20:27:32', '1', 'EXAM');
-- ----------------------------
-- Table structure for subject_category
-- ----------------------------
DROP TABLE IF EXISTS `subject_category`;
......@@ -343,17 +255,11 @@ CREATE TABLE `subject_category` (
-- ----------------------------
-- Records of subject_category
-- ----------------------------
INSERT INTO `subject_category` VALUES ('047a8dd7d0614314a72750af9915ada0', '大学语文', NULL, '-1', '6', 'admin', '2018-12-06 20:37:38', 'admin', '2018-12-06 20:44:44', '0', 'EXAM');
INSERT INTO `subject_category` VALUES ('103cf01d23574c93b88a4aff2a350471', '四级', NULL, '412a93a6e1ac49a59e66da0721c183cd', '1', 'admin', '2018-12-09 20:32:08', 'admin', '2018-12-09 20:32:08', '1', 'EXAM');
INSERT INTO `subject_category` VALUES ('412a93a6e1ac49a59e66da0721c183cd', '大学英语', '大学英语', '-1', '2', 'admin', '2018-12-06 20:37:29', 'admin', '2018-12-06 20:44:25', '0', 'EXAM');
INSERT INTO `subject_category` VALUES ('577ff5e3a9b345e18d40e505cc631110', '国际金融', NULL, '-1', '5', 'admin', '2018-12-06 20:38:30', 'admin', '2018-12-06 20:44:40', '0', 'EXAM');
INSERT INTO `subject_category` VALUES ('700556b5becd4091821644a5288d489c', '架构基础', '4343434', 'aceeeb30b57f4d6982cd37682b5b7522', '1', 'admin', '2018-12-06 20:45:06', 'admin', '2019-03-06 13:59:01', '0', 'EXAM');
INSERT INTO `subject_category` VALUES ('9fdbb0add5354249a8a2d530bdd48d08', '高等数学', NULL, '-1', '3', 'admin', '2018-12-06 20:37:45', 'admin', '2018-12-06 20:44:31', '0', 'EXAM');
INSERT INTO `subject_category` VALUES ('aceeeb30b57f4d6982cd37682b5b7522', '计算机', NULL, '-1', '1', 'admin', '2018-12-06 20:41:44', 'admin', '2018-12-06 20:44:09', '0', 'EXAM');
INSERT INTO `subject_category` VALUES ('c664646337c345ac8a91e3b024ded8bb', '操作系统', NULL, 'aceeeb30b57f4d6982cd37682b5b7522', '2', 'admin', '2018-12-06 20:45:21', 'admin', '2018-12-06 20:45:21', '0', 'EXAM');
INSERT INTO `subject_category` VALUES ('caf8805fc7dc481b98d08ab13e5c5234', '数据库', NULL, 'aceeeb30b57f4d6982cd37682b5b7522', '3', 'admin', '2018-12-06 20:45:34', 'admin', '2018-12-06 20:45:34', '0', 'EXAM');
INSERT INTO `subject_category` VALUES ('dbc710d2af704f8b88488ae2b7e63d9e', '5555', NULL, '-1', '30', 'admin', '2018-12-09 21:04:56', 'admin', '2018-12-09 21:04:56', '1', 'EXAM');
INSERT INTO `subject_category` VALUES ('e11504263fef456997b24d7db0a86c4c', '六级', NULL, '412a93a6e1ac49a59e66da0721c183cd', '2', 'admin', '2018-12-09 20:32:16', 'admin', '2018-12-09 20:32:16', '1', 'EXAM');
INSERT INTO `subject_category` VALUES ('ffe1d4053ae4475bb39aacd6699d37c4', '应用数学', NULL, '-1', '4', 'admin', '2018-12-06 20:38:20', 'admin', '2018-12-06 20:44:36', '0', 'EXAM');
SET FOREIGN_KEY_CHECKS = 1;
doc/deploy/mysql/microservice-user.sql
......@@ -11,7 +11,7 @@
Target Server Version : 50710
File Encoding : 65001
Date: 31/03/2019 15:16:38
Date: 07/04/2019 21:11:30
*/
SET NAMES utf8mb4;
......@@ -40,28 +40,6 @@ CREATE TABLE `sys_attachment` (
) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
-- ----------------------------
-- Records of sys_attachment
-- ----------------------------
INSERT INTO `sys_attachment` VALUES ('10dbd80892f744bea618136bc4a8af7b', 'hdImg_624beb298a54895760501c95a368f2121539400955845.jpg', '65050', 'group1', 'group1/M00/00/00/wKgAX1yQer6Acs4vAAD-GneoEJo368.jpg', NULL, NULL, '1', NULL, '2019-03-19 13:14:42', NULL, '2019-03-19 13:14:42', '1', 'EXAM');
INSERT INTO `sys_attachment` VALUES ('129ac1e3627f4e78aa0e7b7038258270', '简易.jpg', '30366', 'group1', 'group1/M00/00/00/wKgAX1ySR9CAZrPBAAB2ngEqI1k658.jpg', NULL, NULL, '0', NULL, '2019-03-20 21:56:50', NULL, '2019-03-20 21:56:50', '1', 'EXAM');
INSERT INTO `sys_attachment` VALUES ('19a1ae447b2f4f2d92816028b14c296f', '简易.jpg', '30366', 'group1', 'group1/M00/00/00/wKgAX1yXnqmABxpuAAB2ngEqI1k023.jpg', NULL, NULL, '1', 'admin', '2019-03-24 23:08:38', 'admin', '2019-03-24 23:08:38', '0', 'EXAM');
INSERT INTO `sys_attachment` VALUES ('207d0d519efd40c682331a1163e3a6dc', 'hdImg_624beb298a54895760501c95a368f2121539400955845.jpg', '65050', 'group1', 'group1/M00/00/00/wKgAX1yQe72ARa01AAD-GneoEJo964.jpg', NULL, NULL, '1', NULL, '2019-03-19 13:18:56', NULL, '2019-03-19 13:18:56', '1', 'EXAM');
INSERT INTO `sys_attachment` VALUES ('218048dfd45c44eea637fa15dd2cc744', 'hdImg_624beb298a54895760501c95a368f2121539400955845.jpg', '65050', 'group1', 'group1/M00/00/00/wKgAX1yQe9SAdTyFAAD-GneoEJo170.jpg', NULL, NULL, '1', NULL, '2019-03-19 13:19:19', NULL, '2019-03-19 13:19:19', '1', 'EXAM');
INSERT INTO `sys_attachment` VALUES ('472442834a334f68a41a9d2f0222e1bf', 'hdImg_624beb298a54895760501c95a368f2121539400955845.jpg', '65050', 'group1', 'group1/M00/00/00/wKgAX1yQdtqATfkTAAD-GneoEJo916.jpg', NULL, NULL, '1', NULL, '2019-03-19 12:58:06', NULL, '2019-03-19 12:58:06', '1', 'EXAM');
INSERT INTO `sys_attachment` VALUES ('49c75cba7b234631bc173ecc5965c79d', '4.jpg', '11191', 'group1', 'group1/M00/00/00/wKgAX1yQfCSAIwgdAAArtzxOXJ4821.jpg', NULL, NULL, '1', NULL, '2019-03-19 13:20:40', NULL, '2019-03-19 13:20:40', '1', 'EXAM');
INSERT INTO `sys_attachment` VALUES ('6479f07b602848999e7a006962f2265e', 'hdImg_624beb298a54895760501c95a368f2121539400955845.jpg', '65050', 'group1', 'group1/M00/00/00/wKgAX1yQe0WAfUhbAAD-GneoEJo139.jpg', NULL, NULL, '1', NULL, '2019-03-19 13:16:57', NULL, '2019-03-19 13:16:57', '1', 'EXAM');
INSERT INTO `sys_attachment` VALUES ('68c600923e0b4be394cafa184d14b52b', 'docker笔记.txt', '7755', 'group1', 'group1/M00/00/00/wKgAX1yQdd-AZjs6AAAeS9XckBo526.txt', NULL, NULL, '0', NULL, '2019-03-19 12:53:55', NULL, '2019-03-19 12:53:55', '1', 'EXAM');
INSERT INTO `sys_attachment` VALUES ('88e153571aef4ad5872747d725084f93', '4.jpg', '11191', 'group1', 'group1/M00/00/00/wKgAX1yPO1OAUlcsAAArtzxOXJ4407.jpg', NULL, NULL, '0', NULL, '2019-03-18 14:31:50', NULL, '2019-03-18 14:31:50', '1', 'EXAM');
INSERT INTO `sys_attachment` VALUES ('89ef923d02664d038cc613f8a9a77b4f', 'header.jpg', '50859', 'group1', 'group1/M00/00/00/wKgAX1ySTT-AZC7YAADGq28ys0g424.jpg', NULL, NULL, '0', 'admin', '2019-03-20 22:20:01', 'admin', '2019-03-20 22:20:01', '1', 'EXAM');
INSERT INTO `sys_attachment` VALUES ('8bc09a183bd847fc8203268a994a199e', 'hdImg_624beb298a54895760501c95a368f2121539400955845.jpg', '65050', 'group1', 'group1/M00/00/00/wKgAX1yQeXOAMOLPAAD-GneoEJo761.jpg', NULL, NULL, '1', NULL, '2019-03-19 13:09:11', NULL, '2019-03-19 13:09:11', '1', 'EXAM');
INSERT INTO `sys_attachment` VALUES ('99e2f3d783e4449da47377a208c6eea5', 'header.jpg', '50859', 'group1', 'group1/M00/00/00/wKgAX1ySS02ACUt3AADGq28ys0g176.jpg', NULL, NULL, '0', NULL, '2019-03-20 22:11:43', NULL, '2019-03-20 22:11:43', '1', 'EXAM');
INSERT INTO `sys_attachment` VALUES ('bf29d5c50bb9486b8aa1ea408a7c2eee', 'hdImg_624beb298a54895760501c95a368f2121539400955845.jpg', '65050', 'group1', 'group1/M00/00/00/wKgAX1yQdv2ABH5KAAD-GneoEJo357.jpg', NULL, NULL, '1', NULL, '2019-03-19 12:58:41', NULL, '2019-03-19 12:58:41', '1', 'EXAM');
INSERT INTO `sys_attachment` VALUES ('ca40d668997e42f4bf6bd9772bbe729b', 'hdImg_624beb298a54895760501c95a368f2121539400955845.jpg', '65050', 'group1', 'group1/M00/00/00/wKgAX1yQfAWAe6-BAAD-GneoEJo971.jpg', NULL, NULL, '1', NULL, '2019-03-19 13:20:08', NULL, '2019-03-19 13:20:08', '1', 'EXAM');
INSERT INTO `sys_attachment` VALUES ('e30dd7a33dc3463f818182679b6a8c1b', '4.jpg', '11191', 'group1', 'group1/M00/00/00/wKgAX1yQeiSAcbC6AAArtzxOXJ4854.jpg', NULL, NULL, '1', NULL, '2019-03-19 13:12:08', NULL, '2019-03-19 13:12:08', '1', 'EXAM');
INSERT INTO `sys_attachment` VALUES ('e6d9c0f6371c4832b7fcbb9e816a6b9e', 'hdImg_624beb298a54895760501c95a368f2121539400955845.jpg', '65050', 'group1', 'group1/M00/00/00/wKgAX1yQegSAEbrCAAD-GneoEJo244.jpg', NULL, NULL, '1', NULL, '2019-03-19 13:11:36', NULL, '2019-03-19 13:11:36', '1', 'EXAM');
INSERT INTO `sys_attachment` VALUES ('ec5a65adfd0b4d239470905977dd506e', 'hdImg_624beb298a54895760501c95a368f2121539400955845.jpg', '65050', 'group1', 'group1/M00/00/00/wKgAX1yQgFCAdTuiAAD-GneoEJo490.jpg', NULL, NULL, '1', NULL, '2019-03-19 13:38:28', NULL, '2019-03-19 13:38:28', '1', 'EXAM');
-- ----------------------------
-- Table structure for sys_dept
-- ----------------------------
DROP TABLE IF EXISTS `sys_dept`;
......@@ -141,7 +119,9 @@ CREATE TABLE `sys_menu` (
-- ----------------------------
-- Records of sys_menu
-- ----------------------------
INSERT INTO `sys_menu` VALUES ('06e511a2fdc24f84bc4d7ba34e2f40b8', '修改路由', 'sys:route:edit', NULL, '09e6177314264671893316601fd12827', '', '2', '1', 'admin', '2019-04-02 16:29:00', 'admin', '2019-04-02 16:29:00', '0', 'EXAM', NULL, NULL, NULL, NULL);
INSERT INTO `sys_menu` VALUES ('095bb0644ab14d97b31418f87e1cf823', '导出菜单', 'sys:menu:export', NULL, '3', '', '34', '1', 'admin', '2018-11-28 19:07:02', 'admin', '2018-11-28 19:07:02', '0', 'EXAM', NULL, NULL, NULL, NULL);
INSERT INTO `sys_menu` VALUES ('09e6177314264671893316601fd12827', '路由管理', 'sys:route', '/api/user/route/**', '1', '', '12', '0', 'admin', '2019-04-02 16:28:06', 'admin', '2019-04-02 16:28:06', '0', 'EXAM', 'views/sys/route', 'route', NULL, '路由管理');
INSERT INTO `sys_menu` VALUES ('0dc80492cf414db984d825fdd842e022', '新增用户', 'sys:user:add', NULL, '4', 'example', '1', '1', '', '2018-10-28 16:38:57', NULL, '2019-03-20 21:54:33', '0', '', NULL, NULL, NULL, NULL);
INSERT INTO `sys_menu` VALUES ('0ee02b8dc3064fcd972f527c31aad5a7', '修改菜单', 'sys:menu:edit', NULL, '3', 'example', '4', '1', '', '2018-10-28 16:46:38', 'admin', '2018-11-04 10:21:23', '0', '', NULL, NULL, NULL, NULL);
INSERT INTO `sys_menu` VALUES ('0fe1156ec9e24dd4bc2c663c665a5048', '导出用户', 'sys:user:export', NULL, '4', '', '33', '1', 'admin', '2018-11-27 12:05:03', 'admin', '2018-11-27 12:05:03', '0', 'EXAM', NULL, NULL, NULL, NULL);
......@@ -172,14 +152,17 @@ INSERT INTO `sys_menu` VALUES ('594e7afda95c42e6af2046f1bfe81c53', '删除日志
INSERT INTO `sys_menu` VALUES ('5ba624643cd34ec3b78ca622964c0f8a', '修改题目', 'exam:subject:bank:edit', NULL, '1717eabc03174c2e9bdaf27c5a5697dd', '', '2', '1', 'admin', '2018-12-04 21:34:50', 'admin', '2018-12-09 20:35:58', '0', 'EXAM', NULL, NULL, NULL, NULL);
INSERT INTO `sys_menu` VALUES ('6', '部门管理', 'sys:dept', '/api/user/v1/dept/**', '1', '', '8', '0', '1', '1', NULL, '2019-03-18 14:46:50', '0', '1', 'views/sys/dept', 'dept', '', NULL);
INSERT INTO `sys_menu` VALUES ('63f039ea5bcf4208978150b59484a429', '考试管理', 'exam:exam', '/api/exam/v1/examination/**', 'b93eba1199b6420a82d285a8919bcd23', '', '2', '0', 'admin', '2018-11-10 22:22:42', NULL, '2019-03-18 14:47:34', '0', 'EXAM', 'views/exam/exam', 'exam', NULL, '考试管理');
INSERT INTO `sys_menu` VALUES ('6434cf8ac2b0462e981f115329364c43', '刷新路由', 'sys:route:refresh', NULL, '09e6177314264671893316601fd12827', '', '4', '1', 'admin', '2019-04-07 12:08:51', 'admin', '2019-04-07 12:08:51', '0', 'EXAM', NULL, NULL, NULL, NULL);
INSERT INTO `sys_menu` VALUES ('657026922f494801a41b64f40e63fca6', '删除考试', 'exam:exam:del', NULL, '63f039ea5bcf4208978150b59484a429', '', '3', '1', 'admin', '2018-11-10 22:46:12', 'admin', '2018-11-10 22:46:12', '0', 'EXAM', NULL, NULL, NULL, NULL);
INSERT INTO `sys_menu` VALUES ('69a2a85608064762a3d76fc0c92072cc', '新增题目分类', 'exam:subject:category:add', NULL, '1717eabc03174c2e9bdaf27c5a5697dd', '', '4', '1', 'admin', '2018-12-04 21:35:59', 'admin', '2018-12-04 21:35:59', '0', 'EXAM', NULL, NULL, NULL, NULL);
INSERT INTO `sys_menu` VALUES ('6e74291cf4584b479e59409a843bd377', '新增路由', 'sys:route:add', NULL, '09e6177314264671893316601fd12827', '', '1', '1', 'admin', '2019-04-02 16:28:36', 'admin', '2019-04-02 16:28:36', '0', 'EXAM', NULL, NULL, NULL, NULL);
INSERT INTO `sys_menu` VALUES ('6f605148282b4949b5c96e2877dc9052', '题目管理', 'exam:exam:subject', NULL, '63f039ea5bcf4208978150b59484a429', '', '4', '1', 'admin', '2018-11-13 20:50:07', 'admin', '2018-11-13 20:50:41', '0', 'EXAM', NULL, NULL, NULL, NULL);
INSERT INTO `sys_menu` VALUES ('7', '系统监控', 'sys', '/admin/monitor/**', '-1', 'chart', '7', '0', '1', '1', 'admin', '2019-01-05 16:19:56', '0', '1', 'Layout', '/monitor', '', NULL);
INSERT INTO `sys_menu` VALUES ('71e5179363bc4e119a87daaa631a2712', '导入题目', 'exam:exam:subject:import', NULL, '63f039ea5bcf4208978150b59484a429', '', '36', '1', 'admin', '2018-11-27 12:06:45', 'admin', '2018-11-27 12:06:45', '0', 'EXAM', NULL, NULL, NULL, NULL);
INSERT INTO `sys_menu` VALUES ('72de30896d3a401eb62edc0aa6fbf190', '导出成绩', 'exam:examRecord:export', NULL, 'c3adad9112de41a6a2d4cc9fe4a4d94b', '', '30', '1', 'admin', '2018-12-30 22:12:20', 'admin', '2019-01-22 19:43:52', '0', 'EXAM', NULL, NULL, NULL, NULL);
INSERT INTO `sys_menu` VALUES ('7780e3fd6cea4ba78d780f33c111d95a', '导入菜单', 'sys:menu:import', NULL, '3', '', '35', '1', 'admin', '2018-11-28 19:07:20', 'admin', '2018-11-28 19:07:20', '0', 'EXAM', NULL, NULL, NULL, NULL);
INSERT INTO `sys_menu` VALUES ('7f78172c09d3408dab1534d26b608b31', '首页', 'dashboard', '/', '-1', 'dashboard', '0', '0', 'admin', '2018-11-06 23:26:57', 'admin', '2019-03-28 15:59:52', '0', 'EXAM', '', '/dashboard', '', '首页');
INSERT INTO `sys_menu` VALUES ('8a3b997df4ea48548b626ef8e89a704d', '删除路由', 'sys:route:del', NULL, '09e6177314264671893316601fd12827', '', '3', '1', 'admin', '2019-04-02 16:29:19', 'admin', '2019-04-02 16:29:19', '0', 'EXAM', NULL, NULL, NULL, NULL);
INSERT INTO `sys_menu` VALUES ('8aefee22294d47d7a3e4a29ae5ced4b4', '个人资料', 'personal:message', '/admin/api/v1/user/updateInfo', '14', '', '29', '0', 'admin', '2018-10-29 21:58:32', 'admin', '2019-03-06 14:10:33', '0', 'EXAM', 'views/personal/message', 'message', NULL, '个人资料');
INSERT INTO `sys_menu` VALUES ('8b67ccbe89f74b728e58c2e4a4795027', '删除菜单', 'sys:menu:del', NULL, '3', 'example', '3', '1', '', '2018-10-28 16:46:23', 'admin', '2018-11-04 10:21:14', '0', '', NULL, NULL, NULL, NULL);
INSERT INTO `sys_menu` VALUES ('8bcf03f73377412b981572517b9055e0', '删除题目', 'exam:exam:subject:del', NULL, '63f039ea5bcf4208978150b59484a429', '', '38', '1', 'admin', '2018-11-29 14:11:24', 'admin', '2018-11-29 14:11:24', '0', 'EXAM', NULL, NULL, NULL, NULL);
......@@ -266,113 +249,147 @@ CREATE TABLE `sys_role_menu` (
-- ----------------------------
-- Records of sys_role_menu
-- ----------------------------
INSERT INTO `sys_role_menu` VALUES ('00fb7f39f1904de0a8f814e941810628', '59fcb8500eb24f20bf7263467d757212', '0fe1156ec9e24dd4bc2c663c665a5048');
INSERT INTO `sys_role_menu` VALUES ('0174bfbc9a3c49cb8cbc662533891a40', '59fcb8500eb24f20bf7263467d757212', '2a232ac9f43146a49ab5a19226e76742');
INSERT INTO `sys_role_menu` VALUES ('030d60436f4443ee9b6cd8cda52f1394', '59fcb8500eb24f20bf7263467d757212', '0ee02b8dc3064fcd972f527c31aad5a7');
INSERT INTO `sys_role_menu` VALUES ('037ea7d36a294986a5896e1f9d8a83fb', '23ab268d7e0247868dcf484ab63ff595', '8aefee22294d47d7a3e4a29ae5ced4b4');
INSERT INTO `sys_role_menu` VALUES ('05aedfd986dc47d49da7a77d99d5eb8e', '59fcb8500eb24f20bf7263467d757212', 'ac6768a097184c99ada64810a897f727');
INSERT INTO `sys_role_menu` VALUES ('06e3edb0e5c94d039e6ddc57c25739c1', '59fcb8500eb24f20bf7263467d757212', '13f925e8559c43aa8ef33a8e1e3f9b4d');
INSERT INTO `sys_role_menu` VALUES ('078bb68faae94ae49c919a33b8ce6ed8', '59fcb8500eb24f20bf7263467d757212', '23df3c2475504ca781e25c3443d7ad25');
INSERT INTO `sys_role_menu` VALUES ('0f965e0dc620461e95e908e904e75034', '59fcb8500eb24f20bf7263467d757212', '1b68d41bfcc3441f839188a9d7b6ead0');
INSERT INTO `sys_role_menu` VALUES ('0520cca1fdbc43d59e428c35acc3a4f9', '59fcb8500eb24f20bf7263467d757212', '6f605148282b4949b5c96e2877dc9052');
INSERT INTO `sys_role_menu` VALUES ('0577d1f60d1c4a83af5bd411da55a0e1', '59fcb8500eb24f20bf7263467d757212', '3a64f8a80dce4f6c8bc4483f0230f49f');
INSERT INTO `sys_role_menu` VALUES ('0dc6b1e0281c4e4995de8c5b890ba193', '59fcb8500eb24f20bf7263467d757212', '3bb2fec1ba094584aa1a984ec1f05dc7');
INSERT INTO `sys_role_menu` VALUES ('109dc19b6ac34542b72dfc024b87afd1', '59fcb8500eb24f20bf7263467d757212', '2a232ac9f43146a49ab5a19226e76742');
INSERT INTO `sys_role_menu` VALUES ('10a12ee807744e98a7401dea56c87250', 'fce0ad963d1f42be9178c4c5c493f55e', '8aefee22294d47d7a3e4a29ae5ced4b4');
INSERT INTO `sys_role_menu` VALUES ('12b5c7cdd7104d2a9d48a0891790e22d', '59fcb8500eb24f20bf7263467d757212', '6e74291cf4584b479e59409a843bd377');
INSERT INTO `sys_role_menu` VALUES ('12c5769296b5498a852f15087fea5587', '59fcb8500eb24f20bf7263467d757212', 'b85dda1e623e48e4ae82dc228df3edfe');
INSERT INTO `sys_role_menu` VALUES ('12f1b54b5b0f41cf839e56db6f491ab9', '23ab268d7e0247868dcf484ab63ff595', '7f78172c09d3408dab1534d26b608b31');
INSERT INTO `sys_role_menu` VALUES ('15de309b6e8247c492ee378d529782ec', '59fcb8500eb24f20bf7263467d757212', '7780e3fd6cea4ba78d780f33c111d95a');
INSERT INTO `sys_role_menu` VALUES ('1634529946a74d1b84a5bcc884e52222', '59fcb8500eb24f20bf7263467d757212', '91861ef795ab4fc4a207567606fa62cc');
INSERT INTO `sys_role_menu` VALUES ('164966101805422ca5bd801b735305bf', 'fce0ad963d1f42be9178c4c5c493f55e', '63f039ea5bcf4208978150b59484a429');
INSERT INTO `sys_role_menu` VALUES ('1705876c9b224bc6acfdff152ffa9506', 'fce0ad963d1f42be9178c4c5c493f55e', '69a2a85608064762a3d76fc0c92072cc');
INSERT INTO `sys_role_menu` VALUES ('174aad8a29a341049adb38779ee75555', '59fcb8500eb24f20bf7263467d757212', '71e5179363bc4e119a87daaa631a2712');
INSERT INTO `sys_role_menu` VALUES ('1a7209a0c2b24e7faf1b38426cea9dc8', 'fce0ad963d1f42be9178c4c5c493f55e', '34371d1e990549f0b633389bdf64ce0f');
INSERT INTO `sys_role_menu` VALUES ('1c34460b23ad4ad98892dfb510e191d2', '59fcb8500eb24f20bf7263467d757212', '901959fd37df4f7d90adaa4ab6c4b331');
INSERT INTO `sys_role_menu` VALUES ('224b38adb44f4ffb9b792a3780ad4a67', '59fcb8500eb24f20bf7263467d757212', '7');
INSERT INTO `sys_role_menu` VALUES ('25928e403495414ea04d3cb6609f886c', '59fcb8500eb24f20bf7263467d757212', '42c69128d30a4242b08ef0003da68528');
INSERT INTO `sys_role_menu` VALUES ('1f02e520280b4cbfaf862ff1e9d2f505', '59fcb8500eb24f20bf7263467d757212', 'd1967064f3584672af29c184818e38a9');
INSERT INTO `sys_role_menu` VALUES ('1f19ba4fb7244329a6a84f8fad35c724', '59fcb8500eb24f20bf7263467d757212', '1717eabc03174c2e9bdaf27c5a5697dd');
INSERT INTO `sys_role_menu` VALUES ('1fe51f0204e14a7baa6c1dd6e000e7bf', '59fcb8500eb24f20bf7263467d757212', '34371d1e990549f0b633389bdf64ce0f');
INSERT INTO `sys_role_menu` VALUES ('2019b8554a8441dbbb2b6673bd2c7655', '59fcb8500eb24f20bf7263467d757212', '7780e3fd6cea4ba78d780f33c111d95a');
INSERT INTO `sys_role_menu` VALUES ('21e15484ecbe4f6c9ba354f4a8ce8f25', '59fcb8500eb24f20bf7263467d757212', '5');
INSERT INTO `sys_role_menu` VALUES ('281d59486c284c359148f3c63af5fd92', '23ab268d7e0247868dcf484ab63ff595', 'b93eba1199b6420a82d285a8919bcd23');
INSERT INTO `sys_role_menu` VALUES ('29c98d28f3494eeaa789e1e519cd5438', '59fcb8500eb24f20bf7263467d757212', '8bcf03f73377412b981572517b9055e0');
INSERT INTO `sys_role_menu` VALUES ('2b3ddae30b3c4df799c0c036c22cb8d6', 'fce0ad963d1f42be9178c4c5c493f55e', '72de30896d3a401eb62edc0aa6fbf190');
INSERT INTO `sys_role_menu` VALUES ('2b77915c9d8e48a587d32c85af59f2fa', '59fcb8500eb24f20bf7263467d757212', 'b93eba1199b6420a82d285a8919bcd23');
INSERT INTO `sys_role_menu` VALUES ('2beae289e2214a519c0c6c0ba3183463', '59fcb8500eb24f20bf7263467d757212', '7f78172c09d3408dab1534d26b608b31');
INSERT INTO `sys_role_menu` VALUES ('2c0c6096bfc84605a1c803b8d08f33e9', 'fce0ad963d1f42be9178c4c5c493f55e', 'ac6768a097184c99ada64810a897f727');
INSERT INTO `sys_role_menu` VALUES ('2c87e444edd94d95bb902c3aea4ea1a7', 'fce0ad963d1f42be9178c4c5c493f55e', '13f925e8559c43aa8ef33a8e1e3f9b4d');
INSERT INTO `sys_role_menu` VALUES ('2e1bb1a5fcd94c93b482333894a6b697', '59fcb8500eb24f20bf7263467d757212', '530f933da3824e1f9bf3182794141e9e');
INSERT INTO `sys_role_menu` VALUES ('2ed5e41dff8548e199e689f1a4c590e1', '59fcb8500eb24f20bf7263467d757212', 'b8969a3731b0405e82d0bb896e13841e');
INSERT INTO `sys_role_menu` VALUES ('2fb311360a984fba832211c39c7e92db', '59fcb8500eb24f20bf7263467d757212', 'd1967064f3584672af29c184818e38a9');
INSERT INTO `sys_role_menu` VALUES ('35815a91ebe14eeba186ff2295f4d758', '59fcb8500eb24f20bf7263467d757212', '1717eabc03174c2e9bdaf27c5a5697dd');
INSERT INTO `sys_role_menu` VALUES ('34e91ea154894a08af404e1837e8dbb9', '59fcb8500eb24f20bf7263467d757212', 'b8969a3731b0405e82d0bb896e13841e');
INSERT INTO `sys_role_menu` VALUES ('34f1bcbdc7844fc4a1d875962fa151be', '59fcb8500eb24f20bf7263467d757212', 'ca168a2d7c854320b207b7a7ea67eb5d');
INSERT INTO `sys_role_menu` VALUES ('352696b60ee745099efab23ad40ada50', '59fcb8500eb24f20bf7263467d757212', '6434cf8ac2b0462e981f115329364c43');
INSERT INTO `sys_role_menu` VALUES ('35e38527b4934ddaa80b4c87649d8914', '23ab268d7e0247868dcf484ab63ff595', '14');
INSERT INTO `sys_role_menu` VALUES ('36d7be7b66564edca3e02e0e0748bd7c', '59fcb8500eb24f20bf7263467d757212', '69a2a85608064762a3d76fc0c92072cc');
INSERT INTO `sys_role_menu` VALUES ('393dce49aa9b4174ae68ca16aa804d31', '59fcb8500eb24f20bf7263467d757212', '6f605148282b4949b5c96e2877dc9052');
INSERT INTO `sys_role_menu` VALUES ('382978624162455faffce45c2027d3ce', '59fcb8500eb24f20bf7263467d757212', 'c435ac944cd6430ba9a1039d8adb80a7');
INSERT INTO `sys_role_menu` VALUES ('39a9488b90e5403fb7d31162e67299d9', '23ab268d7e0247868dcf484ab63ff595', '63f039ea5bcf4208978150b59484a429');
INSERT INTO `sys_role_menu` VALUES ('40e33021e9c54420942744813d079daa', '59fcb8500eb24f20bf7263467d757212', 'a663e71f7b8441b0b8363ae5eb20bbb3');
INSERT INTO `sys_role_menu` VALUES ('41158e7ab6ef4707872304cecb1ac332', '59fcb8500eb24f20bf7263467d757212', 'b85dda1e623e48e4ae82dc228df3edfe');
INSERT INTO `sys_role_menu` VALUES ('3df6e6fa58df45568a851e641a49ddf0', '59fcb8500eb24f20bf7263467d757212', '530f933da3824e1f9bf3182794141e9e');
INSERT INTO `sys_role_menu` VALUES ('403c8dfb344841b99213d522b6b04bac', '59fcb8500eb24f20bf7263467d757212', '91861ef795ab4fc4a207567606fa62cc');
INSERT INTO `sys_role_menu` VALUES ('40aa0e93ebad4f6891ce921b8db2025f', '59fcb8500eb24f20bf7263467d757212', '06e511a2fdc24f84bc4d7ba34e2f40b8');
INSERT INTO `sys_role_menu` VALUES ('4109d7edea534b7888b85d7f095af256', '59fcb8500eb24f20bf7263467d757212', '4f3e874dc310463a82e3b650fd851fdb');
INSERT INTO `sys_role_menu` VALUES ('4198329687684550aa78db44947cde5c', 'fce0ad963d1f42be9178c4c5c493f55e', 'cfc631763d3e4f1ab973141ddbeee449');
INSERT INTO `sys_role_menu` VALUES ('4258bdc8026f4e86ba5902bb15f10073', '59fcb8500eb24f20bf7263467d757212', '7f78172c09d3408dab1534d26b608b31');
INSERT INTO `sys_role_menu` VALUES ('43b1561644a54a708d9dbc21cb99321a', '59fcb8500eb24f20bf7263467d757212', '14');
INSERT INTO `sys_role_menu` VALUES ('43f2d49511ac4129bc9f22689d85dfd6', 'fce0ad963d1f42be9178c4c5c493f55e', '530f933da3824e1f9bf3182794141e9e');
INSERT INTO `sys_role_menu` VALUES ('4460783765cb4beba3781f8b850e1f65', 'fce0ad963d1f42be9178c4c5c493f55e', 'a398216ac2f14c16928452483786329e');
INSERT INTO `sys_role_menu` VALUES ('4af4db6a479b4f0ba576874c1b047b75', 'fce0ad963d1f42be9178c4c5c493f55e', '1717eabc03174c2e9bdaf27c5a5697dd');
INSERT INTO `sys_role_menu` VALUES ('4c39e95a8b054d4fb69ab842d83f01d2', 'fce0ad963d1f42be9178c4c5c493f55e', '23df3c2475504ca781e25c3443d7ad25');
INSERT INTO `sys_role_menu` VALUES ('4c8b5623dd164ef591cf9fe6811d1ad1', 'fce0ad963d1f42be9178c4c5c493f55e', '8bcf03f73377412b981572517b9055e0');
INSERT INTO `sys_role_menu` VALUES ('4ed7f391d2ea4c189e1634c94f9afe65', '59fcb8500eb24f20bf7263467d757212', '8b67ccbe89f74b728e58c2e4a4795027');
INSERT INTO `sys_role_menu` VALUES ('4d6defa7dd1a4a979178186932e4cc34', '59fcb8500eb24f20bf7263467d757212', '3');
INSERT INTO `sys_role_menu` VALUES ('4f268044d7eb4bd6b9cb8b36a5832755', '59fcb8500eb24f20bf7263467d757212', '451605025d9a4715b4ae78f5a5d01fea');
INSERT INTO `sys_role_menu` VALUES ('4f4eb31a74e046d7bad9c6b705350abc', '23ab268d7e0247868dcf484ab63ff595', '13f925e8559c43aa8ef33a8e1e3f9b4d');
INSERT INTO `sys_role_menu` VALUES ('53b61a2e5e95406ab786cf14b550368e', '59fcb8500eb24f20bf7263467d757212', '8aefee22294d47d7a3e4a29ae5ced4b4');
INSERT INTO `sys_role_menu` VALUES ('54cf5fb79114447fbeef10812e49f43e', '59fcb8500eb24f20bf7263467d757212', 'c2bc24819bcc4e8790f0dba586914efe');
INSERT INTO `sys_role_menu` VALUES ('56f2fd8fc31841999f1528db759a6f0b', '59fcb8500eb24f20bf7263467d757212', '0dc80492cf414db984d825fdd842e022');
INSERT INTO `sys_role_menu` VALUES ('59e7f69573044ad1b5f184b11107ec6b', '59fcb8500eb24f20bf7263467d757212', 'ee35a2abc0b04f3bb70527a7f79806e8');
INSERT INTO `sys_role_menu` VALUES ('5e254b4dd683430eb1b07443d3633c09', '23ab268d7e0247868dcf484ab63ff595', 'b8969a3731b0405e82d0bb896e13841e');
INSERT INTO `sys_role_menu` VALUES ('60586550779c4bb4813404e0065e926e', '59fcb8500eb24f20bf7263467d757212', '34371d1e990549f0b633389bdf64ce0f');
INSERT INTO `sys_role_menu` VALUES ('610efea9c2b24b57b55282eaa5ab7207', '59fcb8500eb24f20bf7263467d757212', 'ca7e69aae4994099a6424aa9727b6a28');
INSERT INTO `sys_role_menu` VALUES ('6274cb2b74c3462687f1297d3333ab42', 'fce0ad963d1f42be9178c4c5c493f55e', 'cffa2058b7c746efa2fca7ceb6052bdc');
INSERT INTO `sys_role_menu` VALUES ('62dbfdd700704762af948a898a25f427', '59fcb8500eb24f20bf7263467d757212', '8aefee22294d47d7a3e4a29ae5ced4b4');
INSERT INTO `sys_role_menu` VALUES ('6385b189f2454aefbc9ee17fdf6742bc', 'fce0ad963d1f42be9178c4c5c493f55e', '4f3e874dc310463a82e3b650fd851fdb');
INSERT INTO `sys_role_menu` VALUES ('66c95f9bdbff44c9bed689d617c06e9e', '23ab268d7e0247868dcf484ab63ff595', '1717eabc03174c2e9bdaf27c5a5697dd');
INSERT INTO `sys_role_menu` VALUES ('6b0737f1e3204282a389eab633c65cb0', '59fcb8500eb24f20bf7263467d757212', '9c2e04eab32c467f87d89ad0a2b4892c');
INSERT INTO `sys_role_menu` VALUES ('6cc8b627612b4fcd99e220cd99be99d3', '59fcb8500eb24f20bf7263467d757212', '1');
INSERT INTO `sys_role_menu` VALUES ('6ba6dc7848394987bc9d30c661786ba6', '59fcb8500eb24f20bf7263467d757212', '0dc80492cf414db984d825fdd842e022');
INSERT INTO `sys_role_menu` VALUES ('6d75fcf88a3842df8a961a825eab886e', '59fcb8500eb24f20bf7263467d757212', '69a2a85608064762a3d76fc0c92072cc');
INSERT INTO `sys_role_menu` VALUES ('6f4da45ca1094f1cba704fa2519fc4fb', 'fce0ad963d1f42be9178c4c5c493f55e', 'c3adad9112de41a6a2d4cc9fe4a4d94b');
INSERT INTO `sys_role_menu` VALUES ('6ffdbf889d7a4f5b92318494d8c55488', '59fcb8500eb24f20bf7263467d757212', '4');
INSERT INTO `sys_role_menu` VALUES ('71c5d297bf1e4f72a1a04173ceaaf48b', '59fcb8500eb24f20bf7263467d757212', '594e7afda95c42e6af2046f1bfe81c53');
INSERT INTO `sys_role_menu` VALUES ('745cb4fd48444233bbbd8448f313ef35', '59fcb8500eb24f20bf7263467d757212', 'cfc631763d3e4f1ab973141ddbeee449');
INSERT INTO `sys_role_menu` VALUES ('7e779baa30854519819ed3e2fd9d5bfc', '59fcb8500eb24f20bf7263467d757212', '15');
INSERT INTO `sys_role_menu` VALUES ('85c84c45e9fd4991b3b1f5e47ab024fc', '59fcb8500eb24f20bf7263467d757212', '3bb2fec1ba094584aa1a984ec1f05dc7');
INSERT INTO `sys_role_menu` VALUES ('87f041f70c3845f3a014f977f8be50e0', '59fcb8500eb24f20bf7263467d757212', '657026922f494801a41b64f40e63fca6');
INSERT INTO `sys_role_menu` VALUES ('6f5dfce6f3b24cd8bc73807a5081e91e', '59fcb8500eb24f20bf7263467d757212', '1e6a90e57df541e0973691c17d44564c');
INSERT INTO `sys_role_menu` VALUES ('72f87911c8cd40bfaf868a29a1ec3257', '59fcb8500eb24f20bf7263467d757212', 'cffa2058b7c746efa2fca7ceb6052bdc');
INSERT INTO `sys_role_menu` VALUES ('78cc79700bd5432f9eb676fe453b1d97', '59fcb8500eb24f20bf7263467d757212', '14');
INSERT INTO `sys_role_menu` VALUES ('7a061e471b1f41f4900f81e2626d21cd', '59fcb8500eb24f20bf7263467d757212', '42c69128d30a4242b08ef0003da68528');
INSERT INTO `sys_role_menu` VALUES ('7bd2146cec444901b9dde5cd76f0070d', '59fcb8500eb24f20bf7263467d757212', '34ffa24d3c124902893e601fe8e22b08');
INSERT INTO `sys_role_menu` VALUES ('7f0016452c3d4a628e43f6041fe66c56', '59fcb8500eb24f20bf7263467d757212', 'ee35a2abc0b04f3bb70527a7f79806e8');
INSERT INTO `sys_role_menu` VALUES ('865cda5f03954232a566a1689e285f1f', '59fcb8500eb24f20bf7263467d757212', '0fe1156ec9e24dd4bc2c663c665a5048');
INSERT INTO `sys_role_menu` VALUES ('8805ee782529431e94aa314df4deb959', 'fce0ad963d1f42be9178c4c5c493f55e', '451605025d9a4715b4ae78f5a5d01fea');
INSERT INTO `sys_role_menu` VALUES ('88071d3cbb994a0c8b6eeba198624737', 'fce0ad963d1f42be9178c4c5c493f55e', 'fa483765360243d0a631a2b9793aaf41');
INSERT INTO `sys_role_menu` VALUES ('894cc05c35344c6f9b58f27570f718b6', '59fcb8500eb24f20bf7263467d757212', 'fe73699236be4b148cd35628929cc876');
INSERT INTO `sys_role_menu` VALUES ('8aae120a470641acab06f3f7f98222ea', '59fcb8500eb24f20bf7263467d757212', '8bcf03f73377412b981572517b9055e0');
INSERT INTO `sys_role_menu` VALUES ('90d44eb0d90940419d4899103e47b56d', '59fcb8500eb24f20bf7263467d757212', 'fe73699236be4b148cd35628929cc876');
INSERT INTO `sys_role_menu` VALUES ('90f4318eb5b04bad85ec2eddad195635', 'fce0ad963d1f42be9178c4c5c493f55e', '3bb2fec1ba094584aa1a984ec1f05dc7');
INSERT INTO `sys_role_menu` VALUES ('933c016eaf4c48189ae7fdb1c7b63312', '59fcb8500eb24f20bf7263467d757212', '1e6a90e57df541e0973691c17d44564c');
INSERT INTO `sys_role_menu` VALUES ('9b53f1bab5ab4aab80e818d638b23c30', '59fcb8500eb24f20bf7263467d757212', '2ac8ccadf70140edbed65c8c1bd05e2c');
INSERT INTO `sys_role_menu` VALUES ('9df8f86a41ce46869436e3b87d0d687c', '59fcb8500eb24f20bf7263467d757212', '095bb0644ab14d97b31418f87e1cf823');
INSERT INTO `sys_role_menu` VALUES ('92b78a92260c4dddaad5abc20ec658de', '59fcb8500eb24f20bf7263467d757212', 'a6ee113d593448e2a63a9d9712d9a81e');
INSERT INTO `sys_role_menu` VALUES ('999716c4b4f94b7bb8046ad82b5d9536', '59fcb8500eb24f20bf7263467d757212', 'a398216ac2f14c16928452483786329e');
INSERT INTO `sys_role_menu` VALUES ('a0053745956c47c08824d93b7f0fb7b8', '59fcb8500eb24f20bf7263467d757212', '9c2e04eab32c467f87d89ad0a2b4892c');
INSERT INTO `sys_role_menu` VALUES ('a1db8cbc5e364d68b48353d4b221821a', '59fcb8500eb24f20bf7263467d757212', '347d24c6e1cf42eaa976c91f5607007a');
INSERT INTO `sys_role_menu` VALUES ('a44eb423dea042769d147a916cd41502', '59fcb8500eb24f20bf7263467d757212', '9c0846685bb24aafae731bdacf879ba2');
INSERT INTO `sys_role_menu` VALUES ('a77a6a73897645d8843b0184cfdb9ace', '59fcb8500eb24f20bf7263467d757212', 'a663e71f7b8441b0b8363ae5eb20bbb3');
INSERT INTO `sys_role_menu` VALUES ('a963e469c99d48f28493aca9ea16b87e', 'fce0ad963d1f42be9178c4c5c493f55e', 'b8969a3731b0405e82d0bb896e13841e');
INSERT INTO `sys_role_menu` VALUES ('a99bbdc5a50a42bd9776b6b1c685bef5', '59fcb8500eb24f20bf7263467d757212', '36cca77232f3487cbee02bb68ae12652');
INSERT INTO `sys_role_menu` VALUES ('ac03e93df05449c58809b201a545d18d', 'fce0ad963d1f42be9178c4c5c493f55e', '9c2e04eab32c467f87d89ad0a2b4892c');
INSERT INTO `sys_role_menu` VALUES ('ac740672c0b64b5085ccb7caf68cdf2c', '59fcb8500eb24f20bf7263467d757212', '09e6177314264671893316601fd12827');
INSERT INTO `sys_role_menu` VALUES ('acd4a17303004dfa930083bc60938639', '59fcb8500eb24f20bf7263467d757212', '23df3c2475504ca781e25c3443d7ad25');
INSERT INTO `sys_role_menu` VALUES ('ace3a21d4d164d03a43fdbb78468e3f0', '59fcb8500eb24f20bf7263467d757212', '13f925e8559c43aa8ef33a8e1e3f9b4d');
INSERT INTO `sys_role_menu` VALUES ('ae50bb9a9ce2479cb1aaf82e7b73e58b', '59fcb8500eb24f20bf7263467d757212', '594e7afda95c42e6af2046f1bfe81c53');
INSERT INTO `sys_role_menu` VALUES ('b0a3de853b8e40d88477ec68f2e92af3', '59fcb8500eb24f20bf7263467d757212', '5ba624643cd34ec3b78ca622964c0f8a');
INSERT INTO `sys_role_menu` VALUES ('b0be089ebb244ea188a26a1249884a96', '59fcb8500eb24f20bf7263467d757212', 'c2bc24819bcc4e8790f0dba586914efe');
INSERT INTO `sys_role_menu` VALUES ('b5c89c4bb84b4ac593d410c0d993195f', '23ab268d7e0247868dcf484ab63ff595', '4f3e874dc310463a82e3b650fd851fdb');
INSERT INTO `sys_role_menu` VALUES ('b6f2aeb27d244b20abced05b12991f38', '59fcb8500eb24f20bf7263467d757212', '71e5179363bc4e119a87daaa631a2712');
INSERT INTO `sys_role_menu` VALUES ('b707d0b541784438a6666e6f022d7a79', 'fce0ad963d1f42be9178c4c5c493f55e', 'b85dda1e623e48e4ae82dc228df3edfe');
INSERT INTO `sys_role_menu` VALUES ('b7bd80aaa0bb481b8c04cee2b484aff4', '59fcb8500eb24f20bf7263467d757212', 'c435ac944cd6430ba9a1039d8adb80a7');
INSERT INTO `sys_role_menu` VALUES ('b7e0011b8d72447e9dddbe55f28d4f15', '59fcb8500eb24f20bf7263467d757212', 'ac6768a097184c99ada64810a897f727');
INSERT INTO `sys_role_menu` VALUES ('b7f964d26c68475e8e99a1cfd557f5f2', '59fcb8500eb24f20bf7263467d757212', 'ca7e69aae4994099a6424aa9727b6a28');
INSERT INTO `sys_role_menu` VALUES ('ba6dfab783d24a18a08d130fc4ff1470', 'fce0ad963d1f42be9178c4c5c493f55e', 'd1967064f3584672af29c184818e38a9');
INSERT INTO `sys_role_menu` VALUES ('bebbf99836b241e7822a076a12263482', '59fcb8500eb24f20bf7263467d757212', '72de30896d3a401eb62edc0aa6fbf190');
INSERT INTO `sys_role_menu` VALUES ('bec6832fc0a3460aa1f9d8b4b1857031', '59fcb8500eb24f20bf7263467d757212', 'a398216ac2f14c16928452483786329e');
INSERT INTO `sys_role_menu` VALUES ('bb4ef4481e1648d1be3a21ba748f26d6', '59fcb8500eb24f20bf7263467d757212', '1');
INSERT INTO `sys_role_menu` VALUES ('bed42f1507e94d6196888989d06636de', '59fcb8500eb24f20bf7263467d757212', '1b68d41bfcc3441f839188a9d7b6ead0');
INSERT INTO `sys_role_menu` VALUES ('bf8d6f3bc9ed469299113c74ec414e25', 'fce0ad963d1f42be9178c4c5c493f55e', '5ba624643cd34ec3b78ca622964c0f8a');
INSERT INTO `sys_role_menu` VALUES ('c3bc5eda1c054d1e90db02b7dc7c9ee2', '59fcb8500eb24f20bf7263467d757212', 'cffa2058b7c746efa2fca7ceb6052bdc');
INSERT INTO `sys_role_menu` VALUES ('c57887944ac2403e9f63537a9f63abb8', '59fcb8500eb24f20bf7263467d757212', 'a6ee113d593448e2a63a9d9712d9a81e');
INSERT INTO `sys_role_menu` VALUES ('c1834558ca154973bc65f3a58f251ce9', '59fcb8500eb24f20bf7263467d757212', '2ac8ccadf70140edbed65c8c1bd05e2c');
INSERT INTO `sys_role_menu` VALUES ('c363452ffa4c447a95b72176cac2ee0a', '59fcb8500eb24f20bf7263467d757212', 'b93eba1199b6420a82d285a8919bcd23');
INSERT INTO `sys_role_menu` VALUES ('c716281f370a4cd18e0a2e6a5a385faa', 'fce0ad963d1f42be9178c4c5c493f55e', '657026922f494801a41b64f40e63fca6');
INSERT INTO `sys_role_menu` VALUES ('c74f1f256f8b426a8cb80db6bd592308', '59fcb8500eb24f20bf7263467d757212', 'ca168a2d7c854320b207b7a7ea67eb5d');
INSERT INTO `sys_role_menu` VALUES ('c839e32fdae243ee9b4d0f129e5c89f6', '59fcb8500eb24f20bf7263467d757212', '4f3e874dc310463a82e3b650fd851fdb');
INSERT INTO `sys_role_menu` VALUES ('c9ec768e1d3a41e29bb22355fa2f7323', '59fcb8500eb24f20bf7263467d757212', '0ee02b8dc3064fcd972f527c31aad5a7');
INSERT INTO `sys_role_menu` VALUES ('ca0d753cc21a44c79dc742eb69a3231a', '59fcb8500eb24f20bf7263467d757212', '5ba624643cd34ec3b78ca622964c0f8a');
INSERT INTO `sys_role_menu` VALUES ('ca33cc44d9ea4a2590f109c1ac3808c4', '59fcb8500eb24f20bf7263467d757212', '6');
INSERT INTO `sys_role_menu` VALUES ('c9a71803605145c6bb47f6590b618f90', '59fcb8500eb24f20bf7263467d757212', '657026922f494801a41b64f40e63fca6');
INSERT INTO `sys_role_menu` VALUES ('cabcefbd441648b1b6ee43cabef9508b', '23ab268d7e0247868dcf484ab63ff595', 'c3adad9112de41a6a2d4cc9fe4a4d94b');
INSERT INTO `sys_role_menu` VALUES ('cad015554cb848829328fb707cd6df90', '59fcb8500eb24f20bf7263467d757212', '3a64f8a80dce4f6c8bc4483f0230f49f');
INSERT INTO `sys_role_menu` VALUES ('cb92f317fb134cd7b571e2594c1aefee', '59fcb8500eb24f20bf7263467d757212', '347d24c6e1cf42eaa976c91f5607007a');
INSERT INTO `sys_role_menu` VALUES ('cec6baac80f44624a725c9c09801f342', '59fcb8500eb24f20bf7263467d757212', 'c3adad9112de41a6a2d4cc9fe4a4d94b');
INSERT INTO `sys_role_menu` VALUES ('d3bda633963c413ca9dbcb0f9fc1193a', '59fcb8500eb24f20bf7263467d757212', '451605025d9a4715b4ae78f5a5d01fea');
INSERT INTO `sys_role_menu` VALUES ('cd3ba2447bdc4b5a869f6bb1ab759dc1', '59fcb8500eb24f20bf7263467d757212', '15');
INSERT INTO `sys_role_menu` VALUES ('cfebd20fcf65466da88f6df33f778106', '59fcb8500eb24f20bf7263467d757212', '6');
INSERT INTO `sys_role_menu` VALUES ('d15164a2b93a4c45a3958bbe20417b81', '59fcb8500eb24f20bf7263467d757212', 'c3adad9112de41a6a2d4cc9fe4a4d94b');
INSERT INTO `sys_role_menu` VALUES ('d29236668dde49fb80ae4f9da12af93e', '59fcb8500eb24f20bf7263467d757212', '72de30896d3a401eb62edc0aa6fbf190');
INSERT INTO `sys_role_menu` VALUES ('d474617d2527497abf8faee3f78805ca', '59fcb8500eb24f20bf7263467d757212', 'ecb3ebcb68b54e06bd29f270a97cbb67');
INSERT INTO `sys_role_menu` VALUES ('d4b7aab188ea4b098d6ba41a252a0edd', '59fcb8500eb24f20bf7263467d757212', '095bb0644ab14d97b31418f87e1cf823');
INSERT INTO `sys_role_menu` VALUES ('d7b4ac981f024182ae4f37e0bba02720', '59fcb8500eb24f20bf7263467d757212', 'cfc631763d3e4f1ab973141ddbeee449');
INSERT INTO `sys_role_menu` VALUES ('d82711c1b42144a58d7ae11e7beacdd1', '59fcb8500eb24f20bf7263467d757212', '63f039ea5bcf4208978150b59484a429');
INSERT INTO `sys_role_menu` VALUES ('d8454ab03df5400396266a466db716c5', 'fce0ad963d1f42be9178c4c5c493f55e', '6f605148282b4949b5c96e2877dc9052');
INSERT INTO `sys_role_menu` VALUES ('e300bb593d234f06b128ca88062038ac', '59fcb8500eb24f20bf7263467d757212', 'ecb3ebcb68b54e06bd29f270a97cbb67');
INSERT INTO `sys_role_menu` VALUES ('e387e62403a1428d969ed3e2b82f3e83', '59fcb8500eb24f20bf7263467d757212', '63f039ea5bcf4208978150b59484a429');
INSERT INTO `sys_role_menu` VALUES ('de30b609125c4f259b1bb4ada8fff623', '59fcb8500eb24f20bf7263467d757212', 'fa483765360243d0a631a2b9793aaf41');
INSERT INTO `sys_role_menu` VALUES ('e42d4a2db5424e30af0b1b5b2e25d8ad', '59fcb8500eb24f20bf7263467d757212', '7');
INSERT INTO `sys_role_menu` VALUES ('e553f51f98524b3e90df2adc02c380cb', 'fce0ad963d1f42be9178c4c5c493f55e', '7f78172c09d3408dab1534d26b608b31');
INSERT INTO `sys_role_menu` VALUES ('e6be0318da604650b3bcdad0824c8281', '59fcb8500eb24f20bf7263467d757212', '34ffa24d3c124902893e601fe8e22b08');
INSERT INTO `sys_role_menu` VALUES ('e86a10855264400d815bddce913669f3', '59fcb8500eb24f20bf7263467d757212', '3');
INSERT INTO `sys_role_menu` VALUES ('e5cd84f8d4a14260bce984788759ee36', '59fcb8500eb24f20bf7263467d757212', '901959fd37df4f7d90adaa4ab6c4b331');
INSERT INTO `sys_role_menu` VALUES ('ed86f7b076354fa18b2cf3e47fd0de67', 'fce0ad963d1f42be9178c4c5c493f55e', '71e5179363bc4e119a87daaa631a2712');
INSERT INTO `sys_role_menu` VALUES ('f0dafca3efcb4d7cb26716af01f34ed7', 'fce0ad963d1f42be9178c4c5c493f55e', 'b93eba1199b6420a82d285a8919bcd23');
INSERT INTO `sys_role_menu` VALUES ('f210587bfb854f3eab2e83d37ddfd157', '59fcb8500eb24f20bf7263467d757212', '5');
INSERT INTO `sys_role_menu` VALUES ('f62f94733cb54e6ca5151d280fef5d19', '59fcb8500eb24f20bf7263467d757212', 'fa483765360243d0a631a2b9793aaf41');
INSERT INTO `sys_role_menu` VALUES ('fbbbc28ce94448f293cae17279a60462', '59fcb8500eb24f20bf7263467d757212', '9c0846685bb24aafae731bdacf879ba2');
INSERT INTO `sys_role_menu` VALUES ('f608e50060934b52a8da0d0ad1f1de3a', '59fcb8500eb24f20bf7263467d757212', '4');
INSERT INTO `sys_role_menu` VALUES ('f652d043d9554c9b9565c0688dd0e677', '59fcb8500eb24f20bf7263467d757212', '8a3b997df4ea48548b626ef8e89a704d');
INSERT INTO `sys_role_menu` VALUES ('f886b677270d49b3b1760bb8d3a095d9', '59fcb8500eb24f20bf7263467d757212', '36cca77232f3487cbee02bb68ae12652');
INSERT INTO `sys_role_menu` VALUES ('fb6c1d1037cd4a58b662284fd0e9d96d', '59fcb8500eb24f20bf7263467d757212', '8b67ccbe89f74b728e58c2e4a4795027');
INSERT INTO `sys_role_menu` VALUES ('fc8e2c159e644b5b93921eedec96f506', 'fce0ad963d1f42be9178c4c5c493f55e', '14');
-- ----------------------------
-- Table structure for sys_route
-- ----------------------------
DROP TABLE IF EXISTS `sys_route`;
CREATE TABLE `sys_route` (
`id` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
`route_id` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '路由ID',
`route_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '路由名称',
`predicates` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '断言',
`filters` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '过滤器',
`uri` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'URI',
`sort` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '排序',
`status` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '启用禁用',
`creator` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
`create_date` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建时间',
`modifier` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '修改人',
`modify_date` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '修改时间',
`del_flag` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '删除标记',
`application_code` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '系统编号',
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
-- ----------------------------
-- Records of sys_route
-- ----------------------------
INSERT INTO `sys_route` VALUES ('0f1aec35a545433c8cc0c8e78995f039', 'auth-service', '认证授权服务', '[\n {\n \"name\": \"Path\",\n \"args\": {\n \"_genkey_0\": \"/api/auth/**\"\n }\n }\n]', '[\n {\n \"name\": \"StripPrefix\",\n \"args\": {\n \"_genkey_0\": \"2\"\n }\n },\n {\n \"name\": \"RemoveRequestHeader\",\n \"args\": {\n \"_genkey_0\": \"Cookie\",\n \"_genkey_1\": \"Set-Cookie\"\n }\n }\n]', 'lb://auth-service', '0', '0', 'admin', '2019-04-07 11:20:55', 'admin', '2019-04-07 14:35:44', '0', 'EXAM');
INSERT INTO `sys_route` VALUES ('5d9dd5f2cb1147aaad6f8b82a58586e8', 'exam-service', '考试服务', '[\n {\n \"name\": \"Path\",\n \"args\": {\n \"_genkey_0\": \"/api/exam/**\"\n }\n }\n]', '[\n {\n \"name\": \"StripPrefix\",\n \"args\": {\n \"_genkey_0\": \"2\"\n }\n },\n {\n \"name\": \"RemoveRequestHeader\",\n \"args\": {\n \"_genkey_0\": \"Cookie\",\n \"_genkey_1\": \"Set-Cookie\"\n }\n }\n]', 'lb://exam-service', '0', '0', 'admin', '2019-04-02 21:39:30', 'admin', '2019-04-07 21:06:08', '0', 'EXAM');
INSERT INTO `sys_route` VALUES ('e9199257e8dc4f2d8fbb2a113c407eca', 'user-service', '用户服务', '[\n {\n \"name\": \"Path\",\n \"args\": {\n \"_genkey_0\": \"/api/user/**\"\n }\n }\n]', '[\n {\n \"name\": \"StripPrefix\",\n \"args\": {\n \"_genkey_0\": \"2\"\n }\n },\n {\n \"name\": \"RemoveRequestHeader\",\n \"args\": {\n \"_genkey_0\": \"Cookie\",\n \"_genkey_1\": \"Set-Cookie\"\n }\n }\n]', 'lb://user-service', '0', '0', 'admin', '2019-04-07 11:22:05', 'admin', '2019-04-07 11:22:05', '0', 'EXAM');
-- ----------------------------
-- Table structure for sys_user
-- ----------------------------
DROP TABLE IF EXISTS `sys_user`;
......@@ -403,7 +420,7 @@ CREATE TABLE `sys_user` (
-- ----------------------------
-- Records of sys_user
-- ----------------------------
INSERT INTO `sys_user` VALUES ('2', '管理员', 'admin', '$2a$10$VguPuhGmeq10EfAuc7rGH.4ibasIXwL4toMU8T5O/iXidah0xgSoe', NULL, '15521089144', 'group1/M00/00/00/wKgAX1yXnqmABxpuAAB2ngEqI1k023.jpg', '19a1ae447b2f4f2d92816028b14c296f', '1633736729@qq.com', '0', '2018-10-04', '0', 'admin', '2018-09-01 14:37:09', 'admin', '2019-03-18 14:12:45', 0, 'EXAM', '管理员', '83f8d25ddc93445fa91e8c9d3db750a0');
INSERT INTO `sys_user` VALUES ('2', '管理员', 'admin', '$2a$10$VguPuhGmeq10EfAuc7rGH.4ibasIXwL4toMU8T5O/iXidah0xgSoe', NULL, '15521089144', '', '', '1633736729@qq.com', '0', '2018-10-04', '0', 'admin', '2018-09-01 14:37:09', 'admin', '2019-03-18 14:12:45', 0, 'EXAM', '管理员', '83f8d25ddc93445fa91e8c9d3db750a0');
INSERT INTO `sys_user` VALUES ('3078afafab8346348cef667b3d56f813', '林老师', 'teacher', '$2a$10$53KTjxEBtn.RIJOMZ/tAcOpIRzwXaHWPeTZFqAYXXBLPMbDBBqbE6', NULL, '12345678901', '', NULL, NULL, '0', '2019-02-18', '0', 'admin', '2019-02-25 13:52:50', 'admin', '2019-03-20 21:43:40', 0, 'EXAM', '张老师', '83f8d25ddc93445fa91e8c9d3db750a0');
INSERT INTO `sys_user` VALUES ('abd4dbe19faf4f7f8ff239b63acc5d34', '梁同学', 'student', '$2a$10$WKc4EjebJbLHLnCgc1Jn/OgeiCVOXSuxw/Flb45Ay9pcogLepr1p6', NULL, '32323232323', '', '', NULL, '0', '2019-02-04', '0', 'admin', '2019-02-25 13:53:47', 'admin', '2019-03-28 16:13:09', 0, 'EXAM', '梁同学', '83f8d25ddc93445fa91e8c9d3db750a0');
......@@ -422,7 +439,7 @@ CREATE TABLE `sys_user_role` (
-- Records of sys_user_role
-- ----------------------------
INSERT INTO `sys_user_role` VALUES ('1bb0ec8a1e3b421f84a1b54eb9f00d33', 'abd4dbe19faf4f7f8ff239b63acc5d34', '23ab268d7e0247868dcf484ab63ff595');
INSERT INTO `sys_user_role` VALUES ('3ebf446ab584424eb67a1acbadb684d2', '3078afafab8346348cef667b3d56f813', 'fce0ad963d1f42be9178c4c5c493f55e');
INSERT INTO `sys_user_role` VALUES ('1f96bb80b7b44675ac59fb31d9619601', '3e55726d2d914cd383b57b166ce6d60b', '23ab268d7e0247868dcf484ab63ff595');
INSERT INTO `sys_user_role` VALUES ('4380dcd018bd4d8eb6417a28089b7b8d', '2', '59fcb8500eb24f20bf7263467d757212');
SET FOREIGN_KEY_CHECKS = 1;
doc/images/image_ui_menu.png
doc/images/image_ui_menu.png

70.7 KB | W: | H:

doc/images/image_ui_menu.png

53.2 KB | W: | H:

doc/images/image_ui_menu.png
doc/images/image_ui_menu.png
doc/images/image_ui_menu.png
doc/images/image_ui_menu.png
  • 2-up
  • Swipe
  • Onion skin
doc/产品设计/在线考试系统-数据库设计.PDM
This source diff could not be displayed because it is too large. You can view the blob instead.
doc/产品设计/在线考试系统-数据库设计.pdb
This source diff could not be displayed because it is too large. You can view the blob instead.
doc/产品设计/系统架构图.png
doc/产品设计/系统架构图.png

26.9 KB | W: | H:

doc/产品设计/系统架构图.png

67.8 KB | W: | H:

doc/产品设计/系统架构图.png
doc/产品设计/系统架构图.png
doc/产品设计/系统架构图.png
doc/产品设计/系统架构图.png
  • 2-up
  • Swipe
  • Onion skin
gateway-service/src/main/java/com/github/tangyi/gateway/config/RabbitConfig.java 0 → 100644
package com.github.tangyi.gateway.config;
import com.github.tangyi.common.core.constant.MqConstant;
import org.springframework.amqp.core.Queue;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
/**
* RabbitMq配置
*
* @author tangyi
* @date 2019/4/2 17:56
*/
@Configuration
public class RabbitConfig {
/**
* 修改路由
*
* @return Queue
*/
@Bean
public Queue editQueue() {
return new Queue(MqConstant.EDIT_GATEWAY_ROUTE_QUEUE);
}
/**
* 删除路由
*
* @return Queue
*/
@Bean
public Queue delQueue() {
return new Queue(MqConstant.DEL_GATEWAY_ROUTE_QUEUE);
}
/**
* 刷新路由
*
* @return Queue
*/
@Bean
public Queue refreshQueue() {
return new Queue(MqConstant.REFRESH_GATEWAY_ROUTE_QUEUE);
}
}
gateway-service/src/main/java/com/github/tangyi/gateway/config/RouteInitConfig.java 0 → 100644
package com.github.tangyi.gateway.config;
import com.github.tangyi.common.core.constant.CommonConstant;
import com.github.tangyi.common.core.model.Route;
import com.github.tangyi.common.core.utils.JsonMapper;
import com.github.tangyi.gateway.receiver.GatewayRouteReceiver;
import org.apache.commons.collections4.CollectionUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Configuration;
import org.springframework.data.redis.core.RedisTemplate;
import javax.annotation.PostConstruct;
import java.util.ArrayList;
import java.util.List;
/**
* 动态路由实现：修改数据库路由配置，用户服务发送路由更新消息，网关消费消息，更新路由配置
* 依赖Redis，如果Redis被清空，需要手动刷新加载路由列表
*
* @author tangyi
* @date 2019/4/2 14:40
*/
@Configuration
public class RouteInitConfig {
private static final Logger logger = LoggerFactory.getLogger(RouteInitConfig.class);
@Autowired
private RedisTemplate redisTemplate;
@Autowired
private GatewayRouteReceiver gatewayRouteReceiver;
@PostConstruct
public void initRoute() {
// 重Redis加载路由列表
Object object = redisTemplate.opsForValue().get(CommonConstant.ROUTE_KEY);
if (object != null) {
List<Route> routes = JsonMapper.getInstance().fromJson(object.toString(), JsonMapper.getInstance().createCollectionType(ArrayList.class, Route.class));
if (CollectionUtils.isNotEmpty(routes)) {
logger.info("加载{}条路由记录", routes.size());
for (Route route : routes)
gatewayRouteReceiver.editRoute(route);
}
}
}
}
gateway-service/src/main/java/com/github/tangyi/gateway/constants/GatewayConstant.java
......@@ -15,4 +15,9 @@ public class GatewayConstant {
* 手机登录URL
*/
public static final String MOBILE_TOKEN_URL = "/mobile/token";
/**
* 注册
*/
public static final String REGISTER = "/user/register";
}
gateway-service/src/main/java/com/github/tangyi/gateway/controller/RouteController.java → gateway-service/src/main/java/com/github/tangyi/gateway/controller/GatewayRouteController.java
package com.github.tangyi.gateway.controller;
import com.github.tangyi.common.core.constant.MqConstant;
import com.github.tangyi.common.core.model.ResponseBean;
import com.github.tangyi.gateway.module.GatewayFilterDefinition;
import com.github.tangyi.gateway.module.GatewayPredicateDefinition;
import com.github.tangyi.gateway.module.GatewayRouteDefinition;
import com.github.tangyi.common.core.vo.RouteFilterVo;
import com.github.tangyi.common.core.vo.RoutePredicateVo;
import com.github.tangyi.common.core.vo.RouteVo;
import com.github.tangyi.gateway.service.DynamicRouteService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.amqp.core.AmqpTemplate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cloud.gateway.filter.FilterDefinition;
import org.springframework.cloud.gateway.filter.GatewayFilter;
......@@ -32,10 +34,10 @@ import java.util.Map;
* @date 2019/3/27 10:59
*/
@RestController
@RequestMapping("/route")
public class RouteController {
@RequestMapping("/api/route")
public class GatewayRouteController {
private static final Logger logger = LoggerFactory.getLogger(RouteController.class);
private static final Logger logger = LoggerFactory.getLogger(GatewayRouteController.class);
private final RouteDefinitionLocator routeDefinitionLocator;
......@@ -43,11 +45,14 @@ public class RouteController {
private final DynamicRouteService dynamicRouteService;
private final AmqpTemplate amqpTemplate;
@Autowired
public RouteController(RouteDefinitionLocator routeDefinitionLocator, RouteLocator routeLocator, DynamicRouteService dynamicRouteService) {
public GatewayRouteController(RouteDefinitionLocator routeDefinitionLocator, RouteLocator routeLocator, DynamicRouteService dynamicRouteService, AmqpTemplate amqpTemplate) {
this.routeDefinitionLocator = routeDefinitionLocator;
this.routeLocator = routeLocator;
this.dynamicRouteService = dynamicRouteService;
this.amqpTemplate = amqpTemplate;
}
/**
......@@ -97,7 +102,7 @@ public class RouteController {
* @return ResponseBean
*/
@PostMapping
public ResponseBean<String> add(@RequestBody GatewayRouteDefinition gatewayRouteDefinition) {
public ResponseBean<String> add(@RequestBody RouteVo gatewayRouteDefinition) {
try {
RouteDefinition definition = assembleRouteDefinition(gatewayRouteDefinition);
logger.info("新增路由：{}，{}", definition.getId(), definition);
......@@ -123,43 +128,56 @@ public class RouteController {
/**
* 更新路由
*
* @param gatewayRouteDefinition gatewayRouteDefinition
* @param routeVo routeVo
* @return ResponseBean
*/
@PutMapping
public ResponseBean<String> update(@RequestBody GatewayRouteDefinition gatewayRouteDefinition) {
RouteDefinition definition = assembleRouteDefinition(gatewayRouteDefinition);
public ResponseBean<String> update(@RequestBody RouteVo routeVo) {
RouteDefinition definition = assembleRouteDefinition(routeVo);
return new ResponseBean<>(this.dynamicRouteService.update(definition));
}
/**
* @param gatewayRouteDefinition gatewayRouteDefinition
* 刷新路由
*
* @return ResponseBean
* @author tangyi
* @date 2019/04/07 12:32
*/
@GetMapping("/refresh")
public ResponseBean<Boolean> refresh() {
amqpTemplate.convertAndSend(MqConstant.REFRESH_GATEWAY_ROUTE_QUEUE, "refresh");
return new ResponseBean<>(Boolean.TRUE);
}
/**
* @param routeVo routeVo
* @return RouteDefinition
*/
private RouteDefinition assembleRouteDefinition(GatewayRouteDefinition gatewayRouteDefinition) {
private RouteDefinition assembleRouteDefinition(RouteVo routeVo) {
RouteDefinition definition = new RouteDefinition();
// id
definition.setId(gatewayRouteDefinition.getId());
definition.setId(routeVo.getRouteId());
List<PredicateDefinition> predicateDefinitions = new ArrayList<>();
// predicates
for (GatewayPredicateDefinition gpDefinition : gatewayRouteDefinition.getPredicates()) {
for (RoutePredicateVo routePredicateVo : routeVo.getPredicates()) {
PredicateDefinition predicate = new PredicateDefinition();
predicate.setArgs(gpDefinition.getArgs());
predicate.setName(gpDefinition.getName());
predicate.setArgs(routePredicateVo.getArgs());
predicate.setName(routePredicateVo.getName());
predicateDefinitions.add(predicate);
}
definition.setPredicates(predicateDefinitions);
// filters
List<FilterDefinition> filterDefinitions = new ArrayList<>();
for (GatewayFilterDefinition gatewayFilterDefinition : gatewayRouteDefinition.getFilters()) {
for (RouteFilterVo routeFilterVo : routeVo.getFilters()) {
FilterDefinition filterDefinition = new FilterDefinition();
filterDefinition.setName(gatewayFilterDefinition.getName());
filterDefinition.setArgs(gatewayFilterDefinition.getArgs());
filterDefinition.setName(routeFilterVo.getName());
filterDefinition.setArgs(routeFilterVo.getArgs());
filterDefinitions.add(filterDefinition);
}
definition.setFilters(filterDefinitions);
// uri
definition.setUri(URI.create(gatewayRouteDefinition.getUri()));
definition.setUri(URI.create(routeVo.getUri()));
return definition;
}
}
gateway-service/src/main/java/com/github/tangyi/gateway/filters/DecodePasswordFilter.java
......@@ -57,10 +57,11 @@ public class DecodePasswordFilter implements GlobalFilter, Ordered {
// 请求的URI
URI uri = request.getURI();
// 获取token的请求
if ("POST".equals(request.getMethodValue()) && StrUtil.containsAnyIgnoreCase(uri.getPath(), GatewayConstant.OAUTH_TOKEN_URL, GatewayConstant.MOBILE_TOKEN_URL)) {
if ("POST".equals(request.getMethodValue()) && StrUtil.containsAnyIgnoreCase(uri.getPath(), GatewayConstant.OAUTH_TOKEN_URL, GatewayConstant.REGISTER,
GatewayConstant.MOBILE_TOKEN_URL)) {
String grantType = request.getQueryParams().getFirst(GRANT_TYPE);
// 授权类型为密码模式则解密
if (PASSWORD.equals(grantType)) {
if (PASSWORD.equals(grantType) || StrUtil.containsAnyIgnoreCase(uri.getPath(), GatewayConstant.REGISTER)) {
String password = request.getQueryParams().getFirst(PASSWORD);
if (password == null || password.isEmpty()) {
logger.info("password is empty...");
......
gateway-service/src/main/java/com/github/tangyi/gateway/filters/ValidateCodeFilter.java
......@@ -43,10 +43,10 @@ public class ValidateCodeFilter implements GlobalFilter, Ordered {
// 请求的URI
URI uri = request.getURI();
if ("POST".equals(request.getMethodValue())
&& StrUtil.containsAnyIgnoreCase(uri.getPath(), GatewayConstant.OAUTH_TOKEN_URL, GatewayConstant.MOBILE_TOKEN_URL)) {
&& StrUtil.containsAnyIgnoreCase(uri.getPath(), GatewayConstant.OAUTH_TOKEN_URL, GatewayConstant.REGISTER, GatewayConstant.MOBILE_TOKEN_URL)) {
String grantType = request.getQueryParams().getFirst(GRANT_TYPE);
// 授权类型为密码模式才校验验证码
if (PASSWORD.equals(grantType)) {
// 授权类型为密码模式、注册才校验验证码
if (PASSWORD.equals(grantType) || StrUtil.containsAnyIgnoreCase(uri.getPath(), GatewayConstant.REGISTER)) {
// 校验验证码
checkCode(request);
}
......
gateway-service/src/main/java/com/github/tangyi/gateway/receiver/GatewayRouteReceiver.java 0 → 100644
package com.github.tangyi.gateway.receiver;
import com.fasterxml.jackson.databind.JavaType;
import com.github.tangyi.common.core.constant.MqConstant;
import com.github.tangyi.common.core.model.Route;
import com.github.tangyi.common.core.utils.JsonMapper;
import com.github.tangyi.common.core.vo.RouteFilterVo;
import com.github.tangyi.common.core.vo.RoutePredicateVo;
import com.github.tangyi.gateway.service.DynamicRouteService;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.amqp.rabbit.annotation.RabbitListener;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cloud.gateway.filter.FilterDefinition;
import org.springframework.cloud.gateway.handler.predicate.PredicateDefinition;
import org.springframework.cloud.gateway.route.RouteDefinition;
import org.springframework.stereotype.Service;
import java.net.URI;
import java.util.ArrayList;
import java.util.List;
/**
* 动态路由
*
* @author tangyi
* @date 2019/4/2 18:07
*/
@Service
public class GatewayRouteReceiver {
private static final Logger logger = LoggerFactory.getLogger(GatewayRouteReceiver.class);
@Autowired
private DynamicRouteService dynamicRouteService;
/**
* 修改路由
*
* @param route route
* @author tangyi
* @date 2019/04/02 20:51
*/
@RabbitListener(queues = {MqConstant.EDIT_GATEWAY_ROUTE_QUEUE})
public void editRoute(Route route) {
if (route.getRouteId() == null)
throw new IllegalArgumentException("routeId不能为空！");
logger.info("更新{}路由", route.getRouteId());
dynamicRouteService.update(routeDefinition(route));
}
/**
* 删除路由
*
* @param routes routes
* @author tangyi
* @date 2019/04/02 20:51
*/
@RabbitListener(queues = {MqConstant.DEL_GATEWAY_ROUTE_QUEUE})
public void delRoute(List<Route> routes) {
if (routes == null || routes.isEmpty())
return;
for (Route route : routes) {
if (route.getRouteId() == null)
throw new IllegalArgumentException("routeId不能为空！");
logger.info("删除{}路由", route.getRouteId());
dynamicRouteService.delete(route.getRouteId());
}
}
/**
* 初始化RouteDefinition
*
* @param route route
* @return RouteDefinition
* @author tangyi
* @date 2019/04/02 18:50
*/
private RouteDefinition routeDefinition(Route route) {
RouteDefinition routeDefinition = new RouteDefinition();
// id
routeDefinition.setId(route.getRouteId());
// predicates
if (StringUtils.isNotBlank(route.getPredicates()))
routeDefinition.setPredicates(predicateDefinitions(route));
// filters
if (StringUtils.isNotBlank(route.getFilters())) {
routeDefinition.setFilters(filterDefinitions(route));
}
// uri
routeDefinition.setUri(URI.create(route.getUri()));
return routeDefinition;
}
/**
* @param route route
* @return List
* @author tangyi
* @date 2019/04/02 21:28
*/
private List<PredicateDefinition> predicateDefinitions(Route route) {
List<PredicateDefinition> predicateDefinitions = new ArrayList<>();
try {
List<RoutePredicateVo> routePredicateVoList = JsonMapper.getInstance().fromJson(route.getPredicates(),
JsonMapper.getInstance().createCollectionType(ArrayList.class, RoutePredicateVo.class));
if (CollectionUtils.isNotEmpty(routePredicateVoList)) {
for (RoutePredicateVo routePredicateVo : routePredicateVoList) {
PredicateDefinition predicate = new PredicateDefinition();
predicate.setArgs(routePredicateVo.getArgs());
predicate.setName(routePredicateVo.getName());
predicateDefinitions.add(predicate);
}
}
} catch (Exception e) {
logger.error(e.getMessage(), e);
}
return predicateDefinitions;
}
/**
* @param route route
* @return List
* @author tangyi
* @date 2019/04/02 21:29
*/
private List<FilterDefinition> filterDefinitions(Route route) {
List<FilterDefinition> filterDefinitions = new ArrayList<>();
try {
JavaType javaType = JsonMapper.getInstance().createCollectionType(ArrayList.class, RouteFilterVo.class);
List<RouteFilterVo> gatewayFilterDefinitions = JsonMapper.getInstance().fromJson(route.getFilters(), javaType);
if (CollectionUtils.isNotEmpty(gatewayFilterDefinitions)) {
for (RouteFilterVo gatewayFilterDefinition : gatewayFilterDefinitions) {
FilterDefinition filterDefinition = new FilterDefinition();
filterDefinition.setName(gatewayFilterDefinition.getName());
filterDefinition.setArgs(gatewayFilterDefinition.getArgs());
filterDefinitions.add(filterDefinition);
}
}
} catch (Exception e) {
logger.error(e.getMessage(), e);
}
return filterDefinitions;
}
}
gateway-service/src/main/java/com/github/tangyi/gateway/service/DynamicRouteService.java
......@@ -67,7 +67,7 @@ public class DynamicRouteService implements ApplicationEventPublisherAware {
* 删除路由
*
* @param id id
* @return ResponseEntity
* @return Mono
*/
public Mono<ResponseEntity<Object>> delete(String id) {
return this.routeDefinitionWriter.delete(Mono.just(id))
......
monitor-service/src/main/java/com/github/tangyi/monitor/config/WebSecurityConfig.java
......@@ -31,7 +31,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
http.headers().frameOptions().disable();
http.authorizeRequests()
.antMatchers("/actuator/**", "/hystrix/**","/hystrix","*.stream").permitAll()
.antMatchers("/actuator/**", "/hystrix/**","/hystrix","*.sender").permitAll()
.antMatchers(adminContextPath + "/assets/**").permitAll()
.antMatchers(adminContextPath + "/login").permitAll()
.anyRequest().authenticated()
......
service-api-impl/auth-service/src/main/java/com/github/tangyi/auth/controller/OauthClientDetailsController.java
......@@ -9,6 +9,7 @@ import com.github.tangyi.common.core.utils.PageUtil;
import com.github.tangyi.common.core.utils.SysUtil;
import com.github.tangyi.common.core.web.BaseController;
import com.github.tangyi.common.log.annotation.Log;
import com.github.tangyi.common.security.constant.SecurityConstant;
import com.github.tangyi.common.security.utils.SecurityUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
......@@ -72,19 +73,18 @@ public class OauthClientDetailsController extends BaseController {
* @date 2019/03/30 16:54
*/
@RequestMapping("clientList")
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@ApiOperation(value = "获取客户端列表")
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "分页页码", defaultValue = CommonConstant.PAGE_NUM_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = "pageSize", value = "分页大小", defaultValue = CommonConstant.PAGE_SIZE_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = "sort", value = "排序字段", defaultValue = CommonConstant.PAGE_SORT_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = "order", value = "排序方向", defaultValue = CommonConstant.PAGE_ORDER_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = CommonConstant.PAGE_NUM, value = "分页页码", defaultValue = CommonConstant.PAGE_NUM_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = CommonConstant.PAGE_SIZE, value = "分页大小", defaultValue = CommonConstant.PAGE_SIZE_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = CommonConstant.SORT, value = "排序字段", defaultValue = CommonConstant.PAGE_SORT_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = CommonConstant.ORDER, value = "排序方向", defaultValue = CommonConstant.PAGE_ORDER_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = "attachment", value = "客户端信息", dataType = "OauthClient")
})
public PageInfo<OauthClientDetails> oauthClientList(@RequestParam(value = "pageNum", required = false, defaultValue = CommonConstant.PAGE_NUM_DEFAULT) String pageNum,
@RequestParam(value = "pageSize", required = false, defaultValue = CommonConstant.PAGE_SIZE_DEFAULT) String pageSize,
@RequestParam(value = "sort", required = false, defaultValue = CommonConstant.PAGE_SORT_DEFAULT) String sort,
@RequestParam(value = "order", required = false, defaultValue = CommonConstant.PAGE_ORDER_DEFAULT) String order,
public PageInfo<OauthClientDetails> oauthClientList(@RequestParam(value = CommonConstant.PAGE_NUM, required = false, defaultValue = CommonConstant.PAGE_NUM_DEFAULT) String pageNum,
@RequestParam(value = CommonConstant.PAGE_SIZE, required = false, defaultValue = CommonConstant.PAGE_SIZE_DEFAULT) String pageSize,
@RequestParam(value = CommonConstant.SORT, required = false, defaultValue = CommonConstant.PAGE_SORT_DEFAULT) String sort,
@RequestParam(value = CommonConstant.ORDER, required = false, defaultValue = CommonConstant.PAGE_ORDER_DEFAULT) String order,
OauthClientDetails oauthClientDetails) {
return oauthClientDetailsService.findPage(PageUtil.pageInfo(pageNum, pageSize, sort, order), oauthClientDetails);
}
......@@ -98,7 +98,6 @@ public class OauthClientDetailsController extends BaseController {
* @date 2019/03/30 23:17
*/
@RequestMapping("clients")
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@ApiOperation(value = "查询客户端列表", notes = "查询客户端列表")
@ApiImplicitParam(name = "oauthClient", value = "客户端实体oauthClient", required = true, dataType = "OauthClientDetails")
public ResponseBean<List<OauthClientDetails>> findOauthClientList(@RequestBody OauthClientDetails oauthClientDetails) {
......@@ -114,7 +113,7 @@ public class OauthClientDetailsController extends BaseController {
* @date 2019/03/30 16:57
*/
@PostMapping
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@PreAuthorize("hasAuthority('sys:client:add') or hasAnyRole('" + SecurityConstant.ROLE_ADMIN + "')")
@ApiOperation(value = "创建客户端", notes = "创建客户端")
@ApiImplicitParam(name = "oauthClientDetails", value = "客户端实体oauthClientDetails", required = true, dataType = "OauthClientDetails")
@Log("新增客户端")
......@@ -134,7 +133,7 @@ public class OauthClientDetailsController extends BaseController {
* @date 2019/03/30 16:56
*/
@PutMapping
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@PreAuthorize("hasAuthority('sys:client:edit') or hasAnyRole('" + SecurityConstant.ROLE_ADMIN + "')")
@ApiOperation(value = "更新客户端信息", notes = "根据客户端id更新客户端的基本信息")
@ApiImplicitParam(name = "oauthClientDetails", value = "客户端实体oauthClientDetails", required = true, dataType = "OauthClientDetails")
@Log("修改客户端")
......@@ -154,7 +153,7 @@ public class OauthClientDetailsController extends BaseController {
* @date 2019/03/30 16:59
*/
@DeleteMapping("/{id}")
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@PreAuthorize("hasAuthority('sys:client:del') or hasAnyRole('" + SecurityConstant.ROLE_ADMIN + "')")
@ApiOperation(value = "删除客户端", notes = "根据ID删除客户端")
@ApiImplicitParam(name = "id", value = "客户端ID", required = true, paramType = "path")
@Log("删除客户端")
......@@ -175,7 +174,7 @@ public class OauthClientDetailsController extends BaseController {
* @date 2019/03/30 17:01
*/
@PostMapping("/deleteAll")
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@PreAuthorize("hasAuthority('sys:client:del') or hasAnyRole('" + SecurityConstant.ROLE_ADMIN + "')")
@ApiOperation(value = "批量删除客户端", notes = "根据客户端id批量删除客户端")
@ApiImplicitParam(name = "oauthClientDetails", value = "客户端信息", dataType = "OauthClientDetails")
@Log("批量删除客户端")
......
service-api-impl/exam-service/src/main/java/com/github/tangyi/exam/controller/AnswerController.java
......@@ -19,7 +19,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
/**
......@@ -35,6 +34,7 @@ public class AnswerController extends BaseController {
private static final Logger logger = LoggerFactory.getLogger(AnswerController.class);
@Autowired
private AnswerService answerService;
......@@ -47,7 +47,6 @@ public class AnswerController extends BaseController {
* @date 2018/11/10 21:23
*/
@GetMapping("/{id}")
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@ApiOperation(value = "获取答题信息", notes = "根据答题id获取答题详细信息")
@ApiImplicitParam(name = "id", value = "答题ID", required = true, dataType = "String", paramType = "path")
public ResponseBean<Answer> answer(@PathVariable String id) {
......@@ -72,19 +71,18 @@ public class AnswerController extends BaseController {
* @date 2018/11/10 21:25
*/
@RequestMapping("answerList")
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@ApiOperation(value = "获取答题列表")
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "分页页码", defaultValue = CommonConstant.PAGE_NUM_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = "pageSize", value = "分页大小", defaultValue = CommonConstant.PAGE_SIZE_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = "sort", value = "排序字段", defaultValue = CommonConstant.PAGE_SORT_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = "order", value = "排序方向", defaultValue = CommonConstant.PAGE_ORDER_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = CommonConstant.PAGE_NUM, value = "分页页码", defaultValue = CommonConstant.PAGE_NUM_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = CommonConstant.PAGE_SIZE, value = "分页大小", defaultValue = CommonConstant.PAGE_SIZE_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = CommonConstant.SORT, value = "排序字段", defaultValue = CommonConstant.PAGE_SORT_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = CommonConstant.ORDER, value = "排序方向", defaultValue = CommonConstant.PAGE_ORDER_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = "answer", value = "答题信息", dataType = "Answer")
})
public PageInfo<Answer> answerList(@RequestParam(value = "pageNum", required = false, defaultValue = CommonConstant.PAGE_NUM_DEFAULT) String pageNum,
@RequestParam(value = "pageSize", required = false, defaultValue = CommonConstant.PAGE_SIZE_DEFAULT) String pageSize,
@RequestParam(value = "sort", required = false, defaultValue = CommonConstant.PAGE_SORT_DEFAULT) String sort,
@RequestParam(value = "order", required = false, defaultValue = CommonConstant.PAGE_ORDER_DEFAULT) String order,
public PageInfo<Answer> answerList(@RequestParam(value = CommonConstant.PAGE_NUM, required = false, defaultValue = CommonConstant.PAGE_NUM_DEFAULT) String pageNum,
@RequestParam(value = CommonConstant.PAGE_SIZE, required = false, defaultValue = CommonConstant.PAGE_SIZE_DEFAULT) String pageSize,
@RequestParam(value = CommonConstant.SORT, required = false, defaultValue = CommonConstant.PAGE_SORT_DEFAULT) String sort,
@RequestParam(value = CommonConstant.ORDER, required = false, defaultValue = CommonConstant.PAGE_ORDER_DEFAULT) String order,
Answer answer) {
return answerService.findPage(PageUtil.pageInfo(pageNum, pageSize, sort, order), answer);
}
......@@ -98,7 +96,6 @@ public class AnswerController extends BaseController {
* @date 2018/11/10 21:26
*/
@PostMapping
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@ApiOperation(value = "创建答题", notes = "创建答题")
@ApiImplicitParam(name = "answer", value = "答题实体answer", required = true, dataType = "Answer")
@Log("新增答题")
......@@ -116,7 +113,6 @@ public class AnswerController extends BaseController {
* @date 2018/11/10 21:27
*/
@PutMapping
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@ApiOperation(value = "更新答题信息", notes = "根据答题id更新答题的基本信息")
@ApiImplicitParam(name = "answer", value = "答题实体answer", required = true, dataType = "Answer")
@Log("修改答题")
......@@ -134,7 +130,6 @@ public class AnswerController extends BaseController {
* @date 2018/11/10 21:28
*/
@DeleteMapping("{id}")
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@ApiOperation(value = "删除答题", notes = "根据ID删除答题")
@ApiImplicitParam(name = "id", value = "答题ID", required = true, paramType = "path")
@Log("删除答题")
......@@ -161,7 +156,6 @@ public class AnswerController extends BaseController {
* @date 2018/12/24 20:06
*/
@PostMapping("saveOrUpdate")
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@ApiOperation(value = "保存答题", notes = "保存答题")
@ApiImplicitParam(name = "answer", value = "答题信息", dataType = "Answer")
@Log("保存答题")
......@@ -190,7 +184,6 @@ public class AnswerController extends BaseController {
* @date 2018/12/24 20:44
*/
@PostMapping("submit")
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@ApiOperation(value = "提交答卷", notes = "提交答卷")
@ApiImplicitParam(name = "answer", value = "答卷信息", dataType = "Answer")
@Log("提交答题")
......
service-api-impl/exam-service/src/main/java/com/github/tangyi/exam/controller/CourseController.java
......@@ -7,6 +7,7 @@ import com.github.tangyi.common.core.utils.PageUtil;
import com.github.tangyi.common.core.utils.SysUtil;
import com.github.tangyi.common.core.web.BaseController;
import com.github.tangyi.common.log.annotation.Log;
import com.github.tangyi.common.security.constant.SecurityConstant;
import com.github.tangyi.common.security.utils.SecurityUtil;
import com.github.tangyi.exam.api.module.Course;
import com.github.tangyi.exam.service.CourseService;
......@@ -46,7 +47,6 @@ public class CourseController extends BaseController {
* @date 2018/11/10 21:28
*/
@GetMapping("/{id}")
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@ApiOperation(value = "获取课程信息", notes = "根据课程id获取课程详细信息")
@ApiImplicitParam(name = "id", value = "课程ID", required = true, dataType = "String", paramType = "path")
public ResponseBean<Course> course(@PathVariable String id) {
......@@ -71,19 +71,18 @@ public class CourseController extends BaseController {
* @date 2018/11/10 21:30
*/
@RequestMapping("courseList")
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@ApiOperation(value = "获取课程列表")
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "分页页码", defaultValue = CommonConstant.PAGE_NUM_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = "pageSize", value = "分页大小", defaultValue = CommonConstant.PAGE_SIZE_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = "sort", value = "排序字段", defaultValue = CommonConstant.PAGE_SORT_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = "order", value = "排序方向", defaultValue = CommonConstant.PAGE_ORDER_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = CommonConstant.PAGE_NUM, value = "分页页码", defaultValue = CommonConstant.PAGE_NUM_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = CommonConstant.PAGE_SIZE, value = "分页大小", defaultValue = CommonConstant.PAGE_SIZE_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = CommonConstant.SORT, value = "排序字段", defaultValue = CommonConstant.PAGE_SORT_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = CommonConstant.ORDER, value = "排序方向", defaultValue = CommonConstant.PAGE_ORDER_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = "course", value = "课程信息", dataType = "Course")
})
public PageInfo<Course> courseList(@RequestParam(value = "pageNum", required = false, defaultValue = CommonConstant.PAGE_NUM_DEFAULT) String pageNum,
@RequestParam(value = "pageSize", required = false, defaultValue = CommonConstant.PAGE_SIZE_DEFAULT) String pageSize,
@RequestParam(value = "sort", required = false, defaultValue = CommonConstant.PAGE_SORT_DEFAULT) String sort,
@RequestParam(value = "order", required = false, defaultValue = CommonConstant.PAGE_ORDER_DEFAULT) String order,
public PageInfo<Course> courseList(@RequestParam(value = CommonConstant.PAGE_NUM, required = false, defaultValue = CommonConstant.PAGE_NUM_DEFAULT) String pageNum,
@RequestParam(value = CommonConstant.PAGE_SIZE, required = false, defaultValue = CommonConstant.PAGE_SIZE_DEFAULT) String pageSize,
@RequestParam(value = CommonConstant.SORT, required = false, defaultValue = CommonConstant.PAGE_SORT_DEFAULT) String sort,
@RequestParam(value = CommonConstant.ORDER, required = false, defaultValue = CommonConstant.PAGE_ORDER_DEFAULT) String order,
Course course) {
return courseService.findPage(PageUtil.pageInfo(pageNum, pageSize, sort, order), course);
}
......@@ -97,7 +96,7 @@ public class CourseController extends BaseController {
* @date 2018/11/10 21:31
*/
@PostMapping
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@PreAuthorize("hasAuthority('exam:course:add') or hasAnyRole('" + SecurityConstant.ROLE_ADMIN + "', '" + SecurityConstant.ROLE_TEACHER + "')")
@ApiOperation(value = "创建课程", notes = "创建课程")
@ApiImplicitParam(name = "course", value = "课程实体course", required = true, dataType = "Course")
@Log("新增课程")
......@@ -115,7 +114,7 @@ public class CourseController extends BaseController {
* @date 2018/11/10 21:31
*/
@PutMapping
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@PreAuthorize("hasAuthority('exam:course:edit') or hasAnyRole('" + SecurityConstant.ROLE_ADMIN + "', '" + SecurityConstant.ROLE_TEACHER + "')")
@ApiOperation(value = "更新课程信息", notes = "根据课程id更新课程的基本信息")
@ApiImplicitParam(name = "course", value = "课程实体course", required = true, dataType = "Course")
@Log("更新课程")
......@@ -133,7 +132,7 @@ public class CourseController extends BaseController {
* @date 2018/11/10 21:32
*/
@DeleteMapping("{id}")
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@PreAuthorize("hasAuthority('exam:course:del') or hasAnyRole('" + SecurityConstant.ROLE_ADMIN + "', '" + SecurityConstant.ROLE_TEACHER + "')")
@ApiOperation(value = "删除课程", notes = "根据ID删除课程")
@ApiImplicitParam(name = "id", value = "课程ID", required = true, paramType = "path")
@Log("删除课程")
......@@ -162,7 +161,7 @@ public class CourseController extends BaseController {
* @date 2018/12/4 11:26
*/
@PostMapping("/deleteAll")
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@PreAuthorize("hasAuthority('exam:course:del') or hasAnyRole('" + SecurityConstant.ROLE_ADMIN + "', '" + SecurityConstant.ROLE_TEACHER + "')")
@ApiOperation(value = "批量删除课程", notes = "根据课程id批量删除课程")
@ApiImplicitParam(name = "course", value = "课程信息", dataType = "Course")
@Log("批量删除课程")
......
service-api-impl/exam-service/src/main/java/com/github/tangyi/exam/controller/ExamRecordController.java
......@@ -9,6 +9,7 @@ import com.github.tangyi.common.core.vo.DeptVo;
import com.github.tangyi.common.core.vo.UserVo;
import com.github.tangyi.common.core.web.BaseController;
import com.github.tangyi.common.log.annotation.Log;
import com.github.tangyi.common.security.constant.SecurityConstant;
import com.github.tangyi.common.security.utils.SecurityUtil;
import com.github.tangyi.exam.api.dto.ExamRecordDto;
import com.github.tangyi.exam.api.module.ExamRecord;
......@@ -67,10 +68,9 @@ public class ExamRecordController extends BaseController {
* @date 2018/11/10 21:33
*/
@GetMapping("/{id}")
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@ApiOperation(value = "获取考试记录信息", notes = "根据考试记录id获取考试记录详细信息")
@ApiImplicitParam(name = "id", value = "考试记录ID", required = true, dataType = "String", paramType = "path")
public ResponseBean<ExamRecord> examRecode(@PathVariable String id) {
public ResponseBean<ExamRecord> examRecord(@PathVariable String id) {
ExamRecord examRecord = new ExamRecord();
if (StringUtils.isNotBlank(id)) {
examRecord.setId(id);
......@@ -92,19 +92,18 @@ public class ExamRecordController extends BaseController {
* @date 2018/11/10 21:33
*/
@RequestMapping("examRecordList")
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@ApiOperation(value = "获取考试记录列表")
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "分页页码", defaultValue = CommonConstant.PAGE_NUM_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = "pageSize", value = "分页大小", defaultValue = CommonConstant.PAGE_SIZE_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = "sort", value = "排序字段", defaultValue = CommonConstant.PAGE_SORT_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = "order", value = "排序方向", defaultValue = CommonConstant.PAGE_ORDER_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = CommonConstant.PAGE_NUM, value = "分页页码", defaultValue = CommonConstant.PAGE_NUM_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = CommonConstant.PAGE_SIZE, value = "分页大小", defaultValue = CommonConstant.PAGE_SIZE_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = CommonConstant.SORT, value = "排序字段", defaultValue = CommonConstant.PAGE_SORT_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = CommonConstant.ORDER, value = "排序方向", defaultValue = CommonConstant.PAGE_ORDER_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = "examRecord", value = "考试记录信息", dataType = "ExamRecord")
})
public PageInfo<ExamRecordDto> examRecodeList(@RequestParam(value = "pageNum", required = false, defaultValue = CommonConstant.PAGE_NUM_DEFAULT) String pageNum,
@RequestParam(value = "pageSize", required = false, defaultValue = CommonConstant.PAGE_SIZE_DEFAULT) String pageSize,
@RequestParam(value = "sort", required = false, defaultValue = CommonConstant.PAGE_SORT_DEFAULT) String sort,
@RequestParam(value = "order", required = false, defaultValue = CommonConstant.PAGE_ORDER_DEFAULT) String order,
public PageInfo<ExamRecordDto> examRecordList(@RequestParam(value = CommonConstant.PAGE_NUM, required = false, defaultValue = CommonConstant.PAGE_NUM_DEFAULT) String pageNum,
@RequestParam(value = CommonConstant.PAGE_SIZE, required = false, defaultValue = CommonConstant.PAGE_SIZE_DEFAULT) String pageSize,
@RequestParam(value = CommonConstant.SORT, required = false, defaultValue = CommonConstant.PAGE_SORT_DEFAULT) String sort,
@RequestParam(value = CommonConstant.ORDER, required = false, defaultValue = CommonConstant.PAGE_ORDER_DEFAULT) String order,
ExamRecord examRecord) {
PageInfo<ExamRecordDto> examRecordDtoPageInfo = new PageInfo<>();
List<ExamRecordDto> examRecordDtoList = new ArrayList<>();
......@@ -183,11 +182,10 @@ public class ExamRecordController extends BaseController {
* @date 2018/11/10 21:33
*/
@PostMapping
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@ApiOperation(value = "创建考试记录", notes = "创建考试记录")
@ApiImplicitParam(name = "examRecord", value = "考试记录实体examRecord", required = true, dataType = "ExamRecord")
@Log("新增考试记录")
public ResponseBean<ExamRecord> addExamRecode(@RequestBody ExamRecord examRecord) {
public ResponseBean<ExamRecord> addExamRecord(@RequestBody ExamRecord examRecord) {
if (StringUtils.isEmpty(examRecord.getExaminationId()))
throw new CommonException("参数校验失败，考试id为空！");
if (StringUtils.isEmpty(examRecord.getUserId()))
......@@ -215,11 +213,10 @@ public class ExamRecordController extends BaseController {
* @date 2018/11/10 21:34
*/
@PutMapping
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@ApiOperation(value = "更新考试记录信息", notes = "根据考试记录id更新考试记录的基本信息")
@ApiImplicitParam(name = "examRecord", value = "考试记录实体examRecord", required = true, dataType = "ExamRecord")
@Log("更新考试记录")
public ResponseBean<Boolean> updateExamRecode(@RequestBody ExamRecord examRecord) {
public ResponseBean<Boolean> updateExamRecord(@RequestBody ExamRecord examRecord) {
examRecord.setCommonValue(SecurityUtil.getCurrentUsername(), SysUtil.getSysCode());
return new ResponseBean<>(examRecordService.update(examRecord) > 0);
}
......@@ -233,11 +230,10 @@ public class ExamRecordController extends BaseController {
* @date 2018/11/10 21:34
*/
@DeleteMapping("{id}")
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@ApiOperation(value = "删除考试记录", notes = "根据ID删除考试记录")
@ApiImplicitParam(name = "id", value = "考试记录ID", required = true, paramType = "path")
@Log("删除考试记录")
public ResponseBean<Boolean> deleteExamRecode(@PathVariable String id) {
public ResponseBean<Boolean> deleteExamRecord(@PathVariable String id) {
boolean success = false;
try {
ExamRecord examRecord = examRecordService.get(id);
......@@ -259,7 +255,7 @@ public class ExamRecordController extends BaseController {
* @date 2018/12/31 22:28
*/
@PostMapping("/export")
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@PreAuthorize("hasAuthority('exam:examRecord:export') or hasAnyRole('" + SecurityConstant.ROLE_ADMIN + "', '" + SecurityConstant.ROLE_TEACHER + "')")
@ApiOperation(value = "导出考试成绩", notes = "根据成绩id导出成绩")
@ApiImplicitParam(name = "examRecordDto", value = "成绩信息", required = true, dataType = "ExamRecordDto")
@Log("导出考试记录")
......
service-api-impl/exam-service/src/main/java/com/github/tangyi/exam/controller/ExaminationController.java
......@@ -7,6 +7,7 @@ import com.github.tangyi.common.core.utils.PageUtil;
import com.github.tangyi.common.core.utils.SysUtil;
import com.github.tangyi.common.core.web.BaseController;
import com.github.tangyi.common.log.annotation.Log;
import com.github.tangyi.common.security.constant.SecurityConstant;
import com.github.tangyi.common.security.utils.SecurityUtil;
import com.github.tangyi.exam.api.dto.ExaminationDto;
import com.github.tangyi.exam.api.module.Course;
......@@ -57,7 +58,6 @@ public class ExaminationController extends BaseController {
* @date 2018/11/10 21:08
*/
@GetMapping("/{id}")
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@ApiOperation(value = "获取考试信息", notes = "根据考试id获取考试详细信息")
@ApiImplicitParam(name = "id", value = "考试ID", required = true, dataType = "String", paramType = "path")
public ResponseBean<Examination> examination(@PathVariable String id) {
......@@ -85,19 +85,18 @@ public class ExaminationController extends BaseController {
* @date 2018/11/10 21:10
*/
@RequestMapping("examinationList")
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@ApiOperation(value = "获取考试列表")
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "分页页码", defaultValue = CommonConstant.PAGE_NUM_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = "pageSize", value = "分页大小", defaultValue = CommonConstant.PAGE_SIZE_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = "sort", value = "排序字段", defaultValue = CommonConstant.PAGE_SORT_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = "order", value = "排序方向", defaultValue = CommonConstant.PAGE_ORDER_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = CommonConstant.PAGE_NUM, value = "分页页码", defaultValue = CommonConstant.PAGE_NUM_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = CommonConstant.PAGE_SIZE, value = "分页大小", defaultValue = CommonConstant.PAGE_SIZE_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = CommonConstant.SORT, value = "排序字段", defaultValue = CommonConstant.PAGE_SORT_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = CommonConstant.ORDER, value = "排序方向", defaultValue = CommonConstant.PAGE_ORDER_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = "examination", value = "考试信息", dataType = "Examination")
})
public PageInfo<ExaminationDto> examinationList(@RequestParam(value = "pageNum", required = false, defaultValue = CommonConstant.PAGE_NUM_DEFAULT) String pageNum,
@RequestParam(value = "pageSize", required = false, defaultValue = CommonConstant.PAGE_SIZE_DEFAULT) String pageSize,
@RequestParam(value = "sort", required = false, defaultValue = CommonConstant.PAGE_SORT_DEFAULT) String sort,
@RequestParam(value = "order", required = false, defaultValue = CommonConstant.PAGE_ORDER_DEFAULT) String order,
public PageInfo<ExaminationDto> examinationList(@RequestParam(value = CommonConstant.PAGE_NUM, required = false, defaultValue = CommonConstant.PAGE_NUM_DEFAULT) String pageNum,
@RequestParam(value = CommonConstant.PAGE_SIZE, required = false, defaultValue = CommonConstant.PAGE_SIZE_DEFAULT) String pageSize,
@RequestParam(value = CommonConstant.SORT, required = false, defaultValue = CommonConstant.PAGE_SORT_DEFAULT) String sort,
@RequestParam(value = CommonConstant.ORDER, required = false, defaultValue = CommonConstant.PAGE_ORDER_DEFAULT) String order,
Examination examination) {
PageInfo<Examination> page = examinationService.findPage(PageUtil.pageInfo(pageNum, pageSize, sort, order), examination);
PageInfo<ExaminationDto> examinationDtoPageInfo = new PageInfo<>();
......@@ -137,7 +136,7 @@ public class ExaminationController extends BaseController {
* @date 2018/11/10 21:14
*/
@PostMapping
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@PreAuthorize("hasAuthority('exam:exam:add') or hasAnyRole('" + SecurityConstant.ROLE_ADMIN + "', '" + SecurityConstant.ROLE_TEACHER + "')")
@ApiOperation(value = "创建考试", notes = "创建考试")
@ApiImplicitParam(name = "examinationDto", value = "考试实体examinationDto", required = true, dataType = "ExaminationDto")
@Log("新增考试")
......@@ -158,7 +157,7 @@ public class ExaminationController extends BaseController {
* @date 2018/11/10 21:15
*/
@PutMapping
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@PreAuthorize("hasAuthority('exam:exam:edit') or hasAnyRole('" + SecurityConstant.ROLE_ADMIN + "', '" + SecurityConstant.ROLE_TEACHER + "')")
@ApiOperation(value = "更新考试信息", notes = "根据考试id更新考试的基本信息")
@ApiImplicitParam(name = "examinationDto", value = "考试实体answer", required = true, dataType = "ExaminationDto")
@Log("更新考试")
......@@ -179,7 +178,7 @@ public class ExaminationController extends BaseController {
* @date 2018/11/10 21:20
*/
@DeleteMapping("{id}")
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@PreAuthorize("hasAuthority('exam:exam:del') or hasAnyRole('" + SecurityConstant.ROLE_ADMIN + "', '" + SecurityConstant.ROLE_TEACHER + "')")
@ApiOperation(value = "删除考试", notes = "根据ID删除考试")
@ApiImplicitParam(name = "id", value = "考试ID", required = true, paramType = "path")
@Log("删除考试")
......@@ -208,7 +207,7 @@ public class ExaminationController extends BaseController {
* @date 2018/12/03 22:03
*/
@PostMapping("/deleteAll")
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@PreAuthorize("hasAuthority('exam:exam:del') or hasAnyRole('" + SecurityConstant.ROLE_ADMIN + "', '" + SecurityConstant.ROLE_TEACHER + "')")
@ApiOperation(value = "批量删除考试", notes = "根据考试id批量删除考试")
@ApiImplicitParam(name = "examinationDto", value = "考试信息", dataType = "ExaminationDto")
@Log("批量删除考试")
......@@ -231,7 +230,6 @@ public class ExaminationController extends BaseController {
* @date 2019/3/1 15:30
*/
@GetMapping("/examinationCount")
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
public ResponseBean<Integer> findExaminationCount() {
Examination examination = new Examination();
examination.setCommonValue(SecurityUtil.getCurrentUsername(), SysUtil.getSysCode());
......
service-api-impl/exam-service/src/main/java/com/github/tangyi/exam/controller/IncorrectAnswerController.java
......@@ -23,7 +23,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
......@@ -59,10 +58,9 @@ public class IncorrectAnswerController extends BaseController {
* @date 2018/11/10 21:36
*/
@GetMapping("/{id}")
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@ApiOperation(value = "获取错题信息", notes = "根据错题id获取错题详细信息")
@ApiImplicitParam(name = "id", value = "错题ID", required = true, dataType = "String", paramType = "path")
public ResponseBean<IncorrectAnswer> examRecode(@PathVariable String id) {
public ResponseBean<IncorrectAnswer> examRecord(@PathVariable String id) {
IncorrectAnswer incorrectAnswer = new IncorrectAnswer();
if (StringUtils.isNotBlank(id)) {
incorrectAnswer.setId(id);
......@@ -84,19 +82,18 @@ public class IncorrectAnswerController extends BaseController {
* @date 2018/11/10 21:37
*/
@RequestMapping("incorrectAnswerList")
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@ApiOperation(value = "获取错题列表")
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "分页页码", defaultValue = CommonConstant.PAGE_NUM_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = "pageSize", value = "分页大小", defaultValue = CommonConstant.PAGE_SIZE_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = "sort", value = "排序字段", defaultValue = CommonConstant.PAGE_SORT_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = "order", value = "排序方向", defaultValue = CommonConstant.PAGE_ORDER_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = CommonConstant.PAGE_NUM, value = "分页页码", defaultValue = CommonConstant.PAGE_NUM_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = CommonConstant.PAGE_SIZE, value = "分页大小", defaultValue = CommonConstant.PAGE_SIZE_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = CommonConstant.SORT, value = "排序字段", defaultValue = CommonConstant.PAGE_SORT_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = CommonConstant.ORDER, value = "排序方向", defaultValue = CommonConstant.PAGE_ORDER_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = "incorrectAnswer", value = "错题信息", dataType = "IncorrectAnswer")
})
public PageInfo<IncorrectAnswerDto> incorrectAnswerList(@RequestParam(value = "pageNum", required = false, defaultValue = CommonConstant.PAGE_NUM_DEFAULT) String pageNum,
@RequestParam(value = "pageSize", required = false, defaultValue = CommonConstant.PAGE_SIZE_DEFAULT) String pageSize,
@RequestParam(value = "sort", required = false, defaultValue = CommonConstant.PAGE_SORT_DEFAULT) String sort,
@RequestParam(value = "order", required = false, defaultValue = CommonConstant.PAGE_ORDER_DEFAULT) String order,
public PageInfo<IncorrectAnswerDto> incorrectAnswerList(@RequestParam(value = CommonConstant.PAGE_NUM, required = false, defaultValue = CommonConstant.PAGE_NUM_DEFAULT) String pageNum,
@RequestParam(value = CommonConstant.PAGE_SIZE, required = false, defaultValue = CommonConstant.PAGE_SIZE_DEFAULT) String pageSize,
@RequestParam(value = CommonConstant.SORT, required = false, defaultValue = CommonConstant.PAGE_SORT_DEFAULT) String sort,
@RequestParam(value = CommonConstant.ORDER, required = false, defaultValue = CommonConstant.PAGE_ORDER_DEFAULT) String order,
IncorrectAnswer incorrectAnswer) {
// 查找错题
PageInfo<IncorrectAnswer> incorrectAnswerPageInfo = incorrectAnswerService.findPage(PageUtil.pageInfo(pageNum, pageSize, sort, order), incorrectAnswer);
......@@ -137,7 +134,6 @@ public class IncorrectAnswerController extends BaseController {
* @date 2018/11/10 21:38
*/
@PostMapping
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@ApiOperation(value = "创建错题", notes = "创建错题")
@ApiImplicitParam(name = "incorrectAnswer", value = "错题实体incorrectAnswer", required = true, dataType = "IncorrectAnswer")
@Log("新增错题")
......@@ -155,7 +151,6 @@ public class IncorrectAnswerController extends BaseController {
* @date 2018/11/10 21:38
*/
@PutMapping
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@ApiOperation(value = "更新错题信息", notes = "根据错题id更新错题的基本信息")
@ApiImplicitParam(name = "incorrectAnswer", value = "错题实体incorrectAnswer", required = true, dataType = "IncorrectAnswer")
@Log("更新错题")
......@@ -173,7 +168,6 @@ public class IncorrectAnswerController extends BaseController {
* @date 2018/11/10 21:39
*/
@DeleteMapping("{id}")
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@ApiOperation(value = "删除错题", notes = "根据ID删除错题")
@ApiImplicitParam(name = "id", value = "错题ID", required = true, paramType = "path")
@Log("删除错题")
......
service-api-impl/exam-service/src/main/java/com/github/tangyi/exam/controller/KnowledgeController.java
......@@ -23,7 +23,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
......@@ -59,7 +58,6 @@ public class KnowledgeController extends BaseController {
* @date 2019/1/1 15:15
*/
@GetMapping("/{id}")
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@ApiOperation(value = "获取知识信息", notes = "根据知识id获取知识详细信息")
@ApiImplicitParam(name = "id", value = "知识ID", required = true, dataType = "String", paramType = "path")
public ResponseBean<Knowledge> knowledge(@PathVariable String id) {
......@@ -84,19 +82,18 @@ public class KnowledgeController extends BaseController {
* @date 2019/1/1 15:15
*/
@RequestMapping("knowledgeList")
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@ApiOperation(value = "获取知识列表")
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "分页页码", defaultValue = CommonConstant.PAGE_NUM_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = "pageSize", value = "分页大小", defaultValue = CommonConstant.PAGE_SIZE_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = "sort", value = "排序字段", defaultValue = CommonConstant.PAGE_SORT_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = "order", value = "排序方向", defaultValue = CommonConstant.PAGE_ORDER_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = CommonConstant.PAGE_NUM, value = "分页页码", defaultValue = CommonConstant.PAGE_NUM_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = CommonConstant.PAGE_SIZE, value = "分页大小", defaultValue = CommonConstant.PAGE_SIZE_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = CommonConstant.SORT, value = "排序字段", defaultValue = CommonConstant.PAGE_SORT_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = CommonConstant.ORDER, value = "排序方向", defaultValue = CommonConstant.PAGE_ORDER_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = "knowledge", value = "知识信息", dataType = "Knowledge")
})
public PageInfo<KnowledgeDto> knowledgeList(@RequestParam(value = "pageNum", required = false, defaultValue = CommonConstant.PAGE_NUM_DEFAULT) String pageNum,
@RequestParam(value = "pageSize", required = false, defaultValue = CommonConstant.PAGE_SIZE_DEFAULT) String pageSize,
@RequestParam(value = "sort", required = false, defaultValue = CommonConstant.PAGE_SORT_DEFAULT) String sort,
@RequestParam(value = "order", required = false, defaultValue = CommonConstant.PAGE_ORDER_DEFAULT) String order,
public PageInfo<KnowledgeDto> knowledgeList(@RequestParam(value = CommonConstant.PAGE_NUM, required = false, defaultValue = CommonConstant.PAGE_NUM_DEFAULT) String pageNum,
@RequestParam(value = CommonConstant.PAGE_SIZE, required = false, defaultValue = CommonConstant.PAGE_SIZE_DEFAULT) String pageSize,
@RequestParam(value = CommonConstant.SORT, required = false, defaultValue = CommonConstant.PAGE_SORT_DEFAULT) String sort,
@RequestParam(value = CommonConstant.ORDER, required = false, defaultValue = CommonConstant.PAGE_ORDER_DEFAULT) String order,
Knowledge knowledge) {
// 查询知识
PageInfo<Knowledge> knowledgePageInfo = knowledgeService.findPage(PageUtil.pageInfo(pageNum, pageSize, sort, order), knowledge);
......@@ -143,7 +140,6 @@ public class KnowledgeController extends BaseController {
* @date 2019/1/1 15:15
*/
@PostMapping
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@ApiOperation(value = "创建知识", notes = "创建知识")
@ApiImplicitParam(name = "knowledge", value = "知识实体knowledge", required = true, dataType = "Knowledge")
@Log("新增知识")
......@@ -161,7 +157,6 @@ public class KnowledgeController extends BaseController {
* @date 2019/1/1 15:15
*/
@PutMapping
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@ApiOperation(value = "更新知识信息", notes = "根据知识id更新知识的基本信息")
@ApiImplicitParam(name = "knowledge", value = "知识实体knowledge", required = true, dataType = "Knowledge")
@Log("更新知识")
......@@ -179,7 +174,6 @@ public class KnowledgeController extends BaseController {
* @date 2019/1/1 15:15
*/
@DeleteMapping("{id}")
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@ApiOperation(value = "删除知识", notes = "根据ID删除知识")
@ApiImplicitParam(name = "id", value = "知识ID", required = true, paramType = "path")
@Log("删除知识")
......@@ -211,7 +205,6 @@ public class KnowledgeController extends BaseController {
* @date 2019/1/1 15:15
*/
@PostMapping("/deleteAll")
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@ApiOperation(value = "批量删除知识", notes = "根据知识id批量删除知识")
@ApiImplicitParam(name = "knowledge", value = "知识信息", dataType = "Knowledge")
@Log("批量删除知识")
......
service-api-impl/exam-service/src/main/java/com/github/tangyi/exam/controller/SubjectBankController.java
......@@ -6,6 +6,7 @@ import com.github.tangyi.common.core.model.ResponseBean;
import com.github.tangyi.common.core.utils.*;
import com.github.tangyi.common.core.web.BaseController;
import com.github.tangyi.common.log.annotation.Log;
import com.github.tangyi.common.security.constant.SecurityConstant;
import com.github.tangyi.common.security.utils.SecurityUtil;
import com.github.tangyi.exam.api.dto.SubjectBankDto;
import com.github.tangyi.exam.api.module.SubjectBank;
......@@ -57,7 +58,6 @@ public class SubjectBankController extends BaseController {
* @date 2018/12/9 14:12
*/
@GetMapping("/{id}")
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@ApiOperation(value = "获取题库信息", notes = "根据题库id获取题库详细信息")
@ApiImplicitParam(name = "id", value = "题库ID", required = true, dataType = "String", paramType = "path")
public ResponseBean<SubjectBank> subjectBank(@PathVariable String id) {
......@@ -82,19 +82,18 @@ public class SubjectBankController extends BaseController {
* @date 2018/12/9 14:13
*/
@RequestMapping("subjectBankList")
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@ApiOperation(value = "获取题库列表")
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "分页页码", defaultValue = CommonConstant.PAGE_NUM_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = "pageSize", value = "分页大小", defaultValue = CommonConstant.PAGE_SIZE_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = "sort", value = "排序字段", defaultValue = CommonConstant.PAGE_SORT_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = "order", value = "排序方向", defaultValue = CommonConstant.PAGE_ORDER_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = CommonConstant.PAGE_NUM, value = "分页页码", defaultValue = CommonConstant.PAGE_NUM_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = CommonConstant.PAGE_SIZE, value = "分页大小", defaultValue = CommonConstant.PAGE_SIZE_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = CommonConstant.SORT, value = "排序字段", defaultValue = CommonConstant.PAGE_SORT_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = CommonConstant.ORDER, value = "排序方向", defaultValue = CommonConstant.PAGE_ORDER_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = "subjectBank", value = "题库信息", dataType = "SubjectBank")
})
public PageInfo<SubjectBank> subjectBankList(@RequestParam(value = "pageNum", required = false, defaultValue = CommonConstant.PAGE_NUM_DEFAULT) String pageNum,
@RequestParam(value = "pageSize", required = false, defaultValue = CommonConstant.PAGE_SIZE_DEFAULT) String pageSize,
@RequestParam(value = "sort", required = false, defaultValue = CommonConstant.PAGE_SORT_DEFAULT) String sort,
@RequestParam(value = "order", required = false, defaultValue = CommonConstant.PAGE_ORDER_DEFAULT) String order,
public PageInfo<SubjectBank> subjectBankList(@RequestParam(value = CommonConstant.PAGE_NUM, required = false, defaultValue = CommonConstant.PAGE_NUM_DEFAULT) String pageNum,
@RequestParam(value = CommonConstant.PAGE_SIZE, required = false, defaultValue = CommonConstant.PAGE_SIZE_DEFAULT) String pageSize,
@RequestParam(value = CommonConstant.SORT, required = false, defaultValue = CommonConstant.PAGE_SORT_DEFAULT) String sort,
@RequestParam(value = CommonConstant.ORDER, required = false, defaultValue = CommonConstant.PAGE_ORDER_DEFAULT) String order,
SubjectBank subjectBank) {
PageInfo<SubjectBank> page = subjectBankService.findPage(PageUtil.pageInfo(pageNum, pageSize, sort, order), subjectBank);
if (CollectionUtils.isNotEmpty(page.getList())) {
......@@ -128,7 +127,7 @@ public class SubjectBankController extends BaseController {
* @date 2018/12/9 14:14
*/
@PostMapping
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@PreAuthorize("hasAuthority('exam:subject:bank:add') or hasAnyRole('" + SecurityConstant.ROLE_ADMIN + "', '" + SecurityConstant.ROLE_TEACHER + "')")
@ApiOperation(value = "创建题库", notes = "创建题库")
@ApiImplicitParam(name = "subjectBank", value = "题库实体subjectBank", required = true, dataType = "SubjectBank")
@Log("新增题库")
......@@ -146,7 +145,7 @@ public class SubjectBankController extends BaseController {
* @date 2018/12/9 14:15
*/
@PutMapping
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@PreAuthorize("hasAuthority('exam:subject:bank:edit') or hasAnyRole('" + SecurityConstant.ROLE_ADMIN + "', '" + SecurityConstant.ROLE_TEACHER + "')")
@ApiOperation(value = "更新题库信息", notes = "根据题库id更新题库的基本信息")
@ApiImplicitParam(name = "subjectBank", value = "题库实体subjectBank", required = true, dataType = "SubjectBank")
@Log("更新题库")
......@@ -164,7 +163,7 @@ public class SubjectBankController extends BaseController {
* @date 2018/12/9 14:15
*/
@DeleteMapping("{id}")
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@PreAuthorize("hasAuthority('exam:subject:bank:del') or hasAnyRole('" + SecurityConstant.ROLE_ADMIN + "', '" + SecurityConstant.ROLE_TEACHER + "')")
@ApiOperation(value = "删除题库", notes = "根据ID删除题库")
@ApiImplicitParam(name = "id", value = "题库ID", required = true, paramType = "path")
@Log("删除题库")
......@@ -192,7 +191,7 @@ public class SubjectBankController extends BaseController {
* @date 2018/12/9 14:16
*/
@PostMapping("/export")
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@PreAuthorize("hasAuthority('exam:subject:bank:export') or hasAnyRole('" + SecurityConstant.ROLE_ADMIN + "', '" + SecurityConstant.ROLE_TEACHER + "')")
@ApiOperation(value = "导出题目", notes = "根据分类id导出题目")
@ApiImplicitParam(name = "subjectBankDto", value = "分类信息", required = true, dataType = "SubjectBankDto")
@Log("导出题库题目")
......@@ -233,7 +232,7 @@ public class SubjectBankController extends BaseController {
* @date 2018/12/9 14:19
*/
@RequestMapping("/import")
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@PreAuthorize("hasAuthority('exam:subject:bank:import') or hasAnyRole('" + SecurityConstant.ROLE_ADMIN + "', '" + SecurityConstant.ROLE_TEACHER + "')")
@ApiOperation(value = "导入题目", notes = "导入题目")
@ApiImplicitParam(name = "categoryId", value = "分类ID", required = true, dataType = "String")
@Log("导入题库题目")
......@@ -273,7 +272,7 @@ public class SubjectBankController extends BaseController {
* @date 2018/12/04 9:55
*/
@PostMapping("/deleteAll")
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@PreAuthorize("hasAuthority('exam:subject:bank:del') or hasAnyRole('" + SecurityConstant.ROLE_ADMIN + "', '" + SecurityConstant.ROLE_TEACHER + "')")
@ApiOperation(value = "批量删除题目", notes = "根据题目id批量删除题目")
@ApiImplicitParam(name = "subjectBankDto", value = "题目信息", dataType = "SubjectBankDto")
@Log("批量删除题库题目")
......
service-api-impl/exam-service/src/main/java/com/github/tangyi/exam/controller/SubjectCategoryController.java
......@@ -6,6 +6,7 @@ import com.github.tangyi.common.core.utils.SysUtil;
import com.github.tangyi.common.core.utils.TreeUtil;
import com.github.tangyi.common.core.web.BaseController;
import com.github.tangyi.common.log.annotation.Log;
import com.github.tangyi.common.security.constant.SecurityConstant;
import com.github.tangyi.common.security.utils.SecurityUtil;
import com.github.tangyi.exam.api.dto.SubjectCategoryDto;
import com.github.tangyi.exam.api.module.SubjectCategory;
......@@ -42,7 +43,6 @@ public class SubjectCategoryController extends BaseController {
* @date 2018/12/04 22:03
*/
@GetMapping(value = "/categories")
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@ApiOperation(value = "获取分类列表")
public List<SubjectCategoryDto> menus() {
// 查询所有分类
......@@ -63,7 +63,6 @@ public class SubjectCategoryController extends BaseController {
* @date 2018/12/04 21:59
*/
@GetMapping("/{id}")
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@ApiOperation(value = "获取分类信息", notes = "根据分类id获取分类详细信息")
@ApiImplicitParam(name = "id", value = "分类ID", required = true, dataType = "String", paramType = "path")
public ResponseBean<SubjectCategory> subjectCategory(@PathVariable String id) {
......@@ -84,7 +83,7 @@ public class SubjectCategoryController extends BaseController {
* @date 2018/12/04 22:00
*/
@PostMapping
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@PreAuthorize("hasAuthority('exam:subject:category:add') or hasAnyRole('" + SecurityConstant.ROLE_ADMIN + "', '" + SecurityConstant.ROLE_TEACHER + "')")
@ApiOperation(value = "创建分类", notes = "创建分类")
@ApiImplicitParam(name = "subjectCategory", value = "分类实体subjectCategory", required = true, dataType = "SubjectCategory")
@Log("新增题目分类")
......@@ -102,7 +101,7 @@ public class SubjectCategoryController extends BaseController {
* @date 2018/12/04 22:01
*/
@PutMapping
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@PreAuthorize("hasAuthority('exam:subject:category:edit') or hasAnyRole('" + SecurityConstant.ROLE_ADMIN + "', '" + SecurityConstant.ROLE_TEACHER + "')")
@ApiOperation(value = "更新分类信息", notes = "根据分类id更新分类的基本信息")
@ApiImplicitParam(name = "subjectCategory", value = "分类实体subjectCategory", required = true, dataType = "SubjectCategory")
@Log("更新题目分类")
......@@ -120,7 +119,7 @@ public class SubjectCategoryController extends BaseController {
* @date 2018/12/04 22:02
*/
@DeleteMapping("/{id}")
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@PreAuthorize("hasAuthority('exam:subject:category:del') or hasAnyRole('" + SecurityConstant.ROLE_ADMIN + "', '" + SecurityConstant.ROLE_TEACHER + "')")
@ApiOperation(value = "删除分类", notes = "根据ID删除分类")
@ApiImplicitParam(name = "id", value = "分类ID", required = true, paramType = "path")
@Log("删除题目分类")
......
service-api-impl/exam-service/src/main/java/com/github/tangyi/exam/controller/SubjectController.java
......@@ -6,6 +6,7 @@ import com.github.tangyi.common.core.model.ResponseBean;
import com.github.tangyi.common.core.utils.*;
import com.github.tangyi.common.core.web.BaseController;
import com.github.tangyi.common.log.annotation.Log;
import com.github.tangyi.common.security.constant.SecurityConstant;
import com.github.tangyi.common.security.utils.SecurityUtil;
import com.github.tangyi.exam.api.dto.SubjectDto;
import com.github.tangyi.exam.api.module.Answer;
......@@ -70,7 +71,6 @@ public class SubjectController extends BaseController {
* @date 2018/11/10 21:43
*/
@GetMapping("/{id}")
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@ApiOperation(value = "获取题目信息", notes = "根据题目id获取题目详细信息")
@ApiImplicitParam(name = "id", value = "题目ID", required = true, dataType = "String", paramType = "path")
public ResponseBean<Subject> subject(@PathVariable String id) {
......@@ -95,19 +95,18 @@ public class SubjectController extends BaseController {
* @date 2018/11/10 21:43
*/
@RequestMapping("subjectList")
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@ApiOperation(value = "获取题目列表")
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "分页页码", defaultValue = CommonConstant.PAGE_NUM_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = "pageSize", value = "分页大小", defaultValue = CommonConstant.PAGE_SIZE_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = "sort", value = "排序字段", defaultValue = CommonConstant.PAGE_SORT_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = "order", value = "排序方向", defaultValue = CommonConstant.PAGE_ORDER_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = CommonConstant.PAGE_NUM, value = "分页页码", defaultValue = CommonConstant.PAGE_NUM_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = CommonConstant.PAGE_SIZE, value = "分页大小", defaultValue = CommonConstant.PAGE_SIZE_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = CommonConstant.SORT, value = "排序字段", defaultValue = CommonConstant.PAGE_SORT_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = CommonConstant.ORDER, value = "排序方向", defaultValue = CommonConstant.PAGE_ORDER_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = "subject", value = "题目信息", dataType = "Subject")
})
public PageInfo<Subject> subjectList(@RequestParam(value = "pageNum", required = false, defaultValue = CommonConstant.PAGE_NUM_DEFAULT) String pageNum,
@RequestParam(value = "pageSize", required = false, defaultValue = CommonConstant.PAGE_SIZE_DEFAULT) String pageSize,
@RequestParam(value = "sort", required = false, defaultValue = CommonConstant.PAGE_SORT_DEFAULT) String sort,
@RequestParam(value = "order", required = false, defaultValue = CommonConstant.PAGE_ORDER_DEFAULT) String order,
public PageInfo<Subject> subjectList(@RequestParam(value = CommonConstant.PAGE_NUM, required = false, defaultValue = CommonConstant.PAGE_NUM_DEFAULT) String pageNum,
@RequestParam(value = CommonConstant.PAGE_SIZE, required = false, defaultValue = CommonConstant.PAGE_SIZE_DEFAULT) String pageSize,
@RequestParam(value = CommonConstant.SORT, required = false, defaultValue = CommonConstant.PAGE_SORT_DEFAULT) String sort,
@RequestParam(value = CommonConstant.ORDER, required = false, defaultValue = CommonConstant.PAGE_ORDER_DEFAULT) String order,
Subject subject) {
return subjectService.findPage(PageUtil.pageInfo(pageNum, pageSize, sort, order), subject);
}
......@@ -121,7 +120,7 @@ public class SubjectController extends BaseController {
* @date 2018/11/10 21:43
*/
@PostMapping
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@PreAuthorize("hasAuthority('exam:exam:subject:add') or hasAnyRole('" + SecurityConstant.ROLE_ADMIN + "', '" + SecurityConstant.ROLE_TEACHER + "')")
@ApiOperation(value = "创建题目", notes = "创建题目")
@ApiImplicitParam(name = "subject", value = "题目实体subject", required = true, dataType = "Subject")
@Log("新增题目")
......@@ -149,7 +148,7 @@ public class SubjectController extends BaseController {
* @date 2018/11/10 21:43
*/
@PutMapping
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@PreAuthorize("hasAuthority('exam:exam:subject:edit') or hasAnyRole('" + SecurityConstant.ROLE_ADMIN + "', '" + SecurityConstant.ROLE_TEACHER + "')")
@ApiOperation(value = "更新题目信息", notes = "根据题目id更新题目的基本信息")
@ApiImplicitParam(name = "subject", value = "角色实体subject", required = true, dataType = "Subject")
@Log("更新题目")
......@@ -167,7 +166,7 @@ public class SubjectController extends BaseController {
* @date 2018/11/10 21:43
*/
@DeleteMapping("{id}")
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@PreAuthorize("hasAuthority('exam:exam:subject:del') or hasAnyRole('" + SecurityConstant.ROLE_ADMIN + "', '" + SecurityConstant.ROLE_TEACHER + "')")
@ApiOperation(value = "删除题目", notes = "根据ID删除题目")
@ApiImplicitParam(name = "id", value = "题目ID", required = true, paramType = "path")
@Log("删除题目")
......@@ -202,7 +201,7 @@ public class SubjectController extends BaseController {
* @date 2018/11/28 12:53
*/
@PostMapping("/export")
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@PreAuthorize("hasAuthority('exam:exam:subject:export') or hasAnyRole('" + SecurityConstant.ROLE_ADMIN + "', '" + SecurityConstant.ROLE_TEACHER + "')")
@ApiOperation(value = "导出题目", notes = "根据分类id导出题目")
@ApiImplicitParam(name = "subjectDto", value = "题目信息", required = true, dataType = "SubjectDto")
@Log("导出题目")
......@@ -243,7 +242,7 @@ public class SubjectController extends BaseController {
* @date 2018/11/28 12:59
*/
@RequestMapping("import")
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@PreAuthorize("hasAuthority('exam:exam:subject:import') or hasAnyRole('" + SecurityConstant.ROLE_ADMIN + "', '" + SecurityConstant.ROLE_TEACHER + "')")
@ApiOperation(value = "导入题目", notes = "导入题目")
@ApiImplicitParam(name = "examinationId", value = "考试ID", required = true, dataType = "String")
@Log("导入题目")
......@@ -286,7 +285,7 @@ public class SubjectController extends BaseController {
* @date 2018/12/04 9:55
*/
@PostMapping("deleteAll")
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@PreAuthorize("hasAuthority('exam:exam:subject:del') or hasAnyRole('" + SecurityConstant.ROLE_ADMIN + "', '" + SecurityConstant.ROLE_TEACHER + "')")
@ApiOperation(value = "批量删除题目", notes = "根据题目id批量删除题目")
@ApiImplicitParam(name = "subjectDto", value = "题目信息", dataType = "SubjectDto")
@Log("批量删除题目")
......@@ -326,7 +325,6 @@ public class SubjectController extends BaseController {
* @date 2019/01/16 22:25
*/
@GetMapping("subjectAnswer")
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@ApiOperation(value = "查询题目和答题", notes = "根据题目id查询题目和答题")
@ApiImplicitParams({
@ApiImplicitParam(name = "serialNumber", value = "题目序号", required = true, dataType = "String"),
......
service-api-impl/exam-service/src/main/java/com/github/tangyi/exam/service/AnswerService.java
......@@ -36,7 +36,7 @@ public class AnswerService extends CrudService<AnswerMapper, Answer> {
private IncorrectAnswerService incorrectAnswerService;
@Autowired
private ExamRecordService examRecodeService;
private ExamRecordService examRecordService;
@Autowired
private ExaminationService examinationService;
......@@ -171,8 +171,7 @@ public class AnswerService extends CrudService<AnswerMapper, Answer> {
examRecord.setScore(totalScore.toString());
examRecord.setCorrectNumber(correctNumber.toString());
examRecord.setInCorrectNumber(incorrectNumber.toString());
examRecodeService.getByUserIdAndExaminationId(examRecord);
success = examRecodeService.update(examRecord) > 0;
success = examRecordService.update(examRecord) > 0;
// 保存错题
ExamRecord searchExamRecord = new ExamRecord();
searchExamRecord.setUserId(answer.getUserId());
......
service-api-impl/exam-service/src/main/java/com/github/tangyi/exam/service/ExamRecordService.java
......@@ -26,7 +26,7 @@ public class ExamRecordService extends CrudService<ExamRecordMapper, ExamRecord>
* @date 2019/1/3 14:10
*/
@Override
@Cacheable(value = "recode", key = "#examRecord.id")
@Cacheable(value = "record", key = "#examRecord.id")
public ExamRecord get(ExamRecord examRecord) {
return super.get(examRecord);
}
......@@ -64,13 +64,13 @@ public class ExamRecordService extends CrudService<ExamRecordMapper, ExamRecord>
/**
* 根据用户id、考试id查找
*
* @param examRecode examRecode
* @return ExamRecode
* @param examRecord examRecord
* @return ExamRecord
* @author tangyi
* @date 2018/12/26 13:58
*/
public ExamRecord getByUserIdAndExaminationId(ExamRecord examRecode) {
return this.dao.getByUserIdAndExaminationId(examRecode);
public ExamRecord getByUserIdAndExaminationId(ExamRecord examRecord) {
return this.dao.getByUserIdAndExaminationId(examRecord);
}
/**
......
service-api-impl/exam-service/src/main/resources/mapper/ExamRecodeMapper.xml
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.github.tangyi.exam.mapper.ExamRecordMapper">
<resultMap id="examRecodeResultMap" type="com.github.tangyi.exam.api.module.ExamRecord">
<resultMap id="examRecordResultMap" type="com.github.tangyi.exam.api.module.ExamRecord">
<id column="id" property="id"/>
<result column="user_id" property="userId"/>
<result column="examination_id" property="examinationId"/>
......@@ -20,7 +20,7 @@
<result column="application_code" property="applicationCode"/>
</resultMap>
<sql id="examRecodeColumns">
<sql id="examRecordColumns">
a.id as "id",
a.user_id,
a.examination_id,
......@@ -55,32 +55,32 @@
</if>
</sql>
<select id="get" resultMap="examRecodeResultMap">
<select id="get" resultMap="examRecordResultMap">
SELECT
<include refid="examRecodeColumns"/>
FROM exam_recode a
<include refid="examRecordColumns"/>
FROM exam_record a
WHERE a.id = #{id} and a.del_flag = 0
</select>
<select id="getByUserIdAndExaminationId" resultMap="examRecodeResultMap">
<select id="getByUserIdAndExaminationId" resultMap="examRecordResultMap">
SELECT
<include refid="examRecodeColumns"/>
FROM exam_recode a
<include refid="examRecordColumns"/>
FROM exam_record a
WHERE a.user_id = #{userId} and examination_id = #{examinationId} and a.del_flag = 0
</select>
<select id="findList" resultMap="examRecodeResultMap">
<select id="findList" resultMap="examRecordResultMap">
SELECT
<include refid="examRecodeColumns"/>
FROM exam_recode a
<include refid="examRecordColumns"/>
FROM exam_record a
WHERE a.del_flag = 0
<include refid="whereColumnList"/>
</select>
<select id="findListById" resultMap="examRecodeResultMap">
<select id="findListById" resultMap="examRecordResultMap">
SELECT
<include refid="examRecodeColumns"/>
FROM exam_recode a
<include refid="examRecordColumns"/>
FROM exam_record a
WHERE a.id IN
<foreach collection="ids" index="index" item="item" open="(" separator="," close=")">
#{item}
......@@ -88,7 +88,7 @@
</select>
<insert id="insert">
insert into exam_recode (
insert into exam_record (
id,
user_id,
examination_id,
......@@ -126,7 +126,7 @@
</insert>
<update id="update">
UPDATE exam_recode SET
UPDATE exam_record SET
<if test="userId != null">
user_id = #{userId},
</if>
......@@ -163,7 +163,7 @@
</update>
<delete id="delete">
UPDATE exam_recode SET
UPDATE exam_record SET
del_flag = 1
WHERE id = #{id}
</delete>
......
service-api-impl/pom.xml
......@@ -8,6 +8,7 @@
<version>2.0-SNAPSHOT</version>
</parent>
<artifactId>service-api-impl</artifactId>
<packaging>pom</packaging>
<name>${project.artifactId}</name>
<description>api实现</description>
......
service-api-impl/user-service/src/main/java/com/github/tangyi/user/config/RabbitConfig.java 0 → 100644
package com.github.tangyi.user.config;
import com.github.tangyi.common.core.constant.MqConstant;
import org.springframework.amqp.core.Queue;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
/**
* RabbitMq配置
*
* @author tangyi
* @date 2019/4/2 17:56
*/
@Configuration
public class RabbitConfig {
/**
* 修改路由
*
* @return Queue
*/
@Bean
public Queue editQueue() {
return new Queue(MqConstant.EDIT_GATEWAY_ROUTE_QUEUE);
}
/**
* 删除路由
*
* @return Queue
*/
@Bean
public Queue delQueue() {
return new Queue(MqConstant.DEL_GATEWAY_ROUTE_QUEUE);
}
}
service-api-impl/user-service/src/main/java/com/github/tangyi/user/config/RouteInitConfig.java 0 → 100644
package com.github.tangyi.user.config;
import com.github.tangyi.common.core.constant.CommonConstant;
import com.github.tangyi.common.core.constant.MqConstant;
import com.github.tangyi.common.core.model.Route;
import com.github.tangyi.common.core.utils.JsonMapper;
import com.github.tangyi.user.service.RouteService;
import org.apache.commons.collections4.CollectionUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.amqp.core.AmqpTemplate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Configuration;
import org.springframework.data.redis.core.RedisTemplate;
import javax.annotation.PostConstruct;
import java.util.List;
/**
* 初始化路由信息
*
* @author tangyi
* @date 2019/4/2 18:42
*/
@Configuration
public class RouteInitConfig {
private static final Logger logger = LoggerFactory.getLogger(RouteInitConfig.class);
@Autowired
private RouteService routeService;
@Autowired
private AmqpTemplate amqpTemplate;
@Autowired
private RedisTemplate redisTemplate;
@PostConstruct
public void initRoute() {
init();
}
/**
* 加载所有路由，发送到mq，存放到redis
*
* @author tangyi
* @date 2019/04/07 12:05
*/
public void init() {
try {
Route init = new Route();
init.setStatus(CommonConstant.DEL_FLAG_NORMAL.toString());
List<Route> routes = routeService.findList(init);
if (CollectionUtils.isNotEmpty(routes)) {
logger.info("加载{}条路由记录", routes.size());
for (Route route : routes) {
// 发送消息
amqpTemplate.convertAndSend(MqConstant.EDIT_GATEWAY_ROUTE_QUEUE, route);
}
// 存入Redis
redisTemplate.opsForValue().set(CommonConstant.ROUTE_KEY, JsonMapper.getInstance().toJson(routes));
}
} catch (Exception e) {
logger.error(e.getMessage(), e);
}
}
}
service-api-impl/user-service/src/main/java/com/github/tangyi/user/controller/AttachmentController.java
......@@ -20,11 +20,8 @@ import io.swagger.annotations.*;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.util.FileCopyUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
......@@ -86,19 +83,18 @@ public class AttachmentController extends BaseController {
* @date 2018/10/30 21:05
*/
@RequestMapping("attachmentList")
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@ApiOperation(value = "获取附件列表")
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "分页页码", defaultValue = CommonConstant.PAGE_NUM_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = "pageSize", value = "分页大小", defaultValue = CommonConstant.PAGE_SIZE_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = "sort", value = "排序字段", defaultValue = CommonConstant.PAGE_SORT_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = "order", value = "排序方向", defaultValue = CommonConstant.PAGE_ORDER_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = CommonConstant.PAGE_NUM, value = "分页页码", defaultValue = CommonConstant.PAGE_NUM_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = CommonConstant.PAGE_SIZE, value = "分页大小", defaultValue = CommonConstant.PAGE_SIZE_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = CommonConstant.SORT, value = "排序字段", defaultValue = CommonConstant.PAGE_SORT_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = CommonConstant.ORDER, value = "排序方向", defaultValue = CommonConstant.PAGE_ORDER_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = "attachment", value = "附件信息", dataType = "Attachment")
})
public PageInfo<Attachment> userList(@RequestParam(value = "pageNum", required = false, defaultValue = CommonConstant.PAGE_NUM_DEFAULT) String pageNum,
@RequestParam(value = "pageSize", required = false, defaultValue = CommonConstant.PAGE_SIZE_DEFAULT) String pageSize,
@RequestParam(value = "sort", required = false, defaultValue = CommonConstant.PAGE_SORT_DEFAULT) String sort,
@RequestParam(value = "order", required = false, defaultValue = CommonConstant.PAGE_ORDER_DEFAULT) String order,
public PageInfo<Attachment> userList(@RequestParam(value = CommonConstant.PAGE_NUM, required = false, defaultValue = CommonConstant.PAGE_NUM_DEFAULT) String pageNum,
@RequestParam(value = CommonConstant.PAGE_SIZE, required = false, defaultValue = CommonConstant.PAGE_SIZE_DEFAULT) String pageSize,
@RequestParam(value = CommonConstant.SORT, required = false, defaultValue = CommonConstant.PAGE_SORT_DEFAULT) String sort,
@RequestParam(value = CommonConstant.ORDER, required = false, defaultValue = CommonConstant.PAGE_ORDER_DEFAULT) String order,
Attachment attachment) {
return attachmentService.findPage(PageUtil.pageInfo(pageNum, pageSize, sort, order), attachment);
}
......@@ -112,7 +108,6 @@ public class AttachmentController extends BaseController {
* @date 2018/10/30 21:54
*/
@RequestMapping("upload")
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@ApiOperation(value = "上传文件", notes = "上传文件")
@ApiImplicitParams({
@ApiImplicitParam(name = "busiType", value = "业务分类", dataType = "String"),
......@@ -201,7 +196,6 @@ public class AttachmentController extends BaseController {
* @date 2018/10/30 22:44
*/
@DeleteMapping("/{id}")
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@ApiOperation(value = "删除附件", notes = "根据ID删除附件")
@ApiImplicitParam(name = "id", value = "附件ID", required = true, paramType = "path")
@Log("删除附件")
......@@ -228,7 +222,6 @@ public class AttachmentController extends BaseController {
* @date 2018/12/4 10:01
*/
@PostMapping("/deleteAll")
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@ApiOperation(value = "批量删除附件", notes = "根据附件id批量删除附件")
@ApiImplicitParam(name = "attachment", value = "附件信息", dataType = "Attachment")
@Log("批量删除附件")
......@@ -252,7 +245,6 @@ public class AttachmentController extends BaseController {
* @date 2019/01/01 22:16
*/
@RequestMapping(value = "/findById", method = RequestMethod.POST)
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@ApiOperation(value = "批量查询附件信息", notes = "根据附件ID批量查询附件信息")
@ApiImplicitParam(name = "attachmentVo", value = "附件信息", dataType = "AttachmentVo")
public ResponseBean<List<AttachmentVo>> findById(@RequestBody AttachmentVo attachmentVo) {
......
service-api-impl/user-service/src/main/java/com/github/tangyi/user/controller/DashboardController.java
......@@ -2,12 +2,11 @@ package com.github.tangyi.user.controller;
import com.github.tangyi.common.core.model.ResponseBean;
import com.github.tangyi.common.core.web.BaseController;
import com.github.tangyi.user.api.dto.DashboardDto;
import com.github.tangyi.exam.api.feign.ExaminationServiceClient;
import com.github.tangyi.user.api.dto.DashboardDto;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
......@@ -35,7 +34,6 @@ public class DashboardController extends BaseController {
* @date 2019/3/1 13:55
*/
@GetMapping
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@ApiOperation(value = "后台首页数据展示", notes = "后台首页数据展示")
@SuppressWarnings("unchecked")
public ResponseBean<DashboardDto> dashboard() {
......
service-api-impl/user-service/src/main/java/com/github/tangyi/user/controller/DeptController.java
......@@ -7,6 +7,7 @@ import com.github.tangyi.common.core.utils.TreeUtil;
import com.github.tangyi.common.core.vo.DeptVo;
import com.github.tangyi.common.core.web.BaseController;
import com.github.tangyi.common.log.annotation.Log;
import com.github.tangyi.common.security.constant.SecurityConstant;
import com.github.tangyi.common.security.utils.SecurityUtil;
import com.github.tangyi.user.api.dto.DeptDto;
import com.github.tangyi.user.api.module.Dept;
......@@ -44,7 +45,6 @@ public class DeptController extends BaseController {
* @date 2018/10/25 12:57
*/
@GetMapping(value = "/depts")
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@ApiOperation(value = "获取部门列表")
public List<DeptDto> depts() {
// 查询所有部门
......@@ -65,7 +65,6 @@ public class DeptController extends BaseController {
* @date 2018/8/28 10:11
*/
@GetMapping("/{id}")
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@ApiOperation(value = "获取部门信息", notes = "根据部门id获取部门详细信息")
@ApiImplicitParam(name = "id", value = "部门ID", required = true, dataType = "String", paramType = "path")
public Dept get(@PathVariable String id) {
......@@ -83,7 +82,7 @@ public class DeptController extends BaseController {
* @date 2018/8/28 10:15
*/
@PostMapping
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@PreAuthorize("hasAuthority('sys:dept:add') or hasAnyRole('" + SecurityConstant.ROLE_ADMIN + "', '" + SecurityConstant.ROLE_TEACHER + "')")
@ApiOperation(value = "创建部门", notes = "创建部门")
@ApiImplicitParam(name = "dept", value = "部门实体", required = true, dataType = "Dept")
@Log("新增部门")
......@@ -101,7 +100,7 @@ public class DeptController extends BaseController {
* @date 2018/8/28 10:16
*/
@DeleteMapping("/{id}")
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@PreAuthorize("hasAuthority('sys:dept:del') or hasAnyRole('" + SecurityConstant.ROLE_ADMIN + "', '" + SecurityConstant.ROLE_TEACHER + "')")
@ApiOperation(value = "删除部门", notes = "根据ID删除部门")
@ApiImplicitParam(name = "id", value = "部门ID", required = true, paramType = "path")
@Log("删除部门")
......@@ -121,7 +120,7 @@ public class DeptController extends BaseController {
* @date 2018/8/28 10:22
*/
@PutMapping
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@PreAuthorize("hasAuthority('sys:dept:edit') or hasAnyRole('" + SecurityConstant.ROLE_ADMIN + "', '" + SecurityConstant.ROLE_TEACHER + "')")
@ApiOperation(value = "更新部门信息", notes = "根据部门id更新部门的基本信息")
@ApiImplicitParam(name = "dept", value = "部门实体", required = true, dataType = "Dept")
@Log("更新部门")
......@@ -139,7 +138,6 @@ public class DeptController extends BaseController {
* @date 2018/12/31 22:13
*/
@RequestMapping(value = "/findById", method = RequestMethod.POST)
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@ApiOperation(value = "批量查询部门信息", notes = "根据Ids批量查询信息")
@ApiImplicitParam(name = "deptVo", value = "部门实体", required = true, dataType = "DeptVo")
public ResponseBean<List<DeptVo>> findById(@RequestBody DeptVo deptVo) {
......
service-api-impl/user-service/src/main/java/com/github/tangyi/user/controller/LogController.java
......@@ -7,6 +7,7 @@ import com.github.tangyi.common.core.model.ResponseBean;
import com.github.tangyi.common.core.utils.PageUtil;
import com.github.tangyi.common.core.utils.SysUtil;
import com.github.tangyi.common.core.web.BaseController;
import com.github.tangyi.common.security.constant.SecurityConstant;
import com.github.tangyi.common.security.utils.SecurityUtil;
import com.github.tangyi.user.service.LogService;
import io.swagger.annotations.Api;
......@@ -14,8 +15,6 @@ import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
......@@ -34,7 +33,6 @@ public class LogController extends BaseController {
@Autowired
private LogService logService;
/**
* 根据id获取日志
*
......@@ -44,7 +42,6 @@ public class LogController extends BaseController {
* @date 2018/9/14 18:20
*/
@GetMapping("/{id}")
@PreAuthorize("hasAnyRole('ROLE_ADMIN')")
@ApiOperation(value = "获取日志信息", notes = "根据日志id获取日志详细信息")
@ApiImplicitParam(name = "id", value = "日志ID", required = true, dataType = "String", paramType = "path")
public Log log(@PathVariable String id) {
......@@ -69,19 +66,18 @@ public class LogController extends BaseController {
* @date 2018/10/24 0024 下午 10:13
*/
@RequestMapping("logList")
@PreAuthorize("hasAnyRole('ROLE_ADMIN')")
@ApiOperation(value = "获取日志列表")
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "分页页码", defaultValue = CommonConstant.PAGE_NUM_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = "pageSize", value = "分页大小", defaultValue = CommonConstant.PAGE_SIZE_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = "sort", value = "排序字段", defaultValue = CommonConstant.PAGE_SORT_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = "order", value = "排序方向", defaultValue = CommonConstant.PAGE_ORDER_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = CommonConstant.PAGE_NUM, value = "分页页码", defaultValue = CommonConstant.PAGE_NUM_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = CommonConstant.PAGE_SIZE, value = "分页大小", defaultValue = CommonConstant.PAGE_SIZE_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = CommonConstant.SORT, value = "排序字段", defaultValue = CommonConstant.PAGE_SORT_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = CommonConstant.ORDER, value = "排序方向", defaultValue = CommonConstant.PAGE_ORDER_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = "log", value = "日志信息", dataType = "Log")
})
public PageInfo<Log> userList(@RequestParam(value = "pageNum", required = false, defaultValue = CommonConstant.PAGE_NUM_DEFAULT) String pageNum,
@RequestParam(value = "pageSize", required = false, defaultValue = CommonConstant.PAGE_SIZE_DEFAULT) String pageSize,
@RequestParam(value = "sort", required = false, defaultValue = CommonConstant.PAGE_SORT_DEFAULT) String sort,
@RequestParam(value = "order", required = false, defaultValue = CommonConstant.PAGE_ORDER_DEFAULT) String order,
public PageInfo<Log> userList(@RequestParam(value = CommonConstant.PAGE_NUM, required = false, defaultValue = CommonConstant.PAGE_NUM_DEFAULT) String pageNum,
@RequestParam(value = CommonConstant.PAGE_SIZE, required = false, defaultValue = CommonConstant.PAGE_SIZE_DEFAULT) String pageSize,
@RequestParam(value = CommonConstant.SORT, required = false, defaultValue = CommonConstant.PAGE_SORT_DEFAULT) String sort,
@RequestParam(value = CommonConstant.ORDER, required = false, defaultValue = CommonConstant.PAGE_ORDER_DEFAULT) String order,
Log log) {
return logService.findPage(PageUtil.pageInfo(pageNum, pageSize, sort, order), log);
}
......@@ -113,7 +109,7 @@ public class LogController extends BaseController {
* @date 2018/10/31 21:27
*/
@DeleteMapping("/{id}")
@PreAuthorize("hasAnyRole('ROLE_ADMIN')")
@PreAuthorize("hasAuthority('monitor:log:del') or hasAnyRole('" + SecurityConstant.ROLE_ADMIN + "', '" + SecurityConstant.ROLE_TEACHER + "')")
@ApiOperation(value = "删除日志", notes = "根据ID删除日志")
@ApiImplicitParam(name = "id", value = "日志ID", required = true, paramType = "path")
public ResponseBean<Boolean> delete(@PathVariable String id) {
......@@ -131,7 +127,7 @@ public class LogController extends BaseController {
* @date 2018/12/4 10:12
*/
@PostMapping("/deleteAll")
@PreAuthorize("hasAnyRole('ROLE_ADMIN')")
@PreAuthorize("hasAuthority('monitor:log:del') or hasAnyRole('" + SecurityConstant.ROLE_ADMIN + "', '" + SecurityConstant.ROLE_TEACHER + "')")
@ApiOperation(value = "批量删除日志", notes = "根据日志ids批量删除日志")
@ApiImplicitParam(name = "log", value = "日志信息", dataType = "Log")
public ResponseBean<Boolean> deleteAllAttachments(@RequestBody Log log) {
......
service-api-impl/user-service/src/main/java/com/github/tangyi/user/controller/MenuController.java
......@@ -8,6 +8,7 @@ import com.github.tangyi.common.core.utils.*;
import com.github.tangyi.common.core.vo.MenuVo;
import com.github.tangyi.common.core.web.BaseController;
import com.github.tangyi.common.log.annotation.Log;
import com.github.tangyi.common.security.constant.SecurityConstant;
import com.github.tangyi.common.security.utils.SecurityUtil;
import com.github.tangyi.user.api.dto.MenuDto;
import com.github.tangyi.user.api.module.Menu;
......@@ -17,8 +18,6 @@ import com.google.common.net.HttpHeaders;
import io.swagger.annotations.*;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
......@@ -49,7 +48,6 @@ public class MenuController extends BaseController {
* @return 当前用户的树形菜单
*/
@GetMapping(value = "/userMenu")
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@ApiOperation(value = "获取当前用户的菜单列表")
public List<MenuDto> userMenu() {
// 查询菜单
......@@ -88,7 +86,6 @@ public class MenuController extends BaseController {
* @return 树形菜单集合
*/
@GetMapping(value = "/menus")
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@ApiOperation(value = "获取树形菜单列表")
public List<MenuDto> menus() {
// 查询所有菜单
......@@ -109,7 +106,7 @@ public class MenuController extends BaseController {
* @date 2018/8/27 16:12
*/
@PostMapping
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@PreAuthorize("hasAuthority('sys:menu:add') or hasAnyRole('" + SecurityConstant.ROLE_ADMIN + "', '" + SecurityConstant.ROLE_TEACHER + "')")
@ApiOperation(value = "创建菜单", notes = "创建菜单")
@ApiImplicitParam(name = "menu", value = "角色实体menu", required = true, dataType = "Menu")
@Log("新增菜单")
......@@ -127,7 +124,7 @@ public class MenuController extends BaseController {
* @date 2018/10/24 16:34
*/
@PutMapping
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@PreAuthorize("hasAuthority('sys:menu:edit') or hasAnyRole('" + SecurityConstant.ROLE_ADMIN + "', '" + SecurityConstant.ROLE_TEACHER + "')")
@ApiOperation(value = "更新菜单信息", notes = "根据菜单id更新菜单的基本信息")
@ApiImplicitParam(name = "menu", value = "角色实体menu", required = true, dataType = "Menu")
@Log("更新菜单")
......@@ -145,7 +142,7 @@ public class MenuController extends BaseController {
* @date 2018/8/27 16:19
*/
@DeleteMapping("/{id}")
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@PreAuthorize("hasAuthority('sys:menu:del') or hasAnyRole('" + SecurityConstant.ROLE_ADMIN + "', '" + SecurityConstant.ROLE_TEACHER + "')")
@ApiOperation(value = "删除菜单", notes = "根据ID删除菜单")
@ApiImplicitParam(name = "id", value = "菜单ID", required = true, paramType = "path")
@Log("删除菜单")
......@@ -164,7 +161,6 @@ public class MenuController extends BaseController {
* @date 2018/8/27 16:11
*/
@GetMapping("/{id}")
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@ApiOperation(value = "获取菜单信息", notes = "根据菜单id获取菜单详细信息")
@ApiImplicitParam(name = "id", value = "菜单ID", required = true, dataType = "String", paramType = "path")
public Menu menu(@PathVariable String id) {
......@@ -186,19 +182,18 @@ public class MenuController extends BaseController {
* @date 2018/8/26 23:17
*/
@RequestMapping("/menuList")
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@ApiOperation(value = "获取菜单列表")
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "分页页码", defaultValue = CommonConstant.PAGE_NUM_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = "pageSize", value = "分页大小", defaultValue = CommonConstant.PAGE_SIZE_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = "sort", value = "排序字段", defaultValue = CommonConstant.PAGE_SORT_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = "order", value = "排序方向", defaultValue = CommonConstant.PAGE_ORDER_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = CommonConstant.PAGE_NUM, value = "分页页码", defaultValue = CommonConstant.PAGE_NUM_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = CommonConstant.PAGE_SIZE, value = "分页大小", defaultValue = CommonConstant.PAGE_SIZE_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = CommonConstant.SORT, value = "排序字段", defaultValue = CommonConstant.PAGE_SORT_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = CommonConstant.ORDER, value = "排序方向", defaultValue = CommonConstant.PAGE_ORDER_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = "Menu", value = "菜单信息", dataType = "Menu")
})
public PageInfo<Menu> menuList(@RequestParam(value = "pageNum", required = false, defaultValue = CommonConstant.PAGE_NUM_DEFAULT) String pageNum,
@RequestParam(value = "pageSize", required = false, defaultValue = CommonConstant.PAGE_SIZE_DEFAULT) String pageSize,
@RequestParam(value = "sort", required = false, defaultValue = CommonConstant.PAGE_SORT_DEFAULT) String sort,
@RequestParam(value = "order", required = false, defaultValue = CommonConstant.PAGE_ORDER_DEFAULT) String order,
public PageInfo<Menu> menuList(@RequestParam(value = CommonConstant.PAGE_NUM, required = false, defaultValue = CommonConstant.PAGE_NUM_DEFAULT) String pageNum,
@RequestParam(value = CommonConstant.PAGE_SIZE, required = false, defaultValue = CommonConstant.PAGE_SIZE_DEFAULT) String pageSize,
@RequestParam(value = CommonConstant.SORT, required = false, defaultValue = CommonConstant.PAGE_SORT_DEFAULT) String sort,
@RequestParam(value = CommonConstant.ORDER, required = false, defaultValue = CommonConstant.PAGE_ORDER_DEFAULT) String order,
Menu menu) {
return menuService.findPage(PageUtil.pageInfo(pageNum, pageSize, sort, order), menu);
}
......@@ -212,7 +207,6 @@ public class MenuController extends BaseController {
* @date 2018/8/27 15:58
*/
@GetMapping("findMenuByRole/{role}")
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@ApiOperation(value = "根据角色查找菜单", notes = "根据角色id获取角色菜单")
@ApiImplicitParam(name = "role", value = "角色名称", required = true, dataType = "String", paramType = "path")
public List<Menu> findMenuByRole(@PathVariable String role) {
......@@ -226,7 +220,6 @@ public class MenuController extends BaseController {
* @return 属性集合
*/
@GetMapping("/roleTree/{roleCode}")
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@ApiOperation(value = "根据角色查找菜单", notes = "根据角色code获取角色菜单")
@ApiImplicitParam(name = "roleCode", value = "角色code", required = true, dataType = "String", paramType = "path")
public List<String> roleTree(@PathVariable String roleCode) {
......@@ -244,7 +237,7 @@ public class MenuController extends BaseController {
* @date 2018/11/28 12:46
*/
@PostMapping("/export")
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@PreAuthorize("hasAuthority('sys:menu:export') or hasAnyRole('" + SecurityConstant.ROLE_ADMIN + "', '" + SecurityConstant.ROLE_TEACHER + "')")
@ApiOperation(value = "导出菜单", notes = "根据菜单id导出菜单")
@ApiImplicitParam(name = "menuVo", value = "菜单信息", required = true, dataType = "MenuVo")
@Log("导出菜单")
......@@ -284,7 +277,7 @@ public class MenuController extends BaseController {
* @date 2018/11/28 12:51
*/
@RequestMapping("import")
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@PreAuthorize("hasAuthority('sys:menu:import') or hasAnyRole('" + SecurityConstant.ROLE_ADMIN + "', '" + SecurityConstant.ROLE_TEACHER + "')")
@ApiOperation(value = "导入菜单", notes = "导入菜单")
@Log("导入菜单")
public ResponseBean<Boolean> importMenu(@ApiParam(value = "要上传的文件", required = true) MultipartFile file, HttpServletRequest request) {
......
service-api-impl/user-service/src/main/java/com/github/tangyi/user/controller/RoleController.java
......@@ -7,6 +7,7 @@ import com.github.tangyi.common.core.utils.PageUtil;
import com.github.tangyi.common.core.utils.SysUtil;
import com.github.tangyi.common.core.web.BaseController;
import com.github.tangyi.common.log.annotation.Log;
import com.github.tangyi.common.security.constant.SecurityConstant;
import com.github.tangyi.common.security.utils.SecurityUtil;
import com.github.tangyi.user.api.module.Dept;
import com.github.tangyi.user.api.module.Role;
......@@ -21,8 +22,6 @@ import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
......@@ -35,7 +34,7 @@ import java.util.List;
* 角色controller
*
* @author tangyi
* @date 2018/8/26 0026 22:50
* @date 2018/8/26 22:50
*/
@Api("角色信息管理")
@RestController
......@@ -63,7 +62,6 @@ public class RoleController extends BaseController {
* @date 2018/9/14 18:20
*/
@GetMapping("/{id}")
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@ApiOperation(value = "获取角色信息", notes = "根据角色id获取角色详细信息")
@ApiImplicitParam(name = "id", value = "角色ID", required = true, dataType = "String", paramType = "path")
public Role role(@PathVariable String id) {
......@@ -88,19 +86,18 @@ public class RoleController extends BaseController {
* @date 2018/10/24 0024 下午 10:13
*/
@RequestMapping("roleList")
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@ApiOperation(value = "获取角色列表")
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "分页页码", defaultValue = CommonConstant.PAGE_NUM_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = "pageSize", value = "分页大小", defaultValue = CommonConstant.PAGE_SIZE_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = "sort", value = "排序字段", defaultValue = CommonConstant.PAGE_SORT_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = "order", value = "排序方向", defaultValue = CommonConstant.PAGE_ORDER_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = CommonConstant.PAGE_NUM, value = "分页页码", defaultValue = CommonConstant.PAGE_NUM_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = CommonConstant.PAGE_SIZE, value = "分页大小", defaultValue = CommonConstant.PAGE_SIZE_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = CommonConstant.SORT, value = "排序字段", defaultValue = CommonConstant.PAGE_SORT_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = CommonConstant.ORDER, value = "排序方向", defaultValue = CommonConstant.PAGE_ORDER_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = "role", value = "角色信息", dataType = "Role")
})
public PageInfo<Role> userList(@RequestParam(value = "pageNum", required = false, defaultValue = CommonConstant.PAGE_NUM_DEFAULT) String pageNum,
@RequestParam(value = "pageSize", required = false, defaultValue = CommonConstant.PAGE_SIZE_DEFAULT) String pageSize,
@RequestParam(value = "sort", required = false, defaultValue = CommonConstant.PAGE_SORT_DEFAULT) String sort,
@RequestParam(value = "order", required = false, defaultValue = CommonConstant.PAGE_ORDER_DEFAULT) String order,
public PageInfo<Role> userList(@RequestParam(value = CommonConstant.PAGE_NUM, required = false, defaultValue = CommonConstant.PAGE_NUM_DEFAULT) String pageNum,
@RequestParam(value = CommonConstant.PAGE_SIZE, required = false, defaultValue = CommonConstant.PAGE_SIZE_DEFAULT) String pageSize,
@RequestParam(value = CommonConstant.SORT, required = false, defaultValue = CommonConstant.PAGE_SORT_DEFAULT) String sort,
@RequestParam(value = CommonConstant.ORDER, required = false, defaultValue = CommonConstant.PAGE_ORDER_DEFAULT) String order,
Role role) {
// 查询所属部门
PageInfo<Role> pageInfo = roleService.findPage(PageUtil.pageInfo(pageNum, pageSize, sort, order), role);
......@@ -133,7 +130,6 @@ public class RoleController extends BaseController {
* @return List
*/
@GetMapping("/roleList/{deptId}")
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@ApiOperation(value = "获取角色信息", notes = "根据部门id获取角色详细信息")
@ApiImplicitParam(name = "deptId", value = "部门ID", required = true, dataType = "String", paramType = "path")
public List<Role> roleList(@PathVariable String deptId) {
......@@ -166,7 +162,7 @@ public class RoleController extends BaseController {
* @date 2018/9/14 18:22
*/
@PutMapping
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@PreAuthorize("hasAuthority('sys:role:edit') or hasAnyRole('" + SecurityConstant.ROLE_ADMIN + "', '" + SecurityConstant.ROLE_TEACHER + "')")
@ApiOperation(value = "更新角色信息", notes = "根据角色id更新角色的基本信息")
@ApiImplicitParam(name = "role", value = "角色实体role", required = true, dataType = "Role")
@Log("修改角色")
......@@ -184,7 +180,6 @@ public class RoleController extends BaseController {
* @date 2018/10/28 下午 2:20
*/
@PutMapping("roleMenuUpdate")
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@ApiOperation(value = "更新角色菜单信息", notes = "更新角色菜单信息")
@ApiImplicitParam(name = "role", value = "角色实体role", required = true, dataType = "Role")
@Log("更新角色菜单")
......@@ -209,7 +204,7 @@ public class RoleController extends BaseController {
* @date 2018/9/14 18:23
*/
@PostMapping
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@PreAuthorize("hasAuthority('sys:role:add') or hasAnyRole('" + SecurityConstant.ROLE_ADMIN + "', '" + SecurityConstant.ROLE_TEACHER + "')")
@ApiOperation(value = "创建角色", notes = "创建角色")
@ApiImplicitParam(name = "role", value = "角色实体role", required = true, dataType = "Role")
@Log("新增角色")
......@@ -227,7 +222,7 @@ public class RoleController extends BaseController {
* @date 2018/9/14 18:24
*/
@DeleteMapping("/{id}")
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@PreAuthorize("hasAuthority('sys:role:del') or hasAnyRole('" + SecurityConstant.ROLE_ADMIN + "', '" + SecurityConstant.ROLE_TEACHER + "')")
@ApiOperation(value = "删除角色", notes = "根据ID删除角色")
@ApiImplicitParam(name = "id", value = "角色ID", required = true, paramType = "path")
@Log("删除角色")
......@@ -248,7 +243,7 @@ public class RoleController extends BaseController {
* @date 2018/12/4 10:00
*/
@PostMapping("/deleteAll")
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@PreAuthorize("hasAuthority('sys:role:del') or hasAnyRole('" + SecurityConstant.ROLE_ADMIN + "', '" + SecurityConstant.ROLE_TEACHER + "')")
@ApiOperation(value = "批量删除角色", notes = "根据角色id批量删除角色")
@ApiImplicitParam(name = "role", value = "角色信息", dataType = "Role")
@Log("批量删除角色")
......
service-api-impl/user-service/src/main/java/com/github/tangyi/user/controller/RouteController.java 0 → 100644
package com.github.tangyi.user.controller;
import com.github.pagehelper.PageInfo;
import com.github.tangyi.common.core.constant.CommonConstant;
import com.github.tangyi.common.core.constant.MqConstant;
import com.github.tangyi.common.core.model.ResponseBean;
import com.github.tangyi.common.core.model.Route;
import com.github.tangyi.common.core.utils.PageUtil;
import com.github.tangyi.common.core.utils.SysUtil;
import com.github.tangyi.common.core.web.BaseController;
import com.github.tangyi.common.log.annotation.Log;
import com.github.tangyi.common.security.constant.SecurityConstant;
import com.github.tangyi.common.security.utils.SecurityUtil;
import com.github.tangyi.user.service.RouteService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.springframework.amqp.core.AmqpTemplate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import java.util.Collections;
import java.util.List;
/**
* 路由controller
*
* @author tangyi
* @date 2019/4/2 15:03
*/
@Api("网关路由信息管理")
@RestController
@RequestMapping("/v1/route")
public class RouteController extends BaseController {
@Autowired
private RouteService routeService;
@Autowired
private AmqpTemplate amqpTemplate;
/**
* 根据id获取路由
*
* @param id id
* @return Route
* @author tangyi
* @date 2019/4/2 15:09
*/
@GetMapping("/{id}")
@ApiOperation(value = "获取路由信息", notes = "根据路由id获取路由详细信息")
@ApiImplicitParam(name = "id", value = "路由ID", required = true, dataType = "String", paramType = "path")
public Route get(@PathVariable String id) {
try {
return routeService.get(id);
} catch (Exception e) {
logger.error(e.getMessage(), e);
}
return new Route();
}
/**
* 路由分页查询
*
* @param pageNum pageNum
* @param pageSize pageSize
* @param sort sort
* @param order order
* @param route route
* @return PageInfo
* @author tangyi
* @date 2019/4/2 15:09
*/
@RequestMapping("routeList")
@ApiOperation(value = "获取路由列表")
@ApiImplicitParams({
@ApiImplicitParam(name = CommonConstant.PAGE_NUM, value = "分页页码", defaultValue = CommonConstant.PAGE_NUM_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = CommonConstant.PAGE_SIZE, value = "分页大小", defaultValue = CommonConstant.PAGE_SIZE_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = CommonConstant.SORT, value = "排序字段", defaultValue = CommonConstant.PAGE_SORT_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = CommonConstant.ORDER, value = "排序方向", defaultValue = CommonConstant.PAGE_ORDER_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = "route", value = "路由信息", dataType = "Route")
})
public PageInfo<Route> userList(@RequestParam(value = CommonConstant.PAGE_NUM, required = false, defaultValue = CommonConstant.PAGE_NUM_DEFAULT) String pageNum,
@RequestParam(value = CommonConstant.PAGE_SIZE, required = false, defaultValue = CommonConstant.PAGE_SIZE_DEFAULT) String pageSize,
@RequestParam(value = CommonConstant.SORT, required = false, defaultValue = CommonConstant.PAGE_SORT_DEFAULT) String sort,
@RequestParam(value = CommonConstant.ORDER, required = false, defaultValue = CommonConstant.PAGE_ORDER_DEFAULT) String order,
Route route) {
return routeService.findPage(PageUtil.pageInfo(pageNum, pageSize, sort, order), route);
}
/**
* 修改路由
*
* @param route route
* @return ResponseBean
* @author tangyi
* @date 2019/4/2 15:09
*/
@PutMapping
@PreAuthorize("hasAuthority('sys:route:edit') or hasAnyRole('" + SecurityConstant.ROLE_ADMIN + "')")
@ApiOperation(value = "更新路由信息", notes = "根据路由id更新路由的基本信息")
@ApiImplicitParam(name = "route", value = "路由实体route", required = true, dataType = "Route")
@Log("修改路由")
public ResponseBean<Boolean> updateRoute(@RequestBody Route route) {
route.setCommonValue(SecurityUtil.getCurrentUsername(), SysUtil.getSysCode());
// 更新路由
if (routeService.update(route) > 0) {
// 发送消息
if (Integer.parseInt(route.getStatus()) == CommonConstant.DEL_FLAG_DEL) {
amqpTemplate.convertAndSend(MqConstant.DEL_GATEWAY_ROUTE_QUEUE, route);
} else {
amqpTemplate.convertAndSend(MqConstant.EDIT_GATEWAY_ROUTE_QUEUE, route);
}
}
return new ResponseBean<>(Boolean.TRUE);
}
/**
* 创建路由
*
* @param route route
* @return ResponseBean
* @author tangyi
* @date 2019/4/2 15:09
*/
@PostMapping
@PreAuthorize("hasAuthority('sys:route:add') or hasAnyRole('" + SecurityConstant.ROLE_ADMIN + "')")
@ApiOperation(value = "创建路由", notes = "创建路由")
@ApiImplicitParam(name = "route", value = "路由实体route", required = true, dataType = "Route")
@Log("新增路由")
public ResponseBean<Boolean> add(@RequestBody Route route) {
route.setCommonValue(SecurityUtil.getCurrentUsername(), SysUtil.getSysCode());
if (routeService.insert(route) > 0 && Integer.parseInt(route.getStatus()) == CommonConstant.DEL_FLAG_NORMAL) {
// 发送消息
amqpTemplate.convertAndSend(MqConstant.EDIT_GATEWAY_ROUTE_QUEUE, route);
}
return new ResponseBean<>(Boolean.TRUE);
}
/**
* 根据id删除路由
*
* @param id id
* @return ResponseBean
* @author tangyi
* @date 2019/4/2 15:09
*/
@DeleteMapping("/{id}")
@PreAuthorize("hasAuthority('sys:route:del') or hasAnyRole('" + SecurityConstant.ROLE_ADMIN + "')")
@ApiOperation(value = "删除路由", notes = "根据ID删除路由")
@ApiImplicitParam(name = "id", value = "路由ID", required = true, paramType = "path")
@Log("删除路由")
public ResponseBean<Boolean> delete(@PathVariable String id) {
Route route = new Route();
route.setId(id);
route = routeService.get(route);
route.setNewRecord(false);
route.setCommonValue(SecurityUtil.getCurrentUsername(), SysUtil.getSysCode());
if (routeService.delete(route) > 0) {
// 发送消息
amqpTemplate.convertAndSend(MqConstant.DEL_GATEWAY_ROUTE_QUEUE, Collections.singletonList(route));
}
return new ResponseBean<>(Boolean.TRUE);
}
/**
* 批量删除
*
* @param route route
* @return ResponseBean
* @author tangyi
* @date 2019/4/2 15:09
*/
@PostMapping("/deleteAll")
@PreAuthorize("hasAuthority('sys:route:del') or hasAnyRole('" + SecurityConstant.ROLE_ADMIN + "')")
@ApiOperation(value = "批量删除路由", notes = "根据路由id批量删除路由")
@ApiImplicitParam(name = "route", value = "路由信息", dataType = "Route")
@Log("批量删除路由")
public ResponseBean<Boolean> deleteAll(@RequestBody Route route) {
boolean success = false;
try {
if (StringUtils.isNotEmpty(route.getIdString())) {
// 先获取路由列表
List<Route> routeList = routeService.findListById(route);
// 删除
success = routeService.deleteAll(route.getIdString().split(",")) > 0;
if (success && CollectionUtils.isNotEmpty(routeList)) {
// 发送消息
amqpTemplate.convertAndSend(MqConstant.DEL_GATEWAY_ROUTE_QUEUE, route);
}
}
} catch (Exception e) {
logger.error("删除路由失败！", e);
}
return new ResponseBean<>(success);
}
}
service-api-impl/user-service/src/main/java/com/github/tangyi/user/controller/SysConfigController.java
......@@ -6,7 +6,6 @@ import com.github.tangyi.user.config.SysConfig;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
......@@ -33,7 +32,6 @@ public class SysConfigController extends BaseController {
* @date 2019/2/28 17:31
*/
@GetMapping
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@ApiOperation(value = "获取系统配置", notes = "获取系统配置")
public ResponseBean<SysConfig> getSysConfig() {
return new ResponseBean<>(sysConfig);
......
service-api-impl/user-service/src/main/java/com/github/tangyi/user/controller/UserController.java
......@@ -7,6 +7,7 @@ import com.github.tangyi.common.core.utils.*;
import com.github.tangyi.common.core.vo.UserVo;
import com.github.tangyi.common.core.web.BaseController;
import com.github.tangyi.common.log.annotation.Log;
import com.github.tangyi.common.security.constant.SecurityConstant;
import com.github.tangyi.common.security.utils.SecurityUtil;
import com.github.tangyi.user.api.constant.RoleConstant;
import com.github.tangyi.user.api.dto.UserDto;
......@@ -23,8 +24,6 @@ import com.github.tangyi.user.utils.UserUtils;
import io.swagger.annotations.*;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpHeaders;
......@@ -70,7 +69,6 @@ public class UserController extends BaseController {
* @return ResponseBean
*/
@GetMapping("/{id}")
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@ApiOperation(value = "获取用户信息", notes = "根据用户id获取用户详细信息")
@ApiImplicitParam(name = "id", value = "用户ID", required = true, dataType = "String", paramType = "path")
public ResponseBean<User> user(@PathVariable String id) {
......@@ -88,7 +86,6 @@ public class UserController extends BaseController {
* @return 用户名
*/
@GetMapping("/info")
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@ApiOperation(value = "获取用户信息", notes = "获取当前登录用户详细信息")
public ResponseBean<UserInfoDto> user(Principal principal) {
UserVo userVo = new UserVo();
......@@ -122,19 +119,18 @@ public class UserController extends BaseController {
* @date 2018/8/26 22:56
*/
@RequestMapping("userList")
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@ApiOperation(value = "获取用户列表")
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "分页页码", defaultValue = CommonConstant.PAGE_NUM_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = "pageSize", value = "分页大小", defaultValue = CommonConstant.PAGE_SIZE_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = "sort", value = "排序字段", defaultValue = CommonConstant.PAGE_SORT_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = "order", value = "排序方向", defaultValue = CommonConstant.PAGE_ORDER_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = CommonConstant.PAGE_NUM, value = "分页页码", defaultValue = CommonConstant.PAGE_NUM_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = CommonConstant.PAGE_SIZE, value = "分页大小", defaultValue = CommonConstant.PAGE_SIZE_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = CommonConstant.SORT, value = "排序字段", defaultValue = CommonConstant.PAGE_SORT_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = CommonConstant.ORDER, value = "排序方向", defaultValue = CommonConstant.PAGE_ORDER_DEFAULT, dataType = "String"),
@ApiImplicitParam(name = "userVo", value = "用户信息", dataType = "UserVo")
})
public PageInfo<User> userList(@RequestParam(value = "pageNum", required = false, defaultValue = CommonConstant.PAGE_NUM_DEFAULT) String pageNum,
@RequestParam(value = "pageSize", required = false, defaultValue = CommonConstant.PAGE_SIZE_DEFAULT) String pageSize,
@RequestParam(value = "sort", required = false, defaultValue = CommonConstant.PAGE_SORT_DEFAULT) String sort,
@RequestParam(value = "order", required = false, defaultValue = CommonConstant.PAGE_ORDER_DEFAULT) String order,
public PageInfo<User> userList(@RequestParam(value = CommonConstant.PAGE_NUM, required = false, defaultValue = CommonConstant.PAGE_NUM_DEFAULT) String pageNum,
@RequestParam(value = CommonConstant.PAGE_SIZE, required = false, defaultValue = CommonConstant.PAGE_SIZE_DEFAULT) String pageSize,
@RequestParam(value = CommonConstant.SORT, required = false, defaultValue = CommonConstant.PAGE_SORT_DEFAULT) String sort,
@RequestParam(value = CommonConstant.ORDER, required = false, defaultValue = CommonConstant.PAGE_ORDER_DEFAULT) String order,
@RequestParam(value = "username", required = false, defaultValue = "") String username,
UserVo userVo) {
User user = new User();
......@@ -152,9 +148,13 @@ public class UserController extends BaseController {
userIdSet.add(tempUser.getId());
});
// 批量查找部门
Dept dept = new Dept();
dept.setIds(deptIdSet.toArray(new String[deptIdSet.size()]));
List<Dept> deptList = deptService.findListById(dept);
List<Dept> deptList = null;
if (!deptIdSet.isEmpty()) {
Dept dept = new Dept();
dept.setIds(deptIdSet.toArray(new String[deptIdSet.size()]));
deptList = deptService.findListById(dept);
}
// 批量查找角色
List<UserRole> userRoles = userRoleService.getByUserIds(new ArrayList<>(userIdSet));
List<Role> roleList = new ArrayList<>();
......@@ -172,11 +172,13 @@ public class UserController extends BaseController {
for (User tempUser : users) {
List<Role> userRoleList = new ArrayList<>();
// 设置部门信息
for (Dept tempDept : deptList) {
if (tempDept.getId().equals(tempUser.getDeptId())) {
tempUser.setDeptName(tempDept.getDeptName());
tempUser.setDeptId(tempDept.getId());
break;
if (deptList != null) {
for (Dept tempDept : deptList) {
if (tempDept.getId().equals(tempUser.getDeptId())) {
tempUser.setDeptName(tempDept.getDeptName());
tempUser.setDeptId(tempDept.getId());
break;
}
}
}
for (UserRole tempUserRole : userRoles) {
......@@ -203,7 +205,7 @@ public class UserController extends BaseController {
* @date 2018/8/26 14:34
*/
@PostMapping
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@PreAuthorize("hasAuthority('sys:user:add') or hasAnyRole('" + SecurityConstant.ROLE_ADMIN + "', '" + SecurityConstant.ROLE_TEACHER + "')")
@ApiOperation(value = "创建用户", notes = "创建用户")
@ApiImplicitParam(name = "userDto", value = "用户实体user", required = true, dataType = "UserDto")
@Log("新增用户")
......@@ -228,7 +230,7 @@ public class UserController extends BaseController {
* @date 2018/8/26 15:06
*/
@PutMapping
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@PreAuthorize("hasAuthority('sys:user:edit') or hasAnyRole('" + SecurityConstant.ROLE_ADMIN + "', '" + SecurityConstant.ROLE_TEACHER + "')")
@ApiOperation(value = "更新用户信息", notes = "根据用户id更新用户的基本信息、角色信息")
@ApiImplicitParam(name = "userDto", value = "用户实体user", required = true, dataType = "UserDto")
@Log("修改用户")
......@@ -250,7 +252,6 @@ public class UserController extends BaseController {
* @date 2018/10/30 10:06
*/
@PutMapping("/updateInfo")
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@ApiOperation(value = "更新用户基本信息", notes = "根据用户id更新用户的基本信息")
@ApiImplicitParam(name = "userDto", value = "用户实体user", required = true, dataType = "UserDto")
@Log("更新用户基本信息")
......@@ -278,7 +279,7 @@ public class UserController extends BaseController {
* @date 2018/8/26 15:28
*/
@DeleteMapping("/{id}")
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@PreAuthorize("hasAuthority('sys:user:del') or hasAnyRole('" + SecurityConstant.ROLE_ADMIN + "', '" + SecurityConstant.ROLE_TEACHER + "')")
@ApiOperation(value = "删除用户", notes = "根据ID删除用户")
@ApiImplicitParam(name = "id", value = "用户ID", required = true, paramType = "path")
@Log("删除用户")
......@@ -301,7 +302,7 @@ public class UserController extends BaseController {
* @date 2018/11/26 22:11
*/
@PostMapping("/export")
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@PreAuthorize("hasAuthority('sys:user:export') or hasAnyRole('" + SecurityConstant.ROLE_ADMIN + "', '" + SecurityConstant.ROLE_TEACHER + "')")
@ApiOperation(value = "导出用户", notes = "根据用户id导出用户")
@ApiImplicitParam(name = "userVo", value = "用户信息", required = true, dataType = "UserVo")
@Log("导出用户")
......@@ -339,7 +340,7 @@ public class UserController extends BaseController {
* @date 2018/11/28 12:44
*/
@RequestMapping("import")
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@PreAuthorize("hasAuthority('sys:user:import') or hasAnyRole('" + SecurityConstant.ROLE_ADMIN + "', '" + SecurityConstant.ROLE_TEACHER + "')")
@ApiOperation(value = "导入数据", notes = "导入数据")
@Log("导入用户")
public ResponseBean<Boolean> importUser(@ApiParam(value = "要上传的文件", required = true) MultipartFile file, HttpServletRequest request) {
......@@ -369,7 +370,7 @@ public class UserController extends BaseController {
* @date 2018/12/4 9:58
*/
@PostMapping("/deleteAll")
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@PreAuthorize("hasAuthority('sys:user:del') or hasAnyRole('" + SecurityConstant.ROLE_ADMIN + "', '" + SecurityConstant.ROLE_TEACHER + "')")
@ApiOperation(value = "批量删除用户", notes = "根据用户id批量删除用户")
@ApiImplicitParam(name = "user", value = "用户信息", dataType = "User")
@Log("批量删除用户")
......@@ -393,7 +394,6 @@ public class UserController extends BaseController {
* @date 2018/12/31 21:16
*/
@RequestMapping(value = "/findById", method = RequestMethod.POST)
@PreAuthorize("hasAnyRole('ROLE_USER', 'ROLE_ADMIN')")
@ApiOperation(value = "根据ID查询用户", notes = "根据ID查询用户")
@ApiImplicitParam(name = "userVo", value = "用户信息", required = true, paramType = "UserVo")
public ResponseBean<List<UserVo>> findById(@RequestBody UserVo userVo) {
......@@ -425,7 +425,7 @@ public class UserController extends BaseController {
@ApiImplicitParam(name = "userDto", value = "用户实体user", required = true, dataType = "UserDto")
@PostMapping("register")
@Log("注册用户")
public ResponseBean<Boolean> register(@RequestBody UserDto userDto) {
public ResponseBean<Boolean> register(UserDto userDto) {
boolean success = false;
User user = new User();
BeanUtils.copyProperties(userDto, user);
......@@ -434,6 +434,7 @@ public class UserController extends BaseController {
if (StringUtils.isEmpty(userDto.getPassword()))
userDto.setPassword(CommonConstant.DEFAULT_PASSWORD);
user.setPassword(encoder.encode(userDto.getPassword()));
user.setStatus(CommonConstant.DEL_FLAG_NORMAL.toString());
// 保存用户
if (userService.insert(user) > 0) {
// 分配默认角色
......
service-api-impl/user-service/src/main/java/com/github/tangyi/user/mapper/RouteMapper.java 0 → 100644
package com.github.tangyi.user.mapper;
import com.github.tangyi.common.core.persistence.CrudMapper;
import com.github.tangyi.common.core.model.Route;
import org.apache.ibatis.annotations.Mapper;
/**
* Route mapper
*
* @author tangyi
* @date 2019/4/2 15:00
*/
@Mapper
public interface RouteMapper extends CrudMapper<Route> {
}
service-api-impl/user-service/src/main/java/com/github/tangyi/user/receiver/RouteReceiver.java 0 → 100644
package com.github.tangyi.user.receiver;
import com.github.tangyi.common.core.constant.MqConstant;
import com.github.tangyi.user.config.RouteInitConfig;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.amqp.rabbit.annotation.RabbitListener;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
* @author tangyi
* @date 2019/4/7 12:38
*/
@Service
public class RouteReceiver {
private static final Logger logger = LoggerFactory.getLogger(RouteReceiver.class);
@Autowired
private RouteInitConfig routeInitConfig;
/**
* 刷新路由
*
* @param msg msg
* @author tangyi
* @date 2019/04/07 12:39
*/
@RabbitListener(queues = {MqConstant.REFRESH_GATEWAY_ROUTE_QUEUE})
public void refreshRoute(String msg) {
logger.info("刷新路由{}", msg);
routeInitConfig.init();
}
}
service-api-impl/user-service/src/main/java/com/github/tangyi/user/service/RouteService.java 0 → 100644
package com.github.tangyi.user.service;
import com.github.tangyi.common.core.service.CrudService;
import com.github.tangyi.common.core.model.Route;
import com.github.tangyi.user.mapper.RouteMapper;
import org.springframework.stereotype.Service;
/**
* 路由service
*
* @author tangyi
* @date 2019/4/2 15:01
*/
@Service
public class RouteService extends CrudService<RouteMapper, Route> {
}
service-api-impl/user-service/src/main/java/com/github/tangyi/user/service/UserService.java
......@@ -18,8 +18,6 @@ import com.github.tangyi.user.mapper.UserMapper;
import com.github.tangyi.user.mapper.UserRoleMapper;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cache.annotation.CacheEvict;
......@@ -43,8 +41,6 @@ import java.util.concurrent.TimeUnit;
@Service
public class UserService extends CrudService<UserMapper, User> {
private static final Logger logger = LoggerFactory.getLogger(UserService.class);
@Autowired
private UserMapper userMapper;
......@@ -88,7 +84,7 @@ public class UserService extends CrudService<UserMapper, User> {
* @param userVo userVo
* @return User
* @author tangyi
* @date 2018/9/11 下午 11:44
* @date 2018/9/11 23:44
*/
public UserInfoDto findUserInfo(UserVo userVo) {
// 根据用户名查询用户信息
......@@ -128,7 +124,7 @@ public class UserService extends CrudService<UserMapper, User> {
* @param userDto userDto
* @return int
* @author tangyi
* @date 2018/8/26 下午 3:15
* @date 2018/8/26 15:15
*/
@Transactional
@CacheEvict(value = "user", key = "#userDto.username")
......
service-api-impl/user-service/src/main/resources/mapper/RouteMapper.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.github.tangyi.user.mapper.RouteMapper">
<resultMap id="routeResultMap" type="com.github.tangyi.common.core.model.Route">
<id column="id" property="id"/>
<result column="route_id" property="routeId" />
<result column="route_name" property="routeName" />
<result column="predicates" property="predicates" />
<result column="filters" property="filters" />
<result column="uri" property="uri" />
<result column="sort" property="sort" />
<result column="status" property="status" />
<result column="creator" property="creator" />
<result column="create_date" property="createDate" />
<result column="modifier" property="modifier" />
<result column="modify_date" property="modifyDate" />
<result column="del_flag" property="delFlag" />
<result column="application_code" property="applicationCode" />
</resultMap>
<sql id="routeColumns">
a.id as "id",
a.route_id,
a.route_name,
a.predicates,
a.filters,
a.uri,
a.sort,
a.status,
a.creator,
a.create_date,
a.modifier,
a.modify_date,
a.del_flag,
a.application_code
</sql>
<!-- where 条件 -->
<sql id="whereColumnList">
<if test="routeId != null and routeId != ''">
and a.route_id like CONCAT('%', #{routeId},'%')
</if>
<if test="routeName != null and routeName != ''">
and a.route_name like CONCAT('%', #{routeName},'%')
</if>
<if test="status != null and status != ''">
and a.status = #{status}
</if>
</sql>
<select id="get" resultMap="routeResultMap">
SELECT
<include refid="routeColumns"/>
FROM sys_route a
WHERE a.id = #{id} and a.del_flag = 0
</select>
<select id="findList" resultMap="routeResultMap">
SELECT
<include refid="routeColumns"/>
FROM sys_route a
WHERE a.del_flag = 0
<include refid="whereColumnList"/>
</select>
<select id="findListById" resultMap="routeResultMap">
SELECT
<include refid="routeColumns"/>
FROM sys_route a
WHERE a.id IN
<foreach collection="ids" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</select>
<insert id="insert">
INSERT INTO sys_route (
id,
route_id,
route_name,
predicates,
filters,
uri,
sort,
status,
creator,
create_date,
modifier,
modify_date,
del_flag,
application_code
) VALUES (
#{id},
#{routeId},
#{routeName},
#{predicates},
#{filters},
#{uri},
#{sort},
#{status},
#{creator},
#{createDate},
#{modifier},
#{modifyDate},
#{delFlag},
#{applicationCode}
)
</insert>
<update id="update">
UPDATE sys_route SET
<if test="routeId != null">
route_id = #{routeId},
</if>
<if test="routeName != null">
route_name = #{routeName},
</if>
<if test="predicates != null">
predicates = #{predicates},
</if>
<if test="filters != null">
filters = #{filters},
</if>
<if test="uri != null">
uri = #{uri},
</if>
<if test="sort != null">
sort = #{sort},
</if>
<if test="status != null">
status = #{status},
</if>
modifier = #{modifier},
modify_date = #{modifyDate}
WHERE
<if test="id != null">
id = #{id}
</if>
</update>
<delete id="delete">
UPDATE sys_route SET
del_flag = 1
WHERE id = #{id}
</delete>
<delete id="deleteAll">
UPDATE sys_route SET
del_flag = 1
WHERE id in
<foreach item="item" index="index" collection="array" open="("
separator="," close=")"> #{item}
</foreach>
</delete>
</mapper>
zipkin-service/pom.xml
......@@ -8,6 +8,7 @@
<version>2.0-SNAPSHOT</version>
</parent>
<artifactId>zipkin-service</artifactId>
<packaging>pom</packaging>
<name>${project.artifactId}</name>
<description>zipkin监控服务</description>
</project>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment