*
- * @package: com.xkcoding.rbac.security.repository
- * @description: UserDao 测试
- * @author: yangkai.shen
- * @date: Created in 2018-12-12 01:10
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-12 01:10
*/
@Slf4j
public class UserDaoTest extends SpringBootDemoRbacSecurityApplicationTests {
@@ -36,4 +30,4 @@ public class UserDaoTest extends SpringBootDemoRbacSecurityApplicationTests {
Assert.assertEquals(2, userList.size());
log.info("【userList】= {}", userList);
}
-}
\ No newline at end of file
+}
diff --git a/demo-rbac-security/src/test/java/com/xkcoding/rbac/security/util/RedisUtilTest.java b/demo-rbac-security/src/test/java/com/xkcoding/rbac/security/util/RedisUtilTest.java
index cbe51ab..7706f93 100644
--- a/demo-rbac-security/src/test/java/com/xkcoding/rbac/security/util/RedisUtilTest.java
+++ b/demo-rbac-security/src/test/java/com/xkcoding/rbac/security/util/RedisUtilTest.java
@@ -13,13 +13,8 @@ import org.springframework.beans.factory.annotation.Autowired;
* 测试RedisUtil
*
*
- * @package: com.xkcoding.rbac.security.util
- * @description: 测试RedisUtil
- * @author: yangkai.shen
- * @date: Created in 2018-12-11 20:44
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-11 20:44
*/
@Slf4j
public class RedisUtilTest extends SpringBootDemoRbacSecurityApplicationTests {
@@ -31,4 +26,4 @@ public class RedisUtilTest extends SpringBootDemoRbacSecurityApplicationTests {
PageResult pageResult = redisUtil.findKeysForPage(Consts.REDIS_JWT_KEY_PREFIX + Consts.SYMBOL_STAR, 2, 1);
log.info("【pageResult】= {}", JSONUtil.toJsonStr(pageResult));
}
-}
\ No newline at end of file
+}
diff --git a/demo-rbac-shiro/src/main/java/com/xkcoding/rbac/shiro/SpringBootDemoRbacShiroApplication.java b/demo-rbac-shiro/src/main/java/com/xkcoding/rbac/shiro/SpringBootDemoRbacShiroApplication.java
index 6159655..df7c6b1 100644
--- a/demo-rbac-shiro/src/main/java/com/xkcoding/rbac/shiro/SpringBootDemoRbacShiroApplication.java
+++ b/demo-rbac-shiro/src/main/java/com/xkcoding/rbac/shiro/SpringBootDemoRbacShiroApplication.java
@@ -9,13 +9,8 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
* 启动器
*
*
- * @package: com.xkcoding.rbac.shiro
- * @description: 启动器
- * @author: yangkai.shen
- * @date: Created in 2019-03-21 16:11
- * @copyright: Copyright (c) 2019
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2019-03-21 16:11
*/
@SpringBootApplication
@MapperScan("com.xkcoding.rbac.shiro.mapper")
diff --git a/demo-rbac-shiro/src/main/java/com/xkcoding/rbac/shiro/common/IResultCode.java b/demo-rbac-shiro/src/main/java/com/xkcoding/rbac/shiro/common/IResultCode.java
index cadc3c6..17ff7ba 100644
--- a/demo-rbac-shiro/src/main/java/com/xkcoding/rbac/shiro/common/IResultCode.java
+++ b/demo-rbac-shiro/src/main/java/com/xkcoding/rbac/shiro/common/IResultCode.java
@@ -5,13 +5,8 @@ package com.xkcoding.rbac.shiro.common;
* 统一状态码接口
*
*
- * @package: com.xkcoding.rbac.shiro.common
- * @description: 统一状态码接口
- * @author: yangkai.shen
- * @date: Created in 2019-03-21 16:28
- * @copyright: Copyright (c) 2019
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2019-03-21 16:28
*/
public interface IResultCode {
/**
diff --git a/demo-rbac-shiro/src/main/java/com/xkcoding/rbac/shiro/common/R.java b/demo-rbac-shiro/src/main/java/com/xkcoding/rbac/shiro/common/R.java
index 8d5e97a..4cd5f00 100644
--- a/demo-rbac-shiro/src/main/java/com/xkcoding/rbac/shiro/common/R.java
+++ b/demo-rbac-shiro/src/main/java/com/xkcoding/rbac/shiro/common/R.java
@@ -8,13 +8,8 @@ import lombok.NoArgsConstructor;
* 统一API对象返回
*
*
- * @package: com.xkcoding.rbac.shiro.common
- * @description: 统一API对象返回
- * @author: yangkai.shen
- * @date: Created in 2019-03-21 16:24
- * @copyright: Copyright (c) 2019
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2019-03-21 16:24
*/
@Data
@NoArgsConstructor
diff --git a/demo-rbac-shiro/src/main/java/com/xkcoding/rbac/shiro/common/ResultCode.java b/demo-rbac-shiro/src/main/java/com/xkcoding/rbac/shiro/common/ResultCode.java
index 871635e..1f0236f 100644
--- a/demo-rbac-shiro/src/main/java/com/xkcoding/rbac/shiro/common/ResultCode.java
+++ b/demo-rbac-shiro/src/main/java/com/xkcoding/rbac/shiro/common/ResultCode.java
@@ -7,13 +7,8 @@ import lombok.Getter;
* 通用状态枚举
*
*
- * @package: com.xkcoding.rbac.shiro.common
- * @description: 通用状态枚举
- * @author: yangkai.shen
- * @date: Created in 2019-03-21 16:31
- * @copyright: Copyright (c) 2019
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2019-03-21 16:31
*/
@Getter
public enum ResultCode implements IResultCode {
diff --git a/demo-rbac-shiro/src/main/java/com/xkcoding/rbac/shiro/config/MybatisPlusConfig.java b/demo-rbac-shiro/src/main/java/com/xkcoding/rbac/shiro/config/MybatisPlusConfig.java
index 3faf11a..9cf6d4e 100644
--- a/demo-rbac-shiro/src/main/java/com/xkcoding/rbac/shiro/config/MybatisPlusConfig.java
+++ b/demo-rbac-shiro/src/main/java/com/xkcoding/rbac/shiro/config/MybatisPlusConfig.java
@@ -15,13 +15,8 @@ import java.util.List;
* MP3 配置
*
*
- * @package: com.xkcoding.rbac.shiro.config
- * @description: MP3 配置
- * @author: yangkai.shen
- * @date: Created in 2019-03-21 17:06
- * @copyright: Copyright (c) 2019
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2019-03-21 17:06
*/
@Configuration
public class MybatisPlusConfig {
diff --git a/demo-rbac-shiro/src/main/java/com/xkcoding/rbac/shiro/controller/TestController.java b/demo-rbac-shiro/src/main/java/com/xkcoding/rbac/shiro/controller/TestController.java
index 59f6d9c..654f7cd 100644
--- a/demo-rbac-shiro/src/main/java/com/xkcoding/rbac/shiro/controller/TestController.java
+++ b/demo-rbac-shiro/src/main/java/com/xkcoding/rbac/shiro/controller/TestController.java
@@ -10,13 +10,8 @@ import org.springframework.web.bind.annotation.RestController;
* 测试Controller
*
*
- * @package: com.xkcoding.rbac.shiro.controller
- * @description: 测试Controller
- * @author: yangkai.shen
- * @date: Created in 2019-03-21 16:13
- * @copyright: Copyright (c) 2019
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2019-03-21 16:13
*/
@RestController
@RequestMapping("/test")
diff --git a/demo-session/src/main/java/com/xkcoding/session/SpringBootDemoSessionApplication.java b/demo-session/src/main/java/com/xkcoding/session/SpringBootDemoSessionApplication.java
index 2834699..e22efcc 100644
--- a/demo-session/src/main/java/com/xkcoding/session/SpringBootDemoSessionApplication.java
+++ b/demo-session/src/main/java/com/xkcoding/session/SpringBootDemoSessionApplication.java
@@ -8,13 +8,8 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
* 启动类
*
*
- * @package: com.xkcoding.session
- * @description: 启动类
- * @author: yangkai.shen
- * @date: Created in 2018-12-19 19:35
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-19 19:35
*/
@SpringBootApplication
public class SpringBootDemoSessionApplication {
diff --git a/demo-session/src/main/java/com/xkcoding/session/config/WebMvcConfig.java b/demo-session/src/main/java/com/xkcoding/session/config/WebMvcConfig.java
index 2528935..0a5f79b 100644
--- a/demo-session/src/main/java/com/xkcoding/session/config/WebMvcConfig.java
+++ b/demo-session/src/main/java/com/xkcoding/session/config/WebMvcConfig.java
@@ -12,13 +12,8 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
* WebMvc 配置类
*
*
- * @package: com.xkcoding.session.config
- * @description: WebMvc 配置类
- * @author: yangkai.shen
- * @date: Created in 2018-12-19 19:50
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-19 19:50
*/
@Configuration
public class WebMvcConfig implements WebMvcConfigurer {
diff --git a/demo-session/src/main/java/com/xkcoding/session/constants/Consts.java b/demo-session/src/main/java/com/xkcoding/session/constants/Consts.java
index 38cf8f3..d8a28fe 100644
--- a/demo-session/src/main/java/com/xkcoding/session/constants/Consts.java
+++ b/demo-session/src/main/java/com/xkcoding/session/constants/Consts.java
@@ -5,13 +5,8 @@ package com.xkcoding.session.constants;
* 常量池
*
*
- * @package: com.xkcoding.session.constants
- * @description: 常量池
- * @author: yangkai.shen
- * @date: Created in 2018-12-19 19:42
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-19 19:42
*/
public interface Consts {
/**
diff --git a/demo-session/src/main/java/com/xkcoding/session/controller/PageController.java b/demo-session/src/main/java/com/xkcoding/session/controller/PageController.java
index d6b4756..64cf929 100644
--- a/demo-session/src/main/java/com/xkcoding/session/controller/PageController.java
+++ b/demo-session/src/main/java/com/xkcoding/session/controller/PageController.java
@@ -16,13 +16,8 @@ import javax.servlet.http.HttpSession;
* 页面跳转 Controller
*
*
- * @package: com.xkcoding.session.controller
- * @description: 页面跳转 Controller
- * @author: yangkai.shen
- * @date: Created in 2018-12-19 19:57
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-19 19:57
*/
@Controller
@RequestMapping("/page")
diff --git a/demo-session/src/main/java/com/xkcoding/session/interceptor/SessionInterceptor.java b/demo-session/src/main/java/com/xkcoding/session/interceptor/SessionInterceptor.java
index c797655..204106d 100644
--- a/demo-session/src/main/java/com/xkcoding/session/interceptor/SessionInterceptor.java
+++ b/demo-session/src/main/java/com/xkcoding/session/interceptor/SessionInterceptor.java
@@ -13,13 +13,8 @@ import javax.servlet.http.HttpSession;
* 校验Session的拦截器
*
*
- * @package: com.xkcoding.session.interceptor
- * @description: 校验Session的拦截器
- * @author: yangkai.shen
- * @date: Created in 2018-12-19 19:40
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-19 19:40
*/
@Component
public class SessionInterceptor extends HandlerInterceptorAdapter {
diff --git a/demo-sharding-jdbc/README.md b/demo-sharding-jdbc/README.md
index c445002..733d7df 100644
--- a/demo-sharding-jdbc/README.md
+++ b/demo-sharding-jdbc/README.md
@@ -110,13 +110,8 @@ import io.shardingsphere.core.keygen.KeyGenerator;
* 自定义雪花算法，替换 DefaultKeyGenerator，避免DefaultKeyGenerator生成的id大几率是偶数
*
*
- * @package: com.xkcoding.sharding.jdbc.config
- * @description: 自定义雪花算法，替换 DefaultKeyGenerator，避免DefaultKeyGenerator生成的id大几率是偶数
- * @author: yangkai.shen
- * @date: Created in 2019-03-26 17:07
- * @copyright: Copyright (c) 2019
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2019-03-26 17:07
*/
public class CustomSnowflakeKeyGenerator implements KeyGenerator {
private Snowflake snowflake;
@@ -124,7 +119,7 @@ public class CustomSnowflakeKeyGenerator implements KeyGenerator {
public CustomSnowflakeKeyGenerator(Snowflake snowflake) {
this.snowflake = snowflake;
}
-
+
@Override
public Number generateKey() {
return snowflake.nextId();
@@ -140,13 +135,8 @@ public class CustomSnowflakeKeyGenerator implements KeyGenerator {
* sharding-jdbc 的数据源配置
*
*
- * @package: com.xkcoding.sharding.jdbc.config
- * @description: sharding-jdbc 的数据源配置
- * @author: yangkai.shen
- * @date: Created in 2019-03-26 16:47
- * @copyright: Copyright (c) 2019
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2019-03-26 16:47
*/
@Configuration
public class DataSourceShardingConfig {
@@ -231,13 +221,8 @@ public class DataSourceShardingConfig {
* 测试sharding-jdbc分库分表
*
*
- * @package: com.xkcoding.sharding.jdbc
- * @description: 测试sharding-jdbc分库分表
- * @author: yangkai.shen
- * @date: Created in 2019-03-26 13:44
- * @copyright: Copyright (c) 2019
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2019-03-26 13:44
*/
@Slf4j
@RunWith(SpringRunner.class)
@@ -285,11 +270,11 @@ public class SpringBootDemoShardingJdbcApplicationTests {
List orders = orderMapper.selectList(Wrappers.query().lambda().in(Order::getOrderId, 1, 2));
log.info("【orders】= {}", JSONUtil.toJsonStr(orders));
}
-
+
}
```
## 3. 参考
1. `ShardingSphere` 官网：https://shardingsphere.apache.org/index_zh.html (虽然文档确实垃圾，但是还是得参考啊~)
-2. `Mybatis-Plus` 语法参考官网：https://mybatis.plus/
\ No newline at end of file
+2. `Mybatis-Plus` 语法参考官网：https://mybatis.plus/
diff --git a/demo-sharding-jdbc/src/main/java/com/xkcoding/sharding/jdbc/SpringBootDemoShardingJdbcApplication.java b/demo-sharding-jdbc/src/main/java/com/xkcoding/sharding/jdbc/SpringBootDemoShardingJdbcApplication.java
index 897d1f6..363dbd7 100644
--- a/demo-sharding-jdbc/src/main/java/com/xkcoding/sharding/jdbc/SpringBootDemoShardingJdbcApplication.java
+++ b/demo-sharding-jdbc/src/main/java/com/xkcoding/sharding/jdbc/SpringBootDemoShardingJdbcApplication.java
@@ -3,7 +3,6 @@ package com.xkcoding.sharding.jdbc;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
import org.springframework.transaction.annotation.EnableTransactionManagement;
/**
@@ -11,13 +10,8 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
* 启动器
*
*
- * @package: com.xkcoding.sharding.jdbc
- * @description: 启动器
- * @author: yangkai.shen
- * @date: Created in 2019-01-23 22:05
- * @copyright: Copyright (c) 2019
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2019-01-23 22:05
*/
@SpringBootApplication
@EnableTransactionManagement(proxyTargetClass = true)
diff --git a/demo-sharding-jdbc/src/main/java/com/xkcoding/sharding/jdbc/config/CustomSnowflakeKeyGenerator.java b/demo-sharding-jdbc/src/main/java/com/xkcoding/sharding/jdbc/config/CustomSnowflakeKeyGenerator.java
index 1ef1d11..667c4b0 100644
--- a/demo-sharding-jdbc/src/main/java/com/xkcoding/sharding/jdbc/config/CustomSnowflakeKeyGenerator.java
+++ b/demo-sharding-jdbc/src/main/java/com/xkcoding/sharding/jdbc/config/CustomSnowflakeKeyGenerator.java
@@ -8,13 +8,8 @@ import io.shardingsphere.core.keygen.KeyGenerator;
* 自定义雪花算法，替换 DefaultKeyGenerator，避免DefaultKeyGenerator生成的id大几率是偶数
*
*
- * @package: com.xkcoding.sharding.jdbc.config
- * @description: 自定义雪花算法，替换 DefaultKeyGenerator，避免DefaultKeyGenerator生成的id大几率是偶数
- * @author: yangkai.shen
- * @date: Created in 2019-03-26 17:07
- * @copyright: Copyright (c) 2019
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2019-03-26 17:07
*/
public class CustomSnowflakeKeyGenerator implements KeyGenerator {
private Snowflake snowflake;
diff --git a/demo-sharding-jdbc/src/main/java/com/xkcoding/sharding/jdbc/config/DataSourceShardingConfig.java b/demo-sharding-jdbc/src/main/java/com/xkcoding/sharding/jdbc/config/DataSourceShardingConfig.java
index 2236503..9aaecaf 100644
--- a/demo-sharding-jdbc/src/main/java/com/xkcoding/sharding/jdbc/config/DataSourceShardingConfig.java
+++ b/demo-sharding-jdbc/src/main/java/com/xkcoding/sharding/jdbc/config/DataSourceShardingConfig.java
@@ -27,13 +27,8 @@ import java.util.concurrent.ConcurrentHashMap;
* sharding-jdbc 的数据源配置
*
*
- * @package: com.xkcoding.sharding.jdbc.config
- * @description: sharding-jdbc 的数据源配置
- * @author: yangkai.shen
- * @date: Created in 2019-03-26 16:47
- * @copyright: Copyright (c) 2019
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2019-03-26 16:47
*/
@Configuration
public class DataSourceShardingConfig {
diff --git a/demo-sharding-jdbc/src/main/java/com/xkcoding/sharding/jdbc/mapper/OrderMapper.java b/demo-sharding-jdbc/src/main/java/com/xkcoding/sharding/jdbc/mapper/OrderMapper.java
index d90027c..41e218d 100644
--- a/demo-sharding-jdbc/src/main/java/com/xkcoding/sharding/jdbc/mapper/OrderMapper.java
+++ b/demo-sharding-jdbc/src/main/java/com/xkcoding/sharding/jdbc/mapper/OrderMapper.java
@@ -9,13 +9,8 @@ import org.springframework.stereotype.Component;
* 订单表 Mapper
*
*
- * @package: com.xkcoding.sharding.jdbc.mapper
- * @description: 订单表 Mapper
- * @author: yangkai.shen
- * @date: Created in 2019-03-26 13:38
- * @copyright: Copyright (c) 2019
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2019-03-26 13:38
*/
@Component
public interface OrderMapper extends BaseMapper {
diff --git a/demo-sharding-jdbc/src/main/java/com/xkcoding/sharding/jdbc/model/Order.java b/demo-sharding-jdbc/src/main/java/com/xkcoding/sharding/jdbc/model/Order.java
index 2429308..c497ff4 100644
--- a/demo-sharding-jdbc/src/main/java/com/xkcoding/sharding/jdbc/model/Order.java
+++ b/demo-sharding-jdbc/src/main/java/com/xkcoding/sharding/jdbc/model/Order.java
@@ -11,13 +11,8 @@ import lombok.NoArgsConstructor;
* 订单表
*
*
- * @package: com.xkcoding.sharding.jdbc.model
- * @description: 订单表
- * @author: yangkai.shen
- * @date: Created in 2019-03-26 13:35
- * @copyright: Copyright (c) 2019
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2019-03-26 13:35
*/
@Data
@NoArgsConstructor
diff --git a/demo-sharding-jdbc/src/test/java/com/xkcoding/sharding/jdbc/SpringBootDemoShardingJdbcApplicationTests.java b/demo-sharding-jdbc/src/test/java/com/xkcoding/sharding/jdbc/SpringBootDemoShardingJdbcApplicationTests.java
index a74c199..75a4c31 100644
--- a/demo-sharding-jdbc/src/test/java/com/xkcoding/sharding/jdbc/SpringBootDemoShardingJdbcApplicationTests.java
+++ b/demo-sharding-jdbc/src/test/java/com/xkcoding/sharding/jdbc/SpringBootDemoShardingJdbcApplicationTests.java
@@ -20,13 +20,8 @@ import java.util.List;
* 测试sharding-jdbc分库分表
*
*
- * @package: com.xkcoding.sharding.jdbc
- * @description: 测试sharding-jdbc分库分表
- * @author: yangkai.shen
- * @date: Created in 2019-03-26 13:44
- * @copyright: Copyright (c) 2019
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2019-03-26 13:44
*/
@Slf4j
@RunWith(SpringRunner.class)
diff --git a/demo-social/README.md b/demo-social/README.md
index 6355ef6..054b56b 100644
--- a/demo-social/README.md
+++ b/demo-social/README.md
@@ -8,7 +8,7 @@
>
> 1. **全**：已集成十多家第三方平台（国内外常用的基本都已包含），后续依然还有扩展计划！
>2. **简**：API就是奔着最简单去设计的（见后面[`快速开始`](https://github.com/zhangyd-c/JustAuth#%E5%BF%AB%E9%80%9F%E5%BC%80%E5%A7%8B)），尽量让您用起来没有障碍感！
->
+>
>PS: 本人十分幸运的参与到了这个SDK的开发，主要开发了**QQ登录、微信登录、小米登录、微软登录、谷歌登录**这 **`5`** 个第三方登录，以及一些BUG的修复工作。再次感谢 [@母狼](https://github.com/zhangyd-c) 开源这个又好用又全面的第三方登录SDK。
如果技术选型是 `JFinal` 的，请查看此 [**`demo`**](https://github.com/xkcoding/jfinal-justauth-demo)
@@ -50,9 +50,9 @@ https://github.com/xkcoding/act-justauth-demo
```shell
$ cd frp_0.27.0_linux_amd64
$ vim frps.ini
-
- [common]
- bind_port = 7100
+
+ [common]
+ bind_port = 7100
vhost_http_port = 7200
```
@@ -86,11 +86,11 @@ https://github.com/xkcoding/act-justauth-demo
```shell
$ cd frp_0.27.0_darwin_amd64
$ vim frpc.ini
-
+
[common]
server_addr = 120.92.169.103
server_port = 7100
-
+
[web]
type = http
local_port = 8080
@@ -119,25 +119,25 @@ nginx 的搭建就不在此赘述了，只说配置
```nginx
server {
listen 80;
- server_name oauth.xkcoding.com;
-
+ server_name oauth.xkcoding.com;
+
location / {
proxy_pass http://127.0.0.1:7200;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header Host $http_host;
proxy_set_header X-Forwarded-Proto $scheme;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_buffering off;
- sendfile off;
- proxy_max_temp_file_size 0;
- client_max_body_size 10m;
- client_body_buffer_size 128k;
- proxy_connect_timeout 90;
- proxy_send_timeout 90;
- proxy_read_timeout 90;
- proxy_temp_file_write_size 64k;
- proxy_http_version 1.1;
- proxy_request_buffering off;
+ proxy_set_header X-Real-IP $remote_addr;
+ proxy_buffering off;
+ sendfile off;
+ proxy_max_temp_file_size 0;
+ client_max_body_size 10m;
+ client_body_buffer_size 128k;
+ proxy_connect_timeout 90;
+ proxy_send_timeout 90;
+ proxy_read_timeout 90;
+ proxy_temp_file_write_size 64k;
+ proxy_http_version 1.1;
+ proxy_request_buffering off;
}
}
```
@@ -167,7 +167,7 @@ $ nginx -s reload
#### 1.5.1. QQ互联平台申请
-1. 前往 https://connect.qq.com/
+1. 前往 https://connect.qq.com/
2. 申请开发者
3. 应用管理 -> 添加网站应用，等待审核通过即可
@@ -237,7 +237,7 @@ $ nginx -s reload
## 2. 主要代码
-> 本 demo 采用 Redis 缓存 state，所以请准备 Redis 环境，如果没有 Redis 环境，可以将配置文件的缓存配置为
+> 本 demo 采用 Redis 缓存 state，所以请准备 Redis 环境，如果没有 Redis 环境，可以将配置文件的缓存配置为
>
> ```yaml
> justauth:
@@ -408,13 +408,8 @@ justauth:
* 第三方登录 Controller
*
*
- * @package: com.xkcoding.oauth.controller
- * @description: 第三方登录 Controller
- * @author: yangkai.shen
- * @date: Created in 2019-05-17 10:07
- * @copyright: Copyright (c) 2019
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2019-05-17 10:07
*/
@Slf4j
@RestController
diff --git a/demo-social/src/main/java/com/xkcoding/social/controller/OauthController.java b/demo-social/src/main/java/com/xkcoding/social/controller/OauthController.java
index f780d37..557fd51 100644
--- a/demo-social/src/main/java/com/xkcoding/social/controller/OauthController.java
+++ b/demo-social/src/main/java/com/xkcoding/social/controller/OauthController.java
@@ -27,13 +27,8 @@ import java.util.stream.Collectors;
* 第三方登录 Controller
*
*
- * @package: com.xkcoding.oauth.controller
- * @description: 第三方登录 Controller
- * @author: yangkai.shen
- * @date: Created in 2019-05-17 10:07
- * @copyright: Copyright (c) 2019
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2019-05-17 10:07
*/
@Slf4j
@RestController
diff --git a/demo-swagger-beauty/README.md b/demo-swagger-beauty/README.md
index b63b09b..b488af5 100644
--- a/demo-swagger-beauty/README.md
+++ b/demo-swagger-beauty/README.md
@@ -131,13 +131,8 @@ spring:
* 通用API接口返回
*
*
- * @package: com.xkcoding.swagger.beauty.common
- * @description: 通用API接口返回
- * @author: yangkai.shen
- * @date: Created in 2018-11-28 14:18
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-11-28 14:18
*/
@Data
@Builder
@@ -172,13 +167,8 @@ public class ApiResponse implements Serializable {
* 用户实体
*
*
- * @package: com.xkcoding.swagger.beauty.entity
- * @description: 用户实体
- * @author: yangkai.shen
- * @date: Created in 2018-11-28 14:13
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-11-28 14:13
*/
@Data
@NoArgsConstructor
@@ -212,13 +202,8 @@ public class User implements Serializable {
* User Controller
*
*
- * @package: com.xkcoding.swagger.beauty.controller
- * @description: User Controller
- * @author: yangkai.shen
- * @date: Created in 2018-11-28 14:25
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-11-28 14:25
*/
@RestController
@RequestMapping("/user")
@@ -294,4 +279,4 @@ public class UserController {
- [battcn](https://github.com/battcn) 的 [swagger-spring-boot-starter](https://github.com/battcn/swagger-spring-boot) 文档：https://github.com/battcn/swagger-spring-boot/blob/master/README.md
- [ swagger-ui-layer](https://gitee.com/caspar-chen/Swagger-UI-layer) 文档：https://gitee.com/caspar-chen/Swagger-UI-layer#%E5%A6%82%E4%BD%95%E4%BD%BF%E7%94%A8
- [swagger-bootstrap-ui](https://gitee.com/xiaoym/swagger-bootstrap-ui) 文档：https://gitee.com/xiaoym/swagger-bootstrap-ui#%E4%BD%BF%E7%94%A8%E8%AF%B4%E6%98%8E
- - [swagger-ui-themes](https://github.com/ostranme/swagger-ui-themes) 文档：https://github.com/ostranme/swagger-ui-themes#getting-started
\ No newline at end of file
+ - [swagger-ui-themes](https://github.com/ostranme/swagger-ui-themes) 文档：https://github.com/ostranme/swagger-ui-themes#getting-started
diff --git a/demo-swagger-beauty/src/main/java/com/xkcoding/swagger/beauty/SpringBootDemoSwaggerBeautyApplication.java b/demo-swagger-beauty/src/main/java/com/xkcoding/swagger/beauty/SpringBootDemoSwaggerBeautyApplication.java
index 6c23e90..349509d 100644
--- a/demo-swagger-beauty/src/main/java/com/xkcoding/swagger/beauty/SpringBootDemoSwaggerBeautyApplication.java
+++ b/demo-swagger-beauty/src/main/java/com/xkcoding/swagger/beauty/SpringBootDemoSwaggerBeautyApplication.java
@@ -8,13 +8,8 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
* 启动器
*
*
- * @package: com.xkcoding.swagger.beauty
- * @description: 启动器
- * @author: yangkai.shen
- * @date: Created in 2018-11-28 11:18
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-11-28 11:18
*/
@SpringBootApplication
public class SpringBootDemoSwaggerBeautyApplication {
diff --git a/demo-swagger-beauty/src/main/java/com/xkcoding/swagger/beauty/common/ApiResponse.java b/demo-swagger-beauty/src/main/java/com/xkcoding/swagger/beauty/common/ApiResponse.java
index 43ce02a..f7ae5bd 100644
--- a/demo-swagger-beauty/src/main/java/com/xkcoding/swagger/beauty/common/ApiResponse.java
+++ b/demo-swagger-beauty/src/main/java/com/xkcoding/swagger/beauty/common/ApiResponse.java
@@ -14,13 +14,8 @@ import java.io.Serializable;
* 通用API接口返回
*
*
- * @package: com.xkcoding.swagger.beauty.common
- * @description: 通用API接口返回
- * @author: yangkai.shen
- * @date: Created in 2018-11-28 14:18
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-11-28 14:18
*/
@Data
@Builder
diff --git a/demo-swagger-beauty/src/main/java/com/xkcoding/swagger/beauty/controller/UserController.java b/demo-swagger-beauty/src/main/java/com/xkcoding/swagger/beauty/controller/UserController.java
index f8667d1..9fbb39d 100644
--- a/demo-swagger-beauty/src/main/java/com/xkcoding/swagger/beauty/controller/UserController.java
+++ b/demo-swagger-beauty/src/main/java/com/xkcoding/swagger/beauty/controller/UserController.java
@@ -19,13 +19,8 @@ import java.util.List;
* User Controller
*
*
- * @package: com.xkcoding.swagger.beauty.controller
- * @description: User Controller
- * @author: yangkai.shen
- * @date: Created in 2018-11-28 14:25
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-11-28 14:25
*/
@RestController
@RequestMapping("/user")
diff --git a/demo-swagger-beauty/src/main/java/com/xkcoding/swagger/beauty/entity/User.java b/demo-swagger-beauty/src/main/java/com/xkcoding/swagger/beauty/entity/User.java
index 758afad..3a75323 100644
--- a/demo-swagger-beauty/src/main/java/com/xkcoding/swagger/beauty/entity/User.java
+++ b/demo-swagger-beauty/src/main/java/com/xkcoding/swagger/beauty/entity/User.java
@@ -13,13 +13,8 @@ import java.io.Serializable;
* 用户实体
*
*
- * @package: com.xkcoding.swagger.beauty.entity
- * @description: 用户实体
- * @author: yangkai.shen
- * @date: Created in 2018-11-28 14:13
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-11-28 14:13
*/
@Data
@NoArgsConstructor
diff --git a/demo-swagger/README.md b/demo-swagger/README.md
index 960b4ae..77f3bd6 100644
--- a/demo-swagger/README.md
+++ b/demo-swagger/README.md
@@ -84,13 +84,8 @@
* Swagger2 配置
*
*
- * @package: com.xkcoding.swagger.config
- * @description: Swagger2 配置
- * @author: yangkai.shen
- * @date: Created in 2018-11-29 11:14
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-11-29 11:14
*/
@Configuration
@EnableSwagger2
@@ -126,13 +121,8 @@ public class Swagger2Config {
* User Controller
*
*
- * @package: com.xkcoding.swagger.controller
- * @description: User Controller
- * @author: yangkai.shen
- * @date: Created in 2018-11-29 11:30
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-11-29 11:30
*/
@RestController
@RequestMapping("/user")
@@ -217,13 +207,8 @@ public class UserController {
* 通用API接口返回
*
*
- * @package: com.xkcoding.swagger.common
- * @description: 通用API接口返回
- * @author: yangkai.shen
- * @date: Created in 2018-11-29 11:30
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-11-29 11:30
*/
@Data
@Builder
diff --git a/demo-swagger/src/main/java/com/xkcoding/swagger/SpringBootDemoSwaggerApplication.java b/demo-swagger/src/main/java/com/xkcoding/swagger/SpringBootDemoSwaggerApplication.java
index dbc1c78..1f9dbae 100644
--- a/demo-swagger/src/main/java/com/xkcoding/swagger/SpringBootDemoSwaggerApplication.java
+++ b/demo-swagger/src/main/java/com/xkcoding/swagger/SpringBootDemoSwaggerApplication.java
@@ -8,13 +8,8 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
* 启动器
*
*
- * @package: com.xkcoding.swagger
- * @description: 启动器
- * @author: yangkai.shen
- * @date: Created in 2018-11-29 13:25
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-11-29 13:25
*/
@SpringBootApplication
public class SpringBootDemoSwaggerApplication {
diff --git a/demo-swagger/src/main/java/com/xkcoding/swagger/common/ApiResponse.java b/demo-swagger/src/main/java/com/xkcoding/swagger/common/ApiResponse.java
index 523a8b6..fb726cd 100644
--- a/demo-swagger/src/main/java/com/xkcoding/swagger/common/ApiResponse.java
+++ b/demo-swagger/src/main/java/com/xkcoding/swagger/common/ApiResponse.java
@@ -14,13 +14,8 @@ import java.io.Serializable;
* 通用API接口返回
*
*
- * @package: com.xkcoding.swagger.common
- * @description: 通用API接口返回
- * @author: yangkai.shen
- * @date: Created in 2018-11-29 11:30
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-11-29 11:30
*/
@Data
@Builder
diff --git a/demo-swagger/src/main/java/com/xkcoding/swagger/common/DataType.java b/demo-swagger/src/main/java/com/xkcoding/swagger/common/DataType.java
index 0caf4ae..b5266a6 100644
--- a/demo-swagger/src/main/java/com/xkcoding/swagger/common/DataType.java
+++ b/demo-swagger/src/main/java/com/xkcoding/swagger/common/DataType.java
@@ -5,13 +5,8 @@ package com.xkcoding.swagger.common;
* 方便在 @ApiImplicitParam 的 dataType 属性使用
*
*
- * @package: com.xkcoding.swagger.common
- * @description: 方便在 @ApiImplicitParam 的 dataType 属性使用
- * @author: yangkai.shen
- * @date: Created in 2018-11-29 13:23
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-11-29 13:23
*/
public final class DataType {
@@ -27,4 +22,4 @@ public final class DataType {
public final static String DATETIME = "dateTime";
public final static String PASSWORD = "password";
-}
\ No newline at end of file
+}
diff --git a/demo-swagger/src/main/java/com/xkcoding/swagger/common/ParamType.java b/demo-swagger/src/main/java/com/xkcoding/swagger/common/ParamType.java
index 438cea8..775ef6f 100644
--- a/demo-swagger/src/main/java/com/xkcoding/swagger/common/ParamType.java
+++ b/demo-swagger/src/main/java/com/xkcoding/swagger/common/ParamType.java
@@ -5,13 +5,8 @@ package com.xkcoding.swagger.common;
* 方便在 @ApiImplicitParam 的 paramType 属性使用
*
*
- * @package: com.xkcoding.swagger.common
- * @description: 方便在 @ApiImplicitParam 的 paramType 属性使用
- * @author: yangkai.shen
- * @date: Created in 2018-11-29 13:24
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-11-29 13:24
*/
public final class ParamType {
@@ -21,4 +16,4 @@ public final class ParamType {
public final static String BODY = "body";
public final static String FORM = "form";
-}
\ No newline at end of file
+}
diff --git a/demo-swagger/src/main/java/com/xkcoding/swagger/config/Swagger2Config.java b/demo-swagger/src/main/java/com/xkcoding/swagger/config/Swagger2Config.java
index 04d0924..b0a9d3c 100644
--- a/demo-swagger/src/main/java/com/xkcoding/swagger/config/Swagger2Config.java
+++ b/demo-swagger/src/main/java/com/xkcoding/swagger/config/Swagger2Config.java
@@ -16,13 +16,8 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
* Swagger2 配置
*
*
- * @package: com.xkcoding.swagger.config
- * @description: Swagger2 配置
- * @author: yangkai.shen
- * @date: Created in 2018-11-29 11:14
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-11-29 11:14
*/
@Configuration
@EnableSwagger2
@@ -45,4 +40,4 @@ public class Swagger2Config {
.build();
}
-}
\ No newline at end of file
+}
diff --git a/demo-swagger/src/main/java/com/xkcoding/swagger/controller/UserController.java b/demo-swagger/src/main/java/com/xkcoding/swagger/controller/UserController.java
index db6cd11..bbf71a2 100644
--- a/demo-swagger/src/main/java/com/xkcoding/swagger/controller/UserController.java
+++ b/demo-swagger/src/main/java/com/xkcoding/swagger/controller/UserController.java
@@ -19,13 +19,8 @@ import java.util.List;
* User Controller
*
*
- * @package: com.xkcoding.swagger.controller
- * @description: User Controller
- * @author: yangkai.shen
- * @date: Created in 2018-11-29 11:30
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-11-29 11:30
*/
@RestController
@RequestMapping("/user")
diff --git a/demo-swagger/src/main/java/com/xkcoding/swagger/entity/User.java b/demo-swagger/src/main/java/com/xkcoding/swagger/entity/User.java
index 3862b9b..a89baea 100644
--- a/demo-swagger/src/main/java/com/xkcoding/swagger/entity/User.java
+++ b/demo-swagger/src/main/java/com/xkcoding/swagger/entity/User.java
@@ -13,13 +13,8 @@ import java.io.Serializable;
* 用户实体
*
*
- * @package: com.xkcoding.swagger.entity
- * @description: 用户实体
- * @author: yangkai.shen
- * @date: Created in 2018-11-29 11:31
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-11-29 11:31
*/
@Data
@NoArgsConstructor
diff --git a/demo-task-quartz/init/dbTables/tables_db2.sql b/demo-task-quartz/init/dbTables/tables_db2.sql
index f56ddda..a8ebabd 100644
--- a/demo-task-quartz/init/dbTables/tables_db2.sql
+++ b/demo-task-quartz/init/dbTables/tables_db2.sql
@@ -4,14 +4,14 @@
# .. known to work with DB2 7.1 and the JDBC driver "COM.ibm.db2.jdbc.net.DB2Driver"
# .. likely to work with others...
#
-# In your Quartz properties file, you'll need to set
+# In your Quartz properties file, you'll need to set
# org.quartz.jobStore.driverDelegateClass = org.quartz.impl.jdbcjobstore.StdJDBCDelegate
#
# If you're using DB2 6.x you'll want to set this property to
# org.quartz.jobStore.driverDelegateClass = org.quartz.impl.jdbcjobstore.DB2v6Delegate
#
-# Note that the blob column size (e.g. blob(2000)) dictates the amount of data that can be stored in
-# that blob - i.e. limits the amount of data you can put into your JobDataMap
+# Note that the blob column size (e.g. blob(2000)) dictates theount of data that can be stored in
+# that blob - i.e. limits theount of data you can put into your JobDataMap
#
@@ -72,7 +72,7 @@ create table qrtz_cron_triggers(
)
CREATE TABLE qrtz_simprop_triggers
- (
+ (
sched_name varchar(120) not null,
TRIGGER_NAME VARCHAR(200) NOT NULL,
TRIGGER_GROUP VARCHAR(200) NOT NULL,
@@ -88,7 +88,7 @@ CREATE TABLE qrtz_simprop_triggers
BOOL_PROP_1 VARCHAR(1) NULL,
BOOL_PROP_2 VARCHAR(1) NULL,
PRIMARY KEY (sched_name,TRIGGER_NAME,TRIGGER_GROUP),
- FOREIGN KEY (sched_name,TRIGGER_NAME,TRIGGER_GROUP)
+ FOREIGN KEY (sched_name,TRIGGER_NAME,TRIGGER_GROUP)
REFERENCES QRTZ_TRIGGERS(sched_name,TRIGGER_NAME,TRIGGER_GROUP)
)
@@ -128,7 +128,7 @@ create table qrtz_fired_triggers(
create table qrtz_paused_trigger_grps(
sched_name varchar(120) not null,
- trigger_group varchar(80) not null,
+ trigger_group varchar(80) not null,
primary key (sched_name,trigger_group)
);
@@ -143,6 +143,6 @@ create table qrtz_scheduler_state (
create table qrtz_locks
(
sched_name varchar(120) not null,
- lock_name varchar(40) not null,
+ lock_name varchar(40) not null,
primary key (sched_name,lock_name)
);
diff --git a/demo-task-quartz/init/dbTables/tables_db2_v72.sql b/demo-task-quartz/init/dbTables/tables_db2_v72.sql
index 2be28e0..91e6d40 100644
--- a/demo-task-quartz/init/dbTables/tables_db2_v72.sql
+++ b/demo-task-quartz/init/dbTables/tables_db2_v72.sql
@@ -1,10 +1,10 @@
--
--- Thanks to Horia Muntean for submitting this, Mikkel Heisterberg for updating it
+-- Thanks to Horia Muntean for submitting this, Mikkel Heisterberg for updating it
--
-- .. known to work with DB2 7.2 and the JDBC driver "COM.ibm.db2.jdbc.net.DB2Driver"
-- .. likely to work with others...
--
--- In your Quartz properties file, you'll need to set
+-- In your Quartz properties file, you'll need to set
-- org.quartz.jobStore.driverDelegateClass = org.quartz.impl.jdbcjobstore.DB2v7Delegate
--
-- or
@@ -14,8 +14,8 @@
-- If you're using DB2 6.x you'll want to set this property to
-- org.quartz.jobStore.driverDelegateClass = org.quartz.impl.jdbcjobstore.DB2v6Delegate
--
--- Note that the blob column size (e.g. blob(2000)) dictates the amount of data that can be stored in
--- that blob - i.e. limits the amount of data you can put into your JobDataMap
+-- Note that the blob column size (e.g. blob(2000)) dictates theount of data that can be stored in
+-- that blob - i.e. limits theount of data you can put into your JobDataMap
--
DROP TABLE QRTZ_FIRED_TRIGGERS;
@@ -87,7 +87,7 @@ create table qrtz_cron_triggers(
);
CREATE TABLE qrtz_simprop_triggers
- (
+ (
sched_name varchar(120) not null,
TRIGGER_NAME VARCHAR(200) NOT NULL,
TRIGGER_GROUP VARCHAR(200) NOT NULL,
@@ -103,7 +103,7 @@ CREATE TABLE qrtz_simprop_triggers
BOOL_PROP_1 VARCHAR(1) NULL,
BOOL_PROP_2 VARCHAR(1) NULL,
PRIMARY KEY (sched_name,TRIGGER_NAME,TRIGGER_GROUP),
- FOREIGN KEY (sched_name,TRIGGER_NAME,TRIGGER_GROUP)
+ FOREIGN KEY (sched_name,TRIGGER_NAME,TRIGGER_GROUP)
REFERENCES QRTZ_TRIGGERS(sched_name,TRIGGER_NAME,TRIGGER_GROUP)
);
@@ -143,7 +143,7 @@ create table qrtz_fired_triggers(
create table qrtz_paused_trigger_grps(
sched_name varchar(120) not null,
- trigger_group varchar(80) not null,
+ trigger_group varchar(80) not null,
primary key (sched_name,trigger_group)
);
@@ -158,6 +158,6 @@ create table qrtz_scheduler_state (
create table qrtz_locks
(
sched_name varchar(120) not null,
- lock_name varchar(40) not null,
+ lock_name varchar(40) not null,
primary key (sched_name,lock_name)
);
diff --git a/demo-task-quartz/init/dbTables/tables_h2.sql b/demo-task-quartz/init/dbTables/tables_h2.sql
index cc23d3c..8e14289 100644
--- a/demo-task-quartz/init/dbTables/tables_h2.sql
+++ b/demo-task-quartz/init/dbTables/tables_h2.sql
@@ -1,11 +1,11 @@
--- Thanks to Amir Kibbar and Peter Rietzler for contributing the schema for H2 database,
+-- Thanks toir Kibbar and Peter Rietzler for contributing the schema for H2 database,
-- and verifying that it works with Quartz's StdJDBCDelegate
--
--- Note, Quartz depends on row-level locking which means you must use the MVCC=TRUE
+-- Note, Quartz depends on row-level locking which means you must use the MVCC=TRUE
-- setting on your H2 database, or you will experience dead-locks
--
--
--- In your Quartz properties file, you'll need to set
+-- In your Quartz properties file, you'll need to set
-- org.quartz.jobStore.driverDelegateClass = org.quartz.impl.jdbcjobstore.StdJDBCDelegate
CREATE TABLE QRTZ_CALENDARS (
@@ -19,7 +19,7 @@ CREATE TABLE QRTZ_CRON_TRIGGERS (
TRIGGER_NAME VARCHAR (200) NOT NULL ,
TRIGGER_GROUP VARCHAR (200) NOT NULL ,
CRON_EXPRESSION VARCHAR (120) NOT NULL ,
- TIME_ZONE_ID VARCHAR (80)
+ TIME_ZONE_ID VARCHAR (80)
);
CREATE TABLE QRTZ_FIRED_TRIGGERS (
@@ -35,12 +35,12 @@ CREATE TABLE QRTZ_FIRED_TRIGGERS (
JOB_NAME VARCHAR (200) NULL ,
JOB_GROUP VARCHAR (200) NULL ,
IS_NONCONCURRENT BOOLEAN NULL ,
- REQUESTS_RECOVERY BOOLEAN NULL
+ REQUESTS_RECOVERY BOOLEAN NULL
);
CREATE TABLE QRTZ_PAUSED_TRIGGER_GRPS (
SCHED_NAME VARCHAR(120) NOT NULL,
- TRIGGER_GROUP VARCHAR (200) NOT NULL
+ TRIGGER_GROUP VARCHAR (200) NOT NULL
);
CREATE TABLE QRTZ_SCHEDULER_STATE (
@@ -52,7 +52,7 @@ CREATE TABLE QRTZ_SCHEDULER_STATE (
CREATE TABLE QRTZ_LOCKS (
SCHED_NAME VARCHAR(120) NOT NULL,
- LOCK_NAME VARCHAR (40) NOT NULL
+ LOCK_NAME VARCHAR (40) NOT NULL
);
CREATE TABLE QRTZ_JOB_DETAILS (
@@ -78,7 +78,7 @@ CREATE TABLE QRTZ_SIMPLE_TRIGGERS (
);
CREATE TABLE qrtz_simprop_triggers
- (
+ (
SCHED_NAME VARCHAR(120) NOT NULL,
TRIGGER_NAME VARCHAR(200) NOT NULL,
TRIGGER_GROUP VARCHAR(200) NOT NULL,
@@ -122,14 +122,14 @@ CREATE TABLE QRTZ_TRIGGERS (
);
ALTER TABLE QRTZ_CALENDARS ADD
- CONSTRAINT PK_QRTZ_CALENDARS PRIMARY KEY
+ CONSTRAINT PK_QRTZ_CALENDARS PRIMARY KEY
(
SCHED_NAME,
CALENDAR_NAME
);
ALTER TABLE QRTZ_CRON_TRIGGERS ADD
- CONSTRAINT PK_QRTZ_CRON_TRIGGERS PRIMARY KEY
+ CONSTRAINT PK_QRTZ_CRON_TRIGGERS PRIMARY KEY
(
SCHED_NAME,
TRIGGER_NAME,
@@ -137,35 +137,35 @@ ALTER TABLE QRTZ_CRON_TRIGGERS ADD
);
ALTER TABLE QRTZ_FIRED_TRIGGERS ADD
- CONSTRAINT PK_QRTZ_FIRED_TRIGGERS PRIMARY KEY
+ CONSTRAINT PK_QRTZ_FIRED_TRIGGERS PRIMARY KEY
(
SCHED_NAME,
ENTRY_ID
);
ALTER TABLE QRTZ_PAUSED_TRIGGER_GRPS ADD
- CONSTRAINT PK_QRTZ_PAUSED_TRIGGER_GRPS PRIMARY KEY
+ CONSTRAINT PK_QRTZ_PAUSED_TRIGGER_GRPS PRIMARY KEY
(
SCHED_NAME,
TRIGGER_GROUP
);
ALTER TABLE QRTZ_SCHEDULER_STATE ADD
- CONSTRAINT PK_QRTZ_SCHEDULER_STATE PRIMARY KEY
+ CONSTRAINT PK_QRTZ_SCHEDULER_STATE PRIMARY KEY
(
SCHED_NAME,
INSTANCE_NAME
);
ALTER TABLE QRTZ_LOCKS ADD
- CONSTRAINT PK_QRTZ_LOCKS PRIMARY KEY
+ CONSTRAINT PK_QRTZ_LOCKS PRIMARY KEY
(
SCHED_NAME,
LOCK_NAME
);
ALTER TABLE QRTZ_JOB_DETAILS ADD
- CONSTRAINT PK_QRTZ_JOB_DETAILS PRIMARY KEY
+ CONSTRAINT PK_QRTZ_JOB_DETAILS PRIMARY KEY
(
SCHED_NAME,
JOB_NAME,
@@ -173,7 +173,7 @@ ALTER TABLE QRTZ_JOB_DETAILS ADD
);
ALTER TABLE QRTZ_SIMPLE_TRIGGERS ADD
- CONSTRAINT PK_QRTZ_SIMPLE_TRIGGERS PRIMARY KEY
+ CONSTRAINT PK_QRTZ_SIMPLE_TRIGGERS PRIMARY KEY
(
SCHED_NAME,
TRIGGER_NAME,
@@ -181,7 +181,7 @@ ALTER TABLE QRTZ_SIMPLE_TRIGGERS ADD
);
ALTER TABLE QRTZ_SIMPROP_TRIGGERS ADD
- CONSTRAINT PK_QRTZ_SIMPROP_TRIGGERS PRIMARY KEY
+ CONSTRAINT PK_QRTZ_SIMPROP_TRIGGERS PRIMARY KEY
(
SCHED_NAME,
TRIGGER_NAME,
@@ -189,7 +189,7 @@ ALTER TABLE QRTZ_SIMPROP_TRIGGERS ADD
);
ALTER TABLE QRTZ_TRIGGERS ADD
- CONSTRAINT PK_QRTZ_TRIGGERS PRIMARY KEY
+ CONSTRAINT PK_QRTZ_TRIGGERS PRIMARY KEY
(
SCHED_NAME,
TRIGGER_NAME,
@@ -245,5 +245,5 @@ ALTER TABLE QRTZ_TRIGGERS ADD
JOB_NAME,
JOB_GROUP
);
-
+
COMMIT;
diff --git a/demo-task-quartz/init/dbTables/tables_pointbase.sql b/demo-task-quartz/init/dbTables/tables_pointbase.sql
index debc93f..b4a9929 100644
--- a/demo-task-quartz/init/dbTables/tables_pointbase.sql
+++ b/demo-task-quartz/init/dbTables/tables_pointbase.sql
@@ -3,8 +3,8 @@
#
#
# ...you may want to change defined the size of the "blob" columns before
-# creating the tables (particularly for the qrtz_job_details.job_data column),
-# if you will be storing large amounts of data in them
+# creating the tables (particularly for the qrtz_job_details.job_data column),
+# if you will be storing largeounts of data in them
#
#
delete from qrtz_fired_triggers;
@@ -30,7 +30,7 @@ drop table qrtz_job_details;
drop table qrtz_paused_trigger_grps;
drop table qrtz_locks;
drop table qrtz_scheduler_state;
-
+
CREATE TABLE qrtz_job_details
(
@@ -38,7 +38,7 @@ CREATE TABLE qrtz_job_details
JOB_NAME VARCHAR2(80) NOT NULL,
JOB_GROUP VARCHAR2(80) NOT NULL,
DESCRIPTION VARCHAR2(120) NULL,
- JOB_CLASS_NAME VARCHAR2(128) NOT NULL,
+ JOB_CLASS_NAME VARCHAR2(128) NOT NULL,
IS_DURABLE BOOLEAN NOT NULL,
IS_NONCONCURRENT BOOLEAN NOT NULL,
IS_UPDATE_DATA BOOLEAN NOT NULL,
@@ -52,7 +52,7 @@ CREATE TABLE qrtz_triggers
SCHED_NAME VARCHAR(120) NOT NULL,
TRIGGER_NAME VARCHAR2(80) NOT NULL,
TRIGGER_GROUP VARCHAR2(80) NOT NULL,
- JOB_NAME VARCHAR2(80) NOT NULL,
+ JOB_NAME VARCHAR2(80) NOT NULL,
JOB_GROUP VARCHAR2(80) NOT NULL,
DESCRIPTION VARCHAR2(120) NULL,
NEXT_FIRE_TIME NUMBER(13) NULL,
@@ -66,8 +66,8 @@ CREATE TABLE qrtz_triggers
MISFIRE_INSTR NUMBER(2) NULL,
JOB_DATA BLOB(4K) NULL,
PRIMARY KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP),
- FOREIGN KEY (SCHED_NAME,JOB_NAME,JOB_GROUP)
- REFERENCES QRTZ_JOB_DETAILS(SCHED_NAME,JOB_NAME,JOB_GROUP)
+ FOREIGN KEY (SCHED_NAME,JOB_NAME,JOB_GROUP)
+ REFERENCES QRTZ_JOB_DETAILS(SCHED_NAME,JOB_NAME,JOB_GROUP)
);
CREATE TABLE qrtz_simple_triggers
@@ -79,13 +79,13 @@ CREATE TABLE qrtz_simple_triggers
REPEAT_INTERVAL NUMBER(12) NOT NULL,
TIMES_TRIGGERED NUMBER(10) NOT NULL,
PRIMARY KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP),
- FOREIGN KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP)
+ FOREIGN KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP)
REFERENCES QRTZ_TRIGGERS(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP)
);
CREATE TABLE qrtz_simprop_triggers
- (
+ (
SCHED_NAME VARCHAR(120) NOT NULL,
TRIGGER_NAME VARCHAR(200) NOT NULL,
TRIGGER_GROUP VARCHAR(200) NOT NULL,
@@ -101,7 +101,7 @@ CREATE TABLE qrtz_simprop_triggers
BOOL_PROP_1 BOOLEAN NULL,
BOOL_PROP_2 BOOLEAN NULL,
PRIMARY KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP),
- FOREIGN KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP)
+ FOREIGN KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP)
REFERENCES QRTZ_TRIGGERS(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP)
);
@@ -113,7 +113,7 @@ CREATE TABLE qrtz_cron_triggers
CRON_EXPRESSION VARCHAR2(120) NOT NULL,
TIME_ZONE_ID VARCHAR2(80),
PRIMARY KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP),
- FOREIGN KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP)
+ FOREIGN KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP)
REFERENCES QRTZ_TRIGGERS(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP)
);
@@ -124,14 +124,14 @@ CREATE TABLE qrtz_blob_triggers
TRIGGER_GROUP VARCHAR2(80) NOT NULL,
BLOB_DATA BLOB(4K) NULL,
PRIMARY KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP),
- FOREIGN KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP)
+ FOREIGN KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP)
REFERENCES QRTZ_TRIGGERS(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP)
);
CREATE TABLE qrtz_calendars
(
SCHED_NAME VARCHAR(120) NOT NULL,
- CALENDAR_NAME VARCHAR2(80) NOT NULL,
+ CALENDAR_NAME VARCHAR2(80) NOT NULL,
CALENDAR BLOB(4K) NOT NULL,
PRIMARY KEY (SCHED_NAME,CALENDAR_NAME)
);
@@ -139,11 +139,11 @@ CREATE TABLE qrtz_calendars
CREATE TABLE qrtz_paused_trigger_grps
(
SCHED_NAME VARCHAR(120) NOT NULL,
- TRIGGER_GROUP VARCHAR2(80) NOT NULL,
+ TRIGGER_GROUP VARCHAR2(80) NOT NULL,
PRIMARY KEY (SCHED_NAME,TRIGGER_GROUP)
);
-CREATE TABLE qrtz_fired_triggers
+CREATE TABLE qrtz_fired_triggers
(
SCHED_NAME VARCHAR(120) NOT NULL,
ENTRY_ID VARCHAR2(95) NOT NULL,
@@ -161,7 +161,7 @@ CREATE TABLE qrtz_fired_triggers
PRIMARY KEY (SCHED_NAME,ENTRY_ID)
);
-CREATE TABLE qrtz_scheduler_state
+CREATE TABLE qrtz_scheduler_state
(
SCHED_NAME VARCHAR(120) NOT NULL,
INSTANCE_NAME VARCHAR2(80) NOT NULL,
@@ -173,7 +173,7 @@ CREATE TABLE qrtz_scheduler_state
CREATE TABLE qrtz_locks
(
SCHED_NAME VARCHAR(120) NOT NULL,
- LOCK_NAME VARCHAR2(40) NOT NULL,
+ LOCK_NAME VARCHAR2(40) NOT NULL,
PRIMARY KEY (SCHED_NAME,LOCK_NAME)
);
diff --git a/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/SpringBootDemoTaskQuartzApplication.java b/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/SpringBootDemoTaskQuartzApplication.java
index ba40b18..8861ef3 100644
--- a/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/SpringBootDemoTaskQuartzApplication.java
+++ b/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/SpringBootDemoTaskQuartzApplication.java
@@ -9,13 +9,8 @@ import tk.mybatis.spring.annotation.MapperScan;
* 启动器
*
*
- * @package: com.xkcoding.task.quartz
- * @description: 启动器
- * @author: yangkai.shen
- * @date: Created in 2018/11/23 20:33
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-11-23 20:33
*/
@MapperScan(basePackages = {"com.xkcoding.task.quartz.mapper"})
@SpringBootApplication
diff --git a/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/common/ApiResponse.java b/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/common/ApiResponse.java
index 81dad5e..7d27988 100644
--- a/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/common/ApiResponse.java
+++ b/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/common/ApiResponse.java
@@ -10,13 +10,8 @@ import java.io.Serializable;
* 通用Api封装
*
*
- * @package: com.xkcoding.task.quartz.common
- * @description: 通用Api封装
- * @author: yangkai.shen
- * @date: Created in 2018-11-26 13:59
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-11-26 13:59
*/
@Data
public class ApiResponse implements Serializable {
diff --git a/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/controller/JobController.java b/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/controller/JobController.java
index 2e167ec..c1d9ebf 100644
--- a/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/controller/JobController.java
+++ b/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/controller/JobController.java
@@ -22,13 +22,8 @@ import javax.validation.Valid;
* Job Controller
*
*
- * @package: com.xkcoding.task.quartz.controller
- * @description: Job Controller
- * @author: yangkai.shen
- * @date: Created in 2018-11-26 13:23
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-11-26 13:23
*/
@RestController
@RequestMapping("/job")
diff --git a/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/entity/domain/JobAndTrigger.java b/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/entity/domain/JobAndTrigger.java
index 5a05b92..c94bce1 100644
--- a/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/entity/domain/JobAndTrigger.java
+++ b/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/entity/domain/JobAndTrigger.java
@@ -9,13 +9,8 @@ import java.math.BigInteger;
* 实体类
*
*
- * @package: com.xkcoding.task.quartz.entity.domain
- * @description: 实体类
- * @author: yangkai.shen
- * @date: Created in 2018-11-26 15:05
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-11-26 15:05
*/
@Data
public class JobAndTrigger {
@@ -59,4 +54,4 @@ public class JobAndTrigger {
* 定时任务状态
*/
private String triggerState;
-}
\ No newline at end of file
+}
diff --git a/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/entity/form/JobForm.java b/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/entity/form/JobForm.java
index d571083..c91781f 100644
--- a/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/entity/form/JobForm.java
+++ b/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/entity/form/JobForm.java
@@ -10,13 +10,8 @@ import javax.validation.constraints.NotBlank;
* 定时任务详情
*
*
- * @package: com.xkcoding.task.quartz.entity.form
- * @description: 定时任务详情
- * @author: yangkai.shen
- * @date: Created in 2018-11-26 13:42
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-11-26 13:42
*/
@Data
@Accessors(chain = true)
diff --git a/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/job/HelloJob.java b/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/job/HelloJob.java
index f56899c..b1579ff 100644
--- a/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/job/HelloJob.java
+++ b/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/job/HelloJob.java
@@ -10,13 +10,8 @@ import org.quartz.JobExecutionContext;
* Hello Job
*
*
- * @package: com.xkcoding.task.quartz.job
- * @description: Hello Job
- * @author: yangkai.shen
- * @date: Created in 2018-11-26 13:22
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-11-26 13:22
*/
@Slf4j
public class HelloJob implements BaseJob {
@@ -25,4 +20,4 @@ public class HelloJob implements BaseJob {
public void execute(JobExecutionContext context) {
log.error("Hello Job 执行时间: {}", DateUtil.now());
}
-}
\ No newline at end of file
+}
diff --git a/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/job/TestJob.java b/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/job/TestJob.java
index a42d184..ec41d1e 100644
--- a/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/job/TestJob.java
+++ b/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/job/TestJob.java
@@ -10,13 +10,8 @@ import org.quartz.JobExecutionContext;
* Test Job
*
*
- * @package: com.xkcoding.task.quartz.job
- * @description: Test Job
- * @author: yangkai.shen
- * @date: Created in 2018-11-26 13:22
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-11-26 13:22
*/
@Slf4j
public class TestJob implements BaseJob {
@@ -25,4 +20,4 @@ public class TestJob implements BaseJob {
public void execute(JobExecutionContext context) {
log.error("Test Job 执行时间: {}", DateUtil.now());
}
-}
\ No newline at end of file
+}
diff --git a/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/job/base/BaseJob.java b/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/job/base/BaseJob.java
index cc5156f..d0343f7 100644
--- a/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/job/base/BaseJob.java
+++ b/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/job/base/BaseJob.java
@@ -7,13 +7,8 @@ import org.quartz.*;
* Job 基类，主要是在 {@link org.quartz.Job} 上再封装一层，只让我们自己项目里的Job去实现
*
*
- * @package: com.xkcoding.task.quartz.job.base
- * @description: Job 基类，主要是在 {@link org.quartz.Job} 上再封装一层，只让我们自己项目里的Job去实现
- * @author: yangkai.shen
- * @date: Created in 2018-11-26 13:27
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-11-26 13:27
*/
public interface BaseJob extends Job {
/**
diff --git a/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/mapper/JobMapper.java b/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/mapper/JobMapper.java
index f59885b..cd4d28b 100644
--- a/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/mapper/JobMapper.java
+++ b/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/mapper/JobMapper.java
@@ -10,13 +10,8 @@ import java.util.List;
* Job Mapper
*
*
- * @package: com.xkcoding.task.quartz.mapper
- * @description: Job Mapper
- * @author: yangkai.shen
- * @date: Created in 2018-11-26 15:12
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-11-26 15:12
*/
@Component
public interface JobMapper {
diff --git a/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/service/JobService.java b/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/service/JobService.java
index d8cb57b..33f5184 100644
--- a/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/service/JobService.java
+++ b/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/service/JobService.java
@@ -3,7 +3,6 @@ package com.xkcoding.task.quartz.service;
import com.github.pagehelper.PageInfo;
import com.xkcoding.task.quartz.entity.domain.JobAndTrigger;
import com.xkcoding.task.quartz.entity.form.JobForm;
-import org.quartz.JobDetail;
import org.quartz.SchedulerException;
/**
@@ -11,13 +10,8 @@ import org.quartz.SchedulerException;
* Job Service
*
*
- * @package: com.xkcoding.task.quartz.service
- * @description: Job Service
- * @author: yangkai.shen
- * @date: Created in 2018-11-26 13:24
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-11-26 13:24
*/
public interface JobService {
/**
diff --git a/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/service/impl/JobServiceImpl.java b/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/service/impl/JobServiceImpl.java
index 63eb61f..9cb88d6 100644
--- a/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/service/impl/JobServiceImpl.java
+++ b/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/service/impl/JobServiceImpl.java
@@ -19,13 +19,8 @@ import java.util.List;
* Job Service
*
*
- * @package: com.xkcoding.task.quartz.service.impl
- * @description: Job Service
- * @author: yangkai.shen
- * @date: Created in 2018-11-26 13:25
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-11-26 13:25
*/
@Service
@Slf4j
diff --git a/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/util/JobUtil.java b/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/util/JobUtil.java
index 49c0603..ab98b10 100644
--- a/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/util/JobUtil.java
+++ b/demo-task-quartz/src/main/java/com/xkcoding/task/quartz/util/JobUtil.java
@@ -7,13 +7,8 @@ import com.xkcoding.task.quartz.job.base.BaseJob;
* 定时任务反射工具类
*
*
- * @package: com.xkcoding.task.quartz.util
- * @description: 定时任务反射工具类
- * @author: yangkai.shen
- * @date: Created in 2018-11-26 13:33
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-11-26 13:33
*/
public class JobUtil {
/**
diff --git a/demo-task/README.md b/demo-task/README.md
index 280c8d0..c56646e 100644
--- a/demo-task/README.md
+++ b/demo-task/README.md
@@ -86,13 +86,8 @@
* 定时任务配置，配置线程池，使用不同线程执行任务，提升效率
*
*
- * @package: com.xkcoding.task.config
- * @description: 定时任务配置，配置线程池，使用不同线程执行任务，提升效率
- * @author: yangkai.shen
- * @date: Created in 2018/11/22 19:02
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-11-22 19:02
*/
@Configuration
@EnableScheduling
@@ -124,13 +119,8 @@ public class TaskConfig implements SchedulingConfigurer {
* 定时任务
*
*
- * @package: com.xkcoding.task.job
- * @description: 定时任务
- * @author: yangkai.shen
- * @date: Created in 2018/11/22 19:09
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-11-22 19:09
*/
@Component
@Slf4j
@@ -182,4 +172,4 @@ server:
## 参考
-- Spring Boot官方文档：https://docs.spring.io/spring-boot/docs/2.1.0.RELEASE/reference/htmlsingle/#boot-features-task-execution-scheduling
\ No newline at end of file
+- Spring Boot官方文档：https://docs.spring.io/spring-boot/docs/2.1.0.RELEASE/reference/htmlsingle/#boot-features-task-execution-scheduling
diff --git a/demo-task/src/main/java/com/xkcoding/task/SpringBootDemoTaskApplication.java b/demo-task/src/main/java/com/xkcoding/task/SpringBootDemoTaskApplication.java
index 55687ad..8f75a00 100644
--- a/demo-task/src/main/java/com/xkcoding/task/SpringBootDemoTaskApplication.java
+++ b/demo-task/src/main/java/com/xkcoding/task/SpringBootDemoTaskApplication.java
@@ -8,13 +8,8 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
* 启动器
*
*
- * @package: com.xkcoding.task
- * @description: 启动器
- * @author: yangkai.shen
- * @date: Created in 2018/11/22 19:00
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-11-22 19:00
*/
@SpringBootApplication
public class SpringBootDemoTaskApplication {
diff --git a/demo-task/src/main/java/com/xkcoding/task/config/TaskConfig.java b/demo-task/src/main/java/com/xkcoding/task/config/TaskConfig.java
index 43ec481..9a00e9e 100644
--- a/demo-task/src/main/java/com/xkcoding/task/config/TaskConfig.java
+++ b/demo-task/src/main/java/com/xkcoding/task/config/TaskConfig.java
@@ -16,13 +16,8 @@ import java.util.concurrent.ScheduledThreadPoolExecutor;
* 定时任务配置，配置线程池，使用不同线程执行任务，提升效率
*
*
- * @package: com.xkcoding.task.config
- * @description: 定时任务配置，配置线程池，使用不同线程执行任务，提升效率
- * @author: yangkai.shen
- * @date: Created in 2018/11/22 19:02
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-11-22 19:02
*/
@Configuration
@EnableScheduling
diff --git a/demo-task/src/main/java/com/xkcoding/task/job/TaskJob.java b/demo-task/src/main/java/com/xkcoding/task/job/TaskJob.java
index dfbc912..94965e1 100644
--- a/demo-task/src/main/java/com/xkcoding/task/job/TaskJob.java
+++ b/demo-task/src/main/java/com/xkcoding/task/job/TaskJob.java
@@ -12,13 +12,8 @@ import java.util.Date;
* 定时任务
*
*
- * @package: com.xkcoding.task.job
- * @description: 定时任务
- * @author: yangkai.shen
- * @date: Created in 2018/11/22 19:09
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-11-22 19:09
*/
@Component
@Slf4j
@@ -49,4 +44,4 @@ public class TaskJob {
public void job3() {
log.info("【job3】开始执行：{}", DateUtil.formatDateTime(new Date()));
}
-}
\ No newline at end of file
+}
diff --git a/demo-template-beetl/README.md b/demo-template-beetl/README.md
index f68e92f..fffc08e 100644
--- a/demo-template-beetl/README.md
+++ b/demo-template-beetl/README.md
@@ -81,13 +81,8 @@
* 主页
*
*
- * @package: com.xkcoding.template.beetl.controller
- * @description: 主页
- * @author: yangkai.shen
- * @date: Created in 2018/10/10 11:17 AM
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-10-10 11:17
*/
@Controller
@Slf4j
@@ -118,13 +113,8 @@ public class IndexController {
* 用户页面
*
*
- * @package: com.xkcoding.template.beetl.controller
- * @description: 用户页面
- * @author: yangkai.shen
- * @date: Created in 2018/10/10 11:17 AM
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-10-10 11:17
*/
@Controller
@RequestMapping("/user")
diff --git a/demo-template-beetl/src/main/java/com/xkcoding/template/beetl/SpringBootDemoTemplateBeetlApplication.java b/demo-template-beetl/src/main/java/com/xkcoding/template/beetl/SpringBootDemoTemplateBeetlApplication.java
index ccd59fc..f7fc8cb 100644
--- a/demo-template-beetl/src/main/java/com/xkcoding/template/beetl/SpringBootDemoTemplateBeetlApplication.java
+++ b/demo-template-beetl/src/main/java/com/xkcoding/template/beetl/SpringBootDemoTemplateBeetlApplication.java
@@ -8,13 +8,8 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
* 启动类
*
*
- * @package: com.xkcoding.template.beetl
- * @description: 启动类
- * @author: yangkai.shen
- * @date: Created in 2018/10/10 11:17 AM
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-10-10 11:17
*/
@SpringBootApplication
public class SpringBootDemoTemplateBeetlApplication {
diff --git a/demo-template-beetl/src/main/java/com/xkcoding/template/beetl/controller/IndexController.java b/demo-template-beetl/src/main/java/com/xkcoding/template/beetl/controller/IndexController.java
index 6c05f41..4f6f000 100644
--- a/demo-template-beetl/src/main/java/com/xkcoding/template/beetl/controller/IndexController.java
+++ b/demo-template-beetl/src/main/java/com/xkcoding/template/beetl/controller/IndexController.java
@@ -14,13 +14,8 @@ import javax.servlet.http.HttpServletRequest;
* 主页
*
*
- * @package: com.xkcoding.template.beetl.controller
- * @description: 主页
- * @author: yangkai.shen
- * @date: Created in 2018/10/10 11:17 AM
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-10-10 11:17
*/
@Controller
@Slf4j
diff --git a/demo-template-beetl/src/main/java/com/xkcoding/template/beetl/controller/UserController.java b/demo-template-beetl/src/main/java/com/xkcoding/template/beetl/controller/UserController.java
index 8bafff5..272676b 100644
--- a/demo-template-beetl/src/main/java/com/xkcoding/template/beetl/controller/UserController.java
+++ b/demo-template-beetl/src/main/java/com/xkcoding/template/beetl/controller/UserController.java
@@ -15,13 +15,8 @@ import javax.servlet.http.HttpServletRequest;
* 用户页面
*
*
- * @package: com.xkcoding.template.beetl.controller
- * @description: 用户页面
- * @author: yangkai.shen
- * @date: Created in 2018/10/10 11:17 AM
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-10-10 11:17
*/
@Controller
@RequestMapping("/user")
diff --git a/demo-template-beetl/src/main/java/com/xkcoding/template/beetl/model/User.java b/demo-template-beetl/src/main/java/com/xkcoding/template/beetl/model/User.java
index 00854b9..fc706ed 100644
--- a/demo-template-beetl/src/main/java/com/xkcoding/template/beetl/model/User.java
+++ b/demo-template-beetl/src/main/java/com/xkcoding/template/beetl/model/User.java
@@ -7,13 +7,8 @@ import lombok.Data;
* 用户 model
*
*
- * @package: com.xkcoding.template.beetl.model
- * @description: 用户 model
- * @author: yangkai.shen
- * @date: Created in 2018/10/10 11:18 AM
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-10-10 11:18
*/
@Data
public class User {
diff --git a/demo-template-enjoy/README.md b/demo-template-enjoy/README.md
index 4994129..2d16929 100644
--- a/demo-template-enjoy/README.md
+++ b/demo-template-enjoy/README.md
@@ -81,13 +81,8 @@
* Enjoy 模板配置类
*
*
- * @package: com.xkcoding.template.enjoy.config
- * @description: Enjoy 模板配置类
- * @author: yangkai.shen
- * @date: Created in 2018/10/11 2:06 PM
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-10-11 14:06
*/
@Configuration
public class EnjoyConfig {
@@ -119,13 +114,8 @@ public class EnjoyConfig {
* 主页
*
*
- * @package: com.xkcoding.template.enjoy.controller
- * @description: 主页
- * @author: yangkai.shen
- * @date: Created in 2018/10/11 2:22 PM
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-10-11 14:22
*/
@Controller
@Slf4j
@@ -156,13 +146,8 @@ public class IndexController {
* 用户页面
*
*
- * @package: com.xkcoding.template.enjoy.controller
- * @description: 用户页面
- * @author: yangkai.shen
- * @date: Created in 2018/10/11 2:24 PM
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-10-11 14:24
*/
@Controller
@RequestMapping("/user")
diff --git a/demo-template-enjoy/src/main/java/com/xkcoding/template/enjoy/SpringBootDemoTemplateEnjoyApplication.java b/demo-template-enjoy/src/main/java/com/xkcoding/template/enjoy/SpringBootDemoTemplateEnjoyApplication.java
index 46314b9..a1db5d4 100644
--- a/demo-template-enjoy/src/main/java/com/xkcoding/template/enjoy/SpringBootDemoTemplateEnjoyApplication.java
+++ b/demo-template-enjoy/src/main/java/com/xkcoding/template/enjoy/SpringBootDemoTemplateEnjoyApplication.java
@@ -8,13 +8,8 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
* 启动类
*
*
- * @package: com.xkcoding.template.enjoy
- * @description: 启动类
- * @author: yangkai.shen
- * @date: Created in 2018/10/11 2:06 PM
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-10-11 14:06
*/
@SpringBootApplication
public class SpringBootDemoTemplateEnjoyApplication {
diff --git a/demo-template-enjoy/src/main/java/com/xkcoding/template/enjoy/config/EnjoyConfig.java b/demo-template-enjoy/src/main/java/com/xkcoding/template/enjoy/config/EnjoyConfig.java
index 246a557..817cf3c 100644
--- a/demo-template-enjoy/src/main/java/com/xkcoding/template/enjoy/config/EnjoyConfig.java
+++ b/demo-template-enjoy/src/main/java/com/xkcoding/template/enjoy/config/EnjoyConfig.java
@@ -10,13 +10,8 @@ import org.springframework.context.annotation.Configuration;
* Enjoy 模板配置类
*
*
- * @package: com.xkcoding.template.enjoy.config
- * @description: Enjoy 模板配置类
- * @author: yangkai.shen
- * @date: Created in 2018/10/11 2:06 PM
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-10-11 14:06
*/
@Configuration
public class EnjoyConfig {
diff --git a/demo-template-enjoy/src/main/java/com/xkcoding/template/enjoy/controller/IndexController.java b/demo-template-enjoy/src/main/java/com/xkcoding/template/enjoy/controller/IndexController.java
index 6cc978d..46b9380 100644
--- a/demo-template-enjoy/src/main/java/com/xkcoding/template/enjoy/controller/IndexController.java
+++ b/demo-template-enjoy/src/main/java/com/xkcoding/template/enjoy/controller/IndexController.java
@@ -14,13 +14,8 @@ import javax.servlet.http.HttpServletRequest;
* 主页
*
*
- * @package: com.xkcoding.template.enjoy.controller
- * @description: 主页
- * @author: yangkai.shen
- * @date: Created in 2018/10/11 2:22 PM
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-10-11 14:22
*/
@Controller
@Slf4j
diff --git a/demo-template-enjoy/src/main/java/com/xkcoding/template/enjoy/controller/UserController.java b/demo-template-enjoy/src/main/java/com/xkcoding/template/enjoy/controller/UserController.java
index 41bddff..e6afad9 100644
--- a/demo-template-enjoy/src/main/java/com/xkcoding/template/enjoy/controller/UserController.java
+++ b/demo-template-enjoy/src/main/java/com/xkcoding/template/enjoy/controller/UserController.java
@@ -15,13 +15,8 @@ import javax.servlet.http.HttpServletRequest;
* 用户页面
*
*
- * @package: com.xkcoding.template.enjoy.controller
- * @description: 用户页面
- * @author: yangkai.shen
- * @date: Created in 2018/10/11 2:24 PM
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-10-11 14:24
*/
@Controller
@RequestMapping("/user")
diff --git a/demo-template-enjoy/src/main/java/com/xkcoding/template/enjoy/model/User.java b/demo-template-enjoy/src/main/java/com/xkcoding/template/enjoy/model/User.java
index 99a7bce..af7c813 100644
--- a/demo-template-enjoy/src/main/java/com/xkcoding/template/enjoy/model/User.java
+++ b/demo-template-enjoy/src/main/java/com/xkcoding/template/enjoy/model/User.java
@@ -7,13 +7,8 @@ import lombok.Data;
* 用户 model
*
*
- * @package: com.xkcoding.template.enjoy.model
- * @description: 用户 model
- * @author: yangkai.shen
- * @date: Created in 2018/10/11 2:21 PM
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-10-11 14:21
*/
@Data
public class User {
diff --git a/demo-template-freemarker/README.md b/demo-template-freemarker/README.md
index 825ab54..bd22e2b 100644
--- a/demo-template-freemarker/README.md
+++ b/demo-template-freemarker/README.md
@@ -79,13 +79,8 @@
* 主页
*
*
- * @package: com.xkcoding.template.freemarker.controller
- * @description: 主页
- * @author: yangkai.shen
- * @date: Created in 2018/10/9 3:07 PM
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-10-019 15:07
*/
@Controller
@Slf4j
@@ -116,13 +111,8 @@ public class IndexController {
* 用户页面
*
*
- * @package: com.xkcoding.template.freemarker.controller
- * @description: 用户页面
- * @author: yangkai.shen
- * @date: Created in 2018/10/9 3:11 PM
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-10-019 15:11
*/
@Controller
@RequestMapping("/user")
diff --git a/demo-template-freemarker/src/main/java/com/xkcoding/template/freemarker/SpringBootDemoTemplateFreemarkerApplication.java b/demo-template-freemarker/src/main/java/com/xkcoding/template/freemarker/SpringBootDemoTemplateFreemarkerApplication.java
index bd01c29..735fce7 100644
--- a/demo-template-freemarker/src/main/java/com/xkcoding/template/freemarker/SpringBootDemoTemplateFreemarkerApplication.java
+++ b/demo-template-freemarker/src/main/java/com/xkcoding/template/freemarker/SpringBootDemoTemplateFreemarkerApplication.java
@@ -8,13 +8,8 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
* 启动类
*
*
- * @package: com.xkcoding.template.freemarker
- * @description: 启动类
- * @author: yangkai.shen
- * @date: Created in 2018/10/9 3:17 PM
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-10-19 15:17
*/
@SpringBootApplication
public class SpringBootDemoTemplateFreemarkerApplication {
diff --git a/demo-template-freemarker/src/main/java/com/xkcoding/template/freemarker/controller/IndexController.java b/demo-template-freemarker/src/main/java/com/xkcoding/template/freemarker/controller/IndexController.java
index d06aa4e..4742535 100644
--- a/demo-template-freemarker/src/main/java/com/xkcoding/template/freemarker/controller/IndexController.java
+++ b/demo-template-freemarker/src/main/java/com/xkcoding/template/freemarker/controller/IndexController.java
@@ -14,13 +14,8 @@ import javax.servlet.http.HttpServletRequest;
* 主页
*
*
- * @package: com.xkcoding.template.freemarker.controller
- * @description: 主页
- * @author: yangkai.shen
- * @date: Created in 2018/10/9 3:07 PM
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-10-19 15:07
*/
@Controller
@Slf4j
diff --git a/demo-template-freemarker/src/main/java/com/xkcoding/template/freemarker/controller/UserController.java b/demo-template-freemarker/src/main/java/com/xkcoding/template/freemarker/controller/UserController.java
index 0631e06..93b2fe7 100644
--- a/demo-template-freemarker/src/main/java/com/xkcoding/template/freemarker/controller/UserController.java
+++ b/demo-template-freemarker/src/main/java/com/xkcoding/template/freemarker/controller/UserController.java
@@ -15,13 +15,8 @@ import javax.servlet.http.HttpServletRequest;
* 用户页面
*
*
- * @package: com.xkcoding.template.freemarker.controller
- * @description: 用户页面
- * @author: yangkai.shen
- * @date: Created in 2018/10/9 3:11 PM
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-10-19 15:11
*/
@Controller
@RequestMapping("/user")
diff --git a/demo-template-freemarker/src/main/java/com/xkcoding/template/freemarker/model/User.java b/demo-template-freemarker/src/main/java/com/xkcoding/template/freemarker/model/User.java
index d03e420..ac1e016 100644
--- a/demo-template-freemarker/src/main/java/com/xkcoding/template/freemarker/model/User.java
+++ b/demo-template-freemarker/src/main/java/com/xkcoding/template/freemarker/model/User.java
@@ -7,13 +7,8 @@ import lombok.Data;
* 用户 model
*
*
- * @package: com.xkcoding.template.freemarker.model
- * @description: 用户 model
- * @author: yangkai.shen
- * @date: Created in 2018/10/9 3:06 PM
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-10-19 15:06
*/
@Data
public class User {
diff --git a/demo-template-thymeleaf/README.md b/demo-template-thymeleaf/README.md
index 10569a3..e588d1e 100644
--- a/demo-template-thymeleaf/README.md
+++ b/demo-template-thymeleaf/README.md
@@ -79,13 +79,8 @@
* 主页
*
*
- * @package: com.xkcoding.template.thymeleaf.controller
- * @description: 主页
- * @author: yangkai.shen
- * @date: Created in 2018/10/10 10:12 AM
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-10-10 10:12
*/
@Controller
@Slf4j
@@ -116,13 +111,8 @@ public class IndexController {
* 用户页面
*
*
- * @package: com.xkcoding.template.thymeleaf.controller
- * @description: 用户页面
- * @author: yangkai.shen
- * @date: Created in 2018/10/10 10:11 AM
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-10-10 10:11
*/
@Controller
@RequestMapping("/user")
diff --git a/demo-template-thymeleaf/src/main/java/com/xkcoding/template/thymeleaf/SpringBootDemoTemplateThymeleafApplication.java b/demo-template-thymeleaf/src/main/java/com/xkcoding/template/thymeleaf/SpringBootDemoTemplateThymeleafApplication.java
index 0bb1b92..b4c482f 100644
--- a/demo-template-thymeleaf/src/main/java/com/xkcoding/template/thymeleaf/SpringBootDemoTemplateThymeleafApplication.java
+++ b/demo-template-thymeleaf/src/main/java/com/xkcoding/template/thymeleaf/SpringBootDemoTemplateThymeleafApplication.java
@@ -8,13 +8,8 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
* 启动类
*
*
- * @package: com.xkcoding.template.thymeleaf
- * @description: 启动类
- * @author: yangkai.shen
- * @date: Created in 2018/10/10 10:10 AM
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-10-10 10:10
*/
@SpringBootApplication
public class SpringBootDemoTemplateThymeleafApplication {
diff --git a/demo-template-thymeleaf/src/main/java/com/xkcoding/template/thymeleaf/controller/IndexController.java b/demo-template-thymeleaf/src/main/java/com/xkcoding/template/thymeleaf/controller/IndexController.java
index 228554a..dced597 100644
--- a/demo-template-thymeleaf/src/main/java/com/xkcoding/template/thymeleaf/controller/IndexController.java
+++ b/demo-template-thymeleaf/src/main/java/com/xkcoding/template/thymeleaf/controller/IndexController.java
@@ -14,13 +14,8 @@ import javax.servlet.http.HttpServletRequest;
* 主页
*
*
- * @package: com.xkcoding.template.thymeleaf.controller
- * @description: 主页
- * @author: yangkai.shen
- * @date: Created in 2018/10/10 10:12 AM
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-10-10 10:12
*/
@Controller
@Slf4j
diff --git a/demo-template-thymeleaf/src/main/java/com/xkcoding/template/thymeleaf/controller/UserController.java b/demo-template-thymeleaf/src/main/java/com/xkcoding/template/thymeleaf/controller/UserController.java
index 2b57459..aefb8e8 100644
--- a/demo-template-thymeleaf/src/main/java/com/xkcoding/template/thymeleaf/controller/UserController.java
+++ b/demo-template-thymeleaf/src/main/java/com/xkcoding/template/thymeleaf/controller/UserController.java
@@ -15,13 +15,8 @@ import javax.servlet.http.HttpServletRequest;
* 用户页面
*
*
- * @package: com.xkcoding.template.thymeleaf.controller
- * @description: 用户页面
- * @author: yangkai.shen
- * @date: Created in 2018/10/10 10:11 AM
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-10-10 10:11
*/
@Controller
@RequestMapping("/user")
diff --git a/demo-template-thymeleaf/src/main/java/com/xkcoding/template/thymeleaf/model/User.java b/demo-template-thymeleaf/src/main/java/com/xkcoding/template/thymeleaf/model/User.java
index 01592d4..4729104 100644
--- a/demo-template-thymeleaf/src/main/java/com/xkcoding/template/thymeleaf/model/User.java
+++ b/demo-template-thymeleaf/src/main/java/com/xkcoding/template/thymeleaf/model/User.java
@@ -7,13 +7,8 @@ import lombok.Data;
* 用户 model
*
*
- * @package: com.xkcoding.template.thymeleaf.model
- * @description: 用户 model
- * @author: yangkai.shen
- * @date: Created in 2018/10/10 10:11 AM
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-10-10 10:11
*/
@Data
public class User {
diff --git a/demo-tio/src/main/java/com/xkcoding/springbootdemotio/SpringBootDemoTioApplication.java b/demo-tio/src/main/java/com/xkcoding/springbootdemotio/SpringBootDemoTioApplication.java
index 3d8746a..5822865 100644
--- a/demo-tio/src/main/java/com/xkcoding/springbootdemotio/SpringBootDemoTioApplication.java
+++ b/demo-tio/src/main/java/com/xkcoding/springbootdemotio/SpringBootDemoTioApplication.java
@@ -8,13 +8,8 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
* 启动器
*
*
- * @package: com.xkcoding.springbootdemotio
- * @description: 启动器
- * @author: yangkai.shen
- * @date: Created in 2019-02-05 18:58
- * @copyright: Copyright (c) 2019
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2019-02-05 18:58
*/
@SpringBootApplication
public class SpringBootDemoTioApplication {
diff --git a/demo-upload/README.md b/demo-upload/README.md
index a139374..22d01df 100644
--- a/demo-upload/README.md
+++ b/demo-upload/README.md
@@ -85,13 +85,8 @@
* 上传配置
*
*
- * @package: com.xkcoding.upload.config
- * @description: 上传配置
- * @author: yangkai.shen
- * @date: Created in 2018/10/23 14:09
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-10-23 14:09
*/
@Configuration
@ConditionalOnClass({Servlet.class, StandardServletMultipartResolver.class, MultipartConfigElement.class})
@@ -173,13 +168,8 @@ public class UploadConfig {
* 文件上传 Controller
*
*
- * @package: com.xkcoding.upload.controller
- * @description: 文件上传 Controller
- * @author: yangkai.shen
- * @date: Created in 2018/11/6 16:33
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-11-06 16:33
*/
@RestController
@Slf4j
@@ -261,13 +251,8 @@ public class UploadController {
* 七牛云上传Service
*
*
- * @package: com.xkcoding.upload.service.impl
- * @description: 七牛云上传Service
- * @author: yangkai.shen
- * @date: Created in 2018/11/6 17:22
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-11-06 17:22
*/
@Service
@Slf4j
diff --git a/demo-upload/src/main/java/com/xkcoding/upload/SpringBootDemoUploadApplication.java b/demo-upload/src/main/java/com/xkcoding/upload/SpringBootDemoUploadApplication.java
index 2afb7af..ff9fba8 100644
--- a/demo-upload/src/main/java/com/xkcoding/upload/SpringBootDemoUploadApplication.java
+++ b/demo-upload/src/main/java/com/xkcoding/upload/SpringBootDemoUploadApplication.java
@@ -8,13 +8,8 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
* 启动类
*
*
- * @package: com.xkcoding.upload
- * @description: 启动类
- * @author: shenyangkai
- * @date: Created in 2018/10/20 21:23
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: shenyangkai
+ * @author yangkai.shen
+ * @date Created in 2018-10-20 21:23
*/
@SpringBootApplication
public class SpringBootDemoUploadApplication {
diff --git a/demo-upload/src/main/java/com/xkcoding/upload/config/UploadConfig.java b/demo-upload/src/main/java/com/xkcoding/upload/config/UploadConfig.java
index c367ca8..d8b4a51 100644
--- a/demo-upload/src/main/java/com/xkcoding/upload/config/UploadConfig.java
+++ b/demo-upload/src/main/java/com/xkcoding/upload/config/UploadConfig.java
@@ -25,13 +25,8 @@ import javax.servlet.Servlet;
* 上传配置
*
*
- * @package: com.xkcoding.upload.config
- * @description: 上传配置
- * @author: yangkai.shen
- * @date: Created in 2018/10/23 14:09
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-10-23 14:09
*/
@Configuration
@ConditionalOnClass({Servlet.class, StandardServletMultipartResolver.class, MultipartConfigElement.class})
diff --git a/demo-upload/src/main/java/com/xkcoding/upload/controller/IndexController.java b/demo-upload/src/main/java/com/xkcoding/upload/controller/IndexController.java
index 003ffc2..c1fbe33 100644
--- a/demo-upload/src/main/java/com/xkcoding/upload/controller/IndexController.java
+++ b/demo-upload/src/main/java/com/xkcoding/upload/controller/IndexController.java
@@ -8,13 +8,8 @@ import org.springframework.web.bind.annotation.GetMapping;
* 首页Controller
*
*
- * @package: com.xkcoding.upload.controller
- * @description: 首页Controller
- * @author: shenyangkai
- * @date: Created in 2018/10/20 21:22
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: shenyangkai
+ * @author yangkai.shen
+ * @date Created in 2018-10-20 21:22
*/
@Controller
public class IndexController {
diff --git a/demo-upload/src/main/java/com/xkcoding/upload/controller/UploadController.java b/demo-upload/src/main/java/com/xkcoding/upload/controller/UploadController.java
index e31dd42..bb0abb9 100644
--- a/demo-upload/src/main/java/com/xkcoding/upload/controller/UploadController.java
+++ b/demo-upload/src/main/java/com/xkcoding/upload/controller/UploadController.java
@@ -26,13 +26,8 @@ import java.io.IOException;
* 文件上传 Controller
*
*
- * @package: com.xkcoding.upload.controller
- * @description: 文件上传 Controller
- * @author: yangkai.shen
- * @date: Created in 2018/11/6 16:33
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-11-06 16:33
*/
@RestController
@Slf4j
diff --git a/demo-upload/src/main/java/com/xkcoding/upload/service/IQiNiuService.java b/demo-upload/src/main/java/com/xkcoding/upload/service/IQiNiuService.java
index 15a15be..0a956b3 100644
--- a/demo-upload/src/main/java/com/xkcoding/upload/service/IQiNiuService.java
+++ b/demo-upload/src/main/java/com/xkcoding/upload/service/IQiNiuService.java
@@ -10,13 +10,8 @@ import java.io.File;
* 七牛云上传Service
*
*
- * @package: com.xkcoding.upload.service
- * @description: 七牛云上传Service
- * @author: yangkai.shen
- * @date: Created in 2018/11/6 17:21
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-11-06 17:21
*/
public interface IQiNiuService {
/**
diff --git a/demo-upload/src/main/java/com/xkcoding/upload/service/impl/QiNiuServiceImpl.java b/demo-upload/src/main/java/com/xkcoding/upload/service/impl/QiNiuServiceImpl.java
index 8993e64..470b0d5 100644
--- a/demo-upload/src/main/java/com/xkcoding/upload/service/impl/QiNiuServiceImpl.java
+++ b/demo-upload/src/main/java/com/xkcoding/upload/service/impl/QiNiuServiceImpl.java
@@ -19,13 +19,8 @@ import java.io.File;
* 七牛云上传Service
*
*
- * @package: com.xkcoding.upload.service.impl
- * @description: 七牛云上传Service
- * @author: yangkai.shen
- * @date: Created in 2018/11/6 17:22
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-11-06 17:22
*/
@Service
@Slf4j
diff --git a/demo-ureport2/src/main/java/com/xkcoding/ureport2/SpringBootDemoUreport2Application.java b/demo-ureport2/src/main/java/com/xkcoding/ureport2/SpringBootDemoUreport2Application.java
index 369d64c..f16fd40 100644
--- a/demo-ureport2/src/main/java/com/xkcoding/ureport2/SpringBootDemoUreport2Application.java
+++ b/demo-ureport2/src/main/java/com/xkcoding/ureport2/SpringBootDemoUreport2Application.java
@@ -8,13 +8,8 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
* 启动器
*
*
- * @package: com.xkcoding.ureport2
- * @description: 启动器
- * @author: yangkai.shen
- * @date: Created in 2019-02-26 23:56
- * @copyright: Copyright (c) 2019
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2019-02-26 23:56
*/
@SpringBootApplication
public class SpringBootDemoUreport2Application {
diff --git a/demo-urule/src/main/java/com/xkcoding/urule/SpringBootDemoUruleApplication.java b/demo-urule/src/main/java/com/xkcoding/urule/SpringBootDemoUruleApplication.java
index d9d0dbb..3ff9b9f 100644
--- a/demo-urule/src/main/java/com/xkcoding/urule/SpringBootDemoUruleApplication.java
+++ b/demo-urule/src/main/java/com/xkcoding/urule/SpringBootDemoUruleApplication.java
@@ -8,13 +8,8 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
* 启动器
*
*
- * @package: com.xkcoding.urule
- * @description: 启动器
- * @author: yangkai.shen
- * @date: Created in 2019-02-25 22:46
- * @copyright: Copyright (c) 2019
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2019-02-25 22:46
*/
@SpringBootApplication
public class SpringBootDemoUruleApplication {
diff --git a/demo-war/README.md b/demo-war/README.md
index 978ceeb..6f1f182 100644
--- a/demo-war/README.md
+++ b/demo-war/README.md
@@ -71,13 +71,8 @@
* 启动器
*
*
- * @package: com.xkcoding.war
- * @description: 启动器
- * @author: shenyangkai
- * @date: Created in 2018/10/30 19:37
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: shenyangkai
+ * @author yangkai.shen
+ * @date Created in 2018-10-30 19:37
*/
@SpringBootApplication
public class SpringBootDemoWarApplication extends SpringBootServletInitializer {
@@ -87,7 +82,7 @@ public class SpringBootDemoWarApplication extends SpringBootServletInitializer {
}
/**
- * 若需要打成 war 包，则需要写一个类继承 {@link SpringBootServletInitializer} 并重写 {@link SpringBootServletInitializer#configure(SpringApplicationBuilder)}
+ * 若需要打成 war 包，则需要写一个类继承 {@link SpringBootServletInitializer} 并重写 {@link SpringBootServletInitializer#configure(SpringApplicationBuilder)}
*/
@Override
protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
diff --git a/demo-war/src/main/java/com/xkcoding/war/SpringBootDemoWarApplication.java b/demo-war/src/main/java/com/xkcoding/war/SpringBootDemoWarApplication.java
index 2ef1d1b..f1da4cd 100644
--- a/demo-war/src/main/java/com/xkcoding/war/SpringBootDemoWarApplication.java
+++ b/demo-war/src/main/java/com/xkcoding/war/SpringBootDemoWarApplication.java
@@ -10,13 +10,8 @@ import org.springframework.boot.web.servlet.support.SpringBootServletInitializer
* 启动器
*
*
- * @package: com.xkcoding.war
- * @description: 启动器
- * @author: shenyangkai
- * @date: Created in 2018/10/30 19:37
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: shenyangkai
+ * @author yangkai.shen
+ * @date Created in 2018-10-30 19:37
*/
@SpringBootApplication
public class SpringBootDemoWarApplication extends SpringBootServletInitializer {
diff --git a/demo-websocket-socketio/README.md b/demo-websocket-socketio/README.md
index 8eaea88..60d43cd 100644
--- a/demo-websocket-socketio/README.md
+++ b/demo-websocket-socketio/README.md
@@ -91,13 +91,8 @@
* websocket服务器配置
*
*
- * @package: com.xkcoding.websocket.socketio.config
- * @description: websocket服务器配置
- * @author: yangkai.shen
- * @date: Created in 2018-12-18 16:42
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-18 16:42
*/
@Configuration
@EnableConfigurationProperties({WsConfig.class})
@@ -142,13 +137,8 @@ public class ServerConfig {
* 消息事件处理
*
*
- * @package: com.xkcoding.websocket.socketio.handler
- * @description: 消息事件处理
- * @author: yangkai.shen
- * @date: Created in 2018-12-18 18:57
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-18 18:57
*/
@Component
@Slf4j
@@ -286,13 +276,8 @@ public class MessageEventHandler {
* websocket服务器启动
*
*
- * @package: com.xkcoding.websocket.socketio.init
- * @description: websocket服务器启动
- * @author: yangkai.shen
- * @date: Created in 2018-12-18 17:07
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-18 17:07
*/
@Component
@Slf4j
@@ -331,4 +316,4 @@ public class ServerRunner implements CommandLineRunner {
### 4.2. 前端
1. socket.io 官网：https://socket.io/
-2. axios.js 用法：https://github.com/axios/axios#example
\ No newline at end of file
+2. axios.js 用法：https://github.com/axios/axios#example
diff --git a/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/SpringBootDemoWebsocketSocketioApplication.java b/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/SpringBootDemoWebsocketSocketioApplication.java
index c604527..2d1c7fa 100644
--- a/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/SpringBootDemoWebsocketSocketioApplication.java
+++ b/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/SpringBootDemoWebsocketSocketioApplication.java
@@ -8,13 +8,8 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
* 启动器
*
*
- * @package: com.xkcoding.websocket.socketio
- * @description: 启动器
- * @author: yangkai.shen
- * @date: Created in 2018-12-12 13:59
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-12 13:59
*/
@SpringBootApplication
public class SpringBootDemoWebsocketSocketioApplication {
diff --git a/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/config/DbTemplate.java b/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/config/DbTemplate.java
index 225187a..8f24558 100644
--- a/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/config/DbTemplate.java
+++ b/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/config/DbTemplate.java
@@ -13,13 +13,8 @@ import java.util.concurrent.ConcurrentHashMap;
* 模拟数据库
*
*
- * @package: com.xkcoding.websocket.socketio.config
- * @description: 模拟数据库
- * @author: yangkai.shen
- * @date: Created in 2018-12-18 19:12
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-18 19:12
*/
@Component
public class DbTemplate {
diff --git a/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/config/Event.java b/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/config/Event.java
index 75caa7f..0fb4468 100644
--- a/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/config/Event.java
+++ b/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/config/Event.java
@@ -5,13 +5,8 @@ package com.xkcoding.websocket.socketio.config;
* 事件常量
*
*
- * @package: com.xkcoding.websocket.socketio.config
- * @description: 事件常量
- * @author: yangkai.shen
- * @date: Created in 2018-12-18 19:36
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-18 19:36
*/
public interface Event {
/**
diff --git a/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/config/ServerConfig.java b/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/config/ServerConfig.java
index 8baccc1..15985a3 100644
--- a/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/config/ServerConfig.java
+++ b/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/config/ServerConfig.java
@@ -12,13 +12,8 @@ import org.springframework.context.annotation.Configuration;
* websocket服务器配置
*
*
- * @package: com.xkcoding.websocket.socketio.config
- * @description: websocket服务器配置
- * @author: yangkai.shen
- * @date: Created in 2018-12-18 16:42
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-18 16:42
*/
@Configuration
@EnableConfigurationProperties({WsConfig.class})
diff --git a/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/config/WsConfig.java b/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/config/WsConfig.java
index a94505c..1077fae 100644
--- a/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/config/WsConfig.java
+++ b/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/config/WsConfig.java
@@ -8,13 +8,8 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
* WebSocket配置类
*
*
- * @package: com.xkcoding.websocket.socketio.config
- * @description: WebSocket配置类
- * @author: yangkai.shen
- * @date: Created in 2018-12-18 16:41
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-18 16:41
*/
@ConfigurationProperties(prefix = "ws.server")
@Data
diff --git a/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/controller/MessageController.java b/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/controller/MessageController.java
index ed94ffb..a64c638 100644
--- a/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/controller/MessageController.java
+++ b/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/controller/MessageController.java
@@ -19,13 +19,8 @@ import java.lang.reflect.Field;
* 消息发送Controller
*
*
- * @package: com.xkcoding.websocket.socketio.controller
- * @description: 消息发送Controller
- * @author: yangkai.shen
- * @date: Created in 2018-12-18 19:50
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-18 19:50
*/
@RestController
@RequestMapping("/send")
diff --git a/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/handler/MessageEventHandler.java b/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/handler/MessageEventHandler.java
index 3610115..d89a6c3 100644
--- a/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/handler/MessageEventHandler.java
+++ b/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/handler/MessageEventHandler.java
@@ -27,13 +27,8 @@ import java.util.UUID;
* 消息事件处理
*
*
- * @package: com.xkcoding.websocket.socketio.handler
- * @description: 消息事件处理
- * @author: yangkai.shen
- * @date: Created in 2018-12-18 18:57
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-18 18:57
*/
@Component
@Slf4j
diff --git a/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/init/ServerRunner.java b/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/init/ServerRunner.java
index cb548b5..23daf6e 100644
--- a/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/init/ServerRunner.java
+++ b/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/init/ServerRunner.java
@@ -11,13 +11,8 @@ import org.springframework.stereotype.Component;
* websocket服务器启动
*
*
- * @package: com.xkcoding.websocket.socketio.init
- * @description: websocket服务器启动
- * @author: yangkai.shen
- * @date: Created in 2018-12-18 17:07
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-18 17:07
*/
@Component
@Slf4j
diff --git a/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/payload/BroadcastMessageRequest.java b/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/payload/BroadcastMessageRequest.java
index 7fe9bb3..47de011 100644
--- a/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/payload/BroadcastMessageRequest.java
+++ b/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/payload/BroadcastMessageRequest.java
@@ -7,13 +7,8 @@ import lombok.Data;
* 广播消息载荷
*
*
- * @package: com.xkcoding.websocket.socketio.payload
- * @description: 广播消息载荷
- * @author: yangkai.shen
- * @date: Created in 2018-12-18 20:01
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-18 20:01
*/
@Data
public class BroadcastMessageRequest {
diff --git a/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/payload/GroupMessageRequest.java b/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/payload/GroupMessageRequest.java
index 5670b41..67d7171 100644
--- a/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/payload/GroupMessageRequest.java
+++ b/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/payload/GroupMessageRequest.java
@@ -7,13 +7,8 @@ import lombok.Data;
* 群聊消息载荷
*
*
- * @package: com.xkcoding.websocket.socketio.payload
- * @description: 群聊消息载荷
- * @author: yangkai.shen
- * @date: Created in 2018-12-18 16:59
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-18 16:59
*/
@Data
public class GroupMessageRequest {
diff --git a/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/payload/JoinRequest.java b/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/payload/JoinRequest.java
index ef63fc8..d20d873 100644
--- a/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/payload/JoinRequest.java
+++ b/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/payload/JoinRequest.java
@@ -7,13 +7,8 @@ import lombok.Data;
* 加群载荷
*
*
- * @package: com.xkcoding.websocket.socketio.payload
- * @description: 加群载荷
- * @author: yangkai.shen
- * @date: Created in 2018-12-19 13:36
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-19 13:36
*/
@Data
public class JoinRequest {
diff --git a/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/payload/SingleMessageRequest.java b/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/payload/SingleMessageRequest.java
index 5998b83..fcc2a46 100644
--- a/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/payload/SingleMessageRequest.java
+++ b/demo-websocket-socketio/src/main/java/com/xkcoding/websocket/socketio/payload/SingleMessageRequest.java
@@ -7,13 +7,8 @@ import lombok.Data;
* 私聊消息载荷
*
*
- * @package: com.xkcoding.websocket.socketio.payload
- * @description: 私聊消息载荷
- * @author: yangkai.shen
- * @date: Created in 2018-12-18 17:02
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-18 17:02
*/
@Data
public class SingleMessageRequest {
diff --git a/demo-websocket/README.md b/demo-websocket/README.md
index dc81fce..d69aaff 100644
--- a/demo-websocket/README.md
+++ b/demo-websocket/README.md
@@ -92,13 +92,8 @@
* WebSocket配置
*
*
- * @package: com.xkcoding.websocket.config
- * @description: WebSocket配置
- * @author: yangkai.shen
- * @date: Created in 2018-12-14 15:58
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-14 15:58
*/
@Configuration
@EnableWebSocket
@@ -135,13 +130,8 @@ public class WebSocketConfig implements WebSocketMessageBrokerConfigurer {
* 服务器定时推送任务
*
*
- * @package: com.xkcoding.websocket.task
- * @description: 服务器定时推送任务
- * @author: yangkai.shen
- * @date: Created in 2018-12-14 16:04
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-14 16:04
*/
@Slf4j
@Component
@@ -386,4 +376,4 @@ public class ServerTask {
2. element-ui 用法：http://element-cn.eleme.io/#/zh-CN
3. stomp.js 用法：https://github.com/jmesnil/stomp-websocket
4. sockjs 用法：https://github.com/sockjs/sockjs-client
-5. axios.js 用法：https://github.com/axios/axios#example
\ No newline at end of file
+5. axios.js 用法：https://github.com/axios/axios#example
diff --git a/demo-websocket/src/main/java/com/xkcoding/websocket/SpringBootDemoWebsocketApplication.java b/demo-websocket/src/main/java/com/xkcoding/websocket/SpringBootDemoWebsocketApplication.java
index 6351666..3633fa9 100644
--- a/demo-websocket/src/main/java/com/xkcoding/websocket/SpringBootDemoWebsocketApplication.java
+++ b/demo-websocket/src/main/java/com/xkcoding/websocket/SpringBootDemoWebsocketApplication.java
@@ -9,13 +9,8 @@ import org.springframework.scheduling.annotation.EnableScheduling;
* 启动器
*
*
- * @package: com.xkcoding.websocket
- * @description: 启动器
- * @author: yangkai.shen
- * @date: Created in 2018-12-14 14:58
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-14 14:58
*/
@SpringBootApplication
@EnableScheduling
diff --git a/demo-websocket/src/main/java/com/xkcoding/websocket/common/WebSocketConsts.java b/demo-websocket/src/main/java/com/xkcoding/websocket/common/WebSocketConsts.java
index 8b577e2..1d0bec6 100644
--- a/demo-websocket/src/main/java/com/xkcoding/websocket/common/WebSocketConsts.java
+++ b/demo-websocket/src/main/java/com/xkcoding/websocket/common/WebSocketConsts.java
@@ -5,13 +5,8 @@ package com.xkcoding.websocket.common;
* WebSocket常量
*
*
- * @package: com.xkcoding.websocket.common
- * @description: WebSocket常量
- * @author: yangkai.shen
- * @date: Created in 2018-12-14 16:01
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-14 16:01
*/
public interface WebSocketConsts {
String PUSH_SERVER = "/topic/server";
diff --git a/demo-websocket/src/main/java/com/xkcoding/websocket/config/WebSocketConfig.java b/demo-websocket/src/main/java/com/xkcoding/websocket/config/WebSocketConfig.java
index 47de6d4..8c08766 100644
--- a/demo-websocket/src/main/java/com/xkcoding/websocket/config/WebSocketConfig.java
+++ b/demo-websocket/src/main/java/com/xkcoding/websocket/config/WebSocketConfig.java
@@ -12,13 +12,8 @@ import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerCo
* WebSocket配置
*
*
- * @package: com.xkcoding.websocket.config
- * @description: WebSocket配置
- * @author: yangkai.shen
- * @date: Created in 2018-12-14 15:58
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-14 15:58
*/
@Configuration
@EnableWebSocket
diff --git a/demo-websocket/src/main/java/com/xkcoding/websocket/controller/ServerController.java b/demo-websocket/src/main/java/com/xkcoding/websocket/controller/ServerController.java
index b4c61e8..3dce171 100644
--- a/demo-websocket/src/main/java/com/xkcoding/websocket/controller/ServerController.java
+++ b/demo-websocket/src/main/java/com/xkcoding/websocket/controller/ServerController.java
@@ -13,13 +13,8 @@ import org.springframework.web.bind.annotation.RestController;
* 服务器监控Controller
*
*
- * @package: com.xkcoding.websocket.controller
- * @description: 服务器监控Controller
- * @author: yangkai.shen
- * @date: Created in 2018-12-17 10:22
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-17 10:22
*/
@RestController
@RequestMapping("/server")
diff --git a/demo-websocket/src/main/java/com/xkcoding/websocket/model/Server.java b/demo-websocket/src/main/java/com/xkcoding/websocket/model/Server.java
index 8d51a73..17fb9a3 100644
--- a/demo-websocket/src/main/java/com/xkcoding/websocket/model/Server.java
+++ b/demo-websocket/src/main/java/com/xkcoding/websocket/model/Server.java
@@ -23,13 +23,8 @@ import java.util.Properties;
* 服务器相关信息实体
*
*
- * @package: com.xkcoding.websocket.model
- * @description: 服务器相关信息实体
- * @author: yangkai.shen
- * @date: Created in 2018-12-14 16:09
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-14 16:09
*/
public class Server {
@@ -217,4 +212,4 @@ public class Server {
return String.format("%d B", size);
}
}
-}
\ No newline at end of file
+}
diff --git a/demo-websocket/src/main/java/com/xkcoding/websocket/model/server/Cpu.java b/demo-websocket/src/main/java/com/xkcoding/websocket/model/server/Cpu.java
index d84cb19..b0b59bd 100644
--- a/demo-websocket/src/main/java/com/xkcoding/websocket/model/server/Cpu.java
+++ b/demo-websocket/src/main/java/com/xkcoding/websocket/model/server/Cpu.java
@@ -7,13 +7,8 @@ import cn.hutool.core.util.NumberUtil;
* CPU相关信息实体
*
*
- * @package: com.xkcoding.websocket.model.server
- * @description: CPU相关信息实体
- * @author: yangkai.shen
- * @date: Created in 2018-12-14 16:09
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-14 16:09
*/
public class Cpu {
/**
@@ -98,4 +93,4 @@ public class Cpu {
public void setFree(double free) {
this.free = free;
}
-}
\ No newline at end of file
+}
diff --git a/demo-websocket/src/main/java/com/xkcoding/websocket/model/server/Jvm.java b/demo-websocket/src/main/java/com/xkcoding/websocket/model/server/Jvm.java
index a0b770b..3dd3ded 100644
--- a/demo-websocket/src/main/java/com/xkcoding/websocket/model/server/Jvm.java
+++ b/demo-websocket/src/main/java/com/xkcoding/websocket/model/server/Jvm.java
@@ -11,13 +11,8 @@ import java.util.Date;
* JVM相关信息实体
*
*
- * @package: com.xkcoding.websocket.model.server
- * @description: JVM相关信息实体
- * @author: yangkai.shen
- * @date: Created in 2018-12-14 16:09
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-14 16:09
*/
public class Jvm {
/**
@@ -130,4 +125,4 @@ public class Jvm {
.getStartTime();
return DateUtil.formatBetween(DateUtil.current(false) - startTime);
}
-}
\ No newline at end of file
+}
diff --git a/demo-websocket/src/main/java/com/xkcoding/websocket/model/server/Mem.java b/demo-websocket/src/main/java/com/xkcoding/websocket/model/server/Mem.java
index 0b72bf4..6d09d79 100644
--- a/demo-websocket/src/main/java/com/xkcoding/websocket/model/server/Mem.java
+++ b/demo-websocket/src/main/java/com/xkcoding/websocket/model/server/Mem.java
@@ -7,13 +7,8 @@ import cn.hutool.core.util.NumberUtil;
* 內存相关信息实体
*
*
- * @package: com.xkcoding.websocket.model.server
- * @description: 內存相关信息实体
- * @author: yangkai.shen
- * @date: Created in 2018-12-14 16:09
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-14 16:09
*/
public class Mem {
/**
@@ -58,4 +53,4 @@ public class Mem {
public double getUsage() {
return NumberUtil.mul(NumberUtil.div(used, total, 4), 100);
}
-}
\ No newline at end of file
+}
diff --git a/demo-websocket/src/main/java/com/xkcoding/websocket/model/server/Sys.java b/demo-websocket/src/main/java/com/xkcoding/websocket/model/server/Sys.java
index f2321cb..ee03793 100644
--- a/demo-websocket/src/main/java/com/xkcoding/websocket/model/server/Sys.java
+++ b/demo-websocket/src/main/java/com/xkcoding/websocket/model/server/Sys.java
@@ -5,13 +5,8 @@ package com.xkcoding.websocket.model.server;
* 系统相关信息实体
*
*
- * @package: com.xkcoding.websocket.model.server
- * @description: 系统相关信息实体
- * @author: yangkai.shen
- * @date: Created in 2018-12-14 16:10
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-14 16:10
*/
public class Sys {
/**
@@ -78,4 +73,4 @@ public class Sys {
public void setOsArch(String osArch) {
this.osArch = osArch;
}
-}
\ No newline at end of file
+}
diff --git a/demo-websocket/src/main/java/com/xkcoding/websocket/model/server/SysFile.java b/demo-websocket/src/main/java/com/xkcoding/websocket/model/server/SysFile.java
index 823cf75..00c63f7 100644
--- a/demo-websocket/src/main/java/com/xkcoding/websocket/model/server/SysFile.java
+++ b/demo-websocket/src/main/java/com/xkcoding/websocket/model/server/SysFile.java
@@ -5,13 +5,8 @@ package com.xkcoding.websocket.model.server;
* 系统文件相关信息实体
*
*
- * @package: com.xkcoding.websocket.model.server
- * @description: 系统文件相关信息实体
- * @author: yangkai.shen
- * @date: Created in 2018-12-14 16:10
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-14 16:10
*/
public class SysFile {
/**
@@ -104,4 +99,4 @@ public class SysFile {
public void setUsage(double usage) {
this.usage = usage;
}
-}
\ No newline at end of file
+}
diff --git a/demo-websocket/src/main/java/com/xkcoding/websocket/payload/KV.java b/demo-websocket/src/main/java/com/xkcoding/websocket/payload/KV.java
index 2db7086..469d24a 100644
--- a/demo-websocket/src/main/java/com/xkcoding/websocket/payload/KV.java
+++ b/demo-websocket/src/main/java/com/xkcoding/websocket/payload/KV.java
@@ -9,13 +9,8 @@ import lombok.NoArgsConstructor;
* 键值匹配
*
*
- * @package: com.xkcoding.websocket.payload
- * @description: 键值匹配
- * @author: yangkai.shen
- * @date: Created in 2018-12-14 17:41
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-14 17:41
*/
@Data
@AllArgsConstructor
diff --git a/demo-websocket/src/main/java/com/xkcoding/websocket/payload/ServerVO.java b/demo-websocket/src/main/java/com/xkcoding/websocket/payload/ServerVO.java
index d36b38a..4d97cd0 100644
--- a/demo-websocket/src/main/java/com/xkcoding/websocket/payload/ServerVO.java
+++ b/demo-websocket/src/main/java/com/xkcoding/websocket/payload/ServerVO.java
@@ -12,13 +12,8 @@ import java.util.List;
* 服务器信息VO
*
*
- * @package: com.xkcoding.websocket.payload
- * @description: 服务器信息VO
- * @author: yangkai.shen
- * @date: Created in 2018-12-14 17:25
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-14 17:25
*/
@Data
public class ServerVO {
diff --git a/demo-websocket/src/main/java/com/xkcoding/websocket/payload/server/CpuVO.java b/demo-websocket/src/main/java/com/xkcoding/websocket/payload/server/CpuVO.java
index e9524c9..73b7bd1 100644
--- a/demo-websocket/src/main/java/com/xkcoding/websocket/payload/server/CpuVO.java
+++ b/demo-websocket/src/main/java/com/xkcoding/websocket/payload/server/CpuVO.java
@@ -12,13 +12,8 @@ import java.util.List;
* CPU相关信息实体VO
*
*
- * @package: com.xkcoding.websocket.payload.server
- * @description: CPU相关信息实体VO
- * @author: yangkai.shen
- * @date: Created in 2018-12-14 17:27
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-14 17:27
*/
@Data
public class CpuVO {
@@ -34,4 +29,4 @@ public class CpuVO {
vo.data.add(new KV("CPU当前空闲率", cpu.getFree() + "%"));
return vo;
}
-}
\ No newline at end of file
+}
diff --git a/demo-websocket/src/main/java/com/xkcoding/websocket/payload/server/JvmVO.java b/demo-websocket/src/main/java/com/xkcoding/websocket/payload/server/JvmVO.java
index 78b6749..77285ae 100644
--- a/demo-websocket/src/main/java/com/xkcoding/websocket/payload/server/JvmVO.java
+++ b/demo-websocket/src/main/java/com/xkcoding/websocket/payload/server/JvmVO.java
@@ -12,13 +12,8 @@ import java.util.List;
* JVM相关信息实体VO
*
*
- * @package: com.xkcoding.websocket.payload.server
- * @description: JVM相关信息实体VO
- * @author: yangkai.shen
- * @date: Created in 2018-12-14 17:28
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-14 17:28
*/
@Data
public class JvmVO {
@@ -37,4 +32,4 @@ public class JvmVO {
return vo;
}
-}
\ No newline at end of file
+}
diff --git a/demo-websocket/src/main/java/com/xkcoding/websocket/payload/server/MemVO.java b/demo-websocket/src/main/java/com/xkcoding/websocket/payload/server/MemVO.java
index fa24fce..7ab709f 100644
--- a/demo-websocket/src/main/java/com/xkcoding/websocket/payload/server/MemVO.java
+++ b/demo-websocket/src/main/java/com/xkcoding/websocket/payload/server/MemVO.java
@@ -12,13 +12,8 @@ import java.util.List;
* 內存相关信息实体VO
*
*
- * @package: com.xkcoding.websocket.payload.server
- * @description: 內存相关信息实体VO
- * @author: yangkai.shen
- * @date: Created in 2018-12-14 17:28
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-14 17:28
*/
@Data
public class MemVO {
@@ -32,4 +27,4 @@ public class MemVO {
vo.data.add(new KV("使用率", mem.getUsage() + "%"));
return vo;
}
-}
\ No newline at end of file
+}
diff --git a/demo-websocket/src/main/java/com/xkcoding/websocket/payload/server/SysFileVO.java b/demo-websocket/src/main/java/com/xkcoding/websocket/payload/server/SysFileVO.java
index c4e5e46..c4b767e 100644
--- a/demo-websocket/src/main/java/com/xkcoding/websocket/payload/server/SysFileVO.java
+++ b/demo-websocket/src/main/java/com/xkcoding/websocket/payload/server/SysFileVO.java
@@ -12,13 +12,8 @@ import java.util.List;
* 系统文件相关信息实体VO
*
*
- * @package: com.xkcoding.websocket.payload.server
- * @description: 系统文件相关信息实体VO
- * @author: yangkai.shen
- * @date: Created in 2018-12-14 17:30
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-14 17:30
*/
@Data
public class SysFileVO {
@@ -41,4 +36,4 @@ public class SysFileVO {
}
return vo;
}
-}
\ No newline at end of file
+}
diff --git a/demo-websocket/src/main/java/com/xkcoding/websocket/payload/server/SysVO.java b/demo-websocket/src/main/java/com/xkcoding/websocket/payload/server/SysVO.java
index 6b722db..a3a0029 100644
--- a/demo-websocket/src/main/java/com/xkcoding/websocket/payload/server/SysVO.java
+++ b/demo-websocket/src/main/java/com/xkcoding/websocket/payload/server/SysVO.java
@@ -12,13 +12,8 @@ import java.util.List;
* 系统相关信息实体VO
*
*
- * @package: com.xkcoding.websocket.payload.server
- * @description: 系统相关信息实体VO
- * @author: yangkai.shen
- * @date: Created in 2018-12-14 17:28
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-14 17:28
*/
@Data
public class SysVO {
@@ -33,4 +28,4 @@ public class SysVO {
vo.data.add(new KV("系统架构", sys.getOsArch()));
return vo;
}
-}
\ No newline at end of file
+}
diff --git a/demo-websocket/src/main/java/com/xkcoding/websocket/task/ServerTask.java b/demo-websocket/src/main/java/com/xkcoding/websocket/task/ServerTask.java
index 62d24e9..8088161 100644
--- a/demo-websocket/src/main/java/com/xkcoding/websocket/task/ServerTask.java
+++ b/demo-websocket/src/main/java/com/xkcoding/websocket/task/ServerTask.java
@@ -20,13 +20,8 @@ import java.util.Date;
* 服务器定时推送任务
*
*
- * @package: com.xkcoding.websocket.task
- * @description: 服务器定时推送任务
- * @author: yangkai.shen
- * @date: Created in 2018-12-14 16:04
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-14 16:04
*/
@Slf4j
@Component
diff --git a/demo-websocket/src/main/java/com/xkcoding/websocket/util/IpUtil.java b/demo-websocket/src/main/java/com/xkcoding/websocket/util/IpUtil.java
index 68ac0c5..647d570 100644
--- a/demo-websocket/src/main/java/com/xkcoding/websocket/util/IpUtil.java
+++ b/demo-websocket/src/main/java/com/xkcoding/websocket/util/IpUtil.java
@@ -9,13 +9,8 @@ import java.net.UnknownHostException;
* IP 工具类
*
*
- * @package: com.xkcoding.websocket.util
- * @description: IP 工具类
- * @author: yangkai.shen
- * @date: Created in 2018-12-14 16:08
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-14 16:08
*/
public class IpUtil {
public static String getIpAddr(HttpServletRequest request) {
@@ -166,4 +161,4 @@ public class IpUtil {
}
return "未知";
}
-}
\ No newline at end of file
+}
diff --git a/demo-websocket/src/main/java/com/xkcoding/websocket/util/ServerUtil.java b/demo-websocket/src/main/java/com/xkcoding/websocket/util/ServerUtil.java
index 4256f18..4f940fa 100644
--- a/demo-websocket/src/main/java/com/xkcoding/websocket/util/ServerUtil.java
+++ b/demo-websocket/src/main/java/com/xkcoding/websocket/util/ServerUtil.java
@@ -9,13 +9,8 @@ import com.xkcoding.websocket.payload.ServerVO;
* 服务器转换工具类
*
*
- * @package: com.xkcoding.websocket.util
- * @description: 服务器转换工具类
- * @author: yangkai.shen
- * @date: Created in 2018-12-17 10:24
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-17 10:24
*/
public class ServerUtil {
/**
diff --git a/demo-zookeeper/README.md b/demo-zookeeper/README.md
index 8b12cf1..15d10b9 100644
--- a/demo-zookeeper/README.md
+++ b/demo-zookeeper/README.md
@@ -93,13 +93,8 @@
* Zookeeper 配置项
*
*
- * @package: com.xkcoding.zookeeper.config.props
- * @description: Zookeeper 配置项
- * @author: yangkai.shen
- * @date: Created in 2018-12-27 14:47
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-27 14:47
*/
@Data
@ConfigurationProperties(prefix = "zk")
@@ -143,13 +138,8 @@ zk:
* Zookeeper配置类
*
*
- * @package: com.xkcoding.zookeeper.config
- * @description: Zookeeper配置类
- * @author: yangkai.shen
- * @date: Created in 2018-12-27 14:45
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-27 14:45
*/
@Configuration
@EnableConfigurationProperties(ZkProps.class)
@@ -182,13 +172,8 @@ public class ZkConfig {
* 在需要加锁的方法上打上该注解后，AOP会帮助你统一管理这个方法的锁
*
*
- * @package: com.xkcoding.zookeeper.annotation
- * @description: 基于Zookeeper的分布式锁注解，在需要加锁的方法上打上该注解后，AOP会帮助你统一管理这个方法的锁
- * @author: yangkai.shen
- * @date: Created in 2018-12-27 14:11
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-27 14:11
*/
@Target({ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME)
@@ -222,13 +207,8 @@ public @interface ZooLock {
* 分布式锁动态key注解，配置之后key的值会动态获取参数内容
*
*
- * @package: com.xkcoding.zookeeper.annotation
- * @description: 分布式锁动态key注解，配置之后key的值会动态获取参数内容
- * @author: yangkai.shen
- * @date: Created in 2018-12-27 14:17
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-27 14:17
*/
@Target({ElementType.PARAMETER})
@Retention(RetentionPolicy.RUNTIME)
@@ -255,13 +235,8 @@ public @interface LockKeyParam {
* 使用 aop 切面记录请求日志信息
*
*
- * @package: com.xkcoding.log.aop.aspectj
- * @description: 使用 aop 切面记录请求日志信息
- * @author: yangkai.shen
- * @date: Created in 2018/10/1 10:05 PM
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-10-01 22:05
*/
@Aspect
@Component
@@ -458,4 +433,4 @@ public class SpringBootDemoZookeeperApplicationTests {
## 参考
1. [如何在测试类中使用 AOP](https://stackoverflow.com/questions/11436600/unit-testing-spring-around-aop-methods)
-2. zookeeper 实现分布式锁：《Spring Boot 2精髓 从构建小系统到架构分布式大系统》李家智 - 第16章 - Spring Boot 和 Zoo Keeper - 16.3 实现分布式锁
\ No newline at end of file
+2. zookeeper 实现分布式锁：《Spring Boot 2精髓 从构建小系统到架构分布式大系统》李家智 - 第16章 - Spring Boot 和 Zoo Keeper - 16.3 实现分布式锁
diff --git a/demo-zookeeper/src/main/java/com/xkcoding/zookeeper/SpringBootDemoZookeeperApplication.java b/demo-zookeeper/src/main/java/com/xkcoding/zookeeper/SpringBootDemoZookeeperApplication.java
index 24867cf..766fbcf 100644
--- a/demo-zookeeper/src/main/java/com/xkcoding/zookeeper/SpringBootDemoZookeeperApplication.java
+++ b/demo-zookeeper/src/main/java/com/xkcoding/zookeeper/SpringBootDemoZookeeperApplication.java
@@ -8,13 +8,8 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
* 启动器
*
*
- * @package: com.xkcoding.zookeeper
- * @description: 启动器
- * @author: yangkai.shen
- * @date: Created in 2018-12-27 14:51
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-27 14:51
*/
@SpringBootApplication
public class SpringBootDemoZookeeperApplication {
diff --git a/demo-zookeeper/src/main/java/com/xkcoding/zookeeper/annotation/LockKeyParam.java b/demo-zookeeper/src/main/java/com/xkcoding/zookeeper/annotation/LockKeyParam.java
index c010e6b..1f2d302 100644
--- a/demo-zookeeper/src/main/java/com/xkcoding/zookeeper/annotation/LockKeyParam.java
+++ b/demo-zookeeper/src/main/java/com/xkcoding/zookeeper/annotation/LockKeyParam.java
@@ -7,13 +7,8 @@ import java.lang.annotation.*;
* 分布式锁动态key注解，配置之后key的值会动态获取参数内容
*
*
- * @package: com.xkcoding.zookeeper.annotation
- * @description: 分布式锁动态key注解，配置之后key的值会动态获取参数内容
- * @author: yangkai.shen
- * @date: Created in 2018-12-27 14:17
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-27 14:17
*/
@Target({ElementType.PARAMETER})
@Retention(RetentionPolicy.RUNTIME)
diff --git a/demo-zookeeper/src/main/java/com/xkcoding/zookeeper/annotation/ZooLock.java b/demo-zookeeper/src/main/java/com/xkcoding/zookeeper/annotation/ZooLock.java
index 6be1120..6e0f562 100644
--- a/demo-zookeeper/src/main/java/com/xkcoding/zookeeper/annotation/ZooLock.java
+++ b/demo-zookeeper/src/main/java/com/xkcoding/zookeeper/annotation/ZooLock.java
@@ -9,13 +9,8 @@ import java.util.concurrent.TimeUnit;
* 在需要加锁的方法上打上该注解后，AOP会帮助你统一管理这个方法的锁
*
*
- * @package: com.xkcoding.zookeeper.annotation
- * @description: 基于Zookeeper的分布式锁注解，在需要加锁的方法上打上该注解后，AOP会帮助你统一管理这个方法的锁
- * @author: yangkai.shen
- * @date: Created in 2018-12-27 14:11
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-27 14:11
*/
@Target({ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME)
diff --git a/demo-zookeeper/src/main/java/com/xkcoding/zookeeper/aspectj/ZooLockAspect.java b/demo-zookeeper/src/main/java/com/xkcoding/zookeeper/aspectj/ZooLockAspect.java
index de1bb3d..068b7f0 100644
--- a/demo-zookeeper/src/main/java/com/xkcoding/zookeeper/aspectj/ZooLockAspect.java
+++ b/demo-zookeeper/src/main/java/com/xkcoding/zookeeper/aspectj/ZooLockAspect.java
@@ -25,13 +25,8 @@ import java.lang.reflect.Method;
* 使用 aop 切面记录请求日志信息
*
*
- * @package: com.xkcoding.log.aop.aspectj
- * @description: 使用 aop 切面记录请求日志信息
- * @author: yangkai.shen
- * @date: Created in 2018/10/1 10:05 PM
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-10-01 22:05
*/
@Aspect
@Component
diff --git a/demo-zookeeper/src/main/java/com/xkcoding/zookeeper/config/ZkConfig.java b/demo-zookeeper/src/main/java/com/xkcoding/zookeeper/config/ZkConfig.java
index 5f5a656..3c25c69 100644
--- a/demo-zookeeper/src/main/java/com/xkcoding/zookeeper/config/ZkConfig.java
+++ b/demo-zookeeper/src/main/java/com/xkcoding/zookeeper/config/ZkConfig.java
@@ -15,13 +15,8 @@ import org.springframework.context.annotation.Configuration;
* Zookeeper配置类
*
*
- * @package: com.xkcoding.zookeeper.config
- * @description: Zookeeper配置类
- * @author: yangkai.shen
- * @date: Created in 2018-12-27 14:45
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-27 14:45
*/
@Configuration
@EnableConfigurationProperties(ZkProps.class)
diff --git a/demo-zookeeper/src/main/java/com/xkcoding/zookeeper/config/props/ZkProps.java b/demo-zookeeper/src/main/java/com/xkcoding/zookeeper/config/props/ZkProps.java
index a944fb7..561c55b 100644
--- a/demo-zookeeper/src/main/java/com/xkcoding/zookeeper/config/props/ZkProps.java
+++ b/demo-zookeeper/src/main/java/com/xkcoding/zookeeper/config/props/ZkProps.java
@@ -8,13 +8,8 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
* Zookeeper 配置项
*
*
- * @package: com.xkcoding.zookeeper.config.props
- * @description: Zookeeper 配置项
- * @author: yangkai.shen
- * @date: Created in 2018-12-27 14:47
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-27 14:47
*/
@Data
@ConfigurationProperties(prefix = "zk")
From 181afbcfce5d9241c6648da3fb363561143238c1 Mon Sep 17 00:00:00 2001
From: "Yangkai.Shen" <237497819@qq.com>
Date: Sun, 25 Oct 2020 11:42:15 +0800
Subject: [PATCH 04/15] =?UTF-8?q?:memo:=20=E6=9B=B4=E6=96=B0=20README.md?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
README.en.md | 397 +++++++++++----------------------------------------
README.md | 395 +++++++++++---------------------------------------
2 files changed, 167 insertions(+), 625 deletions(-)
diff --git a/README.en.md b/README.en.md
index 4ed7873..e949b4d 100644
--- a/README.en.md
+++ b/README.en.md
@@ -5,7 +5,7 @@
-
+
@@ -26,11 +26,6 @@ This project has integrated actuator (`monitoring`), admin (`visual monitoring`)
> If you have demos to contribute or needs to meet, it is very welcome to submit a [issue](https://github.com/xkcoding/spring-boot-demo/issues/new) and I will add it to my [TODO](./TODO.en.md) list.
-## Thanks
-
-- **Thanks JetBrains Offer Open Source Free License**
-- [Thanks MyBatisCodeHelper-Pro(The Best Code Generator Plugin) Offer Permanent Activation Code](https://gejun123456.github.io/MyBatisCodeHelper-Pro/#/?id=mybatiscodehelper-pro)
-
## Branch Introduction
- branch master: Based on Spring Boot version `2.1.0.RELEASE`. Every module's parent dependency is the pom.xml at root directory in convenience of managing common dependencies and learning spring boot.
@@ -55,318 +50,12 @@ This project has integrated actuator (`monitoring`), admin (`visual monitoring`)
6. **`Note: Each demo has a detailed README file. Remember to check it before running the demo~`**
7. **`Note: In some condition you have to execute sql to prepare data before running demo, don't forget it~`**
-## TODO
-
-View the [TODO](./TODO.en.md) file
-
-## Introduction of each Module
-
-| Module Name | Module Description |
-| ------------------------------------------------------------ | ------------------------------------------------------------ |
-| [spring-boot-demo-helloworld](./spring-boot-demo-helloworld) | a helloworld demo. |
-| [spring-boot-demo-properties](./spring-boot-demo-properties) | a demo to read the contents of configuration file. |
-| [spring-boot-demo-actuator](./spring-boot-demo-actuator) | a demo to integrate spring-boot-starter-actuator for monitoring the starting status and the running status of application. |
-| [spring-boot-demo-admin-client](./spring-boot-demo-admin/spring-boot-demo-admin-client) | a client demo to integrate spring-boot-admin for visually monitoring the running status of application, it can be used with spring-boot-starter-actuator. |
-| [spring-boot-demo-admin-server](./spring-boot-demo-admin/spring-boot-demo-admin-server) | a server demo to integrate spring-boot-admin for visually monitoring the running status of the spring-boot program, it can be used with spring-boot-starter-actuator. |
-| [spring-boot-demo-logback](./spring-boot-demo-logback) | a demo to integrate the logback for logging. |
-| [spring-boot-demo-log-aop](./spring-boot-demo-log-aop) | a demo to record web request logs using AOP aspect. |
-| [spring-boot-demo-exception-handler](./spring-boot-demo-exception-handler) | a demo to demonstrate global exception handling, including 2 types, the first one returns json data, and the second one jumps to error page. |
-| [spring-boot-demo-template-freemarker](./spring-boot-demo-template-freemarker) | a demo to integrate Freemarker template engine. |
-| [spring-boot-demo-template-thymeleaf](./spring-boot-demo-template-thymeleaf) | a demo to integrate Thymeleaf template engine. |
-| [spring-boot-demo-template-beetl](./spring-boot-demo-template-beetl) | a demo to integrate Beetl template engine. |
-| [spring-boot-demo-template-enjoy](./spring-boot-demo-template-enjoy) | a demo to integrate Enjoy template engine. |
-| [spring-boot-demo-orm-jdbctemplate](./spring-boot-demo-orm-jdbctemplate) | a demo to integrate the Jdbc Template for operating database and easily encapsulate the generic Dao layer. |
-| [spring-boot-demo-orm-jpa](./spring-boot-demo-orm-jpa) | a demo to integrate spring-boot-starter-data-jpa for operating database. |
-| [spring-boot-demo-orm-mybatis](./spring-boot-demo-orm-mybatis) | a demo to integrate native mybatis by using [mybatis-spring-boot-starter](https://github.com/mybatis/spring-boot-starter) dependency. |
-| [spring-boot-demo-orm-mybatis-mapper-page](./spring-boot-demo-orm-mybatis-mapper-page) | a demo to integrate [Mapper](https://github.com/abel533/Mapper) and [PageHelper](https://github.com/pagehelper/Mybatis-PageHelper) by using [mapper-spring-boot-starter](https://github.com/abel533/Mapper/tree/master/spring-boot-starter) and [pagehelper-spring-boot-starter](https://github.com/pagehelper/pagehelper-spring-boot) dependencies. |
-| [spring-boot-demo-orm-mybatis-plus](./spring-boot-demo-orm-mybatis-plus) | a demo to integrate [mybatis-plus](https://mybatis.plus/en/) by using [mybatis-plus-boot-starter](http://mp.baomidou.com/) dependency, integrate BaseMapper / BaseService / ActiveRecord to operate database. |
-| [spring-boot-demo-orm-beetlsql](./spring-boot-demo-orm-beetlsql) | a demo to integrate [beetl-sql](http://ibeetl.com/guide/#beetlsql) by using [beetl-framework-starter](http://ibeetl.com/guide/#beetlsql) dependency. |
-| [spring-boot-demo-upload](./spring-boot-demo-upload) | a file upload demo, including local file upload and qiniu cloud file upload. |
-| [spring-boot-demo-cache-redis](./spring-boot-demo-cache-redis) | a demo to integrate redis, operate data in redis, and use redis to cache data. |
-| [spring-boot-demo-cache-ehcache](./spring-boot-demo-cache-ehcache) | a demo to integrate ehcache, and use ehcache to cache data. |
-| [spring-boot-demo-email](./spring-boot-demo-email) | a demo to integrate email, including sending simple text email, HTML email (including template HTML email), attachment email, and static resource email. |
-| [spring-boot-demo-task](./spring-boot-demo-task) | a demo to show easy to use scheduled task. |
-| [spring-boot-demo-task-quartz](./spring-boot-demo-task-quartz) | a demo to integrate quartz for managing scheduled tasks, including adding new scheduled tasks, deleting scheduled tasks, suspending scheduled tasks, restoring scheduled tasks, modifying scheduled task startup times, and timing task list queries, and `providing front-end pages`. |
-| [spring-boot-demo-task-xxl-job](./spring-boot-demo-task-xxl-job) | a demo to integrate [xxl-job](http://www.xuxueli.com/xxl-job/en/#/) for distributed scheduled tasks and provide methods to manage scheduled tasks bypass `xxl-job-admin`, including scheduled task lists, trigger lists, new scheduled tasks, deleted scheduled tasks, stopped scheduled tasks, and started scheduled tasks. Modify the scheduled task and manually trigger the scheduled task. |
-| [spring-boot-demo-swagger](./spring-boot-demo-swagger) | a demo to integrate native `swagger` to manage and test API interfaces. |
-| [spring-boot-demo-swagger-beauty](./spring-boot-demo-swagger-beauty) | a demo to integrate third part of swagger dependency [swagger-bootstrap-ui](https://github.com/xiaoymin/Swagger-Bootstrap-UI) to beautify document style and manage and test API interfaces. |
-| [spring-boot-demo-rbac-security](./spring-boot-demo-rbac-security) | a demo to integrate spring security implement privilege management based on RBAC privilege model, supports custom filtering request, dynamic privilege authentication, uses JWT security authentication, supports online population statistics, manually kicks out users, etc. |
-| [spring-boot-demo-rbac-shiro](./spring-boot-demo-rbac-shiro) | NOT FINISHED YET! a demo to integrate shiro for authentication management. |
-| [spring-boot-demo-session](./spring-boot-demo-session) | a demo to integrate Spring Session to implement Session sharing, restart program Session does not expire. |
-| [spring-boot-demo-oauth](./spring-boot-demo-oauth) | NOT FINISHED YET! a demo to implement the oauth server and to implement oauth2 protocol such as the authorization code, access token. |
-| [spring-boot-demo-social](./spring-boot-demo-social) | a demo to integrate third-party login by using `justauth-spring-boot-starter` dependency to achieve QQ login, GitHub login, WeChat login, Google login, Microsoft login, Xiaomi login, enterprise WeChat login. |
-| [spring-boot-demo-zookeeper](./spring-boot-demo-zookeeper) | a demo to integrate Zookeeper and AOP to implement distributed lock. |
-| [spring-boot-demo-mq-rabbitmq](./spring-boot-demo-mq-rabbitmq) | a demo to integrate RabbitMQ implementation for message delivery and reception based on direct queue mode, fanout mode, topic mode, delay queue. |
-| [spring-boot-demo-mq-rocketmq](./spring-boot-demo-mq-rocketmq) | NOT FINISHED YET! a demo to integrate RocketMQ implementation for message delivery and reception. |
-| [spring-boot-demo-mq-kafka](./spring-boot-demo-mq-kafka) | a demo to integrate Kafka implementation for message delivery and reception. |
-| [spring-boot-demo-websocket](./spring-boot-demo-websocket) | a demo to integrate websocket, the backend actively pushes the server running status to front end. |
-| [spring-boot-demo-websocket-socketio](./spring-boot-demo-websocket-socketio) | a demo to integrate websocket by using `netty-socketio`, implement a simple chat room. |
-| [spring-boot-demo-ureport2](./spring-boot-demo-ureport2) | NOT FINISHED YET! a demo to integrate [ureport2](https://github.com/youseries/ureport) to implement complex, customized Chinese-style reports. |
-| [spring-boot-demo-uflo](./spring-boot-demo-uflo) | NOT FINISHED YET! a demo to integrate [uflo](https://github.com/youseries/uflo)(process engine like Activiti and Flowable) to quickly implement a lightweight process engine. |
-| [spring-boot-demo-urule](./spring-boot-demo-urule) | NOT FINISHED YET! a demo to integrate [urule](https://github.com/youseries/urule)(rule engine like drools) fast implementation rule engine. |
-| [spring-boot-demo-activiti](./spring-boot-demo-activiti) | NOT FINISHED YET! a demo to integrate Activiti 7 process engine. |
-| [spring-boot-demo-async](./spring-boot-demo-async) | asynchronous execution of tasks by using natively provided asynchronous task support. |
-| [spring-boot-demo-war](./spring-boot-demo-war) | packaged into a war format configuration |
-| [spring-boot-demo-elasticsearch](./spring-boot-demo-elasticsearch) | a demo to integrate ElasticSearch by using `spring-boot-starter-data-elasticsearch` to implement advanced techniques for using ElasticSearch, including creating indexes, configuring mappings, deleting indexes, adding and deleting basic operations, complex queries, advanced queries, aggregate queries, etc. |
-| [spring-boot-demo-dubbo](./spring-boot-demo-dubbo) | a demo to integrate Dubbo, common module `spring-boot-demo-dubbo-common`, service provider `spring-boot-demo-dubbo-provider`, service consumer `spring-boot-demo-dubbo-consumer`. |
-| [spring-boot-demo-mongodb](./spring-boot-demo-mongodb) | a demo to integrate MongoDB and use the official starter to CRUD. |
-| [spring-boot-demo-neo4j](./spring-boot-demo-neo4j) | a demo to integrate Neo4j graph database to implement a campus character relationship network. |
-| [spring-boot-demo-docker](./spring-boot-demo-docker) | docker container. |
-| [spring-boot-demo-multi-datasource-jpa](./spring-boot-demo-multi-datasource-jpa) | a demo to implement JPA multi-datasource. |
-| [spring-boot-demo-multi-datasource-mybatis](./spring-boot-demo-multi-datasource-mybatis) | a demo to implement Mybatis multi-datasource by using an open source solution from Mybatis-Plus. |
-| [spring-boot-demo-sharding-jdbc](./spring-boot-demo-sharding-jdbc) | a demo to use `sharding-jdbc` to implement sub-database and sub-tables, while ORM uses Mybatis-Plus. |
-| [spring-boot-demo-tio](./spring-boot-demo-tio) | NOT FINISHED YET! a demo to integrate t-io(a network programming framework like netty). |
-| [spring-boot-demo-grpc](./spring-boot-demo-grpc) | NOT FINISHED YET! a demo to integrate Google grpc, need to be configure tls/ssl, see [ISSUE#5](https://github.com/xkcoding/spring-boot-demo/issues/5). |
-| [spring-boot-demo-codegen](./spring-boot-demo-codegen) | a demo to integrate velocity template engine to implement code generator, improve development efficiency. |
-| [spring-boot-demo-graylog](./spring-boot-demo-graylog) | a demo to integrate graylog for unified log collection. |
-| spring-boot-demo-sso | NOT FINISHED YET! a demo to integrate Single Sign On, see [ISSUE#12](https://github.com/xkcoding/spring-boot-demo/issues/12). |
-| [spring-boot-demo-ldap](./spring-boot-demo-ldap) | a demo to integrate LDAP to use `spring-boot-starter-data-ldap` to implement CURD operations and give the login demo, see [ISSUE#23](https://github.com/xkcoding/spring-boot-demo/issues/23), thanks [@fxbin](https://github.com/fxbin). |
-| [spring-boot-demo-dynamic-datasource](./spring-boot-demo-dynamic-datasource) | a demo to add datasource dynamically, switch datasource dynamically. |
-| [spring-boot-demo-ratelimit-guava](./spring-boot-demo-ratelimit-guava) | a demo to use use Guava RateLimiter to protect API by standalone rate limiting. |
-| [spring-boot-demo-ratelimit-redis](./spring-boot-demo-ratelimit-redis) | a demo to use Redis and Lua script implementation to protect API by distributed rate limiting. |
-| [spring-boot-demo-https](./spring-boot-demo-https) | a demo to integrate HTTPS. |
-| [spring-boot-demo-elasticsearch-rest-high-level-client](./spring-boot-demo-elasticsearch-rest-high-level-client) | a demo to integrate ElasticSearch 7.x version by using official Rest High Level Client to operate ES data. |
-| [spring-boot-demo-flyway](./spring-boot-flyway) | a demo to integrate Flyway to initialize tables and data in database, Flyway also support the sql script version control. |
-
-## License
-
-[MIT](http://opensource.org/licenses/MIT)
-
-Copyright (c) 2018 Yangkai.Shen
-
## Stargazers over time
[](https://starchart.cc/xkcoding/spring-boot-demo)
## Appendix
-### Pom.xml in the root directory
-
-```xml
-
-
-
- 4.0.0
-
- com.xkcoding
- spring-boot-demo
- 1.0.0-SNAPSHOT
-
- spring-boot-demo-helloworld
- spring-boot-demo-properties
- spring-boot-demo-actuator
- spring-boot-demo-admin
- spring-boot-demo-logback
- spring-boot-demo-log-aop
- spring-boot-demo-exception-handler
- spring-boot-demo-template-freemarker
- spring-boot-demo-template-thymeleaf
- spring-boot-demo-template-beetl
- spring-boot-demo-template-enjoy
- spring-boot-demo-orm-jdbctemplate
- spring-boot-demo-orm-jpa
- spring-boot-demo-orm-mybatis
- spring-boot-demo-orm-mybatis-mapper-page
- spring-boot-demo-orm-mybatis-plus
- spring-boot-demo-orm-beetlsql
- spring-boot-demo-upload
- spring-boot-demo-cache-redis
- spring-boot-demo-cache-ehcache
- spring-boot-demo-email
- spring-boot-demo-task
- spring-boot-demo-task-quartz
- spring-boot-demo-task-xxl-job
- spring-boot-demo-swagger
- spring-boot-demo-swagger-beauty
- spring-boot-demo-rbac-security
- spring-boot-demo-rbac-shiro
- spring-boot-demo-session
- spring-boot-demo-oauth
- spring-boot-demo-social
- spring-boot-demo-zookeeper
- spring-boot-demo-mq-rabbitmq
- spring-boot-demo-mq-rocketmq
- spring-boot-demo-mq-kafka
- spring-boot-demo-websocket
- spring-boot-demo-websocket-socketio
- spring-boot-demo-ureport2
- spring-boot-demo-uflo
- spring-boot-demo-urule
- spring-boot-demo-activiti
- spring-boot-demo-async
- spring-boot-demo-dubbo
- spring-boot-demo-war
- spring-boot-demo-elasticsearch
- spring-boot-demo-mongodb
- spring-boot-demo-neo4j
- spring-boot-demo-docker
- spring-boot-demo-multi-datasource-jpa
- spring-boot-demo-multi-datasource-mybatis
- spring-boot-demo-sharding-jdbc
- spring-boot-demo-tio
- spring-boot-demo-codegen
- spring-boot-demo-graylog
- spring-boot-demo-ldap
- spring-boot-demo-dynamic-datasource
- spring-boot-demo-ratelimit-guava
- spring-boot-demo-ratelimit-redis
- spring-boot-demo-elasticsearch-rest-high-level-client
- spring-boot-demo-https
- spring-boot-demo-flyway
-
- pom
-
- spring-boot-demo
- http://xkcoding.com
-
-
- UTF-8
- UTF-8
- 1.8
- 1.8
- 1.8
- 2.1.0.RELEASE
- 8.0.12
- 5.0.0
- 28.1-jre
- 1.20
-
-
-
-
- aliyun
- aliyun
- https://maven.aliyun.com/repository/public
-
- true
-
-
- false
-
-
-
-
-
-
-
- org.springframework.boot
- spring-boot-dependencies
- ${spring.boot.version}
- pom
- import
-
-
- mysql
- mysql-connector-java
- ${mysql.version}
-
-
-
- cn.hutool
- hutool-all
- ${hutool.version}
-
-
-
- com.google.guava
- guava
- ${guava.version}
-
-
-
- eu.bitwalker
- UserAgentUtils
- ${user.agent.version}
-
-
-
-
-
-
-
-
- maven-clean-plugin
- 3.0.0
-
-
- maven-resources-plugin
- 3.0.2
-
-
- maven-compiler-plugin
- 3.7.0
-
-
- maven-surefire-plugin
- 2.20.1
-
-
- maven-jar-plugin
- 3.0.2
-
-
- maven-install-plugin
- 2.5.2
-
-
- maven-deploy-plugin
- 2.8.2
-
-
- org.springframework.boot
- spring-boot-maven-plugin
- ${spring.boot.version}
-
-
-
- repackage
-
-
-
-
-
-
-
-
-```
-
-### Official starter introduction
-
-| Name | Description |
-| :------------------------------------- | :----------------------------------------------------------- |
-| spring-boot-starter | The core Spring Boot starter, including auto-configuration support, logging and YAML. |
-| spring-boot-starter-actuator | Production ready features to help you monitor and manage your application. |
-| spring-boot-starter-amqp | Support for RabbitMQ messages |
-| spring-boot-starter-aop | Support for aspect-oriented programming including spring-aop and AspectJ. |
-| spring-boot-starter-batch | Support for “Spring Batch” including HSQLDB database. |
-| spring-boot-starter-cache | Support for Spring’s Cache abstraction. |
-| spring-boot-starter-data-elasticsearch | Support for the Elasticsearch search and analytics engine including spring-data-elasticsearch. |
-| spring-boot-starter-data-jpa | Support for the “Java Persistence API” including spring-data-jpa, spring-orm and Hibernate. |
-| spring-boot-starter-data-mongodb | Support for the MongoDB NoSQL Database, including spring-data-mongodb. |
-| spring-boot-starter-data-rest | Support for exposing Spring Data repositories over REST via spring-data-rest-webmvc. |
-| spring-boot-starter-data-solr | Support for the Apache Solr search platform, including spring-data-solr. |
-| spring-boot-starter-freemarker | Support for the FreeMarker templating engine. |
-| spring-boot-starter-groovy-templates | Support for the Groovy templating engine. |
-| spring-boot-starter-integration | Support for common spring-integration modules. |
-| spring-boot-starter-jdbc | Support for JDBC databases. |
-| spring-boot-starter-jersey | Support for the Jersey RESTful Web Services framework. |
-| spring-boot-starter-jta-atomikos | Support for JTA distributed transactions via Atomikos. |
-| spring-boot-starter-jta-bitronix | Support for JTA distributed transactions via Bitronix. |
-| spring-boot-starter-mail | Support for javax.mail. |
-| spring-boot-starter-mustache | Support for the Mustache templating engine. |
-| spring-boot-starter-redis | Support for the REDIS key-value data store, including spring-redis. |
-| spring-boot-starter-security | Support for spring-security. |
-| spring-boot-starter-social-facebook | Support for spring-social-facebook. |
-| spring-boot-starter-social-linkedin | Support for spring-social-linkedin. |
-| spring-boot-starter-social-twitter | Support for spring-social-twitter. |
-| spring-boot-starter-test | Support for common test dependencies, including JUnit, Hamcrest and Mockito along with the spring-test module. |
-| spring-boot-starter-thymeleaf | Support for the Thymeleaf templating engine, including integration with Spring. |
-| spring-boot-starter-velocity | Support for the Velocity templating engine. |
-| spring-boot-starter-web | Support for full-stack web development, including Tomcat and spring-webmvc. |
-| spring-boot-starter-websocket | Support for WebSocket development. |
-| spring-boot-starter-ws | Support for Spring Web Services. |
-
### Recommended Open source
- `JustAuth`：The most comprehensive open source library for third-party logins in history，https://github.com/justauth/JustAuth
@@ -375,6 +64,86 @@ Copyright (c) 2018 Yangkai.Shen
- `SpringBlade`：Complete micro-service online solution (required for enterprise development)，https://github.com/chillzhuang/SpringBlade
- `Pig`：The universe's strongest micro-service certification authorized scaffolding (architect necessary)，https://github.com/pigxcloud/pig
-### Advertisement
+### TODO
+
+View the [TODO](./TODO.en.md) file
+
+### Introduction of each Module
-[](https://re.jdcloud.com/cps?returnUrl=aHR0cHM6Ly93d3cuamRjbG91ZC5jb20vY24vYWN0aXZpdHkveWVhci1lbmQ_bUlkPTE4JmNwc0tleT1iMjg2Y2Q0ZmExMWM0ODZhODU2NmUwNjc5MGQ0MzY4MA==)
+| Module Name | Module Description |
+| ------------------------------------------------------------ | ------------------------------------------------------------ |
+| [demo-helloworld](./demo-helloworld) | a helloworld demo. |
+| [demo-properties](./demo-properties) | a demo to read the contents of configuration file. |
+| [demo-actuator](./demo-actuator) | a demo to integrate spring-boot-starter-actuator for monitoring the starting status and the running status of application. |
+| [demo-admin-client](./demo-admin/admin-client) | a client demo to integrate spring-boot-admin for visually monitoring the running status of application, it can be used with spring-boot-starter-actuator. |
+| [demo-admin-server](./demo-admin/admin-server) | a server demo to integrate spring-boot-admin for visually monitoring the running status of the spring-boot program, it can be used with spring-boot-starter-actuator. |
+| [demo-logback](./demo-logback) | a demo to integrate the logback for logging. |
+| [demo-log-aop](./demo-log-aop) | a demo to record web request logs using AOP aspect. |
+| [demo-exception-handler](./demo-exception-handler) | a demo to demonstrate global exception handling, including 2 types, the first one returns json data, and the second one jumps to error page. |
+| [demo-template-freemarker](./demo-template-freemarker) | a demo to integrate Freemarker template engine. |
+| [demo-template-thymeleaf](./demo-template-thymeleaf) | a demo to integrate Thymeleaf template engine. |
+| [demo-template-beetl](./demo-template-beetl) | a demo to integrate Beetl template engine. |
+| [demo-template-enjoy](./demo-template-enjoy) | a demo to integrate Enjoy template engine. |
+| [demo-orm-jdbctemplate](./demo-orm-jdbctemplate) | a demo to integrate the Jdbc Template for operating database and easily encapsulate the generic Dao layer. |
+| [demo-orm-jpa](./demo-orm-jpa) | a demo to integrate spring-boot-starter-data-jpa for operating database. |
+| [demo-orm-mybatis](./demo-orm-mybatis) | a demo to integrate native mybatis by using [mybatis-spring-boot-starter](https://github.com/mybatis/spring-boot-starter) dependency. |
+| [demo-orm-mybatis-mapper-page](./demo-orm-mybatis-mapper-page) | a demo to integrate [Mapper](https://github.com/abel533/Mapper) and [PageHelper](https://github.com/pagehelper/Mybatis-PageHelper) by using [mapper-spring-boot-starter](https://github.com/abel533/Mapper/tree/master/spring-boot-starter) and [pagehelper-spring-boot-starter](https://github.com/pagehelper/pagehelper-spring-boot) dependencies. |
+| [demo-orm-mybatis-plus](./demo-orm-mybatis-plus) | a demo to integrate [mybatis-plus](https://mybatis.plus/en/) by using [mybatis-plus-boot-starter](http://mp.baomidou.com/) dependency, integrate BaseMapper / BaseService / ActiveRecord to operate database. |
+| [demo-orm-beetlsql](./demo-orm-beetlsql) | a demo to integrate [beetl-sql](http://ibeetl.com/guide/#beetlsql) by using [beetl-framework-starter](http://ibeetl.com/guide/#beetlsql) dependency. |
+| [demo-upload](./demo-upload) | a file upload demo, including local file upload and qiniu cloud file upload. |
+| [demo-cache-redis](./demo-cache-redis) | a demo to integrate redis, operate data in redis, and use redis to cache data. |
+| [demo-cache-ehcache](./demo-cache-ehcache) | a demo to integrate ehcache, and use ehcache to cache data. |
+| [demo-email](./demo-email) | a demo to integrate email, including sending simple text email, HTML email (including template HTML email), attachment email, and static resource email. |
+| [demo-task](./demo-task) | a demo to show easy to use scheduled task. |
+| [demo-task-quartz](./demo-task-quartz) | a demo to integrate quartz for managing scheduled tasks, including adding new scheduled tasks, deleting scheduled tasks, suspending scheduled tasks, restoring scheduled tasks, modifying scheduled task startup times, and timing task list queries, and `providing front-end pages`. |
+| [demo-task-xxl-job](./demo-task-xxl-job) | a demo to integrate [xxl-job](http://www.xuxueli.com/xxl-job/en/#/) for distributed scheduled tasks and provide methods to manage scheduled tasks bypass `xxl-job-admin`, including scheduled task lists, trigger lists, new scheduled tasks, deleted scheduled tasks, stopped scheduled tasks, and started scheduled tasks. Modify the scheduled task and manually trigger the scheduled task. |
+| [demo-swagger](./demo-swagger) | a demo to integrate native `swagger` to manage and test API interfaces. |
+| [demo-swagger-beauty](./demo-swagger-beauty) | a demo to integrate third part of swagger dependency [swagger-bootstrap-ui](https://github.com/xiaoymin/Swagger-Bootstrap-UI) to beautify document style and manage and test API interfaces. |
+| [demo-rbac-security](./demo-rbac-security) | a demo to integrate spring security implement privilege management based on RBAC privilege model, supports custom filtering request, dynamic privilege authentication, uses JWT security authentication, supports online population statistics, manually kicks out users, etc. |
+| [demo-rbac-shiro](./demo-rbac-shiro) | NOT FINISHED YET! a demo to integrate shiro for authentication management. |
+| [demo-session](./demo-session) | a demo to integrate Spring Session to implement Session sharing, restart program Session does not expire. |
+| [demo-oauth](./demo-oauth) | NOT FINISHED YET! a demo to implement the oauth server and to implement oauth2 protocol such as the authorization code, access token. |
+| [demo-social](./demo-social) | a demo to integrate third-party login by using `justauth-spring-boot-starter` dependency to achieve QQ login, GitHub login, WeChat login, Google login, Microsoft login, Xiaomi login, enterprise WeChat login. |
+| [demo-zookeeper](./demo-zookeeper) | a demo to integrate Zookeeper and AOP to implement distributed lock. |
+| [demo-mq-rabbitmq](./demo-mq-rabbitmq) | a demo to integrate RabbitMQ implementation for message delivery and reception based on direct queue mode, fanout mode, topic mode, delay queue. |
+| [demo-mq-rocketmq](./demo-mq-rocketmq) | NOT FINISHED YET! a demo to integrate RocketMQ implementation for message delivery and reception. |
+| [demo-mq-kafka](./demo-mq-kafka) | a demo to integrate Kafka implementation for message delivery and reception. |
+| [demo-websocket](./demo-websocket) | a demo to integrate websocket, the backend actively pushes the server running status to front end. |
+| [demo-websocket-socketio](./demo-websocket-socketio) | a demo to integrate websocket by using `netty-socketio`, implement a simple chat room. |
+| [demo-ureport2](./demo-ureport2) | NOT FINISHED YET! a demo to integrate [ureport2](https://github.com/youseries/ureport) to implement complex, customized Chinese-style reports. |
+| [demo-uflo](./demo-uflo) | NOT FINISHED YET! a demo to integrate [uflo](https://github.com/youseries/uflo)(process engine like Activiti and Flowable) to quickly implement a lightweight process engine. |
+| [demo-urule](./demo-urule) | NOT FINISHED YET! a demo to integrate [urule](https://github.com/youseries/urule)(rule engine like drools) fast implementation rule engine. |
+| [demo-activiti](./demo-activiti) | NOT FINISHED YET! a demo to integrate Activiti 7 process engine. |
+| [demo-async](./demo-async) | asynchronous execution of tasks by using natively provided asynchronous task support. |
+| [demo-war](./demo-war) | packaged into a war format configuration |
+| [demo-elasticsearch](./demo-elasticsearch) | a demo to integrate ElasticSearch by using `spring-boot-starter-data-elasticsearch` to implement advanced techniques for using ElasticSearch, including creating indexes, configuring mappings, deleting indexes, adding and deleting basic operations, complex queries, advanced queries, aggregate queries, etc. |
+| [demo-dubbo](./demo-dubbo) | a demo to integrate Dubbo, common module `spring-boot-demo-dubbo-common`, service provider `spring-boot-demo-dubbo-provider`, service consumer `spring-boot-demo-dubbo-consumer`. |
+| [demo-mongodb](./demo-mongodb) | a demo to integrate MongoDB and use the official starter to CRUD. |
+| [demo-neo4j](./demo-neo4j) | a demo to integrate Neo4j graph database to implement a campus character relationship network. |
+| [demo-docker](./demo-docker) | docker container. |
+| [demo-multi-datasource-jpa](./demo-multi-datasource-jpa) | a demo to implement JPA multi-datasource. |
+| [demo-multi-datasource-mybatis](./demo-multi-datasource-mybatis) | a demo to implement Mybatis multi-datasource by using an open source solution from Mybatis-Plus. |
+| [demo-sharding-jdbc](./demo-sharding-jdbc) | a demo to use `sharding-jdbc` to implement sub-database and sub-tables, while ORM uses Mybatis-Plus. |
+| [demo-tio](./demo-tio) | NOT FINISHED YET! a demo to integrate t-io(a network programming framework like netty). |
+| demo-grpc | NOT FINISHED YET! a demo to integrate Google grpc, need to be configure tls/ssl, see [ISSUE#5](https://github.com/xkcoding/spring-boot-demo/issues/5). |
+| [demo-codegen](./demo-codegen) | a demo to integrate velocity template engine to implement code generator, improve development efficiency. |
+| [demo-graylog](./demo-graylog) | a demo to integrate graylog for unified log collection. |
+| demo-sso | NOT FINISHED YET! a demo to integrate Single Sign On, see [ISSUE#12](https://github.com/xkcoding/spring-boot-demo/issues/12). |
+| [demo-ldap](./demo-ldap) | a demo to integrate LDAP to use `spring-boot-starter-data-ldap` to implement CURD operations and give the login demo, see [ISSUE#23](https://github.com/xkcoding/spring-boot-demo/issues/23), thanks [@fxbin](https://github.com/fxbin). |
+| [demo-dynamic-datasource](./demo-dynamic-datasource) | a demo to add datasource dynamically, switch datasource dynamically. |
+| [demo-ratelimit-guava](./demo-ratelimit-guava) | a demo to use use Guava RateLimiter to protect API by standalone rate limiting. |
+| [demo-ratelimit-redis](./demo-ratelimit-redis) | a demo to use Redis and Lua script implementation to protect API by distributed rate limiting. |
+| [demo-https](./demo-https) | a demo to integrate HTTPS. |
+| [demo-elasticsearch-rest-high-level-client](./demo-elasticsearch-rest-high-level-client) | a demo to integrate ElasticSearch 7.x version by using official Rest High Level Client to operate ES data. |
+| [demo-flyway](./demo-flyway) | a demo to integrate Flyway to initialize tables and data in database, Flyway also support the sql script version control. |
+
+### Thanks
+
+- **Thanks JetBrains Offer Open Source Free License**
+- [Thanks MyBatisCodeHelper-Pro(The Best Code Generator Plugin) Offer Permanent Activation Code](https://gejun123456.github.io/MyBatisCodeHelper-Pro/#/?id=mybatiscodehelper-pro)
+
+### License
+
+[MIT](http://opensource.org/licenses/MIT)
+
+Copyright (c) 2018 Yangkai.Shen
diff --git a/README.md b/README.md
index c6c493f..b44b5e9 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
-
+
**Thanks JetBrains Offer Open Source Free License**