支持MySQL8.0

.gitignore

@@ -1,5 +1,6 @@
 # Compiled class file
 *.class
+target
 
 # Log file
 *.log

db/mysql.sql

@@ -9,7 +9,7 @@ CREATE TABLE `sys_menu` (
   `icon` varchar(50) COMMENT '菜单图标',
   `order_num` int COMMENT '排序',
   PRIMARY KEY (`menu_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='菜单管理';
+) ENGINE=`InnoDB` DEFAULT CHARACTER SET utf8mb4 COMMENT='菜单管理';
 
 -- 系统用户
 CREATE TABLE `sys_user` (
@@ -24,7 +24,7 @@ CREATE TABLE `sys_user` (
   `create_time` datetime COMMENT '创建时间',
   PRIMARY KEY (`user_id`),
   UNIQUE INDEX (`username`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='系统用户';
+) ENGINE=`InnoDB` DEFAULT CHARACTER SET utf8mb4 COMMENT='系统用户';
 
 -- 系统用户Token
 CREATE TABLE `sys_user_token` (
@@ -34,7 +34,7 @@ CREATE TABLE `sys_user_token` (
   `update_time` datetime DEFAULT NULL COMMENT '更新时间',
   PRIMARY KEY (`user_id`),
   UNIQUE KEY `token` (`token`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='系统用户Token';
+) ENGINE=`InnoDB` DEFAULT CHARACTER SET utf8mb4 COMMENT='系统用户Token';
 
 -- 系统验证码
 CREATE TABLE `sys_captcha` (
@@ -42,7 +42,7 @@ CREATE TABLE `sys_captcha` (
   `code` varchar(6) NOT NULL COMMENT '验证码',
   `expire_time` datetime DEFAULT NULL COMMENT '过期时间',
   PRIMARY KEY (`uuid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='系统验证码';
+) ENGINE=`InnoDB` DEFAULT CHARACTER SET utf8mb4 COMMENT='系统验证码';
 
 -- 角色
 CREATE TABLE `sys_role` (
@@ -52,7 +52,7 @@ CREATE TABLE `sys_role` (
   `create_user_id` bigint(20) COMMENT '创建者ID',
   `create_time` datetime COMMENT '创建时间',
   PRIMARY KEY (`role_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='角色';
+) ENGINE=`InnoDB` DEFAULT CHARACTER SET utf8mb4 COMMENT='角色';
 
 -- 用户与角色对应关系
 CREATE TABLE `sys_user_role` (
@@ -60,7 +60,7 @@ CREATE TABLE `sys_user_role` (
   `user_id` bigint COMMENT '用户ID',
   `role_id` bigint COMMENT '角色ID',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='用户与角色对应关系';
+) ENGINE=`InnoDB` DEFAULT CHARACTER SET utf8mb4 COMMENT='用户与角色对应关系';
 
 -- 角色与菜单对应关系
 CREATE TABLE `sys_role_menu` (
@@ -68,7 +68,7 @@ CREATE TABLE `sys_role_menu` (
   `role_id` bigint COMMENT '角色ID',
   `menu_id` bigint COMMENT '菜单ID',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='角色与菜单对应关系';
+) ENGINE=`InnoDB` DEFAULT CHARACTER SET utf8mb4 COMMENT='角色与菜单对应关系';
 
 -- 系统配置信息
 CREATE TABLE `sys_config` (
@@ -79,7 +79,7 @@ CREATE TABLE `sys_config` (
 	`remark` varchar(500) COMMENT '备注',
 	PRIMARY KEY (`id`),
 	UNIQUE INDEX (`param_key`)
-) ENGINE=`InnoDB` DEFAULT CHARACTER SET utf8 COMMENT='系统配置信息表';
+) ENGINE=`InnoDB` DEFAULT CHARACTER SET utf8mb4 COMMENT='系统配置信息表';
 
 
 -- 系统日志
@@ -93,7 +93,7 @@ CREATE TABLE `sys_log` (
   `ip` varchar(64) COMMENT 'IP地址',
   `create_date` datetime COMMENT '创建时间',
   PRIMARY KEY (`id`)
-) ENGINE=`InnoDB` DEFAULT CHARACTER SET utf8 COMMENT='系统日志';
+) ENGINE=`InnoDB` DEFAULT CHARACTER SET utf8mb4 COMMENT='系统日志';
 
 
 -- 文件上传
@@ -102,7 +102,7 @@ CREATE TABLE `sys_oss` (
   `url` varchar(200) COMMENT 'URL地址',
   `create_date` datetime COMMENT '创建时间',
   PRIMARY KEY (`id`)
-) ENGINE=`InnoDB` DEFAULT CHARACTER SET utf8 COMMENT='文件上传';
+) ENGINE=`InnoDB` DEFAULT CHARACTER SET utf8mb4 COMMENT='文件上传';
 
 
 -- 定时任务
@@ -115,7 +115,7 @@ CREATE TABLE `schedule_job` (
   `remark` varchar(255) DEFAULT NULL COMMENT '备注',
   `create_time` datetime DEFAULT NULL COMMENT '创建时间',
   PRIMARY KEY (`job_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='定时任务';
+) ENGINE=`InnoDB` DEFAULT CHARACTER SET utf8mb4 COMMENT='定时任务';
 
 -- 定时任务日志
 CREATE TABLE `schedule_job_log` (
@@ -129,7 +129,7 @@ CREATE TABLE `schedule_job_log` (
   `create_time` datetime DEFAULT NULL COMMENT '创建时间',
   PRIMARY KEY (`log_id`),
   KEY `job_id` (`job_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='定时任务日志';
+) ENGINE=`InnoDB` DEFAULT CHARACTER SET utf8mb4 COMMENT='定时任务日志';
 
 
 
@@ -142,7 +142,7 @@ CREATE TABLE `tb_user` (
   `create_time` datetime COMMENT '创建时间',
   PRIMARY KEY (`user_id`),
   UNIQUE INDEX (`username`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='用户';
+) ENGINE=`InnoDB` DEFAULT CHARACTER SET utf8mb4 COMMENT='用户';
 
 
 

pom.xml

@@ -11,15 +11,15 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.1.3.RELEASE</version>
+		<version>2.1.7.RELEASE</version>
 	</parent>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>1.8</java.version>
-		<mybatisplus.version>3.0.7.1</mybatisplus.version>
-		<mysql.version>5.1.38</mysql.version>
+		<mybatisplus.version>3.1.2</mybatisplus.version>
+		<mysql.version>8.0.16</mysql.version>
 		<mssql.version>4.0</mssql.version>
 		<oracle.version>11.2.0.3</oracle.version>
 		<druid.version>1.1.13</druid.version>
@@ -37,7 +37,7 @@
 		<qcloud.cos.version>4.4</qcloud.cos.version>
 		<swagger.version>2.7.0</swagger.version>
 		<joda.time.version>2.9.9</joda.time.version>
-		<fastjson.version>1.2.47</fastjson.version>
+		<fastjson.version>1.2.58</fastjson.version>
 		<hutool.version>4.1.1</hutool.version>
 		<lombok.version>1.18.4</lombok.version>
 
@@ -93,11 +93,6 @@
 			</exclusions>
 		</dependency>
 		<dependency>
-			<groupId>com.baomidou</groupId>
-			<artifactId>mybatis-plus</artifactId>
-			<version>${mybatisplus.version}</version>
-		</dependency>
-		<dependency>
 			<groupId>mysql</groupId>
 			<artifactId>mysql-connector-java</artifactId>
 			<version>${mysql.version}</version>

src/main/java/io/renren/config/DemoConfig.java

@@ -1,71 +0,0 @@
-//package io.renren.config;
-//
-//import com.google.gson.Gson;
-//import io.renren.common.utils.HttpContextUtils;
-//import io.renren.common.utils.R;
-//import org.apache.http.HttpStatus;
-//import org.springframework.boot.web.servlet.FilterRegistrationBean;
-//import org.springframework.context.annotation.Bean;
-//import org.springframework.context.annotation.Configuration;
-//
-//import javax.servlet.*;
-//import javax.servlet.FilterConfig;
-//import javax.servlet.http.HttpServletRequest;
-//import javax.servlet.http.HttpServletResponse;
-//import java.io.IOException;
-//
-//@Configuration
-//public class DemoConfig {
-//
-//    @Bean
-//    public FilterRegistrationBean demoFilterRegistration() {
-//        FilterRegistrationBean registration = new FilterRegistrationBean();
-//        registration.setDispatcherTypes(DispatcherType.REQUEST);
-//        registration.setFilter(new DemoFilter());
-//        registration.addUrlPatterns("/sys/*");
-//        registration.setName("demoFilter");
-//        return registration;
-//    }
-//
-//    class DemoFilter implements Filter{
-//
-//        @Override
-//        public void init(FilterConfig filterConfig) throws ServletException {
-//
-//        }
-//
-//        @Override
-//        public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {
-//            HttpServletRequest request = (HttpServletRequest)servletRequest;
-//            HttpServletResponse response = (HttpServletResponse) servletResponse;
-//
-//            if(request.getMethod().equalsIgnoreCase("OPTIONS")){
-//                filterChain.doFilter(servletRequest, servletResponse);
-//                return;
-//            }
-//
-//            String uri = request.getRequestURI();
-//            String[] filters = new String[]{"save","update","delete","password"};
-//            //判断是否包含
-//            for(String filter : filters){
-//                if(uri.indexOf(filter) != -1){
-//                    R r = R.error(HttpStatus.SC_OK, "测试环境，不能操作！");
-//                    String json = new Gson().toJson(r);
-//
-//                    response.setContentType("application/json;charset=utf-8");
-//                    response.setHeader("Access-Control-Allow-Credentials", "true");
-//                    response.setHeader("Access-Control-Allow-Origin", HttpContextUtils.getOrigin());
-//                    response.getWriter().print(json);
-//                    return;
-//                }
-//            }
-//
-//            filterChain.doFilter(servletRequest, servletResponse);
-//        }
-//
-//        @Override
-//        public void destroy() {
-//
-//        }
-//    }
-//}

src/main/java/io/renren/config/ShiroConfig.java

@@ -40,7 +40,7 @@ public class ShiroConfig {
     }
 
     @Bean("shiroFilter")
-    public ShiroFilterFactoryBean shirFilter(SecurityManager securityManager) {
+    public ShiroFilterFactoryBean shiroFilter(SecurityManager securityManager) {
         ShiroFilterFactoryBean shiroFilter = new ShiroFilterFactoryBean();
         shiroFilter.setSecurityManager(securityManager);
 

src/main/resources/application-dev.yml

@@ -3,7 +3,7 @@ spring:
         type: com.alibaba.druid.pool.DruidDataSource
         druid:
             driver-class-name: com.mysql.jdbc.Driver
-            url: jdbc:mysql://localhost:3306/renren_fast?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false
+            url: jdbc:mysql://localhost:3306/renren_fast?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
             username: renren
             password: 123456
             initial-size: 10

src/main/resources/application-prod.yml

@@ -3,7 +3,7 @@ spring:
         type: com.alibaba.druid.pool.DruidDataSource
         druid:
             driver-class-name: com.mysql.jdbc.Driver
-            url: jdbc:mysql://localhost:3306/renren_fast?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false
+            url: jdbc:mysql://localhost:3306/renren_fast?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
             username: renren
             password: 123456
             initial-size: 10

src/main/resources/application-test.yml

@@ -3,7 +3,7 @@ spring:
         type: com.alibaba.druid.pool.DruidDataSource
         druid:
             driver-class-name: com.mysql.jdbc.Driver
-            url: jdbc:mysql://localhost:3306/renren_fast?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false
+            url: jdbc:mysql://localhost:3306/renren_fast?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
             username: renren
             password: 123456
             initial-size: 10