0.7.2

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.daxiang</groupId>
     <artifactId>server</artifactId>
-    <version>0.7.1</version>
+    <version>0.7.2</version>
     <packaging>jar</packaging>
 
     <properties>
@@ -18,15 +18,15 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.0.0.RELEASE</version>
+        <version>2.1.4.RELEASE</version>
         <relativePath/>
     </parent>
 
     <dependencies>
         <dependency>
             <groupId>de.codecentric</groupId>
             <artifactId>spring-boot-admin-starter-server</artifactId>
-            <version>2.0.0</version>
+            <version>2.1.6</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -98,4 +98,4 @@
         </plugins>
     </build>
 
-</project>
+</project>

src/main/java/com/daxiang/model/vo/AgentVo.java

@@ -12,6 +12,7 @@
  */
 @Data
 public class AgentVo {
+    private String instanceId;
     private String ip;
     private Integer port;
     private String osName;

src/main/java/com/daxiang/service/AgentService.java

@@ -72,6 +72,7 @@ private AgentVo createAgentVoWithoutDevices(Instance agent) {
         }
 
         AgentVo agentVo = new AgentVo();
+        agentVo.setInstanceId(agent.getId().getValue());
         agentVo.setIp(uri.getHost());
         agentVo.setPort(uri.getPort());
 

src/main/resources/application-dev.properties

@@ -5,11 +5,11 @@ server.port=8887
 db-url=127.0.0.1:3306/daxiang
 db-username=root
 db-password=root
-spring.datasource.url=jdbc:mysql://${db-url}?characterEncoding=utf-8&useSSL=false
+spring.datasource.url=jdbc:mysql://${db-url}?characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8
 spring.datasource.username=${db-username}
 spring.datasource.password=${db-password}
-spring.datasource.driver-class-name=com.mysql.jdbc.Driver
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 
 #mybatis日志打印
 #logging.level.com.daxiang.mbg.mapper=debug
-#logging.level.com.daxiang.dao=debug
+#logging.level.com.daxiang.dao=debug