revert

Author: houko

.travis.yml

@@ -1,11 +1 @@
-language: java  # 构建语言
-
-sudo: false  # 开启基于容器的Travis CI任务，让编译效率更高。
-
-dist: precise
-
-notifications:      # 每次构建的时候是否通知，如果不想收到通知邮箱（个人感觉邮件贼烦），那就设置false吧
-  email: false
-
-jdk:
-  - oraclejdk8
+language: java

README.md

@@ -65,7 +65,6 @@ http://localhost:808/doc.html bootstrap-ui
 - 2017-11-03 添加kotlin环境配置
 - 2017-11-03 按照阿里巴巴编程规范插件P3C优化代码
 - 2017-11-03 合并`api`和`website`模块,访问`localhost:8080`会显示网站主页,访问`localhost:8080/api`会显示api管理界面
-- 2017-11-03 从java代码转移到kotlin上(java版本请选择[v2017.1](https://github.com/xiaomoinfo/SpringBootUnity/tree/2017.1))
 
 
 

async/pom.xml

@@ -23,7 +23,6 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>1.5.8.RELEASE</version>
                 <executions>
                     <execution>
                         <goals>

async/src/main/java/info/xiaomo/anysc/AsyncMain.kt renamed to async/src/main/java/info/xiaomo/anysc/AsyncMain.java

@@ -1,12 +1,13 @@
-package info.xiaomo.anysc
+package info.xiaomo.anysc;
 
 
-import org.springframework.boot.SpringApplication
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration
-import org.springframework.boot.autoconfigure.domain.EntityScan
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration
-import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration
-import org.springframework.context.annotation.ComponentScan
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.domain.EntityScan;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
 
 /**
  * 把今天最好的表现当作明天最新的起点．．～
@@ -17,16 +18,18 @@
  * @author : xiaomo
  * github: https://github.com/xiaomoinfo
  * email: [email protected]
- *
+ * <p>
  * Date: 2016/4/1 15:38
  * Description: RabbitMq启动器
  * Copyright(©) 2015 by xiaomo.
- */
-@EnableAutoConfiguration(exclude = arrayOf(DataSourceAutoConfiguration::class, HibernateJpaAutoConfiguration::class))
+ **/
+@Configuration
+@EnableAutoConfiguration(exclude = {DataSourceAutoConfiguration.class, HibernateJpaAutoConfiguration.class})
 @ComponentScan("info.xiaomo")
 @EntityScan("info.xiaomo.*.model")
-class AsyncMain
+public class AsyncMain {
+    public static void main(String[] args) throws Exception {
+        SpringApplication.run(AsyncMain.class, args);
+    }
 
-fun main(args: Array<String>) {
-    SpringApplication.run(AsyncMain::class, *args)
 }

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

@@ -0,0 +1,160 @@
+package info.xiaomo.anysc.controller;
+
+import info.xiaomo.anysc.task.AsyncTask;
+import info.xiaomo.core.base.BaseController;
+import info.xiaomo.core.base.Result;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.concurrent.Future;
+
+/**
+ * 把今天最好的表现当作明天最新的起点．．～
+ * いま 最高の表現 として 明日最新の始発．．～
+ * Today the best performance  as tomorrow newest starter!
+ * Created by IntelliJ IDEA.
+ *
+ * @author : xiaomo
+ * github: https://github.com/xiaomoinfo
+ * email: [email protected]
+ * <p>
+ * Date: 2016/11/15 15:12
+ * Description: 用户实体类
+ * Copyright(©) 2015 by xiaomo.
+ **/
+
+@RestController
+@RequestMapping("/")
+public class TestController extends BaseController {
+
+    private final AsyncTask task;
+
+    @Autowired
+    public TestController(AsyncTask task) {
+        this.task = task;
+    }
+
+    @RequestMapping(value = "/", method = RequestMethod.GET)
+    public Result task() throws Exception {
+        long start = System.currentTimeMillis();
+
+        Future<String> task1 = task.doTaskOne();
+        Future<String> task2 = task.doTaskTwo();
+        Future<String> task3 = task.doTaskThree();
+
+        while (true) {
+            if (task1.isDone() && task2.isDone() && task3.isDone()) {
+                // 三个任务都调用完成，退出循环等待
+                break;
+            }
+            Thread.sleep(1000);
+        }
+
+        long end = System.currentTimeMillis();
+
+        System.out.println("任务全部完成，总耗时：" + (end - start) + "毫秒");
+        return new Result<>(end - start);
+    }
+
+
+    /**
+     * 查找所有(不带分页)
+     *
+     * @return result
+     */
+    @Override
+    public Result<List> findAll() {
+        return null;
+    }
+
+    /**
+     * 带分页
+     *
+     * @param start    起始页
+     * @param pageSize 页码数
+     * @return result
+     */
+    @Override
+    public Result<Page> findAll(@PathVariable int start, @PathVariable int pageSize) {
+        return null;
+    }
+
+    /**
+     * 根据id查看模型
+     *
+     * @param id id
+     * @return result
+     */
+    @Override
+    public Result findById(@PathVariable Long id) {
+        return null;
+    }
+
+    /**
+     * 根据名字查找模型
+     *
+     * @param name name
+     * @return result
+     */
+    @Override
+    public Result findByName(@PathVariable String name) {
+        return null;
+    }
+
+    /**
+     * 根据名字删除模型
+     *
+     * @param name name
+     * @return result
+     */
+    @Override
+    public Result<Boolean> delByName(@PathVariable String name) {
+        return null;
+    }
+
+    /**
+     * 根据id删除模型
+     *
+     * @param id id
+     * @return result
+     */
+    @Override
+    public Result<Boolean> delById(@PathVariable Long id) {
+        return null;
+    }
+
+    /**
+     * 添加模型
+     *
+     * @param model model
+     * @return result
+     */
+    @Override
+    public Result<Boolean> add(@RequestBody Object model) {
+        return null;
+    }
+
+    /**
+     * 更新
+     *
+     * @param model model
+     * @return result
+     */
+    @Override
+    public Result<Boolean> update(@RequestBody Object model) {
+        return null;
+    }
+
+    /**
+     * 批量删除
+     *
+     * @param ids ids
+     * @return result
+     */
+    @Override
+    public Result<Boolean> delByIds(@PathVariable List ids) {
+        return null;
+    }
+}

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

@@ -0,0 +1,48 @@
+package info.xiaomo.anysc.task;
+
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.scheduling.annotation.AsyncResult;
+import org.springframework.stereotype.Component;
+
+import java.util.Random;
+import java.util.concurrent.Future;
+
+/**
+ * @author : xiaomo
+ */
+@Component
+public class AsyncTask {
+
+    private static Random random = new Random();
+
+    @Async
+    public Future<String> doTaskOne() throws Exception {
+        System.out.println("开始做任务一");
+        long start = System.currentTimeMillis();
+        Thread.sleep(random.nextInt(10000));
+        long end = System.currentTimeMillis();
+        System.out.println("完成任务一，耗时：" + (end - start) + "毫秒");
+        return new AsyncResult<>("任务一完成");
+    }
+
+    @Async
+    public Future<String> doTaskTwo() throws Exception {
+        System.out.println("开始做任务二");
+        long start = System.currentTimeMillis();
+        Thread.sleep(random.nextInt(10000));
+        long end = System.currentTimeMillis();
+        System.out.println("完成任务二，耗时：" + (end - start) + "毫秒");
+        return new AsyncResult<>("任务二完成");
+    }
+
+    @Async
+    public Future<String> doTaskThree() throws Exception {
+        System.out.println("开始做任务三");
+        long start = System.currentTimeMillis();
+        Thread.sleep(random.nextInt(10000));
+        long end = System.currentTimeMillis();
+        System.out.println("完成任务三，耗时：" + (end - start) + "毫秒");
+        return new AsyncResult<>("任务三完成");
+    }
+
+}