diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java
index 35b04da..f38cea9 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java
@@ -115,12 +115,12 @@
                 + busConfigDTO.getIp() + "," + busConfigDTO.getPort() + "," + busConfigDTO.getThreshold();//按照重传次数、采集间隔、上传周期
         busConfig.setFramecontent(str);
         save(busConfig);
-        String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.H2s.toString(),
+         redisCommon.sendMsg(DeviceTypeEnum.H2s.toString(),
                 busConfig.getDeviceId(), busConfig.getFramecontent(), busConfigDTO.getAttemptsMax());
-        //发布消息订阅
-        if (StrUtil.isNotBlank(concentratorCode)) {
-            RedisPublisherUtil.getInstance().publishMessage(concentratorCode);
-        }
+//        //发布消息订阅
+//        if (StrUtil.isNotBlank(concentratorCode)) {
+//            RedisPublisherUtil.getInstance().publishMessage(concentratorCode);
+//        }
     }
 
     @Transactional

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java
index 35b04da..f38cea9 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java
@@ -115,12 +115,12 @@
                 + busConfigDTO.getIp() + "," + busConfigDTO.getPort() + "," + busConfigDTO.getThreshold();//按照重传次数、采集间隔、上传周期
         busConfig.setFramecontent(str);
         save(busConfig);
-        String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.H2s.toString(),
+         redisCommon.sendMsg(DeviceTypeEnum.H2s.toString(),
                 busConfig.getDeviceId(), busConfig.getFramecontent(), busConfigDTO.getAttemptsMax());
