diff --git a/docker-compose.yml b/docker-compose.yml
index e7c7278..77322fc 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,6 +1,7 @@
version: '3'
networks:
- tsg-bridge:
+ tsg_tsg-bridge:
+ external: true
driver: bridge
services:
hsz-redis:
@@ -12,7 +13,7 @@ services:
ports:
- 6369:6379
networks:
- - tsg-bridge
+ - tsg_tsg-bridge
volumes:
- /opt/hsz/redis/conf/redis.conf:/usr/local/etc/redis/conf/redis.conf
- /opt/hsz/redis/data:/data
@@ -23,7 +24,7 @@ services:
image: openjdk:21
working_dir: /app
networks:
- - tsg-bridge
+ - tsg_tsg-bridge
volumes:
- /opt/hsz/java:/app
ports:
@@ -40,7 +41,7 @@ services:
image: openjdk:21
working_dir: /app
networks:
- - tsg-bridge
+ - tsg_tsg-bridge
volumes:
- /opt/hsz/datasync:/app
environment:
diff --git a/service-datasync/pom.xml b/service-datasync/pom.xml
index d548401..6484e65 100644
--- a/service-datasync/pom.xml
+++ b/service-datasync/pom.xml
@@ -35,11 +35,32 @@
com.baomidou
- mybatis-plus
+ mybatis-plus-spring-boot3-starter
org.postgresql
postgresql
+
+
+
+ org.apache.maven.plugins
+ maven-dependency-plugin
+
+
+ org.apache.maven.plugins
+ maven-jar-plugin
+
+
+
+ true
+ lib/
+ com.gunshi.project.hsz.datasync.Main
+
+
+
+
+
+
\ No newline at end of file
diff --git a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/Main.java b/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/Main.java
index 89a6ea0..152aa40 100644
--- a/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/Main.java
+++ b/service-datasync/src/main/java/com/gunshi/project/hsz/datasync/Main.java
@@ -11,12 +11,12 @@ import org.springframework.scheduling.annotation.EnableScheduling;
@SpringBootApplication
@EnableScheduling
@MapperScan({
- "com.gunshi.project.hsz.datasync.config",
- "com.gunshi.project.hsz.datasync.flow",
- "com.gunshi.project.hsz.datasync.gnss",
- "com.gunshi.project.hsz.datasync.rainfall",
- "com.gunshi.project.hsz.datasync.seepage",
- "com.gunshi.project.hsz.datasync.waterLevel",
+ "com.gunshi.project.hsz.datasync.flow.**.datasource",
+ "com.gunshi.project.hsz.datasync.gnss.**.datasource",
+ "com.gunshi.project.hsz.datasync.rainfall.**.datasource",
+ "com.gunshi.project.hsz.datasync.seepage.**.datasource",
+ "com.gunshi.project.hsz.datasync.waterLevel.**.datasource",
+ "com.gunshi.**.mapper"
})
public class Main {
diff --git a/service-datasync/src/main/resources/application.yml b/service-datasync/src/main/resources/application.yml
index f792c45..4a0ecb2 100644
--- a/service-datasync/src/main/resources/application.yml
+++ b/service-datasync/src/main/resources/application.yml
@@ -11,8 +11,6 @@ mybatis-plus:
update-strategy: always
spring:
- profiles:
- active: prod
datasource:
dynamic:
primary: master
@@ -30,4 +28,10 @@ spring:
hikari:
maximum-pool-size: 20
minimum-idle: 5
- connection-timeout: 30000
\ No newline at end of file
+ connection-timeout: 30000
+ data:
+ redis:
+ host: hsz-redis
+ port: 6379
+ #password: 1234567a
+ database: 4
\ No newline at end of file