升级spring boot、cloud版本，配置中心认证，elk

CHANGELOG.md

+Version v3.2.0-SNAPSHOT (2019-8-18)
+--------------------------
+改进：
+
+* 升级spring boot、spring cloud版本
+* 配置中心增加安全控制
+* 集成elk
+
 Version v3.1.0 (2019-7-18)
 --------------------------
 改进：

README.md

@@ -64,8 +64,8 @@ QQ群号：996208878
 
 |      名称      |   版本    |
 | --------- | -------- |
-| `Spring Boot`    | `2.1.3.RELEASE`  |
-| `Spring Cloud`   | `Greenwich.SR1`  |
+| `Spring Boot`    | `2.1.7.RELEASE`  |
+| `Spring Cloud`   | `Greenwich.SR2`  |
 
 ## 系统架构
 

common/common-core/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.github.tangyi</groupId>
         <artifactId>common</artifactId>
-        <version>3.1.0</version>
+        <version>${revision}</version>
     </parent>
     <artifactId>common-core</artifactId>
     <name>${project.artifactId}</name>

common/common-feign/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.github.tangyi</groupId>
         <artifactId>common</artifactId>
-        <version>3.1.0</version>
+        <version>${revision}</version>
     </parent>
     <artifactId>common-feign</artifactId>
     <name>${project.artifactId}</name>

common/common-log/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.github.tangyi</groupId>
         <artifactId>common</artifactId>
-        <version>3.1.0</version>
+        <version>${revision}</version>
     </parent>
     <artifactId>common-log</artifactId>
     <name>${project.artifactId}</name>

common/common-security/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.github.tangyi</groupId>
         <artifactId>common</artifactId>
-        <version>3.1.0</version>
+        <version>${revision}</version>
     </parent>
     <artifactId>common-security</artifactId>
     <name>${project.artifactId}</name>

common/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.github.tangyi</groupId>
         <artifactId>spring-microservice-exam</artifactId>
-        <version>3.1.0</version>
+        <version>${revision}</version>
     </parent>
     <artifactId>common</artifactId>
     <packaging>pom</packaging>

config-service/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.github.tangyi</groupId>
         <artifactId>spring-microservice-exam</artifactId>
-        <version>3.1.0</version>
+        <version>${revision}</version>
     </parent>
     <artifactId>config-service</artifactId>
     <name>${project.artifactId}</name>
@@ -19,6 +19,12 @@
             <artifactId>spring-cloud-config-server</artifactId>
         </dependency>
 
+        <!-- security -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-security</artifactId>
+        </dependency>
+
         <!-- 管理中心插件 -->
         <dependency>
             <groupId>de.codecentric</groupId>

config-service/src/main/resources/bootstrap.yml

@@ -8,6 +8,10 @@ spring:
   profiles:
     #  指定为native,开启本地存储配置的方式，spring cloud微服务配置中心默认有3种方式：远程git仓库、远程SVN、本地方式（本地目录）
     active: ${SPRING_PROFILES_ACTIVE:native}
+  security:
+    user:
+      name: ${CONFIG_SERVER_USERNAME:admin}
+      password: ${CONFIG_SERVER_PASSWORD:11}
   # spring boot admin配置
   boot:
     admin:
@@ -17,6 +21,9 @@ spring:
         password: ${ADMIN_PASSWORD:11}
         instance:
           service-base-url: http://${CONFIG_SERVICE_HOST:localhost}:${server.port}
+          metadata:
+            tags:
+              environment: prd
   # 使用consul作为注册中心
   cloud:
     consul:

config-service/src/main/resources/config/auth-service.yml

@@ -23,6 +23,9 @@ spring:
         password: ${ADMIN_PASSWORD:11}
         instance:
           service-base-url: http://${AUTH_SERVICE_HOST:localhost}:${server.port}
+          metadata:
+            tags:
+              environment: prd
   # sleuth 配置
   sleuth:
     web:
@@ -125,8 +128,8 @@ sys:
 
 # 微信配置
 wx:
-  appId: wx597d9f972f991a8c
-  appSecret: b5d44266271a08c6f75a347712a7334e
+  appId: test
+  appSecret: test
   grantType: authorization_code
 
 logging:

config-service/src/main/resources/config/exam-service.yml

@@ -23,6 +23,9 @@ spring:
         password: ${ADMIN_PASSWORD:11}
         instance:
           service-base-url: http://${EXAM_SERVICE_HOST:localhost}:${server.port}
+          metadata:
+            tags:
+              environment: prd
   # sleuth 配置
   sleuth:
     web:

config-service/src/main/resources/config/gateway-service.yml

@@ -32,6 +32,9 @@ spring:
         password: ${ADMIN_PASSWORD:11}
         instance:
           service-base-url: http://${GATEWAY_SERVICE_HOST:localhost}:${server.port}
+          metadata:
+            tags:
+              environment: prd
   # sleuth 配置
   sleuth:
     web:

config-service/src/main/resources/config/monitor-service.yml

@@ -25,7 +25,9 @@ spring:
         instance:
           service-base-url: http://${MONITOR_HOST:localhost}:${server.port}
       discovery:
-        ignored-services: consul  # 或略consul服务
+        ignored-services: consul  # 忽略consul服务
+      ui:
+        title: monitor-service
   # sleuth 配置
   sleuth:
     web:

config-service/src/main/resources/config/msc-service.yml

@@ -17,6 +17,9 @@ spring:
         password: ${ADMIN_PASSWORD:11}
         instance:
           service-base-url: http://${AUTH_SERVICE_HOST:localhost}:${server.port}
+          metadata:
+            tags:
+              environment: prd
   # sleuth 配置
   sleuth:
     web:
@@ -83,14 +86,14 @@ management:
 
 # 短信配置
 sms:
-  appKey: appKey
-  appSecret: appSecret
-  regionId: default
-  domain: dysmsapi.aliyuncs.com
-  signName: 在线考试系统演示
-  templateCode: SMS_171192294
-  version: 2017-05-25
-  action: SendSms
+  appKey: ${SMS_APP_KEY:test}
+  appSecret: ${SMS_APP_SECRET:test}
+  regionId: ${SMS_REGION_ID:default}
+  domain: ${SMS_DOMAIN:dysmsapi.aliyuncs.com}
+  signName: ${SMS_SIGN_NAME:test}
+  templateCode: ${SMS_TEMP_CODE:SMS_171192294}
+  version: ${SMS_VERSION:2017-05-25}
+  action: ${SMS_ACTION:SendSms}
 
 ignore:
   urls:

config-service/src/main/resources/config/user-service.yml

@@ -29,6 +29,9 @@ spring:
         password: ${ADMIN_PASSWORD:11}
         instance:
           service-base-url: http://${USER_SERVICE_HOST:localhost}:${server.port}
+          metadata:
+            tags:
+              environment: prd
   # sleuth 配置
   sleuth:
     web:

config-service/src/main/resources/logback.xml

@@ -39,10 +39,18 @@
         </filter>
     </appender>
 
+    <!-- 输出到logstash的appender -->
+ <!--   <appender name="logstash" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
+        &lt;!&ndash; logstash的IP和端口，从环境变量注入 &ndash;&gt;
+        <destination>${ELK_DESTINATION}</destination>
+        <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder"/>
+    </appender>-->
+
     <!-- Level: FATAL 0  ERROR 3  WARN 4  INFO 6  DEBUG 7 -->
     <root level="info">
         <appender-ref ref="console"/>
         <appender-ref ref="debug"/>
         <appender-ref ref="error"/>
+        <!--<appender-ref ref="logstash"/>-->
     </root>
 </configuration>

docker-compose-base.yml

-version: '2'
+version: '3'
 services:
   # ---------------------------
   # consul集群，3个节点
@@ -70,7 +70,7 @@ services:
   # 配置中心
   # ---------------------------
   config-service:
-    image: registry.cn-hangzhou.aliyuncs.com/spring-microservice-exam/config-service:3.1.0
+    image: registry.cn-hangzhou.aliyuncs.com/spring-microservice-exam/config-service:3.2.0-SNAPSHOT
     container_name: config-service
     env_file: docker-compose.env  # 从文件中获取配置
     restart: always

docker-compose-elk.yml

+version: '3.2'
+services:
+  elk:
+    image: sebp/elk
+    container_name: elk
+    ports:
+      - "5601:5601"
+      - "9200:9200"
+      - "5044:5044"
+    environment:
+      - ES_JAVA_OPTS=-Xms256m -Xmx256m
+      - TZ=Asia/Shanghai
+    restart: "unless-stopped"
\ No newline at end of file

docker-compose-nginx.yml

-version: '2'
+version: '3'
 services:
   # ---------------------------
   # 前台
   # ---------------------------
   spring-microservice-exam-web:
-    image: registry.cn-hangzhou.aliyuncs.com/spring-microservice-exam/spring-microservice-exam-web:3.1.0
+    image: registry.cn-hangzhou.aliyuncs.com/spring-microservice-exam/spring-microservice-exam-web:3.2.0-SNAPSHOT
     volumes:
       # 挂载nginx的配置文件
       - ./nginx.conf:/etc/nginx/nginx.conf
@@ -20,7 +20,7 @@ services:
   # 后台
   # ---------------------------
   spring-microservice-exam-ui:
-    image: registry.cn-hangzhou.aliyuncs.com/spring-microservice-exam/spring-microservice-exam-ui:3.1.0
+    image: registry.cn-hangzhou.aliyuncs.com/spring-microservice-exam/spring-microservice-exam-ui:3.2.0-SNAPSHOT
     volumes:
       # 挂载nginx的配置文件
       - ./nginx.conf:/etc/nginx/nginx.conf

docker-compose-services.yml

-version: '2'
+version: '3'
 services:
   # ---------------------------
   # api网关
   # ---------------------------
   gateway-service:
-    image: registry.cn-hangzhou.aliyuncs.com/spring-microservice-exam/gateway-service:3.1.0
+    image: registry.cn-hangzhou.aliyuncs.com/spring-microservice-exam/gateway-service:3.2.0-SNAPSHOT
     container_name: gateway-service
     env_file: docker-compose.env  # 从文件中获取配置
     restart: always
