修改influxdb，redis配置

src/main/java/com/example/tdl/config/ScheduleConfig.java

@@ -16,6 +16,7 @@ import org.influxdb.dto.QueryResult;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.influxdb.InfluxDBTemplate;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
@@ -52,7 +53,9 @@ public class ScheduleConfig {
     @Autowired
     private InfluxDBTemplate influxDBTemplate;
 
-    private final static String database ="original";
+
+    @Value("${spring.influxdb.database}")
+    private  static String database ;
 
     List<Object> head = new ArrayList<Object>(){{
         add("时间");

src/main/java/com/example/tdl/web/AlarmDataController.java

@@ -21,6 +21,7 @@ import org.apache.shiro.SecurityUtils;
 import org.influxdb.dto.Query;
 import org.influxdb.dto.QueryResult;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.influxdb.InfluxDBTemplate;
 import org.springframework.web.bind.annotation.*;
 
@@ -52,7 +53,9 @@ public class AlarmDataController {
     @Autowired
     private TokenRedisService tokenRedisService;
 
-    private final static String database ="original";
+
+    @Value("${spring.influxdb.database}")
+    private  static String database ;
 
     @ApiImplicitParams({
         @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),

src/main/java/com/example/tdl/web/AlarmLogController.java

@@ -64,7 +64,9 @@ public class AlarmLogController {
     @Autowired
     private WarehouseAlarmLogService warehouseAlarmLogService;
 
-    private final static String database ="original";
+
+    @Value("${spring.influxdb.database}")
+    private  static String database ;
 
     @Value("${mqtt.userName}")
     private String userName;

src/main/java/com/example/tdl/web/CircuitController.java

@@ -21,6 +21,7 @@ import org.influxdb.dto.QueryResult;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.influxdb.InfluxDBTemplate;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -98,7 +99,8 @@ public class CircuitController {
     @Autowired
     private TopicConfigService topicConfigService;
 
-    private final static String database ="original";
+    @Value("${spring.influxdb.database}")
+    private  static String database ;
 
     //获取本公司的线路信息
     @ApiOperation(value = "获取本公司的线路信息",notes = "获取本公司的线路信息，返回值说明：" +

src/main/java/com/example/tdl/web/DataController.java

@@ -30,6 +30,7 @@ import org.influxdb.dto.QueryResult;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
@@ -83,7 +84,8 @@ public class DataController {
     @Autowired
     private I18nController i18n;
 
-    private final static String database = "original";
+    @Value("${spring.influxdb.database}")
+    private  static String database ;
 
     private List<String> list = new ArrayList<String>() {{
         add("\"T\"");

src/main/java/com/example/tdl/web/DownloadController.java

@@ -22,6 +22,7 @@ import org.influxdb.dto.QueryResult;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.influxdb.InfluxDBTemplate;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -61,7 +62,8 @@ public class DownloadController {
     @Autowired
     private TDLLogService tdlLogService;
 
-    private final static String database ="original";
+    @Value("${spring.influxdb.database}")
+    private  static String database ;
 
     @ApiOperation(value = "仓库数据下载",notes = "仓库数据下载")
     @ApiImplicitParams({

src/main/java/com/example/tdl/web/HomePageController.java

@@ -19,6 +19,7 @@ import org.influxdb.dto.QueryResult;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.influxdb.InfluxDBTemplate;
 import org.springframework.web.bind.annotation.*;
 
@@ -65,7 +66,8 @@ public class HomePageController {
     @Autowired
     private WarehouseAlarmLogService warehouseAlarmLogService;
 
-    private final static String database ="original";
+    @Value("${spring.influxdb.database}")
+    private  static String database ;
 
     @Autowired
     private I18nController  i18n;

src/main/java/com/example/tdl/web/WarehouseController.java

@@ -26,6 +26,7 @@ import org.influxdb.dto.QueryResult;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.influxdb.InfluxDBTemplate;
 import org.springframework.expression.spel.ast.NullLiteral;
 import org.springframework.web.bind.annotation.*;
@@ -84,7 +85,10 @@ public class WarehouseController {
     @Autowired
     private WarehouseAlarmLogService  warehouseAlarmLogService;
 
-    private final static String database ="original";
+
+
+    @Value("${spring.influxdb.database}")
+    private  static String database ;
 
 
 

src/main/resources/application-docker.properties

@@ -9,12 +9,14 @@ tdl.core.add =http://logistics-core:8079/witium/addMount
 tdl.core.delete =http://logistics-core:8079/witium/delMount
 
 
-tdl.redis.host = witcloud-redis
+tdl.redis.host = logistics-redis
+tdl.redis.password=Witium37774020
 
 server.port=8092
 
 # InfluxDB
-spring.influxdb.url=http://witcloud-influxdb:8086
+spring.influxdb.url=http://ts-bp1q738i505oj79t7.influxdata.tsdb.aliyuncs.com:8086
+spring.influxdb.database=logistics
 
 tdl.mqtt.url = ssl://47.96.128.181
 tdl.mqtt.port = 8883

src/main/resources/application.properties

@@ -7,8 +7,6 @@ spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 threadpool.corepoolsize = 30
 threadpool.maxpoolsize = 50
 
-
-
 server.port=8092
 management.security.enabled=false
 
@@ -56,8 +54,6 @@ tdl.mqtt.clientpwd =
 spring.influxdb.username=admin
 spring.influxdb.password=37774020
 spring.influxdb.url=http://47.97.184.225:8086
-#spring.influxdb.url=http://47.110.153.44:8086
-#spring.influxdb.url=http://172.16.1.24:8086
 spring.influxdb.database=original
 spring.influxdb.retentionPolicy = tdl_policy
 spring.influxdb.connent-timeout=10