Merge remote-tracking branch 'origin/master'

Author: houko

README.md

@@ -14,15 +14,11 @@
 - mysql5.5+
 - git: 版本管理
 - nginx: 反向代理服务器
-- lombok
 
 
 ### 注意事项
 - 本项目代码托管在[github](https://github.com/xiaomoinfo/SpringBootUnity)和[码云](http://git.oschina.net/hupeng/SpringBootUnity)两个地方,最新代码会先推送在github上,码云上会在github上更新完之后进行同步。
 - 本项目多数数据库都用到了`hibernate`，如果没有提供`sql`文件。则启动时会根据代码映射自动生成数据库表，请在启动前修改`application.properties`中的数据库连接信息
-- 本项目使用了`lombok`,在查看本项目时如果您没有下载`lombok 插件`，请先安装,不然找不到`get/set`方法。eclipse用户请参照[官网](http://jnb.ociweb.com/jnb/jnbJan2010.html#references)
-
-![lombok](screenshot/lombok.png)
 
 
 ### 启动方式
@@ -111,36 +107,14 @@ http://localhost:808/doc.html bootstrap-ui
 - [在线Cron表达式生成器](http://cron.qqe2.com/ "在线Cron表达式生成器")
 
 - [在线工具 - 程序员的工具箱](http://tool.lu/ "在线工具 - 程序员的工具箱")
+- [spring boot官方脚手架](https://start.spring.io/ "spring boot官方脚手架")
 
 
 ###  问题反馈
 1. 欢迎提[issue](https://github.com/xiaomoinfo/SpringBootUnity/issues)一起完善这个项目。
 2. QQ: 83387856
 4. 个人主站: https://xiaomo.info
 
-### 在线文档
-
-- [JDK7英文文档](http://tool.oschina.net/apidocs/apidoc?api=jdk_7u4 "JDK7英文文档")
-
-- [Spring4.x文档](http://spring.oschina.mopaas.com/ "Spring4.x文档")
-
-- [Mybatis3官网](http://www.mybatis.org/mybatis-3/zh/index.html "Mybatis3官网")
-
-- [Dubbo官网](http://dubbo.io/ "Dubbo官网")
-
-- [Nginx中文文档](http://tool.oschina.net/apidocs/apidoc?api=nginx-zh "Nginx中文文档")
-
-- [Freemarker在线手册](http://freemarker.foofun.cn/ "Freemarker在线中文手册")
-
-- [Velocity在线手册](http://velocity.apache.org/engine/devel/developer-guide.html "Velocity在线手册")
-
-- [Bootstrap在线手册](http://www.bootcss.com/ "Bootstrap在线手册")
-
-- [Git官网中文文档](https://git-scm.com/book/zh/v2 "Git官网中文文档")
-
-- [Thymeleaf](http://www.thymeleaf.org/doc/tutorials/3.0/thymeleafspring.html "Thymeleaf")
-
-
 
 ## [License](LICENSE "MIT")
 

async/src/main/java/info/xiaomo/anysc/AsyncMain.java

@@ -18,13 +18,13 @@
  * @author : xiaomo
  * github: https://github.com/xiaomoinfo
  * email: xiaomo@xiaomo.info
-
+ * <p>
  * Date: 2016/4/1 15:38
  * Description: RabbitMq启动器
  * Copyright(©) 2015 by xiaomo.
  **/
 @Configuration
-@EnableAutoConfiguration(exclude={DataSourceAutoConfiguration.class,HibernateJpaAutoConfiguration.class})
+@EnableAutoConfiguration(exclude = {DataSourceAutoConfiguration.class, HibernateJpaAutoConfiguration.class})
 @ComponentScan("info.xiaomo")
 @EntityScan("info.xiaomo.*.model")
 public class AsyncMain {

async/src/main/java/info/xiaomo/anysc/controller/TestController.java

@@ -19,7 +19,7 @@
  * @author : xiaomo
  * github: https://github.com/xiaomoinfo
  * email: xiaomo@xiaomo.info
-
+ * <p>
  * Date: 2016/11/15 15:12
  * Description: 用户实体类
  * Copyright(©) 2015 by xiaomo.

async/src/main/java/info/xiaomo/anysc/task/AsyncTask.java

@@ -13,7 +13,7 @@
 @Component
 public class AsyncTask {
 
-    private static Random random =new Random();
+    private static Random random = new Random();
 
     @Async
     public Future<String> doTaskOne() throws Exception {

async/src/main/resources/config/application.properties

@@ -6,3 +6,4 @@ server.max-http-header-size=20971520
 # \u914D\u7F6E\u8FD9\u4E2A\u503C\u5C31\u53EF\u4EE5\u683C\u5F0F\u5316\u65F6\u95F4
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
 spring.jackson.time-zone=GMT+8
+spring.jpa.hibernate.naming.physical-strategy=org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl

core/src/main/java/info/xiaomo/core/base/BaseDao.java

@@ -20,13 +20,15 @@ public interface BaseDao<T> extends JpaRepository<T, Long> {
 
     /**
      * 根据名字查
+     *
      * @param name
      * @return
      */
     T findByName(String name);
 
     /**
      * 删除
+     *
      * @param name
      * @return
      */

core/src/main/java/info/xiaomo/core/base/BaseModel.java

@@ -15,7 +15,7 @@
  * @author : xiaomo
  * github: https://github.com/xiaomoinfo
  * email: xiaomo@xiaomo.info
-
+ * <p>
  * Date: 2016/4/1 20:37
  * Copyright(©) 2015 by xiaomo.
  **/

core/src/main/java/info/xiaomo/core/base/Result.java

@@ -11,7 +11,7 @@
  * @author : xiaomo
  * github: https://github.com/xiaomoinfo
  * email: xiaomo@xiaomo.info
-
+ * <p>
  * Date: 2016/10/31 15:25
  * Description: 返回结果
  * Copyright(©) 2015 by xiaomo.

core/src/main/java/info/xiaomo/core/constant/FileConst.java

@@ -152,11 +152,11 @@ public enum FileConst {
      */
     MF("4D616E69666573742D56"),
     /**
-     *EXE Archive.
+     * EXE Archive.
      */
     EXE("4D5A9000030000000400"),
     /**
-     *CHM Archive.
+     * CHM Archive.
      */
     CHM("49545346030000006000"),
     /*

core/src/main/java/info/xiaomo/core/constant/GenderConst.java

@@ -9,7 +9,7 @@
  * @author : xiaomo
  * github: https://github.com/xiaomoinfo
  * email: xiaomo@xiaomo.info
-
+ * <p>
  * Date: 2016/1/12 16:37
  * Description: 性别
  * Copyright(©) 2015 by xiaomo.