diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index 6bacd93..4040c77 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -21,29 +21,44 @@
       <option name="name" value="maven-public" />
       <option name="url" value="http://192.168.1.24:8081/repository/maven-public/" />
     </remote-repository>
-    <remote-repository>
-      <option name="id" value="repository" />
-      <option name="name" value="repository" />
-      <option name="url" value="http://47.242.184.139:8081/repository/maven-public/" />
-    </remote-repository>
     <remote-repository>
       <option name="id" value="central" />
       <option name="name" value="Maven Central repository" />
       <option name="url" value="https://repo1.maven.org/maven2" />
     </remote-repository>
     <remote-repository>
-      <option name="id" value="jboss.community" />
-      <option name="name" value="JBoss Community repository" />
-      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+      <option name="id" value="maven-releases" />
+      <option name="name" value="maven-releases" />
+      <option name="url" value="http://47.242.184.139:8081/repository/maven-releases/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven-snapshots" />
+      <option name="name" value="maven-snapshots" />
+      <option name="url" value="http://47.242.184.139:8081/repository/maven-snapshots/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven-releases" />
+      <option name="name" value="maven-releases" />
+      <option name="url" value="http://47.242.184.139:8081/repository/maven-public/" />
     </remote-repository>
     <remote-repository>
       <option name="id" value="maven-central" />
       <option name="name" value="maven-central" />
+      <option name="url" value="http://47.242.184.139:8081/repository/maven-central/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="repository" />
+      <option name="name" value="repository" />
       <option name="url" value="http://47.242.184.139:8081/repository/maven-public/" />
     </remote-repository>
     <remote-repository>
-      <option name="id" value="maven-releases" />
-      <option name="name" value="maven-releases" />
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven-central" />
+      <option name="name" value="maven-central" />
       <option name="url" value="http://47.242.184.139:8081/repository/maven-public/" />
     </remote-repository>
     <remote-repository>
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 87430e1..900630a 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,10 +5,17 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="eacd3dd8-1e95-428c-a6af-1aadb9921989" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/jarRepositories.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/jarRepositories.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/AdminClientTemperatureApplication.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/AdminClientTemperatureApplication.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/controller/JdbcDemoController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/controller/JdbcDemoController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/controller/WeatherController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/controller/WeatherController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/entity/Temperature.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/entity/Temperature.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/entity/WebServiceCity.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/entity/WebServiceCity.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/entity/WebServiceProvince.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/entity/WebServiceProvince.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/entity/WebServiceWeatherInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/rehome/mqttclienttemperature/entity/WebServiceWeatherInfo.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.yml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -174,6 +181,7 @@
       <workItem from="1747564622457" duration="10803000" />
       <workItem from="1747644155888" duration="5369000" />
       <workItem from="1747658293616" duration="1309000" />
+      <workItem from="1748326418665" duration="908000" />
     </task>
     <servers />
   </component>
diff --git a/pom.xml b/pom.xml
index f6a2948..f5a8c05 100644
--- a/pom.xml
+++ b/pom.xml
@@ -268,6 +268,7 @@
         </dependency>
         <!--webservice 第三方库axis2 maven引用 Spring-axis end-->
     </dependencies>
+<<<<<<< HEAD
     <!--在项目中使用pom.xml进行下载依赖配置的话可以单独使用：
    注意：项目中使用的maven，如果已经在settings.xml中配置过后就无需在配置此项-->
     <repositories>
@@ -282,6 +283,8 @@
             </snapshots>
         </repository>
     </repositories>
+=======
+>>>>>>> f6a8db4 (createDate change to Date)
     <build>
         <finalName>${project.artifactId}</finalName>
         <plugins>
diff --git a/src/main/java/com/rehome/mqttclienttemperature/AdminClientTemperatureApplication.java b/src/main/java/com/rehome/mqttclienttemperature/AdminClientTemperatureApplication.java
index 28e0fcd..ab6b4c2 100644
--- a/src/main/java/com/rehome/mqttclienttemperature/AdminClientTemperatureApplication.java
+++ b/src/main/java/com/rehome/mqttclienttemperature/AdminClientTemperatureApplication.java
@@ -56,8 +56,8 @@ public class AdminClientTemperatureApplication implements CommandLineRunner, App
                 System.out.println("TemperatureController is not empty");
                 MqttRSAClient client = new MqttRSAClient();
                 client.start(temperatureService);
