diff --git a/pqs-auth/src/main/resources/bootstrap.yml b/pqs-auth/src/main/resources/bootstrap.yml index a2d7b6b94..5660b5cff 100644 --- a/pqs-auth/src/main/resources/bootstrap.yml +++ b/pqs-auth/src/main/resources/bootstrap.yml @@ -50,7 +50,4 @@ mybatis-plus: type-aliases-package: com.njcn.user.pojo mqtt: - uri: tcp://@middle.server.url@:1883 client-id: @artifactId@${random.value} - username: t_user - password: njcnpqs diff --git a/pqs-device/device-boot/src/main/resources/bootstrap.yml b/pqs-device/device-boot/src/main/resources/bootstrap.yml index 7ef31fc6e..23dc3c387 100644 --- a/pqs-device/device-boot/src/main/resources/bootstrap.yml +++ b/pqs-device/device-boot/src/main/resources/bootstrap.yml @@ -57,8 +57,5 @@ mybatis-plus: mqtt: - uri: tcp://@middle.server.url@:1883 client-id: @artifactId@${random.value} - username: t_user - password: njcnpqs diff --git a/pqs-energy/energy-boot/src/main/resources/bootstrap.yml b/pqs-energy/energy-boot/src/main/resources/bootstrap.yml index aee1454ec..1e900cca4 100644 --- a/pqs-energy/energy-boot/src/main/resources/bootstrap.yml +++ b/pqs-energy/energy-boot/src/main/resources/bootstrap.yml @@ -49,7 +49,4 @@ mybatis-plus: mqtt: - uri: tcp://@middle.server.url@:1883 client-id: @artifactId@${random.value} - username: t_user - password: njcnpqs \ No newline at end of file diff --git a/pqs-event/event-boot/src/main/resources/bootstrap.yml b/pqs-event/event-boot/src/main/resources/bootstrap.yml index b3d91bb60..3ebf023df 100644 --- a/pqs-event/event-boot/src/main/resources/bootstrap.yml +++ b/pqs-event/event-boot/src/main/resources/bootstrap.yml @@ -43,7 +43,4 @@ logging: mybatis-plus: type-aliases-package: com.njcn.event.pojo mqtt: - uri: tcp://@middle.server.url@:1883 client-id: @artifactId@${random.value} - username: t_user - password: njcnpqs diff --git a/pqs-gateway/src/main/resources/bootstrap.yml b/pqs-gateway/src/main/resources/bootstrap.yml index 2eebcb185..9af01055d 100644 --- a/pqs-gateway/src/main/resources/bootstrap.yml +++ b/pqs-gateway/src/main/resources/bootstrap.yml @@ -134,10 +134,7 @@ whitelist: mqtt: - uri: tcp://@middle.server.url@:1883 client-id: @artifactId@${random.value} - username: t_user - password: njcnpqs diff --git a/pqs-harmonic/harmonic-boot/src/main/resources/bootstrap.yml b/pqs-harmonic/harmonic-boot/src/main/resources/bootstrap.yml index 633c2d63b..ddc4f5433 100644 --- a/pqs-harmonic/harmonic-boot/src/main/resources/bootstrap.yml +++ b/pqs-harmonic/harmonic-boot/src/main/resources/bootstrap.yml @@ -49,10 +49,7 @@ mybatis-plus: mqtt: - uri: tcp://@middle.server.url@:1883 client-id: @artifactId@${random.value} - username: t_user - password: njcnpqs diff --git a/pqs-quality/quality-boot/src/main/java/com/njcn/quality/service/impl/ModelServiceImpl.java b/pqs-quality/quality-boot/src/main/java/com/njcn/quality/service/impl/ModelServiceImpl.java index b3e498659..1de02815b 100644 --- a/pqs-quality/quality-boot/src/main/java/com/njcn/quality/service/impl/ModelServiceImpl.java +++ b/pqs-quality/quality-boot/src/main/java/com/njcn/quality/service/impl/ModelServiceImpl.java @@ -489,7 +489,7 @@ public class ModelServiceImpl implements IModelService { if (Objects.isNull(map.get(item.getName()))){ throw new BusinessException(EnergyResponseEnum.MODEL_ERROR); } - devCfgParam.setIdx(map.get(item.getName() + item.getVersion() + item.getTime())); + devCfgParam.setIdx(map.get(item.getName())); devCfgParam.setName(item.getDevInfo().getDevName()); LogicDev logicDev = logicDeviceLineService.add(devCfgParam); //逻辑设备入库->硬件信息表 diff --git a/pqs-quality/quality-boot/src/main/resources/bootstrap.yml b/pqs-quality/quality-boot/src/main/resources/bootstrap.yml index bddec7bfc..dd54e9548 100644 --- a/pqs-quality/quality-boot/src/main/resources/bootstrap.yml +++ b/pqs-quality/quality-boot/src/main/resources/bootstrap.yml @@ -51,7 +51,4 @@ mybatis-plus: mqtt: - uri: tcp://@middle.server.url@:1883 client-id: @artifactId@${random.value} - username: t_user - password: njcnpqs \ No newline at end of file diff --git a/pqs-system/system-boot/src/main/resources/bootstrap.yml b/pqs-system/system-boot/src/main/resources/bootstrap.yml index d54ff9e2c..de2a49d16 100644 --- a/pqs-system/system-boot/src/main/resources/bootstrap.yml +++ b/pqs-system/system-boot/src/main/resources/bootstrap.yml @@ -50,7 +50,4 @@ mybatis-plus: mqtt: - uri: tcp://@middle.server.url@:1883 client-id: @artifactId@${random.value} - username: t_user - password: njcnpqs \ No newline at end of file diff --git a/pqs-user/user-boot/src/main/resources/bootstrap.yml b/pqs-user/user-boot/src/main/resources/bootstrap.yml index 7faaeb066..24ea12ff4 100644 --- a/pqs-user/user-boot/src/main/resources/bootstrap.yml +++ b/pqs-user/user-boot/src/main/resources/bootstrap.yml @@ -50,7 +50,4 @@ mybatis-plus: type-aliases-package: com.njcn.user.pojo mqtt: - uri: tcp://@middle.server.url@:1883 client-id: @artifactId@${random.value} - username: t_user - password: njcnpqs