Commit Graph
1506 Commits
Author SHA1 Message Date
Vickey fa9f033b4e ci(docker): update tag trigger from dc3.release.* to dc3.develop.*
This change aligns the CI workflow with the current development branch naming convention, ensuring that the Docker image is built and pushed for development tags.
dc3.develop.20250508.01 dc3.develop.20250508.00
2025-05-08 21:59:50 +08:00
Vickey 9455aa2815 refactor: replace LocalDateTime.now() with LocalDateTimeUtil.now() for consistency
Refactored multiple files to use LocalDateTimeUtil.now() instead of LocalDateTime.now(). This ensures consistent timezone handling across the application by leveraging the centralized utility method.
2025-05-08 21:58:38 +08:00
Vickey 721a642e3e Revert "feat: 调整时间类型"
This reverts commit 1b0dd81d8a.
2025-05-08 21:35:04 +08:00
Vickey b4321b0452 feat: . 2025-05-08 16:55:24 +08:00
Vickey 1b0dd81d8a feat: 调整时间类型 2025-05-07 22:06:23 +08:00
Vickey 4db89d7d42 feat: 调整表结构 2025-05-07 21:54:43 +08:00
Vickey bf9a1b233f chore: add podman scripts for aliyun services and update logback config
Add new podman scripts for running database, Grafana, and Elasticsearch services on Aliyun. Update logback configuration to remove traceId and spanId from log patterns. Delete outdated run_elasticsearch.sh script as it is no longer needed.
2025-05-07 19:25:51 +08:00
pnoker 8970729453 refactor: update APM service port to 9300 and remove exposed port 8200
The APM service port has been updated from 8200 to 9300 across all Dockerfiles to align with the new configuration. Additionally, the exposed port 8200 has been removed from the docker-compose files as it is no longer needed. This change ensures consistency and reduces unnecessary port exposure.
2025-05-07 15:40:10 +08:00
pnoker 39cbf38797 fix: correct file paths and add GC logging configuration
This commit fixes incorrect file paths in README.md and application.yml files, ensuring consistency in naming conventions. Additionally, it adds GC logging configuration to Dockerfiles across multiple modules to enable detailed garbage collection logging for better debugging and performance monitoring.
2025-05-07 15:27:28 +08:00
pnoker 16f1bc40e3 refactor(Dockerfile): reorder JAVA_OPS flags for consistency
The `-XX:+UseG1GC` and `-Djava.security.egd=file:/dev/./urandom` flags in the `JAVA_OPS` environment variable were reordered across multiple Dockerfiles to maintain a consistent configuration. This change improves readability and ensures uniformity in the application's runtime settings.
2025-05-07 11:34:57 +08:00
Vickey 18b0fb079d feat: 在Dockerfile和docker-compose文件中添加APM相关配置
为了支持应用性能监控(APM),在多个Dockerfile和docker-compose配置文件中添加了APM相关的环境变量,包括`APM_AGENT_ENABLE`和`APM_SERVICE`。同时,在docker-compose文件中新增了`dc3-apm`服务,以支持APM功能。
dc3.release.20250506.01
2025-05-06 21:19:03 +08:00
Vickey fcaa8fab4f perf: 将JVM最大内存从1024m调整为512m
为了优化内存使用,减少不必要的内存分配,将JVM最大内存配置从1024m降低至512m。此更改适用于所有相关的Dockerfile和JVM配置文件。
2025-05-06 17:10:56 +08:00
Vickey bf0472fabf refactor(config): 更新测试环境配置文件以优化模块配置
移除dc3-center-auth中不必要的配置项,并将相关配置迁移到dc3-center-single中,以简化模块依赖并提高配置清晰度
2025-05-06 17:06:44 +08:00
Vickey 3a4af6d2ea refactor(config): 更新测试环境配置文件以支持更多服务
更新了 `application-test.yml` 配置文件,添加了 RabbitMQ、MongoDB、gRPC 和 MQTT 的配置项,以便在测试环境中支持这些服务。同时,修复了 PostgreSQL 数据库 schema 的配置错误。
2025-05-06 17:00:51 +08:00
Vickey 1ec1e2d603 fix: 修正测试环境数据库连接URL中的数据库名称
将application-test.yml中的数据库名称从dc3_auth更正为dc3,以确保测试环境正确连接到指定的数据库。
2025-05-06 16:58:23 +08:00
Vickey 41d6a3897a refactor: 使用环境变量替换硬编码的URI
将`application-test.yml`中的硬编码URI替换为环境变量,以提高配置的灵活性和可维护性。移除不再使用的`ekuiper_route`路由配置。
2025-05-06 16:57:12 +08:00
Vickey a00817659d chore: 将所有Dockerfile和docker-compose文件中的NODE_ENV从dev更改为test
为了统一测试环境,将所有Dockerfile和docker-compose文件中的NODE_ENV环境变量从dev更改为test,以确保在测试阶段使用一致的配置。
2025-05-06 16:55:20 +08:00
Vickey 41a9f3ba05 refactor: 移除Dockerfile中的${PARAMS}参数
为了简化Docker容器的启动命令,移除了所有Dockerfile中的${PARAMS}参数。这一改动不会影响容器的运行,因为参数可以通过其他方式传递。
2025-05-06 14:58:34 +08:00
Vickey 05b40b2260 fix: 修正Dockerfile中ENTRYPOINT的路径问题
修复了多个Dockerfile中ENTRYPOINT的路径问题,将`entrypoint.sh`改为`./entrypoint.sh`,以确保容器启动时能够正确找到并执行脚本
2025-05-06 14:43:46 +08:00
Vickey 2a93dcff85 refactor(Dockerfile): 修改多个Dockerfile以使用entrypoint.sh
统一使用entrypoint.sh作为容器入口,增强启动流程的可维护性和一致性
2025-05-06 14:23:52 +08:00
Vickey bafbc3e13f feat: 调整日志 dc3.release.20250506.00 2025-05-06 01:11:46 +08:00
Vickey e654ff7e52 feat: 调整类 2025-05-05 17:25:44 +08:00
pnoker 27a54faa76 build: add logstash-logback dependency and update logging configuration
Add Logstash Logback dependency to enable JSON logging and update the logback.xml configuration to include a JSON encoder. Also, update the CI workflow to cache Maven packages and improve build performance by disabling transfer progress.
dc3.release.20250430.02
2025-04-30 16:27:02 +08:00
pnoker c5072a5fbd refactor(Dockerfile): remove GC logging configuration to simplify container startup
The GC_LOG environment variable and its usage in the CMD instruction have been removed from all Dockerfiles to streamline the container startup process. This change reduces complexity and aligns with a simplified logging strategy.

