diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/ToolController.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/ToolController.java
index 6141e257..8199bb80 100644
--- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/ToolController.java
+++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/ToolController.java
@@ -176,14 +176,15 @@ public class ToolController extends BaseController {
         }
         String mqttPassword = passwordArray[0];
         String authCode = passwordArray.length == 2 ? passwordArray[1] : "";
+        // 验证用户名和密码
         if ((!mqttConfig.getusername().equals(mqttModel.getUserName())) || (!mqttConfig.getpassword().equals(mqttPassword))) {
             return returnUnauthorized(mqttModel, "设备简单认证，mqtt账号和密码与认证服务器配置不匹配");
         }
-        // 授权码处理
+        // 验证授权码
         if (productModel.getIsAuthorize() == 1) {
             // 授权码验证和处理
             String resultMessage = authCodeProcess(authCode, mqttModel, productModel);
-            if (resultMessage != "") {
+            if (!resultMessage.equals("")) {
                 return returnUnauthorized(mqttModel, resultMessage);
             }
         }
@@ -222,22 +223,26 @@ public class ToolController extends BaseController {
         String mqttPassword = passwordArray[0];
         Long expireTime = Long.valueOf(passwordArray[1]);
         String authCode = passwordArray.length == 3 ? passwordArray[2] : "";
-        if (productModel.getIsAuthorize() == 1) {
-            // 授权码验证和处理
-            String resultMessage = authCodeProcess(authCode, mqttModel, productModel);
-            if (resultMessage != "") {
-                return returnUnauthorized(mqttModel, resultMessage);
-            }
-        }
-        if (!mqttPassword.equals(productModel.getMqttPassword())) {
-            return returnUnauthorized(mqttModel, "设备加密认证，设备mqtt密码错误");
-        }
+        // 验证用户名
         if (!mqttModel.getUserName().equals(productModel.getMqttAccount())) {
             return returnUnauthorized(mqttModel, "设备加密认证，设备mqtt用户名错误");
         }
+        // 验证密码
+        if (!mqttPassword.equals(productModel.getMqttPassword())) {
+            return returnUnauthorized(mqttModel, "设备加密认证，设备mqtt密码错误");
+        }
+        // 验证过期时间
         if (expireTime < System.currentTimeMillis()) {
             return returnUnauthorized(mqttModel, "设备加密认证，设备mqtt密码已过期");
         }
+        // 验证授权码
+        if (productModel.getIsAuthorize() == 1) {
+            // 授权码验证和处理
+            String resultMessage = authCodeProcess(authCode, mqttModel, productModel);
+            if (!resultMessage.equals("")) {
+                return returnUnauthorized(mqttModel, resultMessage);
+            }
+        }
         // 设备状态验证 （1-未激活，2-禁用，3-在线，4-离线）
         if (productModel.getDeviceId() != null && productModel.getDeviceId() != 0) {
             if (productModel.getStatus() == 2) {
@@ -262,7 +267,7 @@ public class ToolController extends BaseController {
     private String authCodeProcess(String authCode, MqttAuthenticationModel mqttModel, ProductAuthenticateModel productModel) {
         String message = "";
         if (authCode.equals("")) {
-            message = "设备认证，设备授权码不能为空";
+            return message = "设备认证，设备授权码不能为空";
         }
         // 查询授权码是否存在
         ProductAuthorize authorize = productAuthorizeMapper.selectFirstAuthorizeByAuthorizeCode(new ProductAuthorize(authCode, productModel.getProductId()));
@@ -272,7 +277,7 @@ public class ToolController extends BaseController {
         }
         if (authorize.getSerialNumber() != null && !authorize.getSerialNumber().equals("")) {
             // 授权码已关联设备
-            if (authorize.getSerialNumber() != productModel.getSerialNumber()) {
+            if (!authorize.getSerialNumber().equals( productModel.getSerialNumber())) {
                 message = "设备认证，设备授权码已经分配给其他设备";
                 return message;
             }
diff --git a/vue/src/views/login.vue b/vue/src/views/login.vue
index a06612b0..9251f4b2 100644
--- a/vue/src/views/login.vue
+++ b/vue/src/views/login.vue
@@ -5,7 +5,7 @@
         <el-row :gutter="10">
             <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
                 <div class="login-top">
-                    <h1>物美智能 - 物联美好生活</h1>
+                    <h1>物美智能 - 开源生活物联网平台</h1>
                     <h2>wumei smart open source living iot platform</h2>
                 </div>
             </el-col>