Merge branch 'master' into feature/tsjb-1.0

src/main/java/com/biutag/supervision/job/Job.java

@@ -103,7 +103,7 @@ public class Job {
     /**
      * 凌晨1点执行
      */
-    @Scheduled(cron = "0 0 1 * * ?")
+//    @Scheduled(cron = "0 0 1 * * ?")
     public void mailbox() {
         mailService.saveMailbox();
     }

src/main/resources/application-dev.yml

@@ -37,9 +37,15 @@ spring:
 #          username: alphay
 #          password: alphay@123
           driver-class-name: org.postgresql.Driver
-          url: jdbc:postgresql://59.173.13.131:10642/mailbox?currentSchema=mailbox
-          username: root
-          password: 123456
+          url: jdbc:postgresql://172.31.217.20:30924/mailbox?currentSchema=mailbox
+          username: pg
+          password: ip12341234
+
+#          driver-class-name: org.postgresql.Driver
+#          url: jdbc:postgresql://59.173.13.131:10642/mailbox?currentSchema=mailbox
+#          username: root
+#          password: 123456
+
         wvp:
           type: com.alibaba.druid.pool.DruidDataSource
           driver-class-name: com.mysql.cj.jdbc.Driver
@@ -71,9 +77,9 @@ spring:
           password: ip12341234
   data:
     redis:
-      host: 172.31.217.20
+      host: localhost
       # 端口，默认为6379
-      port: 31707
+      port: 6379
       # 数据库索引
       database: 1
       # 连接超时时间