diff --git a/springboot-webflux-2-restful/src/main/java/org/spring/springboot/domain/City.java b/springboot-webflux-2-restful/src/main/java/org/spring/springboot/domain/City.java
index 598af6d..fa3b410 100644
--- a/springboot-webflux-2-restful/src/main/java/org/spring/springboot/domain/City.java
+++ b/springboot-webflux-2-restful/src/main/java/org/spring/springboot/domain/City.java
@@ -3,7 +3,6 @@ package org.spring.springboot.domain;
 /**
  * 城市实体类
  *
- * Created by bysocket on 09/29/2017.
  */
 public class City {
 
diff --git a/springboot-webflux-2-restful/src/main/java/org/spring/springboot/handler/CityHandler.java b/springboot-webflux-2-restful/src/main/java/org/spring/springboot/handler/CityHandler.java
index 38bb8d2..08e91f2 100644
--- a/springboot-webflux-2-restful/src/main/java/org/spring/springboot/handler/CityHandler.java
+++ b/springboot-webflux-2-restful/src/main/java/org/spring/springboot/handler/CityHandler.java
@@ -22,14 +22,11 @@ public class CityHandler {
     }
 
     public Mono<City> findCityById(Long id) {
-        return Mono.create(cityMonoSink -> cityMonoSink.success(cityRepository.findCityById(id)));
+        return Mono.justOrEmpty(cityRepository.findCityById(id));
     }
 
     public Flux<City> findAllCity() {
-        return Flux.create(cityFluxSink -> {
-            cityRepository.findAll().forEach(city -> cityFluxSink.next(city));
-            cityFluxSink.complete();
-        });
+        return Flux.fromIterable(cityRepository.findAll());
     }
 
     public Mono<Long> modifyCity(City city) {