@@ -17,7 +17,7 @@ services:
   # 授权服务
   # ---------------------------
   auth-service:
-    image: registry.cn-hangzhou.aliyuncs.com/spring-microservice-exam/auth-service:3.1.0
+    image: registry.cn-hangzhou.aliyuncs.com/spring-microservice-exam/auth-service:3.2.0-SNAPSHOT
     container_name: auth-service
     env_file: docker-compose.env  # 从文件中获取配置
     restart: always
@@ -30,7 +30,7 @@ services:
   # 用户服务
   # ---------------------------
   user-service:
-    image: registry.cn-hangzhou.aliyuncs.com/spring-microservice-exam/user-service:3.1.0
+    image: registry.cn-hangzhou.aliyuncs.com/spring-microservice-exam/user-service:3.2.0-SNAPSHOT
     container_name: user-service
     env_file: docker-compose.env  # 从文件中获取配置
     restart: always
@@ -43,7 +43,7 @@ services:
   # 考试服务
   # ---------------------------
   exam-service:
-    image: registry.cn-hangzhou.aliyuncs.com/spring-microservice-exam/exam-service:3.1.0
+    image: registry.cn-hangzhou.aliyuncs.com/spring-microservice-exam/exam-service:3.2.0-SNAPSHOT
     container_name: exam-service
     env_file: docker-compose.env  # 从文件中获取配置
     restart: always
@@ -56,7 +56,7 @@ services:
   # 消息服务
   # ---------------------------
   msc-service:
-    image: registry.cn-hangzhou.aliyuncs.com/spring-microservice-exam/msc-service:3.1.0
+    image: registry.cn-hangzhou.aliyuncs.com/spring-microservice-exam/msc-service:3.2.0-SNAPSHOT
     container_name: msc-service
     env_file: docker-compose.env  # 从文件中获取配置
     restart: always
@@ -69,7 +69,7 @@ services:
   # 监控服务
   # ---------------------------
   monitor-service:
-    image: registry.cn-hangzhou.aliyuncs.com/spring-microservice-exam/monitor-service:3.1.0
+    image: registry.cn-hangzhou.aliyuncs.com/spring-microservice-exam/monitor-service:3.2.0-SNAPSHOT
     container_name: monitor-service
     env_file: docker-compose.env  # 从文件中获取配置
     restart: always

docker-compose.env

 # JVM参数
 # 可通过docker-compose -f docker-compose-services.yml config命令查看是否生效
-JAVA_OPTS=-Xmx512m -Xms256m
+JAVA_OPTS=-Xmx128m -Xms128m
 
 # 租户标识，默认gitee
 TENANT_CODE=gitee
 
 # 网关token转换
-GATEWAY_TOKEN_TRANSFER=true
+GATEWAY_TOKEN_TRANSFER=false
 
 # 环境配置
 SPRING_PROFILES_ACTIVE=native
@@ -26,17 +26,21 @@ REDIS_HOST=redis
 REDIS_PORT=6379
 
 # 数据库配置
-MYSQL_HOST=localhost
+MYSQL_HOST=mysql
 MYSQL_PORT=3306
-MYSQL_USERNAME=platform
+MYSQL_USERNAME=root
 MYSQL_PASSWORD=11
 
 # FDFS配置
-FDFS_HOST=localhost
+FDFS_HOST=fdfs
 FDFS_PORT=22122
 
+# 配置中心的账号密码
+CONFIG_SERVER_USERNAME=admin
+CONFIG_SERVER_PASSWORD=11
+
 # 附件服务器配置
-ATTACHMENT_HOST=http:#localhost
+ATTACHMENT_HOST=http://attachment-service:8080
 ATTACHMENT_PORT=80
 
 # 各服务host配置
@@ -54,7 +58,7 @@ ADMIN_USERNAME=admin
 ADMIN_PASSWORD=11
 
 # zipkin配置
-ZIPKIN_HOST=localhost
+ZIPKIN_HOST=zipkin-service
 ZIPKIN_PORT=9411
 
 # 演示环境
@@ -66,3 +70,6 @@ CLUSTER_DATA_CENTER_ID=1
 
 # 时区设置，否则容器里的时间和主机时间差8小时
 TZ=Asia/Shanghai
+
+# elk配置
+ELK_DESTINATION=localhost:5044
\ No newline at end of file

docs/deploy/elk/02-beats-input.conf

+input {
+    tcp {
+        port => 5044
+        codec => json_lines
+    }
+}
+output{
+    elasticsearch {
+        hosts => ["localhost:9200"]
+    }
+}
\ No newline at end of file

docs/deploy/mysql/init/microservice-auth.sql

@@ -11,7 +11,7 @@
  Target Server Version : 50617
  File Encoding         : 65001
 
- Date: 04/07/2019 14:36:21
+ Date: 18/08/2019 20:10:54
 */
 
 SET NAMES utf8mb4;

docs/deploy/mysql/init/microservice-exam.sql

 /*
  Navicat Premium Data Transfer
 
- Source Server         : 127.0.0.1
+ Source Server         : mysql_localhost
  Source Server Type    : MySQL
- Source Server Version : 80016
+ Source Server Version : 50617
  Source Host           : localhost:3306
  Source Schema         : microservice-exam
 
  Target Server Type    : MySQL
- Target Server Version : 80016
+ Target Server Version : 50617
  File Encoding         : 65001
 
- Date: 19/07/2019 22:56:29
+ Date: 18/08/2019 20:10:47
 */
 
 SET NAMES utf8mb4;
