fanxp 1 year ago
parent
commit
5e9e5ea766

+ 2 - 2
docker-compose.yml

@@ -8,8 +8,8 @@ services:
     image: registry.yingcaibx.com/tl/api:latest
     restart: always
     container_name: tl_api
-#    environment:
-#      - SPRING_DATASOURCE_DYNAMIC_DATASOURCE_MASTER_URL=jdbc:mysql://172.28.175.70:3306/tl?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
+    environment:
+      - SPRING_DATASOURCE_DYNAMIC_DATASOURCE_MASTER_URL=jdbc:mysql://172.28.175.70:3306/tl?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
 #      - MQTT-SERVER=tcp://172.28.175.70:1883
     networks:
       - docker_networks_default

+ 1 - 1
src/main/resources/application-dev.yml

@@ -19,7 +19,7 @@ spring:
     host: 8.142.26.206
     port: 6379
     password: wa3re~86Hu&ifniyM   # 密码(默认为空)
-    timeout: 6000ms  # 连接超时时长(毫秒)
+    timeout: 36000ms  # 连接超时时长(毫秒)
     jedis:
       pool:
         max-active: 1000  # 连接池最大连接数(使用负值表示没有限制)

+ 1 - 1
src/main/resources/application.yml

@@ -5,7 +5,7 @@ server:
 spring:
   # 环境 dev|test|prod
   profiles:
-    active: prod
+    active: dev
   # jackson时间格式化
   jackson:
     time-zone: GMT+8