*
- * @package: com.xkcoding.multi.datasource.jpa.entity.second
- * @description: 多数据源测试表
- * @author: yangkai.shen
- * @date: Created in 2019-01-18 10:06
- * @copyright: Copyright (c) 2019
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2019-01-18 10:06
*/
@Data
@Entity
diff --git a/demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/repository/primary/PrimaryMultiTableRepository.java b/demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/repository/primary/PrimaryMultiTableRepository.java
index 9c8fe0505..91cd78b8b 100644
--- a/demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/repository/primary/PrimaryMultiTableRepository.java
+++ b/demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/repository/primary/PrimaryMultiTableRepository.java
@@ -9,13 +9,8 @@
* 多数据源测试 repo
*
*
- * @package: com.xkcoding.multi.datasource.jpa.repository.primary
- * @description: 多数据源测试 repo
- * @author: yangkai.shen
- * @date: Created in 2019-01-18 10:11
- * @copyright: Copyright (c) 2019
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2019-01-18 10:11
*/
@Repository
public interface PrimaryMultiTableRepository extends JpaRepository {
diff --git a/demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/repository/second/SecondMultiTableRepository.java b/demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/repository/second/SecondMultiTableRepository.java
index 5752f5530..0fc6ba853 100644
--- a/demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/repository/second/SecondMultiTableRepository.java
+++ b/demo-multi-datasource-jpa/src/main/java/com/xkcoding/multi/datasource/jpa/repository/second/SecondMultiTableRepository.java
@@ -9,13 +9,8 @@
* 多数据源测试 repo
*
*
- * @package: com.xkcoding.multi.datasource.jpa.repository.second
- * @description: 多数据源测试 repo
- * @author: yangkai.shen
- * @date: Created in 2019-01-18 10:11
- * @copyright: Copyright (c) 2019
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2019-01-18 10:11
*/
@Repository
public interface SecondMultiTableRepository extends JpaRepository {
diff --git a/demo-multi-datasource-mybatis/README.md b/demo-multi-datasource-mybatis/README.md
index fdd738923..0bacd48ad 100644
--- a/demo-multi-datasource-mybatis/README.md
+++ b/demo-multi-datasource-mybatis/README.md
@@ -119,13 +119,8 @@ CREATE TABLE `multi_user`(
* User实体类
*
*
- * @package: com.xkcoding.multi.datasource.mybatis.model
- * @description: User实体类
- * @author: yangkai.shen
- * @date: Created in 2019-01-21 14:19
- * @copyright: Copyright (c) 2019
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2019-01-21 14:19
*/
@Data
@TableName("multi_user")
@@ -165,13 +160,8 @@ public class User implements Serializable {
* 数据访问层
*
*
- * @package: com.xkcoding.multi.datasource.mybatis.mapper
- * @description: 数据访问层
- * @author: yangkai.shen
- * @date: Created in 2019-01-21 14:28
- * @copyright: Copyright (c) 2019
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2019-01-21 14:28
*/
public interface UserMapper extends BaseMapper {
}
@@ -189,13 +179,8 @@ public interface UserMapper extends BaseMapper {
* 数据服务层
*
*
- * @package: com.xkcoding.multi.datasource.mybatis.service
- * @description: 数据服务层
- * @author: yangkai.shen
- * @date: Created in 2019-01-21 14:31
- * @copyright: Copyright (c) 2019
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2019-01-21 14:31
*/
public interface UserService extends IService {
@@ -222,13 +207,8 @@ public interface UserService extends IService {
* 数据服务层 实现
*
*
- * @package: com.xkcoding.multi.datasource.mybatis.service.impl
- * @description: 数据服务层 实现
- * @author: yangkai.shen
- * @date: Created in 2019-01-21 14:37
- * @copyright: Copyright (c) 2019
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2019-01-21 14:37
*/
@Service
@DS("slave")
@@ -259,13 +239,8 @@ public class UserServiceImpl extends ServiceImpl implements Us
* 启动器
*
*
- * @package: com.xkcoding.multi.datasource.mybatis
- * @description: 启动器
- * @author: yangkai.shen
- * @date: Created in 2019-01-21 14:19
- * @copyright: Copyright (c) 2019
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2019-01-21 14:19
*/
@SpringBootApplication
@MapperScan(basePackages = "com.xkcoding.multi.datasource.mybatis.mapper")
@@ -311,13 +286,8 @@ logging:
* 测试主从数据源
*
*
- * @package: com.xkcoding.multi.datasource.mybatis.service.impl
- * @description: 测试主从数据源
- * @author: yangkai.shen
- * @date: Created in 2019-01-21 14:45
- * @copyright: Copyright (c) 2019
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2019-01-21 14:45
*/
@Slf4j
public class UserServiceImplTest extends SpringBootDemoMultiDatasourceMybatisApplicationTests {
@@ -360,10 +330,10 @@ public class UserServiceImplTest extends SpringBootDemoMultiDatasourceMybatisApp
2019-01-21 14:55:41.313 INFO 7239 --- [ main] c.b.d.d.DynamicRoutingDataSource : 动态数据源-加载 slave 成功
2019-01-21 14:55:41.313 INFO 7239 --- [ main] c.b.d.d.DynamicRoutingDataSource : 动态数据源-加载 master 成功
2019-01-21 14:55:41.313 INFO 7239 --- [ main] c.b.d.d.DynamicRoutingDataSource : 当前的默认数据源是单数据源,数据源名为 master
- _ _ |_ _ _|_. ___ _ | _
-| | |\/|_)(_| | |_\ |_)||_|_\
- / |
- 3.0.7.1
+ _ _ |_ _ _|_. ___ _ | _
+| | |\/|_)(_| | |_\ |_)||_|_\
+ / |
+ 3.0.7.1
```
**主**库 **建议** 只执行 **INSERT** **UPDATE** **DELETE** 操作
@@ -379,4 +349,4 @@ public class UserServiceImplTest extends SpringBootDemoMultiDatasourceMybatisApp
## 参考
1. Mybatis-Plus 多数据源文档:https://mybatis.plus/guide/dynamic-datasource.html
-2. Mybatis-Plus 多数据源集成官方 demo:https://gitee.com/baomidou/dynamic-datasource-spring-boot-starter/tree/master/samples
\ No newline at end of file
+2. Mybatis-Plus 多数据源集成官方 demo:https://gitee.com/baomidou/dynamic-datasource-spring-boot-starter/tree/master/samples
diff --git a/demo-multi-datasource-mybatis/src/main/java/com/xkcoding/multi/datasource/mybatis/SpringBootDemoMultiDatasourceMybatisApplication.java b/demo-multi-datasource-mybatis/src/main/java/com/xkcoding/multi/datasource/mybatis/SpringBootDemoMultiDatasourceMybatisApplication.java
index 5fbc29c36..bdeb42be2 100644
--- a/demo-multi-datasource-mybatis/src/main/java/com/xkcoding/multi/datasource/mybatis/SpringBootDemoMultiDatasourceMybatisApplication.java
+++ b/demo-multi-datasource-mybatis/src/main/java/com/xkcoding/multi/datasource/mybatis/SpringBootDemoMultiDatasourceMybatisApplication.java
@@ -9,13 +9,8 @@
* 启动器
*
*
- * @package: com.xkcoding.multi.datasource.mybatis
- * @description: 启动器
- * @author: yangkai.shen
- * @date: Created in 2019-01-21 14:19
- * @copyright: Copyright (c) 2019
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2019-01-21 14:19
*/
@SpringBootApplication
@MapperScan(basePackages = "com.xkcoding.multi.datasource.mybatis.mapper")
diff --git a/demo-multi-datasource-mybatis/src/main/java/com/xkcoding/multi/datasource/mybatis/mapper/UserMapper.java b/demo-multi-datasource-mybatis/src/main/java/com/xkcoding/multi/datasource/mybatis/mapper/UserMapper.java
index 51a6dd5ed..3e8999ce6 100644
--- a/demo-multi-datasource-mybatis/src/main/java/com/xkcoding/multi/datasource/mybatis/mapper/UserMapper.java
+++ b/demo-multi-datasource-mybatis/src/main/java/com/xkcoding/multi/datasource/mybatis/mapper/UserMapper.java
@@ -8,13 +8,8 @@
* 数据访问层
*
*
- * @package: com.xkcoding.multi.datasource.mybatis.mapper
- * @description: 数据访问层
- * @author: yangkai.shen
- * @date: Created in 2019-01-21 14:28
- * @copyright: Copyright (c) 2019
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2019-01-21 14:28
*/
public interface UserMapper extends BaseMapper {
}
diff --git a/demo-multi-datasource-mybatis/src/main/java/com/xkcoding/multi/datasource/mybatis/model/User.java b/demo-multi-datasource-mybatis/src/main/java/com/xkcoding/multi/datasource/mybatis/model/User.java
index f895d3c08..6790049f2 100644
--- a/demo-multi-datasource-mybatis/src/main/java/com/xkcoding/multi/datasource/mybatis/model/User.java
+++ b/demo-multi-datasource-mybatis/src/main/java/com/xkcoding/multi/datasource/mybatis/model/User.java
@@ -15,13 +15,8 @@
* User实体类
*
*
- * @package: com.xkcoding.multi.datasource.mybatis.model
- * @description: User实体类
- * @author: yangkai.shen
- * @date: Created in 2019-01-21 14:19
- * @copyright: Copyright (c) 2019
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2019-01-21 14:19
*/
@Data
@TableName("multi_user")
@@ -46,4 +41,4 @@ public class User implements Serializable {
* 年龄
*/
private Integer age;
-}
\ No newline at end of file
+}
diff --git a/demo-multi-datasource-mybatis/src/main/java/com/xkcoding/multi/datasource/mybatis/service/UserService.java b/demo-multi-datasource-mybatis/src/main/java/com/xkcoding/multi/datasource/mybatis/service/UserService.java
index f9d84fdba..8e805632a 100644
--- a/demo-multi-datasource-mybatis/src/main/java/com/xkcoding/multi/datasource/mybatis/service/UserService.java
+++ b/demo-multi-datasource-mybatis/src/main/java/com/xkcoding/multi/datasource/mybatis/service/UserService.java
@@ -8,13 +8,8 @@
* 数据服务层
*
*
- * @package: com.xkcoding.multi.datasource.mybatis.service
- * @description: 数据服务层
- * @author: yangkai.shen
- * @date: Created in 2019-01-21 14:31
- * @copyright: Copyright (c) 2019
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2019-01-21 14:31
*/
public interface UserService extends IService {
diff --git a/demo-multi-datasource-mybatis/src/main/java/com/xkcoding/multi/datasource/mybatis/service/impl/UserServiceImpl.java b/demo-multi-datasource-mybatis/src/main/java/com/xkcoding/multi/datasource/mybatis/service/impl/UserServiceImpl.java
index 2d4bec005..65a4f5afd 100644
--- a/demo-multi-datasource-mybatis/src/main/java/com/xkcoding/multi/datasource/mybatis/service/impl/UserServiceImpl.java
+++ b/demo-multi-datasource-mybatis/src/main/java/com/xkcoding/multi/datasource/mybatis/service/impl/UserServiceImpl.java
@@ -12,13 +12,8 @@
* 数据服务层 实现
*
*
- * @package: com.xkcoding.multi.datasource.mybatis.service.impl
- * @description: 数据服务层 实现
- * @author: yangkai.shen
- * @date: Created in 2019-01-21 14:37
- * @copyright: Copyright (c) 2019
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2019-01-21 14:37
*/
@Service
@DS("slave")
diff --git a/demo-multi-datasource-mybatis/src/test/java/com/xkcoding/multi/datasource/mybatis/service/impl/UserServiceImplTest.java b/demo-multi-datasource-mybatis/src/test/java/com/xkcoding/multi/datasource/mybatis/service/impl/UserServiceImplTest.java
index a57b73274..fe11b6dc4 100644
--- a/demo-multi-datasource-mybatis/src/test/java/com/xkcoding/multi/datasource/mybatis/service/impl/UserServiceImplTest.java
+++ b/demo-multi-datasource-mybatis/src/test/java/com/xkcoding/multi/datasource/mybatis/service/impl/UserServiceImplTest.java
@@ -16,13 +16,8 @@
* 测试主从数据源
*
*
- * @package: com.xkcoding.multi.datasource.mybatis.service.impl
- * @description: 测试主从数据源
- * @author: yangkai.shen
- * @date: Created in 2019-01-21 14:45
- * @copyright: Copyright (c) 2019
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2019-01-21 14:45
*/
@Slf4j
public class UserServiceImplTest extends SpringBootDemoMultiDatasourceMybatisApplicationTests {
@@ -49,4 +44,4 @@ public void testListUser() {
List list = userService.list(new QueryWrapper<>());
log.info("【list】= {}", JSONUtil.toJsonStr(list));
}
-}
\ No newline at end of file
+}
diff --git a/demo-neo4j/README.md b/demo-neo4j/README.md
index 08466e596..0321a9942 100644
--- a/demo-neo4j/README.md
+++ b/demo-neo4j/README.md
@@ -106,13 +106,8 @@ spring:
* 自定义主键策略
*
*
- * @package: com.xkcoding.neo4j.config
- * @description: 自定义主键策略
- * @author: yangkai.shen
- * @date: Created in 2018-12-24 14:40
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-24 14:40
*/
public class CustomIdStrategy implements IdStrategy {
@Override
@@ -132,13 +127,8 @@ public class CustomIdStrategy implements IdStrategy {
* 学生节点
*
*
- * @package: com.xkcoding.neo4j.model
- * @description: 学生节点
- * @author: yangkai.shen
- * @date: Created in 2018-12-24 14:38
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-24 14:38
*/
@Data
@NoArgsConstructor
@@ -187,13 +177,8 @@ public class Student {
* 学生节点Repository
*
*
- * @package: com.xkcoding.neo4j.repository
- * @description: 学生节点Repository
- * @author: yangkai.shen
- * @date: Created in 2018-12-24 15:05
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-24 15:05
*/
public interface StudentRepository extends Neo4jRepository {
/**
@@ -249,13 +234,8 @@ public interface StudentRepository extends Neo4jRepository {
* 测试Neo4j
*
*
- * @package: com.xkcoding.neo4j
- * @description: 测试Neo4j
- * @author: yangkai.shen
- * @date: Created in 2018-12-24 15:17
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-24 15:17
*/
@Slf4j
public class Neo4jTest extends SpringBootDemoNeo4jApplicationTests {
@@ -336,4 +316,4 @@ public class Neo4jTest extends SpringBootDemoNeo4jApplicationTests {
## 参考
- spring-data-neo4j 官方文档:https://docs.spring.io/spring-data/neo4j/docs/5.1.2.RELEASE/reference/html/
-- neo4j 官方文档:https://neo4j.com/docs/getting-started/3.5/
\ No newline at end of file
+- neo4j 官方文档:https://neo4j.com/docs/getting-started/3.5/
diff --git a/demo-neo4j/src/main/java/com/xkcoding/neo4j/SpringBootDemoNeo4jApplication.java b/demo-neo4j/src/main/java/com/xkcoding/neo4j/SpringBootDemoNeo4jApplication.java
index b15c70d46..45bc87001 100644
--- a/demo-neo4j/src/main/java/com/xkcoding/neo4j/SpringBootDemoNeo4jApplication.java
+++ b/demo-neo4j/src/main/java/com/xkcoding/neo4j/SpringBootDemoNeo4jApplication.java
@@ -8,13 +8,8 @@
* 启动器
*
*
- * @package: com.xkcoding.neo4j
- * @description: 启动器
- * @author: yangkai.shen
- * @date: Created in 2018-12-22 23:50
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-22 23:50
*/
@SpringBootApplication
public class SpringBootDemoNeo4jApplication {
diff --git a/demo-neo4j/src/main/java/com/xkcoding/neo4j/config/CustomIdStrategy.java b/demo-neo4j/src/main/java/com/xkcoding/neo4j/config/CustomIdStrategy.java
index 5cc877819..511236b9f 100644
--- a/demo-neo4j/src/main/java/com/xkcoding/neo4j/config/CustomIdStrategy.java
+++ b/demo-neo4j/src/main/java/com/xkcoding/neo4j/config/CustomIdStrategy.java
@@ -8,13 +8,8 @@
* 自定义主键策略
*
*
- * @package: com.xkcoding.neo4j.config
- * @description: 自定义主键策略
- * @author: yangkai.shen
- * @date: Created in 2018-12-24 14:40
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-24 14:40
*/
public class CustomIdStrategy implements IdStrategy {
@Override
diff --git a/demo-neo4j/src/main/java/com/xkcoding/neo4j/constants/NeoConsts.java b/demo-neo4j/src/main/java/com/xkcoding/neo4j/constants/NeoConsts.java
index 0ea6f9d68..b420272d1 100644
--- a/demo-neo4j/src/main/java/com/xkcoding/neo4j/constants/NeoConsts.java
+++ b/demo-neo4j/src/main/java/com/xkcoding/neo4j/constants/NeoConsts.java
@@ -5,13 +5,8 @@
* 常量池
*
*
- * @package: com.xkcoding.neo4j.constants
- * @description: 常量池
- * @author: yangkai.shen
- * @date: Created in 2018-12-24 14:45
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-24 14:45
*/
public interface NeoConsts {
/**
diff --git a/demo-neo4j/src/main/java/com/xkcoding/neo4j/model/Class.java b/demo-neo4j/src/main/java/com/xkcoding/neo4j/model/Class.java
index 8af1f6630..faf58351f 100644
--- a/demo-neo4j/src/main/java/com/xkcoding/neo4j/model/Class.java
+++ b/demo-neo4j/src/main/java/com/xkcoding/neo4j/model/Class.java
@@ -13,13 +13,8 @@
* 班级节点
*
*
- * @package: com.xkcoding.neo4j.model
- * @description: 班级节点
- * @author: yangkai.shen
- * @date: Created in 2018-12-24 14:44
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-24 14:44
*/
@Data
@NoArgsConstructor
diff --git a/demo-neo4j/src/main/java/com/xkcoding/neo4j/model/Lesson.java b/demo-neo4j/src/main/java/com/xkcoding/neo4j/model/Lesson.java
index 8d96d4293..6fa9f4368 100644
--- a/demo-neo4j/src/main/java/com/xkcoding/neo4j/model/Lesson.java
+++ b/demo-neo4j/src/main/java/com/xkcoding/neo4j/model/Lesson.java
@@ -13,13 +13,8 @@
* 课程节点
*
*
- * @package: com.xkcoding.neo4j.model
- * @description: 课程节点
- * @author: yangkai.shen
- * @date: Created in 2018-12-24 14:55
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-24 14:55
*/
@Data
@NoArgsConstructor
diff --git a/demo-neo4j/src/main/java/com/xkcoding/neo4j/model/Student.java b/demo-neo4j/src/main/java/com/xkcoding/neo4j/model/Student.java
index 4ce6a852a..56dd4f74f 100644
--- a/demo-neo4j/src/main/java/com/xkcoding/neo4j/model/Student.java
+++ b/demo-neo4j/src/main/java/com/xkcoding/neo4j/model/Student.java
@@ -15,13 +15,8 @@
* 学生节点
*
*
- * @package: com.xkcoding.neo4j.model
- * @description: 学生节点
- * @author: yangkai.shen
- * @date: Created in 2018-12-24 14:38
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-24 14:38
*/
@Data
@NoArgsConstructor
diff --git a/demo-neo4j/src/main/java/com/xkcoding/neo4j/model/Teacher.java b/demo-neo4j/src/main/java/com/xkcoding/neo4j/model/Teacher.java
index 968ddb1f8..62106ed67 100644
--- a/demo-neo4j/src/main/java/com/xkcoding/neo4j/model/Teacher.java
+++ b/demo-neo4j/src/main/java/com/xkcoding/neo4j/model/Teacher.java
@@ -11,13 +11,8 @@
* 教师节点
*
*
- * @package: com.xkcoding.neo4j.model
- * @description: 教师节点
- * @author: yangkai.shen
- * @date: Created in 2018-12-24 14:54
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-24 14:54
*/
@Data
@NoArgsConstructor
diff --git a/demo-neo4j/src/main/java/com/xkcoding/neo4j/payload/ClassmateInfoGroupByLesson.java b/demo-neo4j/src/main/java/com/xkcoding/neo4j/payload/ClassmateInfoGroupByLesson.java
index b5a156c95..453d11d6a 100644
--- a/demo-neo4j/src/main/java/com/xkcoding/neo4j/payload/ClassmateInfoGroupByLesson.java
+++ b/demo-neo4j/src/main/java/com/xkcoding/neo4j/payload/ClassmateInfoGroupByLesson.java
@@ -11,13 +11,8 @@
* 按照课程分组的同学关系
*
*
- * @package: com.xkcoding.neo4j.payload
- * @description: 按照课程分组的同学关系
- * @author: yangkai.shen
- * @date: Created in 2018-12-24 19:18
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-24 19:18
*/
@Data
@QueryResult
diff --git a/demo-neo4j/src/main/java/com/xkcoding/neo4j/payload/TeacherStudent.java b/demo-neo4j/src/main/java/com/xkcoding/neo4j/payload/TeacherStudent.java
index 57eca8426..d70fcf29b 100644
--- a/demo-neo4j/src/main/java/com/xkcoding/neo4j/payload/TeacherStudent.java
+++ b/demo-neo4j/src/main/java/com/xkcoding/neo4j/payload/TeacherStudent.java
@@ -11,13 +11,8 @@
* 师生关系
*
*
- * @package: com.xkcoding.neo4j.payload
- * @description: 师生关系
- * @author: yangkai.shen
- * @date: Created in 2018-12-24 19:18
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-24 19:18
*/
@Data
@QueryResult
diff --git a/demo-neo4j/src/main/java/com/xkcoding/neo4j/repository/ClassRepository.java b/demo-neo4j/src/main/java/com/xkcoding/neo4j/repository/ClassRepository.java
index e8c59b946..ef859792b 100644
--- a/demo-neo4j/src/main/java/com/xkcoding/neo4j/repository/ClassRepository.java
+++ b/demo-neo4j/src/main/java/com/xkcoding/neo4j/repository/ClassRepository.java
@@ -10,13 +10,8 @@
* 班级节点Repository
*
*
- * @package: com.xkcoding.neo4j.repository
- * @description: 班级节点Repository
- * @author: yangkai.shen
- * @date: Created in 2018-12-24 15:05
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-24 15:05
*/
public interface ClassRepository extends Neo4jRepository {
/**
diff --git a/demo-neo4j/src/main/java/com/xkcoding/neo4j/repository/LessonRepository.java b/demo-neo4j/src/main/java/com/xkcoding/neo4j/repository/LessonRepository.java
index a4f7b9db4..fcf010c2f 100644
--- a/demo-neo4j/src/main/java/com/xkcoding/neo4j/repository/LessonRepository.java
+++ b/demo-neo4j/src/main/java/com/xkcoding/neo4j/repository/LessonRepository.java
@@ -8,13 +8,8 @@
* 课程节点Repository
*
*
- * @package: com.xkcoding.neo4j.repository
- * @description: 课程节点Repository
- * @author: yangkai.shen
- * @date: Created in 2018-12-24 15:05
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-24 15:05
*/
public interface LessonRepository extends Neo4jRepository {
}
diff --git a/demo-neo4j/src/main/java/com/xkcoding/neo4j/repository/StudentRepository.java b/demo-neo4j/src/main/java/com/xkcoding/neo4j/repository/StudentRepository.java
index 00956d7ec..a5037c996 100644
--- a/demo-neo4j/src/main/java/com/xkcoding/neo4j/repository/StudentRepository.java
+++ b/demo-neo4j/src/main/java/com/xkcoding/neo4j/repository/StudentRepository.java
@@ -16,13 +16,8 @@
* 学生节点Repository
*
*
- * @package: com.xkcoding.neo4j.repository
- * @description: 学生节点Repository
- * @author: yangkai.shen
- * @date: Created in 2018-12-24 15:05
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-24 15:05
*/
public interface StudentRepository extends Neo4jRepository {
/**
diff --git a/demo-neo4j/src/main/java/com/xkcoding/neo4j/repository/TeacherRepository.java b/demo-neo4j/src/main/java/com/xkcoding/neo4j/repository/TeacherRepository.java
index 380f1ff11..f7d2d6437 100644
--- a/demo-neo4j/src/main/java/com/xkcoding/neo4j/repository/TeacherRepository.java
+++ b/demo-neo4j/src/main/java/com/xkcoding/neo4j/repository/TeacherRepository.java
@@ -8,13 +8,8 @@
* 教师节点Repository
*
*
- * @package: com.xkcoding.neo4j.repository
- * @description: 教师节点Repository
- * @author: yangkai.shen
- * @date: Created in 2018-12-24 15:05
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-24 15:05
*/
public interface TeacherRepository extends Neo4jRepository {
}
diff --git a/demo-neo4j/src/main/java/com/xkcoding/neo4j/service/NeoService.java b/demo-neo4j/src/main/java/com/xkcoding/neo4j/service/NeoService.java
index b0a04f345..664fad10c 100644
--- a/demo-neo4j/src/main/java/com/xkcoding/neo4j/service/NeoService.java
+++ b/demo-neo4j/src/main/java/com/xkcoding/neo4j/service/NeoService.java
@@ -30,13 +30,8 @@
* NeoService
*
*
- * @package: com.xkcoding.neo4j.service
- * @description: NeoService
- * @author: yangkai.shen
- * @date: Created in 2018-12-24 15:19
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-24 15:19
*/
@Service
public class NeoService {
diff --git a/demo-neo4j/src/test/java/com/xkcoding/neo4j/Neo4jTest.java b/demo-neo4j/src/test/java/com/xkcoding/neo4j/Neo4jTest.java
index 9f4fed2c1..f529833fd 100644
--- a/demo-neo4j/src/test/java/com/xkcoding/neo4j/Neo4jTest.java
+++ b/demo-neo4j/src/test/java/com/xkcoding/neo4j/Neo4jTest.java
@@ -18,13 +18,8 @@
* 测试Neo4j
*
*
- * @package: com.xkcoding.neo4j
- * @description: 测试Neo4j
- * @author: yangkai.shen
- * @date: Created in 2018-12-24 15:17
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-24 15:17
*/
@Slf4j
public class Neo4jTest extends SpringBootDemoNeo4jApplicationTests {
diff --git a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/SpringBootDemoOauthApplication.java b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/SpringBootDemoOauthApplication.java
index ed73b619c..af2dd9963 100644
--- a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/SpringBootDemoOauthApplication.java
+++ b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/SpringBootDemoOauthApplication.java
@@ -8,15 +8,8 @@
* 启动器
*
*
- * @package: com.xkcoding.oauth
- * @description: 启动器
- * @author: yangkai.shen
- * @date: Created in 2019-02-17 23:52
- * @copyright: Copyright (c) 2019
- * @version: V1.0
- * @modified: yangkai.shen
- * @modified: EchoCow
- * @date: Modified in 2020-01-6 21:12
+ * @author yangkai.shen
+ * @date Created in 2019-02-17 23:52
*/
@SpringBootApplication
public class SpringBootDemoOauthApplication {
diff --git a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/config/ClientLoginFailureHandler.java b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/config/ClientLoginFailureHandler.java
index 816ab0718..d9e024809 100644
--- a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/config/ClientLoginFailureHandler.java
+++ b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/config/ClientLoginFailureHandler.java
@@ -15,7 +15,7 @@
* 登录失败处理器,失败后携带失败信息重定向到登录地址重新登录.
*
* @author EchoCow
- * @date 2020/1/7 下午1:01
+ * @date 2020-01-07 13:01
*/
@Slf4j
@Component
diff --git a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/config/ClientLogoutSuccessHandler.java b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/config/ClientLogoutSuccessHandler.java
index 1737a6304..61f9f35c4 100644
--- a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/config/ClientLogoutSuccessHandler.java
+++ b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/config/ClientLogoutSuccessHandler.java
@@ -14,7 +14,7 @@
* 客户团退出登录成功处理器.
*
* @author EchoCow
- * @date 2020/1/6 下午22:11
+ * @date 2020-01-06 22:11
*/
@Slf4j
@Component
diff --git a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/config/Oauth2AuthorizationServerConfig.java b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/config/Oauth2AuthorizationServerConfig.java
index 787c9f36d..9326fb5e7 100644
--- a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/config/Oauth2AuthorizationServerConfig.java
+++ b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/config/Oauth2AuthorizationServerConfig.java
@@ -17,7 +17,7 @@
* .
*
* @author EchoCow
- * @date 2020/1/6 下午1:32
+ * @date 2020-01-06 13:32
*/
@Configuration
@RequiredArgsConstructor
diff --git a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/config/Oauth2AuthorizationTokenConfig.java b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/config/Oauth2AuthorizationTokenConfig.java
index 39ac77951..c002434c7 100644
--- a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/config/Oauth2AuthorizationTokenConfig.java
+++ b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/config/Oauth2AuthorizationTokenConfig.java
@@ -18,7 +18,7 @@
* token 相关配置.
*
* @author EchoCow
- * @date 2020/1/6 下午1:33
+ * @date 2020-01-06 13:33
*/
@Configuration
@RequiredArgsConstructor
diff --git a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/config/WebSecurityConfig.java b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/config/WebSecurityConfig.java
index d6071cb53..b458ffc5c 100644
--- a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/config/WebSecurityConfig.java
+++ b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/config/WebSecurityConfig.java
@@ -12,7 +12,7 @@
* 安全配置.
*
* @author EchoCow
- * @date 2020/1/6 下午1:27
+ * @date 2020-01-06 13:27
*/
@EnableWebSecurity
@RequiredArgsConstructor
diff --git a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/config/package-info.java b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/config/package-info.java
index 11cfadbd2..133f549e6 100644
--- a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/config/package-info.java
+++ b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/config/package-info.java
@@ -17,6 +17,6 @@
*
*
* @author EchoCow
- * @date 2020/1/7 上午9:16
+ * @date 2020-01-07 9:16
*/
package com.xkcoding.oauth.config;
diff --git a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/controller/AuthorizationController.java b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/controller/AuthorizationController.java
index 81754677e..a7e26e238 100644
--- a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/controller/AuthorizationController.java
+++ b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/controller/AuthorizationController.java
@@ -15,7 +15,7 @@
* 我们只是在中途修改了它确认的一些信息而已。
*
* @author EchoCow
- * @date 2020/1/6 下午4:42
+ * @date 2020-01-06 16:42
*/
@Controller
@SessionAttributes("authorizationRequest")
diff --git a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/controller/Oauth2Controller.java b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/controller/Oauth2Controller.java
index 5d7aa5d7b..061c1c0e1 100644
--- a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/controller/Oauth2Controller.java
+++ b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/controller/Oauth2Controller.java
@@ -15,7 +15,7 @@
* 页面控制器.
*
* @author EchoCow
- * @date 2020/1/6 下午4:30
+ * @date 2020-01-06 16:30
*/
@Controller
@RequestMapping("/oauth")
diff --git a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/controller/package-info.java b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/controller/package-info.java
index 453b76cd4..1b58c7187 100644
--- a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/controller/package-info.java
+++ b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/controller/package-info.java
@@ -8,7 +8,7 @@
* 或者退出的时候携带什么标识,都可以。
*
* @author EchoCow
- * @date 2020/1/7 上午11:25
+ * @date 2020-01-07 11:25
* @see org.springframework.security.oauth2.provider.endpoint.AuthorizationEndpoint
*/
package com.xkcoding.oauth.controller;
diff --git a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/entity/SysClientDetails.java b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/entity/SysClientDetails.java
index 535e36614..7562d2838 100644
--- a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/entity/SysClientDetails.java
+++ b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/entity/SysClientDetails.java
@@ -18,7 +18,7 @@
* 另一种方式是写一个方法将它转化为默认实现 {@link BaseClientDetails} 比较好一点并且简单很多
*
* @author EchoCow
- * @date 2020/1/6 下午12:54
+ * @date 2020-01-06 12:54
*/
@Data
@Table
diff --git a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/entity/SysRole.java b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/entity/SysRole.java
index e6e4f699a..a5362e655 100644
--- a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/entity/SysRole.java
+++ b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/entity/SysRole.java
@@ -3,7 +3,6 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
-import org.codehaus.jackson.annotate.JsonIgnore;
import javax.persistence.*;
import java.util.Set;
@@ -14,7 +13,7 @@
* 角色信息.
*
* @author EchoCow
- * @date 2020/1/6 下午12:44
+ * @date 2020-01-06 12:44
*/
@Data
@Table
diff --git a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/entity/SysUser.java b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/entity/SysUser.java
index 84a96411b..788825912 100644
--- a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/entity/SysUser.java
+++ b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/entity/SysUser.java
@@ -17,7 +17,7 @@
* 实现接口的方式可以参考 {@link SysClientDetails}
*
* @author EchoCow
- * @date 2020/1/6 下午12:41
+ * @date 2020-01-06 12:41
*/
@Data
@Table
diff --git a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/repostiory/SysClientDetailsRepository.java b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/repostiory/SysClientDetailsRepository.java
index 1184acaf3..83dcfd11d 100644
--- a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/repostiory/SysClientDetailsRepository.java
+++ b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/repostiory/SysClientDetailsRepository.java
@@ -10,7 +10,7 @@
* 客户端信息.
*
* @author EchoCow
- * @date 2020/1/6 下午1:09
+ * @date 2020-01-06 13:09
*/
public interface SysClientDetailsRepository extends JpaRepository {
diff --git a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/repostiory/SysUserRepository.java b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/repostiory/SysUserRepository.java
index a5aaff9cf..0145759fd 100644
--- a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/repostiory/SysUserRepository.java
+++ b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/repostiory/SysUserRepository.java
@@ -9,7 +9,7 @@
* 用户信息仓库.
*
* @author EchoCow
- * @date 2020/1/6 下午1:08
+ * @date 2020-01-06 13:08
*/
public interface SysUserRepository extends JpaRepository {
diff --git a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/service/SysClientDetailsService.java b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/service/SysClientDetailsService.java
index 408414a45..5ccbdbd9a 100644
--- a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/service/SysClientDetailsService.java
+++ b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/service/SysClientDetailsService.java
@@ -13,7 +13,7 @@
* 参见 {@link ClientRegistrationService}
*
* @author EchoCow
- * @date 2020/1/6 下午1:39
+ * @date 2020-01-06 13:39
*/
public interface SysClientDetailsService extends ClientDetailsService {
diff --git a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/service/SysUserService.java b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/service/SysUserService.java
index 6604a54a4..95b8fa919 100644
--- a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/service/SysUserService.java
+++ b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/service/SysUserService.java
@@ -10,7 +10,7 @@
* .
*
* @author EchoCow
- * @date 2020/1/6 下午3:44
+ * @date 2020-01-06 15:44
*/
public interface SysUserService extends UserDetailsService {
/**
diff --git a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/service/impl/SysClientDetailsServiceImpl.java b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/service/impl/SysClientDetailsServiceImpl.java
index 00e36629e..3721373d5 100644
--- a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/service/impl/SysClientDetailsServiceImpl.java
+++ b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/service/impl/SysClientDetailsServiceImpl.java
@@ -14,7 +14,7 @@
* 客户端 相关操作.
*
* @author EchoCow
- * @date 2020/1/6 下午1:37
+ * @date 2020-01-06 13:37
*/
@Service
@RequiredArgsConstructor
diff --git a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/service/impl/SysUserServiceImpl.java b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/service/impl/SysUserServiceImpl.java
index 307af4d6d..0f1b814c2 100644
--- a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/service/impl/SysUserServiceImpl.java
+++ b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/service/impl/SysUserServiceImpl.java
@@ -18,7 +18,7 @@
* 用户相关操作.
*
* @author EchoCow
- * @date 2020/1/6 下午3:06
+ * @date 2020-01-06 15:06
*/
@Service
@RequiredArgsConstructor
diff --git a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/service/package-info.java b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/service/package-info.java
index 45f57f553..b10f52f4d 100644
--- a/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/service/package-info.java
+++ b/demo-oauth/oauth-authorization-server/src/main/java/com/xkcoding/oauth/service/package-info.java
@@ -2,6 +2,6 @@
* service 层,继承并实现 spring 接口.
*
* @author EchoCow
- * @date 2020/1/7 上午9:16
+ * @date 2020-01-07 9:16
*/
package com.xkcoding.oauth.service;
diff --git a/demo-oauth/oauth-authorization-server/src/test/java/com/xkcoding/oauth/PasswordEncodeTest.java b/demo-oauth/oauth-authorization-server/src/test/java/com/xkcoding/oauth/PasswordEncodeTest.java
index 3dc8233a4..84cd8bb7d 100644
--- a/demo-oauth/oauth-authorization-server/src/test/java/com/xkcoding/oauth/PasswordEncodeTest.java
+++ b/demo-oauth/oauth-authorization-server/src/test/java/com/xkcoding/oauth/PasswordEncodeTest.java
@@ -8,7 +8,7 @@
* .
*
* @author EchoCow
- * @date 2020/1/6 下午3:51
+ * @date 2020-01-06 15:51
*/
public class PasswordEncodeTest {
diff --git a/demo-oauth/oauth-authorization-server/src/test/java/com/xkcoding/oauth/oauth/AuthorizationCodeGrantTests.java b/demo-oauth/oauth-authorization-server/src/test/java/com/xkcoding/oauth/oauth/AuthorizationCodeGrantTests.java
index 01e0d447b..ff06e8a98 100644
--- a/demo-oauth/oauth-authorization-server/src/test/java/com/xkcoding/oauth/oauth/AuthorizationCodeGrantTests.java
+++ b/demo-oauth/oauth-authorization-server/src/test/java/com/xkcoding/oauth/oauth/AuthorizationCodeGrantTests.java
@@ -26,7 +26,7 @@
* 授权码模式测试.
*
* @author EchoCow
- * @date 2020/1/6 下午8:43
+ * @date 2020-01-06 20:43
*/
public class AuthorizationCodeGrantTests {
diff --git a/demo-oauth/oauth-authorization-server/src/test/java/com/xkcoding/oauth/oauth/AuthorizationServerInfo.java b/demo-oauth/oauth-authorization-server/src/test/java/com/xkcoding/oauth/oauth/AuthorizationServerInfo.java
index 0c229199c..de5a186bc 100644
--- a/demo-oauth/oauth-authorization-server/src/test/java/com/xkcoding/oauth/oauth/AuthorizationServerInfo.java
+++ b/demo-oauth/oauth-authorization-server/src/test/java/com/xkcoding/oauth/oauth/AuthorizationServerInfo.java
@@ -16,7 +16,7 @@
* 授权服务器工具类.
*
* @author EchoCow
- * @date 2020/1/6 下午8:44
+ * @date 2020-01-06 20:44
*/
@SuppressWarnings("all")
public class AuthorizationServerInfo {
diff --git a/demo-oauth/oauth-authorization-server/src/test/java/com/xkcoding/oauth/oauth/ResourceOwnerPasswordGrantTests.java b/demo-oauth/oauth-authorization-server/src/test/java/com/xkcoding/oauth/oauth/ResourceOwnerPasswordGrantTests.java
index 38d8d1ddc..abe19e1c0 100644
--- a/demo-oauth/oauth-authorization-server/src/test/java/com/xkcoding/oauth/oauth/ResourceOwnerPasswordGrantTests.java
+++ b/demo-oauth/oauth-authorization-server/src/test/java/com/xkcoding/oauth/oauth/ResourceOwnerPasswordGrantTests.java
@@ -14,7 +14,7 @@
* .
*
* @author EchoCow
- * @date 2020/1/6 下午9:14
+ * @date 2020-01-06 21:14
*/
public class ResourceOwnerPasswordGrantTests {
diff --git a/demo-oauth/oauth-authorization-server/src/test/java/com/xkcoding/oauth/repostiory/SysClientDetailsTest.java b/demo-oauth/oauth-authorization-server/src/test/java/com/xkcoding/oauth/repostiory/SysClientDetailsTest.java
index c0126bc09..515ebe083 100644
--- a/demo-oauth/oauth-authorization-server/src/test/java/com/xkcoding/oauth/repostiory/SysClientDetailsTest.java
+++ b/demo-oauth/oauth-authorization-server/src/test/java/com/xkcoding/oauth/repostiory/SysClientDetailsTest.java
@@ -11,7 +11,7 @@
* .
*
* @author EchoCow
- * @date 2020/1/6 下午1:10
+ * @date 2020-01-06 13:10
*/
@DataJpaTest
public class SysClientDetailsTest {
diff --git a/demo-oauth/oauth-authorization-server/src/test/java/com/xkcoding/oauth/repostiory/SysUserRepositoryTest.java b/demo-oauth/oauth-authorization-server/src/test/java/com/xkcoding/oauth/repostiory/SysUserRepositoryTest.java
index 7df067973..50903d1ec 100644
--- a/demo-oauth/oauth-authorization-server/src/test/java/com/xkcoding/oauth/repostiory/SysUserRepositoryTest.java
+++ b/demo-oauth/oauth-authorization-server/src/test/java/com/xkcoding/oauth/repostiory/SysUserRepositoryTest.java
@@ -15,7 +15,7 @@
* .
*
* @author EchoCow
- * @date 2020/1/6 下午1:25
+ * @date 2020-01-06 13:25
*/
@DataJpaTest
public class SysUserRepositoryTest {
diff --git a/demo-oauth/oauth-resource-server/src/main/java/com/xkcoding/oauth/SpringBootDemoResourceApplication.java b/demo-oauth/oauth-resource-server/src/main/java/com/xkcoding/oauth/SpringBootDemoResourceApplication.java
index 33b7bd90c..fb4ac930f 100644
--- a/demo-oauth/oauth-resource-server/src/main/java/com/xkcoding/oauth/SpringBootDemoResourceApplication.java
+++ b/demo-oauth/oauth-resource-server/src/main/java/com/xkcoding/oauth/SpringBootDemoResourceApplication.java
@@ -8,7 +8,7 @@
* 启动器.
*
* @author EchoCow
- * @date 2020/1/9 上午11:38
+ * @date 2020-01-09 11:38
* @version V1.0
*/
@EnableResourceServer
diff --git a/demo-oauth/oauth-resource-server/src/main/java/com/xkcoding/oauth/config/OauthResourceServerConfig.java b/demo-oauth/oauth-resource-server/src/main/java/com/xkcoding/oauth/config/OauthResourceServerConfig.java
index 2d3243e17..f221ce472 100644
--- a/demo-oauth/oauth-resource-server/src/main/java/com/xkcoding/oauth/config/OauthResourceServerConfig.java
+++ b/demo-oauth/oauth-resource-server/src/main/java/com/xkcoding/oauth/config/OauthResourceServerConfig.java
@@ -15,7 +15,7 @@
* 我们自己实现了它的配置,所以它的自动装配不会生效
*
* @author EchoCow
- * @date 2020/1/9 下午2:20
+ * @date 2020-01-09 14:20
*/
@Configuration
@AllArgsConstructor
diff --git a/demo-oauth/oauth-resource-server/src/main/java/com/xkcoding/oauth/config/OauthResourceTokenConfig.java b/demo-oauth/oauth-resource-server/src/main/java/com/xkcoding/oauth/config/OauthResourceTokenConfig.java
index c28c72cc3..dd5927fb2 100644
--- a/demo-oauth/oauth-resource-server/src/main/java/com/xkcoding/oauth/config/OauthResourceTokenConfig.java
+++ b/demo-oauth/oauth-resource-server/src/main/java/com/xkcoding/oauth/config/OauthResourceTokenConfig.java
@@ -22,7 +22,7 @@
* token 相关配置,jwt 相关.
*
* @author EchoCow
- * @date 2020/1/9 下午2:39
+ * @date 2020-01-09 14:39
*/
@Slf4j
@Configuration
diff --git a/demo-oauth/oauth-resource-server/src/main/java/com/xkcoding/oauth/controller/TestController.java b/demo-oauth/oauth-resource-server/src/main/java/com/xkcoding/oauth/controller/TestController.java
index 9c6ed628c..b3f1572e0 100644
--- a/demo-oauth/oauth-resource-server/src/main/java/com/xkcoding/oauth/controller/TestController.java
+++ b/demo-oauth/oauth-resource-server/src/main/java/com/xkcoding/oauth/controller/TestController.java
@@ -8,7 +8,7 @@
* 测试接口.
*
* @author EchoCow
- * @date 2020/1/9 下午2:37
+ * @date 2020-01-09 14:37
*/
@RestController
public class TestController {
diff --git a/demo-oauth/oauth-resource-server/src/test/java/com/xkcoding/oauth/AuthorizationTest.java b/demo-oauth/oauth-resource-server/src/test/java/com/xkcoding/oauth/AuthorizationTest.java
index 774a4ec02..207feb641 100644
--- a/demo-oauth/oauth-resource-server/src/test/java/com/xkcoding/oauth/AuthorizationTest.java
+++ b/demo-oauth/oauth-resource-server/src/test/java/com/xkcoding/oauth/AuthorizationTest.java
@@ -13,7 +13,7 @@
* .
*
* @author EchoCow
- * @date 2020/1/9 下午3:44
+ * @date 2020-01-09 15:44
*/
public class AuthorizationTest {
public static final String AUTHORIZATION_SERVER = "http://127.0.0.1:8080";
diff --git a/demo-oauth/oauth-resource-server/src/test/java/com/xkcoding/oauth/controller/TestControllerTest.java b/demo-oauth/oauth-resource-server/src/test/java/com/xkcoding/oauth/controller/TestControllerTest.java
index ea0a43268..2e933b7ed 100644
--- a/demo-oauth/oauth-resource-server/src/test/java/com/xkcoding/oauth/controller/TestControllerTest.java
+++ b/demo-oauth/oauth-resource-server/src/test/java/com/xkcoding/oauth/controller/TestControllerTest.java
@@ -19,7 +19,7 @@
* .
*
* @author EchoCow
- * @date 2020/1/9 下午3:46
+ * @date 2020-01-09 15:46
*/
public class TestControllerTest extends AuthorizationTest {
diff --git a/demo-orm-beetlsql/README.md b/demo-orm-beetlsql/README.md
index 08cdf575c..1eb3827b0 100644
--- a/demo-orm-beetlsql/README.md
+++ b/demo-orm-beetlsql/README.md
@@ -88,7 +88,7 @@
```
-## application.yml
+## application.yml
> 注意下方注释的地方,**不能解开注释,并且需要通过JavaConfig的方式手动配置数据源**,否则,会导致beetl启动失败,因此,初始化数据库的数据,只能手动在数据库使用 resources/db 下的建表语句和数据库初始化数据。
@@ -141,13 +141,8 @@ beet-beetlsql:
* Beetl数据源配置
*
*
- * @package: com.xkcoding.orm.beetlsql.config
- * @description: Beetl数据源配置
- * @author: yangkai.shen
- * @date: Created in 2018/11/14 17:15
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-11-14 17:15
*/
@Configuration
public class BeetlConfig {
@@ -175,13 +170,8 @@ public class BeetlConfig {
* UserDao
*
*
- * @package: com.xkcoding.orm.beetlsql.dao
- * @description: UserDao
- * @author: yangkai.shen
- * @date: Created in 2018/11/14 16:18
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-11-14 16:18
*/
@Component
public interface UserDao extends BaseMapper {
@@ -197,13 +187,8 @@ public interface UserDao extends BaseMapper {
* User Service
*
*
- * @package: com.xkcoding.orm.beetlsql.service.impl
- * @description: User Service
- * @author: yangkai.shen
- * @date: Created in 2018/11/14 16:28
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-11-14 16:28
*/
@Service
@Slf4j
@@ -305,13 +290,8 @@ public class UserServiceImpl implements UserService {
* User Service测试
*
*
- * @package: com.xkcoding.orm.beetlsql.service
- * @description: User Service测试
- * @author: yangkai.shen
- * @date: Created in 2018/11/14 16:30
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-11-14 16:30
*/
@Slf4j
public class UserServiceTest extends SpringBootDemoOrmBeetlsqlApplicationTests {
@@ -385,4 +365,4 @@ public class UserServiceTest extends SpringBootDemoOrmBeetlsqlApplicationTests {
- BeetlSQL官方文档:http://ibeetl.com/guide/#beetlsql
- 开源项目:https://gitee.com/yangkb/springboot-beetl-beetlsql
-- 博客:https://blog.csdn.net/flystarfly/article/details/82752597
\ No newline at end of file
+- 博客:https://blog.csdn.net/flystarfly/article/details/82752597
diff --git a/demo-orm-beetlsql/src/main/java/com/xkcoding/orm/beetlsql/SpringBootDemoOrmBeetlsqlApplication.java b/demo-orm-beetlsql/src/main/java/com/xkcoding/orm/beetlsql/SpringBootDemoOrmBeetlsqlApplication.java
index 825efe69a..62662fc6d 100644
--- a/demo-orm-beetlsql/src/main/java/com/xkcoding/orm/beetlsql/SpringBootDemoOrmBeetlsqlApplication.java
+++ b/demo-orm-beetlsql/src/main/java/com/xkcoding/orm/beetlsql/SpringBootDemoOrmBeetlsqlApplication.java
@@ -8,13 +8,8 @@
* 启动类
*
*
- * @package: com.xkcoding.orm.beetlsql
- * @description: 启动类
- * @author: yangkai.shen
- * @date: Created in 2018/11/14 15:47
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-11-14 15:47
*/
@SpringBootApplication
public class SpringBootDemoOrmBeetlsqlApplication {
diff --git a/demo-orm-beetlsql/src/main/java/com/xkcoding/orm/beetlsql/config/BeetlConfig.java b/demo-orm-beetlsql/src/main/java/com/xkcoding/orm/beetlsql/config/BeetlConfig.java
index 27271600c..6ec1b5a2f 100644
--- a/demo-orm-beetlsql/src/main/java/com/xkcoding/orm/beetlsql/config/BeetlConfig.java
+++ b/demo-orm-beetlsql/src/main/java/com/xkcoding/orm/beetlsql/config/BeetlConfig.java
@@ -12,13 +12,8 @@
* Beetl数据源配置
*
*
- * @package: com.xkcoding.orm.beetlsql.config
- * @description: Beetl数据源配置
- * @author: yangkai.shen
- * @date: Created in 2018/11/14 17:15
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-11-14 17:15
*/
@Configuration
public class BeetlConfig {
diff --git a/demo-orm-beetlsql/src/main/java/com/xkcoding/orm/beetlsql/dao/UserDao.java b/demo-orm-beetlsql/src/main/java/com/xkcoding/orm/beetlsql/dao/UserDao.java
index 63238d586..8dda59790 100644
--- a/demo-orm-beetlsql/src/main/java/com/xkcoding/orm/beetlsql/dao/UserDao.java
+++ b/demo-orm-beetlsql/src/main/java/com/xkcoding/orm/beetlsql/dao/UserDao.java
@@ -9,13 +9,8 @@
* UserDao
*
*
- * @package: com.xkcoding.orm.beetlsql.dao
- * @description: UserDao
- * @author: yangkai.shen
- * @date: Created in 2018/11/14 16:18
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-11-14 16:18
*/
@Component
public interface UserDao extends BaseMapper {
diff --git a/demo-orm-beetlsql/src/main/java/com/xkcoding/orm/beetlsql/entity/User.java b/demo-orm-beetlsql/src/main/java/com/xkcoding/orm/beetlsql/entity/User.java
index 71e2fd3d2..9a4aadbfa 100644
--- a/demo-orm-beetlsql/src/main/java/com/xkcoding/orm/beetlsql/entity/User.java
+++ b/demo-orm-beetlsql/src/main/java/com/xkcoding/orm/beetlsql/entity/User.java
@@ -14,13 +14,8 @@
* 用户实体类
*
*
- * @package: com.xkcoding.orm.beetlsql.entity
- * @description: 用户实体类
- * @author: yangkai.shen
- * @date: Created in 2018/11/14 16:06
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-11-14 16:06
*/
@Data
@NoArgsConstructor
diff --git a/demo-orm-beetlsql/src/main/java/com/xkcoding/orm/beetlsql/service/UserService.java b/demo-orm-beetlsql/src/main/java/com/xkcoding/orm/beetlsql/service/UserService.java
index a0e7af1ca..15392888a 100644
--- a/demo-orm-beetlsql/src/main/java/com/xkcoding/orm/beetlsql/service/UserService.java
+++ b/demo-orm-beetlsql/src/main/java/com/xkcoding/orm/beetlsql/service/UserService.java
@@ -10,13 +10,8 @@
* User Service
*
*
- * @package: com.xkcoding.orm.beetlsql.service
- * @description: User Service
- * @author: yangkai.shen
- * @date: Created in 2018/11/14 16:18
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-11-14 16:18
*/
public interface UserService {
/**
diff --git a/demo-orm-beetlsql/src/main/java/com/xkcoding/orm/beetlsql/service/impl/UserServiceImpl.java b/demo-orm-beetlsql/src/main/java/com/xkcoding/orm/beetlsql/service/impl/UserServiceImpl.java
index f4bad1002..7ab1f7e7d 100644
--- a/demo-orm-beetlsql/src/main/java/com/xkcoding/orm/beetlsql/service/impl/UserServiceImpl.java
+++ b/demo-orm-beetlsql/src/main/java/com/xkcoding/orm/beetlsql/service/impl/UserServiceImpl.java
@@ -16,13 +16,8 @@
* User Service
*
*
- * @package: com.xkcoding.orm.beetlsql.service.impl
- * @description: User Service
- * @author: yangkai.shen
- * @date: Created in 2018/11/14 16:28
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-11-14 16:28
*/
@Service
@Slf4j
diff --git a/demo-orm-beetlsql/src/test/java/com/xkcoding/orm/beetlsql/service/UserServiceTest.java b/demo-orm-beetlsql/src/test/java/com/xkcoding/orm/beetlsql/service/UserServiceTest.java
index 0f3aaa2a9..50e636323 100644
--- a/demo-orm-beetlsql/src/test/java/com/xkcoding/orm/beetlsql/service/UserServiceTest.java
+++ b/demo-orm-beetlsql/src/test/java/com/xkcoding/orm/beetlsql/service/UserServiceTest.java
@@ -8,7 +8,6 @@
import cn.hutool.json.JSONUtil;
import com.xkcoding.orm.beetlsql.SpringBootDemoOrmBeetlsqlApplicationTests;
import com.xkcoding.orm.beetlsql.entity.User;
-import com.xkcoding.orm.beetlsql.service.UserService;
import lombok.extern.slf4j.Slf4j;
import org.assertj.core.util.Lists;
import org.beetl.sql.core.engine.PageQuery;
@@ -23,13 +22,8 @@
* User Service测试
*
*
- * @package: com.xkcoding.orm.beetlsql.service
- * @description: User Service测试
- * @author: yangkai.shen
- * @date: Created in 2018/11/14 16:30
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-11-14 16:30
*/
@Slf4j
public class UserServiceTest extends SpringBootDemoOrmBeetlsqlApplicationTests {
@@ -96,4 +90,4 @@ public void getUserByPage() {
Assert.assertEquals(userList.size(), userByPage.getTotalRow());
log.debug("【userByPage】= {}", JSONUtil.toJsonStr(userByPage));
}
-}
\ No newline at end of file
+}
diff --git a/demo-orm-jdbctemplate/README.md b/demo-orm-jdbctemplate/README.md
index 3d54e678e..b170dd700 100644
--- a/demo-orm-jdbctemplate/README.md
+++ b/demo-orm-jdbctemplate/README.md
@@ -83,13 +83,8 @@
* Dao基类
*
*
- * @package: com.xkcoding.orm.jdbctemplate.dao.base
- * @description: Dao基类
- * @author: yangkai.shen
- * @date: Created in 2018/10/15 11:28 AM
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-10-15 11:28
*/
@Slf4j
public class BaseDao {
@@ -329,4 +324,4 @@ logging:
## 备注
-其余详细代码参见 demo
\ No newline at end of file
+其余详细代码参见 demo
diff --git a/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/SpringBootDemoOrmJdbctemplateApplication.java b/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/SpringBootDemoOrmJdbctemplateApplication.java
index ab0d2c5c6..292f7b700 100644
--- a/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/SpringBootDemoOrmJdbctemplateApplication.java
+++ b/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/SpringBootDemoOrmJdbctemplateApplication.java
@@ -1,7 +1,5 @@
package com.xkcoding.orm.jdbctemplate;
-import cn.hutool.core.util.IdUtil;
-import cn.hutool.crypto.SecureUtil;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -10,13 +8,8 @@
* 启动类
*
*
- * @package: com.xkcoding.orm.jdbctemplate
- * @description: 启动类
- * @author: yangkai.shen
- * @date: Created in 2018/10/15 9:50 AM
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-10-15 9:50
*/
@SpringBootApplication
public class SpringBootDemoOrmJdbctemplateApplication {
diff --git a/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/annotation/Column.java b/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/annotation/Column.java
index 4dd5245fd..bd65b9a4b 100644
--- a/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/annotation/Column.java
+++ b/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/annotation/Column.java
@@ -10,13 +10,8 @@
* 列注解
*
*
- * @package: com.xkcoding.orm.jdbctemplate.annotation
- * @description: 列注解
- * @author: yangkai.shen
- * @date: Created in 2018/10/15 11:23 AM
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-10-15 11:23
*/
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.FIELD})
diff --git a/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/annotation/Ignore.java b/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/annotation/Ignore.java
index 7a84f3dfe..fba3dc5af 100644
--- a/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/annotation/Ignore.java
+++ b/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/annotation/Ignore.java
@@ -10,13 +10,8 @@
* 需要忽略的字段
*
*
- * @package: com.xkcoding.orm.jdbctemplate.annotation
- * @description: 需要忽略的字段
- * @author: yangkai.shen
- * @date: Created in 2018/10/15 1:25 PM
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-10-15 13:25
*/
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.FIELD})
diff --git a/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/annotation/Pk.java b/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/annotation/Pk.java
index aea8366e4..599faa4b1 100644
--- a/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/annotation/Pk.java
+++ b/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/annotation/Pk.java
@@ -10,13 +10,8 @@
* 主键注解
*
*
- * @package: com.xkcoding.orm.jdbctemplate.annotation
- * @description: 主键注解
- * @author: yangkai.shen
- * @date: Created in 2018/10/15 11:23 AM
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-10-15 11:23
*/
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.FIELD})
diff --git a/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/annotation/Table.java b/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/annotation/Table.java
index b5095482c..d914e2368 100644
--- a/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/annotation/Table.java
+++ b/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/annotation/Table.java
@@ -10,13 +10,8 @@
* 表注解
*
*
- * @package: com.xkcoding.orm.jdbctemplate.annotation
- * @description: 表注解
- * @author: yangkai.shen
- * @date: Created in 2018/10/15 11:23 AM
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-10-15 11:23
*/
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.TYPE})
diff --git a/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/constant/Const.java b/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/constant/Const.java
index 2156ea5c8..9b923b915 100644
--- a/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/constant/Const.java
+++ b/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/constant/Const.java
@@ -5,13 +5,8 @@
* 常量池
*
*
- * @package: com.xkcoding.orm.jdbctemplate.constant
- * @description: 常量池
- * @author: yangkai.shen
- * @date: Created in 2018/10/15 10:59 AM
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-10-15 10:59
*/
public interface Const {
/**
diff --git a/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/controller/UserController.java b/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/controller/UserController.java
index 4616ff314..7c8ed7bb0 100644
--- a/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/controller/UserController.java
+++ b/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/controller/UserController.java
@@ -14,13 +14,8 @@
* User Controller
*
*
- * @package: com.xkcoding.orm.jdbctemplate.controller
- * @description: User Controller
- * @author: yangkai.shen
- * @date: Created in 2018/10/15 1:58 PM
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-10-15 13:58
*/
@RestController
@Slf4j
diff --git a/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/dao/UserDao.java b/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/dao/UserDao.java
index 0ccf99002..f4e5e469e 100644
--- a/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/dao/UserDao.java
+++ b/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/dao/UserDao.java
@@ -13,13 +13,8 @@
* User Dao
*
*
- * @package: com.xkcoding.orm.jdbctemplate.dao
- * @description: User Dao
- * @author: yangkai.shen
- * @date: Created in 2018/10/15 11:15 AM
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-10-15 11:15
*/
@Repository
public class UserDao extends BaseDao {
diff --git a/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/dao/base/BaseDao.java b/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/dao/base/BaseDao.java
index 42c735d5b..b0952f5fb 100644
--- a/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/dao/base/BaseDao.java
+++ b/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/dao/base/BaseDao.java
@@ -30,13 +30,8 @@
* Dao基类
*
*
- * @package: com.xkcoding.orm.jdbctemplate.dao.base
- * @description: Dao基类
- * @author: yangkai.shen
- * @date: Created in 2018/10/15 11:28 AM
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-10-15 11:28
*/
@Slf4j
public class BaseDao {
diff --git a/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/entity/User.java b/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/entity/User.java
index e21697ba2..7b6ebc073 100644
--- a/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/entity/User.java
+++ b/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/entity/User.java
@@ -13,13 +13,8 @@
* 用户实体类
*
*
- * @package: com.xkcoding.orm.jdbctemplate.entity
- * @description: 用户实体类
- * @author: yangkai.shen
- * @date: Created in 2018/10/15 10:45 AM
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-10-15 10:45
*/
@Data
@Table(name = "orm_user")
diff --git a/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/service/IUserService.java b/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/service/IUserService.java
index c4b686eeb..099865c14 100644
--- a/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/service/IUserService.java
+++ b/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/service/IUserService.java
@@ -9,13 +9,8 @@
* User Service
*
*
- * @package: com.xkcoding.orm.jdbctemplate.service
- * @description: User Service
- * @author: yangkai.shen
- * @date: Created in 2018/10/15 1:51 PM
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-10-15 13:51
*/
public interface IUserService {
/**
diff --git a/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/service/impl/UserServiceImpl.java b/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/service/impl/UserServiceImpl.java
index 6f0dccfbb..33afbc2d5 100644
--- a/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/service/impl/UserServiceImpl.java
+++ b/demo-orm-jdbctemplate/src/main/java/com/xkcoding/orm/jdbctemplate/service/impl/UserServiceImpl.java
@@ -20,13 +20,8 @@
* User Service Implement
*
*
- * @package: com.xkcoding.orm.jdbctemplate.service.impl
- * @description: User Service Implement
- * @author: yangkai.shen
- * @date: Created in 2018/10/15 1:53 PM
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-10-15 13:53
*/
@Service
public class UserServiceImpl implements IUserService {
diff --git a/demo-orm-jpa/README.md b/demo-orm-jpa/README.md
index fd3013671..416a1b837 100644
--- a/demo-orm-jpa/README.md
+++ b/demo-orm-jpa/README.md
@@ -88,13 +88,8 @@
* JPA配置类
*
*
- * @package: com.xkcoding.orm.jpa.config
- * @description: JPA配置类
- * @author: yangkai.shen
- * @date: Created in 2018/11/7 11:05
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-11-07 11:05
*/
@Configuration
@EnableTransactionManagement
@@ -133,13 +128,8 @@ public class JpaConfig {
* 用户实体类
*
*
- * @package: com.xkcoding.orm.jpa.entity
- * @description: 用户实体类
- * @author: yangkai.shen
- * @date: Created in 2018/11/7 14:06
- * @copyright: Copyright (c)
- * @version: V1.0
- * @modified: 76peter
+ * @author yangkai.shen
+ * @date Created in 2018-11-07 14:06
*/
@EqualsAndHashCode(callSuper = true)
@NoArgsConstructor
@@ -211,13 +201,8 @@ public class User extends AbstractAuditModel {
* 部门实体类
*
*
- * @package: com.xkcoding.orm.jpa.entity
- * @description: 部门实体类
- * @author: 76peter
- * @date: Created in 2019/10/1 18:07
- * @copyright: Copyright (c) 2019
- * @version: V1.0
- * @modified: 76peter
+ * @author 76peter
+ * @date Created in 2019-10-01 18:07
*/
@EqualsAndHashCode(callSuper = true)
@Data
@@ -272,13 +257,8 @@ public class Department extends AbstractAuditModel {
* 实体通用父类
*
*
- * @package: com.xkcoding.orm.jpa.entity.base
- * @description: 实体通用父类
- * @author: yangkai.shen
- * @date: Created in 2018/11/7 14:01
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-11-07 14:01
*/
@MappedSuperclass
@EntityListeners(AuditingEntityListener.class)
@@ -315,13 +295,8 @@ public abstract class AbstractAuditModel implements Serializable {
* User Dao
*
*
- * @package: com.xkcoding.orm.jpa.repository
- * @description: User Dao
- * @author: yangkai.shen
- * @date: Created in 2018/11/7 14:07
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-11-07 14:07
*/
@Repository
public interface UserDao extends JpaRepository {
@@ -335,13 +310,8 @@ public interface UserDao extends JpaRepository {
* User Dao
*
*
- * @package: com.xkcoding.orm.jpa.repository
- * @description: Department Dao
- * @author: 76peter
- * @date: Created in 2019/10/1 18:07
- * @copyright: Copyright (c) 2019
- * @version: V1.0
- * @modified: 76peter
+ * @author 76peter
+ * @date Created in 2019-10-01 18:07
*/
@Repository
public interface DepartmentDao extends JpaRepository {
@@ -403,13 +373,8 @@ logging:
* jpa 测试类
*
*
- * @package: com.xkcoding.orm.jpa.repository
- * @description: jpa 测试类
- * @author: yangkai.shen
- * @date: Created in 2018/11/7 14:09
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-11-07 14:09
*/
@Slf4j
public class UserDaoTest extends SpringBootDemoOrmJpaApplicationTests {
@@ -516,13 +481,8 @@ public class UserDaoTest extends SpringBootDemoOrmJpaApplicationTests {
* jpa 测试类
*
*
- * @package: com.xkcoding.orm.jpa.repository
- * @description: jpa 测试类
- * @author: 76peter
- * @date: Created in 2018/11/7 14:09
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: 76peter
+ * @author 76peter
+ * @date Created in 2018-11-07 14:09
*/
@Slf4j
public class DepartmentDaoTest extends SpringBootDemoOrmJpaApplicationTests {
@@ -587,4 +547,4 @@ public class DepartmentDaoTest extends SpringBootDemoOrmJpaApplicationTests {
## 参考
-- Spring Data JPA 官方文档:https://docs.spring.io/spring-data/jpa/docs/current/reference/html/
+- Spring Data JPA 官方文档:https://docs.spring.io/spring-data/jpa/docs/current/reference/html/
diff --git a/demo-orm-jpa/src/main/java/com/xkcoding/orm/jpa/SpringBootDemoOrmJpaApplication.java b/demo-orm-jpa/src/main/java/com/xkcoding/orm/jpa/SpringBootDemoOrmJpaApplication.java
index b048ea04f..1a7c8c5f4 100644
--- a/demo-orm-jpa/src/main/java/com/xkcoding/orm/jpa/SpringBootDemoOrmJpaApplication.java
+++ b/demo-orm-jpa/src/main/java/com/xkcoding/orm/jpa/SpringBootDemoOrmJpaApplication.java
@@ -8,13 +8,8 @@
* 启动类
*
*
- * @package: com.xkcoding.orm.jpa
- * @description: 启动类
- * @author: yangkai.shen
- * @date: Created in 2018/10/28 22:58
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-10-28 22:58
*/
@SpringBootApplication
public class SpringBootDemoOrmJpaApplication {
diff --git a/demo-orm-jpa/src/main/java/com/xkcoding/orm/jpa/config/JpaConfig.java b/demo-orm-jpa/src/main/java/com/xkcoding/orm/jpa/config/JpaConfig.java
index c60694337..495301d43 100644
--- a/demo-orm-jpa/src/main/java/com/xkcoding/orm/jpa/config/JpaConfig.java
+++ b/demo-orm-jpa/src/main/java/com/xkcoding/orm/jpa/config/JpaConfig.java
@@ -20,13 +20,8 @@
* JPA配置类
*
*
- * @package: com.xkcoding.orm.jpa.config
- * @description: JPA配置类
- * @author: yangkai.shen
- * @date: Created in 2018/11/7 11:05
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-11-07 11:05
*/
@Configuration
@EnableTransactionManagement
diff --git a/demo-orm-jpa/src/main/java/com/xkcoding/orm/jpa/entity/Department.java b/demo-orm-jpa/src/main/java/com/xkcoding/orm/jpa/entity/Department.java
index 3b71beca7..0de0bb6fb 100644
--- a/demo-orm-jpa/src/main/java/com/xkcoding/orm/jpa/entity/Department.java
+++ b/demo-orm-jpa/src/main/java/com/xkcoding/orm/jpa/entity/Department.java
@@ -11,13 +11,8 @@
* 部门实体类
*
*
- * @package: com.xkcoding.orm.jpa.entity
- * @description: 部门实体类
- * @author: 76peter
- * @date: Created in 2019/10/1 18:07
- * @copyright: Copyright (c) 2019
- * @version: V1.0
- * @modified: 76peter
+ * @author 76peter
+ * @date Created in 2019-10-01 18:07
*/
@EqualsAndHashCode(callSuper = true)
@Data
diff --git a/demo-orm-jpa/src/main/java/com/xkcoding/orm/jpa/entity/User.java b/demo-orm-jpa/src/main/java/com/xkcoding/orm/jpa/entity/User.java
index 27fb30a44..0ea940791 100644
--- a/demo-orm-jpa/src/main/java/com/xkcoding/orm/jpa/entity/User.java
+++ b/demo-orm-jpa/src/main/java/com/xkcoding/orm/jpa/entity/User.java
@@ -12,13 +12,8 @@
* 用户实体类
*
*
- * @package: com.xkcoding.orm.jpa.entity
- * @description: 用户实体类
- * @author: yangkai.shen
- * @date: Created in 2018/11/7 14:06
- * @copyright: Copyright (c)
- * @version: V1.0
- * @modified: 76peter
+ * @author yangkai.shen
+ * @date Created in 2018-11-07 14:06
*/
@EqualsAndHashCode(callSuper = true)
@NoArgsConstructor
diff --git a/demo-orm-jpa/src/main/java/com/xkcoding/orm/jpa/entity/base/AbstractAuditModel.java b/demo-orm-jpa/src/main/java/com/xkcoding/orm/jpa/entity/base/AbstractAuditModel.java
index beb8547be..dd2f2e439 100644
--- a/demo-orm-jpa/src/main/java/com/xkcoding/orm/jpa/entity/base/AbstractAuditModel.java
+++ b/demo-orm-jpa/src/main/java/com/xkcoding/orm/jpa/entity/base/AbstractAuditModel.java
@@ -14,13 +14,8 @@
* 实体通用父类
*
*
- * @package: com.xkcoding.orm.jpa.entity.base
- * @description: 实体通用父类
- * @author: yangkai.shen
- * @date: Created in 2018/11/7 14:01
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-11-07 14:01
*/
@MappedSuperclass
@EntityListeners(AuditingEntityListener.class)
diff --git a/demo-orm-jpa/src/main/java/com/xkcoding/orm/jpa/repository/DepartmentDao.java b/demo-orm-jpa/src/main/java/com/xkcoding/orm/jpa/repository/DepartmentDao.java
index dc3fab490..4767bdeb8 100644
--- a/demo-orm-jpa/src/main/java/com/xkcoding/orm/jpa/repository/DepartmentDao.java
+++ b/demo-orm-jpa/src/main/java/com/xkcoding/orm/jpa/repository/DepartmentDao.java
@@ -12,13 +12,8 @@
* User Dao
*
*
- * @package: com.xkcoding.orm.jpa.repository
- * @description: Department Dao
- * @author: 76peter
- * @date: Created in 2019/10/1 18:07
- * @copyright: Copyright (c) 2019
- * @version: V1.0
- * @modified: 76peter
+ * @author 76peter
+ * @date Created in 2019-10-01 18:07
*/
@Repository
public interface DepartmentDao extends JpaRepository {
diff --git a/demo-orm-jpa/src/main/java/com/xkcoding/orm/jpa/repository/UserDao.java b/demo-orm-jpa/src/main/java/com/xkcoding/orm/jpa/repository/UserDao.java
index 383719a75..c7287939b 100644
--- a/demo-orm-jpa/src/main/java/com/xkcoding/orm/jpa/repository/UserDao.java
+++ b/demo-orm-jpa/src/main/java/com/xkcoding/orm/jpa/repository/UserDao.java
@@ -9,15 +9,10 @@
* User Dao
*
*
- * @package: com.xkcoding.orm.jpa.repository
- * @description: User Dao
- * @author: yangkai.shen
- * @date: Created in 2018/11/7 14:07
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-11-07 14:07
*/
@Repository
public interface UserDao extends JpaRepository {
-
+
}
diff --git a/demo-orm-jpa/src/test/java/com/xkcoding/orm/jpa/repository/DepartmentDaoTest.java b/demo-orm-jpa/src/test/java/com/xkcoding/orm/jpa/repository/DepartmentDaoTest.java
index 054a5bffd..876d07de4 100644
--- a/demo-orm-jpa/src/test/java/com/xkcoding/orm/jpa/repository/DepartmentDaoTest.java
+++ b/demo-orm-jpa/src/test/java/com/xkcoding/orm/jpa/repository/DepartmentDaoTest.java
@@ -18,13 +18,8 @@
* jpa 测试类
*
*
- * @package: com.xkcoding.orm.jpa.repository
- * @description: jpa 测试类
- * @author: 76peter
- * @date: Created in 2018/11/7 14:09
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: 76peter
+ * @author 76peter
+ * @date Created in 2018-11-07 14:09
*/
@Slf4j
public class DepartmentDaoTest extends SpringBootDemoOrmJpaApplicationTests {
diff --git a/demo-orm-jpa/src/test/java/com/xkcoding/orm/jpa/repository/UserDaoTest.java b/demo-orm-jpa/src/test/java/com/xkcoding/orm/jpa/repository/UserDaoTest.java
index edde1967e..20dde4636 100644
--- a/demo-orm-jpa/src/test/java/com/xkcoding/orm/jpa/repository/UserDaoTest.java
+++ b/demo-orm-jpa/src/test/java/com/xkcoding/orm/jpa/repository/UserDaoTest.java
@@ -23,13 +23,8 @@
* jpa 测试类
*
*
- * @package: com.xkcoding.orm.jpa.repository
- * @description: jpa 测试类
- * @author: yangkai.shen
- * @date: Created in 2018/11/7 14:09
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-11-07 14:09
*/
@Slf4j
public class UserDaoTest extends SpringBootDemoOrmJpaApplicationTests {
@@ -127,4 +122,4 @@ private void initData() {
userDao.saveAll(userList);
}
-}
\ No newline at end of file
+}
diff --git a/demo-orm-mybatis-mapper-page/README.md b/demo-orm-mybatis-mapper-page/README.md
index ee3dcb76b..94d7725de 100644
--- a/demo-orm-mybatis-mapper-page/README.md
+++ b/demo-orm-mybatis-mapper-page/README.md
@@ -100,13 +100,8 @@
* 启动器
*
*
- * @package: com.xkcoding.orm.mybatis.MapperAndPage
- * @description: 启动器
- * @author: yangkai.shen
- * @date: Created in 2018/11/8 13:43
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-11-08 13:43
*/
@SpringBootApplication
@MapperScan(basePackages = {"com.xkcoding.orm.mybatis.MapperAndPage.mapper"}) // 注意:这里的 MapperScan 是 tk.mybatis.spring.annotation.MapperScan 这个包下的
@@ -177,13 +172,8 @@ pagehelper:
* UserMapper
*
*
- * @package: com.xkcoding.orm.mybatis.MapperAndPage.mapper
- * @description: UserMapper
- * @author: yangkai.shen
- * @date: Created in 2018/11/8 14:15
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-11-08 14:15
*/
@Component
// 注意:这里的Mapper是tk.mybatis.mapper.common.Mapper包下的
@@ -199,13 +189,8 @@ public interface UserMapper extends Mapper, MySqlMapper {
* UserMapper 测试
*
*
- * @package: com.xkcoding.orm.mybatis.MapperAndPage.mapper
- * @description: UserMapper 测试
- * @author: yangkai.shen
- * @date: Created in 2018/11/8 14:25
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-11-08 14:25
*/
@Slf4j
public class UserMapperTest extends SpringBootDemoOrmMybatisMapperPageApplicationTests {
@@ -343,4 +328,4 @@ public class UserMapperTest extends SpringBootDemoOrmMybatisMapperPageApplicatio
## 参考
- 通用Mapper官方文档:https://github.com/abel533/Mapper/wiki/1.integration
-- pagehelper 官方文档:https://github.com/pagehelper/Mybatis-PageHelper/blob/master/wikis/zh/HowToUse.md
\ No newline at end of file
+- pagehelper 官方文档:https://github.com/pagehelper/Mybatis-PageHelper/blob/master/wikis/zh/HowToUse.md
diff --git a/demo-orm-mybatis-mapper-page/src/main/java/com/xkcoding/orm/mybatis/MapperAndPage/SpringBootDemoOrmMybatisMapperPageApplication.java b/demo-orm-mybatis-mapper-page/src/main/java/com/xkcoding/orm/mybatis/MapperAndPage/SpringBootDemoOrmMybatisMapperPageApplication.java
index 41e188724..69a7adeca 100644
--- a/demo-orm-mybatis-mapper-page/src/main/java/com/xkcoding/orm/mybatis/MapperAndPage/SpringBootDemoOrmMybatisMapperPageApplication.java
+++ b/demo-orm-mybatis-mapper-page/src/main/java/com/xkcoding/orm/mybatis/MapperAndPage/SpringBootDemoOrmMybatisMapperPageApplication.java
@@ -9,13 +9,8 @@
* 启动器
*
*
- * @package: com.xkcoding.orm.mybatis.MapperAndPage
- * @description: 启动器
- * @author: yangkai.shen
- * @date: Created in 2018/11/8 13:43
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-11-08 13:43
*/
@SpringBootApplication
@MapperScan(basePackages = {"com.xkcoding.orm.mybatis.MapperAndPage.mapper"})
diff --git a/demo-orm-mybatis-mapper-page/src/main/java/com/xkcoding/orm/mybatis/MapperAndPage/entity/User.java b/demo-orm-mybatis-mapper-page/src/main/java/com/xkcoding/orm/mybatis/MapperAndPage/entity/User.java
index 07ecca17b..3106bfb72 100644
--- a/demo-orm-mybatis-mapper-page/src/main/java/com/xkcoding/orm/mybatis/MapperAndPage/entity/User.java
+++ b/demo-orm-mybatis-mapper-page/src/main/java/com/xkcoding/orm/mybatis/MapperAndPage/entity/User.java
@@ -16,13 +16,8 @@
* 用户实体类
*
*
- * @package: com.xkcoding.orm.mybatis.MapperAndPage.entity
- * @description: 用户实体类
- * @author: yangkai.shen
- * @date: Created in 2018/11/8 14:14
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-11-08 14:14
*/
@Data
@NoArgsConstructor
diff --git a/demo-orm-mybatis-mapper-page/src/main/java/com/xkcoding/orm/mybatis/MapperAndPage/mapper/UserMapper.java b/demo-orm-mybatis-mapper-page/src/main/java/com/xkcoding/orm/mybatis/MapperAndPage/mapper/UserMapper.java
index 4cc51aeb4..bd8d1215b 100644
--- a/demo-orm-mybatis-mapper-page/src/main/java/com/xkcoding/orm/mybatis/MapperAndPage/mapper/UserMapper.java
+++ b/demo-orm-mybatis-mapper-page/src/main/java/com/xkcoding/orm/mybatis/MapperAndPage/mapper/UserMapper.java
@@ -10,13 +10,8 @@
* UserMapper
*
*
- * @package: com.xkcoding.orm.mybatis.MapperAndPage.mapper
- * @description: UserMapper
- * @author: yangkai.shen
- * @date: Created in 2018/11/8 14:15
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-11-08 14:15
*/
@Component
public interface UserMapper extends Mapper, MySqlMapper {
diff --git a/demo-orm-mybatis-mapper-page/src/test/java/com/xkcoding/orm/mybatis/MapperAndPage/mapper/UserMapperTest.java b/demo-orm-mybatis-mapper-page/src/test/java/com/xkcoding/orm/mybatis/MapperAndPage/mapper/UserMapperTest.java
index 409616afd..6b9204096 100644
--- a/demo-orm-mybatis-mapper-page/src/test/java/com/xkcoding/orm/mybatis/MapperAndPage/mapper/UserMapperTest.java
+++ b/demo-orm-mybatis-mapper-page/src/test/java/com/xkcoding/orm/mybatis/MapperAndPage/mapper/UserMapperTest.java
@@ -23,13 +23,8 @@
* UserMapper 测试
*
*
- * @package: com.xkcoding.orm.mybatis.MapperAndPage.mapper
- * @description: UserMapper 测试
- * @author: yangkai.shen
- * @date: Created in 2018/11/8 14:25
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-11-08 14:25
*/
@Slf4j
public class UserMapperTest extends SpringBootDemoOrmMybatisMapperPageApplicationTests {
@@ -161,4 +156,4 @@ private void initData() {
testInsertList();
}
-}
\ No newline at end of file
+}
diff --git a/demo-orm-mybatis-plus/README.md b/demo-orm-mybatis-plus/README.md
index 658fd2052..280605499 100644
--- a/demo-orm-mybatis-plus/README.md
+++ b/demo-orm-mybatis-plus/README.md
@@ -93,13 +93,8 @@
* mybatis-plus 配置
*
*
- * @package: com.xkcoding.orm.mybatis.plus.config
- * @description: mybatis-plus 配置
- * @author: yangkai.shen
- * @date: Created in 2018/11/8 17:29
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-11-08 17:29
*/
@Configuration
@MapperScan(basePackages = {"com.xkcoding.orm.mybatis.plus.mapper"})
@@ -140,13 +135,8 @@ import java.util.Date;
* 通用字段填充
*
*
- * @package: com.xkcoding.orm.mybatis.plus.config
- * @description: 通用字段填充
- * @author: yangkai.shen
- * @date: Created in 2018/11/8 17:40
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-11-08 17:40
*/
@Slf4j
@Component
@@ -231,13 +221,8 @@ mybatis-plus:
* UserMapper
*
*
- * @package: com.xkcoding.orm.mybatis.plus.mapper
- * @description: UserMapper
- * @author: yangkai.shen
- * @date: Created in 2018/11/8 16:57
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-11-08 16:57
*/
@Component
public interface UserMapper extends BaseMapper {
@@ -252,13 +237,8 @@ public interface UserMapper extends BaseMapper {
* User Service
*
*
- * @package: com.xkcoding.orm.mybatis.plus.service
- * @description: User Service
- * @author: yangkai.shen
- * @date: Created in 2018/11/8 18:10
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-11-08 18:10
*/
public interface UserService extends IService {
}
@@ -272,13 +252,8 @@ public interface UserService extends IService {
* User Service
*
*
- * @package: com.xkcoding.orm.mybatis.plus.service.impl
- * @description: User Service
- * @author: yangkai.shen
- * @date: Created in 2018/11/8 18:10
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-11-08 18:10
*/
@Service
public class UserServiceImpl extends ServiceImpl implements UserService {
@@ -293,13 +268,8 @@ public class UserServiceImpl extends ServiceImpl implements Us
* User Service 测试
*
*
- * @package: com.xkcoding.orm.mybatis.plus.service
- * @description: User Service 测试
- * @author: yangkai.shen
- * @date: Created in 2018/11/8 18:13
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-11-08 18:13
*/
@Slf4j
public class UserServiceTest extends SpringBootDemoOrmMybatisPlusApplicationTests {
@@ -435,7 +405,7 @@ public class UserServiceTest extends SpringBootDemoOrmMybatisPlusApplicationTest
*
*
* @author yangkai.shen
- * @date Created in 2019/9/16 14:04
+ * @date Created in 2019-09-16 14:04
*/
@Data
@TableName("orm_role")
@@ -473,7 +443,7 @@ public class Role extends Model {
*
*
* @author yangkai.shen
- * @date Created in 2019/9/16 14:06
+ * @date Created in 2019-09-16 14:06
*/
public interface RoleMapper extends BaseMapper {
}
@@ -488,7 +458,7 @@ public interface RoleMapper extends BaseMapper {
*
*
* @author yangkai.shen
- * @date Created in 2019/9/16 14:19
+ * @date Created in 2019-09-16 14:19
*/
@Slf4j
public class ActiveRecordTest extends SpringBootDemoOrmMybatisPlusApplicationTests {
diff --git a/demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/SpringBootDemoOrmMybatisPlusApplication.java b/demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/SpringBootDemoOrmMybatisPlusApplication.java
index 9b908b2d2..5919a429b 100644
--- a/demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/SpringBootDemoOrmMybatisPlusApplication.java
+++ b/demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/SpringBootDemoOrmMybatisPlusApplication.java
@@ -1,6 +1,5 @@
package com.xkcoding.orm.mybatis.plus;
-import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -9,13 +8,8 @@
* 启动器
*
*
- * @package: com.xkcoding.orm.mybatis.plus
- * @description: 启动器
- * @author: yangkai.shen
- * @date: Created in 2018/11/8 16:48
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-11-08 16:48
*/
@SpringBootApplication
public class SpringBootDemoOrmMybatisPlusApplication {
diff --git a/demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/config/CommonFieldHandler.java b/demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/config/CommonFieldHandler.java
index 77584eb21..59991b29f 100644
--- a/demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/config/CommonFieldHandler.java
+++ b/demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/config/CommonFieldHandler.java
@@ -12,13 +12,8 @@
* 通用字段填充
*
*
- * @package: com.xkcoding.orm.mybatis.plus.config
- * @description: 通用字段填充
- * @author: yangkai.shen
- * @date: Created in 2018/11/8 17:40
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-11-08 17:40
*/
@Slf4j
@Component
diff --git a/demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/config/MybatisPlusConfig.java b/demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/config/MybatisPlusConfig.java
index 4d6f8467e..6b9a5954d 100644
--- a/demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/config/MybatisPlusConfig.java
+++ b/demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/config/MybatisPlusConfig.java
@@ -12,13 +12,8 @@
* mybatis-plus 配置
*
*
- * @package: com.xkcoding.orm.mybatis.plus.config
- * @description: mybatis-plus 配置
- * @author: yangkai.shen
- * @date: Created in 2018/11/8 17:29
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-11-08 17:29
*/
@Configuration
@MapperScan(basePackages = {"com.xkcoding.orm.mybatis.plus.mapper"})
diff --git a/demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/entity/Role.java b/demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/entity/Role.java
index 074fc0e6d..8eee1fca8 100644
--- a/demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/entity/Role.java
+++ b/demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/entity/Role.java
@@ -14,7 +14,7 @@
*
*
* @author yangkai.shen
- * @date Created in 2019/9/14 14:04
+ * @date Created in 2019-09-14 14:04
*/
@Data
@TableName("orm_role")
diff --git a/demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/entity/User.java b/demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/entity/User.java
index afa560a33..6ce14a45e 100644
--- a/demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/entity/User.java
+++ b/demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/entity/User.java
@@ -18,13 +18,8 @@
* 用户实体类
*
*
- * @package: com.xkcoding.orm.mybatis.plus.entity
- * @description: 用户实体类
- * @author: yangkai.shen
- * @date: Created in 2018/11/8 16:49
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-11-08 16:49
*/
@Data
@NoArgsConstructor
diff --git a/demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/mapper/RoleMapper.java b/demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/mapper/RoleMapper.java
index 02408490a..c5953096f 100644
--- a/demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/mapper/RoleMapper.java
+++ b/demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/mapper/RoleMapper.java
@@ -9,7 +9,7 @@
*
*
* @author yangkai.shen
- * @date Created in 2019/9/14 14:06
+ * @date Created in 2019-09-14 14:06
*/
public interface RoleMapper extends BaseMapper {
}
diff --git a/demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/mapper/UserMapper.java b/demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/mapper/UserMapper.java
index 4bb44b4dd..028507def 100644
--- a/demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/mapper/UserMapper.java
+++ b/demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/mapper/UserMapper.java
@@ -9,13 +9,8 @@
* UserMapper
*
*
- * @package: com.xkcoding.orm.mybatis.plus.mapper
- * @description: UserMapper
- * @author: yangkai.shen
- * @date: Created in 2018/11/8 16:57
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-11-08 16:57
*/
@Component
public interface UserMapper extends BaseMapper {
diff --git a/demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/service/UserService.java b/demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/service/UserService.java
index bb357bbf7..8215a83e0 100644
--- a/demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/service/UserService.java
+++ b/demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/service/UserService.java
@@ -8,13 +8,8 @@
* User Service
*
*
- * @package: com.xkcoding.orm.mybatis.plus.service
- * @description: User Service
- * @author: yangkai.shen
- * @date: Created in 2018/11/8 18:10
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-11-08 18:10
*/
public interface UserService extends IService {
}
diff --git a/demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/service/impl/UserServiceImpl.java b/demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/service/impl/UserServiceImpl.java
index 5afb5f79b..535d95567 100644
--- a/demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/service/impl/UserServiceImpl.java
+++ b/demo-orm-mybatis-plus/src/main/java/com/xkcoding/orm/mybatis/plus/service/impl/UserServiceImpl.java
@@ -11,13 +11,8 @@
* User Service
*
*
- * @package: com.xkcoding.orm.mybatis.plus.service.impl
- * @description: User Service
- * @author: yangkai.shen
- * @date: Created in 2018/11/8 18:10
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-11-08 18:10
*/
@Service
public class UserServiceImpl extends ServiceImpl implements UserService {
diff --git a/demo-orm-mybatis-plus/src/test/java/com/xkcoding/orm/mybatis/plus/activerecord/ActiveRecordTest.java b/demo-orm-mybatis-plus/src/test/java/com/xkcoding/orm/mybatis/plus/activerecord/ActiveRecordTest.java
index 426b0efdd..1bfc9811b 100644
--- a/demo-orm-mybatis-plus/src/test/java/com/xkcoding/orm/mybatis/plus/activerecord/ActiveRecordTest.java
+++ b/demo-orm-mybatis-plus/src/test/java/com/xkcoding/orm/mybatis/plus/activerecord/ActiveRecordTest.java
@@ -16,7 +16,7 @@
*
*
* @author yangkai.shen
- * @date Created in 2019/9/14 14:19
+ * @date Created in 2019-09-14 14:19
*/
@Slf4j
public class ActiveRecordTest extends SpringBootDemoOrmMybatisPlusApplicationTests {
diff --git a/demo-orm-mybatis-plus/src/test/java/com/xkcoding/orm/mybatis/plus/service/UserServiceTest.java b/demo-orm-mybatis-plus/src/test/java/com/xkcoding/orm/mybatis/plus/service/UserServiceTest.java
index d1bf23fa3..6ea2d3787 100644
--- a/demo-orm-mybatis-plus/src/test/java/com/xkcoding/orm/mybatis/plus/service/UserServiceTest.java
+++ b/demo-orm-mybatis-plus/src/test/java/com/xkcoding/orm/mybatis/plus/service/UserServiceTest.java
@@ -9,7 +9,6 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.xkcoding.orm.mybatis.plus.SpringBootDemoOrmMybatisPlusApplicationTests;
import com.xkcoding.orm.mybatis.plus.entity.User;
-import com.xkcoding.orm.mybatis.plus.service.UserService;
import lombok.extern.slf4j.Slf4j;
import org.assertj.core.util.Lists;
import org.junit.Assert;
@@ -24,13 +23,8 @@
* User Service 测试
*
*
- * @package: com.xkcoding.orm.mybatis.plus.service
- * @description: User Service 测试
- * @author: yangkai.shen
- * @date: Created in 2018/11/8 18:13
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-11-08 18:13
*/
@Slf4j
public class UserServiceTest extends SpringBootDemoOrmMybatisPlusApplicationTests {
@@ -150,4 +144,4 @@ private void initData() {
testSaveList();
}
-}
\ No newline at end of file
+}
diff --git a/demo-orm-mybatis/README.md b/demo-orm-mybatis/README.md
index c6d6ab567..e8c16eb4c 100644
--- a/demo-orm-mybatis/README.md
+++ b/demo-orm-mybatis/README.md
@@ -86,13 +86,8 @@
* 启动类
*
*
- * @package: com.xkcoding.orm.mybatis
- * @description: 启动类
- * @author: yangkai.shen
- * @date: Created in 2018/11/8 10:52
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-11-08 10:52
*/
@MapperScan(basePackages = {"com.xkcoding.orm.mybatis.mapper"})
@SpringBootApplication
@@ -149,13 +144,8 @@ mybatis:
* User Mapper
*
*
- * @package: com.xkcoding.orm.mybatis.mapper
- * @description: User Mapper
- * @author: yangkai.shen
- * @date: Created in 2018/11/8 10:54
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-11-08 10:54
*/
@Mapper
@Component
@@ -241,13 +231,8 @@ public interface UserMapper {
* UserMapper 测试类
*
*
- * @package: com.xkcoding.orm.mybatis.mapper
- * @description: UserMapper 测试类
- * @author: yangkai.shen
- * @date: Created in 2018/11/8 11:25
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-11-08 11:25
*/
@Slf4j
public class UserMapperTest extends SpringBootDemoOrmMybatisApplicationTests {
diff --git a/demo-orm-mybatis/src/main/java/com/xkcoding/orm/mybatis/SpringBootDemoOrmMybatisApplication.java b/demo-orm-mybatis/src/main/java/com/xkcoding/orm/mybatis/SpringBootDemoOrmMybatisApplication.java
index 27e2ba0f9..dc6240665 100644
--- a/demo-orm-mybatis/src/main/java/com/xkcoding/orm/mybatis/SpringBootDemoOrmMybatisApplication.java
+++ b/demo-orm-mybatis/src/main/java/com/xkcoding/orm/mybatis/SpringBootDemoOrmMybatisApplication.java
@@ -9,13 +9,8 @@
* 启动类
*
*
- * @package: com.xkcoding.orm.mybatis
- * @description: 启动类
- * @author: yangkai.shen
- * @date: Created in 2018/11/8 10:52
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-11-08 10:52
*/
@MapperScan(basePackages = {"com.xkcoding.orm.mybatis.mapper"})
@SpringBootApplication
diff --git a/demo-orm-mybatis/src/main/java/com/xkcoding/orm/mybatis/entity/User.java b/demo-orm-mybatis/src/main/java/com/xkcoding/orm/mybatis/entity/User.java
index 21c9d8822..d361be0f8 100644
--- a/demo-orm-mybatis/src/main/java/com/xkcoding/orm/mybatis/entity/User.java
+++ b/demo-orm-mybatis/src/main/java/com/xkcoding/orm/mybatis/entity/User.java
@@ -13,13 +13,8 @@
* 用户实体类
*
*
- * @package: com.xkcoding.orm.mybatis.entity
- * @description: 用户实体类
- * @author: yangkai.shen
- * @date: Created in 2018/11/8 10:58
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-11-08 10:58
*/
@Data
@NoArgsConstructor
diff --git a/demo-orm-mybatis/src/main/java/com/xkcoding/orm/mybatis/mapper/UserMapper.java b/demo-orm-mybatis/src/main/java/com/xkcoding/orm/mybatis/mapper/UserMapper.java
index b76ac3200..796fdfddf 100644
--- a/demo-orm-mybatis/src/main/java/com/xkcoding/orm/mybatis/mapper/UserMapper.java
+++ b/demo-orm-mybatis/src/main/java/com/xkcoding/orm/mybatis/mapper/UserMapper.java
@@ -13,13 +13,8 @@
* User Mapper
*
*
- * @package: com.xkcoding.orm.mybatis.mapper
- * @description: User Mapper
- * @author: yangkai.shen
- * @date: Created in 2018/11/8 10:54
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-11-08 10:54
*/
@Mapper
@Component
diff --git a/demo-orm-mybatis/src/test/java/com/xkcoding/orm/mybatis/mapper/UserMapperTest.java b/demo-orm-mybatis/src/test/java/com/xkcoding/orm/mybatis/mapper/UserMapperTest.java
index 4d29f0259..c25000f2c 100644
--- a/demo-orm-mybatis/src/test/java/com/xkcoding/orm/mybatis/mapper/UserMapperTest.java
+++ b/demo-orm-mybatis/src/test/java/com/xkcoding/orm/mybatis/mapper/UserMapperTest.java
@@ -18,13 +18,8 @@
* UserMapper 测试类
*
*
- * @package: com.xkcoding.orm.mybatis.mapper
- * @description: UserMapper 测试类
- * @author: yangkai.shen
- * @date: Created in 2018/11/8 11:25
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-11-08 11:25
*/
@Slf4j
public class UserMapperTest extends SpringBootDemoOrmMybatisApplicationTests {
@@ -70,4 +65,4 @@ public void deleteById() {
int i = userMapper.deleteById(1L);
Assert.assertEquals(1, i);
}
-}
\ No newline at end of file
+}
diff --git a/demo-properties/README.md b/demo-properties/README.md
index 17a969b12..f326bef9c 100644
--- a/demo-properties/README.md
+++ b/demo-properties/README.md
@@ -84,13 +84,8 @@
* 项目配置
*
*
- * @package: com.xkcoding.properties.property
- * @description: 项目配置
- * @author: yangkai.shen
- * @date: Created in 2018/9/29 10:50 AM
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-09-29 10:50
*/
@Data
@Component
@@ -110,13 +105,8 @@ public class ApplicationProperty {
* 开发人员配置信息
*
*
- * @package: com.xkcoding.properties.property
- * @description: 开发人员配置信息
- * @author: yangkai.shen
- * @date: Created in 2018/9/29 10:51 AM
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-09-29 10:51
*/
@Data
@ConfigurationProperties(prefix = "developer")
@@ -137,13 +127,8 @@ public class DeveloperProperty {
* 测试Controller
*
*
- * @package: com.xkcoding.properties.controller
- * @description: 测试Controller
- * @author: yangkai.shen
- * @date: Created in 2018/9/29 10:49 AM
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-09-29 10:49
*/
@RestController
public class PropertyController {
diff --git a/demo-properties/src/main/java/com/xkcoding/properties/SpringBootDemoPropertiesApplication.java b/demo-properties/src/main/java/com/xkcoding/properties/SpringBootDemoPropertiesApplication.java
index 93c0feb78..c2b1f018c 100644
--- a/demo-properties/src/main/java/com/xkcoding/properties/SpringBootDemoPropertiesApplication.java
+++ b/demo-properties/src/main/java/com/xkcoding/properties/SpringBootDemoPropertiesApplication.java
@@ -8,13 +8,8 @@
* 启动类
*
*
- * @package: com.xkcoding.properties
- * @description: 启动类
- * @author: yangkai.shen
- * @date: Created in 2018/9/29 10:48 AM
- * @copyright: Copyright (c)2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-09-29 10:48
*/
@SpringBootApplication
public class SpringBootDemoPropertiesApplication {
diff --git a/demo-properties/src/main/java/com/xkcoding/properties/controller/PropertyController.java b/demo-properties/src/main/java/com/xkcoding/properties/controller/PropertyController.java
index 5e7b49c8f..b676181cf 100644
--- a/demo-properties/src/main/java/com/xkcoding/properties/controller/PropertyController.java
+++ b/demo-properties/src/main/java/com/xkcoding/properties/controller/PropertyController.java
@@ -12,13 +12,8 @@
* 测试Controller
*
*
- * @package: com.xkcoding.properties.controller
- * @description: 测试Controller
- * @author: yangkai.shen
- * @date: Created in 2018/9/29 10:49 AM
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-09-29 10:49
*/
@RestController
public class PropertyController {
diff --git a/demo-properties/src/main/java/com/xkcoding/properties/property/ApplicationProperty.java b/demo-properties/src/main/java/com/xkcoding/properties/property/ApplicationProperty.java
index 0ae920d29..8ccf55d67 100644
--- a/demo-properties/src/main/java/com/xkcoding/properties/property/ApplicationProperty.java
+++ b/demo-properties/src/main/java/com/xkcoding/properties/property/ApplicationProperty.java
@@ -9,13 +9,8 @@
* 项目配置
*
*
- * @package: com.xkcoding.properties.property
- * @description: 项目配置
- * @author: yangkai.shen
- * @date: Created in 2018/9/29 10:50 AM
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-09-29 10:50
*/
@Data
@Component
diff --git a/demo-properties/src/main/java/com/xkcoding/properties/property/DeveloperProperty.java b/demo-properties/src/main/java/com/xkcoding/properties/property/DeveloperProperty.java
index d8c486f2c..a226940d5 100644
--- a/demo-properties/src/main/java/com/xkcoding/properties/property/DeveloperProperty.java
+++ b/demo-properties/src/main/java/com/xkcoding/properties/property/DeveloperProperty.java
@@ -9,13 +9,8 @@
* 开发人员配置信息
*
*
- * @package: com.xkcoding.properties.property
- * @description: 开发人员配置信息
- * @author: yangkai.shen
- * @date: Created in 2018/9/29 10:51 AM
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-09-29 10:51
*/
@Data
@ConfigurationProperties(prefix = "developer")
diff --git a/demo-ratelimit-guava/README.md b/demo-ratelimit-guava/README.md
index 1b4e91b9e..896041fe8 100644
--- a/demo-ratelimit-guava/README.md
+++ b/demo-ratelimit-guava/README.md
@@ -88,7 +88,7 @@
* 限流注解,添加了 {@link AliasFor} 必须通过 {@link AnnotationUtils} 获取,才会生效
*
* @author yangkai.shen
- * @date Created in 2019/9/12 14:14
+ * @date Created in 2019-09-12 14:14
* @see AnnotationUtils
*
*/
@@ -129,7 +129,7 @@ public @interface RateLimiter {
*
*
* @author yangkai.shen
- * @date Created in 2019/9/12 14:27
+ * @date Created in 2019-09-12 14:27
*/
@Slf4j
@Aspect
@@ -175,7 +175,7 @@ public class RateLimiterAspect {
*
*
* @author yangkai.shen
- * @date Created in 2019/9/12 14:22
+ * @date Created in 2019-09-12 14:22
*/
@Slf4j
@RestController
diff --git a/demo-ratelimit-guava/src/main/java/com/xkcoding/ratelimit/guava/SpringBootDemoRatelimitGuavaApplication.java b/demo-ratelimit-guava/src/main/java/com/xkcoding/ratelimit/guava/SpringBootDemoRatelimitGuavaApplication.java
index 39564bf2e..f99ff75f1 100644
--- a/demo-ratelimit-guava/src/main/java/com/xkcoding/ratelimit/guava/SpringBootDemoRatelimitGuavaApplication.java
+++ b/demo-ratelimit-guava/src/main/java/com/xkcoding/ratelimit/guava/SpringBootDemoRatelimitGuavaApplication.java
@@ -9,7 +9,7 @@
*
*
* @author yangkai.shen
- * @date Created in 2019/9/12 14:06
+ * @date Created in 2019-09-12 14:06
*/
@SpringBootApplication
public class SpringBootDemoRatelimitGuavaApplication {
diff --git a/demo-ratelimit-guava/src/main/java/com/xkcoding/ratelimit/guava/annotation/RateLimiter.java b/demo-ratelimit-guava/src/main/java/com/xkcoding/ratelimit/guava/annotation/RateLimiter.java
index 6c3519230..35bb0ddeb 100644
--- a/demo-ratelimit-guava/src/main/java/com/xkcoding/ratelimit/guava/annotation/RateLimiter.java
+++ b/demo-ratelimit-guava/src/main/java/com/xkcoding/ratelimit/guava/annotation/RateLimiter.java
@@ -11,7 +11,7 @@
* 限流注解,添加了 {@link AliasFor} 必须通过 {@link AnnotationUtils} 获取,才会生效
*
* @author yangkai.shen
- * @date Created in 2019/9/12 14:14
+ * @date Created in 2019-09-12 14:14
* @see AnnotationUtils
*
*/
diff --git a/demo-ratelimit-guava/src/main/java/com/xkcoding/ratelimit/guava/aspect/RateLimiterAspect.java b/demo-ratelimit-guava/src/main/java/com/xkcoding/ratelimit/guava/aspect/RateLimiterAspect.java
index d204a12cc..98ccd4a29 100644
--- a/demo-ratelimit-guava/src/main/java/com/xkcoding/ratelimit/guava/aspect/RateLimiterAspect.java
+++ b/demo-ratelimit-guava/src/main/java/com/xkcoding/ratelimit/guava/aspect/RateLimiterAspect.java
@@ -20,7 +20,7 @@
*
*
* @author yangkai.shen
- * @date Created in 2019/9/12 14:27
+ * @date Created in 2019-09-12 14:27
*/
@Slf4j
@Aspect
diff --git a/demo-ratelimit-guava/src/main/java/com/xkcoding/ratelimit/guava/controller/TestController.java b/demo-ratelimit-guava/src/main/java/com/xkcoding/ratelimit/guava/controller/TestController.java
index 66c3eb649..5ccb2b3d2 100644
--- a/demo-ratelimit-guava/src/main/java/com/xkcoding/ratelimit/guava/controller/TestController.java
+++ b/demo-ratelimit-guava/src/main/java/com/xkcoding/ratelimit/guava/controller/TestController.java
@@ -12,7 +12,7 @@
*
*
* @author yangkai.shen
- * @date Created in 2019/9/12 14:22
+ * @date Created in 2019-09-12 14:22
*/
@Slf4j
@RestController
diff --git a/demo-ratelimit-guava/src/main/java/com/xkcoding/ratelimit/guava/handler/GlobalExceptionHandler.java b/demo-ratelimit-guava/src/main/java/com/xkcoding/ratelimit/guava/handler/GlobalExceptionHandler.java
index 3317c4312..85f9bfae8 100644
--- a/demo-ratelimit-guava/src/main/java/com/xkcoding/ratelimit/guava/handler/GlobalExceptionHandler.java
+++ b/demo-ratelimit-guava/src/main/java/com/xkcoding/ratelimit/guava/handler/GlobalExceptionHandler.java
@@ -10,7 +10,7 @@
*
*
* @author yangkai.shen
- * @date Created in 2019/9/12 15:00
+ * @date Created in 2019-09-12 15:00
*/
@RestControllerAdvice
public class GlobalExceptionHandler {
diff --git a/demo-ratelimit-redis/README.md b/demo-ratelimit-redis/README.md
index e23db4e42..7564ac34f 100644
--- a/demo-ratelimit-redis/README.md
+++ b/demo-ratelimit-redis/README.md
@@ -93,7 +93,7 @@
*
*
* @author yangkai.shen
- * @date Created in 2019/9/30 10:31
+ * @date Created in 2019-09-30 10:31
* @see AnnotationUtils
*/
@Target(ElementType.METHOD)
@@ -138,7 +138,7 @@ public @interface RateLimiter {
*
*
* @author yangkai.shen
- * @date Created in 2019/9/30 10:30
+ * @date Created in 2019-09-30 10:30
*/
@Slf4j
@Aspect
@@ -250,7 +250,7 @@ end
*
*
* @author yangkai.shen
- * @date Created in 2019/9/30 10:30
+ * @date Created in 2019-09-30 10:30
*/
@Slf4j
@RestController
diff --git a/demo-ratelimit-redis/src/main/java/com/xkcoding/ratelimit/redis/SpringBootDemoRatelimitRedisApplication.java b/demo-ratelimit-redis/src/main/java/com/xkcoding/ratelimit/redis/SpringBootDemoRatelimitRedisApplication.java
index 76330b805..43cb5f2d8 100644
--- a/demo-ratelimit-redis/src/main/java/com/xkcoding/ratelimit/redis/SpringBootDemoRatelimitRedisApplication.java
+++ b/demo-ratelimit-redis/src/main/java/com/xkcoding/ratelimit/redis/SpringBootDemoRatelimitRedisApplication.java
@@ -9,7 +9,7 @@
*
*
* @author yangkai.shen
- * @date Created in 2019/9/30 09:32
+ * @date Created in 2019-09-30 09:32
*/
@SpringBootApplication
public class SpringBootDemoRatelimitRedisApplication {
diff --git a/demo-ratelimit-redis/src/main/java/com/xkcoding/ratelimit/redis/annotation/RateLimiter.java b/demo-ratelimit-redis/src/main/java/com/xkcoding/ratelimit/redis/annotation/RateLimiter.java
index dda095482..459b0bcbb 100644
--- a/demo-ratelimit-redis/src/main/java/com/xkcoding/ratelimit/redis/annotation/RateLimiter.java
+++ b/demo-ratelimit-redis/src/main/java/com/xkcoding/ratelimit/redis/annotation/RateLimiter.java
@@ -12,7 +12,7 @@
*
*
* @author yangkai.shen
- * @date Created in 2019/9/30 10:31
+ * @date Created in 2019-09-30 10:31
* @see AnnotationUtils
*/
@Target(ElementType.METHOD)
diff --git a/demo-ratelimit-redis/src/main/java/com/xkcoding/ratelimit/redis/aspect/RateLimiterAspect.java b/demo-ratelimit-redis/src/main/java/com/xkcoding/ratelimit/redis/aspect/RateLimiterAspect.java
index 4566dfb3d..d69b3bcad 100644
--- a/demo-ratelimit-redis/src/main/java/com/xkcoding/ratelimit/redis/aspect/RateLimiterAspect.java
+++ b/demo-ratelimit-redis/src/main/java/com/xkcoding/ratelimit/redis/aspect/RateLimiterAspect.java
@@ -27,7 +27,7 @@
*
*
* @author yangkai.shen
- * @date Created in 2019/9/30 10:30
+ * @date Created in 2019-09-30 10:30
*/
@Slf4j
@Aspect
diff --git a/demo-ratelimit-redis/src/main/java/com/xkcoding/ratelimit/redis/config/RedisConfig.java b/demo-ratelimit-redis/src/main/java/com/xkcoding/ratelimit/redis/config/RedisConfig.java
index d155b582e..6716388bc 100644
--- a/demo-ratelimit-redis/src/main/java/com/xkcoding/ratelimit/redis/config/RedisConfig.java
+++ b/demo-ratelimit-redis/src/main/java/com/xkcoding/ratelimit/redis/config/RedisConfig.java
@@ -13,7 +13,7 @@
*
*
* @author yangkai.shen
- * @date Created in 2019/9/30 11:37
+ * @date Created in 2019-09-30 11:37
*/
@Configuration
public class RedisConfig {
diff --git a/demo-ratelimit-redis/src/main/java/com/xkcoding/ratelimit/redis/controller/TestController.java b/demo-ratelimit-redis/src/main/java/com/xkcoding/ratelimit/redis/controller/TestController.java
index da4f92ec1..fb1aab3c5 100644
--- a/demo-ratelimit-redis/src/main/java/com/xkcoding/ratelimit/redis/controller/TestController.java
+++ b/demo-ratelimit-redis/src/main/java/com/xkcoding/ratelimit/redis/controller/TestController.java
@@ -12,7 +12,7 @@
*
*
* @author yangkai.shen
- * @date Created in 2019/9/30 10:30
+ * @date Created in 2019-09-30 10:30
*/
@Slf4j
@RestController
diff --git a/demo-ratelimit-redis/src/main/java/com/xkcoding/ratelimit/redis/handler/GlobalExceptionHandler.java b/demo-ratelimit-redis/src/main/java/com/xkcoding/ratelimit/redis/handler/GlobalExceptionHandler.java
index 30bdb31b7..f0b67f0fc 100644
--- a/demo-ratelimit-redis/src/main/java/com/xkcoding/ratelimit/redis/handler/GlobalExceptionHandler.java
+++ b/demo-ratelimit-redis/src/main/java/com/xkcoding/ratelimit/redis/handler/GlobalExceptionHandler.java
@@ -11,7 +11,7 @@
*
*
* @author yangkai.shen
- * @date Created in 2019/9/30 10:30
+ * @date Created in 2019-09-30 10:30
*/
@Slf4j
@RestControllerAdvice
diff --git a/demo-ratelimit-redis/src/main/java/com/xkcoding/ratelimit/redis/util/IpUtil.java b/demo-ratelimit-redis/src/main/java/com/xkcoding/ratelimit/redis/util/IpUtil.java
index ff2fd39ba..c6c2e337d 100644
--- a/demo-ratelimit-redis/src/main/java/com/xkcoding/ratelimit/redis/util/IpUtil.java
+++ b/demo-ratelimit-redis/src/main/java/com/xkcoding/ratelimit/redis/util/IpUtil.java
@@ -13,7 +13,7 @@
*
*
* @author yangkai.shen
- * @date Created in 2019/9/30 10:38
+ * @date Created in 2019-09-30 10:38
*/
@Slf4j
public class IpUtil {
diff --git a/demo-rbac-security/README.md b/demo-rbac-security/README.md
index bd7907e09..5f4660246 100644
--- a/demo-rbac-security/README.md
+++ b/demo-rbac-security/README.md
@@ -10,7 +10,7 @@
- [x] 持久化技术使用 `spring-data-jpa` 完成
- [x] 使用 `JWT` 实现安全验证,同时引入 `Redis` 解决 `JWT` 无法手动设置过期的弊端,并且保证同一用户在同一时间仅支持同一设备登录,不同设备登录会将,详情参考 [`JwtUtil.java`](./src/main/java/com/xkcoding/rbac/security/util/JwtUtil.java)
- [x] 在线人数统计,详情参考 [`MonitorService.java`](./src/main/java/com/xkcoding/rbac/security/service/MonitorService.java) 和 [`RedisUtil.java`](./src/main/java/com/xkcoding/rbac/security/util/RedisUtil.java)
-- [x] 手动踢出用户,详情参考 [`MonitorService.java`](./src/main/java/com/xkcoding/rbac/security/service/MonitorService.java)
+- [x] 手动踢出用户,详情参考 [`MonitorService.java`](./src/main/java/com/xkcoding/rbac/security/service/MonitorService.java)
- [x] 自定义配置不需要进行拦截的请求,详情参考 [`CustomConfig.java`](./src/main/java/com/xkcoding/rbac/security/config/CustomConfig.java) 和 [`application.yml`](./src/main/resources/application.yml)
## 2. 运行
@@ -146,13 +146,8 @@
* JWT 工具类
*
*
- * @package: com.xkcoding.rbac.security.util
- * @description: JWT 工具类
- * @author: yangkai.shen
- * @date: Created in 2018-12-07 13:42
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-07 13:42
*/
@EnableConfigurationProperties(JwtConfig.class)
@Configuration
@@ -306,13 +301,8 @@ public class JwtUtil {
* Security 配置
*
*
- * @package: com.xkcoding.rbac.security.config
- * @description: Security 配置
- * @author: yangkai.shen
- * @date: Created in 2018-12-07 16:46
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-07 16:46
*/
@Configuration
@EnableWebSecurity
@@ -471,13 +461,8 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
* 动态路由认证
*
*
- * @package: com.xkcoding.rbac.security.config
- * @description: 动态路由认证
- * @author: yangkai.shen
- * @date: Created in 2018-12-10 17:17
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-10 17:17
*/
@Component
public class RbacAuthorityService {
@@ -601,13 +586,8 @@ public class RbacAuthorityService {
* Jwt 认证过滤器
*
*
- * @package: com.xkcoding.rbac.security.config
- * @description: Jwt 认证过滤器
- * @author: yangkai.shen
- * @date: Created in 2018-12-10 15:15
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-10 15:15
*/
@Component
@Slf4j
@@ -732,13 +712,8 @@ public class JwtAuthenticationFilter extends OncePerRequestFilter {
* 自定义UserDetails查询
*
*
- * @package: com.xkcoding.rbac.security.service
- * @description: 自定义UserDetails查询
- * @author: yangkai.shen
- * @date: Created in 2018-12-10 10:29
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-10 10:29
*/
@Service
public class CustomUserDetailsService implements UserDetailsService {
@@ -775,13 +750,8 @@ public class CustomUserDetailsService implements UserDetailsService {
* Redis工具类
*
*
- * @package: com.xkcoding.rbac.security.util
- * @description: Redis工具类
- * @author: yangkai.shen
- * @date: Created in 2018-12-11 20:24
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-11 20:24
*/
@Component
@Slf4j
@@ -856,13 +826,8 @@ import java.util.stream.Collectors;
* 监控 Service
*
*
- * @package: com.xkcoding.rbac.security.service
- * @description: 监控 Service
- * @author: yangkai.shen
- * @date: Created in 2018-12-12 00:55
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-12 00:55
*/
@Service
public class MonitorService {
diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/SpringBootDemoRbacSecurityApplication.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/SpringBootDemoRbacSecurityApplication.java
index 5b8cef02a..621d5e8a0 100644
--- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/SpringBootDemoRbacSecurityApplication.java
+++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/SpringBootDemoRbacSecurityApplication.java
@@ -8,13 +8,8 @@
* 启动器
*
*
- * @package: com.xkcoding.rbac.security
- * @description: 启动器
- * @author: yangkai.shen
- * @date: Created in 2018-12-10 11:28
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-10 11:28
*/
@SpringBootApplication
public class SpringBootDemoRbacSecurityApplication {
diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/common/ApiResponse.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/common/ApiResponse.java
index 8d743c32f..59e1985bc 100644
--- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/common/ApiResponse.java
+++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/common/ApiResponse.java
@@ -9,13 +9,8 @@
* 通用的 API 接口封装
*
*
- * @package: com.xkcoding.rbac.security.common
- * @description: 通用的 API 接口封装
- * @author: yangkai.shen
- * @date: Created in 2018-12-07 14:55
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-07 14:55
*/
@Data
public class ApiResponse implements Serializable {
diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/common/BaseException.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/common/BaseException.java
index 90547ef76..24f7937b9 100644
--- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/common/BaseException.java
+++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/common/BaseException.java
@@ -8,13 +8,8 @@
* 异常基类
*
*
- * @package: com.xkcoding.rbac.security.common
- * @description: 异常基类
- * @author: yangkai.shen
- * @date: Created in 2018-12-07 14:57
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-07 14:57
*/
@EqualsAndHashCode(callSuper = true)
@Data
diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/common/Consts.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/common/Consts.java
index 8e973737c..754cfb2d0 100644
--- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/common/Consts.java
+++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/common/Consts.java
@@ -5,13 +5,8 @@
* 常量池
*
*
- * @package: com.xkcoding.rbac.security.common
- * @description: 常量池
- * @author: yangkai.shen
- * @date: Created in 2018-12-10 15:03
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-10 15:03
*/
public interface Consts {
/**
diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/common/IStatus.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/common/IStatus.java
index eefd3a228..f6f58c19e 100644
--- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/common/IStatus.java
+++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/common/IStatus.java
@@ -5,13 +5,8 @@
* REST API 错误码接口
*
*
- * @package: com.xkcoding.rbac.security.common
- * @description: REST API 错误码接口
- * @author: yangkai.shen
- * @date: Created in 2018-12-07 14:35
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-07 14:35
*/
public interface IStatus {
@@ -29,4 +24,4 @@ public interface IStatus {
*/
String getMessage();
-}
\ No newline at end of file
+}
diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/common/PageResult.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/common/PageResult.java
index 4a2307e12..e81f05ff9 100644
--- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/common/PageResult.java
+++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/common/PageResult.java
@@ -12,13 +12,8 @@
* 通用分页参数返回
*
*
- * @package: com.xkcoding.rbac.security.common
- * @description: 通用分页参数返回
- * @author: yangkai.shen
- * @date: Created in 2018-12-11 20:26
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-11 20:26
*/
@Data
@NoArgsConstructor
diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/common/Status.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/common/Status.java
index 23a194ea7..192ffd3ef 100644
--- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/common/Status.java
+++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/common/Status.java
@@ -7,13 +7,8 @@
* 通用状态码
*
*
- * @package: com.xkcoding.rbac.security.common
- * @description: 通用状态码
- * @author: yangkai.shen
- * @date: Created in 2018-12-07 14:31
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-07 14:31
*/
@Getter
public enum Status implements IStatus {
diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/CustomConfig.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/CustomConfig.java
index 32f3cf719..bac88268f 100644
--- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/CustomConfig.java
+++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/CustomConfig.java
@@ -8,13 +8,8 @@
* 自定义配置
*
*
- * @package: com.xkcoding.rbac.security.config
- * @description: 自定义配置
- * @author: yangkai.shen
- * @date: Created in 2018-12-13 10:56
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-13 10:56
*/
@ConfigurationProperties(prefix = "custom.config")
@Data
diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/IdConfig.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/IdConfig.java
index d25738a19..7723ded25 100644
--- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/IdConfig.java
+++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/IdConfig.java
@@ -10,13 +10,8 @@
* 雪花主键生成器
*
*
- * @package: com.xkcoding.rbac.security.config
- * @description: 雪花主键生成器
- * @author: yangkai.shen
- * @date: Created in 2018-12-10 11:28
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-10 11:28
*/
@Configuration
public class IdConfig {
diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/IgnoreConfig.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/IgnoreConfig.java
index 2bbc40f0b..becfacdf5 100644
--- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/IgnoreConfig.java
+++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/IgnoreConfig.java
@@ -10,13 +10,8 @@
* 忽略配置
*
*
- * @package: com.xkcoding.rbac.security.config
- * @description: 忽略配置
- * @author: yangkai.shen
- * @date: Created in 2018-12-17 17:37
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-17 17:37
*/
@Data
public class IgnoreConfig {
diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/JwtAuthenticationFilter.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/JwtAuthenticationFilter.java
index 165d23050..910496127 100644
--- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/JwtAuthenticationFilter.java
+++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/JwtAuthenticationFilter.java
@@ -32,13 +32,8 @@
* Jwt 认证过滤器
*
*
- * @package: com.xkcoding.rbac.security.config
- * @description: Jwt 认证过滤器
- * @author: yangkai.shen
- * @date: Created in 2018-12-10 15:15
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-10 15:15
*/
@Component
@Slf4j
diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/JwtConfig.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/JwtConfig.java
index 1cc098801..d75e3e33f 100644
--- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/JwtConfig.java
+++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/JwtConfig.java
@@ -8,13 +8,8 @@
* JWT 配置
*
*
- * @package: com.xkcoding.rbac.security.config
- * @description: JWT 配置
- * @author: yangkai.shen
- * @date: Created in 2018-12-07 13:42
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-07 13:42
*/
@ConfigurationProperties(prefix = "jwt.config")
@Data
diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/RbacAuthorityService.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/RbacAuthorityService.java
index 1c250127d..555996dd0 100644
--- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/RbacAuthorityService.java
+++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/RbacAuthorityService.java
@@ -33,13 +33,8 @@
* 动态路由认证
*
*
- * @package: com.xkcoding.rbac.security.config
- * @description: 动态路由认证
- * @author: yangkai.shen
- * @date: Created in 2018-12-10 17:17
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-10 17:17
*/
@Component
public class RbacAuthorityService {
@@ -147,4 +142,4 @@ private Multimap allUrlMapping() {
return urlMapping;
}
-}
\ No newline at end of file
+}
diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/RedisConfig.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/RedisConfig.java
index 5ab166e3f..4a0ea93cc 100644
--- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/RedisConfig.java
+++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/RedisConfig.java
@@ -17,13 +17,8 @@
* redis配置
*
*
- * @package: com.xkcoding.rbac.security.config
- * @description: redis配置
- * @author: yangkai.shen
- * @date: Created in 2018-12-11 15:16
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-11 15:16
*/
@Configuration
@AutoConfigureAfter(RedisAutoConfiguration.class)
diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/SecurityConfig.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/SecurityConfig.java
index a9bf36e30..2b2d75fb3 100644
--- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/SecurityConfig.java
+++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/SecurityConfig.java
@@ -22,13 +22,8 @@
* Security 配置
*
*
- * @package: com.xkcoding.rbac.security.config
- * @description: Security 配置
- * @author: yangkai.shen
- * @date: Created in 2018-12-07 16:46
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-07 16:46
*/
@Configuration
@EnableWebSecurity
diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/SecurityHandlerConfig.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/SecurityHandlerConfig.java
index 2db9de8fc..888f5ae49 100644
--- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/SecurityHandlerConfig.java
+++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/SecurityHandlerConfig.java
@@ -11,13 +11,8 @@
* Security 结果处理配置
*
*
- * @package: com.xkcoding.rbac.security.config
- * @description: Security 结果处理配置
- * @author: yangkai.shen
- * @date: Created in 2018-12-07 17:31
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-07 17:31
*/
@Configuration
public class SecurityHandlerConfig {
diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/WebMvcConfig.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/WebMvcConfig.java
index cffb3fa0a..9e7ce1390 100644
--- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/WebMvcConfig.java
+++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/config/WebMvcConfig.java
@@ -9,13 +9,8 @@
* MVC配置
*
*
- * @package: com.xkcoding.rbac.security.config
- * @description: MVC配置
- * @author: yangkai.shen
- * @date: Created in 2018-12-10 16:09
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-10 16:09
*/
@Configuration
public class WebMvcConfig implements WebMvcConfigurer {
@@ -29,4 +24,4 @@ public void addCorsMappings(CorsRegistry registry) {
.allowedMethods("HEAD", "OPTIONS", "GET", "POST", "PUT", "PATCH", "DELETE")
.maxAge(MAX_AGE_SECS);
}
-}
\ No newline at end of file
+}
diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/controller/AuthController.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/controller/AuthController.java
index 6e5f5784d..acaa99147 100644
--- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/controller/AuthController.java
+++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/controller/AuthController.java
@@ -8,7 +8,6 @@
import com.xkcoding.rbac.security.vo.JwtResponse;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.core.Authentication;
@@ -26,13 +25,8 @@
* 认证 Controller,包括用户注册,用户登录请求
*
*
- * @package: com.xkcoding.rbac.security.controller
- * @description: 认证 Controller,包括用户注册,用户登录请求
- * @author: yangkai.shen
- * @date: Created in 2018-12-07 17:23
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-07 17:23
*/
@Slf4j
@RestController
diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/controller/MonitorController.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/controller/MonitorController.java
index c254f7729..57fcf670b 100644
--- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/controller/MonitorController.java
+++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/controller/MonitorController.java
@@ -21,13 +21,8 @@
* 监控 Controller,在线用户,手动踢出用户等功能
*
*
- * @package: com.xkcoding.rbac.security.controller
- * @description: 监控 Controller,在线用户,手动踢出用户等功能
- * @author: yangkai.shen
- * @date: Created in 2018-12-11 20:55
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-11 20:55
*/
@Slf4j
@RestController
diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/controller/TestController.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/controller/TestController.java
index da05212ea..764cfdf82 100644
--- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/controller/TestController.java
+++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/controller/TestController.java
@@ -9,13 +9,8 @@
* 测试Controller
*
*
- * @package: com.xkcoding.rbac.security.controller
- * @description: 测试Controller
- * @author: yangkai.shen
- * @date: Created in 2018-12-10 15:44
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-10 15:44
*/
@Slf4j
@RestController
diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/exception/SecurityException.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/exception/SecurityException.java
index 4b02465b6..f1e7ffb3b 100644
--- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/exception/SecurityException.java
+++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/exception/SecurityException.java
@@ -10,13 +10,8 @@
* 全局异常
*
*
- * @package: com.xkcoding.rbac.security.exception
- * @description: 全局异常
- * @author: yangkai.shen
- * @date: Created in 2018-12-10 17:24
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-10 17:24
*/
@EqualsAndHashCode(callSuper = true)
@Data
diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/exception/handler/GlobalExceptionHandler.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/exception/handler/GlobalExceptionHandler.java
index 909638c2e..8e7d4da22 100644
--- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/exception/handler/GlobalExceptionHandler.java
+++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/exception/handler/GlobalExceptionHandler.java
@@ -24,13 +24,8 @@
* 全局统一异常处理
*
*
- * @package: com.xkcoding.rbac.security.exception.handler
- * @description: 全局统一异常处理
- * @author: yangkai.shen
- * @date: Created in 2018-12-10 17:00
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-10 17:00
*/
@ControllerAdvice
@Slf4j
diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/model/Permission.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/model/Permission.java
index 1c2c5df22..d0569cc62 100644
--- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/model/Permission.java
+++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/model/Permission.java
@@ -12,13 +12,8 @@
* 权限
*
*
- * @package: com.xkcoding.rbac.security.model
- * @description: 权限
- * @author: yangkai.shen
- * @date: Created in 2018-12-07 16:04
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-07 16:04
*/
@Data
@Entity
diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/model/Role.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/model/Role.java
index 4ed5764bf..ed17c0a50 100644
--- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/model/Role.java
+++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/model/Role.java
@@ -12,13 +12,8 @@
* 角色
*
*
- * @package: com.xkcoding.rbac.security.model
- * @description: 角色
- * @author: yangkai.shen
- * @date: Created in 2018-12-07 15:45
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-07 15:45
*/
@Data
@Entity
diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/model/RolePermission.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/model/RolePermission.java
index 3705d8fa9..21d5e498d 100644
--- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/model/RolePermission.java
+++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/model/RolePermission.java
@@ -12,13 +12,8 @@
* 角色-权限
*
*
- * @package: com.xkcoding.rbac.security.model
- * @description: 角色-权限
- * @author: yangkai.shen
- * @date: Created in 2018-12-10 13:46
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-10 13:46
*/
@Data
@Entity
diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/model/User.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/model/User.java
index f5db78cc5..ddecc7573 100644
--- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/model/User.java
+++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/model/User.java
@@ -12,13 +12,8 @@
* 用户
*
*
- * @package: com.xkcoding.rbac.security.model
- * @description: 用户
- * @author: yangkai.shen
- * @date: Created in 2018-12-07 16:00
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-07 16:00
*/
@Data
@Entity
diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/model/UserRole.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/model/UserRole.java
index af3898466..2ca084d83 100644
--- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/model/UserRole.java
+++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/model/UserRole.java
@@ -12,13 +12,8 @@
* 用户角色关联
*
*
- * @package: com.xkcoding.rbac.security.model
- * @description: 用户角色关联
- * @author: yangkai.shen
- * @date: Created in 2018-12-10 11:18
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-10 11:18
*/
@Data
@Entity
diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/model/unionkey/RolePermissionKey.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/model/unionkey/RolePermissionKey.java
index 8837ca80f..7216c8bbb 100644
--- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/model/unionkey/RolePermissionKey.java
+++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/model/unionkey/RolePermissionKey.java
@@ -11,13 +11,8 @@
* 角色-权限联合主键
*
*
- * @package: com.xkcoding.rbac.security.model.unionkey
- * @description: 角色-权限联合主键
- * @author: yangkai.shen
- * @date: Created in 2018-12-10 13:47
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-10 13:47
*/
@Data
@Embeddable
diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/model/unionkey/UserRoleKey.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/model/unionkey/UserRoleKey.java
index bc9d548ba..c3c61d563 100644
--- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/model/unionkey/UserRoleKey.java
+++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/model/unionkey/UserRoleKey.java
@@ -11,19 +11,14 @@
* 用户-角色联合主键
*
*
- * @package: com.xkcoding.rbac.security.model.unionkey
- * @description: 用户-角色联合主键
- * @author: yangkai.shen
- * @date: Created in 2018-12-10 11:20
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-10 11:20
*/
@Embeddable
@Data
public class UserRoleKey implements Serializable {
private static final long serialVersionUID = 5633412144183654743L;
-
+
/**
* 用户id
*/
diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/payload/LoginRequest.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/payload/LoginRequest.java
index 3c9a0c53c..92d0baadb 100644
--- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/payload/LoginRequest.java
+++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/payload/LoginRequest.java
@@ -9,13 +9,8 @@
* 登录请求参数
*
*
- * @package: com.xkcoding.rbac.security.payload
- * @description: 登录请求参数
- * @author: yangkai.shen
- * @date: Created in 2018-12-10 15:52
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-10 15:52
*/
@Data
public class LoginRequest {
diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/payload/PageCondition.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/payload/PageCondition.java
index bcdf201dc..dba46aef6 100644
--- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/payload/PageCondition.java
+++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/payload/PageCondition.java
@@ -7,13 +7,8 @@
* 分页请求参数
*
*
- * @package: com.xkcoding.rbac.security.payload
- * @description: 分页请求参数
- * @author: yangkai.shen
- * @date: Created in 2018-12-12 18:05
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-12 18:05
*/
@Data
public class PageCondition {
diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/repository/PermissionDao.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/repository/PermissionDao.java
index 6f7dc0580..f911dc9bc 100644
--- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/repository/PermissionDao.java
+++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/repository/PermissionDao.java
@@ -13,13 +13,8 @@
* 权限 DAO
*
*
- * @package: com.xkcoding.rbac.security.repository
- * @description: 权限 DAO
- * @author: yangkai.shen
- * @date: Created in 2018-12-07 16:21
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-07 16:21
*/
public interface PermissionDao extends JpaRepository, JpaSpecificationExecutor {
diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/repository/RoleDao.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/repository/RoleDao.java
index 0dba9e8b9..cdb9de958 100644
--- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/repository/RoleDao.java
+++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/repository/RoleDao.java
@@ -13,13 +13,8 @@
* 角色 DAO
*
*
- * @package: com.xkcoding.rbac.security.repository
- * @description: 角色 DAO
- * @author: yangkai.shen
- * @date: Created in 2018-12-07 16:20
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-07 16:20
*/
public interface RoleDao extends JpaRepository, JpaSpecificationExecutor {
/**
diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/repository/RolePermissionDao.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/repository/RolePermissionDao.java
index 21e749150..e41a25043 100644
--- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/repository/RolePermissionDao.java
+++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/repository/RolePermissionDao.java
@@ -10,13 +10,8 @@
* 角色-权限 DAO
*
*
- * @package: com.xkcoding.rbac.security.repository
- * @description: 角色-权限 DAO
- * @author: yangkai.shen
- * @date: Created in 2018-12-10 13:45
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-10 13:45
*/
public interface RolePermissionDao extends JpaRepository, JpaSpecificationExecutor {
}
diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/repository/UserDao.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/repository/UserDao.java
index 45b30e9ba..64cda75f6 100644
--- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/repository/UserDao.java
+++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/repository/UserDao.java
@@ -12,13 +12,8 @@
* 用户 DAO
*
*
- * @package: com.xkcoding.rbac.security.repository
- * @description: 用户 DAO
- * @author: yangkai.shen
- * @date: Created in 2018-12-07 16:18
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-07 16:18
*/
public interface UserDao extends JpaRepository, JpaSpecificationExecutor {
/**
diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/repository/UserRoleDao.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/repository/UserRoleDao.java
index e9d1f1feb..7f0a932c6 100644
--- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/repository/UserRoleDao.java
+++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/repository/UserRoleDao.java
@@ -10,13 +10,8 @@
* 用户角色 DAO
*
*
- * @package: com.xkcoding.rbac.security.repository
- * @description: 用户角色 DAO
- * @author: yangkai.shen
- * @date: Created in 2018-12-10 11:24
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-10 11:24
*/
public interface UserRoleDao extends JpaRepository, JpaSpecificationExecutor {
diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/service/CustomUserDetailsService.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/service/CustomUserDetailsService.java
index e153056c4..6b03a0510 100644
--- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/service/CustomUserDetailsService.java
+++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/service/CustomUserDetailsService.java
@@ -21,13 +21,8 @@
* 自定义UserDetails查询
*
*
- * @package: com.xkcoding.rbac.security.service
- * @description: 自定义UserDetails查询
- * @author: yangkai.shen
- * @date: Created in 2018-12-10 10:29
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-10 10:29
*/
@Service
public class CustomUserDetailsService implements UserDetailsService {
diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/service/MonitorService.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/service/MonitorService.java
index 739a683af..d2cfdfdd0 100644
--- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/service/MonitorService.java
+++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/service/MonitorService.java
@@ -22,13 +22,8 @@
* 监控 Service
*
*
- * @package: com.xkcoding.rbac.security.service
- * @description: 监控 Service
- * @author: yangkai.shen
- * @date: Created in 2018-12-12 00:55
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-12 00:55
*/
@Slf4j
@Service
diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/util/JwtUtil.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/util/JwtUtil.java
index 305279c87..387b1c83e 100644
--- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/util/JwtUtil.java
+++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/util/JwtUtil.java
@@ -28,13 +28,8 @@
* JWT 工具类
*
*
- * @package: com.xkcoding.rbac.security.util
- * @description: JWT 工具类
- * @author: yangkai.shen
- * @date: Created in 2018-12-07 13:42
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-07 13:42
*/
@EnableConfigurationProperties(JwtConfig.class)
@Configuration
diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/util/PageUtil.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/util/PageUtil.java
index fecd3c39a..a67606141 100644
--- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/util/PageUtil.java
+++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/util/PageUtil.java
@@ -11,13 +11,8 @@
* 分页工具类
*
*
- * @package: com.xkcoding.rbac.security.util
- * @description: 分页工具类
- * @author: yangkai.shen
- * @date: Created in 2018-12-12 18:09
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-12 18:09
*/
public class PageUtil {
/**
diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/util/RedisUtil.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/util/RedisUtil.java
index b8e14221f..21402d78d 100644
--- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/util/RedisUtil.java
+++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/util/RedisUtil.java
@@ -20,13 +20,8 @@
* Redis工具类
*
*
- * @package: com.xkcoding.rbac.security.util
- * @description: Redis工具类
- * @author: yangkai.shen
- * @date: Created in 2018-12-11 20:24
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-11 20:24
*/
@Component
@Slf4j
diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/util/ResponseUtil.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/util/ResponseUtil.java
index 4987ecd6a..73b1d28e0 100644
--- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/util/ResponseUtil.java
+++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/util/ResponseUtil.java
@@ -15,13 +15,8 @@
* Response 通用工具类
*
*
- * @package: com.xkcoding.rbac.security.util
- * @description: Response 通用工具类
- * @author: yangkai.shen
- * @date: Created in 2018-12-07 17:37
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-07 17:37
*/
@Slf4j
public class ResponseUtil {
@@ -70,4 +65,4 @@ public static void renderJson(HttpServletResponse response, BaseException except
log.error("Response写出JSON异常,", e);
}
}
-}
\ No newline at end of file
+}
diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/util/SecurityUtil.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/util/SecurityUtil.java
index 402e5f876..8b73ed176 100644
--- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/util/SecurityUtil.java
+++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/util/SecurityUtil.java
@@ -11,13 +11,8 @@
* Spring Security工具类
*
*
- * @package: com.xkcoding.rbac.security.util
- * @description: Spring Security工具类
- * @author: yangkai.shen
- * @date: Created in 2018-12-12 18:30
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-12 18:30
*/
public class SecurityUtil {
/**
diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/vo/JwtResponse.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/vo/JwtResponse.java
index f403dd421..c052f04de 100644
--- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/vo/JwtResponse.java
+++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/vo/JwtResponse.java
@@ -9,13 +9,8 @@
* JWT 响应返回
*
*
- * @package: com.xkcoding.rbac.security.vo
- * @description: JWT 响应返回
- * @author: yangkai.shen
- * @date: Created in 2018-12-10 16:01
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-10 16:01
*/
@Data
@NoArgsConstructor
diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/vo/OnlineUser.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/vo/OnlineUser.java
index 2d0268bcf..190a8fe22 100644
--- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/vo/OnlineUser.java
+++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/vo/OnlineUser.java
@@ -11,13 +11,8 @@
* 在线用户 VO
*
*
- * @package: com.xkcoding.rbac.security.vo
- * @description: 在线用户 VO
- * @author: yangkai.shen
- * @date: Created in 2018-12-12 00:58
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-12 00:58
*/
@Data
public class OnlineUser {
diff --git a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/vo/UserPrincipal.java b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/vo/UserPrincipal.java
index b244eaee6..88ebd124b 100644
--- a/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/vo/UserPrincipal.java
+++ b/demo-rbac-security/src/main/java/com/xkcoding/rbac/security/vo/UserPrincipal.java
@@ -23,13 +23,8 @@
* 自定义User
*
*
- * @package: com.xkcoding.rbac.security.vo
- * @description: 自定义User
- * @author: yangkai.shen
- * @date: Created in 2018-12-10 15:09
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-10 15:09
*/
@Data
@NoArgsConstructor
@@ -148,4 +143,4 @@ public boolean isCredentialsNonExpired() {
public boolean isEnabled() {
return Objects.equals(this.status, Consts.ENABLE);
}
-}
\ No newline at end of file
+}
diff --git a/demo-rbac-security/src/test/java/com/xkcoding/rbac/security/repository/DataInitTest.java b/demo-rbac-security/src/test/java/com/xkcoding/rbac/security/repository/DataInitTest.java
index 3d27d96b7..3dab200ec 100644
--- a/demo-rbac-security/src/test/java/com/xkcoding/rbac/security/repository/DataInitTest.java
+++ b/demo-rbac-security/src/test/java/com/xkcoding/rbac/security/repository/DataInitTest.java
@@ -16,13 +16,8 @@
* 数据初始化测试
*
*
- * @package: com.xkcoding.rbac.security.repository
- * @description: 数据初始化测试
- * @author: yangkai.shen
- * @date: Created in 2018-12-10 11:26
- * @copyright: Copyright (c) 2018
- * @version: V1.0
- * @modified: yangkai.shen
+ * @author yangkai.shen
+ * @date Created in 2018-12-10 11:26
*/
public class DataInitTest extends SpringBootDemoRbacSecurityApplicationTests {
@Autowired
diff --git a/demo-rbac-security/src/test/java/com/xkcoding/rbac/security/repository/UserDaoTest.java b/demo-rbac-security/src/test/java/com/xkcoding/rbac/security/repository/UserDaoTest.java
index 1c9bdb150..d05d2bc42 100644
--- a/demo-rbac-security/src/test/java/com/xkcoding/rbac/security/repository/UserDaoTest.java
+++ b/demo-rbac-security/src/test/java/com/xkcoding/rbac/security/repository/UserDaoTest.java
@@ -9,20 +9,14 @@
import org.springframework.beans.factory.annotation.Autowired;
import java.util.List;
-import java.util.Optional;
/**
*
* UserDao 测试
*
*
- * @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 void findByUsernameIn() {
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 cbe51abfe..7706f9323 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 @@
* 测试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 void findKeysForPage() {
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 615965596..df7c6b182 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 @@
* 启动器
*
*
- * @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 cadc3c632..17ff7baff 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
- * @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 8d5e97a1a..4cd5f00ff 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 @@
* 统一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 871635ec1..1f0236fbf 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 @@
* 通用状态枚举
*
*
- * @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 3faf11a7f..9cf6d4e6a 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 @@
* 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 59f6d9c1b..654f7cd5f 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 @@
* 测试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 2834699ee..e22efcc9a 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 @@
* 启动类
*
*
- * @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 25289357c..0a5f79b15 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 @@
* 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 38cf8f3c0..d8a28fed4 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
- * @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 d6b4756d5..64cf9297d 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 @@
* 页面跳转 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 c79765539..204106ddf 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 @@
* 校验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 c4450029b..733d7dfb7 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 897d1f633..363dbd738 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 @@
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 @@
* 启动器
*
*
- * @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 1ef1d11c6..667c4b0d7 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 @@
* 自定义雪花算法,替换 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 223650354..9aaecafef 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 @@
* 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 d90027cee..41e218dce 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 @@
* 订单表 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 242930809..c497ff4b1 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 @@
* 订单表
*
*
- * @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 a74c1997c..75a4c3195 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 @@
* 测试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 6355ef6b7..054b56b5d 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 f780d3778..557fd51d1 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 @@
* 第三方登录 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 b63b09b03..b488af530 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 6c23e904a..349509d58 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 @@
* 启动器
*
*
- * @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 43ce02a8f..f7ae5bd5c 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 @@
* 通用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 f8667d19c..9fbb39de7 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 @@
* 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 758afad01..3a7532338 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 @@
* 用户实体
*
*
- * @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 960b4ae3a..77f3bd6cb 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 dbc1c7850..1f9dbae05 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 @@
* 启动器
*
*
- * @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 523a8b6f7..fb726cd66 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 @@
* 通用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 0caf4ae60..b5266a603 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 @@
* 方便在 @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 438cea820..775ef6f65 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 @@
* 方便在 @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 04d0924f8..b0a9d3c20 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 @@
* 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 @@ private ApiInfo apiInfo() {
.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 db6cd1115..bbf71a269 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 @@
* 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 3862b9bd8..a89baeac0 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 @@
* 用户实体
*
*
- * @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 f56ddda80..a8ebabd56 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 2be28e08a..91e6d4012 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 cc23d3c95..8e14289c5 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 debc93f16..b4a992915 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 ba40b18ba..8861ef383 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 @@
* 启动器
*
*
- * @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 81dad5edf..7d2798862 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 @@
* 通用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 2e167ec06..c1d9ebf25 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 @@
* 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 5a05b9260..c94bce1b5 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 @@
* 实体类
*
*
- * @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 d57108366..c91781f8d 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 @@
* 定时任务详情
*
*
- * @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 f56899c41..b1579ffa2 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 @@
* 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 a42d1849c..ec41d1e99 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 @@
* 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 cc5156f6a..d0343f7f9 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 @@
* 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 f59885b6b..cd4d28b7c 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 @@
* 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 d8cb57b43..33f518465 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 @@
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 @@
* 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 63eb61fc7..9cb88d6ea 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 @@
* 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 49c0603f1..ab98b10b5 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 @@
* 定时任务反射工具类
*
*
- * @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 280c8d0fd..c56646e0c 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 55687ad8a..8f75a0052 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 @@
* 启动器
*
*
- * @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 43ec481e6..9a00e9e45 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 @@
* 定时任务配置,配置线程池,使用不同线程执行任务,提升效率
*
*
- * @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 dfbc91282..94965e18f 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 @@
* 定时任务
*
*
- * @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 void job2() {
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 f68e92f51..fffc08e30 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 ccd59fc57..f7fc8cbc6 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 @@
* 启动类
*
*
- * @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 6c05f413a..4f6f00023 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 @@
* 主页
*
*
- * @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 8bafff5a6..272676b11 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 @@
* 用户页面
*
*
- * @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 00854b935..fc706edbd 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 @@
* 用户 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 4994129ca..2d169299d 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 46314b9ad..a1db5d4fd 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 @@
* 启动类
*
*
- * @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 246a55728..817cf3cb2 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 @@
* 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 6cc978de5..46b9380f5 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 @@
* 主页
*
*
- * @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 41bddff3d..e6afad947 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 @@
* 用户页面
*
*
- * @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 99a7bcefc..af7c81359 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 @@
* 用户 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 825ab5457..bd22e2bdd 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 bd01c29fc..735fce700 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 @@
* 启动类
*
*
- * @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 d06aa4e8f..47425353d 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 @@
* 主页
*
*
- * @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 0631e06f8..93b2fe7cc 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 @@
* 用户页面
*
*
- * @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 d03e4204d..ac1e016e6 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 @@
* 用户 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 10569a35e..e588d1e03 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 0bb1b921f..b4c482f61 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 @@
* 启动类
*
*
- * @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 228554ac2..dced597a8 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 @@
* 主页
*
*
- * @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 2b574597f..aefb8e8a5 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 @@
* 用户页面
*
*
- * @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 01592d4f2..4729104ae 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 @@
* 用户 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 3d8746a3e..58228650e 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 @@
* 启动器
*
*
- * @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 a13937448..22d01df6e 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 2afb7afeb..ff9fba863 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 @@
* 启动类
*
*
- * @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 c367ca861..d8b4a5187 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 @@
* 上传配置
*
*
- * @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 003ffc204..c1fbe33f5 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 @@
* 首页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 e31dd4203..bb0abb9ec 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 @@
* 文件上传 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 15a15be52..0a956b39d 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 @@
* 七牛云上传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 8993e643d..470b0d5fd 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 @@
* 七牛云上传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 369d64c20..f16fd407c 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 @@
* 启动器
*
*
- * @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 d9d0dbb8a..3ff9b9f9a 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 @@
* 启动器
*
*
- * @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 978ceebcd..6f1f18254 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 2ef1d1b49..f1da4cdf3 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 @@
* 启动器
*
*
- * @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 8eaea88af..60d43cd6f 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 c604527c4..2d1c7fa86 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 @@
* 启动器
*
*
- * @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 225187a15..8f24558bf 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 @@
* 模拟数据库
*
*
- * @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 75caa7f62..0fb4468e8 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
- * @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 8baccc1dd..15985a35c 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 @@
* 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 a94505ca1..1077fae86 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 @@
* 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 ed94ffb26..a64c638c2 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 @@
* 消息发送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 3610115b1..d89a6c3b9 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 @@
* 消息事件处理
*
*
- * @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 cb548b56f..23daf6eae 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 @@
* 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 7fe9bb30f..47de011dc 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 @@
* 广播消息载荷
*
*
- * @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 5670b41cf..67d7171d7 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 @@
* 群聊消息载荷
*
*
- * @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 ef63fc8b6..d20d87390 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 @@
* 加群载荷
*
*
- * @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 5998b83e9..fcc2a461f 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 @@
* 私聊消息载荷
*
*
- * @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 dc81fcec0..d69aaff1b 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 6351666ed..3633fa97e 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 @@
* 启动器
*
*
- * @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 8b577e207..1d0bec6d2 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 @@
* 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 47de6d43d..8c0876659 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 @@
* 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 b4c61e878..3dce171f6 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 @@
* 服务器监控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 8d51a7338..17fb9a3a6 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 @@
* 服务器相关信息实体
*
*
- * @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 String convertFileSize(long size) {
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 d84cb1984..b0b59bdb7 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 @@
* 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 double getFree() {
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 a0b770b74..3dd3dedf2 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 @@
* 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 String getRunTime() {
.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 0b72bf477..6d09d7940 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 @@
* 內存相关信息实体
*
*
- * @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 void setFree(long free) {
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 f2321cbf9..ee037933f 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
- * @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 String getOsArch() {
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 823cf756f..00c63f7e0 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
- * @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 double getUsage() {
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 2db70864d..469d24a14 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 @@
* 键值匹配
*
*
- * @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 d36b38a66..4d97cd07d 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 @@
* 服务器信息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 e9524c960..73b7bd123 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 @@
* 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 static CpuVO create(Cpu cpu) {
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 78b6749b1..77285ae98 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 @@
* 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 static JvmVO create(Jvm jvm) {
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 fa24fce99..7ab709fb8 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 @@
* 內存相关信息实体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 static MemVO create(Mem mem) {
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 c4e5e46a4..c4b767e9b 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 @@
* 系统文件相关信息实体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 static SysFileVO create(List sysFiles) {
}
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 6b722dbf9..a3a00296c 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 @@
* 系统相关信息实体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 static SysVO create(Sys sys) {
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 62d24e90b..808816167 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 @@
* 服务器定时推送任务
*
*
- * @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 68ac0c5c3..647d57069 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 @@
* 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 static String getHostName() {
}
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 4256f1813..4f940faed 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 @@
* 服务器转换工具类
*
*
- * @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 8b12cf1eb..15d10b9dd 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 24867cf18..766fbcf76 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 @@
* 启动器
*
*
- * @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 c010e6b50..1f2d3024a 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 @@
* 分布式锁动态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 6be11203f..6e0f56238 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 @@
* 在需要加锁的方法上打上该注解后,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 de1bb3d2c..068b7f0ab 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 @@
* 使用 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 5f5a6562c..3c25c69e9 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 @@
* 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 a944fb729..561c55ba5 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 @@
* 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/16] =?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 4ed7873e0..e949b4dd2 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
[![Stargazers over time](https://starchart.cc/xkcoding/spring-boot-demo.svg)](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
-[![JD_CLOUD](assets/jdcloud.jpg)](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 c6c493f15..b44b5e947 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
-
+