diff --git a/data-framework/pom.xml b/data-framework/pom.xml index a60d417..1dbba33 100644 --- a/data-framework/pom.xml +++ b/data-framework/pom.xml @@ -10,23 +10,6 @@ data-framework - - - - - - org.springframework.integration - spring-integration-mqtt - 6.4.1 - - - org.json - json - 20240303 - - - - - + framework \ No newline at end of file diff --git a/data-storage/src/main/resources/application.yml b/data-storage/src/main/resources/application-dev.yaml similarity index 89% rename from data-storage/src/main/resources/application.yml rename to data-storage/src/main/resources/application-dev.yaml index 700c028..9a7071a 100644 --- a/data-storage/src/main/resources/application.yml +++ b/data-storage/src/main/resources/application-dev.yaml @@ -1,6 +1,3 @@ - -server: - port: 8088 spring: application: name: iot-data-bridge @@ -14,7 +11,7 @@ spring: mybatis: mapper-locations: classpath:com/huaxing/**/mapper/*.xml - type-aliases-package: com.huaxing.data.storage.entity + type-aliases-package: com.huaxing.**.entity configuration: map-underscore-to-camel-case: true sql-session-factory: diff --git a/data-storage/src/main/resources/application-prod.yaml b/data-storage/src/main/resources/application-prod.yaml new file mode 100644 index 0000000..9a7071a --- /dev/null +++ b/data-storage/src/main/resources/application-prod.yaml @@ -0,0 +1,45 @@ +spring: + application: + name: iot-data-bridge + datasource: + url: jdbc:dolphindb://localhost:8848?databasePath=dfs://ZbDB + username: admin + password: 123456 + driver-class-name: com.dolphindb.jdbc.Driver + main: + lazy-initialization: false + +mybatis: + mapper-locations: classpath:com/huaxing/**/mapper/*.xml + type-aliases-package: com.huaxing.**.entity + configuration: + map-underscore-to-camel-case: true + sql-session-factory: + data-source: ${spring.datasource} + sql-session-template: + executor-type: BATCH + sql-session-factory-ref: sqlSessionFactory + +mqtt: + username: admin + password: 123456 + host-url: tcp://8.130.65.74:1883 + client-id: iot + timeout: 100 + keepalive: 100 + completion-timeout: 5000 + qos: 1 + default-topic: iot/data/# + topics: + - iot/test1/# + - iot/test2/# + +dolphindb: + db-path: dfs://ZbDB + host: 127.0.0.1 + port: 8848 + username: admin + password: 123456 + init-pool-size: 10 + minimum-pool-size: 5 + enable-high-availability: false \ No newline at end of file diff --git a/data-storage/src/main/resources/application.yaml b/data-storage/src/main/resources/application.yaml new file mode 100644 index 0000000..6213e80 --- /dev/null +++ b/data-storage/src/main/resources/application.yaml @@ -0,0 +1,5 @@ +server: + port: 8088 +spring: + profiles: + active: dev \ No newline at end of file diff --git a/pom.xml b/pom.xml index 51e2698..297ba4a 100644 --- a/pom.xml +++ b/pom.xml @@ -16,6 +16,14 @@ + + + + org.json + json + 20240303 + + org.projectlombok lombok @@ -55,6 +63,7 @@ mybatis 3.5.17 + org.mybatis mybatis-spring @@ -73,6 +82,30 @@ dolphindb-javaapi 3.00.2.3 + + + + org.apache.cassandra + cassandra-all + 0.8.1 + + + + org.slf4j + slf4j-log4j12 + + + log4j + log4j + + + + + + org.springframework.integration + spring-integration-mqtt + 6.4.1 +