!19 合并3.3.8至主干

Merge pull request !19 from matevip/dev

README.md

@@ -4,7 +4,7 @@
 <p align="center">
   <img src='https://img.shields.io/github/license/matevip/matecloud' alt='License'/>
   <img src="https://img.shields.io/github/stars/matevip/matecloud" alt="Stars"/>
-  <img src="https://img.shields.io/badge/Spring%20Boot-2.4.5-green" alt="SpringBoot"/>
+  <img src="https://img.shields.io/badge/Spring%20Boot-2.5.0-green" alt="SpringBoot"/>
   <img src="https://img.shields.io/badge/Spring%20Cloud-2020.0.2-blue" alt="SpringCloud"/>
   <img src="https://img.shields.io/badge/Spring%20Cloud%20Alibaba-2021.1-brightgreen" alt="Spring Cloud Alibaba"/>
 </p>
@@ -29,10 +29,10 @@ admin | matecloud123 | 不能执行增删改请求，如需全部权限加微信
 ### 📌 版本演进
 核心中间件 | 2.5.8及以下 | 3.0.8+
 ---|---|---
-Spring Boot | 2.3.*.RELEASE | <img src="https://img.shields.io/badge/Spring%20Boot-2.4.5-blue" alt="SpringBoot"/>
+Spring Boot | 2.3.*.RELEASE | <img src="https://img.shields.io/badge/Spring%20Boot-2.5.0-blue" alt="SpringBoot"/>
 Spring Cloud | Hoxton SR* | <img src="https://img.shields.io/badge/Spring%20Cloud-2020.0.2-blue" alt="SpringCloud"/>
 Spring Cloud Alibaba | 2.2.*.RELEASE | <img src="https://img.shields.io/badge/Spring%20Cloud%20Alibaba-2021.1-blue" alt="SpringCloudAlibaba"/>
-Nacos | 1.4.*及以下 | <img src="https://img.shields.io/badge/Nacos-2.0.0-blue" alt="nacos"/>
+Nacos | 1.4.*及以下 | <img src="https://img.shields.io/badge/Nacos-2.0.1-blue" alt="nacos"/>
 Sentinel | 1.8.1 | <img src="https://img.shields.io/badge/Sentinel-1.8.1-blue" alt="sentinel"/>
 
 ### 📖 官方文档
@@ -70,13 +70,13 @@ Sentinel | 1.8.1 | <img src="https://img.shields.io/badge/Sentinel-1.8.1-blue" a
 </table>
 
 ### 🔧 功能特点
-- 主体框架：采用最新的Spring Cloud 2020.0.2, Spring Boot 2.4.5, Spring Cloud Alibaba 2021.1版本进行系统设计；
+- 主体框架：采用最新的Spring Cloud 2020.0.2, Spring Boot 2.5.0, Spring Cloud Alibaba 2021.1版本进行系统设计；
 
 - 统一注册：支持Nacos作为注册中心，实现多配置、分群组、分命名空间、多业务模块的注册和发现功能；
 
-- 统一认证：统一Oauth2认证协议，采用jwt的方式，实现统一认证，并支持自定义grant_type实现手机号码登录，第三方登录正在开发中；
+- 统一认证：统一Oauth2认证协议，采用jwt的方式，实现统一认证，并支持自定义grant_type实现手机号码登录，第三方登录集成JustAuth实现微信、支付宝等多种登录模式；
 
-- 业务监控：利用Spring Boot Admin 来监控各个独立Service的运行状态；利用Hystrix Dashboard来实时查看接口的运行状态和调用频率等。
+- 业务监控：利用Spring Boot Admin 来监控各个独立Service的运行状态。
 
 - 内部调用：集成了Feign和Dubbo两种模式支持内部调用，并且可以实现无缝切换，适合新老程序员，快速熟悉项目；
 
@@ -90,7 +90,7 @@ Sentinel | 1.8.1 | <img src="https://img.shields.io/badge/Sentinel-1.8.1-blue" a
 
 - 消息中心：集成消息中间件RocketMQ，对业务进行异步处理;
 
-- 业务分离：采用前后端分离的框架设计，前端采用vue-element-admin
+- 业务分离：采用前后端分离的框架设计，前端采用vue-element-admin,商业版采用antd-pro-vue
   
 - 链路追踪：自定义traceId的方式，实现简单的链路追踪功能
 
@@ -151,7 +151,7 @@ matecloud -- 父项目,各模块分离，方便集成和微服务
         <dependency>
             <groupId>vip.mate</groupId>
             <artifactId>mate-starter-dependencies</artifactId>
-            <version>3.1.8</version>
+            <version>3.2.8</version>
             <type>pom</type>
             <scope>import</scope>
         </dependency>

doc/sql/xxl_job_schema.sql

 #
-# XXL-JOB v2.2.1-SNAPSHOT
+# XXL-JOB v2.3.0
 # Copyright (c) 2015-present, xuxueli.
 
 CREATE database if NOT EXISTS `xxl_job` default character set utf8mb4 collate utf8mb4_unicode_ci;
