diff --git a/docker-compose.yml b/docker-compose.yml index 4099fc4..34ee134 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,14 +1,14 @@ services: xyt: image: openjdk:21 - container_name: xyt - restart: always + container_name: tsg + restart: no network_mode: host volumes: - /root/gunshiApp/xyt:/app - /etc/localtime:/etc/localtime:ro - /etc/timezone:/etc/timezone:ro environment: - - SPRING_PROFILES_ACTIVE=prod + - SPRING_PROFILES_ACTIVE=dev - TZ=Asia/Shanghai command: java -jar /app/gunshi-project-xyt-1.0-SNAPSHOT.jar \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/xyt/timetask/DataTaskTSG.java b/src/main/java/com/gunshi/project/xyt/timetask/DataTaskTSG.java index 631a0ff..7288ecc 100644 --- a/src/main/java/com/gunshi/project/xyt/timetask/DataTaskTSG.java +++ b/src/main/java/com/gunshi/project/xyt/timetask/DataTaskTSG.java @@ -57,7 +57,7 @@ import java.util.stream.Collectors; @EnableScheduling//开启定时任务 @Component @Slf4j -// @Profile("prod") + @Profile({"prod","dev"}) public class DataTaskTSG { private static SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); diff --git a/src/main/java/com/gunshi/project/xyt/timetask/PaDataTask.java b/src/main/java/com/gunshi/project/xyt/timetask/PaDataTask.java index 279f883..8b24482 100644 --- a/src/main/java/com/gunshi/project/xyt/timetask/PaDataTask.java +++ b/src/main/java/com/gunshi/project/xyt/timetask/PaDataTask.java @@ -45,7 +45,7 @@ import java.util.stream.Collectors; @EnableScheduling//开启定时任务 @Component @Slf4j -//@Profile("prod") +@Profile({"prod","dev"}) public class PaDataTask { private static SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 8bf20e6..cc545ce 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -2,5 +2,5 @@ spring: config: import: - config-common.yml - - config-dev.yml + - config-local.yml - config-ruoyi.yml \ No newline at end of file diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml new file mode 100644 index 0000000..8bf20e6 --- /dev/null +++ b/src/main/resources/application-local.yml @@ -0,0 +1,6 @@ +spring: + config: + import: + - config-common.yml + - config-dev.yml + - config-ruoyi.yml \ No newline at end of file diff --git a/src/main/resources/config-local.yml b/src/main/resources/config-local.yml new file mode 100644 index 0000000..bf2479e --- /dev/null +++ b/src/main/resources/config-local.yml @@ -0,0 +1,45 @@ +spring: + profiles: + active: dev + datasource: + dynamic: + datasource: + master: + url: jdbc:postgresql://10.0.41.112:5432/tanshugang?stringtype=unspecified + username: gunshiiot + password: 1234567a + driver-class-name: org.postgresql.Driver + access-logging: + url: jdbc:postgresql://10.0.41.112:5432/tanshugang + username: gunshiiot + password: 1234567a + driver-class-name: org.postgresql.Driver + data: + redis: + host: 10.0.41.112 + port: 6379 + password: 1234567a + database: 4 +mybatis-plus: + configuration: + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl + +gunshi: + file: + key: 6gaWRs4bz4mxpXXxgZF4 + secret: 3QFbff974hVwpH6laAondq33iShpzs6YG4XsrTRT + endpoint: http://223.75.53.141:9100 + publicBucket: gs-tsg + loginBucket: gs-tsg + privateBucket: gs-tsg + +# 洪水预测数据库连接信息 +algorithem: + datasource: + url: jdbc:postgresql://10.0.41.112:5432/tanshugang?stringtype=unspecified + username: gunshiiot + password: 1234567a + driver-class-name: org.postgresql.Driver + +jcskPath: http://223.75.53.124:8002/shareddata/api/v1/monitdata +jcskToken: FB1EE57468E0CB9A51306F9056A534778235BF27CBDCB8546B7EABA6FB72BBCBEE4BB01A9CBD8C3899E682C67167C02D81FDABD21639DE2655EB4EE567391899 \ No newline at end of file