FIX4.9

720yun_fd_consumer/gis_consumer/src/main/java/com/gis/entity/SceneQueueDTO.java

@@ -1,6 +1,8 @@
 package com.gis.entity;
 
 import com.amazonaws.services.dynamodbv2.xspec.S;
+import com.alibaba.fastjson.JSONObject;
+import com.google.gson.JsonObject;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.util.Date;
@@ -45,5 +47,9 @@ public class SceneQueueDTO {
 
     private String pwd;
 
+    @ApiModelProperty(value = "点位数量")
+    private Integer shootCount;
+
+    private JsonObject gps;
 
 }

720yun_fd_consumer/gis_consumer/src/main/resources/application-loc-site.yml

@@ -29,14 +29,14 @@ spring:
             max-wait: 60000
             min-evictable-idle-time-millis: 30000
             min-idle: 10
-            password: 4dkk2020test%
+            password: JK123456%JIK
             stat-view-servlet:
                 enabled: true
             test-on-borrow: false
             test-on-return: false
             test-while-idle: true
             time-between-eviction-runs-millis: 60000
-            url: jdbc:mysql://120.25.146.52:3306/720yun_fd_manage?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
+            url: jdbc:mysql://120.25.146.52:13306/720yun_fd_manage?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
             username: root
             validation-query: SELECT 1 FROM DUAL
             web-stat-filter:

720yun_fd_consumer/gis_consumer/src/main/resources/application-sit.yml

@@ -31,14 +31,14 @@ spring:
             max-wait: 60000
             min-evictable-idle-time-millis: 30000
             min-idle: 10
-            password: 4dkk2020test%
+            password: JK123456%JIK
             stat-view-servlet:
                 enabled: true
             test-on-borrow: false
             test-on-return: false
             test-while-idle: true
             time-between-eviction-runs-millis: 60000
-            url: jdbc:mysql://127.0.0.1:3306/720yun_fd_manage?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
+            url: jdbc:mysql://127.0.0.1:13306/720yun_fd_manage?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
             username: root
             validation-query: SELECT 1 FROM DUAL
             web-stat-filter:

720yun_fd_manage/gis_application/src/main/resources/application-locSit.yml

@@ -33,14 +33,14 @@ spring:
             max-wait: 60000
             min-evictable-idle-time-millis: 30000
             min-idle: 10
-            password: 4dkk2020test%
+            password: JK123456%JIK
             stat-view-servlet:
                 enabled: true
             test-on-borrow: false
             test-on-return: false
             test-while-idle: true
             time-between-eviction-runs-millis: 60000
-            url: jdbc:mysql://120.25.146.52:3306/${project.name}?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
+            url: jdbc:mysql://120.25.146.52:13306/${project.name}?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
             username: root
             validation-query: SELECT 1 FROM DUAL
             web-stat-filter:

720yun_fd_manage/gis_application/src/main/resources/application-sit.yml

@@ -33,14 +33,14 @@ spring:
             max-wait: 60000
             min-evictable-idle-time-millis: 30000
             min-idle: 10
-            password: 4dkk2020test%
+            password: JK123456%JIK
             stat-view-servlet:
                 enabled: true
             test-on-borrow: false
             test-on-return: false
             test-while-idle: true
             time-between-eviction-runs-millis: 60000
-            url: jdbc:mysql://127.0.0.1:3306/${project.name}?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
+            url: jdbc:mysql://127.0.0.1:13306/${project.name}?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
             username: root
             validation-query: SELECT 1 FROM DUAL
             web-stat-filter: