From 2b85a8297b13109968e8aae6db3a943fce5edeaa Mon Sep 17 00:00:00 2001 From: xuwujing <1060589146@qq.com> Date: Fri, 26 Apr 2019 20:36:02 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- .../target/classes/META-INF/MANIFEST.MF | 9 --- .../maven/1.0.0/springboot-2/pom.properties | 7 --- .../META-INF/maven/1.0.0/springboot-2/pom.xml | 60 ------------------- springboot-2/target/classes/application.yml | 14 ----- 5 files changed, 1 insertion(+), 91 deletions(-) delete mode 100644 springboot-2/target/classes/META-INF/MANIFEST.MF delete mode 100644 springboot-2/target/classes/META-INF/maven/1.0.0/springboot-2/pom.properties delete mode 100644 springboot-2/target/classes/META-INF/maven/1.0.0/springboot-2/pom.xml delete mode 100644 springboot-2/target/classes/application.yml diff --git a/README.md b/README.md index 618248a..18dec73 100644 --- a/README.md +++ b/README.md @@ -59,7 +59,7 @@ springBoot-study 是本人在学习SpringBoot的一些工程！ - [springboot-task](https://github.com/xuwujing/springBoot-study/tree/master/springboot-task):SpringBoot使用注解实现线程池的配置和自定义线程的使用示例。 -- [springboot-2](https://github.com/xuwujing/springBoot-study/tree/master/springboot-2):SpringBoo2.x 结合webflux(异步非阻塞开发框架)的 版本使用示例。 +- [springboot2-webflux](https://github.com/xuwujing/springBoot-study/tree/master/springboot2-webflux):SpringBoo2.x 结合webflux(异步非阻塞开发框架)的 版本使用示例。 - [springboot2-elasticsearch](https://github.com/xuwujing/springBoot-study/tree/master/springboot2-elasticsearch):SpringBoo2.x 结合ElasticSearch 6.x 版本使用的示例。 diff --git a/springboot-2/target/classes/META-INF/MANIFEST.MF b/springboot-2/target/classes/META-INF/MANIFEST.MF deleted file mode 100644 index e97a673..0000000 --- a/springboot-2/target/classes/META-INF/MANIFEST.MF +++ /dev/null @@ -1,9 +0,0 @@ -Manifest-Version: 1.0 -Implementation-Title: springboot-2 -Implementation-Version: 0.0.1-SNAPSHOT -Built-By: Administrator -Implementation-Vendor-Id: 1.0.0 -Build-Jdk: 1.8.0_131 -Implementation-URL: http://maven.apache.org -Created-By: Maven Integration for Eclipse - diff --git a/springboot-2/target/classes/META-INF/maven/1.0.0/springboot-2/pom.properties b/springboot-2/target/classes/META-INF/maven/1.0.0/springboot-2/pom.properties deleted file mode 100644 index a98b644..0000000 --- a/springboot-2/target/classes/META-INF/maven/1.0.0/springboot-2/pom.properties +++ /dev/null @@ -1,7 +0,0 @@ -#Generated by Maven Integration for Eclipse -#Thu Apr 11 19:26:07 CST 2019 -version=0.0.1-SNAPSHOT -groupId=1.0.0 -m2e.projectName=springboot-2 -m2e.projectLocation=D\:\\git\\GitHub\\springBoot-study\\springboot-2 -artifactId=springboot-2 diff --git a/springboot-2/target/classes/META-INF/maven/1.0.0/springboot-2/pom.xml b/springboot-2/target/classes/META-INF/maven/1.0.0/springboot-2/pom.xml deleted file mode 100644 index b6e5cda..0000000 --- a/springboot-2/target/classes/META-INF/maven/1.0.0/springboot-2/pom.xml +++ /dev/null @@ -1,60 +0,0 @@ - - 4.0.0 - - 1.0.0 - springboot-2 - 0.0.1-SNAPSHOT - jar - - springboot-2 - http://maven.apache.org - - - UTF-8 - UTF-8 - 1.8 - 1.8 - 1.8 - - - - org.springframework.boot - spring-boot-starter-parent - 2.1.3.RELEASE - - - - - - org.springframework.boot - spring-boot-starter-webflux - - - org.springframework.boot - spring-boot-starter-actuator - - - org.springframework.boot - spring-boot-starter-test - test - - - org.springframework.boot - spring-boot-devtools - true - test - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - - diff --git a/springboot-2/target/classes/application.yml b/springboot-2/target/classes/application.yml deleted file mode 100644 index db7c0fa..0000000 --- a/springboot-2/target/classes/application.yml +++ /dev/null @@ -1,14 +0,0 @@ -server: - port: 8280 - - -spring: - application: - name: springboot2 - - -management: - security: - enabled: false #关掉安全认证 - port: 8888 #管理端口 - context-path: /monitor #actuator的访问路径 \ No newline at end of file From 8696777d8b249c331ef2a6cb497e405bb1649f92 Mon Sep 17 00:00:00 2001 From: xuwujing <1060589146@qq.com> Date: Mon, 6 May 2019 19:03:35 +0800 Subject: [PATCH 2/2] update pom.xml --- springboot2-docker/pom.xml | 186 ++++++++++++++++++------------------ springboot2-webflux/pom.xml | 126 ++++++++++++------------ 2 files changed, 156 insertions(+), 156 deletions(-) diff --git a/springboot2-docker/pom.xml b/springboot2-docker/pom.xml index f96aec3..37fcbf7 100644 --- a/springboot2-docker/pom.xml +++ b/springboot2-docker/pom.xml @@ -1,94 +1,94 @@ - - - 4.0.0 - - com.pancm - docker - 1.0-SNAPSHOT - - UTF-8 - UTF-8 - 1.8 - 1.8 - 1.8 - springboot - - - - org.springframework.boot - spring-boot-starter-parent - 2.1.3.RELEASE - - - - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-test - test - - - org.springframework.boot - spring-boot-devtools - true - test - - - - - - compile - src - springboot2-docker - - - org.springframework.boot - spring-boot-maven-plugin - - true - com.pancm.DockerApplication - - - - - repackage - - - - - - - com.spotify - docker-maven-plugin - 1.0.0 - - - http://localhost:2375 - - java - - ${docker.image.prefix}/${project.artifactId} - - ${project.basedir}/src/main/docker - - - - / - ${project.build.directory} - ${project.build.finalName}.jar - - - - - - - - - + + + 4.0.0 + + com.pancm + springboot2-docker + 1.0-SNAPSHOT + + UTF-8 + UTF-8 + 1.8 + 1.8 + 1.8 + springboot + + + + org.springframework.boot + spring-boot-starter-parent + 2.1.3.RELEASE + + + + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-test + test + + + org.springframework.boot + spring-boot-devtools + true + test + + + + + + compile + src + springboot2-docker + + + org.springframework.boot + spring-boot-maven-plugin + + true + com.pancm.DockerApplication + + + + + repackage + + + + + + + com.spotify + docker-maven-plugin + 1.0.0 + + + http://localhost:2375 + + java + + ${docker.image.prefix}/${project.artifactId} + + ${project.basedir}/src/main/docker + + + + / + ${project.build.directory} + ${project.build.finalName}.jar + + + + + + + + + \ No newline at end of file diff --git a/springboot2-webflux/pom.xml b/springboot2-webflux/pom.xml index 83c2dec..f15c26e 100644 --- a/springboot2-webflux/pom.xml +++ b/springboot2-webflux/pom.xml @@ -1,63 +1,63 @@ - - 4.0.0 - - 1.0.0 - springboot-2 - 0.0.1-SNAPSHOT - jar - - springboot2-webflux - http://maven.apache.org - - - UTF-8 - UTF-8 - 1.8 - 1.8 - 1.8 - - - - org.springframework.boot - spring-boot-starter-parent - 2.1.3.RELEASE - - - - - - org.springframework.boot - spring-boot-starter-webflux - - - org.springframework.boot - spring-boot-starter-actuator - - - org.springframework.boot - spring-boot-starter-test - test - - - org.springframework.boot - spring-boot-devtools - true - test - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - true - - - - - - + + 4.0.0 + + 1.0.0 + springboot2-webflux + 0.0.1-SNAPSHOT + jar + + springboot2-webflux + http://maven.apache.org + + + UTF-8 + UTF-8 + 1.8 + 1.8 + 1.8 + + + + org.springframework.boot + spring-boot-starter-parent + 2.1.3.RELEASE + + + + + + org.springframework.boot + spring-boot-starter-webflux + + + org.springframework.boot + spring-boot-starter-actuator + + + org.springframework.boot + spring-boot-starter-test + test + + + org.springframework.boot + spring-boot-devtools + true + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + true + + + + + +