From 6f3433551682ed596fe2c75ce0eb4181e550f053 Mon Sep 17 00:00:00 2001
From: SZH <szh_hello@163.com>
Date: 星期五, 16 九月 2022 14:47:30 +0800
Subject: [PATCH] 修改配置文件
---
safePlatfrom-out-web/src/main/resources/config/application.yaml | 2 +-
safePlatfrom-out-web/src/main/resources/config/application-dev.yaml | 6 ++++++
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/schedule/KeepAliveRobot.java | 6 +++---
3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/schedule/KeepAliveRobot.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/schedule/KeepAliveRobot.java
index 4e6e41e..37da8c6 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/schedule/KeepAliveRobot.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/schedule/KeepAliveRobot.java
@@ -1,6 +1,7 @@
package com.gkhy.safePlatform.targetDuty.schedule;
import com.gkhy.safePlatform.targetDuty.service.TargetTypeService;
+import com.gkhy.safePlatform.targetDuty.service.baseService.TargetTypeBaseService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.scheduling.annotation.EnableScheduling;
@@ -14,14 +15,13 @@
public class KeepAliveRobot {
@Autowired
- private TargetTypeService targetTypeService;
+ private TargetTypeBaseService targetTypeBaseService;
// 30m
@Scheduled(cron = "0 0/30 * * * ?")
public void keepAlive(){
//
-// targetTypeService.getById(-1L);
-
+ targetTypeBaseService.getById(1L);
}
}
diff --git a/safePlatfrom-out-web/src/main/resources/config/application-dev.yaml b/safePlatfrom-out-web/src/main/resources/config/application-dev.yaml
index 0023719..1f344b6 100644
--- a/safePlatfrom-out-web/src/main/resources/config/application-dev.yaml
+++ b/safePlatfrom-out-web/src/main/resources/config/application-dev.yaml
@@ -30,6 +30,12 @@
username: gkhy_dev_out_team
password: Adsdf675T6AC7yga
type: com.alibaba.druid.pool.DruidDataSource
+ equipment:
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ url: jdbc:mysql://192.168.0.52:3306/safeplatform.equipment.dev?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
+ username: gkhy_dev_out_team
+ password: Adsdf675T6AC7yga
+ type: com.alibaba.druid.pool.DruidDataSource
redis:
host: 192.168.0.52
port: 6379
diff --git a/safePlatfrom-out-web/src/main/resources/config/application.yaml b/safePlatfrom-out-web/src/main/resources/config/application.yaml
index 017f989..8f11917 100644
--- a/safePlatfrom-out-web/src/main/resources/config/application.yaml
+++ b/safePlatfrom-out-web/src/main/resources/config/application.yaml
@@ -2,7 +2,7 @@
application:
name: safeplatform-out
profiles:
- active: guotai-uat
+ active: dev
# active: guotai-demo
#### test uat guotai-demo guotai-uat
# active: test
--
Gitblit v1.9.2