@@ -23,22 +23,22 @@ SET FOREIGN_KEY_CHECKS = 0;
 DROP TABLE IF EXISTS `exam_answer`;
 CREATE TABLE `exam_answer`  (
   `id` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '主键',
-  `exam_record_id` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '考试记录id',
-  `subject_id` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '题目ID',
-  `type` int(11) DEFAULT NULL,
-  `answer` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '答案',
-  `answer_type` int(11) DEFAULT NULL COMMENT '答题类型，0：正确，1：错误',
-  `score` int(11) DEFAULT NULL COMMENT '实际得分',
-  `mark_status` int(255) DEFAULT NULL,
-  `creator` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '创建人',
-  `create_date` timestamp NULL DEFAULT NULL COMMENT '创建时间',
-  `modifier` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '修改人',
-  `modify_date` timestamp NULL DEFAULT NULL COMMENT '修改时间',
-  `del_flag` int(11) DEFAULT '0' COMMENT '删除标记 0:正常;1:删除',
-  `application_code` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '系统编号',
-  `tenant_code` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL,
+  `exam_record_id` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '考试记录id',
+  `subject_id` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '题目ID',
+  `type` int(11) NULL DEFAULT NULL,
+  `answer` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '答案',
+  `answer_type` int(11) NULL DEFAULT NULL COMMENT '答题类型，0：正确，1：错误',
+  `score` int(11) NULL DEFAULT NULL COMMENT '实际得分',
+  `mark_status` int(255) NULL DEFAULT NULL,
+  `creator` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建人',
+  `create_date` timestamp(0) NULL DEFAULT NULL COMMENT '创建时间',
+  `modifier` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '修改人',
+  `modify_date` timestamp(0) NULL DEFAULT NULL COMMENT '修改时间',
+  `del_flag` int(11) NULL DEFAULT 0 COMMENT '删除标记 0:正常;1:删除',
+  `application_code` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '系统编号',
+  `tenant_code` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='答题表';
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '答题表' ROW_FORMAT = Compact;
 
 -- ----------------------------
 -- Table structure for exam_course
@@ -46,28 +46,26 @@ CREATE TABLE `exam_answer` (
 DROP TABLE IF EXISTS `exam_course`;
 CREATE TABLE `exam_course`  (
   `id` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '主键',
-  `course_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '课程名称',
-  `college` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '学院',
-  `major` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '专业',
-  `teacher` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '老师',
-  `course_description` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '课程描述',
-  `creator` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '创建人',
-  `create_date` timestamp NULL DEFAULT NULL COMMENT '创建时间',
-  `modifier` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '修改人',
-  `modify_date` timestamp NULL DEFAULT NULL COMMENT '修改时间',
-  `del_flag` int(11) DEFAULT '0' COMMENT '删除标记 0:正常;1:删除',
-  `application_code` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '系统编号',
-  `tenant_code` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '租户编号',
+  `course_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '课程名称',
+  `college` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '学院',
+  `major` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '专业',
+  `teacher` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '老师',
+  `course_description` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '课程描述',
+  `creator` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建人',
+  `create_date` timestamp(0) NULL DEFAULT NULL COMMENT '创建时间',
+  `modifier` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '修改人',
+  `modify_date` timestamp(0) NULL DEFAULT NULL COMMENT '修改时间',
+  `del_flag` int(11) NULL DEFAULT 0 COMMENT '删除标记 0:正常;1:删除',
+  `application_code` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '系统编号',
+  `tenant_code` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '租户编号',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='课程表';
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '课程表' ROW_FORMAT = Compact;
 
 -- ----------------------------
 -- Records of exam_course
 -- ----------------------------
-BEGIN;
 INSERT INTO `exam_course` VALUES ('590968789617741824', '计算机基础', '信息学院', '软件工程', '', '计算机基础', 'admin', '2019-06-19 18:18:59', 'admin', '2019-06-23 13:55:51', 0, 'EXAM', 'gitee');
 INSERT INTO `exam_course` VALUES ('590968881187786752', '大学语文', '信息学院', '软件工程', '陈老师', '大学语文', 'admin', '2019-06-19 18:19:20', 'admin', '2019-07-19 22:09:42', 0, 'EXAM', 'gitee');
-COMMIT;
 
 -- ----------------------------
 -- Table structure for exam_examination
@@ -75,33 +73,31 @@ COMMIT;
 DROP TABLE IF EXISTS `exam_examination`;
 CREATE TABLE `exam_examination`  (
   `id` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '主键',
-  `examination_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '考试名称',
-  `type` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '考试类型',
-  `attention` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '考试注意事项',
-  `start_time` timestamp NULL DEFAULT NULL COMMENT '考试开始时间',
-  `end_time` timestamp NULL DEFAULT NULL COMMENT '考试结束时间',
-  `total_score` int(11) DEFAULT NULL COMMENT '总分',
-  `status` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '考试状态',
-  `avatar_id` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '图片ID',
-  `course_id` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '课程',
-  `remark` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '备注',
-  `creator` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '创建人',
-  `create_date` timestamp NULL DEFAULT NULL COMMENT '创建时间',
-  `modifier` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '修改人',
-  `modify_date` timestamp NULL DEFAULT NULL COMMENT '修改时间',
-  `del_flag` int(11) DEFAULT '0' COMMENT '删除标记 0:正常;1:删除',
-  `application_code` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '系统编号',
-  `tenant_code` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '租户编号',
+  `examination_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '考试名称',
+  `type` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '考试类型',
+  `attention` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '考试注意事项',
+  `start_time` timestamp(0) NULL DEFAULT NULL COMMENT '考试开始时间',
+  `end_time` timestamp(0) NULL DEFAULT NULL COMMENT '考试结束时间',
+  `total_score` int(11) NULL DEFAULT NULL COMMENT '总分',
+  `status` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '考试状态',
+  `avatar_id` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '图片ID',
+  `course_id` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '课程',
+  `remark` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注',
+  `creator` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建人',
+  `create_date` timestamp(0) NULL DEFAULT NULL COMMENT '创建时间',
+  `modifier` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '修改人',
+  `modify_date` timestamp(0) NULL DEFAULT NULL COMMENT '修改时间',
+  `del_flag` int(11) NULL DEFAULT 0 COMMENT '删除标记 0:正常;1:删除',
+  `application_code` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '系统编号',
+  `tenant_code` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '租户编号',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='考试信息表';
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '考试信息表' ROW_FORMAT = Compact;
 
 -- ----------------------------
 -- Records of exam_examination
 -- ----------------------------
-BEGIN;
 INSERT INTO `exam_examination` VALUES ('590969316204220416', '全国计算机统考练习题10道', '2', '练习', '2019-06-19 18:20:00', '2019-06-19 20:20:00', 50, '0', NULL, '590968789617741824', '全国计算机统考练习题10道', 'admin', '2019-06-19 18:21:04', 'admin', '2019-06-19 18:45:33', 0, 'EXAM', 'gitee');
 INSERT INTO `exam_examination` VALUES ('590969514372501504', '四川省2016年普通高考文科综合能力测试-语文部分', '0', '注意事项:\n1.本试卷分第工卷(选择题)和第II卷(非选择题)两部分。答卷前，考生务必将白己的姓名、准考证号填写在答题卡上。\n2.回答第Ⅰ卷时，选出每小题答案后，用铅笔把答题卡上对应题目的答案标号涂黑。如需改动，用橡皮擦干净后，再选涂其它答案标号。写在本试卷上无效。\n3.回答第Ⅱ卷时，将答案写在答题卡上。写在本试卷上无效。\n4.考试结束后，将本试卷和答题卡一并交回。', '2019-07-02 19:21:00', '2019-07-04 16:02:00', 60, '0', NULL, '590968881187786752', '四川省2016年普通高考-文科综合能力测试', 'admin', '2019-06-19 18:21:51', 'admin', '2019-07-04 14:20:36', 0, 'EXAM', 'gitee');
-COMMIT;
 
 -- ----------------------------
 -- Table structure for exam_examination_record
@@ -109,23 +105,23 @@ COMMIT;
 DROP TABLE IF EXISTS `exam_examination_record`;
 CREATE TABLE `exam_examination_record`  (
   `id` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '主键',
-  `user_id` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '用户id',
-  `examination_id` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '考试ID',
-  `start_time` timestamp NULL DEFAULT NULL COMMENT '开始时间',
-  `end_time` timestamp NULL DEFAULT NULL COMMENT '结束时间',
-  `score` int(11) DEFAULT NULL COMMENT '成绩',
-  `correct_number` int(11) DEFAULT NULL COMMENT '正确题目数量',
-  `incorrect_number` int(11) DEFAULT NULL COMMENT '错误题目数量',
-  `submit_status` int(11) DEFAULT NULL,
-  `creator` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '创建人',
-  `create_date` timestamp NULL DEFAULT NULL COMMENT '创建时间',
-  `modifier` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '修改人',
-  `modify_date` timestamp NULL DEFAULT NULL COMMENT '修改时间',
-  `del_flag` int(11) DEFAULT '0' COMMENT '删除标记 0:正常;1:删除',
-  `application_code` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '系统编号',
-  `tenant_code` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '租户编号',
+  `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',
+  `start_time` timestamp(0) NULL DEFAULT NULL COMMENT '开始时间',
+  `end_time` timestamp(0) NULL DEFAULT NULL COMMENT '结束时间',
+  `score` int(11) NULL DEFAULT NULL COMMENT '成绩',
+  `correct_number` int(11) NULL DEFAULT NULL COMMENT '正确题目数量',
+  `incorrect_number` int(11) NULL DEFAULT NULL COMMENT '错误题目数量',
+  `submit_status` int(11) NULL DEFAULT NULL,
+  `creator` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建人',
+  `create_date` timestamp(0) NULL DEFAULT NULL COMMENT '创建时间',
+  `modifier` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '修改人',
+  `modify_date` timestamp(0) NULL DEFAULT NULL COMMENT '修改时间',
+  `del_flag` int(11) NULL DEFAULT 0 COMMENT '删除标记 0:正常;1:删除',
+  `application_code` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '系统编号',
+  `tenant_code` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '租户编号',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='考试记录表';
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '考试记录表' ROW_FORMAT = Compact;
 
 -- ----------------------------
 -- Table structure for exam_examination_subject
@@ -133,19 +129,18 @@ CREATE TABLE `exam_examination_record` (
 DROP TABLE IF EXISTS `exam_examination_subject`;
 CREATE TABLE `exam_examination_subject`  (
   `id` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '主键',
-  `examination_id` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '考试ID',
-  `subject_id` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '题目ID',
-  `type` int(11) DEFAULT NULL COMMENT '类型 0-选择题，1-简答题',
-  `application_code` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '系统编号',
-  `tenant_code` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL,
-  `serial_number` int(11) DEFAULT NULL,
+  `examination_id` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '考试ID',
+  `subject_id` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '题目ID',
+  `type` int(11) NULL DEFAULT NULL COMMENT '类型 0-选择题，1-简答题',
+  `application_code` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '系统编号',
+  `tenant_code` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `serial_number` int(11) NULL DEFAULT NULL,
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='考试题目表';
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '考试题目表' ROW_FORMAT = Compact;
 
 -- ----------------------------
 -- Records of exam_examination_subject
 -- ----------------------------
-BEGIN;
 INSERT INTO `exam_examination_subject` VALUES ('590970743886581760', '590969316204220416', '590970743878193152', 0, 'EXAM', 'gitee', 1);
 INSERT INTO `exam_examination_subject` VALUES ('590970887440830464', '590969316204220416', '590970887432441856', 0, 'EXAM', 'gitee', 2);
 INSERT INTO `exam_examination_subject` VALUES ('590971026888855552', '590969316204220416', '590971026880466944', 0, 'EXAM', 'gitee', 3);
@@ -168,7 +163,6 @@ INSERT INTO `exam_examination_subject` VALUES ('590973027999682560', '5909695143
 INSERT INTO `exam_examination_subject` VALUES ('590973115165708288', '590969514372501504', '590973115157319680', 0, 'EXAM', 'gitee', 10);
 INSERT INTO `exam_examination_subject` VALUES ('590973253548380160', '590969514372501504', '590973253544185856', 0, 'EXAM', 'gitee', 11);
 INSERT INTO `exam_examination_subject` VALUES ('590973360670904320', '590969514372501504', '590973360662515712', 0, 'EXAM', 'gitee', 12);
-COMMIT;
 
 -- ----------------------------
 -- Table structure for exam_knowledge
@@ -176,26 +170,24 @@ COMMIT;
 DROP TABLE IF EXISTS `exam_knowledge`;
 CREATE TABLE `exam_knowledge`  (
   `id` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '主键',
-  `knowledge_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '知识名称',
-  `knowledge_desc` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '知识描述',
-  `attachment_id` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '附件ID',
-  `status` int(11) DEFAULT NULL COMMENT '状态',
-  `creator` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '创建人',
-  `create_date` timestamp NULL DEFAULT NULL COMMENT '创建时间',
-  `modifier` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '修改人',
-  `modify_date` timestamp NULL DEFAULT NULL COMMENT '修改时间',
-  `del_flag` int(11) DEFAULT '0' COMMENT '删除标记 0:正常;1:删除',
-  `application_code` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '系统编号',
-  `tenant_code` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '租户编号',
+  `knowledge_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '知识名称',
+  `knowledge_desc` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '知识描述',
+  `attachment_id` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '附件ID',
+  `status` int(11) NULL DEFAULT NULL COMMENT '状态',
+  `creator` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建人',
+  `create_date` timestamp(0) NULL DEFAULT NULL COMMENT '创建时间',
+  `modifier` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '修改人',
+  `modify_date` timestamp(0) NULL DEFAULT NULL COMMENT '修改时间',
+  `del_flag` int(11) NULL DEFAULT 0 COMMENT '删除标记 0:正常;1:删除',
+  `application_code` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '系统编号',
+  `tenant_code` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '租户编号',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='知识表';
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '知识表' ROW_FORMAT = Compact;
 
 -- ----------------------------
 -- Records of exam_knowledge
 -- ----------------------------
-BEGIN;
 INSERT INTO `exam_knowledge` VALUES ('590978901526843392', '四川省2016年普通高考适应性测试', '四川省2016年普通高考适应性测试', '590978944174526464', 0, 'admin', '2019-06-19 18:59:09', 'admin', '2019-07-04 13:51:27', 0, 'EXAM', 'gitee');
-COMMIT;
 
 -- ----------------------------
 -- Table structure for exam_pictures
@@ -203,17 +195,17 @@ COMMIT;
 DROP TABLE IF EXISTS `exam_pictures`;
 CREATE TABLE `exam_pictures`  (
   `id` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '主键',
-  `picture_address` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '知识名称',
-  `attachment_id` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '附件ID',
-  `creator` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '创建人',
-  `create_date` timestamp NULL DEFAULT NULL COMMENT '创建时间',
-  `modifier` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '修改人',
-  `modify_date` timestamp NULL DEFAULT NULL COMMENT '修改时间',
-  `del_flag` int(11) DEFAULT '0' COMMENT '删除标记 0:正常;1:删除',
-  `application_code` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '系统编号',
-  `tenant_code` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '租户编号',
+  `picture_address` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '知识名称',
+  `attachment_id` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '附件ID',
+  `creator` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建人',
+  `create_date` timestamp(0) NULL DEFAULT NULL COMMENT '创建时间',
+  `modifier` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '修改人',
+  `modify_date` timestamp(0) NULL DEFAULT NULL COMMENT '修改时间',
+  `del_flag` int(11) NULL DEFAULT 0 COMMENT '删除标记 0:正常;1:删除',
+  `application_code` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '系统编号',
+  `tenant_code` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '租户编号',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='图片表';
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '图片表' ROW_FORMAT = Compact;
 
 -- ----------------------------
 -- Table structure for exam_subject_category
@@ -221,32 +213,31 @@ CREATE TABLE `exam_pictures` (
 DROP TABLE IF EXISTS `exam_subject_category`;
 CREATE TABLE `exam_subject_category`  (
   `id` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '主键',
-  `category_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '分类名称',
-  `category_desc` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '分类描述',
-  `parent_id` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '父分类ID',
-  `sort` int(11) DEFAULT NULL COMMENT '排序号',
-  `type` int(11) DEFAULT NULL COMMENT '类型: 0-私共,1-公有',
-  `creator` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '创建人',
-  `create_date` timestamp NULL DEFAULT NULL COMMENT '创建时间',
-  `modifier` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '修改人',
-  `modify_date` timestamp NULL DEFAULT NULL COMMENT '修改时间',
-  `del_flag` int(11) DEFAULT '0' COMMENT '删除标记 0:正常;1:删除',
+  `category_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '分类名称',
+  `category_desc` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '分类描述',
+  `parent_id` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '父分类ID',
+  `sort` int(11) NULL DEFAULT NULL COMMENT '排序号',
+  `type` int(11) NULL DEFAULT NULL COMMENT '类型: 0-私共,1-公有',
+  `creator` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建人',
+  `create_date` timestamp(0) NULL DEFAULT NULL COMMENT '创建时间',
+  `modifier` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '修改人',
+  `modify_date` timestamp(0) NULL DEFAULT NULL COMMENT '修改时间',
+  `del_flag` int(11) NULL DEFAULT 0 COMMENT '删除标记 0:正常;1:删除',
   `application_code` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '系统编号',
-  `tenant_code` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '租户编号',
+  `tenant_code` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '租户编号',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='题目分类表';
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '题目分类表' ROW_FORMAT = Compact;
 
 -- ----------------------------
 -- Records of exam_subject_category
 -- ----------------------------
-BEGIN;
 INSERT INTO `exam_subject_category` VALUES ('590975991732637696', '计算机', NULL, '-1', 30, NULL, 'admin', '2019-06-19 18:47:36', 'admin', '2019-06-19 18:47:36', 0, 'EXAM', 'gitee');
 INSERT INTO `exam_subject_category` VALUES ('590976037467328512', '数据库基础', NULL, '590975991732637696', 30, NULL, 'admin', '2019-06-19 18:47:47', 'admin', '2019-07-04 13:51:03', 0, 'EXAM', 'gitee');
 INSERT INTO `exam_subject_category` VALUES ('590976094983819264', 'Java程序设计', NULL, '590975991732637696', 31, NULL, 'admin', '2019-06-19 18:48:00', 'admin', '2019-06-19 18:48:00', 0, 'EXAM', 'gitee');
 INSERT INTO `exam_subject_category` VALUES ('590976142211682304', '数据结构', NULL, '590975991732637696', 33, NULL, 'admin', '2019-06-19 18:48:12', 'admin', '2019-06-19 18:48:12', 0, 'EXAM', 'gitee');
 INSERT INTO `exam_subject_category` VALUES ('590976191398285312', '地理', NULL, '-1', 31, NULL, 'admin', '2019-06-19 18:48:23', 'admin', '2019-06-19 18:48:23', 0, 'EXAM', 'gitee');
 INSERT INTO `exam_subject_category` VALUES ('590976335996915712', '计算机基础', NULL, '590975991732637696', 34, NULL, 'admin', '2019-06-19 18:48:58', 'admin', '2019-06-19 18:48:58', 0, 'EXAM', 'gitee');
-COMMIT;
+INSERT INTO `exam_subject_category` VALUES ('602231546270846976', '多选测试', NULL, '-1', 30, NULL, 'admin', '2019-07-20 20:13:10', 'admin', '2019-07-20 20:13:10', 0, 'EXAM', 'gitee');
 
 -- ----------------------------
 -- Table structure for exam_subject_choices
@@ -254,28 +245,27 @@ COMMIT;
 DROP TABLE IF EXISTS `exam_subject_choices`;
 CREATE TABLE `exam_subject_choices`  (
   `id` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '主键',
-  `category_id` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL,
-  `serial_number` int(11) DEFAULT NULL COMMENT '题目序号',
-  `subject_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '题目名称',
-  `choices_type` int(11) DEFAULT NULL COMMENT '题目类型',
-  `answer` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '参考答案',
-  `score` int(11) DEFAULT NULL COMMENT '题目分值',
-  `analysis` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '解析',
-  `level` int(11) DEFAULT NULL COMMENT '难度等级',
-  `creator` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '创建人',
-  `create_date` timestamp NULL DEFAULT NULL COMMENT '创建时间',
-  `modifier` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '修改人',
-  `modify_date` timestamp NULL DEFAULT NULL COMMENT '修改时间',
-  `del_flag` int(11) DEFAULT '0' COMMENT '删除标记 0:正常;1:删除',
-  `application_code` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '系统编号',
-  `tenant_code` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL,
+  `category_id` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `serial_number` int(11) NULL DEFAULT NULL COMMENT '题目序号',
+  `subject_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '题目名称',
+  `choices_type` int(11) NULL DEFAULT NULL COMMENT '题目类型',
+  `answer` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '参考答案',
+  `score` int(11) NULL DEFAULT NULL COMMENT '题目分值',
+  `analysis` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '解析',
+  `level` int(11) NULL DEFAULT NULL COMMENT '难度等级',
+  `creator` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建人',
+  `create_date` timestamp(0) NULL DEFAULT NULL COMMENT '创建时间',
+  `modifier` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '修改人',
+  `modify_date` timestamp(0) NULL DEFAULT NULL COMMENT '修改时间',
+  `del_flag` int(11) NULL DEFAULT 0 COMMENT '删除标记 0:正常;1:删除',
+  `application_code` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '系统编号',
+  `tenant_code` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='选择题表';
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '选择题表' ROW_FORMAT = Compact;
 
 -- ----------------------------
 -- Records of exam_subject_choices
 -- ----------------------------
-BEGIN;
 INSERT INTO `exam_subject_choices` VALUES ('590970743878193152', '0', 1, '自计算机问世至今已经经历了四个时代，划分时代的主要依据是计算机的_', 0, 'D', 5, '<p>无</p>', 2, 'admin', '2019-06-19 18:26:45', 'admin', '2019-06-19 18:31:29', 0, 'EXAM', 'gitee');
 INSERT INTO `exam_subject_choices` VALUES ('590970887432441856', '0', 2, '第一台计算机是在1946年在美国诞生，该机的英文缩写是_', 0, 'A', 5, '<p>无</p>', 2, 'admin', '2019-06-19 18:27:19', 'admin', '2019-06-19 18:27:19', 0, 'EXAM', 'gitee');
 INSERT INTO `exam_subject_choices` VALUES ('590971026880466944', '0', 3, '当前的计算机一般被认为是第四代计算机，它所采用的逻辑元件是_', 0, 'C', 5, '无', 2, 'admin', '2019-06-19 18:27:52', 'admin', '2019-06-19 18:27:52', 0, 'EXAM', 'gitee');
@@ -298,8 +288,8 @@ INSERT INTO `exam_subject_choices` VALUES ('590973027995488256', '0', 9, '古代
 INSERT INTO `exam_subject_choices` VALUES ('590973115157319680', '0', 10, '19 世纪末 20 世纪初，一向傲慢的英国人惊奇地发现：“身上的衣服是德国缝制的，少女们周末穿的漂亮披风与上衣来自德国。更让人吃惊的是生活中有许多东西都产自德国，……连周末歌剧院里上演的歌剧也是德国人创作的，演员无一例外是德国人。”可见，当时傲慢的英国人', 0, 'D', 5, '', 2, 'admin', '2019-06-19 18:36:10', 'admin', '2019-06-19 18:36:10', 0, 'EXAM', 'gitee');
 INSERT INTO `exam_subject_choices` VALUES ('590973253544185856', '0', 11, '1920–1921 年，苏俄许多工人流往农村，还有一些则自谋生路成了小手工业者。据此推知当时苏俄', 0, 'A', 5, '', 2, 'admin', '2019-06-19 18:36:43', 'admin', '2019-06-19 18:36:43', 0, 'EXAM', 'gitee');
 INSERT INTO `exam_subject_choices` VALUES ('590973360662515712', '0', 12, '1964 年 6 月，美国《时代》杂志发表社论指出：“从北约到联合国，从拉丁美洲到红色中国，几乎在世界政治中的每一个问题或地区上，法国都采取和美国政策不一致的态度。”这一社论', 0, 'B', 5, '', 2, 'admin', '2019-06-19 18:37:08', 'admin', '2019-06-19 18:37:08', 0, 'EXAM', 'gitee');
-INSERT INTO `exam_subject_choices` VALUES ('590976455786237952', '590976335996915712', 1, '自计算机问世至今已经经历了四个时代，划分时代的主要依据是计算机的_', 0, 'D', 5, '', 2, 'admin', '2019-06-19 18:49:26', 'admin', '2019-07-04 13:51:17', 0, 'EXAM', 'gitee');
-COMMIT;
+INSERT INTO `exam_subject_choices` VALUES ('590976455786237952', '590976335996915712', 1, '<p>自计算机问世至今已经经历了四个时代，划分时代的主要依据是计算机的_</p>', 0, 'D', 5, '', 2, 'admin', '2019-06-19 18:49:26', 'admin', '2019-07-20 20:29:15', 0, 'EXAM', 'gitee');
+INSERT INTO `exam_subject_choices` VALUES ('602231589715447808', '602231546270846976', 1, '<p>32</p>', 3, 'A', 5, '233', 2, 'admin', '2019-07-20 20:13:20', 'admin', '2019-07-20 20:30:22', 0, 'EXAM', 'gitee');
 
 -- ----------------------------
 -- Table structure for exam_subject_judgement
@@ -307,22 +297,22 @@ COMMIT;
 DROP TABLE IF EXISTS `exam_subject_judgement`;
 CREATE TABLE `exam_subject_judgement`  (
   `id` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '主键',
-  `category_id` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '分类ID',
-  `serial_number` int(11) DEFAULT NULL COMMENT '序号',
-  `subject_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '题目名称',
-  `answer` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '参考答案',
-  `score` int(11) DEFAULT NULL COMMENT '分值',
-  `analysis` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '解析',
-  `level` int(11) DEFAULT NULL COMMENT '难度等级',
-  `creator` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '创建人',
-  `create_date` timestamp NULL DEFAULT NULL COMMENT '创建时间',
-  `modifier` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '修改人',
-  `modify_date` timestamp NULL DEFAULT NULL COMMENT '修改时间',
-  `del_flag` int(11) DEFAULT '0' COMMENT '删除标记 0:正常;1:删除',
-  `application_code` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '系统编号',
-  `tenant_code` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '租户编号',
+  `category_id` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '分类ID',
+  `serial_number` int(11) NULL DEFAULT NULL COMMENT '序号',
+  `subject_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '题目名称',
+  `answer` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '参考答案',
+  `score` int(11) NULL DEFAULT NULL COMMENT '分值',
+  `analysis` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '解析',
+  `level` int(11) NULL DEFAULT NULL COMMENT '难度等级',
+  `creator` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建人',
+  `create_date` timestamp(0) NULL DEFAULT NULL COMMENT '创建时间',
+  `modifier` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '修改人',
+  `modify_date` timestamp(0) NULL DEFAULT NULL COMMENT '修改时间',
+  `del_flag` int(11) NULL DEFAULT 0 COMMENT '删除标记 0:正常;1:删除',
+  `application_code` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '系统编号',
+  `tenant_code` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '租户编号',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='简答题表';
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '简答题表' ROW_FORMAT = Compact;
 
 -- ----------------------------
 -- Table structure for exam_subject_option
@@ -330,23 +320,22 @@ CREATE TABLE `exam_subject_judgement` (
 DROP TABLE IF EXISTS `exam_subject_option`;
 CREATE TABLE `exam_subject_option`  (
   `id` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '主键',
-  `subject_choices_id` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '选择题ID',
-  `option_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '选项名称',
-  `option_content` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '选项内容',
-  `creator` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '创建人',
-  `create_date` timestamp NULL DEFAULT NULL COMMENT '创建时间',
-  `modifier` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '修改人',
-  `modify_date` timestamp NULL DEFAULT NULL COMMENT '修改时间',
-  `del_flag` int(11) DEFAULT '0' COMMENT '删除标记 0:正常;1:删除',
-  `application_code` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '系统编号',
-  `tenant_code` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '租户编号',
+  `subject_choices_id` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '选择题ID',
+  `option_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '选项名称',
+  `option_content` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '选项内容',
+  `creator` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建人',
+  `create_date` timestamp(0) NULL DEFAULT NULL COMMENT '创建时间',
+  `modifier` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '修改人',
+  `modify_date` timestamp(0) NULL DEFAULT NULL COMMENT '修改时间',
+  `del_flag` int(11) NULL DEFAULT 0 COMMENT '删除标记 0:正常;1:删除',
+  `application_code` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '系统编号',
+  `tenant_code` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '租户编号',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='选择题选项表';
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '选择题选项表' ROW_FORMAT = Compact;
 
 -- ----------------------------
 -- Records of exam_subject_option
 -- ----------------------------
-BEGIN;
 INSERT INTO `exam_subject_option` VALUES ('590970743911747584', '590970743878193152', 'A', '<p>规模</p>', 'admin', '2019-06-19 18:26:45', 'admin', '2019-06-19 18:31:29', 0, 'EXAM', 'gitee');
 INSERT INTO `exam_subject_option` VALUES ('590970743911747585', '590970743878193152', 'B', '<p>功能</p>', 'admin', '2019-06-19 18:26:45', 'admin', '2019-06-19 18:31:29', 0, 'EXAM', 'gitee');
 INSERT INTO `exam_subject_option` VALUES ('590970743911747586', '590970743878193152', 'C', '<p>性能</p>', 'admin', '2019-06-19 18:26:45', 'admin', '2019-06-19 18:31:29', 0, 'EXAM', 'gitee');
@@ -435,15 +424,18 @@ INSERT INTO `exam_subject_option` VALUES ('590973360691875840', '590973360662515
 INSERT INTO `exam_subject_option` VALUES ('590973360691875841', '590973360662515712', 'B', '<p>反映了法国推行独立外交</p>', 'admin', '2019-06-19 18:37:08', 'admin', '2019-06-19 18:37:08', 0, 'EXAM', 'gitee');
 INSERT INTO `exam_subject_option` VALUES ('590973360691875842', '590973360662515712', 'C', '<p>体现了两大阵营对抗趋于缓和</p>', 'admin', '2019-06-19 18:37:08', 'admin', '2019-06-19 18:37:08', 0, 'EXAM', 'gitee');
 INSERT INTO `exam_subject_option` VALUES ('590973360691875843', '590973360662515712', 'D', '体现了两大阵营对抗趋于缓和', 'admin', '2019-06-19 18:37:08', 'admin', '2019-06-19 18:37:08', 0, 'EXAM', 'gitee');
-INSERT INTO `exam_subject_option` VALUES ('590976455823986688', '590976455786237952', 'A', '<p>规模</p>', 'admin', '2019-06-19 18:49:26', 'admin', '2019-07-04 13:51:17', 0, 'EXAM', 'gitee');
-INSERT INTO `exam_subject_option` VALUES ('590976455823986689', '590976455786237952', 'B', '<p>功能</p>', 'admin', '2019-06-19 18:49:26', 'admin', '2019-07-04 13:51:17', 0, 'EXAM', 'gitee');
-INSERT INTO `exam_subject_option` VALUES ('590976455823986690', '590976455786237952', 'C', '<p>性能</p>', 'admin', '2019-06-19 18:49:26', 'admin', '2019-07-04 13:51:17', 0, 'EXAM', 'gitee');
-INSERT INTO `exam_subject_option` VALUES ('590976455823986691', '590976455786237952', 'D', '构成元件', 'admin', '2019-06-19 18:49:26', 'admin', '2019-07-04 13:51:17', 0, 'EXAM', 'gitee');
+INSERT INTO `exam_subject_option` VALUES ('590976455823986688', '590976455786237952', 'A', '<p>规模</p>', 'admin', '2019-06-19 18:49:26', 'admin', '2019-07-20 20:29:15', 0, 'EXAM', 'gitee');
+INSERT INTO `exam_subject_option` VALUES ('590976455823986689', '590976455786237952', 'B', '<p>功能</p>', 'admin', '2019-06-19 18:49:26', 'admin', '2019-07-20 20:29:15', 0, 'EXAM', 'gitee');
+INSERT INTO `exam_subject_option` VALUES ('590976455823986690', '590976455786237952', 'C', '<p>性能</p>', 'admin', '2019-06-19 18:49:26', 'admin', '2019-07-20 20:29:15', 0, 'EXAM', 'gitee');
+INSERT INTO `exam_subject_option` VALUES ('590976455823986691', '590976455786237952', 'D', '构成元件', 'admin', '2019-06-19 18:49:26', 'admin', '2019-07-20 20:29:15', 0, 'EXAM', 'gitee');
 INSERT INTO `exam_subject_option` VALUES ('590976456683819008', '590976456675430400', 'A', '<p>规模</p>', 'admin', '2019-06-19 18:49:27', 'admin', '2019-06-19 18:49:27', 0, 'EXAM', 'gitee');
 INSERT INTO `exam_subject_option` VALUES ('590976456683819009', '590976456675430400', 'B', '<p>功能</p>', 'admin', '2019-06-19 18:49:27', 'admin', '2019-06-19 18:49:27', 0, 'EXAM', 'gitee');
 INSERT INTO `exam_subject_option` VALUES ('590976456683819010', '590976456675430400', 'C', '<p>性能</p>', 'admin', '2019-06-19 18:49:27', 'admin', '2019-06-19 18:49:27', 0, 'EXAM', 'gitee');
 INSERT INTO `exam_subject_option` VALUES ('590976456683819011', '590976456675430400', 'D', '构成元件', 'admin', '2019-06-19 18:49:27', 'admin', '2019-06-19 18:49:27', 0, 'EXAM', 'gitee');
-COMMIT;
+INSERT INTO `exam_subject_option` VALUES ('602231589723836416', '602231589715447808', 'A', '32', 'admin', '2019-07-20 20:13:20', 'admin', '2019-07-20 20:30:22', 0, 'EXAM', 'gitee');
+INSERT INTO `exam_subject_option` VALUES ('602231589723836417', '602231589715447808', 'B', '323', 'admin', '2019-07-20 20:13:20', 'admin', '2019-07-20 20:30:22', 0, 'EXAM', 'gitee');
+INSERT INTO `exam_subject_option` VALUES ('602231589723836418', '602231589715447808', 'C', '323', 'admin', '2019-07-20 20:13:20', 'admin', '2019-07-20 20:30:22', 0, 'EXAM', 'gitee');
+INSERT INTO `exam_subject_option` VALUES ('602231589723836419', '602231589715447808', 'D', '323', 'admin', '2019-07-20 20:13:20', 'admin', '2019-07-20 20:30:22', 0, 'EXAM', 'gitee');
 
 -- ----------------------------
 -- Table structure for exam_subject_short_answer
@@ -451,21 +443,21 @@ COMMIT;
 DROP TABLE IF EXISTS `exam_subject_short_answer`;
 CREATE TABLE `exam_subject_short_answer`  (
   `id` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '主键',
-  `category_id` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '分类ID',
-  `serial_number` int(11) DEFAULT NULL COMMENT '序号',
-  `subject_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '题目名称',
-  `answer` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '参考答案',
-  `score` int(11) DEFAULT NULL COMMENT '分值',
-  `analysis` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '解析',
-  `level` int(11) DEFAULT NULL COMMENT '难度等级',
-  `creator` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '创建人',
-  `create_date` timestamp NULL DEFAULT NULL COMMENT '创建时间',
-  `modifier` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '修改人',
-  `modify_date` timestamp NULL DEFAULT NULL COMMENT '修改时间',
-  `del_flag` int(11) DEFAULT '0' COMMENT '删除标记 0:正常;1:删除',
-  `application_code` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '系统编号',
-  `tenant_code` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '租户编号',
+  `category_id` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '分类ID',
+  `serial_number` int(11) NULL DEFAULT NULL COMMENT '序号',
+  `subject_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '题目名称',
+  `answer` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '参考答案',
+  `score` int(11) NULL DEFAULT NULL COMMENT '分值',
+  `analysis` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '解析',
+  `level` int(11) NULL DEFAULT NULL COMMENT '难度等级',
+  `creator` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建人',
+  `create_date` timestamp(0) NULL DEFAULT NULL COMMENT '创建时间',
+  `modifier` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '修改人',
+  `modify_date` timestamp(0) NULL DEFAULT NULL COMMENT '修改时间',
+  `del_flag` int(11) NULL DEFAULT 0 COMMENT '删除标记 0:正常;1:删除',
+  `application_code` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '系统编号',
+  `tenant_code` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '租户编号',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='简答题表';
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '简答题表' ROW_FORMAT = Compact;
 
 SET FOREIGN_KEY_CHECKS = 1;

docs/deploy/mysql/init/microservice-gateway.sql

@@ -11,7 +11,7 @@
  Target Server Version : 50617
  File Encoding         : 65001
 
- Date: 18/07/2019 23:06:58
+ Date: 18/08/2019 20:10:40
 */
 
 SET NAMES utf8mb4;
@@ -42,8 +42,9 @@ CREATE TABLE `sys_route`  (
 -- ----------------------------
 -- 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-26 22:45:28', 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-26 22:45:30', 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-06-07 21:48:45', 0, 'EXAM');
+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', '1', '0', 'admin', '2019-04-07 11:20:55', '', '2019-08-03 09:58:48', 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', '3', '0', 'admin', '2019-04-02 21:39:30', '', '2019-08-03 09:58:54', 0, 'EXAM');
+INSERT INTO `sys_route` VALUES ('607150228717572096', 'msc-service', '消息中心', '[\n  {\n    \"name\": \"Path\",\n    \"args\": {\n      \"_genkey_0\": \"/api/msc/**\"\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://msc-service', '4', '0', '', '2019-08-03 09:58:15', '', '2019-08-03 09:58:27', 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', '2', '0', 'admin', '2019-04-07 11:22:05', '', '2019-08-03 09:58:35', 0, 'EXAM');
 
 SET FOREIGN_KEY_CHECKS = 1;

docs/deploy/mysql/init/microservice-user.sql

@@ -11,7 +11,7 @@
  Target Server Version : 50617
  File Encoding         : 65001
 
- Date: 18/07/2019 23:06:48
+ Date: 18/08/2019 20:10:33
 */
 
 SET NAMES utf8mb4;
@@ -627,6 +627,7 @@ CREATE TABLE `sys_user`  (
   `login_time` timestamp(0) NULL DEFAULT NULL,
   `lock_time` timestamp(0) NULL DEFAULT NULL,
   `wechat` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `family_role` int(11) NULL DEFAULT NULL,
   `creator` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '创建人',
   `create_date` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '创建时间',
   `modifier` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '修改人',
@@ -640,10 +641,11 @@ CREATE TABLE `sys_user`  (
 -- ----------------------------
 -- Records of sys_user
 -- ----------------------------
-INSERT INTO `sys_user` VALUES ('596078038307966976', '管理员', '15521089185', '596094244884713472', '1633736729@qq.com', '2019-07-01', 0, 0, '571347099191480320', '管理员', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'admin', '2019-07-04 13:51:34', 'admin', '2019-07-04 13:51:35', 0, 'EXAM', 'gitee');
-INSERT INTO `sys_user` VALUES ('596307222997372928', '梁同学', '15521089185', NULL, '1633736729@qq.com', '2019-07-01', 0, 1, NULL, '梁同学', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'admin', '2019-07-05 21:53:16', 'admin', '2019-07-05 21:53:17', 0, 'EXAM', 'gitee');
-INSERT INTO `sys_user` VALUES ('596332387600830464', '林老师', '15521089185', NULL, '1633736729@qq.com', '2019-07-03', 0, 1, NULL, '林老师', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'admin', '2019-07-04 13:34:28', 'admin', '2019-07-04 13:38:06', 0, 'EXAM', 'gitee');
-INSERT INTO `sys_user` VALUES ('597110984758398976', '测试', '15521089182', '597110984758398977', NULL, NULL, 0, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2019-07-06 17:05:52', NULL, NULL, 'ovLl45InRn4Hz_jrpEk-gF-kEFf8', '2019-07-18 23:06:24', 'admin', '2019-07-18 23:06:25', 0, 'EXAM', 'gitee');
+INSERT INTO `sys_user` VALUES ('596078038307966976', '管理员', '15521089185', '596094244884713472', '1633736729@qq.com', '2019-07-01', 0, 0, '571347099191480320', '管理员', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'admin', '2019-07-04 13:51:34', 'admin', '2019-07-04 13:51:35', 0, 'EXAM', 'gitee');
+INSERT INTO `sys_user` VALUES ('596307222997372928', '梁同学', '15521089185', NULL, '1633736729@qq.com', '2019-07-01', 0, 1, NULL, '梁同学', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'admin', '2019-07-05 21:53:16', 'admin', '2019-07-05 21:53:17', 0, 'EXAM', 'gitee');
+INSERT INTO `sys_user` VALUES ('596332387600830464', '林老师', '15521089185', NULL, '1633736729@qq.com', '2019-07-03', 0, 1, NULL, '林老师', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'admin', '2019-07-04 13:34:28', 'admin', '2019-07-04 13:38:06', 0, 'EXAM', 'gitee');
+INSERT INTO `sys_user` VALUES ('597110984758398976', '测试', '15521089182', '597110984758398977', NULL, NULL, 0, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2019-07-06 17:05:52', NULL, NULL, NULL, 'ovLl45InRn4Hz_jrpEk-gF-kEFf8', '2019-07-18 23:06:24', 'admin', '2019-07-18 23:06:25', 0, 'EXAM', 'gitee');
+INSERT INTO `sys_user` VALUES ('607570770629103616', NULL, '15521089185', NULL, NULL, NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2019-08-04 13:49:20', NULL, NULL, NULL, '15521089185', '2019-08-04 13:49:20', '15521089185', '2019-08-04 13:49:20', 0, 'EXAM', 'gitee');
 
 -- ----------------------------
 -- Table structure for sys_user_auths
@@ -673,6 +675,7 @@ INSERT INTO `sys_user_auths` VALUES ('596329627606192128', '596078038307966976',
 INSERT INTO `sys_user_auths` VALUES ('596329627648135168', '596307222997372928', 1, 'student', '$2a$10$czmVw4WF7Qt7RpwDJ4V4W.jkDKheEev63HlIsP31QnWHVOpSJz3au', 'admin', '2019-07-04 13:21:03', 'admin', '2019-07-04 13:21:03', 0, 'EXAM', 'gitee');
 INSERT INTO `sys_user_auths` VALUES ('596332387693105152', '596332387600830464', 1, 'teacher', '$2a$10$c9xRyRp3DXACdLgb/.yFR.5qSGIkGdP8o6WIcg4J9Hc6DY4FoUh0y', 'admin', '2019-07-04 13:32:01', 'admin', '2019-07-04 13:32:01', 0, 'EXAM', 'gitee');
 INSERT INTO `sys_user_auths` VALUES ('597110984905199616', '597110984758398976', 4, 'ovLl45InRn4Hz_jrpEk-gF-kEFf8', '$2a$10$H8/Cm4fYNdcWjtfZkD58OOlUZHx81OTcLDnPDaLheJ.fGr.Xtj7OK', 'ovLl45InRn4Hz_jrpEk-gF-kEFf8', '2019-07-06 17:05:53', 'ovLl45InRn4Hz_jrpEk-gF-kEFf8', '2019-07-06 17:05:53', 0, 'EXAM', 'gitee');
+INSERT INTO `sys_user_auths` VALUES ('607570770817847296', '607570770629103616', 2, '15521089185', '$2a$10$Xbldn/SREVl8xN6s98n9/.usvTed6e7gpJfbRuFZniOnyo6uNF45C', '15521089185', '2019-08-04 13:49:20', '15521089185', '2019-08-04 13:49:20', 0, 'EXAM', 'gitee');
 
 -- ----------------------------
 -- Table structure for sys_user_role
@@ -692,6 +695,7 @@ INSERT INTO `sys_user_role` VALUES ('596307898116739072', '596078038307966976',
 INSERT INTO `sys_user_role` VALUES ('596333922548322304', '596332387600830464', '596330074307956736');
 INSERT INTO `sys_user_role` VALUES ('596820924016234496', '596307222997372928', '596116511031169024');
 INSERT INTO `sys_user_role` VALUES ('601550371109867520', '597110984758398976', '596116511031169024');
+INSERT INTO `sys_user_role` VALUES ('607570771480547328', '607570770629103616', '596116511031169024');
 
 -- ----------------------------
 -- Table structure for sys_user_student

docs/deploy/start.sh

@@ -5,7 +5,7 @@ DOCKERHOME=/spring-microservice-exam
 
 # 镜像名称前缀、标签
 BASE_IMAGE_NAME=registry.cn-hangzhou.aliyuncs.com/spring-microservice-exam
-BSEE_IMAGE_TAG=3.1.0
+BSEE_IMAGE_TAG=3.2.0-SNAPSHOT
 
 # 各服务的镜像名称
 CONFIG_SERVICE=$BASE_IMAGE_NAME/config-service:$BSEE_IMAGE_TAG

gateway-service/README.md

@@ -31,3 +31,8 @@ server {
      }
  }
  ```
+ 
+ # 后续计划
+ 
+ 1. filters和predicates入库
+ 2. 服务多实例部署，支持流量切换、灰度发布、ABTest，思路：基于服务标签（主、备）、权重方式实现
\ No newline at end of file

gateway-service/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.github.tangyi</groupId>
         <artifactId>spring-microservice-exam</artifactId>
-        <version>3.1.0</version>
+        <version>${revision}</version>
     </parent>
     <artifactId>gateway-service</artifactId>
     <name>${project.artifactId}</name>

gateway-service/src/main/java/com/github/tangyi/gateway/module/Filters.java

+package com.github.tangyi.gateway.module;
+
+import com.github.tangyi.common.core.persistence.BaseEntity;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * 网关过滤器
+ *
+ * @author tangyi
+ * @date 2019-08-16 17:48
+ */
+@Data
+public class Filters extends BaseEntity<Filters> {
+
+    /**
+     * 路由ID
+     */
+    @NotBlank(message = "路由ID不能为空")
+    private String routeId;
+
+    /**
+     * 过滤器名称
+     */
+    @NotBlank(message = "filter name不能为空")
+    private String name;
+
+    /**
+     * 路由参数
+     */
+    private String args;
+}

gateway-service/src/main/java/com/github/tangyi/gateway/module/Predicates.java

+package com.github.tangyi.gateway.module;
+
+import com.github.tangyi.common.core.persistence.BaseEntity;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * 断言
+ *
+ * @author tangyi
+ * @date 2019-08-16 17:51
+ */
+@Data
+public class Predicates extends BaseEntity<Predicates> {
+
+    /**
+     * 路由ID
+     */
+    @NotBlank(message = "路由ID不能为空")
+    private String routeId;
+
+    /**
+     * 断言名称
+     */
+    @NotBlank(message = "predicates name不能为空")
+    private String name;
+
+    /**
+     * 断言参数
+     */
+    private String args;
+}

gateway-service/src/main/resources/bootstrap.yml

@@ -17,3 +17,5 @@ spring:
         enabled: true
         # 指向配置中心在consul注册的服务名称（即：spring.application.name）
         service-id: config-service
+      username: ${CONFIG_SERVER_USERNAME:admin}
+      password: ${CONFIG_SERVER_PASSWORD:11}

gateway-service/src/main/resources/logback.xml

@@ -39,10 +39,18 @@
         </filter>
     </appender>
 
+    <!-- 输出到logstash的appender -->
+    <!--   <appender name="logstash" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
+           &lt;!&ndash; logstash的IP和端口，从环境变量注入 &ndash;&gt;
+           <destination>${ELK_DESTINATION}</destination>
+           <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder"/>
+       </appender>-->
+
     <!-- Level: FATAL 0  ERROR 3  WARN 4  INFO 6  DEBUG 7 -->
     <root level="info">
         <appender-ref ref="console"/>
         <appender-ref ref="debug"/>
         <appender-ref ref="error"/>
+        <!--<appender-ref ref="logstash"/>-->
     </root>
 </configuration>

modules/auth-service-parent/auth-service-api/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.github.tangyi</groupId>
         <artifactId>auth-service-parent</artifactId>
-        <version>3.1.0</version>
+        <version>${revision}</version>
     </parent>
     <artifactId>auth-service-api</artifactId>
     <name>${project.artifactId}</name>

modules/auth-service-parent/auth-service/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.github.tangyi</groupId>
         <artifactId>auth-service-parent</artifactId>
-        <version>3.1.0</version>
+        <version>${revision}</version>
     </parent>
     <artifactId>auth-service</artifactId>
     <name>${project.artifactId}</name>

modules/auth-service-parent/auth-service/src/main/resources/bootstrap.yml

@@ -18,15 +18,11 @@ spring:
         enabled: true
         # 指向配置中心在consul注册的服务名称（即：spring.application.name）
         service-id: config-service
-
+      username: ${CONFIG_SERVER_USERNAME:admin}
+      password: ${CONFIG_SERVER_PASSWORD:11}
 # jwt加密配置
 encrypt:
   key-store:
     location: classpath:/jwt.jks
     alias: jwt
     password: abc123
\ No newline at end of file
-
-logging:
-  level:
-    root: info
-    com.github.tangyi: debug
\ No newline at end of file

modules/auth-service-parent/auth-service/src/main/resources/logback.xml

@@ -39,10 +39,18 @@
         </filter>
     </appender>
 
+    <!-- 输出到logstash的appender -->
+    <!--   <appender name="logstash" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
+           &lt;!&ndash; logstash的IP和端口，从环境变量注入 &ndash;&gt;
+           <destination>${ELK_DESTINATION}</destination>
+           <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder"/>
+       </appender>-->
+
     <!-- Level: FATAL 0  ERROR 3  WARN 4  INFO 6  DEBUG 7 -->
     <root level="info">
         <appender-ref ref="console"/>
         <appender-ref ref="debug"/>
         <appender-ref ref="error"/>
+        <!--<appender-ref ref="logstash"/>-->
     </root>
 </configuration>

modules/auth-service-parent/pom.xml

@@ -10,7 +10,7 @@
     <parent>
         <groupId>com.github.tangyi</groupId>
         <artifactId>modules</artifactId>
-        <version>3.1.0</version>
+        <version>${revision}</version>
     </parent>
     <artifactId>auth-service-parent</artifactId>
     <name>${project.artifactId}</name>

modules/exam-service-parent/exam-service-api/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.github.tangyi</groupId>
         <artifactId>exam-service-parent</artifactId>
-        <version>3.1.0</version>
+        <version>${revision}</version>
     </parent>
     <artifactId>exam-service-api</artifactId>
     <name>${project.artifactId}</name>

modules/exam-service-parent/exam-service/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.github.tangyi</groupId>
         <artifactId>exam-service-parent</artifactId>
-        <version>3.1.0</version>
+        <version>${revision}</version>
     </parent>
     <artifactId>exam-service</artifactId>
     <name>${project.artifactId}</name>

modules/exam-service-parent/exam-service/src/main/resources/bootstrap.yml

@@ -17,3 +17,5 @@ spring:
         enabled: true
         # 指向配置中心在consul注册的服务名称（即：spring.application.name）
         service-id: config-service
+      username: ${CONFIG_SERVER_USERNAME:admin}
+      password: ${CONFIG_SERVER_PASSWORD:11}
\ No newline at end of file

modules/exam-service-parent/exam-service/src/main/resources/logback.xml

@@ -39,10 +39,18 @@
         </filter>
     </appender>
 
+    <!-- 输出到logstash的appender -->
+    <!--   <appender name="logstash" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
+           &lt;!&ndash; logstash的IP和端口，从环境变量注入 &ndash;&gt;
+           <destination>${ELK_DESTINATION}</destination>
+           <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder"/>
+       </appender>-->
+
     <!-- Level: FATAL 0  ERROR 3  WARN 4  INFO 6  DEBUG 7 -->
     <root level="info">
         <appender-ref ref="console"/>
         <appender-ref ref="debug"/>
         <appender-ref ref="error"/>
+        <!--<appender-ref ref="logstash"/>-->
     </root>
 </configuration>

modules/exam-service-parent/pom.xml

@@ -10,7 +10,7 @@
     <parent>
         <groupId>com.github.tangyi</groupId>
         <artifactId>modules</artifactId>
-        <version>3.1.0</version>
+        <version>${revision}</version>
     </parent>
     <artifactId>exam-service-parent</artifactId>
     <name>${project.artifactId}</name>

modules/msc-service-parent/msc-service-api/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.github.tangyi</groupId>
         <artifactId>msc-service-parent</artifactId>
-        <version>3.1.0</version>
+        <version>${revision}</version>
     </parent>
     <artifactId>msc-service-api</artifactId>
     <name>${project.artifactId}</name>

modules/msc-service-parent/msc-service/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.github.tangyi</groupId>
         <artifactId>msc-service-parent</artifactId>
-        <version>3.1.0</version>
+        <version>${revision}</version>
     </parent>
     <artifactId>msc-service</artifactId>
     <name>${project.artifactId}</name>

modules/msc-service-parent/msc-service/src/main/resources/bootstrap.yml

@@ -17,3 +17,5 @@ spring:
         enabled: true
         # 指向配置中心在consul注册的服务名称（即：spring.application.name）
         service-id: config-service
+      username: ${CONFIG_SERVER_USERNAME:admin}
+      password: ${CONFIG_SERVER_PASSWORD:11}
\ No newline at end of file

modules/msc-service-parent/msc-service/src/main/resources/logback.xml

@@ -39,10 +39,18 @@
         </filter>
     </appender>
 
+    <!-- 输出到logstash的appender -->
+    <!--   <appender name="logstash" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
+           &lt;!&ndash; logstash的IP和端口，从环境变量注入 &ndash;&gt;
+           <destination>${ELK_DESTINATION}</destination>
+           <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder"/>
+       </appender>-->
+
     <!-- Level: FATAL 0  ERROR 3  WARN 4  INFO 6  DEBUG 7 -->
     <root level="info">
         <appender-ref ref="console"/>
         <appender-ref ref="debug"/>
         <appender-ref ref="error"/>
+        <!--<appender-ref ref="logstash"/>-->
     </root>
 </configuration>

modules/msc-service-parent/pom.xml

@@ -10,7 +10,7 @@
     <parent>
         <groupId>com.github.tangyi</groupId>
         <artifactId>modules</artifactId>
-        <version>3.1.0</version>
+        <version>${revision}</version>
     </parent>
     <artifactId>msc-service-parent</artifactId>
     <name>${project.artifactId}</name>

modules/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.github.tangyi</groupId>
         <artifactId>spring-microservice-exam</artifactId>
-        <version>3.1.0</version>
+        <version>${revision}</version>
     </parent>
     <artifactId>modules</artifactId>
     <packaging>pom</packaging>

modules/user-service-parent/pom.xml

@@ -10,7 +10,7 @@
     <parent>
         <groupId>com.github.tangyi</groupId>
         <artifactId>modules</artifactId>
-        <version>3.1.0</version>
+        <version>${revision}</version>
     </parent>
     <artifactId>user-service-parent</artifactId>
     <name>${project.artifactId}</name>

modules/user-service-parent/user-service-api/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.github.tangyi</groupId>
         <artifactId>user-service-parent</artifactId>
-        <version>3.1.0</version>
+        <version>${revision}</version>
     </parent>
     <artifactId>user-service-api</artifactId>
     <name>${project.artifactId}</name>

modules/user-service-parent/user-service/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.github.tangyi</groupId>
         <artifactId>user-service-parent</artifactId>
-        <version>3.1.0</version>
+        <version>${revision}</version>
     </parent>
     <artifactId>user-service</artifactId>
     <name>${project.artifactId}</name>

modules/user-service-parent/user-service/src/main/java/com/github/tangyi/user/controller/LogController.java

@@ -100,6 +100,8 @@ public class LogController extends BaseController {
     public ResponseBean<Boolean> addLog(@RequestBody @Valid Log log) {
         if (StringUtils.isBlank(log.getId()))
             log.setCommonValue(SysUtil.getUser(), SysUtil.getSysCode(), SysUtil.getTenantCode());
+        if (true)
+            return null;
         // 保存日志
         return new ResponseBean<>(logService.insert(log) > 0);
     }

modules/user-service-parent/user-service/src/main/resources/bootstrap.yml

@@ -18,3 +18,5 @@ spring:
         enabled: true
         # 指向配置中心在consul注册的服务名称（即：spring.application.name）
         service-id: config-service
+      username: ${CONFIG_SERVER_USERNAME:admin}
+      password: ${CONFIG_SERVER_PASSWORD:11}

modules/user-service-parent/user-service/src/main/resources/logback.xml

@@ -39,10 +39,18 @@
         </filter>
     </appender>
 
+    <!-- 输出到logstash的appender -->
+    <!--   <appender name="logstash" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
+           &lt;!&ndash; logstash的IP和端口，从环境变量注入 &ndash;&gt;
+           <destination>${ELK_DESTINATION}</destination>
+           <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder"/>
+       </appender>-->
+
     <!-- Level: FATAL 0  ERROR 3  WARN 4  INFO 6  DEBUG 7 -->
     <root level="info">
         <appender-ref ref="console"/>
         <appender-ref ref="debug"/>
         <appender-ref ref="error"/>
+        <!--<appender-ref ref="logstash"/>-->
     </root>
 </configuration>

monitor-service/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.github.tangyi</groupId>
         <artifactId>spring-microservice-exam</artifactId>
-        <version>3.1.0</version>
+        <version>${revision}</version>
     </parent>
     <artifactId>monitor-service</artifactId>
     <name>${project.artifactId}</name>

monitor-service/src/main/resources/bootstrap.yml

@@ -18,3 +18,5 @@ spring:
         enabled: true
         # 指向配置中心在consul注册的服务名称（即：spring.application.name）
         service-id: config-service
+      username: ${CONFIG_SERVER_USERNAME:admin}
+      password: ${CONFIG_SERVER_PASSWORD:11}
\ No newline at end of file

monitor-service/src/main/resources/logback.xml

@@ -39,10 +39,18 @@
         </filter>
     </appender>
 
+    <!-- 输出到logstash的appender -->
+    <!--   <appender name="logstash" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
+           &lt;!&ndash; logstash的IP和端口，从环境变量注入 &ndash;&gt;
+           <destination>${ELK_DESTINATION}</destination>
+           <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder"/>
+       </appender>-->
+
     <!-- Level: FATAL 0  ERROR 3  WARN 4  INFO 6  DEBUG 7 -->
     <root level="info">
         <appender-ref ref="console"/>
         <appender-ref ref="debug"/>
         <appender-ref ref="error"/>
+        <!--<appender-ref ref="logstash"/>-->
     </root>
 </configuration>

pom.xml

@@ -3,12 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-
     <groupId>com.github.tangyi</groupId>
     <artifactId>spring-microservice-exam</artifactId>
-    <version>3.1.0</version>
+    <version>${revision}</version>
     <packaging>pom</packaging>
-
     <name>spring-microservice-exam</name>
     <description>微服务在线考试系统</description>
     <url>https://gitee.com/wells2333/spring-micoservices-exam.git</url>
@@ -32,11 +30,13 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.1.3.RELEASE</version>
+        <version>2.1.7.RELEASE</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 
     <properties>
+        <!-- 版本号 -->
+        <revision>3.2.0-SNAPSHOT</revision>
         <!-- 编译 -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -45,18 +45,17 @@
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
         <!-- spring boot、spring cloud -->
-        <spring-boot.version>2.1.3.RELEASE</spring-boot.version>
-        <spring-cloud.version>Greenwich.SR1</spring-cloud.version>
+        <spring-boot.version>2.1.7.RELEASE</spring-boot.version>
+        <spring-cloud.version>Greenwich.SR2</spring-cloud.version>
         <security.auth.version>2.3.5.RELEASE</security.auth.version>
-        <spring-boot-admin.version>2.1.3</spring-boot-admin.version>
+        <spring-boot-admin.version>2.1.6</spring-boot-admin.version>
         <spring-cloud-sleuth.version>2.1.0.RELEASE</spring-cloud-sleuth.version>
         <zipkin.version>2.11.3</zipkin.version>
         <swagger.version>2.9.2</swagger.version>
         <fastdfs-client.version>1.26.5</fastdfs-client.version>
         <mysql.connector.version>8.0.13</mysql.connector.version>
-        <!-- common-->
+        <!-- common -->
         <commons-io.version>2.6</commons-io.version>
-        <commons-lang3.version>3.7</commons-lang3.version>
         <commons-collections4.version>4.0</commons-collections4.version>
         <commons-beanutils.version>1.9.2</commons-beanutils.version>
 
@@ -79,6 +78,9 @@
         <docker.registry>registry.cn-hangzhou.aliyuncs.com</docker.registry>
         <docker.namespace>spring-microservice-exam</docker.namespace>
         <scanner.maven.version>3.3.0.603</scanner.maven.version>
+
+        <!-- logstash -->
+        <logstash.version>5.2</logstash.version>
     </properties>
 
     <dependencies>
@@ -141,6 +143,13 @@
             <groupId>io.springfox</groupId>
             <artifactId>springfox-swagger-ui</artifactId>
         </dependency>
+
+        <!-- logstash -->
+        <dependency>
+            <groupId>net.logstash.logback</groupId>
+            <artifactId>logstash-logback-encoder</artifactId>
+            <version>${logstash.version}</version>
+        </dependency>
     </dependencies>
 
     <!-- spring cloud base -->
@@ -165,56 +174,56 @@
             <dependency>
                 <groupId>com.github.tangyi</groupId>
                 <artifactId>common-core</artifactId>
-                <version>${project.version}</version>
+                <version>${revision}</version>
             </dependency>
 
             <!-- common-security -->
             <dependency>
                 <groupId>com.github.tangyi</groupId>
                 <artifactId>common-security</artifactId>
-                <version>${project.version}</version>
+                <version>${revision}</version>
             </dependency>
 
             <!-- common-feign -->
             <dependency>
                 <groupId>com.github.tangyi</groupId>
                 <artifactId>common-feign</artifactId>
-                <version>${project.version}</version>
+                <version>${revision}</version>
             </dependency>
 
             <!-- common-log -->
             <dependency>
                 <groupId>com.github.tangyi</groupId>
                 <artifactId>common-log</artifactId>
-                <version>${project.version}</version>
+                <version>${revision}</version>
             </dependency>
 
             <!-- user-service-api -->
             <dependency>
                 <groupId>com.github.tangyi</groupId>
                 <artifactId>user-service-api</artifactId>
-                <version>${project.version}</version>
+                <version>${revision}</version>
             </dependency>
 
             <!-- auth-service-api -->
             <dependency>
                 <groupId>com.github.tangyi</groupId>
                 <artifactId>auth-service-api</artifactId>
-                <version>${project.version}</version>
+                <version>${revision}</version>
             </dependency>
 
             <!-- exam-service-api -->
             <dependency>
                 <groupId>com.github.tangyi</groupId>
                 <artifactId>exam-service-api</artifactId>
-                <version>${project.version}</version>
+                <version>${revision}</version>
             </dependency>
 
             <!-- msc-service-api -->
             <dependency>
                 <groupId>com.github.tangyi</groupId>
                 <artifactId>msc-service-api</artifactId>
-                <version>${project.version}</version>
+                <version>${revision}</version>
             </dependency>
 
             <!-- 管理中心插件  -->

sonar-project.properties

 sonar.projectKey=spring-microservice-exam
 sonar.projectName=spring-microservice-exam
-sonar.projectVersion=3.1.0
+sonar.projectVersion=3.2.0-SNAPSHOT
 sonar.sources=
 sonar.binaries=bin
 sonar.language=java

zipkin-service/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.github.tangyi</groupId>
         <artifactId>spring-microservice-exam</artifactId>
-        <version>3.1.0</version>
+        <version>${revision}</version>
     </parent>
     <artifactId>zipkin-service</artifactId>
     <packaging>pom</packaging>