CHANGELOG.md

 ### 版本升级日志
 ---
+
+###### v11.0.0-RELEASE
+
+1. 业务流程重新设计，优化现在的业务流程(课程由管理员维护，不再依赖讲师)
+2. 对接官方支付渠道(包括支付宝和微信)，解耦龙果支付
+3. 定时任务改用xxl-job，解决分布式调度问题
+4. 重构后端工程项目，进行升级和优化（特别提醒：不兼容之前的版本）
+5. Admin工程架构升级和页面重构优化(由vue2.0升级为vue3.0)
+6. Web工程代码重构和页面优化
+
+---
+
+###### v10.0.0-RELEASE
+
+1. 升级spring boot主版本，多个组件版本升级
+2. 全新架构，重构项目结构
+3. 增加视频类型和存储类型的说明，增加minio支持
+4. 切换网关组件为Spring CLoud Gateway
+5. 增加nacos_cofig.zip配置，nacos可以一键导入
+6. 将file_storage的表file_type修改为file_classify
+7. 网关增加聚合接口文档，更方便接口文档的查看和对接
+8. 增加搜索功能，管理后台一键导入es功能
+
+---
+
 ###### v9.0.0-RELEASE
+
 1. app-job的启动bug修复
 2. 主分支切换为alibaba分支
 3. 修复升级后的freemark页面不显示的bug
@@ -11,7 +37,9 @@
 8. 优化docker-compose.yml
 
 ---
+
 ###### v8.0.0-RELEASE
+
 1. 升级FastDFS的版本，已修复加载出现的bug
 2. 升级swagger2的jar版本
 3. 升级spring boot admin，精简server-sba的jar，移除多余的jar
@@ -23,7 +51,9 @@
 9. 修改子项目名称，roncoo-education-server-*修改为roncoo-education-app-*，更符合业务特性
 
 ---
+
 ###### v7.0.0-RELEASE
+
 1. 整理优化演示数据
 2. 修复课程简介为空不显示课程信息
 3. roncoo-education-gateway修改为roncoo-education-server-gateway
@@ -34,7 +64,9 @@
 8. 增加文件存储方式：FastDFS
 
 ---
+
 ###### v6.0.0-RELEASE -- 2020.01.28
+
 1. 修改网关配置开发环境地址与测试环境地址一致
 2. 移除roncoo-druid，替换为alibaba-druid
 3. 移除server-zipkin, 官方建议单独部署
@@ -42,12 +74,17 @@
 5. 移除多余的图片
 
 ---
+
 ###### v5.0.0-RELEASE -- 2019.10.28
+
 1. 移除roncoo-education-web-boss工程，替换为roncoo-education-admin，单独维护
 2. 架构调整，更接近商业版架构（移除roncoo-education-course-common、roncoo-education-system-common、roncoo-education-user-common3个工程）
 3. 修改bug和漏洞若干
+
  ---
+
 ###### v4.0.0-RELEASE -- 2019.08.16
+
 1. 管理后台使用Vue实现前后端分离
 2. 增加roncoo-education-boss工程，推荐使用
 3. 保留roncoo-education-web-boss，下一版本将移除
@@ -55,7 +92,9 @@
 5. 调整接口url风格，修改网关映射规则
 
  ---
+
 ###### v3.0.0-RELEASE -- 2019.05.16
+
 1. 修复视频上传不同步问题
 2. 修复部分微服务日志不打印的问题
 3. 修改配置中心默认获取方式为本地配置，不再依赖于项目：roncoo-education-config
@@ -64,7 +103,9 @@
 6. 增加sonar插件，使代码更健壮
 
  ---
+
 ###### v2.0.0-RELEASE -- 2019.03.18
+
 1. 集成了链路监控：roncoo-education-server-zipkin
 2. 新增站内信功能
 3. 新增推荐课程功能
@@ -75,5 +116,7 @@
 8. 优化环境配置，更方便部署
 
  ---
+
 ###### 1.0.0 -- 2019.01.04
+
 初始化

DOCKER.md

 #### 端口设置
-|                服务名称             |     服务端口     | 
+|              service              |       port      | 
 | --------------------------------- | --------------- |
-| roncoo-education-app-eureka       |  5761           |
-| roncoo-education-app-confg        |  5741           |
-| roncoo-education-app-sba          |  5721           |
-| roncoo-education-app-job          |  5820           |
-| roncoo-education-app-gateway      |  5840           |
-| roncoo-education-system           |  5730           |
-| roncoo-education-user             |  5720           |
-| roncoo-education-course           |  5710           |
+| roncoo-education-app-gateway      |     5840        |
+| roncoo-education-app-job          |     5820        |
+| roncoo-education-app-sba          |     5800        |
+| roncoo-education-system           |     5710        |
+| roncoo-education-user             |     5720        |
+| roncoo-education-course           |     5730        |
 -------------------------------------------------------
 
 #### 如何进行docker部署
 ```
 1. maven打包
 # mvn clean package
+
 2. 利用docker-compose构建
 # docker-compose build
+
 3. 启动docker-compose
 # docker-compose up -d
 ```
 > 特别说明：请提前配置好MySQL、Redis、Elasticsearch  
-> 配置文件在 **./roncoo-education-app-config/src/main/resources/config**
+

LICENSE.txt

 The MIT License (MIT)
-Copyright © 2019 lingke
+Copyright © 2016 LingKe, Co., Ltd.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
+THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

README.md

-<div align=center><img src="logo.jpg"/></div>
+<div align=center>
+    <img src="images/logo.jpg" alt="领课教育系统-开源版"/>
+    <div align=center>    
+        <a href="http://spring.io/projects/spring-boot">
+            <img src="https://img.shields.io/badge/spring--boot-2.3.5-blue.svg" alt="spring-boot">
+        </a>
+        <a href="https://spring.io/projects/spring-cloud-alibaba">
+            <img src="https://img.shields.io/badge/spring--cloud--alibaba-2.2.6-blue.svg" alt="mybatis-plus">
+        </a> 
+    </div>
+</div>
 
-### 项目分支使用组件说明
-| 名称 | 主分支(Alibaba分支) | Nextfile分支 |
-|:---|:---|:---|
-| 核心组件 |  spring cloud alibaba 2.2.3.RELEASE |  spring cloud netflix Hoxton.SR3 |
-| 注册中心 |  spring cloud alibaba nacos         |  spring cloud netflix eureka     |
-| 配置中心 |  spring cloud alibaba nacos         |  spring cloud config             |
-| 服务熔断 |  spring cloud alibaba sentinel      |  spring cloud netflix hystrix    |
-| 服务网关 |  spring cloud gateway               |  spring cloud netflix zuul       |
+### 项目介绍
 
----
+领课教育系统（roncoo-education）是基于领课网络多年的在线教育平台开发和运营经验打造出来的产品，致力于打造一个各行业都适用的分布式在线教育系统。系统采用前后端分离模式，前台采用vue.js为核心框架，后台采用Spring Cloud为核心框架。系统目前主要功能有课程点播功能，支持多家视频云的接入，课程附件管理功能，支持多家存储云的接入，可以帮助个人或者企业快速搭建一个轻量级的在线教育平台。
 