Additionally, the docker-compose-elasticsearch.yml and docker-compose-elasticsearch-aliyun.yml files have been updated to reorder services, add Java options for Elasticsearch and Logstash, and ensure proper service dependencies.
dc3.release.20250430.01
2025-04-30 15:17:25 +08:00
pnoker 8f94beb9d8 refactor: improve code formatting and configuration
- Consolidate SQL query formatting in DeviceStatusHistoryMapper.xml and DriverStatusHistoryMapper.xml
- Update application.yml with undertow access log configuration
- Enhance readability of descriptions in pom.xml files
dc3.release.20250430.00
2025-04-30 10:52:30 +08:00
pnoker a1a011e4ec refactor(Dockerfile): reorder commands for better logical flow
Reordered the `WORKDIR` and `RUN` commands in multiple Dockerfiles to ensure a more logical and consistent structure. This improves readability and maintainability of the Dockerfiles.
2025-04-30 10:43:07 +08:00
pnoker aebebfc6cc ci: add docker-compose files for Elasticsearch setup
Added two docker-compose files to configure Elasticsearch, Kibana, and Logstash services. The first file is for a standard setup, while the second is tailored for Aliyun's container registry. This change facilitates easier deployment and testing of the Elasticsearch stack in different environments.
2025-04-29 22:08:49 +08:00
pnoker 30fd92df07 docs: update module descriptions in pom.xml files for clarity
Updated the descriptions in the pom.xml files for various DC3 platform modules to provide clearer and more detailed explanations of their functionalities. This improves the understanding of each module's purpose and capabilities.
dc3.release.20250427.11
2025-04-27 21:51:08 +08:00
pnoker aefd0c9dcb refactor(data): restructure MongoDB configuration and repository service
Restructured MongoDB configuration and repository service to improve maintainability and clarity. Updated dependency management, added new MongoDB-specific classes, and corrected configuration files. This refactor ensures better organization and alignment with the project's architecture.
2025-04-27 21:36:10 +08:00
pnoker c9d275de8f refactor(data-storage): replace InfluxDB with MongoDB for point value storage
This commit replaces InfluxDB with MongoDB as the primary storage solution for point values. The changes include:
- Removal of all InfluxDB-related code, including configuration, entities, and repository implementation
- Addition of MongoDB configuration, entities, and repository service
- Implementation of MongoDB-specific indexing and query operations for point value storage and retrieval
- Update of Spring configuration and factory patterns to support MongoDB integration

