From 061698cd726bc108ccc4c56232f044f69a7d2000 Mon Sep 17 00:00:00 2001 From: pnoker Date: Thu, 28 Apr 2022 00:28:57 +0800 Subject: [PATCH] feat(config): add dev/prod profiles and fix driver metadata receiver routing --- .../src/main/resources/application-prod.yml | 1 + .../src/main/resources/application-test.yml | 2 +- .../src/main/resources/application-prod.yml | 1 + .../src/main/resources/application-test.yml | 2 +- .../service/impl/DriverSdkServiceImpl.java | 2 +- .../manager/service/impl/NotifyServiceImpl.java | 10 +++++----- .../src/main/resources/application-prod.yml | 1 + .../src/main/resources/application-prod.yml | 1 + .../src/main/resources/application-prod.yml | 1 + .../src/main/resources/application-driver.yml | 13 +++++++++++++ .../service/rabbit/DriverMetadataReceiver.java | 4 ++-- .../src/main/resources/application-dev.yml | 11 +++++++++++ .../src/main/resources/application-prod.yml | 1 + .../src/main/resources/application-test.yml | 1 + .../src/main/resources/application.yml | 15 +++++++++------ .../src/main/resources/application-dev.yml | 11 +++++++++++ .../src/main/resources/application-prod.yml | 1 + .../src/main/resources/application-test.yml | 1 + .../src/main/resources/application.yml | 14 +------------- .../src/main/resources/application-dev.yml | 11 +++++++++++ .../src/main/resources/application-prod.yml | 1 + .../src/main/resources/application-test.yml | 1 + .../src/main/resources/application.yml | 14 ++------------ .../src/main/resources/application-dev.yml | 11 +++++++++++ .../src/main/resources/application-prod.yml | 1 + .../src/main/resources/application-test.yml | 1 + .../src/main/resources/application.yml | 17 ++++++++++------- .../src/main/resources/application-dev.yml | 12 ++++++++++++ .../src/main/resources/application-prod.yml | 1 + .../src/main/resources/application-test.yml | 1 + .../src/main/resources/application.yml | 16 +++++++++------- .../src/main/resources/application-dev.yml | 11 +++++++++++ .../src/main/resources/application-prod.yml | 1 + .../src/main/resources/application-test.yml | 1 + .../src/main/resources/application.yml | 14 +++++++++----- .../src/main/resources/application-dev.yml | 11 +++++++++++ .../src/main/resources/application-prod.yml | 1 + .../src/main/resources/application-test.yml | 1 + .../src/main/resources/application.yml | 14 +++++++++----- .../src/main/resources/application-dev.yml | 14 ++++++++++++++ .../src/main/resources/application-prod.yml | 1 + .../src/main/resources/application-test.yml | 1 + .../src/main/resources/application.yml | 17 +++++++++-------- dc3/docker-compose.yml | 2 +- 44 files changed, 195 insertions(+), 74 deletions(-) create mode 100644 dc3-common/dc3-common-profiles/src/main/resources/application-driver.yml create mode 100644 dc3-driver/dc3-driver-edge-gateway/src/main/resources/application-dev.yml create mode 100644 dc3-driver/dc3-driver-edge-gateway/src/main/resources/application-prod.yml create mode 100644 dc3-driver/dc3-driver-edge-gateway/src/main/resources/application-test.yml create mode 100644 dc3-driver/dc3-driver-listening-virtual/src/main/resources/application-dev.yml create mode 100644 dc3-driver/dc3-driver-listening-virtual/src/main/resources/application-prod.yml create mode 100644 dc3-driver/dc3-driver-listening-virtual/src/main/resources/application-test.yml create mode 100644 dc3-driver/dc3-driver-modbus-tcp/src/main/resources/application-dev.yml create mode 100644 dc3-driver/dc3-driver-modbus-tcp/src/main/resources/application-prod.yml create mode 100644 dc3-driver/dc3-driver-modbus-tcp/src/main/resources/application-test.yml create mode 100644 dc3-driver/dc3-driver-mqtt/src/main/resources/application-dev.yml create mode 100644 dc3-driver/dc3-driver-mqtt/src/main/resources/application-prod.yml create mode 100644 dc3-driver/dc3-driver-mqtt/src/main/resources/application-test.yml create mode 100644 dc3-driver/dc3-driver-opc-da/src/main/resources/application-dev.yml create mode 100644 dc3-driver/dc3-driver-opc-da/src/main/resources/application-prod.yml create mode 100644 dc3-driver/dc3-driver-opc-da/src/main/resources/application-test.yml create mode 100644 dc3-driver/dc3-driver-opc-ua/src/main/resources/application-dev.yml create mode 100644 dc3-driver/dc3-driver-opc-ua/src/main/resources/application-prod.yml create mode 100644 dc3-driver/dc3-driver-opc-ua/src/main/resources/application-test.yml create mode 100644 dc3-driver/dc3-driver-plcs7/src/main/resources/application-dev.yml create mode 100644 dc3-driver/dc3-driver-plcs7/src/main/resources/application-prod.yml create mode 100644 dc3-driver/dc3-driver-plcs7/src/main/resources/application-test.yml create mode 100644 dc3-driver/dc3-driver-virtual/src/main/resources/application-dev.yml create mode 100644 dc3-driver/dc3-driver-virtual/src/main/resources/application-prod.yml create mode 100644 dc3-driver/dc3-driver-virtual/src/main/resources/application-test.yml diff --git a/dc3-center/dc3-center-auth/src/main/resources/application-prod.yml b/dc3-center/dc3-center-auth/src/main/resources/application-prod.yml index e69de29bb..e6d2397dc 100644 --- a/dc3-center/dc3-center-auth/src/main/resources/application-prod.yml +++ b/dc3-center/dc3-center-auth/src/main/resources/application-prod.yml @@ -0,0 +1 @@ +# Product environment, customizable configuration \ No newline at end of file diff --git a/dc3-center/dc3-center-auth/src/main/resources/application-test.yml b/dc3-center/dc3-center-auth/src/main/resources/application-test.yml index 387869a09..32fda2164 100644 --- a/dc3-center/dc3-center-auth/src/main/resources/application-test.yml +++ b/dc3-center/dc3-center-auth/src/main/resources/application-test.yml @@ -1 +1 @@ -# Development environment, customizable configuration \ No newline at end of file +# Test environment, customizable configuration \ No newline at end of file diff --git a/dc3-center/dc3-center-data/src/main/resources/application-prod.yml b/dc3-center/dc3-center-data/src/main/resources/application-prod.yml index e69de29bb..e6d2397dc 100644 --- a/dc3-center/dc3-center-data/src/main/resources/application-prod.yml +++ b/dc3-center/dc3-center-data/src/main/resources/application-prod.yml @@ -0,0 +1 @@ +# Product environment, customizable configuration \ No newline at end of file diff --git a/dc3-center/dc3-center-data/src/main/resources/application-test.yml b/dc3-center/dc3-center-data/src/main/resources/application-test.yml index 387869a09..32fda2164 100644 --- a/dc3-center/dc3-center-data/src/main/resources/application-test.yml +++ b/dc3-center/dc3-center-data/src/main/resources/application-test.yml @@ -1 +1 @@ -# Development environment, customizable configuration \ No newline at end of file +# Test environment, customizable configuration \ No newline at end of file diff --git a/dc3-center/dc3-center-manager/src/main/java/com/dc3/center/manager/service/impl/DriverSdkServiceImpl.java b/dc3-center/dc3-center-manager/src/main/java/com/dc3/center/manager/service/impl/DriverSdkServiceImpl.java index 5d4eba453..8a9d3346b 100644 --- a/dc3-center/dc3-center-manager/src/main/java/com/dc3/center/manager/service/impl/DriverSdkServiceImpl.java +++ b/dc3-center/dc3-center-manager/src/main/java/com/dc3/center/manager/service/impl/DriverSdkServiceImpl.java @@ -74,7 +74,7 @@ public class DriverSdkServiceImpl implements DriverSdkService { log.debug("Driver does not registered, adding {} ", driver); try { Driver byHostPort = driverService.selectByHostPort(driver.getType(), driver.getHost(), driver.getPort(), driver.getTenantId()); - throw new ServiceException("The port(" + driver.getPort() + ") is already occupied by driver(" + byHostPort.getName() + "/" + byHostPort.getServiceName() + ")"); + throw new ServiceException("The port(" + driver.getPort() + ") is already occupied by driver(" + byHostPort.getServiceName() + "/" + byHostPort.getName() + ")"); } catch (NotFoundException notFoundException2) { driver = driverService.add(driver); } diff --git a/dc3-center/dc3-center-manager/src/main/java/com/dc3/center/manager/service/impl/NotifyServiceImpl.java b/dc3-center/dc3-center-manager/src/main/java/com/dc3/center/manager/service/impl/NotifyServiceImpl.java index 029f0d52f..f4f331f94 100644 --- a/dc3-center/dc3-center-manager/src/main/java/com/dc3/center/manager/service/impl/NotifyServiceImpl.java +++ b/dc3-center/dc3-center-manager/src/main/java/com/dc3/center/manager/service/impl/NotifyServiceImpl.java @@ -48,7 +48,7 @@ public class NotifyServiceImpl implements NotifyService { notifyDriver(driver, operation); }); } catch (Exception e) { - log.warn("Notify Driver Profile : {}", e.getMessage()); + log.warn("Notify Driver Profile: {}", e.getMessage()); } } @@ -61,7 +61,7 @@ public class NotifyServiceImpl implements NotifyService { notifyDriver(driver, operation); }); } catch (Exception e) { - log.warn("Notify Driver Point : {}", e.getMessage()); + log.warn("Notify Driver Point: {}", e.getMessage()); } } @@ -72,7 +72,7 @@ public class NotifyServiceImpl implements NotifyService { DriverConfiguration operation = new DriverConfiguration().setType(Common.Driver.Type.DEVICE).setCommand(command).setContent(device); notifyDriver(driver, operation); } catch (Exception e) { - log.warn("Notify Driver Device : {}", e.getMessage()); + log.warn("Notify Driver Device: {}", e.getMessage()); } } @@ -83,7 +83,7 @@ public class NotifyServiceImpl implements NotifyService { DriverConfiguration operation = new DriverConfiguration().setType(Common.Driver.Type.DRIVER_INFO).setCommand(command).setContent(driverInfo); notifyDriver(driver, operation); } catch (Exception e) { - log.warn("Notify Driver DriverInfo : {}", e.getMessage()); + log.warn("Notify Driver DriverInfo: {}", e.getMessage()); } } @@ -94,7 +94,7 @@ public class NotifyServiceImpl implements NotifyService { DriverConfiguration operation = new DriverConfiguration().setType(Common.Driver.Type.POINT_INFO).setCommand(command).setContent(pointInfo); notifyDriver(driver, operation); } catch (Exception e) { - log.warn("Notify Driver PointInfo : {}", e.getMessage()); + log.warn("Notify Driver PointInfo: {}", e.getMessage()); } } diff --git a/dc3-center/dc3-center-manager/src/main/resources/application-prod.yml b/dc3-center/dc3-center-manager/src/main/resources/application-prod.yml index e69de29bb..e6d2397dc 100644 --- a/dc3-center/dc3-center-manager/src/main/resources/application-prod.yml +++ b/dc3-center/dc3-center-manager/src/main/resources/application-prod.yml @@ -0,0 +1 @@ +# Product environment, customizable configuration \ No newline at end of file diff --git a/dc3-center/dc3-center-monitor/src/main/resources/application-prod.yml b/dc3-center/dc3-center-monitor/src/main/resources/application-prod.yml index e69de29bb..e6d2397dc 100644 --- a/dc3-center/dc3-center-monitor/src/main/resources/application-prod.yml +++ b/dc3-center/dc3-center-monitor/src/main/resources/application-prod.yml @@ -0,0 +1 @@ +# Product environment, customizable configuration \ No newline at end of file diff --git a/dc3-center/dc3-center-register/src/main/resources/application-prod.yml b/dc3-center/dc3-center-register/src/main/resources/application-prod.yml index e69de29bb..e6d2397dc 100644 --- a/dc3-center/dc3-center-register/src/main/resources/application-prod.yml +++ b/dc3-center/dc3-center-register/src/main/resources/application-prod.yml @@ -0,0 +1 @@ +# Product environment, customizable configuration \ No newline at end of file diff --git a/dc3-common/dc3-common-profiles/src/main/resources/application-driver.yml b/dc3-common/dc3-common-profiles/src/main/resources/application-driver.yml new file mode 100644 index 000000000..d48e4a9a7 --- /dev/null +++ b/dc3-common/dc3-common-profiles/src/main/resources/application-driver.yml @@ -0,0 +1,13 @@ +driver: + tenant: default + +spring: + application: + name: ${driver.project}_${driver.tenant} + main: + allow-bean-definition-overriding: true + mvc: + throw-exception-if-no-handler-found: true + web: + resources: + add-mappings: false \ No newline at end of file diff --git a/dc3-common/dc3-common-sdk/src/main/java/com/dc3/common/sdk/service/rabbit/DriverMetadataReceiver.java b/dc3-common/dc3-common-sdk/src/main/java/com/dc3/common/sdk/service/rabbit/DriverMetadataReceiver.java index c2e221de7..7466c672e 100644 --- a/dc3-common/dc3-common-sdk/src/main/java/com/dc3/common/sdk/service/rabbit/DriverMetadataReceiver.java +++ b/dc3-common/dc3-common-sdk/src/main/java/com/dc3/common/sdk/service/rabbit/DriverMetadataReceiver.java @@ -92,7 +92,7 @@ public class DriverMetadataReceiver { */ private void configurationDriver(DriverConfiguration driverConfiguration) { if (!Common.Response.OK.equals(driverConfiguration.getResponse())) { - driverService.close("The driver initialization failed {}", driverConfiguration.getResponse()); + driverService.close("The driver initialization failed: {}", driverConfiguration.getResponse()); } switch (driverConfiguration.getCommand()) { @@ -104,7 +104,7 @@ public class DriverMetadataReceiver { break; case Common.Driver.Event.DRIVER_METADATA_SYNC_BACK: DriverMetadata driverMetadata = Convert.convert(DriverMetadata.class, driverConfiguration.getContent()); - log.debug("Initialization driver metadata : {}", JsonUtil.toPrettyJsonString(driverMetadata)); + log.debug("Initialization driver metadata: {}", JsonUtil.toPrettyJsonString(driverMetadata)); driverContext.setDriverMetadata(driverMetadata); break; default: diff --git a/dc3-driver/dc3-driver-edge-gateway/src/main/resources/application-dev.yml b/dc3-driver/dc3-driver-edge-gateway/src/main/resources/application-dev.yml new file mode 100644 index 000000000..2e958427a --- /dev/null +++ b/dc3-driver/dc3-driver-edge-gateway/src/main/resources/application-dev.yml @@ -0,0 +1,11 @@ +# Development environment, customizable configuration +eureka: + instance: + # Custom node registration IP + ip-address: ${SERVICE_HOST:192.168.0.103} + +# Log config +logging: + level: + com.dc3: DEBUG + com.dc3.common.sdk: DEBUG \ No newline at end of file diff --git a/dc3-driver/dc3-driver-edge-gateway/src/main/resources/application-prod.yml b/dc3-driver/dc3-driver-edge-gateway/src/main/resources/application-prod.yml new file mode 100644 index 000000000..e6d2397dc --- /dev/null +++ b/dc3-driver/dc3-driver-edge-gateway/src/main/resources/application-prod.yml @@ -0,0 +1 @@ +# Product environment, customizable configuration \ No newline at end of file diff --git a/dc3-driver/dc3-driver-edge-gateway/src/main/resources/application-test.yml b/dc3-driver/dc3-driver-edge-gateway/src/main/resources/application-test.yml new file mode 100644 index 000000000..32fda2164 --- /dev/null +++ b/dc3-driver/dc3-driver-edge-gateway/src/main/resources/application-test.yml @@ -0,0 +1 @@ +# Test environment, customizable configuration \ No newline at end of file diff --git a/dc3-driver/dc3-driver-edge-gateway/src/main/resources/application.yml b/dc3-driver/dc3-driver-edge-gateway/src/main/resources/application.yml index 3b120b6e6..2ad9f0683 100644 --- a/dc3-driver/dc3-driver-edge-gateway/src/main/resources/application.yml +++ b/dc3-driver/dc3-driver-edge-gateway/src/main/resources/application.yml @@ -1,6 +1,5 @@ driver: name: EdgeGateway - tenant: default type: gateway project: @project.artifactId@ description: @project.description@ @@ -58,12 +57,16 @@ server: port: 8702 spring: - application: - name: ${driver.project}_${driver.tenant} + profiles: + active: + - server + - register + - monitor + - rabbitmq + - quartz + - driver + - ${NODE_ENV:dev} logging: - level: - com.dc3.common.sdk: DEBUG - com.dc3: DEBUG file: name: dc3/logs/driver/mqtt/${spring.application.name}.log \ No newline at end of file diff --git a/dc3-driver/dc3-driver-listening-virtual/src/main/resources/application-dev.yml b/dc3-driver/dc3-driver-listening-virtual/src/main/resources/application-dev.yml new file mode 100644 index 000000000..2e958427a --- /dev/null +++ b/dc3-driver/dc3-driver-listening-virtual/src/main/resources/application-dev.yml @@ -0,0 +1,11 @@ +# Development environment, customizable configuration +eureka: + instance: + # Custom node registration IP + ip-address: ${SERVICE_HOST:192.168.0.103} + +# Log config +logging: + level: + com.dc3: DEBUG + com.dc3.common.sdk: DEBUG \ No newline at end of file diff --git a/dc3-driver/dc3-driver-listening-virtual/src/main/resources/application-prod.yml b/dc3-driver/dc3-driver-listening-virtual/src/main/resources/application-prod.yml new file mode 100644 index 000000000..e6d2397dc --- /dev/null +++ b/dc3-driver/dc3-driver-listening-virtual/src/main/resources/application-prod.yml @@ -0,0 +1 @@ +# Product environment, customizable configuration \ No newline at end of file diff --git a/dc3-driver/dc3-driver-listening-virtual/src/main/resources/application-test.yml b/dc3-driver/dc3-driver-listening-virtual/src/main/resources/application-test.yml new file mode 100644 index 000000000..32fda2164 --- /dev/null +++ b/dc3-driver/dc3-driver-listening-virtual/src/main/resources/application-test.yml @@ -0,0 +1 @@ +# Test environment, customizable configuration \ No newline at end of file diff --git a/dc3-driver/dc3-driver-listening-virtual/src/main/resources/application.yml b/dc3-driver/dc3-driver-listening-virtual/src/main/resources/application.yml index b52ff6c74..3b49e1abc 100644 --- a/dc3-driver/dc3-driver-listening-virtual/src/main/resources/application.yml +++ b/dc3-driver/dc3-driver-listening-virtual/src/main/resources/application.yml @@ -1,6 +1,5 @@ driver: name: ListeningVirtualDriver - tenant: default type: driver project: @project.artifactId@ description: @project.description@ @@ -65,8 +64,6 @@ server: port: 8700 spring: - application: - name: ${driver.project}_${driver.tenant} profiles: active: - server @@ -74,18 +71,9 @@ spring: - monitor - rabbitmq - quartz + - driver - ${NODE_ENV:dev} - main: - allow-bean-definition-overriding: true - mvc: - throw-exception-if-no-handler-found: true - web: - resources: - add-mappings: false logging: - level: - com.dc3: DEBUG - com.dc3.common.sdk: DEBUG file: name: dc3/logs/driver/listening-virtual/${spring.application.name}.log \ No newline at end of file diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/resources/application-dev.yml b/dc3-driver/dc3-driver-modbus-tcp/src/main/resources/application-dev.yml new file mode 100644 index 000000000..2e958427a --- /dev/null +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/resources/application-dev.yml @@ -0,0 +1,11 @@ +# Development environment, customizable configuration +eureka: + instance: + # Custom node registration IP + ip-address: ${SERVICE_HOST:192.168.0.103} + +# Log config +logging: + level: + com.dc3: DEBUG + com.dc3.common.sdk: DEBUG \ No newline at end of file diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/resources/application-prod.yml b/dc3-driver/dc3-driver-modbus-tcp/src/main/resources/application-prod.yml new file mode 100644 index 000000000..e6d2397dc --- /dev/null +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/resources/application-prod.yml @@ -0,0 +1 @@ +# Product environment, customizable configuration \ No newline at end of file diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/resources/application-test.yml b/dc3-driver/dc3-driver-modbus-tcp/src/main/resources/application-test.yml new file mode 100644 index 000000000..32fda2164 --- /dev/null +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/resources/application-test.yml @@ -0,0 +1 @@ +# Test environment, customizable configuration \ No newline at end of file diff --git a/dc3-driver/dc3-driver-modbus-tcp/src/main/resources/application.yml b/dc3-driver/dc3-driver-modbus-tcp/src/main/resources/application.yml index cd85b85a6..43145d6b3 100644 --- a/dc3-driver/dc3-driver-modbus-tcp/src/main/resources/application.yml +++ b/dc3-driver/dc3-driver-modbus-tcp/src/main/resources/application.yml @@ -1,6 +1,5 @@ driver: name: ModbusDriver - tenant: default type: driver project: @project.artifactId@ description: @project.description@ @@ -71,8 +70,6 @@ server: port: 8604 spring: - application: - name: ${driver.project}_${driver.tenant} profiles: active: - server @@ -80,16 +77,9 @@ spring: - monitor - rabbitmq - quartz - main: - allow-bean-definition-overriding: true - mvc: - throw-exception-if-no-handler-found: true - web: - resources: - add-mappings: false + - driver + - ${NODE_ENV:dev} logging: - level: - com.dc3: DEBUG file: name: dc3/logs/driver/modbus-tcp/${spring.application.name}.log \ No newline at end of file diff --git a/dc3-driver/dc3-driver-mqtt/src/main/resources/application-dev.yml b/dc3-driver/dc3-driver-mqtt/src/main/resources/application-dev.yml new file mode 100644 index 000000000..2e958427a --- /dev/null +++ b/dc3-driver/dc3-driver-mqtt/src/main/resources/application-dev.yml @@ -0,0 +1,11 @@ +# Development environment, customizable configuration +eureka: + instance: + # Custom node registration IP + ip-address: ${SERVICE_HOST:192.168.0.103} + +# Log config +logging: + level: + com.dc3: DEBUG + com.dc3.common.sdk: DEBUG \ No newline at end of file diff --git a/dc3-driver/dc3-driver-mqtt/src/main/resources/application-prod.yml b/dc3-driver/dc3-driver-mqtt/src/main/resources/application-prod.yml new file mode 100644 index 000000000..e6d2397dc --- /dev/null +++ b/dc3-driver/dc3-driver-mqtt/src/main/resources/application-prod.yml @@ -0,0 +1 @@ +# Product environment, customizable configuration \ No newline at end of file diff --git a/dc3-driver/dc3-driver-mqtt/src/main/resources/application-test.yml b/dc3-driver/dc3-driver-mqtt/src/main/resources/application-test.yml new file mode 100644 index 000000000..32fda2164 --- /dev/null +++ b/dc3-driver/dc3-driver-mqtt/src/main/resources/application-test.yml @@ -0,0 +1 @@ +# Test environment, customizable configuration \ No newline at end of file diff --git a/dc3-driver/dc3-driver-mqtt/src/main/resources/application.yml b/dc3-driver/dc3-driver-mqtt/src/main/resources/application.yml index 48ffb19c1..26b52c3eb 100644 --- a/dc3-driver/dc3-driver-mqtt/src/main/resources/application.yml +++ b/dc3-driver/dc3-driver-mqtt/src/main/resources/application.yml @@ -1,6 +1,5 @@ driver: name: MqttDriver - tenant: default type: driver project: @project.artifactId@ description: @project.description@ @@ -52,7 +51,7 @@ driver: name: driver/${spring.application.name}/gateway/+ default-send-topic: qos: 1 - topic: default/${spring.application.name} + name: default/${spring.application.name} keep-alive: 15 completion-timeout: 3000 @@ -60,12 +59,16 @@ server: port: 8701 spring: - application: - name: ${driver.project}_${driver.tenant} + profiles: + active: + - server + - register + - monitor + - rabbitmq + - quartz + - driver + - ${NODE_ENV:dev} logging: - level: - com.dc3.common.sdk: DEBUG - com.dc3: DEBUG file: name: dc3/logs/driver/mqtt/${spring.application.name}.log \ No newline at end of file diff --git a/dc3-driver/dc3-driver-opc-da/src/main/resources/application-dev.yml b/dc3-driver/dc3-driver-opc-da/src/main/resources/application-dev.yml new file mode 100644 index 000000000..4151db043 --- /dev/null +++ b/dc3-driver/dc3-driver-opc-da/src/main/resources/application-dev.yml @@ -0,0 +1,12 @@ +# Development environment, customizable configuration +eureka: + instance: + # Custom node registration IP + ip-address: ${SERVICE_HOST:192.168.0.103} + +# Log config +logging: + level: + com.dc3: DEBUG + com.dc3.common.sdk: DEBUG + com.freud.dcom.utgard.cases.*: INFO \ No newline at end of file diff --git a/dc3-driver/dc3-driver-opc-da/src/main/resources/application-prod.yml b/dc3-driver/dc3-driver-opc-da/src/main/resources/application-prod.yml new file mode 100644 index 000000000..e6d2397dc --- /dev/null +++ b/dc3-driver/dc3-driver-opc-da/src/main/resources/application-prod.yml @@ -0,0 +1 @@ +# Product environment, customizable configuration \ No newline at end of file diff --git a/dc3-driver/dc3-driver-opc-da/src/main/resources/application-test.yml b/dc3-driver/dc3-driver-opc-da/src/main/resources/application-test.yml new file mode 100644 index 000000000..32fda2164 --- /dev/null +++ b/dc3-driver/dc3-driver-opc-da/src/main/resources/application-test.yml @@ -0,0 +1 @@ +# Test environment, customizable configuration \ No newline at end of file diff --git a/dc3-driver/dc3-driver-opc-da/src/main/resources/application.yml b/dc3-driver/dc3-driver-opc-da/src/main/resources/application.yml index 19ea6b691..289e94ed9 100644 --- a/dc3-driver/dc3-driver-opc-da/src/main/resources/application.yml +++ b/dc3-driver/dc3-driver-opc-da/src/main/resources/application.yml @@ -1,6 +1,5 @@ driver: name: OpcDaDriver - tenant: default type: driver project: @project.artifactId@ description: @project.description@ @@ -81,13 +80,16 @@ server: port: 8602 spring: - application: - name: ${driver.project}_${driver.tenant} + profiles: + active: + - server + - register + - monitor + - rabbitmq + - quartz + - driver + - ${NODE_ENV:dev} logging: - level: - com.freud.dcom.utgard.cases.*: INFO - com.dc3.common.sdk: DEBUG - com.dc3: DEBUG file: name: dc3/logs/driver/opcda/${spring.application.name}.log \ No newline at end of file diff --git a/dc3-driver/dc3-driver-opc-ua/src/main/resources/application-dev.yml b/dc3-driver/dc3-driver-opc-ua/src/main/resources/application-dev.yml new file mode 100644 index 000000000..2e958427a --- /dev/null +++ b/dc3-driver/dc3-driver-opc-ua/src/main/resources/application-dev.yml @@ -0,0 +1,11 @@ +# Development environment, customizable configuration +eureka: + instance: + # Custom node registration IP + ip-address: ${SERVICE_HOST:192.168.0.103} + +# Log config +logging: + level: + com.dc3: DEBUG + com.dc3.common.sdk: DEBUG \ No newline at end of file diff --git a/dc3-driver/dc3-driver-opc-ua/src/main/resources/application-prod.yml b/dc3-driver/dc3-driver-opc-ua/src/main/resources/application-prod.yml new file mode 100644 index 000000000..e6d2397dc --- /dev/null +++ b/dc3-driver/dc3-driver-opc-ua/src/main/resources/application-prod.yml @@ -0,0 +1 @@ +# Product environment, customizable configuration \ No newline at end of file diff --git a/dc3-driver/dc3-driver-opc-ua/src/main/resources/application-test.yml b/dc3-driver/dc3-driver-opc-ua/src/main/resources/application-test.yml new file mode 100644 index 000000000..32fda2164 --- /dev/null +++ b/dc3-driver/dc3-driver-opc-ua/src/main/resources/application-test.yml @@ -0,0 +1 @@ +# Test environment, customizable configuration \ No newline at end of file diff --git a/dc3-driver/dc3-driver-opc-ua/src/main/resources/application.yml b/dc3-driver/dc3-driver-opc-ua/src/main/resources/application.yml index b9646c0c2..8694bab11 100644 --- a/dc3-driver/dc3-driver-opc-ua/src/main/resources/application.yml +++ b/dc3-driver/dc3-driver-opc-ua/src/main/resources/application.yml @@ -1,6 +1,5 @@ driver: name: OpcUaDriver - tenant: default type: driver project: @project.artifactId@ description: @project.description@ @@ -71,11 +70,16 @@ server: port: 8603 spring: - application: - name: ${driver.project}_${driver.tenant} + profiles: + active: + - server + - register + - monitor + - rabbitmq + - quartz + - driver + - ${NODE_ENV:dev} logging: - level: - com.dc3: DEBUG file: name: dc3/logs/driver/opcua/${spring.application.name}.log \ No newline at end of file diff --git a/dc3-driver/dc3-driver-plcs7/src/main/resources/application-dev.yml b/dc3-driver/dc3-driver-plcs7/src/main/resources/application-dev.yml new file mode 100644 index 000000000..2e958427a --- /dev/null +++ b/dc3-driver/dc3-driver-plcs7/src/main/resources/application-dev.yml @@ -0,0 +1,11 @@ +# Development environment, customizable configuration +eureka: + instance: + # Custom node registration IP + ip-address: ${SERVICE_HOST:192.168.0.103} + +# Log config +logging: + level: + com.dc3: DEBUG + com.dc3.common.sdk: DEBUG \ No newline at end of file diff --git a/dc3-driver/dc3-driver-plcs7/src/main/resources/application-prod.yml b/dc3-driver/dc3-driver-plcs7/src/main/resources/application-prod.yml new file mode 100644 index 000000000..e6d2397dc --- /dev/null +++ b/dc3-driver/dc3-driver-plcs7/src/main/resources/application-prod.yml @@ -0,0 +1 @@ +# Product environment, customizable configuration \ No newline at end of file diff --git a/dc3-driver/dc3-driver-plcs7/src/main/resources/application-test.yml b/dc3-driver/dc3-driver-plcs7/src/main/resources/application-test.yml new file mode 100644 index 000000000..32fda2164 --- /dev/null +++ b/dc3-driver/dc3-driver-plcs7/src/main/resources/application-test.yml @@ -0,0 +1 @@ +# Test environment, customizable configuration \ No newline at end of file diff --git a/dc3-driver/dc3-driver-plcs7/src/main/resources/application.yml b/dc3-driver/dc3-driver-plcs7/src/main/resources/application.yml index 3d6f2544a..1805cf979 100644 --- a/dc3-driver/dc3-driver-plcs7/src/main/resources/application.yml +++ b/dc3-driver/dc3-driver-plcs7/src/main/resources/application.yml @@ -1,6 +1,5 @@ driver: name: PlcS7Driver - tenant: default type: driver project: @project.artifactId@ description: @project.description@ @@ -81,11 +80,16 @@ server: port: 8601 spring: - application: - name: ${driver.project}_${driver.tenant} + profiles: + active: + - server + - register + - monitor + - rabbitmq + - quartz + - driver + - ${NODE_ENV:dev} logging: - level: - com.dc3: DEBUG file: name: dc3/logs/driver/plcs7/${spring.application.name}.log \ No newline at end of file diff --git a/dc3-driver/dc3-driver-virtual/src/main/resources/application-dev.yml b/dc3-driver/dc3-driver-virtual/src/main/resources/application-dev.yml new file mode 100644 index 000000000..7ae306b9b --- /dev/null +++ b/dc3-driver/dc3-driver-virtual/src/main/resources/application-dev.yml @@ -0,0 +1,14 @@ +# Development environment, customizable configuration +eureka: + instance: + # Custom node registration IP + ip-address: ${SERVICE_HOST:192.168.0.103} + +# Log config +logging: + level: + com.dc3: DEBUG + com.dc3.common.sdk: DEBUG + com.dc3.common.sdk.service: DEBUG + com.dc3.common.sdk.service.job: DEBUG + com.dc3.common.sdk.service.rabbit: DEBUG \ No newline at end of file diff --git a/dc3-driver/dc3-driver-virtual/src/main/resources/application-prod.yml b/dc3-driver/dc3-driver-virtual/src/main/resources/application-prod.yml new file mode 100644 index 000000000..e6d2397dc --- /dev/null +++ b/dc3-driver/dc3-driver-virtual/src/main/resources/application-prod.yml @@ -0,0 +1 @@ +# Product environment, customizable configuration \ No newline at end of file diff --git a/dc3-driver/dc3-driver-virtual/src/main/resources/application-test.yml b/dc3-driver/dc3-driver-virtual/src/main/resources/application-test.yml new file mode 100644 index 000000000..32fda2164 --- /dev/null +++ b/dc3-driver/dc3-driver-virtual/src/main/resources/application-test.yml @@ -0,0 +1 @@ +# Test environment, customizable configuration \ No newline at end of file diff --git a/dc3-driver/dc3-driver-virtual/src/main/resources/application.yml b/dc3-driver/dc3-driver-virtual/src/main/resources/application.yml index 26ea5171d..c76d73347 100644 --- a/dc3-driver/dc3-driver-virtual/src/main/resources/application.yml +++ b/dc3-driver/dc3-driver-virtual/src/main/resources/application.yml @@ -1,6 +1,5 @@ driver: name: VirtualDriver - tenant: default type: driver project: @project.artifactId@ description: @project.description@ @@ -51,14 +50,16 @@ server: port: 8600 spring: - application: - name: ${driver.project}_${driver.tenant} + profiles: + active: + - server + - register + - monitor + - rabbitmq + - quartz + - driver + - ${NODE_ENV:dev} logging: - level: - com.dc3: DEBUG - #com.dc3.common.sdk.service: INFO - #com.dc3.common.sdk.service.job: INFO - #com.dc3.common.sdk.service.rabbit: INFO file: name: dc3/logs/driver/virtual/${spring.application.name}.log \ No newline at end of file diff --git a/dc3/docker-compose.yml b/dc3/docker-compose.yml index c4ae703dc..4c6564c78 100644 --- a/dc3/docker-compose.yml +++ b/dc3/docker-compose.yml @@ -687,7 +687,7 @@ services: image: pnoker/dc3-emqx:1.0.0 restart: always ports: - - 1883:1883 + #- 1883:1883 - 8883:8883 - 18083:18083 container_name: dc3-emqx