-##### 领课教育系统(roncoo-education)：[CodeChina](https://codechina.csdn.net/roncoocom/roncoo-education) | [码云地址](https://gitee.com/roncoocom/roncoo-education) | [Github地址](https://github.com/roncoo/roncoo-education)
-> roncoo-education是后台工程，核心框架：Spring Cloud  
+* 所有使用到的框架或者组件都是基于开源项目，代码保证100%开源。
+* 系统功能通用，无论是个人还是企业都可以利用该系统快速搭建一个属于自己的在线教育平台。
+* 如需商业技术服务支持，可使用 [领课教育系统商业版](https://www.roncoo.net/)，功能更丰富，架构更健壮，VIP服务，上线快速。
+* 友情链接：领课教育系统的视频云服务基于 [保利威视频云](https://my.polyv.net/v3/register/?f=qd=lingke) 实现，通过链接注册即可免费试用。
 
-##### 前端门户工程(roncoo-education-web)：[CodeChina](https://codechina.csdn.net/roncoocom/roncoo-education-web) | [码云地址](https://gitee.com/roncoocom/roncoo-education-web) | [Github地址](https://github.com/roncoo/roncoo-education-web)
-> roncoo-education-web是前端门户工程，核心框架：Vuejs + Nuxt.js  
+### 前台主要功能介绍
 
-##### 后台管理工程(roncoo-education-admin)：[CodeChina](https://codechina.csdn.net/roncoocom/roncoo-education-admin) | [码云地址](https://gitee.com/roncoocom/roncoo-education-admin) | [Github地址](https://github.com/roncoo/roncoo-education-admin)
-> roncoo-education-admin是后台管理工程，核心框架：vue-element-admin
+* 首页功能：导航模块，轮播模块，专区模块，友情链接，底部信息
+* 课程中心：搜索功能，分类导航（自定义分类设置），课程列出
+* 课程详情：课程信息，课程目录，讲师信息、购买、播放等功能
+* 个人中心：我的课程，我的订单，个人信息
 
----
+  <img src="images/index.jpg" alt="领课教育系统-首页"/>
+  <img src="images/course.jpg" alt="领课教育系统-课程"/>
+
+### 后台主要功能介绍
+
+* 权限管理功能：菜单多角色多用户自定义管理
+* 系统配置功能：自定义进行站点配置及第三方参数配置
+* 讲师管理功能：讲师列出、添加、修改、删除等功能
+* 课程分类管理：分类列出、添加、修改、删除等功能
+* 课程管理功能：课程列出、添加、修改、删除等功能
+* 订单管理功能：订单的列出，对订单进行分析统计功能
+* 用户管理功能：同一时间只允许同一个账号在同一个浏览器登录，防止账号共享
+* 轮播管理功能：后台自定义轮播设置，增加营销效果
+* 支付功能模块：对接官方支付宝、官方微信
+* 其他功能模块：菜单导航功能、友情链接功能等
+
+  <img src="images/admin1.jpg" alt="领课教育系统-首页"/>
+  <img src="images/admin2.jpg" alt="领课教育系统-课程"/>
 
 ### 演示地址
-* [前端演示地址](http://edu.os.roncoo.com/) | [后台演示地址](http://edu.os.roncoo.com/admin) 
-### 帮助文档（如果对你有用，请给个star！）
-* [项目文档](http://doc.os.roncoos.com/) | [常见问题](https://blog.roncoo.com/article/1105309620724858882) | [部署文档](https://blog.roncoo.com/article/1103554925858197505) 
-* [MySQL安装](https://blog.roncoo.com/article/1280781211745636354) | [Redis安装](https://blog.roncoo.com/article/1281402533735550977) | [Elasticsearch安装](https://blog.roncoo.com/article/1281405654742323202) | [FastDFS安装](https://blog.roncoo.com/article/1275251133292867586)
+
+* [前端门户演示地址：https://eduos.roncoo.net/](https://eduos.roncoo.net/)
+* [后台管理演示地址：https://eduos.roncoo.net/admin](https://eduos.roncoo.net/admin/)
+* [项目帮助文档地址：https://eduos.roncoo.net/doc](https://eduos.roncoo.net/doc/)
 
 ---
 
-### 项目介绍
-领课教育系统（roncoo-education）是基于领课网络多年的在线教育平台开发和运营经验打造出来的产品，致力于打造一个各行业都适用的分布式在线教育系统。系统采用前后端分离模式，前台采用vue.js为核心框架，后台采用Spring Cloud为核心框架。系统目前主要功能有课程点播功能，支持多家视频云的接入，课程附件管理功能，支持多家存储云的接入，讲师管理功能，支持讲师入驻功能，可以帮助个人或者企业快速搭建一个轻量级的在线教育平台。
+##### 领课教育系统(roncoo-education)：[码云地址](https://gitee.com/roncoocom/roncoo-education) | [Github地址](https://github.com/roncoo/roncoo-education)
 
-* 所有使用到的框架或者组件都是基于开源项目，代码保证100%开源。
-* 系统功能通用，无论是个人还是企业都可以利用该系统快速搭建一个属于自己的在线教育平台。
+> roncoo-education是后台工程，核心框架：Spring Cloud Alibaba
 
-### 前台主要功能介绍
-* 首页功能，导航模块，广告模块，课程模块，文章模块，友情链接
-* 列表功能，分类模块（自定义分类设置），搜索模块（自定义搜索设置）
-* 课程详情页功能，讲师介绍、课程介绍、目录的展示和购买、播放功能等
-* 个人中心，具有个人信息设置、密码修改、订单管理、学习记录等功能
-* 讲师中心，讲师信息管理、课程管理（课程的添加、修改）、收益管理等功能
+##### 前端门户工程(roncoo-education-web)： [码云地址](https://gitee.com/roncoocom/roncoo-education-web) | [Github地址](https://github.com/roncoo/roncoo-education-web)
 
-### 后台主要功能介绍
-* 权限管理功能，多角色多用户自定义配置
-* 系统配置功能，自定义进行站点配置及第三方参数配置
-* 讲师管理功能，讲师申请入驻，后台具有审核功能
-* 课程管理功能，讲师管理自有课程，后台具有审核功能
-* 订单管理功能，订单的列出，对订单进行分析统计功能
-* 用户登录功能，同一时间只允许同一个账号在同一个地方登录，防止账号共享
-* 广告管理功能，后台自定义广告设置，增加营销效果
-
-### 官方QQ群（加群免费获取sql脚本）
-<a target="_blank" href="https://qm.qq.com/cgi-bin/qm/qr?k=BpOlarqoFOUReMfHsinOBDrFJhVln6LO&jump_from=webapi"><img border="0" src="http://pub.idqqimg.com/wpa/images/group.png" alt="在线教育系统-领课⑪" title="在线教育系统-领课⑪"> 624670981</a> 可加
-
-> QQ群：1028579521(已满)  
-> QQ群：532451240(已满)  QQ群：903738971(已满)   QQ群：74876271 (已满)  
-> QQ群：774890501(已满)  QQ群：702189511(已满)   QQ群：826617734(已满)  
-> QQ群：154407415(已满)  QQ群：284915592(已满)   QQ群：703455569(已满)  
-
-## 项目推荐
-##### 龙果支付系统(roncoo-pay)：[码云地址](https://gitee.com/roncoocom/roncoo-pay) | [Github地址](https://github.com/roncoo/roncoo-pay)
+> roncoo-education-web是前端门户工程，核心框架：Vuejs + Nuxt.js
+
+##### 后台管理工程(roncoo-education-admin)：[码云地址](https://gitee.com/roncoocom/roncoo-education-admin) | [Github地址](https://github.com/roncoo/roncoo-education-admin)
+
+> roncoo-education-admin是后台管理工程，核心框架：vue-element-admin
+
+### 官方交流群（加群即可获取sql脚本）
+
+<img src="images/qun.jpg" alt="领课教育系统-官方开源群" width="200"/>

docker-compose.yml

@@ -4,92 +4,92 @@ services:
     build:
       context: ./roncoo-education-app-sba
       args:
-        JAVA_OPTS: '-Xmn128M -Xmx512M'
+        JAVA_OPTS: '-Xmn256M -Xmx256M'
         RUN_ARGS: '--spring.profiles.active=demo --spring.cloud.nacos.server-addr=192.168.100.11:8848'
     image: roncoo-education-app-sba
     container_name: sba
     restart: always
     volumes:
-      - /home/roncoo/logs/sba:/root/education/logs/sba
+      - /home/roncoo/logs/sba:/root/logs/sba
     networks:
       - education
     ports:
-      - "5721:5721"
+      - "8182:8182"
   app-job:
     build:
       context: ./roncoo-education-app-job
       args:
-        JAVA_OPTS: '-Xmn128M -Xmx512M'
+        JAVA_OPTS: '-Xmn256M -Xmx256M'
         RUN_ARGS: '--spring.profiles.active=demo --spring.cloud.nacos.server-addr=192.168.100.11:8848'
     image: roncoo-education-app-job
     container_name: job
     restart: always
     volumes:
-      - /home/roncoo/logs/job:/root/education/logs/job
+      - /home/roncoo/logs/job:/root/logs/job
     networks:
       - education
     ports:
-      - "5820:5820"
+      - "8181:8181"
   app-gateway:
     build:
       context: ./roncoo-education-app-gateway
       args:
-        JAVA_OPTS: '-Xmn128M -Xmx512M'
+        JAVA_OPTS: '-Xmn256M -Xmx256M'
         RUN_ARGS: '--spring.profiles.active=demo --spring.cloud.nacos.server-addr=192.168.100.11:8848'
     image: roncoo-education-app-gateway
     container_name: gateway
     restart: always
     volumes:
-      - /home/roncoo/logs/gateway:/root/education/logs/gateway
+      - /home/roncoo/logs/gateway:/root/logs/gateway
     networks:
       - education
     ports:
-      - "5840:5840"
+      - "8180:8180"
   system-service:
     build:
       context: ./roncoo-education-system/roncoo-education-system-service
       args:
-        JAVA_OPTS: '-Xmn128M -Xmx512M'
+        JAVA_OPTS: '-Xmn256M -Xmx256M'
         RUN_ARGS: '--spring.profiles.active=demo --spring.cloud.nacos.server-addr=192.168.100.11:8848'
     image: roncoo-education-system-service
     container_name: system
     restart: always
     volumes:
-      - /home/roncoo/logs/system:/root/education/logs/system
+      - /home/roncoo/logs/system:/root/logs/system
     networks:
       - education
     ports:
-      - "5730:5730"
+      - "8184:8184"
   user-service:
     build:
       context: ./roncoo-education-user/roncoo-education-user-service
       args:
-        JAVA_OPTS: '-Xmn128M -Xmx512M'
+        JAVA_OPTS: '-Xmn256M -Xmx256M'
         RUN_ARGS: '--spring.profiles.active=demo --spring.cloud.nacos.server-addr=192.168.100.11:8848'
     image: roncoo-education-user-service
     container_name: user
     restart: always
     volumes:
-      - /home/roncoo/logs/user:/root/education/logs/user
+      - /home/roncoo/logs/user:/root/logs/user
     networks:
       - education
     ports:
-      - "5720:5720"
+      - "8186:8186"
   course-service:
     build:
       context: ./roncoo-education-course/roncoo-education-course-service
       args:
-        JAVA_OPTS: '-Xmn128M -Xmx512M'
+        JAVA_OPTS: '-Xmn256M -Xmx256M'
         RUN_ARGS: '--spring.profiles.active=demo --spring.cloud.nacos.server-addr=192.168.100.11:8848'
     image: roncoo-education-course-service
     container_name: course
     restart: always
     volumes:
-      - /home/roncoo/logs/course:/root/education/logs/course
+      - /home/roncoo/logs/course:/root/logs/course
     networks:
       - education
     ports:
-      - "5710:5710"
+      - "8188:8188"
 networks:
   education:
     driver: bridge

nacos_cofig.sql

-/******************************************/
-/*   数据库全名 = nacos_config   */
-/*   表名称 = config_info   */
-/******************************************/
-CREATE TABLE `config_info` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id',
-  `data_id` varchar(255) NOT NULL COMMENT 'data_id',
-  `group_id` varchar(255) DEFAULT NULL,
-  `content` longtext NOT NULL COMMENT 'content',
-  `md5` varchar(32) DEFAULT NULL COMMENT 'md5',
-  `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-  `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
-  `src_user` text COMMENT 'source user',
-  `src_ip` varchar(20) DEFAULT NULL COMMENT 'source ip',
-  `app_name` varchar(128) DEFAULT NULL,
-  `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段',
-  `c_desc` varchar(256) DEFAULT NULL,
-  `c_use` varchar(64) DEFAULT NULL,
-  `effect` varchar(64) DEFAULT NULL,
-  `type` varchar(64) DEFAULT NULL,
-  `c_schema` text,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `uk_configinfo_datagrouptenant` (`data_id`,`group_id`,`tenant_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_info';
-
-/******************************************/
-/*   数据库全名 = nacos_config   */
-/*   表名称 = config_info_aggr   */
-/******************************************/
-CREATE TABLE `config_info_aggr` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id',
-  `data_id` varchar(255) NOT NULL COMMENT 'data_id',
-  `group_id` varchar(255) NOT NULL COMMENT 'group_id',
-  `datum_id` varchar(255) NOT NULL COMMENT 'datum_id',
-  `content` longtext NOT NULL COMMENT '内容',
-  `gmt_modified` datetime NOT NULL COMMENT '修改时间',
-  `app_name` varchar(128) DEFAULT NULL,
-  `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段',
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `uk_configinfoaggr_datagrouptenantdatum` (`data_id`,`group_id`,`tenant_id`,`datum_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='增加租户字段';
-
-/******************************************/
-/*   数据库全名 = nacos_config   */
-/*   表名称 = config_info_beta   */
-/******************************************/
-CREATE TABLE `config_info_beta` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id',
-  `data_id` varchar(255) NOT NULL COMMENT 'data_id',
-  `group_id` varchar(128) NOT NULL COMMENT 'group_id',
-  `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name',
-  `content` longtext NOT NULL COMMENT 'content',
-  `beta_ips` varchar(1024) DEFAULT NULL COMMENT 'betaIps',
-  `md5` varchar(32) DEFAULT NULL COMMENT 'md5',
-  `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-  `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
-  `src_user` text COMMENT 'source user',
-  `src_ip` varchar(20) DEFAULT NULL COMMENT 'source ip',
-  `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段',
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `uk_configinfobeta_datagrouptenant` (`data_id`,`group_id`,`tenant_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_info_beta';
-
-/******************************************/
-/*   数据库全名 = nacos_config   */
-/*   表名称 = config_info_tag   */
-/******************************************/
-CREATE TABLE `config_info_tag` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id',
-  `data_id` varchar(255) NOT NULL COMMENT 'data_id',
-  `group_id` varchar(128) NOT NULL COMMENT 'group_id',
-  `tenant_id` varchar(128) DEFAULT '' COMMENT 'tenant_id',
-  `tag_id` varchar(128) NOT NULL COMMENT 'tag_id',
-  `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name',
-  `content` longtext NOT NULL COMMENT 'content',
-  `md5` varchar(32) DEFAULT NULL COMMENT 'md5',
-  `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-  `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
-  `src_user` text COMMENT 'source user',
-  `src_ip` varchar(20) DEFAULT NULL COMMENT 'source ip',
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `uk_configinfotag_datagrouptenanttag` (`data_id`,`group_id`,`tenant_id`,`tag_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_info_tag';
-
-/******************************************/
-/*   数据库全名 = nacos_config   */
-/*   表名称 = config_tags_relation   */
-/******************************************/
-CREATE TABLE `config_tags_relation` (
-  `id` bigint(20) NOT NULL COMMENT 'id',
-  `tag_name` varchar(128) NOT NULL COMMENT 'tag_name',
-  `tag_type` varchar(64) DEFAULT NULL COMMENT 'tag_type',
-  `data_id` varchar(255) NOT NULL COMMENT 'data_id',
-  `group_id` varchar(128) NOT NULL COMMENT 'group_id',
-  `tenant_id` varchar(128) DEFAULT '' COMMENT 'tenant_id',
-  `nid` bigint(20) NOT NULL AUTO_INCREMENT,
-  PRIMARY KEY (`nid`),
-  UNIQUE KEY `uk_configtagrelation_configidtag` (`id`,`tag_name`,`tag_type`),
-  KEY `idx_tenant_id` (`tenant_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_tag_relation';
-
-/******************************************/
-/*   数据库全名 = nacos_config   */
-/*   表名称 = group_capacity   */
-/******************************************/
-CREATE TABLE `group_capacity` (
-  `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键ID',
-  `group_id` varchar(128) NOT NULL DEFAULT '' COMMENT 'Group ID，空字符表示整个集群',
-  `quota` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '配额，0表示使用默认值',
-  `usage` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '使用量',
-  `max_size` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '单个配置大小上限，单位为字节，0表示使用默认值',
-  `max_aggr_count` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '聚合子配置最大个数，，0表示使用默认值',
-  `max_aggr_size` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '单个聚合数据的子配置大小上限，单位为字节，0表示使用默认值',
-  `max_history_count` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '最大变更历史数量',
-  `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-  `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `uk_group_id` (`group_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='集群、各Group容量信息表';
-
-/******************************************/
-/*   数据库全名 = nacos_config   */
-/*   表名称 = his_config_info   */
-/******************************************/
-CREATE TABLE `his_config_info` (
-  `id` bigint(64) unsigned NOT NULL,
-  `nid` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
-  `data_id` varchar(255) NOT NULL,
-  `group_id` varchar(128) NOT NULL,
-  `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name',
-  `content` longtext NOT NULL,
-  `md5` varchar(32) DEFAULT NULL,
-  `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `src_user` text,
-  `src_ip` varchar(20) DEFAULT NULL,
-  `op_type` char(10) DEFAULT NULL,
-  `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段',
-  PRIMARY KEY (`nid`),
-  KEY `idx_gmt_create` (`gmt_create`),
-  KEY `idx_gmt_modified` (`gmt_modified`),
-  KEY `idx_did` (`data_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='多租户改造';
-
-/******************************************/
-/*   数据库全名 = nacos_config   */
-/*   表名称 = tenant_capacity   */
-/******************************************/
-CREATE TABLE `tenant_capacity` (
-  `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键ID',
-  `tenant_id` varchar(128) NOT NULL DEFAULT '' COMMENT 'Tenant ID',
-  `quota` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '配额，0表示使用默认值',
-  `usage` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '使用量',
-  `max_size` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '单个配置大小上限，单位为字节，0表示使用默认值',
-  `max_aggr_count` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '聚合子配置最大个数',
-  `max_aggr_size` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '单个聚合数据的子配置大小上限，单位为字节，0表示使用默认值',
-  `max_history_count` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '最大变更历史数量',
-  `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-  `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `uk_tenant_id` (`tenant_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='租户容量信息表';
-
-/******************************************/
-/*   数据库全名 = nacos_config   */
-/*   表名称 = tenant_info   */
-/******************************************/
-CREATE TABLE `tenant_info` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id',
-  `kp` varchar(128) NOT NULL COMMENT 'kp',
-  `tenant_id` varchar(128) default '' COMMENT 'tenant_id',
-  `tenant_name` varchar(128) default '' COMMENT 'tenant_name',
-  `tenant_desc` varchar(256) DEFAULT NULL COMMENT 'tenant_desc',
-  `create_source` varchar(32) DEFAULT NULL COMMENT 'create_source',
-  `gmt_create` bigint(20) NOT NULL COMMENT '创建时间',
-  `gmt_modified` bigint(20) NOT NULL COMMENT '修改时间',
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `uk_tenant_info_kptenantid` (`kp`,`tenant_id`),
-  KEY `idx_tenant_id` (`tenant_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='tenant_info';
-
-/******************************************/
-/*   数据库全名 = nacos_config   */
-/*   表名称 = users   */
-/******************************************/
-CREATE TABLE `users` (
-	`username` varchar(50) NOT NULL PRIMARY KEY,
-	`password` varchar(500) NOT NULL,
-	`enabled` boolean NOT NULL
-);
-
-/******************************************/
-/*   数据库全名 = nacos_config   */
-/*   表名称 = roles   */
-/******************************************/
-CREATE TABLE `roles` (
-	`username` varchar(50) NOT NULL,
-	`role` varchar(50) NOT NULL,
-	UNIQUE INDEX `idx_user_role` (`username` ASC, `role` ASC) USING BTREE
-);
-
-/******************************************/
-/*   数据库全名 = nacos_config   */
-/*   表名称 = permissions   */
-/******************************************/
-CREATE TABLE `permissions` (
-    `role` varchar(50) NOT NULL,
-    `resource` varchar(255) NOT NULL,
-    `action` varchar(8) NOT NULL,
-    UNIQUE INDEX `uk_role_permission` (`role`,`resource`,`action`) USING BTREE
-);
-
-INSERT INTO users (username, password, enabled) VALUES ('nacos', '$2a$10$EuWPZHzz32dJN7jexM34MOeYirDdFAZm2kuWj7VEOJhhZkDrxfvUu', TRUE);
-
-INSERT INTO roles (username, role) VALUES ('nacos', 'ROLE_ADMIN');

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>com.roncoo</groupId>
     <artifactId>roncoo-education</artifactId>
-    <version>9.0.0-RELEASE</version>
+    <version>11.0.0-RELEASE</version>
     <packaging>pom</packaging>
 
     <name>roncoo-education</name>
@@ -19,7 +19,7 @@
 
     <developers>
         <developer>
-            <name>fengyongwei</name>
+            <name>fengyw</name>
             <email>fengyw@roncoo.com</email>
             <organization>LingKe, Co., Ltd.</organization>
             <organizationUrl>http://www.roncoo.net</organizationUrl>
@@ -29,8 +29,7 @@
             <timezone>+8</timezone>
         </developer>
         <developer>
-            <name>liaohr</name>
-            <email>liaohr@roncoo.com</email>
+            <name>wuy</name>
             <organization>LingKe, Co., Ltd.</organization>
             <organizationUrl>http://www.roncoo.net</organizationUrl>
             <roles>
@@ -39,8 +38,8 @@
             <timezone>+8</timezone>
         </developer>
         <developer>
-            <name>keyh</name>
-            <email>keyh@roncoo.com</email>
+            <name>liaohr</name>
+            <email>liaohr@roncoo.com</email>
             <organization>LingKe, Co., Ltd.</organization>
             <organizationUrl>http://www.roncoo.net</organizationUrl>
             <roles>
@@ -49,7 +48,8 @@
             <timezone>+8</timezone>
         </developer>
         <developer>
-            <name>yangzj</name>
+            <name>keyh</name>
+            <email>keyh@roncoo.com</email>
             <organization>LingKe, Co., Ltd.</organization>
             <organizationUrl>http://www.roncoo.net</organizationUrl>
             <roles>
@@ -58,7 +58,7 @@
             <timezone>+8</timezone>
         </developer>
         <developer>
-            <name>wuy</name>
+            <name>yangzj</name>
             <organization>LingKe, Co., Ltd.</organization>
             <organizationUrl>http://www.roncoo.net</organizationUrl>
             <roles>
@@ -80,7 +80,7 @@
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-starter-parent</artifactId>
-                <version>2.2.5.RELEASE</version>
+                <version>2.3.5.RELEASE</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -89,7 +89,7 @@
             <dependency>
                 <groupId>org.springframework.cloud</groupId>
                 <artifactId>spring-cloud-dependencies</artifactId>
-                <version>Hoxton.SR3</version>
+                <version>Hoxton.SR9</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -98,11 +98,23 @@
             <dependency>
                 <groupId>com.alibaba.cloud</groupId>
                 <artifactId>spring-cloud-alibaba-dependencies</artifactId>
-                <version>2.2.3.RELEASE</version>
+                <version>2.2.6.RELEASE</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
 
+            <dependency>
+                <groupId>com.xuxueli</groupId>
+                <artifactId>xxl-job-core</artifactId>
+                <version>2.3.1</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.squareup.okhttp3</groupId>
+                <artifactId>okhttp</artifactId>
+                <version>4.8.1</version>
+            </dependency>
+
             <!-- com.roncoo -->
             <dependency>
                 <groupId>com.roncoo</groupId>
@@ -121,126 +133,23 @@
             </dependency>
             <dependency>
                 <groupId>com.roncoo</groupId>
-                <artifactId>roncoo-education-util</artifactId>
+                <artifactId>roncoo-education-common-core</artifactId>
                 <version>${project.version}</version>
             </dependency>
-
-            <!-- fastdfs -->
-            <!-- https://mvnrepository.com/artifact/com.roncoo/roncoo-spring-boot-starter-fastdfs -->
             <dependency>
                 <groupId>com.roncoo</groupId>
-                <artifactId>roncoo-spring-boot-starter-fastdfs</artifactId>
-                <version>1.2.1</version>
-            </dependency>
-
-            <!-- aliyun -->
-            <!-- fastjson -->
-            <dependency>
-                <groupId>com.alibaba</groupId>
-                <artifactId>fastjson</artifactId>
-                <version>1.2.28</version>
-            </dependency>
-            <dependency>
-                <groupId>com.aliyun.oss</groupId>
-                <artifactId>aliyun-sdk-oss</artifactId>
-                <version>2.2.1</version>
-            </dependency>
-            <dependency>
-                <groupId>com.aliyun.oas</groupId>
-                <artifactId>aliyun-oas</artifactId>
-                <version>0.2.5</version>
-            </dependency>
-            <dependency>
-                <groupId>com.aliyun</groupId>
-                <artifactId>aliyun-java-sdk-core</artifactId>
-                <version>2.4.2</version>
-            </dependency>
-            <dependency>
-                <groupId>com.aliyun</groupId>
-                <artifactId>aliyun-java-sdk-dysmsapi</artifactId>
-                <version>1.0.0</version>
-            </dependency>
-
-            <!-- Swagger -->
-            <dependency>
-                <groupId>com.spring4all</groupId>
-                <artifactId>swagger-spring-boot-starter</artifactId>
-                <version>1.9.1.RELEASE</version>
-            </dependency>
-            <dependency>
-                <groupId>com.github.xiaoymin</groupId>
-                <artifactId>knife4j-spring-ui</artifactId>
-                <version>2.0.7</version>
-            </dependency>
-
-            <!-- jwt -->
-            <dependency>
-                <groupId>com.auth0</groupId>
-                <artifactId>java-jwt</artifactId>
-                <version>3.2.0</version>
-            </dependency>
-
-            <!-- mybatis  -->
-            <dependency>
-                <groupId>org.mybatis.spring.boot</groupId>
-                <artifactId>mybatis-spring-boot-starter</artifactId>
-                <version>1.3.1</version>
-            </dependency>
-
-            <!-- logback -->
-            <dependency>
-                <groupId>net.logstash.logback</groupId>
-                <artifactId>logstash-logback-encoder</artifactId>
-                <version>5.2</version>
-            </dependency>
-
-            <!-- excel -->
-            <dependency>
-                <groupId>org.apache.poi</groupId>
-                <artifactId>poi-ooxml</artifactId>
-                <version>3.17</version>
-            </dependency>
-
-            <!-- ECharts -->
-            <dependency>
-                <groupId>com.github.abel533</groupId>
-                <artifactId>ECharts</artifactId>
-                <version>3.0.0.2</version>
-            </dependency>
-
-            <!-- hutool -->
-            <dependency>
-                <groupId>com.xiaoleilu</groupId>
-                <artifactId>hutool</artifactId>
-                <version>2.16.2</version>
-            </dependency>
-
-            <!-- jsoup -->
-            <dependency>
-                <groupId>org.jsoup</groupId>
-                <artifactId>jsoup</artifactId>
-                <version>1.7.2</version>
+                <artifactId>roncoo-education-common-log</artifactId>
+                <version>${project.version}</version>
             </dependency>
-
-            <!-- pdf -->
             <dependency>
-                <groupId>com.itextpdf</groupId>
-                <artifactId>itextpdf</artifactId>
-                <version>5.5.13</version>
-            </dependency>
-
-            <!-- de.codecentric -->
-            <dependency>
-                <groupId>de.codecentric</groupId>
-                <artifactId>spring-boot-admin-starter-server</artifactId>
-                <version>2.2.4</version>
+                <groupId>com.roncoo</groupId>
+                <artifactId>roncoo-education-common-polyv</artifactId>
+                <version>${project.version}</version>
             </dependency>
-
-            <!-- druid -->
             <dependency>
-                <groupId>com.alibaba</groupId>
-                <artifactId>druid-spring-boot-starter</artifactId>
-                <version>1.1.21</version>
+                <groupId>com.roncoo</groupId>
+                <artifactId>roncoo-education-common-service</artifactId>
+                <version>${project.version}</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
@@ -299,28 +208,6 @@
         </pluginManagement>
     </build>
 
-    <!-- 环境变量 -->
-    <profiles>
-        <profile>
-            <id>dev</id>
-            <properties>
-                <env>dev</env>
-            </properties>
-        </profile>
-        <profile>
-            <id>prod</id>
-            <properties>
-                <env>prod</env>
-            </properties>
-        </profile>
-        <profile>
-            <id>test</id>
-            <properties>
-                <env>test</env>
-            </properties>
-        </profile>
-    </profiles>
-
     <modules>
         <!-- 网关接口 -->
         <module>roncoo-education-app-gateway</module>
@@ -328,9 +215,8 @@
         <module>roncoo-education-app-job</module>
         <!-- 监控中心 -->
         <module>roncoo-education-app-sba</module>
-
         <!-- 基础工程 -->
-        <module>roncoo-education-util</module>
+        <module>roncoo-education-common</module>
         <!-- 系统管理 -->
         <module>roncoo-education-system</module>
         <!-- 用户管理 -->

roncoo-distribution/assembly.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2019-现在 Daocao Ltd.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<assembly>
+    <id>${project.version}</id>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <formats>
+        <format>dir</format>
+        <format>tar.gz</format>
+        <!--<format>zip</format>-->
+    </formats>
+    <fileSets>
+        <fileSet>
+            <directory>${project.parent.basedir}/roncoo-distribution/bin</directory>
+            <fileMode>0755</fileMode>
+            <outputDirectory>bin</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>${project.parent.basedir}/roncoo-distribution/conf</directory>
+            <outputDirectory>conf</outputDirectory>
+        </fileSet>
+    </fileSets>
+    <files>
+        <file>
+            <source>${project.parent.basedir}/roncoo-education-app-gateway/target/gateway.jar</source>
+            <outputDirectory>target</outputDirectory>
+        </file>
+        <file>
+            <source>${project.parent.basedir}/roncoo-education-app-job/target/job.jar</source>
+            <outputDirectory>target</outputDirectory>
+        </file>
+        <file>
+            <source>${project.parent.basedir}/roncoo-education-app-sba/target/sba.jar</source>
+            <outputDirectory>target</outputDirectory>
+        </file>
+        <file>
+            <source>${project.parent.basedir}/roncoo-education-course/roncoo-education-course-service/target/course.jar</source>
+            <outputDirectory>target</outputDirectory>
+        </file>
+        <file>
+            <source>${project.parent.basedir}/roncoo-education-system/roncoo-education-service-system/target/system.jar</source>
+            <outputDirectory>target</outputDirectory>
+        </file>
+        <file>
+            <source>${project.parent.basedir}/roncoo-education-user/roncoo-education-user-service/target/user.jar</source>
+            <outputDirectory>target</outputDirectory>
+        </file>
+        <file>
+            <source>${project.parent.basedir}/roncoo-education-app-sba/target/sba.jar</source>
+            <outputDirectory>target</outputDirectory>
+        </file>
+    </files>
+</assembly>

roncoo-distribution/bin/course.sh

+#!/bin/bash
+# Copyright 2019-现在 LingKe, Co., Ltd.
+[ ! -e "$JAVA_HOME/bin/java" ] && JAVA_HOME=$HOME/jdk/java
+[ ! -e "$JAVA_HOME/bin/java" ] && JAVA_HOME=/usr/java
+[ ! -e "$JAVA_HOME/bin/java" ] && JAVA_HOME=/opt/java
+[ ! -e "$JAVA_HOME/bin/java" ] && unset JAVA_HOME
+if [ -z "$JAVA_HOME" ]; then
+  echo "Please set the JAVA_HOME variable in your environment, We need java(x64)! jdk8 or later is better!"
+  echo
+fi
+export JAVA_HOME
+export JAVA="$JAVA_HOME/bin/java"
+export BASE_DIR=`cd $(dirname $0)/..; pwd`
+export SERVER="course"
+export CONFIG_LOCATION=file:${BASE_DIR}/conf/
+
+# JVM Configuration
+JAVA_OPT="${JAVA_OPT} -Xms512m -Xmx512m"
+JAVA_OPT="${JAVA_OPT} -jar ${BASE_DIR}/target/${SERVER}.jar"
+JAVA_OPT="${JAVA_OPT} --spring.config.additional-location=${CONFIG_LOCATION}"
+
+function start()
+{
+  pid=`ps ax | grep -i roncoo.${SERVER} | grep java | grep -v grep | awk '{print $1}'`
+  if [ x"$pid" != x"" ] ; then
+    echo "${SERVER} is running..."
+  else
+    nohup "$JAVA" ${JAVA_OPT} roncoo.${SERVER} >/dev/null 2>&1 &
+    echo "${SERVER} start success"
+  fi
+}
+
+function stop()
+{
+  pid=""
+  query(){
+    pid=`ps ax | grep -i roncoo.${SERVER} | grep java | grep -v grep | awk '{print $1}'`
+  }
+  query
+  if [ x"$pid" != x"" ] ; then
+    kill ${pid}
+    echo "${SERVER} stopping···"
+    while [ x"$pid" != x"" ]
+    do
+      sleep 1
+      query
+    done
+    echo "${SERVER} stop success"
+  else
+    echo "${SERVER} is stop"
+  fi
+}
+
+case "$1" in
+  start)
+    start;;
+  stop)
+    stop;;
+  *)
+    $0 stop
+    sleep 1
+    $0 start
+    ;;
+esac
\ No newline at end of file

roncoo-distribution/bin/gateway.sh

+#!/bin/bash
+# Copyright 2019-现在 LingKe, Co., Ltd.
+[ ! -e "$JAVA_HOME/bin/java" ] && JAVA_HOME=$HOME/jdk/java
+[ ! -e "$JAVA_HOME/bin/java" ] && JAVA_HOME=/usr/java
+[ ! -e "$JAVA_HOME/bin/java" ] && JAVA_HOME=/opt/java
+[ ! -e "$JAVA_HOME/bin/java" ] && unset JAVA_HOME
+if [ -z "$JAVA_HOME" ]; then
+  echo "Please set the JAVA_HOME variable in your environment, We need java(x64)! jdk8 or later is better!"
+  echo
+fi
+export JAVA_HOME
+export JAVA="$JAVA_HOME/bin/java"
+export BASE_DIR=`cd $(dirname $0)/..; pwd`
+export SERVER="gateway"
+export CONFIG_LOCATION=file:${BASE_DIR}/conf/
+
+# JVM Configuration
+JAVA_OPT="${JAVA_OPT} -Xms512m -Xmx512m"
+JAVA_OPT="${JAVA_OPT} -jar ${BASE_DIR}/target/${SERVER}.jar"
+JAVA_OPT="${JAVA_OPT} --spring.config.additional-location=${CONFIG_LOCATION}"
+
+function start()
+{
+  pid=`ps ax | grep -i roncoo.${SERVER} | grep java | grep -v grep | awk '{print $1}'`
+  if [ x"$pid" != x"" ] ; then
+    echo "${SERVER} is running..."
+  else
+    nohup "$JAVA" ${JAVA_OPT} roncoo.${SERVER} >/dev/null 2>&1 &
+    echo "${SERVER} start success"
+  fi
+}
+
+function stop()
+{
+  pid=""
+  query(){
+    pid=`ps ax | grep -i roncoo.${SERVER} | grep java | grep -v grep | awk '{print $1}'`
+  }
+  query
+  if [ x"$pid" != x"" ] ; then
+    kill ${pid}
+    echo "${SERVER} stopping···"
+    while [ x"$pid" != x"" ]
+    do
+      sleep 1
+      query
+    done
+    echo "${SERVER} stop success"
+  else
+    echo "${SERVER} is stop"
+  fi
+}
+
+case "$1" in
+  start)
+    start;;
+  stop)
+    stop;;
+  *)
+    $0 stop
+    sleep 1
+    $0 start
+    ;;
+esac
\ No newline at end of file

roncoo-distribution/bin/job.sh

+#!/bin/bash
+# Copyright 2019-现在 LingKe, Co., Ltd.
+[ ! -e "$JAVA_HOME/bin/java" ] && JAVA_HOME=$HOME/jdk/java
+[ ! -e "$JAVA_HOME/bin/java" ] && JAVA_HOME=/usr/java
+[ ! -e "$JAVA_HOME/bin/java" ] && JAVA_HOME=/opt/java
+[ ! -e "$JAVA_HOME/bin/java" ] && unset JAVA_HOME
+if [ -z "$JAVA_HOME" ]; then
+  echo "Please set the JAVA_HOME variable in your environment, We need java(x64)! jdk8 or later is better!"
+  echo
+fi
+export JAVA_HOME
+export JAVA="$JAVA_HOME/bin/java"
+export BASE_DIR=`cd $(dirname $0)/..; pwd`
+export SERVER="job"
+export CONFIG_LOCATION=file:${BASE_DIR}/conf/
+
+# JVM Configuration
+JAVA_OPT="${JAVA_OPT} -Xms512m -Xmx512m"
+JAVA_OPT="${JAVA_OPT} -jar ${BASE_DIR}/target/${SERVER}.jar"
+JAVA_OPT="${JAVA_OPT} --spring.config.additional-location=${CONFIG_LOCATION}"
+
+function start()
+{
+  pid=`ps ax | grep -i roncoo.${SERVER} | grep java | grep -v grep | awk '{print $1}'`
+  if [ x"$pid" != x"" ] ; then
+    echo "${SERVER} is running..."
+  else
+    nohup "$JAVA" ${JAVA_OPT} roncoo.${SERVER} >/dev/null 2>&1 &
+    echo "${SERVER} start success"
+  fi
+}
+
+function stop()
+{
+  pid=""
+  query(){
+    pid=`ps ax | grep -i roncoo.${SERVER} | grep java | grep -v grep | awk '{print $1}'`
+  }
+  query
+  if [ x"$pid" != x"" ] ; then
+    kill ${pid}
+    echo "${SERVER} stopping···"
+    while [ x"$pid" != x"" ]
+    do
+      sleep 1
+      query
+    done
+    echo "${SERVER} stop success"
+  else
+    echo "${SERVER} is stop"
+  fi
+}
+
+case "$1" in
+  start)
+    start;;
+  stop)
+    stop;;
+  *)
+    $0 stop
+    sleep 1
+    $0 start
+    ;;
+esac
\ No newline at end of file

roncoo-distribution/bin/sba.sh

+#!/bin/bash
+# Copyright 2019-现在 LingKe, Co., Ltd.
+[ ! -e "$JAVA_HOME/bin/java" ] && JAVA_HOME=$HOME/jdk/java
+[ ! -e "$JAVA_HOME/bin/java" ] && JAVA_HOME=/usr/java
+[ ! -e "$JAVA_HOME/bin/java" ] && JAVA_HOME=/opt/java
+[ ! -e "$JAVA_HOME/bin/java" ] && unset JAVA_HOME
+if [ -z "$JAVA_HOME" ]; then
+  echo "Please set the JAVA_HOME variable in your environment, We need java(x64)! jdk8 or later is better!"
+  echo
+fi
+export JAVA_HOME
+export JAVA="$JAVA_HOME/bin/java"
+export BASE_DIR=`cd $(dirname $0)/..; pwd`
+export SERVER="sba"
+export CONFIG_LOCATION=file:${BASE_DIR}/conf/
+
+# JVM Configuration
+JAVA_OPT="${JAVA_OPT} -Xms512m -Xmx512m"
+JAVA_OPT="${JAVA_OPT} -jar ${BASE_DIR}/target/${SERVER}.jar"
+JAVA_OPT="${JAVA_OPT} --spring.config.additional-location=${CONFIG_LOCATION}"
+
+function start()
+{
+  pid=`ps ax | grep -i roncoo.${SERVER} | grep java | grep -v grep | awk '{print $1}'`
+  if [ x"$pid" != x"" ] ; then
+    echo "${SERVER} is running..."
+  else
+    nohup "$JAVA" ${JAVA_OPT} roncoo.${SERVER} >/dev/null 2>&1 &
+    echo "${SERVER} start success"
+  fi
+}
+
+function stop()
+{
+  pid=""
+  query(){
+    pid=`ps ax | grep -i roncoo.${SERVER} | grep java | grep -v grep | awk '{print $1}'`
+  }
+  query
+  if [ x"$pid" != x"" ] ; then
+    kill ${pid}
+    echo "${SERVER} stopping···"
+    while [ x"$pid" != x"" ]
+    do
+      sleep 1
+      query
+    done
+    echo "${SERVER} stop success"
+  else
+    echo "${SERVER} is stop"
+  fi
+}
+
+case "$1" in
+  start)
+    start;;
+  stop)
+    stop;;
+  *)
+    $0 stop
+    sleep 1
+    $0 start
+    ;;
+esac
\ No newline at end of file

roncoo-distribution/bin/system.sh

+#!/bin/bash
+# Copyright 2019-现在 LingKe, Co., Ltd.
+[ ! -e "$JAVA_HOME/bin/java" ] && JAVA_HOME=$HOME/jdk/java
+[ ! -e "$JAVA_HOME/bin/java" ] && JAVA_HOME=/usr/java
+[ ! -e "$JAVA_HOME/bin/java" ] && JAVA_HOME=/opt/java
+[ ! -e "$JAVA_HOME/bin/java" ] && unset JAVA_HOME
+if [ -z "$JAVA_HOME" ]; then
+  echo "Please set the JAVA_HOME variable in your environment, We need java(x64)! jdk8 or later is better!"
+  echo
+fi
+export JAVA_HOME
+export JAVA="$JAVA_HOME/bin/java"
+export BASE_DIR=`cd $(dirname $0)/..; pwd`
+export SERVER="system"
+export CONFIG_LOCATION=file:${BASE_DIR}/conf/
+
+# JVM Configuration
+JAVA_OPT="${JAVA_OPT} -Xms512m -Xmx512m"
+JAVA_OPT="${JAVA_OPT} -jar ${BASE_DIR}/target/${SERVER}.jar"
+JAVA_OPT="${JAVA_OPT} --spring.config.additional-location=${CONFIG_LOCATION}"
+
+function start()
+{
+  pid=`ps ax | grep -i roncoo.${SERVER} | grep java | grep -v grep | awk '{print $1}'`
+  if [ x"$pid" != x"" ] ; then
+    echo "${SERVER} is running..."
+  else
+    nohup "$JAVA" ${JAVA_OPT} roncoo.${SERVER} >/dev/null 2>&1 &
+    echo "${SERVER} start success"
+  fi
+}
+
+function stop()
+{
+  pid=""
+  query(){
+    pid=`ps ax | grep -i roncoo.${SERVER} | grep java | grep -v grep | awk '{print $1}'`
+  }
+  query
+  if [ x"$pid" != x"" ] ; then
+    kill ${pid}
+    echo "${SERVER} stopping···"
+    while [ x"$pid" != x"" ]
+    do
+      sleep 1
+      query
+    done
+    echo "${SERVER} stop success"
+  else
+    echo "${SERVER} is stop"
+  fi
+}
+
+case "$1" in
+  start)
+    start;;
+  stop)
+    stop;;
+  *)
+    $0 stop
+    sleep 1
+    $0 start
+    ;;
+esac
\ No newline at end of file

roncoo-distribution/bin/user.sh

+#!/bin/bash
+# Copyright 2019-现在 LingKe, Co., Ltd.
+[ ! -e "$JAVA_HOME/bin/java" ] && JAVA_HOME=$HOME/jdk/java
+[ ! -e "$JAVA_HOME/bin/java" ] && JAVA_HOME=/usr/java
+[ ! -e "$JAVA_HOME/bin/java" ] && JAVA_HOME=/opt/java
+[ ! -e "$JAVA_HOME/bin/java" ] && unset JAVA_HOME
+if [ -z "$JAVA_HOME" ]; then
+  echo "Please set the JAVA_HOME variable in your environment, We need java(x64)! jdk8 or later is better!"
+  echo
+fi
+export JAVA_HOME
+export JAVA="$JAVA_HOME/bin/java"
+export BASE_DIR=`cd $(dirname $0)/..; pwd`
+export SERVER="user"
+export CONFIG_LOCATION=file:${BASE_DIR}/conf/
+
+# JVM Configuration
+JAVA_OPT="${JAVA_OPT} -Xms512m -Xmx512m"
+JAVA_OPT="${JAVA_OPT} -jar ${BASE_DIR}/target/${SERVER}.jar"
+JAVA_OPT="${JAVA_OPT} --spring.config.additional-location=${CONFIG_LOCATION}"
+
+function start()
+{
+  pid=`ps ax | grep -i roncoo.${SERVER} | grep java | grep -v grep | awk '{print $1}'`
+  if [ x"$pid" != x"" ] ; then
+    echo "${SERVER} is running..."
+  else
+    nohup "$JAVA" ${JAVA_OPT} roncoo.${SERVER} >/dev/null 2>&1 &
+    echo "${SERVER} start success"
+  fi
+}
+
+function stop()
+{
+  pid=""
+  query(){
+    pid=`ps ax | grep -i roncoo.${SERVER} | grep java | grep -v grep | awk '{print $1}'`
+  }
+  query
+  if [ x"$pid" != x"" ] ; then
+    kill ${pid}
+    echo "${SERVER} stopping···"
+    while [ x"$pid" != x"" ]
+    do
+      sleep 1
+      query
+    done
+    echo "${SERVER} stop success"
+  else
+    echo "${SERVER} is stop"
+  fi
+}
+
+case "$1" in
+  start)
+    start;;
+  stop)
+    stop;;
+  *)
+    $0 stop
+    sleep 1
+    $0 start
+    ;;
+esac
\ No newline at end of file

roncoo-distribution/conf/bootstrap.properties

+# profile
+spring.profiles.active=prod
+
+# nacos
+spring.cloud.nacos.username=nacos
+spring.cloud.nacos.password=nacos
+spring.cloud.nacos.server-addr=127.0.0.1:8848

roncoo-distribution/pom.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>com.roncoo</groupId>
+        <artifactId>roncoo-education</artifactId>
+        <version>22.0.0-RELEASE</version>
+    </parent>
+
+    <artifactId>roncoo-distribution</artifactId>
+    <packaging>pom</packaging>
+    <name>roncoo-distribution</name>
+
+    <profiles>
+        <profile>
+            <id>release-education</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-assembly-plugin</artifactId>
+                        <configuration>
+                            <descriptors>
+                                <descriptor>assembly.xml</descriptor>
+                            </descriptors>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <id>make-assembly</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>single</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+                <finalName>education</finalName>
+            </build>
+        </profile>
+    </profiles>
+</project>

roncoo-education-app-gateway/Dockerfile

-FROM daocloud.io/library/java:8-jre-alpine
+FROM openjdk:8-jdk-oracle
 MAINTAINER roncoo
 ARG JAVA_OPTS="-Xmx128M"
 ENV JAVA_OPTS=$JAVA_OPTS
 ARG RUN_ARGS="--spring.profiles.active=prod"
 ENV RUN_ARGS=$RUN_ARGS
-ADD target/app-gateway.jar /app-gateway.jar
-ENTRYPOINT ["sh","-c","java $JAVA_OPTS -jar /app-gateway.jar $RUN_ARGS"]
+ADD target/gateway.jar /gateway.jar
+ENTRYPOINT ["sh","-c","java $JAVA_OPTS -jar /gateway.jar $RUN_ARGS"]

roncoo-education-app-gateway/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.roncoo</groupId>
         <artifactId>roncoo-education</artifactId>
-        <version>9.0.0-RELEASE</version>
+        <version>11.0.0-RELEASE</version>
     </parent>
 
     <artifactId>roncoo-education-app-gateway</artifactId>
@@ -22,49 +22,46 @@
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
         </dependency>
-        <!-- hystrix -->
+
+        <!-- gateway -->
         <dependency>
             <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
+            <artifactId>spring-cloud-starter-gateway</artifactId>
         </dependency>
-        <!-- zuul -->
+
+        <!-- sentinel -->
         <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-netflix-zuul</artifactId>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba.csp</groupId>
+            <artifactId>sentinel-spring-cloud-gateway-adapter</artifactId>
         </dependency>
 
         <dependency>
             <groupId>com.roncoo</groupId>
-            <artifactId>roncoo-education-util</artifactId>
+            <artifactId>roncoo-education-common-core</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-web</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-redis</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-freemarker</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-devtools</artifactId>
-        </dependency>
-
-        <!-- test -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>
-        <finalName>app-gateway</finalName>
+        <finalName>gateway</finalName>
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>

roncoo-education-app-gateway/src/main/java/com/roncoo/education/ServerGatewayApplication.java

@@ -3,21 +3,14 @@
  */
 package com.roncoo.education;
 
-import com.roncoo.education.app.gateway.common.FilterPre;
 import org.springframework.boot.SpringApplication;
 import org.springframework.cloud.client.SpringCloudApplication;
-import org.springframework.cloud.netflix.zuul.EnableZuulProxy;
-import org.springframework.context.annotation.Bean;
-import org.springframework.web.cors.CorsConfiguration;
-import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
-import org.springframework.web.filter.CorsFilter;
 
 /**
  * 服务网关
  *
  * @author wujing
  */
-@EnableZuulProxy
 @SpringCloudApplication
 public class ServerGatewayApplication {
 
@@ -25,22 +18,4 @@ public class ServerGatewayApplication {
         SpringApplication.run(ServerGatewayApplication.class, args);
     }
 
-    @Bean
-    public FilterPre filterPre() {
-        return new FilterPre();
-    }
-
-    @Bean
-    public CorsFilter corsFilter() {
-        final UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
-        final CorsConfiguration config = new CorsConfiguration();
-        config.setAllowCredentials(true);
-        config.addAllowedOrigin("*");
-        config.addAllowedHeader("*");
-        config.addAllowedMethod("*");
-        config.setMaxAge(18000L);
-        source.registerCorsConfiguration("/**", config);
-        return new CorsFilter(source);
-    }
-
 }

roncoo-education-app-gateway/src/main/java/com/roncoo/education/app/gateway/GlobalErrorAttributes.java

+package com.roncoo.education.app.gateway;
+
+import com.roncoo.education.common.core.base.BaseException;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.web.error.ErrorAttributeOptions;
+import org.springframework.boot.web.reactive.error.DefaultErrorAttributes;
+import org.springframework.http.HttpStatus;
+import org.springframework.stereotype.Component;
+import org.springframework.web.reactive.function.server.ServerRequest;
+
+import java.util.Map;
+
+/**
+ * @author wujing
+ */
+@Slf4j
+@Component
+public class GlobalErrorAttributes extends DefaultErrorAttributes {
+
+    @Override
+    public Map<String, Object> getErrorAttributes(ServerRequest request, ErrorAttributeOptions options) {
+        Map<String, Object> map = super.getErrorAttributes(request, options);
+        log.error("系统异常，{}", map);
+        map.put("status", HttpStatus.OK.value());
+        Throwable error = this.getError(request);
+        if (error instanceof BaseException) {
+            BaseException be = (BaseException) error;
+            map.put("code", be.getCode());
+            map.put("msg", be.getMessage());
+        }
+        return map;
+    }
+}

roncoo-education-app-gateway/src/main/java/com/roncoo/education/app/gateway/IndexController.java

+package com.roncoo.education.app.gateway;
+
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+import reactor.core.publisher.Mono;
+
+@RestController
+public class IndexController {
+
+    @GetMapping("/")
+    public Mono<String> index() {
+        return Mono.just("SUCCESS");
+    }
+}

roncoo-education-app-gateway/src/main/java/com/roncoo/education/app/gateway/common/FilterPre.java

-/**
- * Copyright 2015-现在 广州市领课网络科技有限公司
- */
-package com.roncoo.education.app.gateway.common;
-
-import com.auth0.jwt.interfaces.DecodedJWT;
-import com.netflix.zuul.ZuulFilter;
-import com.netflix.zuul.context.RequestContext;
-import com.netflix.zuul.exception.ZuulException;
-import com.netflix.zuul.http.ServletInputStreamWrapper;
-import com.roncoo.education.util.base.BaseException;
-import com.roncoo.education.util.enums.RedisPreEnum;
-import com.roncoo.education.util.enums.ResultEnum;
-import com.roncoo.education.util.tools.JSONUtil;
-import com.roncoo.education.util.tools.JWTUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cloud.netflix.zuul.filters.support.FilterConstants;
-import org.springframework.data.redis.core.StringRedisTemplate;
-import org.springframework.util.StringUtils;
-
-import javax.servlet.ServletInputStream;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
-import java.io.BufferedReader;
-import java.io.DataInputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
-import java.util.concurrent.TimeUnit;
-
-/**
- * 请求开始前执行
- */
-public class FilterPre extends ZuulFilter {
-
-    private static final Logger logger = LoggerFactory.getLogger(FilterPre.class);
-    private static final String TOKEN = "token";
-    private static final String USERNO = "userNo";
-
-    @Autowired
-    private StringRedisTemplate stringRedisTemplate;
-
-    @SuppressWarnings("unchecked")
-    private static TreeMap<String, Object> getParamMap(HttpServletRequest request) {
-        TreeMap<String, Object> paramMap = new TreeMap<>();
-        Map<String, String[]> map = request.getParameterMap();
-        for (String key : map.keySet()) {
-            paramMap.put(key, map.get(key)[0]);
-        }
-        if (paramMap.isEmpty()) {
-            DataInputStream in = null;
-            try {
-                in = new DataInputStream(request.getInputStream());
-                byte[] buf = new byte[request.getContentLength()];
-                in.readFully(buf);
-                String t = new String(buf, "UTF-8");
-                if (StringUtils.hasText(t)) {
-                    return new TreeMap<>(JSONUtil.parseObject(t, TreeMap.class));
-                }
-            } catch (Exception e) {
-                logger.error("获取不到任何参数");
-            } finally {
-                if (null != in)
-                    try {
-                        in.close();// 关闭数据流
-                    } catch (IOException e) {
-                        logger.error("关闭数据流异常");
-                    }
-            }
-        }
-        return paramMap;
-    }
-
-    // 校验用户是否有权限
-    private static Boolean checkUri(String uri, String tk) {
-        List<String> menuVOList1 = JSONUtil.parseArray(tk, String.class);
-        if (StringUtils.hasText(uri) && uri.endsWith("/")) {
-            uri = uri.substring(0, uri.length() - 1);
-        }
-        for (String s : menuVOList1) {
-            if (s.contains(uri)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    @Override
-    public String filterType() {
-        return FilterConstants.PRE_TYPE;
-    }
-
-    @Override
-    public int filterOrder() {
-        return FilterConstants.PRE_DECORATION_FILTER_ORDER - 1;
-    }
-
-    @Override
-    public boolean shouldFilter() {
-        String uri = RequestContext.getCurrentContext().getRequest().getServletPath();
-        logger.info("请求地址", uri);
-
-        if (uri.contains("/callback")) {
-            // 回调使用
-            return false;
-        }
-        if (uri.contains("/api")) {
-            // 不鉴权
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    public Object run() throws ZuulException {
-        RequestContext ctx = RequestContext.getCurrentContext();
-        String uri = RequestContext.getCurrentContext().getRequest().getServletPath();
-        logger.info("请求地址" + uri);
-        HttpServletRequest request = ctx.getRequest();
-        Long userNo = null;
-        try {
-            userNo = getUserNoByToken(request);
-            if (uri.contains("/pc") && !uri.contains("/system/pc/menu/user/list") && !uri.contains("/system/pc/menu/user/button/list")) {
-                // 管理后台鉴权
-                if (!stringRedisTemplate.hasKey(RedisPreEnum.ADMINI_MENU.getCode().concat(userNo.toString()))) {
-                    throw new BaseException(ResultEnum.MENU_PAST);
-                }
-                String tk = stringRedisTemplate.opsForValue().get(RedisPreEnum.ADMINI_MENU.getCode().concat(userNo.toString()));
-                // 校验接口是否有权限
-                if (!checkUri(uri, tk)) {
-                    throw new BaseException(ResultEnum.MENU_NO);
-                }
-                // 更新时间，使用户菜单不过期
-                stringRedisTemplate.opsForValue().set(RedisPreEnum.ADMINI_MENU.getCode().concat(userNo.toString()), tk, 1, TimeUnit.HOURS);
-            }
-
-        } catch (BaseException e) {
-            logger.error("系统异常", e);
-            throw new ZuulException(e, e.getCode(), e.getMessage());
-        }
-        // 参数封装
-        try {
-            ctx.setRequest(requestWrapper(request, userNo));
-            return null;
-        } catch (Exception e) {
-            logger.error("封装参数异常", e.getMessage());
-            throw new ZuulException(e, ResultEnum.ERROR.getCode(), e.getMessage());
-        }
-
-    }
-
-    /**
-     * token 拦截功能
-     */
-    private Long getUserNoByToken(HttpServletRequest request) {
-        String token = request.getHeader(TOKEN); // 检验token
-        if (StringUtils.isEmpty(token)) { // token不存在，则从报文里面获取
-            throw new BaseException("token不存在，请重新登录");
-        }
-        // 解析 token
-        DecodedJWT jwt = null;
-        try {
-            jwt = JWTUtil.verify(token);
-        } catch (Exception e) {
-            logger.error("token异常，token={}", token.toString());
-            throw new BaseException(ResultEnum.TOKEN_ERROR);
-        }
-
-        // 校验token
-        if (null == jwt) {
-            throw new BaseException(ResultEnum.TOKEN_ERROR);
-        }
-        Long userNo = JWTUtil.getUserNo(jwt);
-        if (userNo <= 0) {
-            throw new BaseException(ResultEnum.TOKEN_ERROR);
-        }
-
-        // 单点登录处理，注意，登录的时候必须要放入缓存
-//        if (!stringRedisTemplate.hasKey(userNo.toString())) {
-//            // 不存在，则登录异常，有效期为1小时
-//            throw new BaseException(ResultEnum.TOKEN_PAST);
-//        }
-//        // 存在，判断是否token相同
-//        String tk = stringRedisTemplate.opsForValue().get(userNo.toString());
-//        if (!token.equals(tk)) {
-//            // 不同则为不同的用户登录，这时候提示异地登录
-//            throw new BaseException(ResultEnum.REMOTE_ERROR);
-//        }
-
-        // 更新时间，使token不过期
-        stringRedisTemplate.opsForValue().set(userNo.toString(), token, 1, TimeUnit.HOURS);
-
-        return userNo;
-    }
-
-    private HttpServletRequestWrapper requestWrapper(HttpServletRequest request, Long userNo) throws IOException {
-        Map<String, Object> map = getParamMap(request);
-        map.put(USERNO, userNo);
-        String newBody = JSONUtil.toJSONString(map);
-        logger.info("转发参数={}", newBody);
-        final byte[] reqBodyBytes = newBody.getBytes();
-        return new HttpServletRequestWrapper(request) {
-            @Override
-            public BufferedReader getReader() throws IOException {
-                return new BufferedReader(new InputStreamReader(getInputStream()));
-            }
-
-            @Override
-            public ServletInputStream getInputStream() throws IOException {
-                return new ServletInputStreamWrapper(reqBodyBytes);
-            }
-
-            @Override
-            public int getContentLength() {
-                return reqBodyBytes.length;
-            }
-
-            @Override
-            public long getContentLengthLong() {
-                return reqBodyBytes.length;
-            }
-        };
-    }
-}

roncoo-education-app-gateway/src/main/java/com/roncoo/education/app/gateway/controller/HandlerController.java

-package com.roncoo.education.app.gateway.controller;
-
-import com.netflix.zuul.context.RequestContext;
-import com.netflix.zuul.exception.ZuulException;
-import com.roncoo.education.util.base.Result;
-import com.roncoo.education.util.enums.ResultEnum;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.boot.web.servlet.error.ErrorController;
-import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseStatus;
-import org.springframework.web.bind.annotation.RestController;
-
-@Slf4j
-@RestController
-public class HandlerController implements ErrorController {
-
-    /**
-     * 出异常后进入该方法，交由下面的方法处理
-     */
-    @Override
-    public String getErrorPath() {
-        return "/error";
-    }
-
-    @RequestMapping("/error")
-    @ResponseStatus(HttpStatus.OK)
-    public Result<String> error() {
-        RequestContext ctx = RequestContext.getCurrentContext();
-        Throwable throwable = ctx.getThrowable();
-        log.error("系统异常", throwable);
-        if (null != throwable && throwable instanceof ZuulException) {
-            ZuulException e = (ZuulException) ctx.getThrowable();
-            return Result.error(e.nStatusCode, e.errorCause);
-        }
-        return Result.error(ResultEnum.ERROR);
-    }
-
-}

roncoo-education-app-gateway/src/main/java/com/roncoo/education/app/gateway/controller/IndexController.java

-/**
- * Copyright 2015-现在 广州市领课网络科技有限公司
- */
-package com.roncoo.education.app.gateway.controller;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-
-@Controller
-public class IndexController {
-
-    @RequestMapping(value = "/", method = RequestMethod.GET)
-    public String index() {
-        return "index";
-    }
-
-}

roncoo-education-app-gateway/src/main/java/com/roncoo/education/app/gateway/filter/EduGlobalFilter.java

+package com.roncoo.education.app.gateway.filter;
+
+import com.auth0.jwt.interfaces.DecodedJWT;
+import com.roncoo.education.common.core.base.BaseException;
+import com.roncoo.education.common.core.enums.ResultEnum;
+import com.roncoo.education.common.core.tools.Constants;
+import com.roncoo.education.common.core.tools.JWTUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.gateway.filter.GatewayFilterChain;
+import org.springframework.cloud.gateway.filter.GlobalFilter;
+import org.springframework.core.Ordered;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.http.server.reactive.ServerHttpRequest;
+import org.springframework.stereotype.Component;
+import org.springframework.util.StringUtils;
+import org.springframework.web.server.ServerWebExchange;
+import reactor.core.publisher.Mono;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * @author wujing
+ */
+@Slf4j
+@Component
+public class EduGlobalFilter implements GlobalFilter, Ordered {
+
+    /**
+     * admin不需要token校验的接口
+     */
+    private static final List<String> EXCLUDE_TOKEN_URL = Arrays.asList(
+            // 登录接口
+            "/system/admin/login/password"
+    );
+
+    /**
+     * admin不需要权限校验的接口
+     */
+    private static final List<String> EXCLUDE_URL = Arrays.asList(
+            // 登录获取菜单接口
+            "/system/admin/sys/menu/user/list",
+            // 登录获取权限接口
+            "/system/admin/sys/menu/permission/list",
+            // 登录获取当前用户接口
+            "/system/admin/sys/user/current",
+            // 上传接口
+            "/system/admin/upload/pic"
+    );
+
+    @Autowired
+    private StringRedisTemplate stringRedisTemplate;
+
+    /**
+     * 优先级，order越大，优先级越低
+     *
+     * @return
+     */
+    @Override
+    public int getOrder() {
+        return 0;
+    }
+
+    @Override
+    public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain) {
+        ServerHttpRequest request = exchange.getRequest();
+        String uri = request.getPath().value();
+        if (FilterUtil.checkUri(uri, FilterUtil.CALLBACK_URL_PREFIX)) {
+            // 路径存在关键词：/callback，不鉴权
+            return chain.filter(exchange);
+        }
+        if (FilterUtil.checkUri(uri, FilterUtil.API_URL_PREFIX)) {
+            // 路径存在关键词：/api，不鉴权
+            return chain.filter(exchange);
+        }
+        if (FilterUtil.checkUri(uri, FilterUtil.API_V2)) {
+            // 路径存在关键词：/v2，不鉴权
+            return chain.filter(exchange);
+        }
+        if (FilterUtil.checkUri(uri, FilterUtil.IMAGES)) {
+            // 路径存在关键词：/images
+            return chain.filter(exchange);
+        }
+        // 额外不需要token认证的接口
+        if (EXCLUDE_TOKEN_URL.contains(uri)) {
+            return chain.filter(exchange);
+        }
+
+        Long userId = getUserId(request);
+        if (FilterUtil.checkUri(uri, FilterUtil.ADMIN_URL_PREFIX)) {
+            // admin校验
+            if (!stringRedisTemplate.hasKey(Constants.RedisPre.ADMINI_MENU.concat(userId.toString()))) {
+                throw new BaseException(ResultEnum.MENU_PAST);
+            }
+            String tk = stringRedisTemplate.opsForValue().get(Constants.RedisPre.ADMINI_MENU.concat(userId.toString()));
+            // 校验接口是否有权限
+            if (!checkUri(uri, tk)) {
+                throw new BaseException(ResultEnum.MENU_NO);
+            }
+            // 更新时间，使用户菜单不过期
+            stringRedisTemplate.opsForValue().set(Constants.RedisPre.ADMINI_MENU.concat(userId.toString()), tk, Constants.SESSIONTIME, TimeUnit.MINUTES);
+        }
+        request.mutate().header(Constants.USER_ID, String.valueOf(userId));
+        return chain.filter(exchange);
+    }
+
+    // 校验用户是否有权限
+    private static Boolean checkUri(String uri, String tk) {
+        if (StringUtils.hasText(uri) && uri.endsWith("/")) {
+            uri = uri.substring(0, uri.length() - 1);
+        }
+
+        // 额外不需要权限校验的接口
+        if (EXCLUDE_URL.contains(uri)) {
+            return true;
+        }
+        // 权限校验
+        uri = uri.substring(1).replace("/", ":");
+        if (tk.contains(uri)) {
+            return true;
+        }
+
+        log.info("用户没该权限点，{}", uri);
+        return false;
+    }
+
+    private Long getUserId(ServerHttpRequest request) {
+        // 头部
+        String token = request.getHeaders().getFirst(Constants.TOKEN);
+        if (StringUtils.isEmpty(token)) {
+            throw new BaseException("token不存在，请重新登录");
+        }
+
+        // 解析 token
+        DecodedJWT jwt = null;
+        try {
+            jwt = JWTUtil.verify(token);
+        } catch (Exception e) {
+            log.error("token异常，token={}", token);
+            throw new BaseException(ResultEnum.TOKEN_ERROR);
+        }
+
+        // 校验token
+        if (null == jwt) {
+            throw new BaseException(ResultEnum.TOKEN_ERROR);
+        }
+        Long userId = JWTUtil.getUserId(jwt);
+        if (userId <= 0) {
+            throw new BaseException(ResultEnum.TOKEN_ERROR);
+        }
+
+        // 更新时间，使token不过期
+        stringRedisTemplate.opsForValue().set(userId.toString(), token, Constants.SESSIONTIME, TimeUnit.MINUTES);
+        return userId;
+    }
+
+}

roncoo-education-app-gateway/src/main/java/com/roncoo/education/app/gateway/filter/FilterUtil.java

+package com.roncoo.education.app.gateway.filter;
+
+import com.auth0.jwt.interfaces.DecodedJWT;
+import com.roncoo.education.common.core.base.BaseException;
+import com.roncoo.education.common.core.enums.ResultEnum;
+import com.roncoo.education.common.core.tools.Constants;
+import com.roncoo.education.common.core.tools.JWTUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.server.reactive.ServerHttpRequest;
+import org.springframework.util.StringUtils;
+
+/**
+ * 过滤器工具类
+ *
+ * @author Admin
+ */
+@Slf4j
+public final class FilterUtil {
+
+    private FilterUtil() {
+    }
+
+    /**
+     * 技术文档
+     */
+    public static final String API_V2 = "/v2";
+    /**
+     * 图片
+     */
+    public static final String IMAGES = "/images";
+    /**
+     * Api路径前缀
+     */
+    public static final String API_URL_PREFIX = "/api";
+    /**
+     * Boss路径前缀
+     */
+    public static final String CALLBACK_URL_PREFIX = "/callback";
+    /**
+     * Admin路径前缀
+     */
+    public static final String ADMIN_URL_PREFIX = "/admin";
+
+    /**
+     * 校验uri里面的第二个斜杠的字符串
+     *
+     * @param uri 请求URL
+     * @param key 需要校验的字符串
+     * @return 校验结果
+     */
+    public static boolean checkUri(String uri, String key) {
+        String result = uri.substring(uri.indexOf("/", uri.indexOf("/") + 1));
+        return result.startsWith(key);
+    }
+
+    public static boolean startsWith(String uri, String key) {
+        return uri.startsWith(key);
+    }
+
+    /**
+     * 获取JWT解码信息
+     *
+     * @param request 访问请求
+     * @return JWT解码信息
+     */
+    public static DecodedJWT getDecodedJWT(ServerHttpRequest request) {
+        // 头部
+        String token = request.getHeaders().getFirst(Constants.TOKEN);
+        // 路径
+        if (!StringUtils.hasText(token)) {
+            token = request.getQueryParams().getFirst(Constants.TOKEN);
+        }
+        // 检验token
+        if (!StringUtils.hasText(token)) {
+            throw new BaseException(ResultEnum.TOKEN_PAST);
+        }
+
+        // 解析 token
+        try {
+            return JWTUtil.verify(token);
+        } catch (Exception e) {
+            log.error("token异常，token={}", token, e);
+            throw new BaseException(ResultEnum.TOKEN_ERROR);
+        }
+    }
+}

roncoo-education-app-gateway/src/main/java/com/roncoo/education/app/gateway/swagger/SwaggerHandler.java

+package com.roncoo.education.app.gateway.swagger;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+import reactor.core.publisher.Mono;
+import springfox.documentation.swagger.web.*;
+
+import java.util.Optional;
+
+@RestController
+public class SwaggerHandler {
+
+  @Autowired(required = false)
+  private SecurityConfiguration securityConfiguration;
+
+  @Autowired(required = false)
+  private UiConfiguration uiConfiguration;
+
+  private final SwaggerResourcesProvider swaggerResources;
+
+  @Autowired
+  public SwaggerHandler(SwaggerResourcesProvider swaggerResources) {
+    this.swaggerResources = swaggerResources;
+  }
+
+  @GetMapping("/swagger-resources/configuration/security")
+  public Mono<ResponseEntity<SecurityConfiguration>> securityConfiguration() {
+    return Mono.just(
+        new ResponseEntity<>(
+            Optional.ofNullable(securityConfiguration)
+                .orElse(SecurityConfigurationBuilder.builder().build()),
+            HttpStatus.OK));
+  }
+
+  @GetMapping("/swagger-resources/configuration/ui")
+  public Mono<ResponseEntity<UiConfiguration>> uiConfiguration() {
+    return Mono.just(
+        new ResponseEntity<>(
+            Optional.ofNullable(uiConfiguration).orElse(UiConfigurationBuilder.builder().build()),
+            HttpStatus.OK));
+  }
+
+  @GetMapping("/swagger-resources")
+  public Mono<ResponseEntity> swaggerResources() {
+    return Mono.just((new ResponseEntity<>(swaggerResources.get(), HttpStatus.OK)));
+  }
+}

roncoo-education-app-gateway/src/main/java/com/roncoo/education/app/gateway/swagger/SwaggerResourceConfig.java

+package com.roncoo.education.app.gateway.swagger;
+
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.cloud.gateway.config.GatewayProperties;
+import org.springframework.cloud.gateway.route.RouteLocator;
+import org.springframework.context.annotation.Primary;
+import org.springframework.stereotype.Component;
+import springfox.documentation.swagger.web.SwaggerResource;
+import springfox.documentation.swagger.web.SwaggerResourcesProvider;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Slf4j
+@Component
+@Primary
+@AllArgsConstructor
+public class SwaggerResourceConfig implements SwaggerResourcesProvider {
+
+    private final RouteLocator routeLocator;
+    private final GatewayProperties gatewayProperties;
+
+    @Override
+    public List<SwaggerResource> get() {
+        List<SwaggerResource> resources = new ArrayList<>();
+        List<String> routes = new ArrayList<>();
+        routeLocator.getRoutes().subscribe(route -> routes.add(route.getId()));
+        gatewayProperties.getRoutes().stream()
+                .filter(routeDefinition -> routes.contains(routeDefinition.getId()))
+                .forEach(
+                        route -> {
+                            route.getPredicates().forEach(
+                                    predicateDefinition ->
+                                            resources.add(swaggerResource(route.getId(), "/v2/api-docs")));
+                        });
+        return resources;
+    }
+
+    private SwaggerResource swaggerResource(String name, String location) {
+        SwaggerResource swaggerResource = new SwaggerResource();
+        swaggerResource.setName(name);
+        swaggerResource.setLocation("/" + name + location);
+        swaggerResource.setSwaggerVersion("2.0");
+        return swaggerResource;
+    }
+}

roncoo-education-app-gateway/src/main/resources/bootstrap.properties

 # application
-spring.application.name=roncoo-education-app-gateway
+spring.application.name=app-gateway
 # profile
 spring.profiles.active=dev
 # server
-server.port=5840
+server.port=8180
 # nacos
 spring.cloud.nacos.username=nacos
 spring.cloud.nacos.password=nacos
-spring.cloud.nacos.server-addr=localhost:8848
+spring.cloud.nacos.server-addr=10.65.3.98:8848
 spring.cloud.nacos.namespace=${spring.profiles.active}
 spring.cloud.nacos.discovery.namespace=${spring.cloud.nacos.namespace}
 spring.cloud.nacos.config.namespace=${spring.cloud.nacos.namespace}

roncoo-education-app-gateway/src/main/resources/templates/index.ftl

-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>接口文档</title>
-</head>
-<body>
-<div style="margin:0 auto;text-align:center;">
-    <br/>
-    <a href="http://localhost:5710/doc.html" target="_blanck">课程API</a>
-    <br/>
-    <br/>
-    <a href="http://localhost:5720/doc.html" target="_blanck">用户API</a>
-    <br/>
-    <br/>
-    <a href="http://localhost:5730/doc.html" target="_blanck">系统API</a>
-</div>
-</body>
-</html>

roncoo-education-app-job/Dockerfile

-FROM daocloud.io/library/java:8-jre-alpine
+FROM openjdk:8-jdk-oracle
 MAINTAINER roncoo
 ARG JAVA_OPTS="-Xmx128M"
 ENV JAVA_OPTS=$JAVA_OPTS
 ARG RUN_ARGS="--spring.profiles.active=prod"
 ENV RUN_ARGS=$RUN_ARGS
-ADD target/app-job.jar /app-job.jar
-ENTRYPOINT ["sh","-c","java $JAVA_OPTS -jar /app-job.jar $RUN_ARGS"]
+ADD target/job.jar /job.jar
+ENTRYPOINT ["sh","-c","java $JAVA_OPTS -jar /job.jar $RUN_ARGS"]

roncoo-education-app-job/pom.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" 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>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         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>
+    <parent>
+        <groupId>com.roncoo</groupId>
+        <artifactId>roncoo-education</artifactId>
+        <version>11.0.0-RELEASE</version>
+    </parent>
 
-	<parent>
-		<groupId>com.roncoo</groupId>
-		<artifactId>roncoo-education</artifactId>
-		<version>9.0.0-RELEASE</version>
-	</parent>
+    <groupId>com.xuxueli</groupId>
+    <artifactId>roncoo-education-app-job</artifactId>
 
-	<artifactId>roncoo-education-app-job</artifactId>
-	<name>roncoo-education-app-job</name>
+    <dependencies>
+        <!-- Nacos -->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.roncoo</groupId>
+            <artifactId>roncoo-education-common-log</artifactId>
+        </dependency>
 
-	<dependencies>
-		<!-- Nacos -->
-		<dependency>
-			<groupId>com.alibaba.cloud</groupId>
-			<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.alibaba.cloud</groupId>
-			<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
-		</dependency>
+        <!-- starter-web：spring-webmvc + autoconfigure + logback + yaml + tomcat -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
 
-		<dependency>
-			<groupId>com.roncoo</groupId>
-			<artifactId>roncoo-education-course-feign</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.roncoo</groupId>
-			<artifactId>roncoo-education-user-feign</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.roncoo</groupId>
-			<artifactId>roncoo-education-system-feign</artifactId>
-		</dependency>
+        <!-- freemarker-starter -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-freemarker</artifactId>
+        </dependency>
 
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-actuator</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-devtools</artifactId>
-		</dependency>
+        <!-- mail-starter -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-mail</artifactId>
+        </dependency>
 
-		<!-- test -->
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-test</artifactId>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
+        <!-- starter-actuator -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+
+        <!-- mybatis-starter：mybatis + mybatis-spring + hikari（default） -->
+        <!-- mybatis -->
+        <dependency>
+            <groupId>org.mybatis.spring.boot</groupId>
+            <artifactId>mybatis-spring-boot-starter</artifactId>
+            <version>2.2.2</version>
+        </dependency>
+        <!-- mysql -->
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+        </dependency>
+        <!-- xxl-job-core -->
+        <dependency>
+            <groupId>com.xuxueli</groupId>
+            <artifactId>xxl-job-core</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>job</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>com.spotify</groupId>
+                <artifactId>dockerfile-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
 
-	<build>
-		<finalName>app-job</finalName>
-		<plugins>
-			<plugin>
-				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-maven-plugin</artifactId>
-			</plugin>
-		</plugins>
-	</build>
 </project>

roncoo-education-app-job/src/main/java/com/roncoo/education/ServerJobApplication.java

-/**
- * Copyright 2015-现在 广州市领课网络科技有限公司
- */
-package com.roncoo.education;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.cloud.client.SpringCloudApplication;
-import org.springframework.cloud.openfeign.EnableFeignClients;
-import org.springframework.scheduling.annotation.EnableScheduling;
-
-/**
- * 定时任务
- */
-@EnableScheduling
-@EnableFeignClients
-@SpringCloudApplication
-public class ServerJobApplication {
-
-    public static void main(String[] args) {
-        SpringApplication.run(ServerJobApplication.class, args);
-    }
-
-}

roncoo-education-app-job/src/main/java/com/roncoo/education/app/job/MsgSendCrontab.java

-package com.roncoo.education.app.job;
-
-import com.roncoo.education.system.feign.interfaces.IFeignMsg;
-import com.roncoo.education.util.base.BaseController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-
-/**
- * 站内信-定时发送
- *
- * @author wuyun
- */
-@Component
-public class MsgSendCrontab extends BaseController {
-
-    private static final Object KEY = new Object();
-    private static boolean taskFlag = false;
-
-    @Autowired
-    private IFeignMsg bossMsg;
-
-    /**
-     * 定时任务，一小时启动一次
-     *
-     * @author wuyun
-     */
-    @Scheduled(fixedRate = 60000)
-    public void pushCancel() {
-        synchronized (KEY) {
-            if (MsgSendCrontab.taskFlag) {
-                logger.warn("站内信-定时发送已经启动");
-                return;
-            }
-            MsgSendCrontab.taskFlag = true;
-        }
-
-        try {
-            bossMsg.push();
-        } catch (Exception e) {
-            logger.error("站内信-定时发送-执行出错", e);
-        }
-
-        MsgSendCrontab.taskFlag = false;
-
-        logger.warn("站内信-定时发送-任务完成");
-    }
-}

roncoo-education-app-job/src/main/java/com/roncoo/education/app/job/OrderCrontab.java

-package com.roncoo.education.app.job;
-
-import com.roncoo.education.course.feign.interfaces.IFeignOrderInfo;
-import com.roncoo.education.util.base.BaseController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-
-/**
- * 定时任务-订单处理
- *
- * @author wuyun
- */
-@Component
-public class OrderCrontab extends BaseController {
-
-    private static final Object KEY = new Object();
-
-    private static boolean taskFlag = false;
-
-    @Autowired
-    private IFeignOrderInfo feignOrderInfo;
-
-    /**
-     * 定时任务每分钟执行一次
-     */
-    @Scheduled(fixedRate = 60000)
-    public void orderCancel() {
-        synchronized (KEY) {
-            if (OrderCrontab.taskFlag) {
-                logger.warn("订单处理-任务已经启动");
-                return;
-            }
-            OrderCrontab.taskFlag = true;
-        }
-        logger.warn("订单处理-定时任务开始");
-
-        try {
-            feignOrderInfo.handleScheduledTasks();
-        } catch (Exception e) {
-            logger.error("定时任务-订单处理-执行出错", e);
-        }
-        OrderCrontab.taskFlag = false;
-    }
-
-}

roncoo-education-app-job/src/main/java/com/roncoo/education/app/job/VideoCrontab.java

-package com.roncoo.education.app.job;
-
-import com.roncoo.education.course.feign.interfaces.IFeignCourseVideo;
-import com.roncoo.education.util.base.BaseController;
-import com.roncoo.education.util.config.SystemUtil;
-import com.xiaoleilu.hutool.io.FileUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-
-import java.io.File;
-
-/**
- * 定时任务-视频处理
- *
- * @author wuyun
- */
-@Component
-public class VideoCrontab extends BaseController {
-
-    private static final Object KEY = new Object();
-    private static boolean taskFlag = false;
-
-    @Autowired
-    private IFeignCourseVideo feignCourseVideo;
-
-    /**
-     * 定时任务每分钟执行一次 <br/>
-     * 注意：每个course服务都必须要对应有一个定时任务，针对服务器
-     */
-    @Scheduled(fixedRate = 60000)
-    public void orderCancel() {
-        synchronized (KEY) {
-            if (VideoCrontab.taskFlag) {
-                logger.warn("视频处理-任务已经启动");
-                return;
-            }
-            VideoCrontab.taskFlag = true;
-        }
-
-        int videoSum = 0;
-
-        File file = new File(SystemUtil.PERIOD_VIDEO_PATH);
-        if (file.isDirectory()) {// isDirectory是否文件夹
-            File[] files = file.listFiles();// listFiles是获取该目录下所有文件和目录的绝对路径
-            for (File targetFile : files) {
-
-                if (targetFile.isFile() && targetFile.exists()) {
-                    if (FileUtil.newerThan(targetFile, (System.currentTimeMillis() - 7200000))) {// 上传两个小时内
-
-                        try {
-                            feignCourseVideo.handleScheduledTasks(targetFile);
-                            videoSum = videoSum + 1;
-                        } catch (Exception e) {
-                            logger.error("视频定时任务处理失败", e);
-                        }
-
-                    }
-                }
-            }
-        }
-
-        VideoCrontab.taskFlag = false;
-
-        logger.warn("视频处理-定时任务完成，处理视频数={}", videoSum);
-    }
-
-}

roncoo-education-app-job/src/main/java/com/xxl/job/admin/XxlJobAdminApplication.java

+package com.xxl.job.admin;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+
+/**
+ * @author xuxueli 2018-10-28 00:38:13
+ */
+@EnableDiscoveryClient
+@SpringBootApplication
+public class XxlJobAdminApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(XxlJobAdminApplication.class, args);
+    }
+
+}

roncoo-education-app-job/src/main/java/com/xxl/job/admin/controller/IndexController.java

+package com.xxl.job.admin.controller;
+
+import com.xxl.job.admin.controller.annotation.PermissionLimit;
+import com.xxl.job.admin.service.LoginService;
+import com.xxl.job.admin.service.XxlJobService;
+import com.xxl.job.core.biz.model.ReturnT;
+import org.springframework.beans.propertyeditors.CustomDateEditor;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.WebDataBinder;
+import org.springframework.web.bind.annotation.InitBinder;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.view.RedirectView;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Map;
+
+/**
+ * index controller
+ * @author xuxueli 2015-12-19 16:13:16
+ */
+@Controller
+public class IndexController {
+
+	@Resource
+	private XxlJobService xxlJobService;
+	@Resource
+	private LoginService loginService;
+
+
+	@RequestMapping("/")
+	public String index(Model model) {
+
+		Map<String, Object> dashboardMap = xxlJobService.dashboardInfo();
+		model.addAllAttributes(dashboardMap);
+
+		return "index";
+	}
+
+    @RequestMapping("/chartInfo")
+	@ResponseBody
+	public ReturnT<Map<String, Object>> chartInfo(Date startDate, Date endDate) {
+        ReturnT<Map<String, Object>> chartInfo = xxlJobService.chartInfo(startDate, endDate);
+        return chartInfo;
+    }
+	
+	@RequestMapping("/toLogin")
+	@PermissionLimit(limit=false)
+	public ModelAndView toLogin(HttpServletRequest request, HttpServletResponse response,ModelAndView modelAndView) {
+		if (loginService.ifLogin(request, response) != null) {
+			modelAndView.setView(new RedirectView("/",true,false));
+			return modelAndView;
+		}
+		return new ModelAndView("login");
+	}
+	
+	@RequestMapping(value="login", method=RequestMethod.POST)
+	@ResponseBody
+	@PermissionLimit(limit=false)
+	public ReturnT<String> loginDo(HttpServletRequest request, HttpServletResponse response, String userName, String password, String ifRemember){
+		boolean ifRem = (ifRemember!=null && ifRemember.trim().length()>0 && "on".equals(ifRemember))?true:false;
+		return loginService.login(request, response, userName, password, ifRem);
+	}
+	
+	@RequestMapping(value="logout", method=RequestMethod.POST)
+	@ResponseBody
+	@PermissionLimit(limit=false)
+	public ReturnT<String> logout(HttpServletRequest request, HttpServletResponse response){
+		return loginService.logout(request, response);
+	}
+	
+	@RequestMapping("/help")
+	public String help() {
+
+		/*if (!PermissionInterceptor.ifLogin(request)) {
+			return "redirect:/toLogin";
+		}*/
+
+		return "help";
+	}
+
+	@InitBinder
+	public void initBinder(WebDataBinder binder) {
+		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		dateFormat.setLenient(false);
+		binder.registerCustomEditor(Date.class, new CustomDateEditor(dateFormat, true));
+	}
+	
+}

roncoo-education-app-job/src/main/java/com/xxl/job/admin/controller/JobApiController.java

+package com.xxl.job.admin.controller;
+
+import com.xxl.job.admin.controller.annotation.PermissionLimit;
+import com.xxl.job.admin.core.conf.XxlJobAdminConfig;
+import com.xxl.job.core.biz.AdminBiz;
+import com.xxl.job.core.biz.model.HandleCallbackParam;
+import com.xxl.job.core.biz.model.RegistryParam;
+import com.xxl.job.core.biz.model.ReturnT;
+import com.xxl.job.core.util.GsonTool;
+import com.xxl.job.core.util.XxlJobRemotingUtil;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * Created by xuxueli on 17/5/10.
+ */
+@Controller
+@RequestMapping("/api")
+public class JobApiController {
+
+    @Resource
+    private AdminBiz adminBiz;
+
+    /**
+     * api
+     *
+     * @param uri
+     * @param data
+     * @return
+     */
+    @RequestMapping("/{uri}")
+    @ResponseBody
+    @PermissionLimit(limit=false)
+    public ReturnT<String> api(HttpServletRequest request, @PathVariable("uri") String uri, @RequestBody(required = false) String data) {
+
+        // valid
+        if (!"POST".equalsIgnoreCase(request.getMethod())) {
+            return new ReturnT<String>(ReturnT.FAIL_CODE, "invalid request, HttpMethod not support.");
+        }
+        if (uri==null || uri.trim().length()==0) {
+            return new ReturnT<String>(ReturnT.FAIL_CODE, "invalid request, uri-mapping empty.");
+        }
+        if (XxlJobAdminConfig.getAdminConfig().getAccessToken()!=null
+                && XxlJobAdminConfig.getAdminConfig().getAccessToken().trim().length()>0
+                && !XxlJobAdminConfig.getAdminConfig().getAccessToken().equals(request.getHeader(XxlJobRemotingUtil.XXL_JOB_ACCESS_TOKEN))) {
+            return new ReturnT<String>(ReturnT.FAIL_CODE, "The access token is wrong.");
+        }
+
+        // services mapping
+        if ("callback".equals(uri)) {
+            List<HandleCallbackParam> callbackParamList = GsonTool.fromJson(data, List.class, HandleCallbackParam.class);
+            return adminBiz.callback(callbackParamList);
+        } else if ("registry".equals(uri)) {
+            RegistryParam registryParam = GsonTool.fromJson(data, RegistryParam.class);
+            return adminBiz.registry(registryParam);
+        } else if ("registryRemove".equals(uri)) {
+            RegistryParam registryParam = GsonTool.fromJson(data, RegistryParam.class);
+            return adminBiz.registryRemove(registryParam);
+        } else {
+            return new ReturnT<String>(ReturnT.FAIL_CODE, "invalid request, uri-mapping("+ uri +") not found.");
+        }
+
+    }
+
+}

roncoo-education-app-job/src/main/java/com/xxl/job/admin/controller/JobCodeController.java

+package com.xxl.job.admin.controller;
+
+import com.xxl.job.admin.core.model.XxlJobInfo;
+import com.xxl.job.admin.core.model.XxlJobLogGlue;
+import com.xxl.job.admin.core.util.I18nUtil;
+import com.xxl.job.admin.dao.XxlJobInfoDao;
+import com.xxl.job.admin.dao.XxlJobLogGlueDao;
+import com.xxl.job.core.biz.model.ReturnT;
+import com.xxl.job.core.glue.GlueTypeEnum;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * job code controller
+ * @author xuxueli 2015-12-19 16:13:16
+ */
+@Controller
+@RequestMapping("/jobcode")
+public class JobCodeController {
+	
+	@Resource
+	private XxlJobInfoDao xxlJobInfoDao;
+	@Resource
+	private XxlJobLogGlueDao xxlJobLogGlueDao;
+
+	@RequestMapping
+	public String index(HttpServletRequest request, Model model, int jobId) {
+		XxlJobInfo jobInfo = xxlJobInfoDao.loadById(jobId);
+		List<XxlJobLogGlue> jobLogGlues = xxlJobLogGlueDao.findByJobId(jobId);
+
+		if (jobInfo == null) {
+			throw new RuntimeException(I18nUtil.getString("jobinfo_glue_jobid_unvalid"));
+		}
+		if (GlueTypeEnum.BEAN == GlueTypeEnum.match(jobInfo.getGlueType())) {
+			throw new RuntimeException(I18nUtil.getString("jobinfo_glue_gluetype_unvalid"));
+		}
+
+		// valid permission
+		JobInfoController.validPermission(request, jobInfo.getJobGroup());
+
+		// Glue类型-字典
+		model.addAttribute("GlueTypeEnum", GlueTypeEnum.values());
+
+		model.addAttribute("jobInfo", jobInfo);
+		model.addAttribute("jobLogGlues", jobLogGlues);
+		return "jobcode/jobcode.index";
+	}
+	
+	@RequestMapping("/save")
+	@ResponseBody
+	public ReturnT<String> save(Model model, int id, String glueSource, String glueRemark) {
+		// valid
+		if (glueRemark==null) {
+			return new ReturnT<String>(500, (I18nUtil.getString("system_please_input") + I18nUtil.getString("jobinfo_glue_remark")) );
+		}
+		if (glueRemark.length()<4 || glueRemark.length()>100) {
+			return new ReturnT<String>(500, I18nUtil.getString("jobinfo_glue_remark_limit"));
+		}
+		XxlJobInfo exists_jobInfo = xxlJobInfoDao.loadById(id);
+		if (exists_jobInfo == null) {
+			return new ReturnT<String>(500, I18nUtil.getString("jobinfo_glue_jobid_unvalid"));
+		}
+		
+		// update new code
+		exists_jobInfo.setGlueSource(glueSource);
+		exists_jobInfo.setGlueRemark(glueRemark);
+		exists_jobInfo.setGlueUpdatetime(new Date());
+
+		exists_jobInfo.setUpdateTime(new Date());
+		xxlJobInfoDao.update(exists_jobInfo);
+
+		// log old code
+		XxlJobLogGlue xxlJobLogGlue = new XxlJobLogGlue();
+		xxlJobLogGlue.setJobId(exists_jobInfo.getId());
+		xxlJobLogGlue.setGlueType(exists_jobInfo.getGlueType());
+		xxlJobLogGlue.setGlueSource(glueSource);
+		xxlJobLogGlue.setGlueRemark(glueRemark);
+
+		xxlJobLogGlue.setAddTime(new Date());
+		xxlJobLogGlue.setUpdateTime(new Date());
+		xxlJobLogGlueDao.save(xxlJobLogGlue);
+
+		// remove code backup more than 30
+		xxlJobLogGlueDao.removeOld(exists_jobInfo.getId(), 30);
+
+		return ReturnT.SUCCESS;
+	}
+	
+}

roncoo-education-app-job/src/main/java/com/xxl/job/admin/controller/JobGroupController.java

+package com.xxl.job.admin.controller;
+
+import com.xxl.job.admin.core.model.XxlJobGroup;
+import com.xxl.job.admin.core.model.XxlJobRegistry;
+import com.xxl.job.admin.core.util.I18nUtil;
+import com.xxl.job.admin.dao.XxlJobGroupDao;
+import com.xxl.job.admin.dao.XxlJobInfoDao;
+import com.xxl.job.admin.dao.XxlJobRegistryDao;
+import com.xxl.job.core.biz.model.ReturnT;
+import com.xxl.job.core.enums.RegistryConfig;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.*;
+
+/**
+ * job group controller
+ * @author xuxueli 2016-10-02 20:52:56
+ */
+@Controller
+@RequestMapping("/jobgroup")
+public class JobGroupController {
+
+	@Resource
+	public XxlJobInfoDao xxlJobInfoDao;
+	@Resource
+	public XxlJobGroupDao xxlJobGroupDao;
+	@Resource
+	private XxlJobRegistryDao xxlJobRegistryDao;
+
+	@RequestMapping
+	public String index(Model model) {
+		return "jobgroup/jobgroup.index";
+	}
+
+	@RequestMapping("/pageList")
+	@ResponseBody
+	public Map<String, Object> pageList(HttpServletRequest request,
+										@RequestParam(required = false, defaultValue = "0") int start,
+										@RequestParam(required = false, defaultValue = "10") int length,
+										String appname, String title) {
+
+		// page query
+		List<XxlJobGroup> list = xxlJobGroupDao.pageList(start, length, appname, title);
+		int list_count = xxlJobGroupDao.pageListCount(start, length, appname, title);
+
+		// package result
+		Map<String, Object> maps = new HashMap<String, Object>();
+		maps.put("recordsTotal", list_count);		// 总记录数
+		maps.put("recordsFiltered", list_count);	// 过滤后的总记录数
+		maps.put("data", list);  					// 分页列表
+		return maps;
+	}
+
+	@RequestMapping("/save")
+	@ResponseBody
+	public ReturnT<String> save(XxlJobGroup xxlJobGroup){
+
+		// valid
+		if (xxlJobGroup.getAppname()==null || xxlJobGroup.getAppname().trim().length()==0) {
+			return new ReturnT<String>(500, (I18nUtil.getString("system_please_input")+"AppName") );
+		}
+		if (xxlJobGroup.getAppname().length()<4 || xxlJobGroup.getAppname().length()>64) {
+			return new ReturnT<String>(500, I18nUtil.getString("jobgroup_field_appname_length") );
+		}
+		if (xxlJobGroup.getAppname().contains(">") || xxlJobGroup.getAppname().contains("<")) {
+			return new ReturnT<String>(500, "AppName"+I18nUtil.getString("system_unvalid") );
+		}
+		if (xxlJobGroup.getTitle()==null || xxlJobGroup.getTitle().trim().length()==0) {
+			return new ReturnT<String>(500, (I18nUtil.getString("system_please_input") + I18nUtil.getString("jobgroup_field_title")) );
+		}
+		if (xxlJobGroup.getTitle().contains(">") || xxlJobGroup.getTitle().contains("<")) {
+			return new ReturnT<String>(500, I18nUtil.getString("jobgroup_field_title")+I18nUtil.getString("system_unvalid") );
+		}
+		if (xxlJobGroup.getAddressType()!=0) {
+			if (xxlJobGroup.getAddressList()==null || xxlJobGroup.getAddressList().trim().length()==0) {
+				return new ReturnT<String>(500, I18nUtil.getString("jobgroup_field_addressType_limit") );
+			}
+			if (xxlJobGroup.getAddressList().contains(">") || xxlJobGroup.getAddressList().contains("<")) {
+				return new ReturnT<String>(500, I18nUtil.getString("jobgroup_field_registryList")+I18nUtil.getString("system_unvalid") );
+			}
+
+			String[] addresss = xxlJobGroup.getAddressList().split(",");
+			for (String item: addresss) {
+				if (item==null || item.trim().length()==0) {
+					return new ReturnT<String>(500, I18nUtil.getString("jobgroup_field_registryList_unvalid") );
+				}
+			}
+		}
+
+		// process
+		xxlJobGroup.setUpdateTime(new Date());
+
+		int ret = xxlJobGroupDao.save(xxlJobGroup);
+		return (ret>0)?ReturnT.SUCCESS:ReturnT.FAIL;
+	}
+
+	@RequestMapping("/update")
+	@ResponseBody
+	public ReturnT<String> update(XxlJobGroup xxlJobGroup){
+		// valid
+		if (xxlJobGroup.getAppname()==null || xxlJobGroup.getAppname().trim().length()==0) {
+			return new ReturnT<String>(500, (I18nUtil.getString("system_please_input")+"AppName") );
+		}
+		if (xxlJobGroup.getAppname().length()<4 || xxlJobGroup.getAppname().length()>64) {
+			return new ReturnT<String>(500, I18nUtil.getString("jobgroup_field_appname_length") );
+		}
+		if (xxlJobGroup.getTitle()==null || xxlJobGroup.getTitle().trim().length()==0) {
+			return new ReturnT<String>(500, (I18nUtil.getString("system_please_input") + I18nUtil.getString("jobgroup_field_title")) );
+		}
+		if (xxlJobGroup.getAddressType() == 0) {
+			// 0=自动注册
+			List<String> registryList = findRegistryByAppName(xxlJobGroup.getAppname());
+			String addressListStr = null;
+			if (registryList!=null && !registryList.isEmpty()) {
+				Collections.sort(registryList);
+				addressListStr = "";
+				for (String item:registryList) {
+					addressListStr += item + ",";
+				}
+				addressListStr = addressListStr.substring(0, addressListStr.length()-1);
+			}
+			xxlJobGroup.setAddressList(addressListStr);
+		} else {
+			// 1=手动录入
+			if (xxlJobGroup.getAddressList()==null || xxlJobGroup.getAddressList().trim().length()==0) {
+				return new ReturnT<String>(500, I18nUtil.getString("jobgroup_field_addressType_limit") );
+			}
+			String[] addresss = xxlJobGroup.getAddressList().split(",");
+			for (String item: addresss) {
+				if (item==null || item.trim().length()==0) {
+					return new ReturnT<String>(500, I18nUtil.getString("jobgroup_field_registryList_unvalid") );
+				}
+			}
+		}
+
+		// process
+		xxlJobGroup.setUpdateTime(new Date());
+
+		int ret = xxlJobGroupDao.update(xxlJobGroup);
+		return (ret>0)?ReturnT.SUCCESS:ReturnT.FAIL;
+	}
+
+	private List<String> findRegistryByAppName(String appnameParam){
+		HashMap<String, List<String>> appAddressMap = new HashMap<String, List<String>>();
+		List<XxlJobRegistry> list = xxlJobRegistryDao.findAll(RegistryConfig.DEAD_TIMEOUT, new Date());
+		if (list != null) {
+			for (XxlJobRegistry item: list) {
+				if (RegistryConfig.RegistType.EXECUTOR.name().equals(item.getRegistryGroup())) {
+					String appname = item.getRegistryKey();
+					List<String> registryList = appAddressMap.get(appname);
+					if (registryList == null) {
+						registryList = new ArrayList<String>();
+					}
+
+					if (!registryList.contains(item.getRegistryValue())) {
+						registryList.add(item.getRegistryValue());
+					}
+					appAddressMap.put(appname, registryList);
+				}
+			}
+		}
+		return appAddressMap.get(appnameParam);
+	}
+
+	@RequestMapping("/remove")
+	@ResponseBody
+	public ReturnT<String> remove(int id){
+
+		// valid
+		int count = xxlJobInfoDao.pageListCount(0, 10, id, -1,  null, null, null);
+		if (count > 0) {
+			return new ReturnT<String>(500, I18nUtil.getString("jobgroup_del_limit_0") );
+		}
+
+		List<XxlJobGroup> allList = xxlJobGroupDao.findAll();
+		if (allList.size() == 1) {
+			return new ReturnT<String>(500, I18nUtil.getString("jobgroup_del_limit_1") );
+		}
+
+		int ret = xxlJobGroupDao.remove(id);
+		return (ret>0)?ReturnT.SUCCESS:ReturnT.FAIL;
+	}
+
+	@RequestMapping("/loadById")
+	@ResponseBody
+	public ReturnT<XxlJobGroup> loadById(int id){
+		XxlJobGroup jobGroup = xxlJobGroupDao.load(id);
+		return jobGroup!=null?new ReturnT<XxlJobGroup>(jobGroup):new ReturnT<XxlJobGroup>(ReturnT.FAIL_CODE, null);
+	}
+
+}

roncoo-education-app-job/src/main/java/com/xxl/job/admin/controller/JobInfoController.java

+package com.xxl.job.admin.controller;
+
+import com.xxl.job.admin.core.cron.CronExpression;
+import com.xxl.job.admin.core.exception.XxlJobException;
+import com.xxl.job.admin.core.model.XxlJobGroup;
+import com.xxl.job.admin.core.model.XxlJobInfo;
+import com.xxl.job.admin.core.model.XxlJobUser;
+import com.xxl.job.admin.core.route.ExecutorRouteStrategyEnum;
+import com.xxl.job.admin.core.scheduler.MisfireStrategyEnum;
+import com.xxl.job.admin.core.scheduler.ScheduleTypeEnum;
+import com.xxl.job.admin.core.thread.JobScheduleHelper;
+import com.xxl.job.admin.core.thread.JobTriggerPoolHelper;
+import com.xxl.job.admin.core.trigger.TriggerTypeEnum;
+import com.xxl.job.admin.core.util.I18nUtil;
+import com.xxl.job.admin.dao.XxlJobGroupDao;
+import com.xxl.job.admin.service.LoginService;
+import com.xxl.job.admin.service.XxlJobService;
+import com.xxl.job.core.biz.model.ReturnT;
+import com.xxl.job.core.enums.ExecutorBlockStrategyEnum;
+import com.xxl.job.core.glue.GlueTypeEnum;
+import com.xxl.job.core.util.DateUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.text.ParseException;
+import java.util.*;
+
+/**
+ * index controller
+ * @author xuxueli 2015-12-19 16:13:16
+ */
+@Controller
+@RequestMapping("/jobinfo")
+public class JobInfoController {
+	private static Logger logger = LoggerFactory.getLogger(JobInfoController.class);
+
+	@Resource
+	private XxlJobGroupDao xxlJobGroupDao;
+	@Resource
+	private XxlJobService xxlJobService;
+	
+	@RequestMapping
+	public String index(HttpServletRequest request, Model model, @RequestParam(required = false, defaultValue = "-1") int jobGroup) {
+
+		// 枚举-字典
+		model.addAttribute("ExecutorRouteStrategyEnum", ExecutorRouteStrategyEnum.values());	    // 路由策略-列表
+		model.addAttribute("GlueTypeEnum", GlueTypeEnum.values());								// Glue类型-字典
+		model.addAttribute("ExecutorBlockStrategyEnum", ExecutorBlockStrategyEnum.values());	    // 阻塞处理策略-字典
+		model.addAttribute("ScheduleTypeEnum", ScheduleTypeEnum.values());	    				// 调度类型
+		model.addAttribute("MisfireStrategyEnum", MisfireStrategyEnum.values());	    			// 调度过期策略
+
+		// 执行器列表
+		List<XxlJobGroup> jobGroupList_all =  xxlJobGroupDao.findAll();
+
+		// filter group
+		List<XxlJobGroup> jobGroupList = filterJobGroupByRole(request, jobGroupList_all);
+		if (jobGroupList==null || jobGroupList.size()==0) {
+			throw new XxlJobException(I18nUtil.getString("jobgroup_empty"));
+		}
+
+		model.addAttribute("JobGroupList", jobGroupList);
+		model.addAttribute("jobGroup", jobGroup);
+
+		return "jobinfo/jobinfo.index";
+	}
+
+	public static List<XxlJobGroup> filterJobGroupByRole(HttpServletRequest request, List<XxlJobGroup> jobGroupList_all){
+		List<XxlJobGroup> jobGroupList = new ArrayList<>();
+		if (jobGroupList_all!=null && jobGroupList_all.size()>0) {
+			XxlJobUser loginUser = (XxlJobUser) request.getAttribute(LoginService.LOGIN_IDENTITY_KEY);
+			if (loginUser.getRole() == 1) {
+				jobGroupList = jobGroupList_all;
+			} else {
+				List<String> groupIdStrs = new ArrayList<>();
+				if (loginUser.getPermission()!=null && loginUser.getPermission().trim().length()>0) {
+					groupIdStrs = Arrays.asList(loginUser.getPermission().trim().split(","));
+				}
+				for (XxlJobGroup groupItem:jobGroupList_all) {
+					if (groupIdStrs.contains(String.valueOf(groupItem.getId()))) {
+						jobGroupList.add(groupItem);
+					}
+				}
+			}
+		}
+		return jobGroupList;
+	}
+	public static void validPermission(HttpServletRequest request, int jobGroup) {
+		XxlJobUser loginUser = (XxlJobUser) request.getAttribute(LoginService.LOGIN_IDENTITY_KEY);
+		if (!loginUser.validPermission(jobGroup)) {
+			throw new RuntimeException(I18nUtil.getString("system_permission_limit") + "[username="+ loginUser.getUsername() +"]");
+		}
+	}
+	
+	@RequestMapping("/pageList")
+	@ResponseBody
+	public Map<String, Object> pageList(@RequestParam(required = false, defaultValue = "0") int start,  
+			@RequestParam(required = false, defaultValue = "10") int length,
+			int jobGroup, int triggerStatus, String jobDesc, String executorHandler, String author) {
+		
+		return xxlJobService.pageList(start, length, jobGroup, triggerStatus, jobDesc, executorHandler, author);
+	}
+	
+	@RequestMapping("/add")
+	@ResponseBody
+	public ReturnT<String> add(XxlJobInfo jobInfo) {
+		return xxlJobService.add(jobInfo);
+	}
+	
+	@RequestMapping("/update")
+	@ResponseBody
+	public ReturnT<String> update(XxlJobInfo jobInfo) {
+		return xxlJobService.update(jobInfo);
+	}
+	
+	@RequestMapping("/remove")
+	@ResponseBody
+	public ReturnT<String> remove(int id) {
+		return xxlJobService.remove(id);
+	}
+	
+	@RequestMapping("/stop")
+	@ResponseBody
+	public ReturnT<String> pause(int id) {
+		return xxlJobService.stop(id);
+	}
+	
+	@RequestMapping("/start")
+	@ResponseBody
+	public ReturnT<String> start(int id) {
+		return xxlJobService.start(id);
+	}
+	
+	@RequestMapping("/trigger")
+	@ResponseBody
+	//@PermissionLimit(limit = false)
+	public ReturnT<String> triggerJob(int id, String executorParam, String addressList) {
+		// force cover job param
+		if (executorParam == null) {
+			executorParam = "";
+		}
+
+		JobTriggerPoolHelper.trigger(id, TriggerTypeEnum.MANUAL, -1, null, executorParam, addressList);
+		return ReturnT.SUCCESS;
+	}
+
+	@RequestMapping("/nextTriggerTime")
+	@ResponseBody
+	public ReturnT<List<String>> nextTriggerTime(String scheduleType, String scheduleConf) {
+
+		XxlJobInfo paramXxlJobInfo = new XxlJobInfo();
+		paramXxlJobInfo.setScheduleType(scheduleType);
+		paramXxlJobInfo.setScheduleConf(scheduleConf);
+
+		List<String> result = new ArrayList<>();
+		try {
+			Date lastTime = new Date();
+			for (int i = 0; i < 5; i++) {
+				lastTime = JobScheduleHelper.generateNextValidTime(paramXxlJobInfo, lastTime);
+				if (lastTime != null) {
+					result.add(DateUtil.formatDateTime(lastTime));
+				} else {
+					break;
+				}
+			}
+		} catch (Exception e) {
+			logger.error(e.getMessage(), e);
+			return new ReturnT<List<String>>(ReturnT.FAIL_CODE, (I18nUtil.getString("schedule_type")+I18nUtil.getString("system_unvalid")) + e.getMessage());
+		}
+		return new ReturnT<List<String>>(result);
+
+	}
+	
+}

roncoo-education-app-job/src/main/java/com/xxl/job/admin/controller/JobLogController.java

+package com.xxl.job.admin.controller;
+
+import com.xxl.job.admin.core.exception.XxlJobException;
+import com.xxl.job.admin.core.complete.XxlJobCompleter;
+import com.xxl.job.admin.core.model.XxlJobGroup;
+import com.xxl.job.admin.core.model.XxlJobInfo;
+import com.xxl.job.admin.core.model.XxlJobLog;
+import com.xxl.job.admin.core.scheduler.XxlJobScheduler;
+import com.xxl.job.admin.core.util.I18nUtil;
+import com.xxl.job.admin.dao.XxlJobGroupDao;
+import com.xxl.job.admin.dao.XxlJobInfoDao;
+import com.xxl.job.admin.dao.XxlJobLogDao;
+import com.xxl.job.core.biz.ExecutorBiz;
+import com.xxl.job.core.biz.model.KillParam;
+import com.xxl.job.core.biz.model.LogParam;
+import com.xxl.job.core.biz.model.LogResult;
+import com.xxl.job.core.biz.model.ReturnT;
+import com.xxl.job.core.util.DateUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * index controller
+ * @author xuxueli 2015-12-19 16:13:16
+ */
+@Controller
+@RequestMapping("/joblog")
+public class JobLogController {
+	private static Logger logger = LoggerFactory.getLogger(JobLogController.class);
+
+	@Resource
+	private XxlJobGroupDao xxlJobGroupDao;
+	@Resource
+	public XxlJobInfoDao xxlJobInfoDao;
+	@Resource
+	public XxlJobLogDao xxlJobLogDao;
+
+	@RequestMapping
+	public String index(HttpServletRequest request, Model model, @RequestParam(required = false, defaultValue = "0") Integer jobId) {
+
+		// 执行器列表
+		List<XxlJobGroup> jobGroupList_all =  xxlJobGroupDao.findAll();
+
+		// filter group
+		List<XxlJobGroup> jobGroupList = JobInfoController.filterJobGroupByRole(request, jobGroupList_all);
+		if (jobGroupList==null || jobGroupList.size()==0) {
+			throw new XxlJobException(I18nUtil.getString("jobgroup_empty"));
+		}
+
+		model.addAttribute("JobGroupList", jobGroupList);
+
+		// 任务
+		if (jobId > 0) {
+			XxlJobInfo jobInfo = xxlJobInfoDao.loadById(jobId);
+			if (jobInfo == null) {
+				throw new RuntimeException(I18nUtil.getString("jobinfo_field_id") + I18nUtil.getString("system_unvalid"));
+			}
+
+			model.addAttribute("jobInfo", jobInfo);
+
+			// valid permission
+			JobInfoController.validPermission(request, jobInfo.getJobGroup());
+		}
+
+		return "joblog/joblog.index";
+	}
+
+	@RequestMapping("/getJobsByGroup")
+	@ResponseBody
+	public ReturnT<List<XxlJobInfo>> getJobsByGroup(int jobGroup){
+		List<XxlJobInfo> list = xxlJobInfoDao.getJobsByGroup(jobGroup);
+		return new ReturnT<List<XxlJobInfo>>(list);
+	}
+	
+	@RequestMapping("/pageList")
+	@ResponseBody
+	public Map<String, Object> pageList(HttpServletRequest request,
+										@RequestParam(required = false, defaultValue = "0") int start,
+										@RequestParam(required = false, defaultValue = "10") int length,
+										int jobGroup, int jobId, int logStatus, String filterTime) {
+
+		// valid permission
+		JobInfoController.validPermission(request, jobGroup);	// 仅管理员支持查询全部；普通用户仅支持查询有权限的 jobGroup
+		
+		// parse param
+		Date triggerTimeStart = null;
+		Date triggerTimeEnd = null;
+		if (filterTime!=null && filterTime.trim().length()>0) {
+			String[] temp = filterTime.split(" - ");
+			if (temp.length == 2) {
+				triggerTimeStart = DateUtil.parseDateTime(temp[0]);
+				triggerTimeEnd = DateUtil.parseDateTime(temp[1]);
+			}
+		}
+		
+		// page query
+		List<XxlJobLog> list = xxlJobLogDao.pageList(start, length, jobGroup, jobId, triggerTimeStart, triggerTimeEnd, logStatus);
+		int list_count = xxlJobLogDao.pageListCount(start, length, jobGroup, jobId, triggerTimeStart, triggerTimeEnd, logStatus);
+		
+		// package result
+		Map<String, Object> maps = new HashMap<String, Object>();
+	    maps.put("recordsTotal", list_count);		// 总记录数
+	    maps.put("recordsFiltered", list_count);	// 过滤后的总记录数
+	    maps.put("data", list);  					// 分页列表
+		return maps;
+	}
+
+	@RequestMapping("/logDetailPage")
+	public String logDetailPage(int id, Model model){
+
+		// base check
+		ReturnT<String> logStatue = ReturnT.SUCCESS;
+		XxlJobLog jobLog = xxlJobLogDao.load(id);
+		if (jobLog == null) {
+            throw new RuntimeException(I18nUtil.getString("joblog_logid_unvalid"));
+		}
+
+        model.addAttribute("triggerCode", jobLog.getTriggerCode());
+        model.addAttribute("handleCode", jobLog.getHandleCode());
+        model.addAttribute("executorAddress", jobLog.getExecutorAddress());
+        model.addAttribute("triggerTime", jobLog.getTriggerTime().getTime());
+        model.addAttribute("logId", jobLog.getId());
+		return "joblog/joblog.detail";
+	}
+
+	@RequestMapping("/logDetailCat")
+	@ResponseBody
+	public ReturnT<LogResult> logDetailCat(String executorAddress, long triggerTime, long logId, int fromLineNum){
+		try {
+			ExecutorBiz executorBiz = XxlJobScheduler.getExecutorBiz(executorAddress);
+			ReturnT<LogResult> logResult = executorBiz.log(new LogParam(triggerTime, logId, fromLineNum));
+
+			// is end
+            if (logResult.getContent()!=null && logResult.getContent().getFromLineNum() > logResult.getContent().getToLineNum()) {
+                XxlJobLog jobLog = xxlJobLogDao.load(logId);
+                if (jobLog.getHandleCode() > 0) {
+                    logResult.getContent().setEnd(true);
+                }
+            }
+
+			return logResult;
+		} catch (Exception e) {
+			logger.error(e.getMessage(), e);
+			return new ReturnT<LogResult>(ReturnT.FAIL_CODE, e.getMessage());
+		}
+	}
+
+	@RequestMapping("/logKill")
+	@ResponseBody
+	public ReturnT<String> logKill(int id){
+		// base check
+		XxlJobLog log = xxlJobLogDao.load(id);
+		XxlJobInfo jobInfo = xxlJobInfoDao.loadById(log.getJobId());
+		if (jobInfo==null) {
+			return new ReturnT<String>(500, I18nUtil.getString("jobinfo_glue_jobid_unvalid"));
+		}
+		if (ReturnT.SUCCESS_CODE != log.getTriggerCode()) {
+			return new ReturnT<String>(500, I18nUtil.getString("joblog_kill_log_limit"));
+		}
+
+		// request of kill
+		ReturnT<String> runResult = null;
+		try {
+			ExecutorBiz executorBiz = XxlJobScheduler.getExecutorBiz(log.getExecutorAddress());
+			runResult = executorBiz.kill(new KillParam(jobInfo.getId()));
+		} catch (Exception e) {
+			logger.error(e.getMessage(), e);
+			runResult = new ReturnT<String>(500, e.getMessage());
+		}
+
+		if (ReturnT.SUCCESS_CODE == runResult.getCode()) {
+			log.setHandleCode(ReturnT.FAIL_CODE);
+			log.setHandleMsg( I18nUtil.getString("joblog_kill_log_byman")+":" + (runResult.getMsg()!=null?runResult.getMsg():""));
+			log.setHandleTime(new Date());
+			XxlJobCompleter.updateHandleInfoAndFinish(log);
+			return new ReturnT<String>(runResult.getMsg());
+		} else {
+			return new ReturnT<String>(500, runResult.getMsg());
+		}
+	}
+
+	@RequestMapping("/clearLog")
+	@ResponseBody
+	public ReturnT<String> clearLog(int jobGroup, int jobId, int type){
+
+		Date clearBeforeTime = null;
+		int clearBeforeNum = 0;
+		if (type == 1) {
+			clearBeforeTime = DateUtil.addMonths(new Date(), -1);	// 清理一个月之前日志数据
+		} else if (type == 2) {
+			clearBeforeTime = DateUtil.addMonths(new Date(), -3);	// 清理三个月之前日志数据
+		} else if (type == 3) {
+			clearBeforeTime = DateUtil.addMonths(new Date(), -6);	// 清理六个月之前日志数据
+		} else if (type == 4) {
+			clearBeforeTime = DateUtil.addYears(new Date(), -1);	// 清理一年之前日志数据
+		} else if (type == 5) {
+			clearBeforeNum = 1000;		// 清理一千条以前日志数据
+		} else if (type == 6) {
+			clearBeforeNum = 10000;		// 清理一万条以前日志数据
+		} else if (type == 7) {
+			clearBeforeNum = 30000;		// 清理三万条以前日志数据
+		} else if (type == 8) {
+			clearBeforeNum = 100000;	// 清理十万条以前日志数据
+		} else if (type == 9) {
+			clearBeforeNum = 0;			// 清理所有日志数据
+		} else {
+			return new ReturnT<String>(ReturnT.FAIL_CODE, I18nUtil.getString("joblog_clean_type_unvalid"));
+		}
+
+		List<Long> logIds = null;
+		do {
+			logIds = xxlJobLogDao.findClearLogIds(jobGroup, jobId, clearBeforeTime, clearBeforeNum, 1000);
+			if (logIds!=null && logIds.size()>0) {
+				xxlJobLogDao.clearLog(logIds);
+			}
+		} while (logIds!=null && logIds.size()>0);
+
+		return ReturnT.SUCCESS;
+	}
+
+}

roncoo-education-app-job/src/main/java/com/xxl/job/admin/controller/UserController.java

+package com.xxl.job.admin.controller;
+
+import com.xxl.job.admin.controller.annotation.PermissionLimit;
+import com.xxl.job.admin.core.model.XxlJobGroup;
+import com.xxl.job.admin.core.model.XxlJobUser;
+import com.xxl.job.admin.core.util.I18nUtil;
+import com.xxl.job.admin.dao.XxlJobGroupDao;
+import com.xxl.job.admin.dao.XxlJobUserDao;
+import com.xxl.job.admin.service.LoginService;
+import com.xxl.job.core.biz.model.ReturnT;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.util.DigestUtils;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author xuxueli 2019-05-04 16:39:50
+ */
+@Controller
+@RequestMapping("/user")
+public class UserController {
+
+    @Resource
+    private XxlJobUserDao xxlJobUserDao;
+    @Resource
+    private XxlJobGroupDao xxlJobGroupDao;
+
+    @RequestMapping
+    @PermissionLimit(adminuser = true)
+    public String index(Model model) {
+
+        // 执行器列表
+        List<XxlJobGroup> groupList = xxlJobGroupDao.findAll();
+        model.addAttribute("groupList", groupList);
+
+        return "user/user.index";
+    }
+
+    @RequestMapping("/pageList")
+    @ResponseBody
+    @PermissionLimit(adminuser = true)
+    public Map<String, Object> pageList(@RequestParam(required = false, defaultValue = "0") int start,
+                                        @RequestParam(required = false, defaultValue = "10") int length,
+                                        String username, int role) {
+
+        // page list
+        List<XxlJobUser> list = xxlJobUserDao.pageList(start, length, username, role);
+        int list_count = xxlJobUserDao.pageListCount(start, length, username, role);
+
+        // filter
+        if (list!=null && list.size()>0) {
+            for (XxlJobUser item: list) {
+                item.setPassword(null);
+            }
+        }
+
+        // package result
+        Map<String, Object> maps = new HashMap<String, Object>();
+        maps.put("recordsTotal", list_count);		// 总记录数
+        maps.put("recordsFiltered", list_count);	// 过滤后的总记录数
+        maps.put("data", list);  					// 分页列表
+        return maps;
+    }
+
+    @RequestMapping("/add")
+    @ResponseBody
+    @PermissionLimit(adminuser = true)
+    public ReturnT<String> add(XxlJobUser xxlJobUser) {
+
+        // valid username
+        if (!StringUtils.hasText(xxlJobUser.getUsername())) {
+            return new ReturnT<String>(ReturnT.FAIL_CODE, I18nUtil.getString("system_please_input")+I18nUtil.getString("user_username") );
+        }
+        xxlJobUser.setUsername(xxlJobUser.getUsername().trim());
+        if (!(xxlJobUser.getUsername().length()>=4 && xxlJobUser.getUsername().length()<=20)) {
+            return new ReturnT<String>(ReturnT.FAIL_CODE, I18nUtil.getString("system_lengh_limit")+"[4-20]" );
+        }
+        // valid password
+        if (!StringUtils.hasText(xxlJobUser.getPassword())) {
+            return new ReturnT<String>(ReturnT.FAIL_CODE, I18nUtil.getString("system_please_input")+I18nUtil.getString("user_password") );
+        }
+        xxlJobUser.setPassword(xxlJobUser.getPassword().trim());
+        if (!(xxlJobUser.getPassword().length()>=4 && xxlJobUser.getPassword().length()<=20)) {
+            return new ReturnT<String>(ReturnT.FAIL_CODE, I18nUtil.getString("system_lengh_limit")+"[4-20]" );
+        }
+        // md5 password
+        xxlJobUser.setPassword(DigestUtils.md5DigestAsHex(xxlJobUser.getPassword().getBytes()));
+
+        // check repeat
+        XxlJobUser existUser = xxlJobUserDao.loadByUserName(xxlJobUser.getUsername());
+        if (existUser != null) {
+            return new ReturnT<String>(ReturnT.FAIL_CODE, I18nUtil.getString("user_username_repeat") );
+        }
+
+        // write
+        xxlJobUserDao.save(xxlJobUser);
+        return ReturnT.SUCCESS;
+    }
+
+    @RequestMapping("/update")
+    @ResponseBody
+    @PermissionLimit(adminuser = true)
+    public ReturnT<String> update(HttpServletRequest request, XxlJobUser xxlJobUser) {
+
+        // avoid opt login seft
+        XxlJobUser loginUser = (XxlJobUser) request.getAttribute(LoginService.LOGIN_IDENTITY_KEY);
+        if (loginUser.getUsername().equals(xxlJobUser.getUsername())) {
+            return new ReturnT<String>(ReturnT.FAIL.getCode(), I18nUtil.getString("user_update_loginuser_limit"));
+        }
+
+        // valid password
+        if (StringUtils.hasText(xxlJobUser.getPassword())) {
+            xxlJobUser.setPassword(xxlJobUser.getPassword().trim());
+            if (!(xxlJobUser.getPassword().length()>=4 && xxlJobUser.getPassword().length()<=20)) {
+                return new ReturnT<String>(ReturnT.FAIL_CODE, I18nUtil.getString("system_lengh_limit")+"[4-20]" );
+            }
+            // md5 password
+            xxlJobUser.setPassword(DigestUtils.md5DigestAsHex(xxlJobUser.getPassword().getBytes()));
+        } else {
+            xxlJobUser.setPassword(null);
+        }
+
+        // write
+        xxlJobUserDao.update(xxlJobUser);
+        return ReturnT.SUCCESS;
+    }
+
+    @RequestMapping("/remove")
+    @ResponseBody
+    @PermissionLimit(adminuser = true)
+    public ReturnT<String> remove(HttpServletRequest request, int id) {
+
+        // avoid opt login seft
+        XxlJobUser loginUser = (XxlJobUser) request.getAttribute(LoginService.LOGIN_IDENTITY_KEY);
+        if (loginUser.getId() == id) {
+            return new ReturnT<String>(ReturnT.FAIL.getCode(), I18nUtil.getString("user_update_loginuser_limit"));
+        }
+
+        xxlJobUserDao.delete(id);
+        return ReturnT.SUCCESS;
+    }
+
+    @RequestMapping("/updatePwd")
+    @ResponseBody
+    public ReturnT<String> updatePwd(HttpServletRequest request, String password){
+
+        // valid password
+        if (password==null || password.trim().length()==0){
+            return new ReturnT<String>(ReturnT.FAIL.getCode(), "密码不可为空");
+        }
+        password = password.trim();
+        if (!(password.length()>=4 && password.length()<=20)) {
+            return new ReturnT<String>(ReturnT.FAIL_CODE, I18nUtil.getString("system_lengh_limit")+"[4-20]" );
+        }
+
+        // md5 password
+        String md5Password = DigestUtils.md5DigestAsHex(password.getBytes());
+
+        // update pwd
+        XxlJobUser loginUser = (XxlJobUser) request.getAttribute(LoginService.LOGIN_IDENTITY_KEY);
+
+        // do write
+        XxlJobUser existUser = xxlJobUserDao.loadByUserName(loginUser.getUsername());
+        existUser.setPassword(md5Password);
+        xxlJobUserDao.update(existUser);
+
+        return ReturnT.SUCCESS;
+    }
+
+}

roncoo-education-app-job/src/main/java/com/xxl/job/admin/controller/annotation/PermissionLimit.java

+package com.xxl.job.admin.controller.annotation;
+
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * 权限限制
+ * @author xuxueli 2015-12-12 18:29:02
+ */
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface PermissionLimit {
+	
+	/**
+	 * 登录拦截 (默认拦截)
+	 */
+	boolean limit() default true;
+
+	/**
+	 * 要求管理员权限
+	 *
+	 * @return
+	 */
+	boolean adminuser() default false;
+
+}
\ No newline at end of file

roncoo-education-app-job/src/main/java/com/xxl/job/admin/controller/interceptor/CookieInterceptor.java

+package com.xxl.job.admin.controller.interceptor;
+
+import com.xxl.job.admin.core.util.FtlUtil;
+import com.xxl.job.admin.core.util.I18nUtil;
+import org.springframework.stereotype.Component;
+import org.springframework.web.servlet.AsyncHandlerInterceptor;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.HashMap;
+
+/**
+ * push cookies to model as cookieMap
+ *
+ * @author xuxueli 2015-12-12 18:09:04
+ */
+@Component
+public class CookieInterceptor implements AsyncHandlerInterceptor {
+
+	@Override
+	public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler,
+			ModelAndView modelAndView) throws Exception {
+
+		// cookie
+		if (modelAndView!=null && request.getCookies()!=null && request.getCookies().length>0) {
+			HashMap<String, Cookie> cookieMap = new HashMap<String, Cookie>();
+			for (Cookie ck : request.getCookies()) {
+				cookieMap.put(ck.getName(), ck);
+			}
+			modelAndView.addObject("cookieMap", cookieMap);
+		}
+
+		// static method
+		if (modelAndView != null) {
+			modelAndView.addObject("I18nUtil", FtlUtil.generateStaticModel(I18nUtil.class.getName()));
+		}
+
+	}
+	
+}

roncoo-education-app-job/src/main/java/com/xxl/job/admin/controller/interceptor/PermissionInterceptor.java

+package com.xxl.job.admin.controller.interceptor;
+
+import com.xxl.job.admin.controller.annotation.PermissionLimit;
+import com.xxl.job.admin.core.model.XxlJobUser;
+import com.xxl.job.admin.core.util.I18nUtil;
+import com.xxl.job.admin.service.LoginService;
+import org.springframework.stereotype.Component;
+import org.springframework.web.method.HandlerMethod;
+import org.springframework.web.servlet.AsyncHandlerInterceptor;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * 权限拦截
+ *
+ * @author xuxueli 2015-12-12 18:09:04
+ */
+@Component
+public class PermissionInterceptor implements AsyncHandlerInterceptor {
+
+	@Resource
+	private LoginService loginService;
+
+	@Override
+	public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
+		
+		if (!(handler instanceof HandlerMethod)) {
+			return true;	// proceed with the next interceptor
+		}
+
+		// if need login
+		boolean needLogin = true;
+		boolean needAdminuser = false;
+		HandlerMethod method = (HandlerMethod)handler;
+		PermissionLimit permission = method.getMethodAnnotation(PermissionLimit.class);
+		if (permission!=null) {
+			needLogin = permission.limit();
+			needAdminuser = permission.adminuser();
+		}
+
+		if (needLogin) {
+			XxlJobUser loginUser = loginService.ifLogin(request, response);
+			if (loginUser == null) {
+				response.setStatus(302);
+				response.setHeader("location", request.getContextPath()+"/toLogin");
+				return false;
+			}
+			if (needAdminuser && loginUser.getRole()!=1) {
+				throw new RuntimeException(I18nUtil.getString("system_permission_limit"));
+			}
+			request.setAttribute(LoginService.LOGIN_IDENTITY_KEY, loginUser);
+		}
+
+		return true;	// proceed with the next interceptor
+	}
+	
+}

roncoo-education-app-job/src/main/java/com/xxl/job/admin/controller/interceptor/WebMvcConfig.java

+package com.xxl.job.admin.controller.interceptor;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+import javax.annotation.Resource;
+
+/**
+ * web mvc config
+ *
+ * @author xuxueli 2018-04-02 20:48:20
+ */
+@Configuration
+public class WebMvcConfig implements WebMvcConfigurer {
+
+    @Resource
+    private PermissionInterceptor permissionInterceptor;
+    @Resource
+    private CookieInterceptor cookieInterceptor;
+
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+        registry.addInterceptor(permissionInterceptor).addPathPatterns("/**");
+        registry.addInterceptor(cookieInterceptor).addPathPatterns("/**");
+    }
+
+}
\ No newline at end of file

roncoo-education-app-job/src/main/java/com/xxl/job/admin/controller/resolver/WebExceptionResolver.java

+package com.xxl.job.admin.controller.resolver;
+
+import com.xxl.job.admin.core.exception.XxlJobException;
+import com.xxl.job.core.biz.model.ReturnT;
+import com.xxl.job.admin.core.util.JacksonUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.method.HandlerMethod;
+import org.springframework.web.servlet.HandlerExceptionResolver;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+/**
+ * common exception resolver
+ *
+ * @author xuxueli 2016-1-6 19:22:18
+ */
+@Component
+public class WebExceptionResolver implements HandlerExceptionResolver {
+	private static transient Logger logger = LoggerFactory.getLogger(WebExceptionResolver.class);
+
+	@Override
+	public ModelAndView resolveException(HttpServletRequest request,
+			HttpServletResponse response, Object handler, Exception ex) {
+
+		if (!(ex instanceof XxlJobException)) {
+			logger.error("WebExceptionResolver:{}", ex);
+		}
+
+		// if json
+		boolean isJson = false;
+		if (handler instanceof HandlerMethod) {
+			HandlerMethod method = (HandlerMethod)handler;
+			ResponseBody responseBody = method.getMethodAnnotation(ResponseBody.class);
+			if (responseBody != null) {
+				isJson = true;
+			}
+		}
+
+		// error result
+		ReturnT<String> errorResult = new ReturnT<String>(ReturnT.FAIL_CODE, ex.toString().replaceAll("\n", "<br/>"));
+
+		// response
+		ModelAndView mv = new ModelAndView();
+		if (isJson) {
+			try {
+				response.setContentType("application/json;charset=utf-8");
+				response.getWriter().print(JacksonUtil.writeValueAsString(errorResult));
+			} catch (IOException e) {
+				logger.error(e.getMessage(), e);
+			}
+			return mv;
+		} else {
+
+			mv.addObject("exceptionMsg", errorResult.getMsg());
+			mv.setViewName("/common/common.exception");
+			return mv;
+		}
+	}
+	
+}
\ No newline at end of file

roncoo-education-app-job/src/main/java/com/xxl/job/admin/core/alarm/JobAlarm.java

+package com.xxl.job.admin.core.alarm;
+
+import com.xxl.job.admin.core.model.XxlJobInfo;
+import com.xxl.job.admin.core.model.XxlJobLog;
+
+/**
+ * @author xuxueli 2020-01-19
+ */
+public interface JobAlarm {
+
+    /**
+     * job alarm
+     *
+     * @param info
+     * @param jobLog
+     * @return
+     */
+    public boolean doAlarm(XxlJobInfo info, XxlJobLog jobLog);
+
+}

roncoo-education-app-job/src/main/java/com/xxl/job/admin/core/alarm/JobAlarmer.java

+package com.xxl.job.admin.core.alarm;
+
+import com.xxl.job.admin.core.model.XxlJobInfo;
+import com.xxl.job.admin.core.model.XxlJobLog;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+@Component
+public class JobAlarmer implements ApplicationContextAware, InitializingBean {
+    private static Logger logger = LoggerFactory.getLogger(JobAlarmer.class);
+
+    private ApplicationContext applicationContext;
+    private List<JobAlarm> jobAlarmList;
+
+    @Override
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+        this.applicationContext = applicationContext;
+    }
+
+    @Override
+    public void afterPropertiesSet() throws Exception {
+        Map<String, JobAlarm> serviceBeanMap = applicationContext.getBeansOfType(JobAlarm.class);
+        if (serviceBeanMap != null && serviceBeanMap.size() > 0) {
+            jobAlarmList = new ArrayList<JobAlarm>(serviceBeanMap.values());
+        }
+    }
+
+    /**
+     * job alarm
+     *
+     * @param info
+     * @param jobLog
+     * @return
+     */
+    public boolean alarm(XxlJobInfo info, XxlJobLog jobLog) {
+
+        boolean result = false;
+        if (jobAlarmList!=null && jobAlarmList.size()>0) {
+            result = true;  // success means all-success
+            for (JobAlarm alarm: jobAlarmList) {
+                boolean resultItem = false;
+                try {
+                    resultItem = alarm.doAlarm(info, jobLog);
+                } catch (Exception e) {
+                    logger.error(e.getMessage(), e);
+                }
+                if (!resultItem) {
+                    result = false;
+                }
+            }
+        }
+
+        return result;
+    }
+
+}

roncoo-education-app-job/src/main/java/com/xxl/job/admin/core/alarm/impl/EmailJobAlarm.java

+package com.xxl.job.admin.core.alarm.impl;
+
+import com.xxl.job.admin.core.alarm.JobAlarm;
+import com.xxl.job.admin.core.conf.XxlJobAdminConfig;
+import com.xxl.job.admin.core.model.XxlJobGroup;
+import com.xxl.job.admin.core.model.XxlJobInfo;
+import com.xxl.job.admin.core.model.XxlJobLog;
+import com.xxl.job.admin.core.util.I18nUtil;
+import com.xxl.job.core.biz.model.ReturnT;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.mail.javamail.MimeMessageHelper;
+import org.springframework.stereotype.Component;
+
+import javax.mail.internet.MimeMessage;
+import java.text.MessageFormat;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * job alarm by email
+ *
+ * @author xuxueli 2020-01-19
+ */
+@Component
+public class EmailJobAlarm implements JobAlarm {
+    private static Logger logger = LoggerFactory.getLogger(EmailJobAlarm.class);
+
+    /**
+     * fail alarm
+     *
+     * @param jobLog
+     */
+    @Override
+    public boolean doAlarm(XxlJobInfo info, XxlJobLog jobLog){
+        boolean alarmResult = true;
+
+        // send monitor email
+        if (info!=null && info.getAlarmEmail()!=null && info.getAlarmEmail().trim().length()>0) {
+
+            // alarmContent
+            String alarmContent = "Alarm Job LogId=" + jobLog.getId();
+            if (jobLog.getTriggerCode() != ReturnT.SUCCESS_CODE) {
+                alarmContent += "<br>TriggerMsg=<br>" + jobLog.getTriggerMsg();
+            }
+            if (jobLog.getHandleCode()>0 && jobLog.getHandleCode() != ReturnT.SUCCESS_CODE) {
+                alarmContent += "<br>HandleCode=" + jobLog.getHandleMsg();
+            }
+
+            // email info
+            XxlJobGroup group = XxlJobAdminConfig.getAdminConfig().getXxlJobGroupDao().load(Integer.valueOf(info.getJobGroup()));
+            String personal = I18nUtil.getString("admin_name_full");
+            String title = I18nUtil.getString("jobconf_monitor");
+            String content = MessageFormat.format(loadEmailJobAlarmTemplate(),
+                    group!=null?group.getTitle():"null",
+                    info.getId(),
+                    info.getJobDesc(),
+                    alarmContent);
+
+            Set<String> emailSet = new HashSet<String>(Arrays.asList(info.getAlarmEmail().split(",")));
+            for (String email: emailSet) {
+
+                // make mail
+                try {
+                    MimeMessage mimeMessage = XxlJobAdminConfig.getAdminConfig().getMailSender().createMimeMessage();
+
+                    MimeMessageHelper helper = new MimeMessageHelper(mimeMessage, true);
+                    helper.setFrom(XxlJobAdminConfig.getAdminConfig().getEmailFrom(), personal);
+                    helper.setTo(email);
+                    helper.setSubject(title);
+                    helper.setText(content, true);
+
+                    XxlJobAdminConfig.getAdminConfig().getMailSender().send(mimeMessage);
+                } catch (Exception e) {
+                    logger.error(">>>>>>>>>>> xxl-job, job fail alarm email send error, JobLogId:{}", jobLog.getId(), e);
+
+                    alarmResult = false;
+                }
+
+            }
+        }
+
+        return alarmResult;
+    }
+
+    /**
+     * load email job alarm template
+     *
+     * @return
+     */
+    private static final String loadEmailJobAlarmTemplate(){
+        String mailBodyTemplate = "<h5>" + I18nUtil.getString("jobconf_monitor_detail") + "：</span>" +
+                "<table border=\"1\" cellpadding=\"3\" style=\"border-collapse:collapse; width:80%;\" >\n" +
+                "   <thead style=\"font-weight: bold;color: #ffffff;background-color: #ff8c00;\" >" +
+                "      <tr>\n" +
+                "         <td width=\"20%\" >"+ I18nUtil.getString("jobinfo_field_jobgroup") +"</td>\n" +
+                "         <td width=\"10%\" >"+ I18nUtil.getString("jobinfo_field_id") +"</td>\n" +
+                "         <td width=\"20%\" >"+ I18nUtil.getString("jobinfo_field_jobdesc") +"</td>\n" +
+                "         <td width=\"10%\" >"+ I18nUtil.getString("jobconf_monitor_alarm_title") +"</td>\n" +
+                "         <td width=\"40%\" >"+ I18nUtil.getString("jobconf_monitor_alarm_content") +"</td>\n" +
+                "      </tr>\n" +
+                "   </thead>\n" +
+                "   <tbody>\n" +
+                "      <tr>\n" +
+                "         <td>{0}</td>\n" +
+                "         <td>{1}</td>\n" +
+                "         <td>{2}</td>\n" +
+                "         <td>"+ I18nUtil.getString("jobconf_monitor_alarm_type") +"</td>\n" +
+                "         <td>{3}</td>\n" +
+                "      </tr>\n" +
+                "   </tbody>\n" +
+                "</table>";
+
+        return mailBodyTemplate;
+    }
+
+}

roncoo-education-app-job/src/main/java/com/xxl/job/admin/core/complete/XxlJobCompleter.java

+package com.xxl.job.admin.core.complete;
+
+import com.xxl.job.admin.core.conf.XxlJobAdminConfig;
+import com.xxl.job.admin.core.model.XxlJobInfo;
+import com.xxl.job.admin.core.model.XxlJobLog;
+import com.xxl.job.admin.core.thread.JobTriggerPoolHelper;
+import com.xxl.job.admin.core.trigger.TriggerTypeEnum;
+import com.xxl.job.admin.core.util.I18nUtil;
+import com.xxl.job.core.biz.model.ReturnT;
+import com.xxl.job.core.context.XxlJobContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.text.MessageFormat;
+
+/**
+ * @author xuxueli 2020-10-30 20:43:10
+ */
+public class XxlJobCompleter {
+    private static Logger logger = LoggerFactory.getLogger(XxlJobCompleter.class);
+
+    /**
+     * common fresh handle entrance (limit only once)
+     *
+     * @param xxlJobLog
+     * @return
+     */
+    public static int updateHandleInfoAndFinish(XxlJobLog xxlJobLog) {
+
+        // finish
+        finishJob(xxlJobLog);
+
+        // text最大64kb 避免长度过长
+        if (xxlJobLog.getHandleMsg().length() > 15000) {
+            xxlJobLog.setHandleMsg( xxlJobLog.getHandleMsg().substring(0, 15000) );
+        }
+
+        // fresh handle
+        return XxlJobAdminConfig.getAdminConfig().getXxlJobLogDao().updateHandleInfo(xxlJobLog);
+    }
+
+
+    /**
+     * do somethind to finish job
+     */
+    private static void finishJob(XxlJobLog xxlJobLog){
+
+        // 1、handle success, to trigger child job
+        String triggerChildMsg = null;
+        if (XxlJobContext.HANDLE_CODE_SUCCESS == xxlJobLog.getHandleCode()) {
+            XxlJobInfo xxlJobInfo = XxlJobAdminConfig.getAdminConfig().getXxlJobInfoDao().loadById(xxlJobLog.getJobId());
+            if (xxlJobInfo!=null && xxlJobInfo.getChildJobId()!=null && xxlJobInfo.getChildJobId().trim().length()>0) {
+                triggerChildMsg = "<br><br><span style=\"color:#00c0ef;\" > >>>>>>>>>>>"+ I18nUtil.getString("jobconf_trigger_child_run") +"<<<<<<<<<<< </span><br>";
+
+                String[] childJobIds = xxlJobInfo.getChildJobId().split(",");
+                for (int i = 0; i < childJobIds.length; i++) {
+                    int childJobId = (childJobIds[i]!=null && childJobIds[i].trim().length()>0 && isNumeric(childJobIds[i]))?Integer.valueOf(childJobIds[i]):-1;
+                    if (childJobId > 0) {
+
+                        JobTriggerPoolHelper.trigger(childJobId, TriggerTypeEnum.PARENT, -1, null, null, null);
+                        ReturnT<String> triggerChildResult = ReturnT.SUCCESS;
+
+                        // add msg
+                        triggerChildMsg += MessageFormat.format(I18nUtil.getString("jobconf_callback_child_msg1"),
+                                (i+1),
+                                childJobIds.length,
+                                childJobIds[i],
+                                (triggerChildResult.getCode()==ReturnT.SUCCESS_CODE?I18nUtil.getString("system_success"):I18nUtil.getString("system_fail")),
+                                triggerChildResult.getMsg());
+                    } else {
+                        triggerChildMsg += MessageFormat.format(I18nUtil.getString("jobconf_callback_child_msg2"),
+                                (i+1),
+                                childJobIds.length,
+                                childJobIds[i]);
+                    }
+                }
+
+            }
+        }
+
+        if (triggerChildMsg != null) {
+            xxlJobLog.setHandleMsg( xxlJobLog.getHandleMsg() + triggerChildMsg );
+        }
+
+        // 2、fix_delay trigger next
+        // on the way
+
+    }
+
+    private static boolean isNumeric(String str){
+        try {
+            int result = Integer.valueOf(str);
+            return true;
+        } catch (NumberFormatException e) {
+            return false;
+        }
+    }
+
+}

roncoo-education-app-job/src/main/java/com/xxl/job/admin/core/conf/XxlJobAdminConfig.java

+package com.xxl.job.admin.core.conf;
+
+import com.xxl.job.admin.core.alarm.JobAlarmer;
+import com.xxl.job.admin.core.scheduler.XxlJobScheduler;
+import com.xxl.job.admin.dao.*;
+import org.springframework.beans.factory.DisposableBean;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.mail.javamail.JavaMailSender;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import javax.sql.DataSource;
+import java.util.Arrays;
+
+/**
+ * xxl-job config
+ *
+ * @author xuxueli 2017-04-28
+ */
+
+@Component
+public class XxlJobAdminConfig implements InitializingBean, DisposableBean {
+
+    private static XxlJobAdminConfig adminConfig = null;
+
+    public static XxlJobAdminConfig getAdminConfig() {
+        return adminConfig;
+    }
+
+
+    // ---------------------- XxlJobScheduler ----------------------
+
+    private XxlJobScheduler xxlJobScheduler;
+
+    @Override
+    public void afterPropertiesSet() throws Exception {
+        adminConfig = this;
+
+        xxlJobScheduler = new XxlJobScheduler();
+        xxlJobScheduler.init();
+    }
+
+    @Override
+    public void destroy() throws Exception {
+        xxlJobScheduler.destroy();
+    }
+
+
+    // ---------------------- XxlJobScheduler ----------------------
+
+    // conf
+    @Value("${xxl.job.i18n}")
+    private String i18n;
+
+    @Value("${xxl.job.access-token}")
+    private String accessToken;
+
+    @Value("${spring.mail.from}")
+    private String emailFrom;
+
+    @Value("${xxl.job.triggerpool.fast.max}")
+    private int triggerPoolFastMax;
+
+    @Value("${xxl.job.triggerpool.slow.max}")
+    private int triggerPoolSlowMax;
+
+    @Value("${xxl.job.logretentiondays}")
+    private int logretentiondays;
+
+    // dao, service
+
+    @Resource
+    private XxlJobLogDao xxlJobLogDao;
+    @Resource
+    private XxlJobInfoDao xxlJobInfoDao;
+    @Resource
+    private XxlJobRegistryDao xxlJobRegistryDao;
+    @Resource
+    private XxlJobGroupDao xxlJobGroupDao;
+    @Resource
+    private XxlJobLogReportDao xxlJobLogReportDao;
+    @Resource
+    private JavaMailSender mailSender;
+    @Resource
+    private DataSource dataSource;
+    @Resource
+    private JobAlarmer jobAlarmer;
+
+
+    public String getI18n() {
+        if (!Arrays.asList("zh_CN", "zh_TC", "en").contains(i18n)) {
+            return "zh_CN";
+        }
+        return i18n;
+    }
+
+    public String getAccessToken() {
+        return accessToken;
+    }
+
+    public String getEmailFrom() {
+        return emailFrom;
+    }
+
+    public int getTriggerPoolFastMax() {
+        if (triggerPoolFastMax < 200) {
+            return 200;
+        }
+        return triggerPoolFastMax;
+    }
+
+    public int getTriggerPoolSlowMax() {
+        if (triggerPoolSlowMax < 100) {
+            return 100;
+        }
+        return triggerPoolSlowMax;
+    }
+
+    public int getLogretentiondays() {
+        if (logretentiondays < 7) {
+            return -1;  // Limit greater than or equal to 7, otherwise close
+        }
+        return logretentiondays;
+    }
+
+    public XxlJobLogDao getXxlJobLogDao() {
+        return xxlJobLogDao;
+    }
+
+    public XxlJobInfoDao getXxlJobInfoDao() {
+        return xxlJobInfoDao;
+    }
+
+    public XxlJobRegistryDao getXxlJobRegistryDao() {
+        return xxlJobRegistryDao;
+    }
+
+    public XxlJobGroupDao getXxlJobGroupDao() {
+        return xxlJobGroupDao;
+    }
+
+    public XxlJobLogReportDao getXxlJobLogReportDao() {
+        return xxlJobLogReportDao;
+    }
+
+    public JavaMailSender getMailSender() {
+        return mailSender;
+    }
+
+    public DataSource getDataSource() {
+        return dataSource;
+    }
+
+    public JobAlarmer getJobAlarmer() {
+        return jobAlarmer;
+    }
+
+}

roncoo-education-app-job/src/main/java/com/xxl/job/admin/core/exception/XxlJobException.java

+package com.xxl.job.admin.core.exception;
+
+/**
+ * @author xuxueli 2019-05-04 23:19:29
+ */
+public class XxlJobException extends RuntimeException {
+
+    public XxlJobException() {
+    }
+    public XxlJobException(String message) {
+        super(message);
+    }
+
+}

roncoo-education-app-job/src/main/java/com/xxl/job/admin/core/model/XxlJobGroup.java

+package com.xxl.job.admin.core.model;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Created by xuxueli on 16/9/30.
+ */
+public class XxlJobGroup {
+
+    private int id;
+    private String appname;
+    private String title;
+    private int addressType;        // 执行器地址类型：0=自动注册、1=手动录入
+    private String addressList;     // 执行器地址列表，多地址逗号分隔(手动录入)
+    private Date updateTime;
+
+    // registry list
+    private List<String> registryList;  // 执行器地址列表(系统注册)
+    public List<String> getRegistryList() {
+        if (addressList!=null && addressList.trim().length()>0) {
+            registryList = new ArrayList<String>(Arrays.asList(addressList.split(",")));
+        }
+        return registryList;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getAppname() {
+        return appname;
+    }
+
+    public void setAppname(String appname) {
+        this.appname = appname;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public int getAddressType() {
+        return addressType;
+    }
+
+    public void setAddressType(int addressType) {
+        this.addressType = addressType;
+    }
+
+    public String getAddressList() {
+        return addressList;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public void setAddressList(String addressList) {
+        this.addressList = addressList;
+    }
+
+}

roncoo-education-app-job/src/main/java/com/xxl/job/admin/core/model/XxlJobInfo.java

+package com.xxl.job.admin.core.model;
+
+import java.util.Date;
+
+/**
+ * xxl-job info
+ *
+ * @author xuxueli  2016-1-12 18:25:49
+ */
+public class XxlJobInfo {
+	
+	private int id;				// 主键ID
+	
+	private int jobGroup;		// 执行器主键ID
+	private String jobDesc;
+	
+	private Date addTime;
+	private Date updateTime;
+	
+	private String author;		// 负责人
+	private String alarmEmail;	// 报警邮件
+
+	private String scheduleType;			// 调度类型
+	private String scheduleConf;			// 调度配置，值含义取决于调度类型
+	private String misfireStrategy;			// 调度过期策略
+
+	private String executorRouteStrategy;	// 执行器路由策略
+	private String executorHandler;		    // 执行器，任务Handler名称
+	private String executorParam;		    // 执行器，任务参数
+	private String executorBlockStrategy;	// 阻塞处理策略
+	private int executorTimeout;     		// 任务执行超时时间，单位秒
+	private int executorFailRetryCount;		// 失败重试次数
+	
+	private String glueType;		// GLUE类型	#com.xxl.job.core.glue.GlueTypeEnum
+	private String glueSource;		// GLUE源代码
+	private String glueRemark;		// GLUE备注
+	private Date glueUpdatetime;	// GLUE更新时间
+
+	private String childJobId;		// 子任务ID，多个逗号分隔
+
+	private int triggerStatus;		// 调度状态：0-停止，1-运行
+	private long triggerLastTime;	// 上次调度时间
+	private long triggerNextTime;	// 下次调度时间
+
+
+	public int getId() {
+		return id;
+	}
+
+	public void setId(int id) {
+		this.id = id;
+	}
+
+	public int getJobGroup() {
+		return jobGroup;
+	}
+
+	public void setJobGroup(int jobGroup) {
+		this.jobGroup = jobGroup;
+	}
+
+	public String getJobDesc() {
+		return jobDesc;
+	}
+
+	public void setJobDesc(String jobDesc) {
+		this.jobDesc = jobDesc;
+	}
+
+	public Date getAddTime() {
+		return addTime;
+	}
+
+	public void setAddTime(Date addTime) {
+		this.addTime = addTime;
+	}
+
+	public Date getUpdateTime() {
+		return updateTime;
+	}
+
+	public void setUpdateTime(Date updateTime) {
+		this.updateTime = updateTime;
+	}
+
+	public String getAuthor() {
+		return author;
+	}
+
+	public void setAuthor(String author) {
+		this.author = author;
+	}
+
+	public String getAlarmEmail() {
+		return alarmEmail;
+	}
+
+	public void setAlarmEmail(String alarmEmail) {
+		this.alarmEmail = alarmEmail;
+	}
+
+	public String getScheduleType() {
+		return scheduleType;
+	}
+
+	public void setScheduleType(String scheduleType) {
+		this.scheduleType = scheduleType;
+	}
+
+	public String getScheduleConf() {
+		return scheduleConf;
+	}
+
+	public void setScheduleConf(String scheduleConf) {
+		this.scheduleConf = scheduleConf;
+	}
+
+	public String getMisfireStrategy() {
+		return misfireStrategy;
+	}
+
+	public void setMisfireStrategy(String misfireStrategy) {
+		this.misfireStrategy = misfireStrategy;
+	}
+
+	public String getExecutorRouteStrategy() {
+		return executorRouteStrategy;
+	}
+
+	public void setExecutorRouteStrategy(String executorRouteStrategy) {
+		this.executorRouteStrategy = executorRouteStrategy;
+	}
+
+	public String getExecutorHandler() {
+		return executorHandler;
+	}
+
+	public void setExecutorHandler(String executorHandler) {
+		this.executorHandler = executorHandler;
+	}
+
+	public String getExecutorParam() {
+		return executorParam;
+	}
+
+	public void setExecutorParam(String executorParam) {
+		this.executorParam = executorParam;
+	}
+
+	public String getExecutorBlockStrategy() {
+		return executorBlockStrategy;
+	}
+
+	public void setExecutorBlockStrategy(String executorBlockStrategy) {
+		this.executorBlockStrategy = executorBlockStrategy;
+	}
+
+	public int getExecutorTimeout() {
+		return executorTimeout;
+	}
+
+	public void setExecutorTimeout(int executorTimeout) {
+		this.executorTimeout = executorTimeout;
+	}
+
+	public int getExecutorFailRetryCount() {
+		return executorFailRetryCount;
+	}
+
+	public void setExecutorFailRetryCount(int executorFailRetryCount) {
+		this.executorFailRetryCount = executorFailRetryCount;
+	}
+
+	public String getGlueType() {
+		return glueType;
+	}
+
+	public void setGlueType(String glueType) {
+		this.glueType = glueType;
+	}
+
+	public String getGlueSource() {
+		return glueSource;
+	}
+
+	public void setGlueSource(String glueSource) {
+		this.glueSource = glueSource;
+	}
+
+	public String getGlueRemark() {
+		return glueRemark;
+	}
+
+	public void setGlueRemark(String glueRemark) {
+		this.glueRemark = glueRemark;
+	}
+
+	public Date getGlueUpdatetime() {
+		return glueUpdatetime;
+	}
+
+	public void setGlueUpdatetime(Date glueUpdatetime) {
+		this.glueUpdatetime = glueUpdatetime;
+	}
+
+	public String getChildJobId() {
+		return childJobId;
+	}
+
+	public void setChildJobId(String childJobId) {
+		this.childJobId = childJobId;
+	}
+
+	public int getTriggerStatus() {
+		return triggerStatus;
+	}
+
+	public void setTriggerStatus(int triggerStatus) {
+		this.triggerStatus = triggerStatus;
+	}
+
+	public long getTriggerLastTime() {
+		return triggerLastTime;
+	}
+
+	public void setTriggerLastTime(long triggerLastTime) {
+		this.triggerLastTime = triggerLastTime;
+	}
+
+	public long getTriggerNextTime() {
+		return triggerNextTime;
+	}
+
+	public void setTriggerNextTime(long triggerNextTime) {
+		this.triggerNextTime = triggerNextTime;
+	}
+}

roncoo-education-app-job/src/main/java/com/xxl/job/admin/core/model/XxlJobLog.java

+package com.xxl.job.admin.core.model;
+
+import java.util.Date;
+
+/**
+ * xxl-job log, used to track trigger process
+ * @author xuxueli  2015-12-19 23:19:09
+ */
+public class XxlJobLog {
+	
+	private long id;
+	
+	// job info
+	private int jobGroup;
+	private int jobId;
+
+	// execute info
+	private String executorAddress;
+	private String executorHandler;
+	private String executorParam;
+	private String executorShardingParam;
+	private int executorFailRetryCount;
+	
+	// trigger info
+	private Date triggerTime;
+	private int triggerCode;
+	private String triggerMsg;
+	
+	// handle info
+	private Date handleTime;
+	private int handleCode;
+	private String handleMsg;
+
+	// alarm info
+	private int alarmStatus;
+
+	public long getId() {
+		return id;
+	}
+
+	public void setId(long id) {
+		this.id = id;
+	}
+
+	public int getJobGroup() {
+		return jobGroup;
+	}
+
+	public void setJobGroup(int jobGroup) {
+		this.jobGroup = jobGroup;
+	}
+
+	public int getJobId() {
+		return jobId;
+	}
+
+	public void setJobId(int jobId) {
+		this.jobId = jobId;
+	}
+
+	public String getExecutorAddress() {
+		return executorAddress;
+	}
+
+	public void setExecutorAddress(String executorAddress) {
+		this.executorAddress = executorAddress;
+	}
+
+	public String getExecutorHandler() {
+		return executorHandler;
+	}
+
+	public void setExecutorHandler(String executorHandler) {
+		this.executorHandler = executorHandler;
+	}
+
+	public String getExecutorParam() {
+		return executorParam;
+	}
+
+	public void setExecutorParam(String executorParam) {
+		this.executorParam = executorParam;
+	}
+
+	public String getExecutorShardingParam() {
+		return executorShardingParam;
+	}
+
+	public void setExecutorShardingParam(String executorShardingParam) {
+		this.executorShardingParam = executorShardingParam;
+	}
+
+	public int getExecutorFailRetryCount() {
+		return executorFailRetryCount;
+	}
+
+	public void setExecutorFailRetryCount(int executorFailRetryCount) {
+		this.executorFailRetryCount = executorFailRetryCount;
+	}
+
+	public Date getTriggerTime() {
+		return triggerTime;
+	}
+
+	public void setTriggerTime(Date triggerTime) {
+		this.triggerTime = triggerTime;
+	}
+
+	public int getTriggerCode() {
+		return triggerCode;
+	}
+
+	public void setTriggerCode(int triggerCode) {
+		this.triggerCode = triggerCode;
+	}
+
+	public String getTriggerMsg() {
+		return triggerMsg;
+	}
+
+	public void setTriggerMsg(String triggerMsg) {
+		this.triggerMsg = triggerMsg;
+	}
+
+	public Date getHandleTime() {
+		return handleTime;
+	}
+
+	public void setHandleTime(Date handleTime) {
+		this.handleTime = handleTime;
+	}
+
+	public int getHandleCode() {
+		return handleCode;
+	}
+
+	public void setHandleCode(int handleCode) {
+		this.handleCode = handleCode;
+	}
+
+	public String getHandleMsg() {
+		return handleMsg;
+	}
+
+	public void setHandleMsg(String handleMsg) {
+		this.handleMsg = handleMsg;
+	}
+
+	public int getAlarmStatus() {
+		return alarmStatus;
+	}
+
+	public void setAlarmStatus(int alarmStatus) {
+		this.alarmStatus = alarmStatus;
+	}
+
+}

roncoo-education-app-job/src/main/java/com/xxl/job/admin/core/model/XxlJobLogGlue.java

+package com.xxl.job.admin.core.model;
+
+import java.util.Date;
+
+/**
+ * xxl-job log for glue, used to track job code process
+ * @author xuxueli 2016-5-19 17:57:46
+ */
+public class XxlJobLogGlue {
+	
+	private int id;
+	private int jobId;				// 任务主键ID
+	private String glueType;		// GLUE类型	#com.xxl.job.core.glue.GlueTypeEnum
+	private String glueSource;
+	private String glueRemark;
+	private Date addTime;
+	private Date updateTime;
+
+	public int getId() {
+		return id;
+	}
+
+	public void setId(int id) {
+		this.id = id;
+	}
+
+	public int getJobId() {
+		return jobId;
+	}
+
+	public void setJobId(int jobId) {
+		this.jobId = jobId;
+	}
+
+	public String getGlueType() {
+		return glueType;
+	}
+
+	public void setGlueType(String glueType) {
+		this.glueType = glueType;
+	}
+
+	public String getGlueSource() {
+		return glueSource;
+	}
+
+	public void setGlueSource(String glueSource) {
+		this.glueSource = glueSource;
+	}
+
+	public String getGlueRemark() {
+		return glueRemark;
+	}
+
+	public void setGlueRemark(String glueRemark) {
+		this.glueRemark = glueRemark;
+	}
+
+	public Date getAddTime() {
+		return addTime;
+	}
+
+	public void setAddTime(Date addTime) {
+		this.addTime = addTime;
+	}
+
+	public Date getUpdateTime() {
+		return updateTime;
+	}
+
+	public void setUpdateTime(Date updateTime) {
+		this.updateTime = updateTime;
+	}
+
+}

roncoo-education-app-job/src/main/java/com/xxl/job/admin/core/model/XxlJobLogReport.java

+package com.xxl.job.admin.core.model;
+
+import java.util.Date;
+
+public class XxlJobLogReport {
+
+    private int id;
+
+    private Date triggerDay;
+
+    private int runningCount;
+    private int sucCount;
+    private int failCount;
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public Date getTriggerDay() {
+        return triggerDay;
+    }
+
+    public void setTriggerDay(Date triggerDay) {
+        this.triggerDay = triggerDay;
+    }
+
+    public int getRunningCount() {
+        return runningCount;
+    }
+
+    public void setRunningCount(int runningCount) {
+        this.runningCount = runningCount;
+    }
+
+    public int getSucCount() {
+        return sucCount;
+    }
+
+    public void setSucCount(int sucCount) {
+        this.sucCount = sucCount;
+    }
+
+    public int getFailCount() {
+        return failCount;
+    }
+
+    public void setFailCount(int failCount) {
+        this.failCount = failCount;
+    }
+}

roncoo-education-app-job/src/main/java/com/xxl/job/admin/core/model/XxlJobRegistry.java

+package com.xxl.job.admin.core.model;
+
+import java.util.Date;
+
+/**
+ * Created by xuxueli on 16/9/30.
+ */
+public class XxlJobRegistry {
+
+    private int id;
+    private String registryGroup;
+    private String registryKey;
+    private String registryValue;
+    private Date updateTime;
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getRegistryGroup() {
+        return registryGroup;
+    }
+
+    public void setRegistryGroup(String registryGroup) {
+        this.registryGroup = registryGroup;
+    }
+
+    public String getRegistryKey() {
+        return registryKey;
+    }
+
+    public void setRegistryKey(String registryKey) {
+        this.registryKey = registryKey;
+    }
+
+    public String getRegistryValue() {
+        return registryValue;
+    }
+
+    public void setRegistryValue(String registryValue) {
+        this.registryValue = registryValue;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+}

roncoo-education-app-job/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteFirst.java

+package com.xxl.job.admin.core.route.strategy;
+
+import com.xxl.job.admin.core.route.ExecutorRouter;
+import com.xxl.job.core.biz.model.ReturnT;
+import com.xxl.job.core.biz.model.TriggerParam;
+
+import java.util.List;
+
+/**
+ * Created by xuxueli on 17/3/10.
+ */
+public class ExecutorRouteFirst extends ExecutorRouter {
+
+    @Override
+    public ReturnT<String> route(TriggerParam triggerParam, List<String> addressList){
+        return new ReturnT<String>(addressList.get(0));
+    }
+
+}