diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 000000000..c33a9922d --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,29 @@ +pipeline { + agent { + label 'master' + } + stages{ + stage('checkout code'){ + steps { + git branch: 'IditOryDanny_2_sol', url: 'https://github.com/danny-ros/spring-boot-examples.git' + } + } + stage('Build'){ + steps { + sh '''cd spring-boot-package-war''' + sh '''mvn compile''' + } + } + stage('Test'){ + steps { + sh '''cd spring-boot-package-war + mvn test''' + } + } + stage('Deploy to Integration ') { + steps { + sh 'cp "/opt/tomcat/.jenkins/workspace/final project/target/spring-boot-package-war-0.0.${BUILD_ID}-SNAPSHOT.war" /opt/tomcat/latest/webapps' + } + } + } +} diff --git a/README.md b/README.md deleted file mode 100644 index d005c0ff9..000000000 --- a/README.md +++ /dev/null @@ -1,58 +0,0 @@ -# Spring Boot Examples - -Demo website：http://www.ityouknow.com/ - -[参与贡献](https://github.com/ityouknow/spring-boot-examples/issues) |  [English](README_EN.md) - - -Spring boot使用的各种示例，以最简单、最实用为标准 - - -- [spring-boot-helloWorld](https://github.com/ityouknow/spring-boot-examples/tree/master/spring-boot-helloWorld)：spring-boot的helloWorld版本 -- [spring-boot-mybaits-annotation](https://github.com/ityouknow/spring-boot-examples/tree/master/spring-boot-mybatis-annotation)：注解版本 -- [spring-boot-mybaits-xml](https://github.com/ityouknow/spring-boot-examples/tree/master/spring-boot-mybatis-xml)：xml配置版本 -- [spring-boot-mybatis-mulidatasource](https://github.com/ityouknow/spring-boot-examples/tree/master/spring-boot-mybatis-mulidatasource)：springboot+mybatis多数据源最简解决方案 -- [spring-boot-mybatis-annotation-mulidatasource](https://github.com/ityouknow/spring-boot-examples/tree/master/spring-boot-mybatis-annotation-mulidatasource)：springboot+mybatis（注解版）多数据源最简解决方案 -- [spring-boot-thymeleaf](https://github.com/ityouknow/spring-boot-examples/tree/master/spring-boot-thymeleaf)：simple spring boot thymeleaf demo -- [spring-boot-jpa-thymeleaf-curd](https://github.com/ityouknow/spring-boot-examples/tree/master/spring-boot-jpa-thymeleaf-curd)：spring boot + jpa + thymeleaf 增删改查示例 -- [spring-boot-rabbitmq](https://github.com/ityouknow/spring-boot-examples/tree/master/spring-boot-rabbitmq)：spring boot和rabbitmq各种消息应用案例 -- [spring-boot-scheduler](https://github.com/ityouknow/spring-boot-examples/tree/master/spring-boot-scheduler)：spring boot和定时任务案例 -- [spring-boot-web](https://github.com/ityouknow/spring-boot-examples/tree/master/spring-boot-web)：web开发综合使用案例 -- [spring-boot-mail](https://github.com/ityouknow/spring-boot-examples/tree/master/spring-boot-mail)：spring boot和邮件服务 -- [spring-boot-mongodb](https://github.com/ityouknow/spring-boot-examples/tree/master/spring-boot-mongodb)：spring boot和mongodb的使用 -- [spring-boot-multi-mongodb](https://github.com/ityouknow/spring-boot-examples/tree/master/spring-boot-multi-mongodb)：spring boot和mongodb多数据源的使用 -- [spring-boot-package-war](https://github.com/ityouknow/spring-boot-examples/tree/master/spring-boot-package-war)：spring-boot打包成war包示例 -- [spring-boot-shiro](https://github.com/ityouknow/spring-boot-examples/tree/master/spring-boot-shiro)：springboot 整合shiro rbac示例 -- [spring-boot-file-upload](https://github.com/ityouknow/spring-boot-examples/tree/master/spring-boot-file-upload)：springboot 集成上传文件示例 -- [spring-boot-fastDFS](https://github.com/ityouknow/spring-boot-examples/tree/master/spring-boot-fastDFS)：springboot 集成FastDFS示例 - -**[Favorites-web](https://github.com/cloudfavorites/favorites-web)：云收藏（springboot实战开源项目）** - - - -参考文章： - -- [springboot(一)：入门篇](http://www.ityouknow.com/springboot/2016/01/06/springboot(%E4%B8%80)-%E5%85%A5%E9%97%A8%E7%AF%87.html) -- [springboot(二)：web综合开发](http://www.ityouknow.com/springboot/2016/02/03/springboot(%E4%BA%8C)-web%E7%BB%BC%E5%90%88%E5%BC%80%E5%8F%91.html) -- [springboot(三)：Spring boot中Redis的使用](http://www.ityouknow.com/springboot/2016/03/06/springboot(%E4%B8%89)-Spring-Boot%E4%B8%ADRedis%E7%9A%84%E4%BD%BF%E7%94%A8.html) -- [springboot(四)：thymeleaf使用详解](http://www.ityouknow.com/springboot/2016/05/01/springboot(%E5%9B%9B)-thymeleaf%E4%BD%BF%E7%94%A8%E8%AF%A6%E8%A7%A3.html) -- [springboot(五)：spring data jpa的使用](http://www.ityouknow.com/springboot/2016/08/20/springboot(%E4%BA%94)-spring-data-jpa%E7%9A%84%E4%BD%BF%E7%94%A8.html) -- [springboot(六)：如何优雅的使用mybatis](http://www.ityouknow.com/springboot/2016/11/06/springboot(%E5%85%AD)-%E5%A6%82%E4%BD%95%E4%BC%98%E9%9B%85%E7%9A%84%E4%BD%BF%E7%94%A8mybatis.html) -- [springboot(七)：springboot+mybatis多数据源最简解决方案](http://www.ityouknow.com/springboot/2016/11/25/springboot(%E4%B8%83)-springboot+mybatis%E5%A4%9A%E6%95%B0%E6%8D%AE%E6%BA%90%E6%9C%80%E7%AE%80%E8%A7%A3%E5%86%B3%E6%96%B9%E6%A1%88.html) -- [springboot(八)：RabbitMQ详解](http://www.ityouknow.com/springboot/2016/11/30/springboot(%E5%85%AB)-RabbitMQ%E8%AF%A6%E8%A7%A3.html) -- [springboot(九)：定时任务](http://www.ityouknow.com/springboot/2016/12/02/springboot(%E4%B9%9D)-%E5%AE%9A%E6%97%B6%E4%BB%BB%E5%8A%A1.html) -- [springboot(十)：邮件服务](http://www.ityouknow.com/springboot/2017/05/06/springboot-mail.html) -- [springboot(十一)：Spring boot中mongodb的使用](http://www.ityouknow.com/springboot/2017/05/08/springboot-mongodb.html) -- [springboot(十二)：springboot如何测试打包部署](http://www.ityouknow.com/springboot/2017/05/09/springboot-deploy.html) -- [springboot(十三)：springboot小技巧](http://www.ityouknow.com/springboot/2017/06/22/springboot-tips.html) -- [springboot(十四)：springboot整合shiro-登录认证和权限管理](http://www.ityouknow.com/springboot/2017/06/26/springboot-shiro.html) - -**[springboot实战：我们的第一款开源项目](http://www.ityouknow.com/springboot/2016/09/26/springboot%E5%AE%9E%E6%88%98-%E6%88%91%E4%BB%AC%E7%9A%84%E7%AC%AC%E4%B8%80%E6%AC%BE%E5%BC%80%E6%BA%90%E8%BD%AF%E4%BB%B6.html)** - -> 如果大家想了解关于springboot的其它方面应用，也可以以[issues](https://github.com/ityouknow/spring-boot-examples/issues)的形式反馈给我，我后续来完善。 - - -关注公众号：纯洁的微笑，回复"springboot"进群交流 - -![](http://www.ityouknow.com/assets/images/keeppuresmile.jpg) - diff --git a/README_EN.md b/README_EN.md deleted file mode 100644 index 50c842a1b..000000000 --- a/README_EN.md +++ /dev/null @@ -1,30 +0,0 @@ -# Spring Boot Examples - -this is ablout learn Spring Boot Examples - -Demo website：http://www.ityouknow.com/ - -[Contribution](https://github.com/ityouknow/spring-boot-examples/issues) |  [中文](README.md) - - -Spring Boot Examples, Use the simplest and most useful scene demo. - -- [spring-boot-helloWorld](https://github.com/ityouknow/spring-boot-examples/tree/master/spring-boot-helloWorld)：Spring Boot helloWorld -- [spring-boot-mybaits-annotation](https://github.com/ityouknow/spring-boot-examples/tree/master/spring-boot-mybatis-annotation)：Spring Boot use mybatis annotation -- [spring-boot-mybaits-xml](https://github.com/ityouknow/spring-boot-examples/tree/master/spring-boot-mybatis-xml)：Spring Boot use mybatis xml -- [spring-boot-mybatis-mulidatasource](https://github.com/ityouknow/spring-boot-examples/tree/master/spring-boot-mybatis-mulidatasource)：Spring Boot+mybatis+mulidatasource -- [spring-boot-mybatis-annotation-mulidatasource](https://github.com/ityouknow/spring-boot-examples/tree/master/spring-boot-mybatis-annotation-mulidatasource)：Spring Boot+ mybatis annotation + mulidatasource -- [spring-boot-thymeleaf](https://github.com/ityouknow/spring-boot-examples/tree/master/spring-boot-thymeleaf)：simple spring boot thymeleaf demo -- [spring-boot-jpa-thymeleaf-curd](https://github.com/ityouknow/spring-boot-examples/tree/master/spring-boot-jpa-thymeleaf-curd)：spring boot + jpa + thymeleaf curd demo -- [spring-boot-rabbitmq](https://github.com/ityouknow/spring-boot-examples/tree/master/spring-boot-rabbitmq)： using AMQP and RabbitMQ -- [spring-boot-scheduler](https://github.com/ityouknow/spring-boot-examples/tree/master/spring-boot-scheduler)：Timed tasks developed using Spring Boot -- [spring-boot-web](https://github.com/ityouknow/spring-boot-examples/tree/master/spring-boot-web)：Web projects developed using Spring Boot -- [spring-boot-mail](https://github.com/ityouknow/spring-boot-examples/tree/master/spring-boot-mail)：Mail system developed using Spring Boot -- [spring-boot-mongodb](https://github.com/ityouknow/spring-boot-examples/tree/master/spring-boot-mongodb)：Spring Boot + Mongodb -- [spring-boot-multi-mongodb](https://github.com/ityouknow/spring-boot-examples/tree/master/spring-boot-multi-mongodb)：Spring Boot + multiMongodb -- [spring-boot-package-war](https://github.com/ityouknow/spring-boot-examples/tree/master/spring-boot-package-war)：Spring Boot package war -- [spring-boot-shiro](https://github.com/ityouknow/spring-boot-examples/tree/master/spring-boot-shiro)：spring boot shiro rbac demo -- [spring-boot-file-upload](https://github.com/ityouknow/spring-boot-examples/tree/master/spring-boot-file-upload)：Spring Boot file upload example -- [spring-boot-fastDFS](https://github.com/ityouknow/spring-boot-examples/tree/master/spring-boot-fastDFS)：springboot use FastDFS example - -**[Favorites-web](https://github.com/cloudfavorites/favorites-web)：Open source projects developed using Spring Boot** diff --git a/spring-boot-package-war/pom.xml b/spring-boot-package-war/pom.xml index c54d0da80..5bba0d5c4 100644 --- a/spring-boot-package-war/pom.xml +++ b/spring-boot-package-war/pom.xml @@ -32,6 +32,7 @@ org.springframework.boot spring-boot-starter-test + 1.3.6.RELEASE test @@ -39,16 +40,25 @@ org.springframework.boot spring-boot-starter-web + org.springframework.boot spring-boot-starter-tomcat provided - + + org.springframework.boot spring-boot-devtools true + + + javax.xml.bind + jaxb-api + 2.3.0 + + @@ -57,7 +67,7 @@ org.springframework.boot spring-boot-maven-plugin - true + true diff --git a/spring-boot-package-war/src/main/java/com/neo/controller/HelloWorldController.java b/spring-boot-package-war/src/main/java/com/neo/controller/HelloWorldController.java index c231fae49..a8a6efb45 100644 --- a/spring-boot-package-war/src/main/java/com/neo/controller/HelloWorldController.java +++ b/spring-boot-package-war/src/main/java/com/neo/controller/HelloWorldController.java @@ -8,6 +8,6 @@ public class HelloWorldController { @RequestMapping("/hello") public String index() { - return "Hello World xx"; + return "Hello World"; } -} \ No newline at end of file +} diff --git a/spring-boot-package-war/src/main/resources/Application.java b/spring-boot-package-war/src/main/resources/Application.java new file mode 100644 index 000000000..6cda50c81 --- /dev/null +++ b/spring-boot-package-war/src/main/resources/Application.java @@ -0,0 +1,12 @@ +package com.neo; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class Application { + + public static void main(String[] args) { + SpringApplication.run(Application.class, args); + } +} diff --git a/spring-boot-package-war/src/main/resources/ServletInitializer.java b/spring-boot-package-war/src/main/resources/ServletInitializer.java new file mode 100644 index 000000000..e57ead010 --- /dev/null +++ b/spring-boot-package-war/src/main/resources/ServletInitializer.java @@ -0,0 +1,14 @@ +package com.neo; + +import org.springframework.boot.builder.SpringApplicationBuilder; +import org.springframework.boot.context.web.SpringBootServletInitializer; + +/** + * Created by summer on 2017/5/8. + */ +public class ServletInitializer extends SpringBootServletInitializer { + @Override + protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { + return application.sources(Application.class); + } +} diff --git a/spring-boot-package-war/src/main/resources/controller/HelloWorldController.java b/spring-boot-package-war/src/main/resources/controller/HelloWorldController.java new file mode 100644 index 000000000..a8a6efb45 --- /dev/null +++ b/spring-boot-package-war/src/main/resources/controller/HelloWorldController.java @@ -0,0 +1,13 @@ +package com.neo.controller; + +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class HelloWorldController { + + @RequestMapping("/hello") + public String index() { + return "Hello World"; + } +}