diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java index 80005b9..8185dc2 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java @@ -86,6 +86,7 @@ @Autowired private IBusConfigService busCommonConfigService; + @Value("${smartcity.device.sm4.deviceType}") private String deviceType; @Value("${smartcity.device.sm4.appId}") @@ -97,6 +98,9 @@ @Value("${smartcity.device.sm4.secretKey}") private String secretKey; + @Value("${smartcity.device.sm4.switch}") + private Boolean sm4Witch; + /** * 判断设备是否关联集中器 * @@ -752,6 +756,9 @@ } private Boolean insertSecretKey(String devcode, Boolean isReg) { + if(!sm4Witch){ + return false; + } //北控平台注册获取密钥 BusImeiIccid busImeiIccid = busImeiIccidService.selectOneByCode(devcode); if (ToolUtil.isNotEmpty(busImeiIccid)) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java index 80005b9..8185dc2 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java @@ -86,6 +86,7 @@ @Autowired private IBusConfigService busCommonConfigService; + @Value("${smartcity.device.sm4.deviceType}") private String deviceType; @Value("${smartcity.device.sm4.appId}") @@ -97,6 +98,9 @@ @Value("${smartcity.device.sm4.secretKey}") private String secretKey; + @Value("${smartcity.device.sm4.switch}") + private Boolean sm4Witch; + /** * 判断设备是否关联集中器 * @@ -752,6 +756,9 @@ } private Boolean insertSecretKey(String devcode, Boolean isReg) { + if(!sm4Witch){ + return false; + } //北控平台注册获取密钥 BusImeiIccid busImeiIccid = busImeiIccidService.selectOneByCode(devcode); if (ToolUtil.isNotEmpty(busImeiIccid)) { diff --git a/casic-web/pom.xml b/casic-web/pom.xml index 92f54e6..8ed2a4d 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -10,7 +10,7 @@ casic-web ${pro.version} - war + jar casic-web casic web启动入口 diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java index 80005b9..8185dc2 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java @@ -86,6 +86,7 @@ @Autowired private IBusConfigService busCommonConfigService; + @Value("${smartcity.device.sm4.deviceType}") private String deviceType; @Value("${smartcity.device.sm4.appId}") @@ -97,6 +98,9 @@ @Value("${smartcity.device.sm4.secretKey}") private String secretKey; + @Value("${smartcity.device.sm4.switch}") + private Boolean sm4Witch; + /** * 判断设备是否关联集中器 * @@ -752,6 +756,9 @@ } private Boolean insertSecretKey(String devcode, Boolean isReg) { + if(!sm4Witch){ + return false; + } //北控平台注册获取密钥 BusImeiIccid busImeiIccid = busImeiIccidService.selectOneByCode(devcode); if (ToolUtil.isNotEmpty(busImeiIccid)) { diff --git a/casic-web/pom.xml b/casic-web/pom.xml index 92f54e6..8ed2a4d 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -10,7 +10,7 @@ casic-web ${pro.version} - war + jar casic-web casic web启动入口 diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index a1e4796..40a4d7e 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -58,6 +58,7 @@ appSecret: dc43576cd2a045dfb48c93212fdbfdff url: http://117.119.83.196:8063 secretKey: 009f1bbe8ba832438b59ef81beab5169 + switch: false getui: appId: 115V4gtbgZ8OSC2U9vikz2 appKey: dyamRUrm2YAUYAkeYQmIQ