diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index c6fef1112..89cdbc314 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1,6 +1,6 @@ # These are supported funding model platforms -github: [pnokers] +github: [ pnokers ] patreon: # Replace with a single Patreon username open_collective: # Replace with a single Open Collective username ko_fi: # Replace with a single Ko-fi username diff --git a/Dockerfile b/Dockerfile index 129fbcd65..cac5b54f7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ # # builder -FROM registry.cn-beijing.aliyuncs.com/dc3/dc3-jdk:17 AS builder +FROM registry.cn-beijing.aliyuncs.com/dc3/dc3-jdk:21 AS builder LABEL dc3.author pnokers LABEL dc3.author.email pnokers.icloud.com diff --git a/dc3-center/dc3-center-auth/Dockerfile b/dc3-center/dc3-center-auth/Dockerfile index f7caca594..b6d576167 100644 --- a/dc3-center/dc3-center-auth/Dockerfile +++ b/dc3-center/dc3-center-auth/Dockerfile @@ -15,7 +15,7 @@ # # runtime -FROM registry.cn-beijing.aliyuncs.com/dc3/dc3-jre:17 AS runtime +FROM registry.cn-beijing.aliyuncs.com/dc3/dc3-jre:21 AS runtime LABEL dc3.author pnokers LABEL dc3.author.email pnokers.icloud.com diff --git a/dc3-center/dc3-center-data/Dockerfile b/dc3-center/dc3-center-data/Dockerfile index 249b2d2b0..8978ef43c 100644 --- a/dc3-center/dc3-center-data/Dockerfile +++ b/dc3-center/dc3-center-data/Dockerfile @@ -15,7 +15,7 @@ # # runtime -FROM registry.cn-beijing.aliyuncs.com/dc3/dc3-jre:17 AS runtime +FROM registry.cn-beijing.aliyuncs.com/dc3/dc3-jre:21 AS runtime LABEL dc3.author pnokers LABEL dc3.author.email pnokers.icloud.com diff --git a/dc3-center/dc3-center-data/src/main/java/io/github/pnoker/center/data/entity/DriverEvent.java b/dc3-center/dc3-center-data/src/main/java/io/github/pnoker/center/data/entity/DriverEvent.java index 58bcde677..dc1cde47a 100644 --- a/dc3-center/dc3-center-data/src/main/java/io/github/pnoker/center/data/entity/DriverEvent.java +++ b/dc3-center/dc3-center-data/src/main/java/io/github/pnoker/center/data/entity/DriverEvent.java @@ -16,9 +16,7 @@ package io.github.pnoker.center.data.entity; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonInclude; -import io.github.pnoker.common.constant.common.TimeConstant; import lombok.Getter; import lombok.Setter; import org.bson.types.ObjectId; diff --git a/dc3-center/dc3-center-manager/Dockerfile b/dc3-center/dc3-center-manager/Dockerfile index f49719b9f..a51bf902e 100644 --- a/dc3-center/dc3-center-manager/Dockerfile +++ b/dc3-center/dc3-center-manager/Dockerfile @@ -15,7 +15,7 @@ # # runtime -FROM registry.cn-beijing.aliyuncs.com/dc3/dc3-jre:17 AS runtime +FROM registry.cn-beijing.aliyuncs.com/dc3/dc3-jre:21 AS runtime LABEL dc3.author pnokers LABEL dc3.author.email pnokers.icloud.com diff --git a/dc3-center/dc3-center-manager/src/main/java/io/github/pnoker/center/manager/service/impl/TopicServiceImpl.java b/dc3-center/dc3-center-manager/src/main/java/io/github/pnoker/center/manager/service/impl/TopicServiceImpl.java index fe75d14b0..fcd6be32a 100644 --- a/dc3-center/dc3-center-manager/src/main/java/io/github/pnoker/center/manager/service/impl/TopicServiceImpl.java +++ b/dc3-center/dc3-center-manager/src/main/java/io/github/pnoker/center/manager/service/impl/TopicServiceImpl.java @@ -66,7 +66,7 @@ public class TopicServiceImpl extends ServiceImpl Long profileBindId = profileBind.getProfileId(); List points = Db.lambdaQuery(PointDO.class) .eq(PointDO::getProfileId, profileBindId) - // .eq(PointDO::getEnableFlag, 1) + // .eq(PointDO::getEnableFlag, 1) .eq(PointDO::getDeleted, 0) .list(); for (PointDO point : points) { diff --git a/dc3-driver/dc3-driver-dtu-yeecom/Dockerfile b/dc3-driver/dc3-driver-dtu-yeecom/Dockerfile index b5ce3f8b1..2be4808c1 100644 --- a/dc3-driver/dc3-driver-dtu-yeecom/Dockerfile +++ b/dc3-driver/dc3-driver-dtu-yeecom/Dockerfile @@ -15,7 +15,7 @@ # # runtime -FROM registry.cn-beijing.aliyuncs.com/dc3/dc3-jre:17 AS runtime +FROM registry.cn-beijing.aliyuncs.com/dc3/dc3-jre:21 AS runtime LABEL dc3.author pnokers LABEL dc3.author.email pnokers.icloud.com diff --git a/dc3-driver/dc3-driver-edge-gateway/Dockerfile b/dc3-driver/dc3-driver-edge-gateway/Dockerfile index 687beb3eb..53ac85c4f 100644 --- a/dc3-driver/dc3-driver-edge-gateway/Dockerfile +++ b/dc3-driver/dc3-driver-edge-gateway/Dockerfile @@ -15,7 +15,7 @@ # # runtime -FROM registry.cn-beijing.aliyuncs.com/dc3/dc3-jre:17 AS runtime +FROM registry.cn-beijing.aliyuncs.com/dc3/dc3-jre:21 AS runtime LABEL dc3.author pnokers LABEL dc3.author.email pnokers.icloud.com diff --git a/dc3-driver/dc3-driver-listening-virtual/Dockerfile b/dc3-driver/dc3-driver-listening-virtual/Dockerfile index 76c1b1137..84007e219 100644 --- a/dc3-driver/dc3-driver-listening-virtual/Dockerfile +++ b/dc3-driver/dc3-driver-listening-virtual/Dockerfile @@ -15,7 +15,7 @@ # # runtime -FROM registry.cn-beijing.aliyuncs.com/dc3/dc3-jre:17 AS runtime +FROM registry.cn-beijing.aliyuncs.com/dc3/dc3-jre:21 AS runtime LABEL dc3.author pnokers LABEL dc3.author.email pnokers.icloud.com diff --git a/dc3-driver/dc3-driver-lwm2m/Dockerfile b/dc3-driver/dc3-driver-lwm2m/Dockerfile index 65c24817a..e7d2a6d75 100644 --- a/dc3-driver/dc3-driver-lwm2m/Dockerfile +++ b/dc3-driver/dc3-driver-lwm2m/Dockerfile @@ -15,7 +15,7 @@ # # runtime -FROM registry.cn-beijing.aliyuncs.com/dc3/dc3-jre:17 AS runtime +FROM registry.cn-beijing.aliyuncs.com/dc3/dc3-jre:21 AS runtime LABEL dc3.author pnokers LABEL dc3.author.email pnokers.icloud.com diff --git a/dc3-driver/dc3-driver-modbus-tcp/Dockerfile b/dc3-driver/dc3-driver-modbus-tcp/Dockerfile index 223dd39ad..5e4707336 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/Dockerfile +++ b/dc3-driver/dc3-driver-modbus-tcp/Dockerfile @@ -15,7 +15,7 @@ # # runtime -FROM registry.cn-beijing.aliyuncs.com/dc3/dc3-jre:17 AS runtime +FROM registry.cn-beijing.aliyuncs.com/dc3/dc3-jre:21 AS runtime LABEL dc3.author pnokers LABEL dc3.author.email pnokers.icloud.com diff --git a/dc3-driver/dc3-driver-mqtt/Dockerfile b/dc3-driver/dc3-driver-mqtt/Dockerfile index 4a1de81f0..9a65d75c4 100644 --- a/dc3-driver/dc3-driver-mqtt/Dockerfile +++ b/dc3-driver/dc3-driver-mqtt/Dockerfile @@ -15,7 +15,7 @@ # # runtime -FROM registry.cn-beijing.aliyuncs.com/dc3/dc3-jre:17 AS runtime +FROM registry.cn-beijing.aliyuncs.com/dc3/dc3-jre:21 AS runtime LABEL dc3.author pnokers LABEL dc3.author.email pnokers.icloud.com diff --git a/dc3-driver/dc3-driver-opc-da/Dockerfile b/dc3-driver/dc3-driver-opc-da/Dockerfile index 64dc5e28c..e02cf533e 100644 --- a/dc3-driver/dc3-driver-opc-da/Dockerfile +++ b/dc3-driver/dc3-driver-opc-da/Dockerfile @@ -15,7 +15,7 @@ # # runtime -FROM registry.cn-beijing.aliyuncs.com/dc3/dc3-jre:17 AS runtime +FROM registry.cn-beijing.aliyuncs.com/dc3/dc3-jre:21 AS runtime LABEL dc3.author pnokers LABEL dc3.author.email pnokers.icloud.com diff --git a/dc3-driver/dc3-driver-opc-ua/Dockerfile b/dc3-driver/dc3-driver-opc-ua/Dockerfile index 8abf66f5c..e39e5ecca 100644 --- a/dc3-driver/dc3-driver-opc-ua/Dockerfile +++ b/dc3-driver/dc3-driver-opc-ua/Dockerfile @@ -15,7 +15,7 @@ # # runtime -FROM registry.cn-beijing.aliyuncs.com/dc3/dc3-jre:17 AS runtime +FROM registry.cn-beijing.aliyuncs.com/dc3/dc3-jre:21 AS runtime LABEL dc3.author pnokers LABEL dc3.author.email pnokers.icloud.com diff --git a/dc3-driver/dc3-driver-plcs7/Dockerfile b/dc3-driver/dc3-driver-plcs7/Dockerfile index 12468fd67..4e869cb76 100644 --- a/dc3-driver/dc3-driver-plcs7/Dockerfile +++ b/dc3-driver/dc3-driver-plcs7/Dockerfile @@ -15,7 +15,7 @@ # # runtime -FROM registry.cn-beijing.aliyuncs.com/dc3/dc3-jre:17 AS runtime +FROM registry.cn-beijing.aliyuncs.com/dc3/dc3-jre:21 AS runtime LABEL dc3.author pnokers LABEL dc3.author.email pnokers.icloud.com diff --git a/dc3-driver/dc3-driver-virtual/Dockerfile b/dc3-driver/dc3-driver-virtual/Dockerfile index a04c9ed7c..b17ada3e1 100644 --- a/dc3-driver/dc3-driver-virtual/Dockerfile +++ b/dc3-driver/dc3-driver-virtual/Dockerfile @@ -15,7 +15,7 @@ # # runtime -FROM registry.cn-beijing.aliyuncs.com/dc3/dc3-jre:17 AS runtime +FROM registry.cn-beijing.aliyuncs.com/dc3/dc3-jre:21 AS runtime LABEL dc3.author pnokers LABEL dc3.author.email pnokers.icloud.com diff --git a/dc3-driver/dc3-driver-weather-amap/Dockerfile b/dc3-driver/dc3-driver-weather-amap/Dockerfile index 90162c7fa..958e3be6e 100644 --- a/dc3-driver/dc3-driver-weather-amap/Dockerfile +++ b/dc3-driver/dc3-driver-weather-amap/Dockerfile @@ -15,7 +15,7 @@ # # runtime -FROM registry.cn-beijing.aliyuncs.com/dc3/dc3-jre:17 AS runtime +FROM registry.cn-beijing.aliyuncs.com/dc3/dc3-jre:21 AS runtime LABEL dc3.author pnokers LABEL dc3.author.email pnokers.icloud.com diff --git a/dc3-gateway/Dockerfile b/dc3-gateway/Dockerfile index ca8863bb4..8439fecdf 100644 --- a/dc3-gateway/Dockerfile +++ b/dc3-gateway/Dockerfile @@ -15,7 +15,7 @@ # # runtime -FROM registry.cn-beijing.aliyuncs.com/dc3/dc3-jre:17 AS runtime +FROM registry.cn-beijing.aliyuncs.com/dc3/dc3-jre:21 AS runtime LABEL dc3.author pnokers LABEL dc3.author.email pnokers.icloud.com diff --git a/dc3/docker-compose-dev.yml b/dc3/docker-compose-dev.yml index c37f6acad..aec2b0eb6 100644 --- a/dc3/docker-compose-dev.yml +++ b/dc3/docker-compose-dev.yml @@ -16,7 +16,7 @@ services: mysql: - image: registry.cn-beijing.aliyuncs.com/dc3/dc3-mysql:2024.3.2.dev + image: registry.cn-beijing.aliyuncs.com/dc3/dc3-mysql:2024.3.0.dev restart: always ports: - '33306:3306' @@ -38,7 +38,7 @@ services: - dc3-mysql mongo: - image: registry.cn-beijing.aliyuncs.com/dc3/dc3-mongo:2024.3.2.dev + image: registry.cn-beijing.aliyuncs.com/dc3/dc3-mongo:2024.3.0.dev restart: always ports: - '37017:27017' @@ -58,7 +58,7 @@ services: - dc3-mongo redis: - image: registry.cn-beijing.aliyuncs.com/dc3/dc3-redis:2024.3.2.dev + image: registry.cn-beijing.aliyuncs.com/dc3/dc3-redis:2024.3.0.dev restart: always ports: - '36379:6379' @@ -77,7 +77,7 @@ services: - dc3-redis rabbitmq: - image: registry.cn-beijing.aliyuncs.com/dc3/dc3-rabbitmq:2024.3.2.dev + image: registry.cn-beijing.aliyuncs.com/dc3/dc3-rabbitmq:2024.3.0.dev restart: always ports: - '5672:5672' diff --git a/dc3/docker-compose.yml b/dc3/docker-compose.yml index 98d69c0d7..a06fe1881 100644 --- a/dc3/docker-compose.yml +++ b/dc3/docker-compose.yml @@ -19,7 +19,7 @@ services: build: context: ../dc3-gateway/ dockerfile: ./Dockerfile - image: registry.cn-beijing.aliyuncs.com/dc3/dc3-gateway:2024.3.2.dev + image: registry.cn-beijing.aliyuncs.com/dc3/dc3-gateway:2024.3.0.dev restart: always ports: - '8000:8000' @@ -43,7 +43,7 @@ services: build: context: ../dc3-center/dc3-center-auth/ dockerfile: ./Dockerfile - image: registry.cn-beijing.aliyuncs.com/dc3/dc3-center-auth:2024.3.2.dev + image: registry.cn-beijing.aliyuncs.com/dc3/dc3-center-auth:2024.3.0.dev restart: always ports: - '8300:8300' @@ -68,7 +68,7 @@ services: build: context: ../dc3-center/dc3-center-manager/ dockerfile: ./Dockerfile - image: registry.cn-beijing.aliyuncs.com/dc3/dc3-center-manager:2024.3.2.dev + image: registry.cn-beijing.aliyuncs.com/dc3/dc3-center-manager:2024.3.0.dev restart: always ports: - '7400:7400' @@ -94,7 +94,7 @@ services: build: context: ../dc3-center/dc3-center-data/ dockerfile: ./Dockerfile - image: registry.cn-beijing.aliyuncs.com/dc3/dc3-center-data:2024.3.2.dev + image: registry.cn-beijing.aliyuncs.com/dc3/dc3-center-data:2024.3.0.dev restart: always ports: - '7500:7500' @@ -120,7 +120,7 @@ services: build: context: ../dc3-driver/dc3-driver-virtual/ dockerfile: ./Dockerfile - image: registry.cn-beijing.aliyuncs.com/dc3/dc3-driver-virtual:2024.3.2.dev + image: registry.cn-beijing.aliyuncs.com/dc3/dc3-driver-virtual:2024.3.0.dev restart: always environment: - NODE_ENV=dev @@ -142,7 +142,7 @@ services: build: context: ../dc3-driver/dc3-driver-plcs7/ dockerfile: ./Dockerfile - image: registry.cn-beijing.aliyuncs.com/dc3/dc3-driver-plcs7:2024.3.2.dev + image: registry.cn-beijing.aliyuncs.com/dc3/dc3-driver-plcs7:2024.3.0.dev restart: always environment: - NODE_ENV=dev @@ -164,7 +164,7 @@ services: build: context: ../dc3-driver/dc3-driver-opc-da/ dockerfile: ./Dockerfile - image: registry.cn-beijing.aliyuncs.com/dc3/dc3-driver-opc-da:2024.3.2.dev + image: registry.cn-beijing.aliyuncs.com/dc3/dc3-driver-opc-da:2024.3.0.dev restart: always environment: - NODE_ENV=dev @@ -186,7 +186,7 @@ services: build: context: ../dc3-driver/dc3-driver-opc-ua/ dockerfile: ./Dockerfile - image: registry.cn-beijing.aliyuncs.com/dc3/dc3-driver-opc-ua:2024.3.2.dev + image: registry.cn-beijing.aliyuncs.com/dc3/dc3-driver-opc-ua:2024.3.0.dev restart: always environment: - NODE_ENV=dev @@ -208,7 +208,7 @@ services: build: context: ../dc3-driver/dc3-driver-listening-virtual/ dockerfile: ./Dockerfile - image: registry.cn-beijing.aliyuncs.com/dc3/dc3-driver-listening-virtual:2024.3.2.dev + image: registry.cn-beijing.aliyuncs.com/dc3/dc3-driver-listening-virtual:2024.3.0.dev restart: always ports: - '6270:6270' @@ -233,7 +233,7 @@ services: build: context: ../dc3-driver/dc3-driver-dtu-yeecom/ dockerfile: ./Dockerfile - image: registry.cn-beijing.aliyuncs.com/dc3/dc3-driver-dtu-yeecom:2024.3.2.dev + image: registry.cn-beijing.aliyuncs.com/dc3/dc3-driver-dtu-yeecom:2024.3.0.dev restart: always ports: - '9001:9001' @@ -258,7 +258,7 @@ services: build: context: ../dc3-driver/dc3-driver-lwm2m/ dockerfile: ./Dockerfile - image: registry.cn-beijing.aliyuncs.com/dc3/dc3-driver-lwm2m:2024.3.2.dev + image: registry.cn-beijing.aliyuncs.com/dc3/dc3-driver-lwm2m:2024.3.0.dev restart: always ports: - '5683:5683' @@ -283,7 +283,7 @@ services: build: context: ../dc3-driver/dc3-driver-mqtt/ dockerfile: ./Dockerfile - image: registry.cn-beijing.aliyuncs.com/dc3/dc3-driver-mqtt:2024.3.2.dev + image: registry.cn-beijing.aliyuncs.com/dc3/dc3-driver-mqtt:2024.3.0.dev restart: always environment: - NODE_ENV=dev @@ -305,7 +305,7 @@ services: build: context: ../dc3-driver/dc3-driver-edge-gateway/ dockerfile: ./Dockerfile - image: registry.cn-beijing.aliyuncs.com/dc3/dc3-driver-edge-gateway:2024.3.2.dev + image: registry.cn-beijing.aliyuncs.com/dc3/dc3-driver-edge-gateway:2024.3.0.dev restart: always environment: - NODE_ENV=dev @@ -327,7 +327,7 @@ services: build: context: ../dc3-driver/dc3-driver-modbus-tcp/ dockerfile: ./Dockerfile - image: registry.cn-beijing.aliyuncs.com/dc3/dc3-driver-modbus-tcp:2024.3.2.dev + image: registry.cn-beijing.aliyuncs.com/dc3/dc3-driver-modbus-tcp:2024.3.0.dev restart: always environment: - NODE_ENV=dev @@ -349,7 +349,7 @@ services: build: context: ../dc3-driver/dc3-driver-weather-amap/ dockerfile: ./Dockerfile - image: registry.cn-beijing.aliyuncs.com/dc3/dc3-driver-weather-amap:2024.3.2.dev + image: registry.cn-beijing.aliyuncs.com/dc3/dc3-driver-weather-amap:2024.3.0.dev restart: always environment: - NODE_ENV=dev