-        //发布消息订阅
-        if (StrUtil.isNotBlank(concentratorCode)) {
-            RedisPublisherUtil.getInstance().publishMessage(concentratorCode);
-        }
+//        //发布消息订阅
+//        if (StrUtil.isNotBlank(concentratorCode)) {
+//            RedisPublisherUtil.getInstance().publishMessage(concentratorCode);
+//        }
     }
 
     @Transactional
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ThirdUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ThirdUserController.java
index 2f0eb3e..07c65c7 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ThirdUserController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ThirdUserController.java
@@ -51,27 +51,27 @@
      */
     @RequestMapping("/user/login/token")
     public Object userLoginToken(@RequestBody UserVO userVO) {
-        return  loginIn(userVO.getUserCode());
+        return loginIn(userVO.getUserCode());
     }
 
 
     private Object loginIn(String userCode) {
         String password = "111111";
         SuccessResponseData resultData = new SuccessResponseData();
-        LockAccountDTO lockAccountDTO = this.loginCheckService.invalidLockAccount(userCode);
+        //去除用户登录锁
+//        LockAccountDTO lockAccountDTO = this.loginCheckService.invalidLockAccount(userCode);
         super.getSession().setAttribute("isApp", false);
         Subject currentUser = ShiroKit.getSubject();
         UsernamePasswordToken token = new UsernamePasswordToken(userCode, password.toCharArray());
         token.setRememberMe(false);
         try {
             currentUser.login(token);
-            CacheUtil.remove("CONSTANT_ADMIN", "lock_account_" + lockAccountDTO.getAccount());
+//            CacheUtil.remove("CONSTANT_ADMIN", "lock_account_" + lockAccountDTO.getAccount());
         } catch (Exception var17) {
             resultData.setCode(BizExceptionEnum.USER_NOT_EXISTED.getCode());
             resultData.setMessage(I18nFactory.getMessage("admin.nouser.error"));
-            return this.loginCheckService.checkLoginException(var17, resultData, lockAccountDTO);
+            return ResponseData.success();
         }
-
         AuthUser authUser = ShiroKit.getUser();
         super.getSession().setAttribute("shiroUser", authUser);
         super.getSession().setAttribute("username", authUser.getAccount());

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java
index 35b04da..f38cea9 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java
@@ -115,12 +115,12 @@
                 + busConfigDTO.getIp() + "," + busConfigDTO.getPort() + "," + busConfigDTO.getThreshold();//按照重传次数、采集间隔、上传周期
         busConfig.setFramecontent(str);
         save(busConfig);
-        String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.H2s.toString(),
+         redisCommon.sendMsg(DeviceTypeEnum.H2s.toString(),
                 busConfig.getDeviceId(), busConfig.getFramecontent(), busConfigDTO.getAttemptsMax());
-        //发布消息订阅
-        if (StrUtil.isNotBlank(concentratorCode)) {
-            RedisPublisherUtil.getInstance().publishMessage(concentratorCode);
-        }
+//        //发布消息订阅
+//        if (StrUtil.isNotBlank(concentratorCode)) {
+//            RedisPublisherUtil.getInstance().publishMessage(concentratorCode);
+//        }
     }
 
     @Transactional
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ThirdUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ThirdUserController.java
index 2f0eb3e..07c65c7 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ThirdUserController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ThirdUserController.java
@@ -51,27 +51,27 @@
      */
     @RequestMapping("/user/login/token")
     public Object userLoginToken(@RequestBody UserVO userVO) {
-        return  loginIn(userVO.getUserCode());
+        return loginIn(userVO.getUserCode());
     }
 
 
     private Object loginIn(String userCode) {
         String password = "111111";
         SuccessResponseData resultData = new SuccessResponseData();
-        LockAccountDTO lockAccountDTO = this.loginCheckService.invalidLockAccount(userCode);
+        //去除用户登录锁
+//        LockAccountDTO lockAccountDTO = this.loginCheckService.invalidLockAccount(userCode);
         super.getSession().setAttribute("isApp", false);
         Subject currentUser = ShiroKit.getSubject();
         UsernamePasswordToken token = new UsernamePasswordToken(userCode, password.toCharArray());
         token.setRememberMe(false);
         try {
             currentUser.login(token);
-            CacheUtil.remove("CONSTANT_ADMIN", "lock_account_" + lockAccountDTO.getAccount());
+//            CacheUtil.remove("CONSTANT_ADMIN", "lock_account_" + lockAccountDTO.getAccount());
         } catch (Exception var17) {
             resultData.setCode(BizExceptionEnum.USER_NOT_EXISTED.getCode());
             resultData.setMessage(I18nFactory.getMessage("admin.nouser.error"));
-            return this.loginCheckService.checkLoginException(var17, resultData, lockAccountDTO);
+            return ResponseData.success();
         }
-
         AuthUser authUser = ShiroKit.getUser();
         super.getSession().setAttribute("shiroUser", authUser);
         super.getSession().setAttribute("username", authUser.getAccount());
diff --git a/casic-web/src/main/resources/config/application-dm.yml b/casic-web/src/main/resources/config/application-dm.yml
index 7293eec..e0c79d7 100644
--- a/casic-web/src/main/resources/config/application-dm.yml
+++ b/casic-web/src/main/resources/config/application-dm.yml
@@ -24,9 +24,9 @@
   session:
     store-type: redis
   redis:
-    host: 111.198.10.15
-    port: 11412
-    password: ew5T4K3#203lwh
+    host: 10.80.1.124
+    port: 31681
+    password:
     redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
   jms:
     pub-sub-domain: true

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java
index 35b04da..f38cea9 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusH2sConfigServiceImpl.java
@@ -115,12 +115,12 @@
                 + busConfigDTO.getIp() + "," + busConfigDTO.getPort() + "," + busConfigDTO.getThreshold();//按照重传次数、采集间隔、上传周期
         busConfig.setFramecontent(str);
         save(busConfig);
-        String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.H2s.toString(),
+         redisCommon.sendMsg(DeviceTypeEnum.H2s.toString(),
                 busConfig.getDeviceId(), busConfig.getFramecontent(), busConfigDTO.getAttemptsMax());
-        //发布消息订阅
-        if (StrUtil.isNotBlank(concentratorCode)) {
-            RedisPublisherUtil.getInstance().publishMessage(concentratorCode);
-        }
+//        //发布消息订阅
+//        if (StrUtil.isNotBlank(concentratorCode)) {
+//            RedisPublisherUtil.getInstance().publishMessage(concentratorCode);
+//        }
     }
 
     @Transactional
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ThirdUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ThirdUserController.java
index 2f0eb3e..07c65c7 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ThirdUserController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/ThirdUserController.java
@@ -51,27 +51,27 @@
      */
     @RequestMapping("/user/login/token")
     public Object userLoginToken(@RequestBody UserVO userVO) {
-        return  loginIn(userVO.getUserCode());
+        return loginIn(userVO.getUserCode());
     }
 
 
     private Object loginIn(String userCode) {
         String password = "111111";
         SuccessResponseData resultData = new SuccessResponseData();
-        LockAccountDTO lockAccountDTO = this.loginCheckService.invalidLockAccount(userCode);
+        //去除用户登录锁
+//        LockAccountDTO lockAccountDTO = this.loginCheckService.invalidLockAccount(userCode);
         super.getSession().setAttribute("isApp", false);
         Subject currentUser = ShiroKit.getSubject();
         UsernamePasswordToken token = new UsernamePasswordToken(userCode, password.toCharArray());
         token.setRememberMe(false);
         try {
             currentUser.login(token);
-            CacheUtil.remove("CONSTANT_ADMIN", "lock_account_" + lockAccountDTO.getAccount());
+//            CacheUtil.remove("CONSTANT_ADMIN", "lock_account_" + lockAccountDTO.getAccount());
         } catch (Exception var17) {
             resultData.setCode(BizExceptionEnum.USER_NOT_EXISTED.getCode());
             resultData.setMessage(I18nFactory.getMessage("admin.nouser.error"));
-            return this.loginCheckService.checkLoginException(var17, resultData, lockAccountDTO);
+            return ResponseData.success();
         }
-
         AuthUser authUser = ShiroKit.getUser();
         super.getSession().setAttribute("shiroUser", authUser);
         super.getSession().setAttribute("username", authUser.getAccount());
diff --git a/casic-web/src/main/resources/config/application-dm.yml b/casic-web/src/main/resources/config/application-dm.yml
index 7293eec..e0c79d7 100644
--- a/casic-web/src/main/resources/config/application-dm.yml
+++ b/casic-web/src/main/resources/config/application-dm.yml
@@ -24,9 +24,9 @@
   session:
     store-type: redis
   redis:
-    host: 111.198.10.15
-    port: 11412
-    password: ew5T4K3#203lwh
+    host: 10.80.1.124
+    port: 31681
+    password:
     redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
   jms:
     pub-sub-domain: true
diff --git a/casic-web/src/main/resources/config/application-postgre.yml b/casic-web/src/main/resources/config/application-postgre.yml
index 39dfb3b..8fa603e 100644
--- a/casic-web/src/main/resources/config/application-postgre.yml
+++ b/casic-web/src/main/resources/config/application-postgre.yml
@@ -22,7 +22,7 @@
     host: 127.0.0.1
     port: 6379
     password:
-  activemq:
+  activemq:r
     user:
     password:
     broker-url: tcp://192.168.0.203:61616