The migration to MongoDB provides better scalability and flexibility for handling point value data in the IoT DC3 platform.
2025-04-27 21:35:48 +08:00
pnoker 8a81ed6a98 feat(docker): add redis-exporter service to docker-compose
This commit introduces the redis-exporter service to the docker-compose-grafana-aliyun.yml file, enabling Redis monitoring within the DC3 environment. The service is configured with the necessary logging and network settings to ensure seamless integration.
dc3.release.20250427.10
2025-04-27 16:20:18 +08:00
pnoker 575759200b ci: add Redis service to docker-compose files
Added Redis service configuration to both docker-compose-optional.yml and docker-compose-optional-aliyun.yml. This change ensures Redis is available as part of the Docker setup, supporting the application's caching and data storage needs.
2025-04-27 15:45:22 +08:00
pnoker 538a3d4f3f fix(docker): correct COPY command in Dockerfile
The COPY command was missing the 'COPY' keyword, which caused the Dockerfile to be invalid. This fix ensures the Docker image can be built correctly.
dc3.release.20250427.08
2025-04-27 14:43:25 +08:00
pnoker c727174c48 ci: update Dockerfile paths in CI workflow for multi-service builds
The Dockerfile paths in the CI workflow were updated to use the correct service-specific paths instead of the default `./Dockerfile`. This ensures that the correct Dockerfile is used for each service during the build process, avoiding potential errors in multi-service builds.
dc3.release.20250427.07
2025-04-27 14:34:01 +08:00
pnoker 131922849b refactor: remove TDEngine-related files and configurations
Removed TDEngine-related files, configurations, and dependencies to streamline the codebase and improve maintainability. This includes deleting TDEngine-specific classes, YAML files, Mapper XML, and removing TDEngine references from the POM files and constant classes. Additionally, updated the Docker CI workflow to ensure consistency.
dc3.release.20250427.05 dc3.release.20250427.06
2025-04-27 14:20:38 +08:00
pnoker 63ecedea4c refactor: simplify COPY paths in Dockerfiles and fix CI workflow
This commit simplifies the COPY paths in multiple Dockerfiles to use a more consistent and concise format. Additionally, it fixes a typo in the CI workflow and updates the context paths for Docker builds to ensure proper execution.
dc3.release.20250427.04
2025-04-27 14:05:55 +08:00
pnoker b20120e2aa ci: fix incorrect variable reference in docker-ci.yml
The commit corrects the variable reference from `steps.version.outputs.varsiables.version` to `steps.varsiables.outputs.version` in the Docker image tagging process. This ensures the correct version is used for tagging images across all services.
dc3.release.20250427.02 dc3.release.20250427.03
2025-04-27 11:11:52 +08:00
pnoker 4507e26681 ci(docker-ci): update JDK setup and fix version variable references
Update the JDK setup step to use `actions/setup-java@v4` with the Liberica distribution. Fix the version variable references in docker image tags to correctly use `steps.version.outputs.varsiables.version` instead of `steps.version.outputs.varsiables`.
dc3.release.20250427.01
2025-04-27 11:06:15 +08:00
pnoker 5141bf4bce ci: remove build cache configuration from docker-ci.yml
The build cache configuration (`cache-from` and `cache-to`) has been removed to simplify the Docker build process and reduce dependency on external cache registries. This change aims to streamline the CI workflow and improve build reliability.
dc3.release.20250427.00
2025-04-27 10:51:08 +08:00
pnoker c7fdc2fecb ci(docker-ci): reorder and update CI workflow steps
Reordered environment variable assignments for better readability and replaced Maven cache step with JDK 21 setup to ensure compatibility with the latest Java version.
dc3.release.20250425.03 dc3.release.20250425.04
2025-04-25 22:04:45 +08:00
pnoker 79d8a4e847 refactor(docker): simplify Dockerfiles and CI workflow by removing builder stage and optimizing build process
Removed the redundant builder stage from all Dockerfiles to streamline the build process. Updated the CI workflow to include Maven build and caching steps, reducing complexity and improving efficiency. These changes aim to enhance maintainability and reduce build times.
dc3.release.20250425.02
2025-04-25 22:01:08 +08:00
pnoker 9a3c58e276 chore: add prometheus endpoint to management configuration
Enable the prometheus endpoint in the management configuration to allow monitoring and metrics collection.
dc3.release.20250425.01
2025-04-25 21:19:23 +08:00
pnoker 87d85791bc build: remove local build config and add monitoring dependencies
Remove local Docker build configurations from docker-compose-aliyun.yml to use pre-built images. Add Spring Actuator and Micrometer Prometheus dependencies to enable application monitoring and metrics collection.
2025-04-25 21:08:36 +08:00
pnoker 4495d279ab chore(docker): standardize string quotes and add new compose files
Standardized the use of double quotes in docker-compose files for consistency. Added new docker-compose files for optional and Aliyun configurations to support different deployment environments.
2025-04-25 20:46:30 +08:00
pnoker 5721dc4d88 ci: remove outdated Docker CI workflows for various services
The Docker CI workflows for multiple services (e.g., Gateway, Center Auth, Center Data, etc.) have been removed as they are no longer needed. This cleanup helps reduce repository clutter and maintenance overhead.
dc3.release.20250425.00
2025-04-25 19:20:06 +08:00
pnoker 11bcec7623 refactor(Dockerfiles): simplify Dockerfile configurations and CI workflows
Consolidated Dockerfile configurations by removing redundant build steps and updated CI workflows to use consistent naming conventions. This improves maintainability and reduces complexity in the build process.
dc3.release.20250424.06
2025-04-25 18:56:37 +08:00
pnoker 9be2f5f0d6 chore: update version to 2025.2.5 across multiple files
Updated the version from 2025.2.4 to 2025.2.5 in pom.xml files and various Java classes to reflect the latest release. This change ensures consistency across the codebase and aligns with the new version of the IoT DC3 Platform.
dc3.release.20250424.04 dc3.release.20250424.05
2025-04-25 16:22:39 +08:00
pnoker 24faae2fd3 chore: update project version to 2025.2.4 across all modules
Updated the version from 2025.2.2 to 2025.2.4 in all pom.xml files, Java classes, and CI/CD configurations to reflect the latest release version. This change ensures consistency across the entire project.
dc3.release.20250424.02 dc3.release.20250424.03
2025-04-24 19:46:54 +08:00
pnoker 7bdb0fbbcd . dc3.develop.20250424.00 dc3.release.20250424.01 dc3.release.20250424.00 2025-04-21 22:12:44 +08:00
pnoker e557ea6e37 build: remove redundant repository configurations from pom.xml
The repository configurations for Aliyun, Maven Central, and Sonatype were removed as they are no longer needed. This simplifies the pom.xml file and reduces unnecessary configuration clutter.
dc3.release.20250421.01
2025-04-21 21:05:53 +08:00