From f6f7626221ee9c0475c519c40e292f85703ece5a Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期五, 23 八月 2024 11:38:11 +0800
Subject: [PATCH] data
---
iailab-module-data/iailab-module-data-biz/src/main/resources/application.yml | 36 ++++++++
iailab-module-data/iailab-module-data-biz/src/main/resources/application-test_rec.yml | 9 +-
iailab-module-data/iailab-module-data-biz/src/main/resources/application-dev.yml | 33 +------
iailab-module-data/iailab-module-data-biz/pom.xml | 106 ++++++++++++++------------
4 files changed, 101 insertions(+), 83 deletions(-)
diff --git a/iailab-module-data/iailab-module-data-biz/pom.xml b/iailab-module-data/iailab-module-data-biz/pom.xml
index 8221109..a55d2ee 100644
--- a/iailab-module-data/iailab-module-data-biz/pom.xml
+++ b/iailab-module-data/iailab-module-data-biz/pom.xml
@@ -22,52 +22,13 @@
<groupId>com.iailab</groupId>
<artifactId>iailab-common-env</artifactId>
</dependency>
- <!-- 消息队列相关 -->
- <dependency>
- <groupId>com.iailab</groupId>
- <artifactId>iailab-common-mq</artifactId>
- </dependency>
- <dependency>
- <groupId>com.iailab</groupId>
- <artifactId>iailab-common-mybatis</artifactId>
- </dependency>
- <dependency>
- <groupId>com.iailab</groupId>
- <artifactId>iailab-common-redis</artifactId>
- </dependency>
- <dependency>
- <groupId>com.iailab</groupId>
- <artifactId>iailab-common-excel</artifactId>
- </dependency>
- <dependency>
- <groupId>com.iailab</groupId>
- <artifactId>iailab-common-security</artifactId>
- </dependency>
- <!-- RPC 远程调用相关 -->
- <dependency>
- <groupId>com.iailab</groupId>
- <artifactId>iailab-common-rpc</artifactId>
- </dependency>
- <!-- 监控相关 -->
- <dependency>
- <groupId>com.iailab</groupId>
- <artifactId>iailab-common-monitor</artifactId>
- </dependency>
- <!-- Job 定时任务相关 -->
- <dependency>
- <groupId>com.iailab</groupId>
- <artifactId>iailab-common-biz-data-permission</artifactId>
- </dependency>
<dependency>
<groupId>com.iailab</groupId>
<artifactId>iailab-module-data-api</artifactId>
<version>${revision}</version>
</dependency>
- <dependency>
- <groupId>com.iailab</groupId>
- <artifactId>iailab-module-model-api</artifactId>
- <version>${revision}</version>
- </dependency>
+
+ <!-- 依赖服务 -->
<dependency>
<groupId>com.iailab</groupId>
<artifactId>iailab-module-infra-api</artifactId>
@@ -78,22 +39,75 @@
<artifactId>iailab-module-system-api</artifactId>
<version>${revision}</version>
</dependency>
+
+
+ <!-- 业务组件 -->
+ <dependency>
+ <groupId>com.iailab</groupId>
+ <artifactId>iailab-common-biz-data-permission</artifactId>
+ </dependency>
<dependency>
<groupId>com.iailab</groupId>
<artifactId>iailab-common-biz-tenant</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.iailab</groupId>
+ <artifactId>iailab-common-biz-ip</artifactId>
+ </dependency>
+
+ <!-- Web 相关 -->
+ <dependency>
+ <groupId>com.iailab</groupId>
+ <artifactId>iailab-common-security</artifactId>
+ </dependency>
+
+ <!-- DB 相关 -->
+ <dependency>
+ <groupId>com.iailab</groupId>
+ <artifactId>iailab-common-mybatis</artifactId>
+ </dependency>
+
+ <!-- RPC 远程调用相关 -->
+ <dependency>
+ <groupId>com.iailab</groupId>
+ <artifactId>iailab-common-rpc</artifactId>
+ </dependency>
+ <!-- 监控相关 -->
+ <dependency>
+ <groupId>com.iailab</groupId>
+ <artifactId>iailab-common-monitor</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.iailab</groupId>
+ <artifactId>iailab-common-biz-data-permission</artifactId>
+ </dependency>
+
<dependency>
<groupId>com.auth0</groupId>
<artifactId>java-jwt</artifactId>
<version>${java-jwt.version}</version>
</dependency>
- <!-- nacos 客户端 -->
+ <!-- Test 测试相关 -->
+ <dependency>
+ <groupId>com.iailab</groupId>
+ <artifactId>iailab-common-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- 工具类相关 -->
+ <dependency>
+ <groupId>com.iailab</groupId>
+ <artifactId>iailab-common-excel</artifactId>
+ </dependency>
+
+ <!-- Registry 注册中心相关 -->
<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
</dependency>
- <!-- nacos 配置中心 -->
+
+ <!-- Config 配置中心相关 -->
<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
@@ -178,12 +192,6 @@
<groupId>com.influxdb</groupId>
<artifactId>influxdb-client-java</artifactId>
<version>6.8.0</version>
- </dependency>
-
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter</artifactId>
- <scope>test</scope>
</dependency>
</dependencies>
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/resources/application-dev.yml b/iailab-module-data/iailab-module-data-biz/src/main/resources/application-dev.yml
index 64fcef7..41bbdf9 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/resources/application-dev.yml
+++ b/iailab-module-data/iailab-module-data-biz/src/main/resources/application-dev.yml
@@ -38,35 +38,16 @@
primary: master
datasource:
master:
- url: jdbc:mysql://127.0.0.1:3306/iailab_ntt_data?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
- # url: jdbc:mysql://127.0.0.1:3306/iailab-plat?useSSL=true&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai # MySQL Connector/J 5.X 连接的示例
- # url: jdbc:postgresql://127.0.0.1:5432/ruoyi-vue-pro # PostgreSQL 连接的示例
- # url: jdbc:oracle:thin:@127.0.0.1:1521:xe # Oracle 连接的示例
- # url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=ruoyi-vue-pro # SQLServer 连接的示例
- # url: jdbc:dm://10.211.55.4:5236?schema=RUOYI_VUE_PRO # DM 连接的示例
+ url: jdbc:mysql://127.0.0.1:3306/iailab_test_data?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
username: root
password: 123456
- # username: sa # SQL Server 连接的示例
- # password: JSm:g(*%lU4ZAkz06cd52KqT3)i1?H7W # SQL Server 连接的示例
- # username: SYSDBA # DM 连接的示例
- # password: SYSDBA # DM 连接的示例
- slave: # 模拟从库，可根据自己需要修改
- lazy: true # 开启懒加载，保证启动速度
- url: jdbc:mysql://127.0.0.1:3306/iailab_ntt_data?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
- username: root
- password: 123456
+
+ # Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优
redis:
- database: 0
- host: 127.0.0.1
- port: 6379
- password: '123456' # 密码（默认为空）
- timeout: 6000ms # 连接超时时长（毫秒）
- jedis:
- pool:
- max-active: 1000 # 连接池最大连接数（使用负值表示没有限制）
- max-wait: -1ms # 连接池最大阻塞等待时间（使用负值表示没有限制）
- max-idle: 10 # 连接池中的最大空闲连接
- min-idle: 5 # 连接池中的最小空闲连接
+ host: 127.0.0.1 # 地址
+ port: 6379 # 端口
+ database: 0 # 数据库索引
+ # password: 123456 # 密码，建议生产环境开启
oadp:
domain: http://172.16.1.148:6010
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/resources/application-test.yml b/iailab-module-data/iailab-module-data-biz/src/main/resources/application-test_rec.yml
similarity index 92%
rename from iailab-module-data/iailab-module-data-biz/src/main/resources/application-test.yml
rename to iailab-module-data/iailab-module-data-biz/src/main/resources/application-test_rec.yml
index a6bc3d9..5cb5172 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/resources/application-test.yml
+++ b/iailab-module-data/iailab-module-data-biz/src/main/resources/application-test_rec.yml
@@ -40,11 +40,10 @@
config:
multi-statement-allow: true
redis:
- database: 0
- host: 172.16.1.148
- port: 6379
- password: # 密码（默认为空）
- timeout: 6000ms # 连接超时时长（毫秒）
+ host: 172.16.8.100 # 地址
+ port: 6379 # 端口
+ database: 0 # 数据库索引
+ password: 123456 # 密码，建议生产环境开启
jedis:
pool:
max-active: 1000 # 连接池最大连接数（使用负值表示没有限制）
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/resources/application.yml b/iailab-module-data/iailab-module-data-biz/src/main/resources/application.yml
index a31e2cc..b0e8d5e 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/resources/application.yml
+++ b/iailab-module-data/iailab-module-data-biz/src/main/resources/application.yml
@@ -162,9 +162,39 @@
version: ${iailab.info.version}
base-package: ${iailab.info.base-package}
tenant: # 多租户相关配置项
- enable: false
-# ignore-urls:
-# ignore-tables:
+ enable: true
+ ignore-tables:
+ - qrtz_blob_triggers
+ - qrtz_calendars
+ - qrtz_cron_triggers
+ - qrtz_fired_triggers
+ - qrtz_job_details
+ - qrtz_locks
+ - qrtz_paused_trigger_grps
+ - qrtz_scheduler_state
+ - qrtz_simple_triggers
+ - qrtz_simprop_triggers
+ - qrtz_triggers
+ - schedule_job
+ - schedule_job_log
+ - t_channel_kio_device
+ - t_channel_kio_tag
+ - t_channel_modbus_device
+ - t_channel_modbus_tag
+ - t_channel_opcda_device
+ - t_channel_opcda_tag
+ - t_channel_opcua_device
+ - t_channel_opcua_tag
+ - t_da_math_point
+ - t_da_measure_point
+ - t_da_point
+ - t_da_point_value
+ - t_da_sequence_num
+ - t_http_api
+ - t_http_tag
+ - t_http_token
+ - t_ind_item
+ - t_ind_item_atom
app:
app-key: data
app-secret: 85b0df7edc3df3611913df34ed695011
--
Gitblit v1.9.3