@@ -10,12 +10,14 @@ SET NAMES utf8mb4;
 CREATE TABLE `xxl_job_info` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `job_group` int(11) NOT NULL COMMENT '执行器主键ID',
-  `job_cron` varchar(128) NOT NULL COMMENT '任务执行CRON',
   `job_desc` varchar(255) NOT NULL,
   `add_time` datetime DEFAULT NULL,
   `update_time` datetime DEFAULT NULL,
   `author` varchar(64) DEFAULT NULL COMMENT '作者',
   `alarm_email` varchar(255) DEFAULT NULL COMMENT '报警邮件',
+  `schedule_type` varchar(50) NOT NULL DEFAULT 'NONE' COMMENT '调度类型',
+  `schedule_conf` varchar(128) DEFAULT NULL COMMENT '调度配置，值含义取决于调度类型',
+  `misfire_strategy` varchar(50) NOT NULL DEFAULT 'DO_NOTHING' COMMENT '调度过期策略',
   `executor_route_strategy` varchar(50) DEFAULT NULL COMMENT '执行器路由策略',
   `executor_handler` varchar(255) DEFAULT NULL COMMENT '执行器任务handler',
   `executor_param` varchar(512) DEFAULT NULL COMMENT '执行器任务参数',
@@ -60,6 +62,7 @@ CREATE TABLE `xxl_job_log_report` (
   `running_count` int(11) NOT NULL DEFAULT '0' COMMENT '运行中-日志数量',
   `suc_count` int(11) NOT NULL DEFAULT '0' COMMENT '执行成功-日志数量',
   `fail_count` int(11) NOT NULL DEFAULT '0' COMMENT '执行失败-日志数量',
+  `update_time` datetime DEFAULT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `i_trigger_day` (`trigger_day`) USING BTREE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
@@ -90,7 +93,8 @@ CREATE TABLE `xxl_job_group` (
   `app_name` varchar(64) NOT NULL COMMENT '执行器AppName',
   `title` varchar(12) NOT NULL COMMENT '执行器名称',
   `address_type` tinyint(4) NOT NULL DEFAULT '0' COMMENT '执行器地址类型：0=自动注册、1=手动录入',
-  `address_list` varchar(512) DEFAULT NULL COMMENT '执行器地址列表，多地址逗号分隔',
+  `address_list` text COMMENT '执行器地址列表，多地址逗号分隔',
+  `update_time` datetime DEFAULT NULL,
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
@@ -109,9 +113,8 @@ CREATE TABLE `xxl_job_lock` (
   PRIMARY KEY (`lock_name`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
-
-INSERT INTO `xxl_job_group`(`id`, `app_name`, `title`, `address_type`, `address_list`) VALUES (1, 'xxl-job-executor-sample', '示例执行器', 0, NULL);
-INSERT INTO `xxl_job_info`(`id`, `job_group`, `job_cron`, `job_desc`, `add_time`, `update_time`, `author`, `alarm_email`, `executor_route_strategy`, `executor_handler`, `executor_param`, `executor_block_strategy`, `executor_timeout`, `executor_fail_retry_count`, `glue_type`, `glue_source`, `glue_remark`, `glue_updatetime`, `child_jobid`) VALUES (1, 1, '0 0 0 * * ? *', '测试任务1', '2018-11-03 22:21:31', '2018-11-03 22:21:31', 'XXL', '', 'FIRST', 'demoJobHandler', '', 'SERIAL_EXECUTION', 0, 0, 'BEAN', '', 'GLUE代码初始化', '2018-11-03 22:21:31', '');
+INSERT INTO `xxl_job_group`(`id`, `app_name`, `title`, `address_type`, `address_list`, `update_time`) VALUES (1, 'xxl-job-executor-sample', '示例执行器', 0, NULL, '2018-11-03 22:21:31' );
+INSERT INTO `xxl_job_info`(`id`, `job_group`, `job_desc`, `add_time`, `update_time`, `author`, `alarm_email`, `schedule_type`, `schedule_conf`, `misfire_strategy`, `executor_route_strategy`, `executor_handler`, `executor_param`, `executor_block_strategy`, `executor_timeout`, `executor_fail_retry_count`, `glue_type`, `glue_source`, `glue_remark`, `glue_updatetime`, `child_jobid`) VALUES (1, 1, '测试任务1', '2018-11-03 22:21:31', '2018-11-03 22:21:31', 'XXL', '', 'CRON', '0 0 0 * * ? *', 'DO_NOTHING', 'FIRST', 'demoJobHandler', '', 'SERIAL_EXECUTION', 0, 0, 'BEAN', '', 'GLUE代码初始化', '2018-11-03 22:21:31', '');
 INSERT INTO `xxl_job_user`(`id`, `username`, `password`, `role`, `permission`) VALUES (1, 'admin', 'e10adc3949ba59abbe56e057f20f883e', 1, NULL);
 INSERT INTO `xxl_job_lock` ( `lock_name`) VALUES ( 'schedule_lock');
 

mate-core/mate-starter-auth/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mate-core</artifactId>
         <groupId>vip.mate</groupId>
-        <version>3.2.8</version>
+        <version>3.3.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

mate-core/mate-starter-cloud/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mate-core</artifactId>
         <groupId>vip.mate</groupId>
-        <version>3.2.8</version>
+        <version>3.3.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

mate-core/mate-starter-common/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mate-core</artifactId>
         <groupId>vip.mate</groupId>
-        <version>3.2.8</version>
+        <version>3.3.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

mate-core/mate-starter-common/src/main/java/vip/mate/core/common/constant/MateConstant.java

@@ -13,7 +13,7 @@ public class MateConstant {
 	/**
 	 * 应用版本号
 	 */
-	public static final String MATE_APP_VERSION = "3.2.8";
+	public static final String MATE_APP_VERSION = "3.3.8";
 
 	/**
 	 * Spring 应用名 prop key

mate-core/mate-starter-database/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mate-core</artifactId>
         <groupId>vip.mate</groupId>
-        <version>3.2.8</version>
+        <version>3.3.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

mate-core/mate-starter-database/src/main/java/vip/mate/core/database/config/MybatisPlusConfiguration.java

@@ -15,6 +15,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.Order;
@@ -62,6 +63,7 @@ public class MybatisPlusConfiguration {
 	 * sql 日志
 	 */
 	@Bean
+	@Profile({"local", "dev", "test"})
 	@ConditionalOnProperty(value = "mybatis-plus.sql-log.enable", matchIfMissing = true)
 	public SqlLogInterceptor sqlLogInterceptor() {
 		return new SqlLogInterceptor();

mate-core/mate-starter-dependencies/pom.xml

@@ -5,14 +5,14 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.4.5</version>
+        <version>2.5.0</version>
         <relativePath/>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>vip.mate</groupId>
     <artifactId>mate-starter-dependencies</artifactId>
-    <version>3.2.8</version>
+    <version>3.3.8</version>
     <packaging>pom</packaging>
     <name>mate-starter-dependencies</name>
     <description>based on Spring Cloud Alibaba dependencies</description>
@@ -39,10 +39,10 @@
     </scm>
 
     <properties>
-        <matecloud.core.version>3.2.8</matecloud.core.version>
+        <matecloud.core.version>3.3.8</matecloud.core.version>
         <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
 
-        <spring.boot.version>2.4.5</spring.boot.version>
+        <spring.boot.version>2.5.0</spring.boot.version>
         <spring.cloud.version>2020.0.2</spring.cloud.version>
         <alibaba.cloud.version>2021.1</alibaba.cloud.version>
 
@@ -72,10 +72,10 @@
         <jetcache.version>2.6.0</jetcache.version>
 
         <!-- Apache Dubbo -->
-        <dubbo.version>2.7.10</dubbo.version>
+        <dubbo.version>2.7.11</dubbo.version>
         <fastjson.version>1.2.76</fastjson.version>
 
-        <spring-boot-admin.version>2.3.1</spring-boot-admin.version>
+        <spring-boot-admin.version>2.4.1</spring-boot-admin.version>
         <poi.version>4.1.2</poi.version>
         <nacos.client.version>2.0.1</nacos.client.version>
         <easypoi.version>4.3.0</easypoi.version>

mate-core/mate-starter-dozer/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mate-core</artifactId>
         <groupId>vip.mate</groupId>
-        <version>3.2.8</version>
+        <version>3.3.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

mate-core/mate-starter-dubbo/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mate-core</artifactId>
         <groupId>vip.mate</groupId>
-        <version>3.2.8</version>
+        <version>3.3.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

mate-core/mate-starter-elasticsearch/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mate-core</artifactId>
         <groupId>vip.mate</groupId>
-        <version>3.2.8</version>
+        <version>3.3.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

mate-core/mate-starter-encrypt/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mate-core</artifactId>
         <groupId>vip.mate</groupId>
-        <version>3.2.8</version>
+        <version>3.3.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

mate-core/mate-starter-feign/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mate-core</artifactId>
         <groupId>vip.mate</groupId>
-        <version>3.2.8</version>
+        <version>3.3.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

mate-core/mate-starter-file/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mate-core</artifactId>
         <groupId>vip.mate</groupId>
-        <version>3.2.8</version>
+        <version>3.3.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

mate-core/mate-starter-gray/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mate-core</artifactId>
         <groupId>vip.mate</groupId>
-        <version>3.2.8</version>
+        <version>3.3.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

mate-core/mate-starter-idempotent/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mate-core</artifactId>
         <groupId>vip.mate</groupId>
-        <version>3.2.8</version>
+        <version>3.3.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

mate-core/mate-starter-j2cache/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mate-core</artifactId>
         <groupId>vip.mate</groupId>
-        <version>3.2.8</version>
+        <version>3.3.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

mate-core/mate-starter-jetcache/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mate-core</artifactId>
         <groupId>vip.mate</groupId>
-        <version>3.2.8</version>
+        <version>3.3.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

mate-core/mate-starter-job/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mate-core</artifactId>
         <groupId>vip.mate</groupId>
-        <version>3.2.8</version>
+        <version>3.3.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>