-            } else {
-                System.out.println("TemperatureController is empty");
+            }else {
+                System.out.println("temperatureService is empty");
             }
         } catch (Exception ex) {
             ex.printStackTrace();
diff --git a/src/main/java/com/rehome/mqttclienttemperature/controller/JdbcDemoController.java b/src/main/java/com/rehome/mqttclienttemperature/controller/JdbcDemoController.java
index 8e612f4..b9dc3b7 100644
--- a/src/main/java/com/rehome/mqttclienttemperature/controller/JdbcDemoController.java
+++ b/src/main/java/com/rehome/mqttclienttemperature/controller/JdbcDemoController.java
@@ -46,16 +46,14 @@ import java.util.concurrent.*;
  */
 
 /**
- *源码下载
+ * 源码下载
  * https://download.csdn.net/download/lxyoucan/85094574
- *
+ * <p>
  * 参考
  * https://github.com/freakchick/DBApi
- *
- *SpringBoot中封装jdbc工具类
+ * <p>
+ * SpringBoot中封装jdbc工具类
  * https://blog.csdn.net/lxyoucan/article/details/124042295
- *
- *
  */
 
 @Slf4j
@@ -80,6 +78,7 @@ public class JdbcDemoController {
 //        ds.setId("2");
 //        ds.setName("oracle");
 //        ds.setUrl("jdbc:oracle:thin:@192.168.1.9:1521/orcl");
+//        ds.setUrl("jdbc:oracle:thin:@192.168.3.7:1521/orcl");
 //        ds.setUsername("appserver");
 //        ds.setPassword("appserver");
 //        ds.setDriver("oracle.jdbc.driver.OracleDriver");
@@ -87,11 +86,11 @@ public class JdbcDemoController {
 
     /**
      * 查询测试
+     *
      * @return
      */
     //@RequestMapping("/api/list")
     public ResponseDto queryList() {
-
         // 自定义一个线程池,内部包含8个线程
         ExecutorService customPool = Executors.newFixedThreadPool(8);
         // 自定义一个线程池,内部包含10个线程
@@ -99,14 +98,8 @@ public class JdbcDemoController {
         CompletableFuture<String> future = CompletableFuture.supplyAsync(() -> {
             String sql = "select * from temperature where id = ?";
             List<Object> jdbcParamValues = new ArrayList<>();
-            for (int i = 0; i < 2362254; i++) {
-//            try {
-//                Thread.sleep(5);
-//            } catch (InterruptedException e) {
-//                e.printStackTrace();
-//            }
+            for (int i = 2292104; i < 2298700; i++) {
                 jdbcParamValues.add(i + 1);
-
                 Gson gson = new Gson();
                 ResponseDto responseDto = JdbcUtil.executeSql(ds, sql, jdbcParamValues);
                 String dbQueryResult = gson.toJson(responseDto);
@@ -116,7 +109,6 @@ public class JdbcDemoController {
                 ResponseTemperatureDto responseTemperatureDto = gson.fromJson(dbQueryResult, ResponseTemperatureDto.class);
                 if (responseTemperatureDto.isSuccess() && responseTemperatureDto.getData() != null && responseTemperatureDto.getData().size() > 0) {
                     log.info(gson.toJson(responseTemperatureDto.getData().get(0)));
-
                     TemperatureDto dto = responseTemperatureDto.getData().get(0);
                     Temperature temperature = new Temperature();
                     temperature.setCreateDate(dto.getCreateDate());
@@ -131,7 +123,7 @@ public class JdbcDemoController {
                 }
             }
             return "数据库同步成功";
-        },customPool);
+        }, customPool);
 
         future.thenApply(result -> {
             System.out.println("Result: " + result);
@@ -157,6 +149,7 @@ public class JdbcDemoController {
 
     /**
      * 查询测试
+     *
      * @return
      */
     @RequestMapping("/api/getResult")
@@ -172,7 +165,7 @@ public class JdbcDemoController {
                 Thread.currentThread().interrupt(); // 重置中断状态
             }
             return "数据库同步成功";
-        },executorService);
+        }, executorService);
         //注意，如果需要异步返回结果，再做后续操作，需要加入join()方法等待异步计算结果后回调,不然异步没有处理完直接主线程结束
         future.thenApply(result -> {
             System.out.println("Result: " + result);
@@ -184,6 +177,7 @@ public class JdbcDemoController {
 
     /**
      * 查询测试
+     *
      * @return
      */
     @RequestMapping("/api/getResult0")
@@ -193,7 +187,7 @@ public class JdbcDemoController {
         String result = CompletableFuture.supplyAsync(() -> {
             System.out.println("Step 1: Generate number");
             return 42;
-        },executorService).thenApply(num -> {
+        }, executorService).thenApply(num -> {
             System.out.println("Step 2: Convert number to string");
             return "Number is: " + num;
         }).exceptionally(exception -> {
@@ -201,7 +195,7 @@ public class JdbcDemoController {
             return null;
         }).join();
 
-        if(TextUtils.isEmpty(result)){
+        if (TextUtils.isEmpty(result)) {
             return "数据库同步异常...";
         }
         System.out.println("数据库正在同步...");
diff --git a/src/main/java/com/rehome/mqttclienttemperature/controller/WeatherController.java b/src/main/java/com/rehome/mqttclienttemperature/controller/WeatherController.java
index 7481637..c159edc 100644
--- a/src/main/java/com/rehome/mqttclienttemperature/controller/WeatherController.java
+++ b/src/main/java/com/rehome/mqttclienttemperature/controller/WeatherController.java
@@ -157,7 +157,7 @@ public class WeatherController {
 				if(provinceDb==null){
 					WebServiceProvince province = new WebServiceProvince();
 					province.setProvinceName(provinceName);
-					//province.setCreateDate(nowDate);
+					province.setCreateDate(now);
 					province.setDataHour(nowHour);
 					province.setDataMinute(dataMinute);
 					province.setDataSecond(dataSecond);
@@ -196,7 +196,7 @@ public class WeatherController {
 							citySave.setCityName(cityNameCn);
 							citySave.setCityNameEn(cityNameEn);
 							citySave.setCode(cityCode);
-							//citySave.setCreateDate(now);
+							citySave.setCreateDate(now);
 							citySave.setDataHour(nowHour);
 							citySave.setDataMinute(dataMinute);
 							citySave.setDataSecond(dataSecond);
diff --git a/src/main/java/com/rehome/mqttclienttemperature/entity/WebServiceWeatherInfo.java b/src/main/java/com/rehome/mqttclienttemperature/entity/WebServiceWeatherInfo.java
index ddca184..2e3fd3e 100644
--- a/src/main/java/com/rehome/mqttclienttemperature/entity/WebServiceWeatherInfo.java
+++ b/src/main/java/com/rehome/mqttclienttemperature/entity/WebServiceWeatherInfo.java
@@ -5,7 +5,6 @@ import lombok.Data;
 import org.hibernate.annotations.Proxy;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
-
 import javax.persistence.*;
 import java.util.Date;
 
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 777b528..57f22ac 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -16,12 +16,15 @@ spring:
     #url: jdbc:mysql://192.168.3.7:3306/appserver?useUnicode=true&characterEncoding=utf-8&useSSL=false&autoReconnect=true
     #url: jdbc:mysql://192.168.3.7:3306/appserver?useUnicode=true&characterEncoding=utf-8&useSSL=false&autoReconnect=true
     #url: jdbc:mysql://192.168.1.24:3306/weather?useUnicode=true&characterEncoding=utf-8&useSSL=false&autoReconnect=true
+    #url: jdbc:mysql://192.168.3.24:3306/appserver?useUnicode=true&characterEncoding=utf-8&useSSL=false&autoReconnect=true
+    #url: jdbc:mysql://192.168.3.9:3306/appserver?useUnicode=true&characterEncoding=utf-8&useSSL=false&autoReconnect=true
+    #url: jdbc:mysql://192.168.1.24:3306/appserver?useUnicode=true&characterEncoding=utf-8&useSSL=false&autoReconnect=true
     #url: jdbc:mysql://47.242.184.139:3306/appserver?useUnicode=true&characterEncoding=utf-8&useSSL=false&autoReconnect=true
 #    driverClassName: com.mysql.cj.jdbc.Driver #com.mysql.cj.jdbc.Driver com.mysql.jdbc.Driver
 #    username: root
 #    password: Skyinno251,
     driverClassName: oracle.jdbc.driver.OracleDriver
-    url: jdbc:oracle:thin:@192.168.1.9:1521/orcl
+    url: jdbc:oracle:thin:@192.168.3.9:1521/orcl
     username: appserver
     password: appserver
   jpa: