From e590bda78207fc430a2b37bb5490047ff007e553 Mon Sep 17 00:00:00 2001
From: liqiangqiang <liqiangqiang@youzan.com>
Date: Tue, 10 Apr 2018 11:08:42 +0800
Subject: [PATCH] =?UTF-8?q?WebFlux=20=E5=BF=AB=E9=80=9F=E5=85=A5=E9=97=A8?=
 =?UTF-8?q?=E5=AE=9E=E8=B7=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 springboot-webflux-1-quickstart/pom.xml       | 77 +++++++++++--------
 .../org/spring/springboot/domain/City.java    | 61 ---------------
 2 files changed, 43 insertions(+), 95 deletions(-)
 delete mode 100644 springboot-webflux-1-quickstart/src/main/java/org/spring/springboot/domain/City.java

diff --git a/springboot-webflux-1-quickstart/pom.xml b/springboot-webflux-1-quickstart/pom.xml
index 64eea95..6e82485 100755
--- a/springboot-webflux-1-quickstart/pom.xml
+++ b/springboot-webflux-1-quickstart/pom.xml
@@ -1,41 +1,50 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
+  <modelVersion>4.0.0</modelVersion>
 
-    <groupId>springboot</groupId>
-    <artifactId>springboot-webflux-1-quickstart</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
-    <name>springboot-webflux-1-quickstart :: Spring Boot WebFlux 快速入门</name>
+  <groupId>springboot</groupId>
+  <artifactId>springboot-webflux-1-quickstart</artifactId>
+  <version>0.0.1-SNAPSHOT</version>
+  <name>springboot-webflux-1-quickstart :: Spring Boot WebFlux 快速入门</name>
 
-    <!-- Spring Boot 启动父依赖 -->
-    <parent>
+  <parent>
+    <groupId>org.springframework.boot</groupId>
+    <artifactId>spring-boot-starter-parent</artifactId>
+    <version>2.0.1.RELEASE</version>
+    <relativePath/> <!-- lookup parent from repository -->
+  </parent>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+    <java.version>1.8</java.version>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-webflux</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-test</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>io.projectreactor</groupId>
+      <artifactId>reactor-test</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
         <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.0.1.RELEASE</version>
-    </parent>
-
-    <dependencies>
-
-        <!-- Spring Boot Web Flux 依赖 -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-webflux</artifactId>
-        </dependency>
-
-        <!-- Spring Boot Test 依赖 -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <!-- Junit -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.12</version>
-        </dependency>
-    </dependencies>
-
+        <artifactId>spring-boot-maven-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/springboot-webflux-1-quickstart/src/main/java/org/spring/springboot/domain/City.java b/springboot-webflux-1-quickstart/src/main/java/org/spring/springboot/domain/City.java
deleted file mode 100644
index 598af6d..0000000
--- a/springboot-webflux-1-quickstart/src/main/java/org/spring/springboot/domain/City.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package org.spring.springboot.domain;
-
-/**
- * 城市实体类
- *
- * Created by bysocket on 09/29/2017.
- */
-public class City {
-
-    /**
-     * 城市编号
-     */
-    private Long id;
-
-    /**
-     * 省份编号
-     */
-    private Long provinceId;
-
-    /**
-     * 城市名称
-     */
-    private String cityName;
-
-    /**
-     * 描述
-     */
-    private String description;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getProvinceId() {
-        return provinceId;
-    }
-
-    public void setProvinceId(Long provinceId) {
-        this.provinceId = provinceId;
-    }
-
-    public String getCityName() {
-        return cityName;
-    }
-
-    public void setCityName(String cityName) {
-        this.cityName = cityName;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-}