diff --git a/fys-admin/src/main/resources/application-prod.yml b/fys-admin/src/main/resources/application-prod.yml
index 5fd5908..45255db 100644
--- a/fys-admin/src/main/resources/application-prod.yml
+++ b/fys-admin/src/main/resources/application-prod.yml
@@ -52,9 +52,9 @@ spring:
           driverClassName: com.mysql.cj.jdbc.Driver
           # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562
           # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题)
-          url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
+          url: jdbc:mysql://localhost:3306/fys_vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
           username: root
-          password: root
+          password: Jz_5623_cl1
 #        # 从库数据源
 #        slave:
 #          lazy: true
@@ -105,9 +105,9 @@ spring.data:
     # 端口，默认为6379
     port: 6379
     # 数据库索引
-    database: 0
+    database: 1
     # redis 密码必须配置
-    password: fys123
+    password: re_fs_11520631
     # 连接超时时间
     timeout: 10s
     # 是否开启ssl
@@ -272,3 +272,37 @@ justauth:
       client-id: 10**********6
       client-secret: 1f7d08**********5b7**********29e
       redirect-uri: ${justauth.address}/social-callback?source=gitea
+
+
+# MQTT配置
+mqtt:
+  username: admin
+  password: #YtvpSfCNG
+  url: tcp://47.120.79.150:2883
+  subClientId: fys_subClient
+  subTopic: worker/alert/#,worker/location/#
+  pubTopic: worker/location
+  pubClientId: fys_pubClient
+
+
+# 文件存储路径
+file:
+  mac:
+    path: ~/file/
+    avatar: ~/avatar/
+  linux:
+    path: /home/eladmin/file/
+    avatar: /home/eladmin/avatar/
+  windows:
+    path: C:\eladmin\file\
+    avatar: C:\eladmin\avatar\
+  # 文件大小 /M
+  maxSize: 100
+  avatarMaxSize: 5
+  device:
+    pic: C:\eladmin\file\    #设备图片存储路径
+    ip: http://fuyuanshen.com:81/    #服务器地址
+  app_avatar:
+    pic: C:\eladmin\file\    #设备图片存储路径
+    #ip: http://fuyuanshen.com:81/    #服务器地址
+    ip: https://fuyuanshen.com/    #服务器地址
\ No newline at end of file
diff --git a/fys-admin/src/main/resources/application.yml b/fys-admin/src/main/resources/application.yml
index f550a10..3744835 100644
--- a/fys-admin/src/main/resources/application.yml
+++ b/fys-admin/src/main/resources/application.yml
@@ -1,7 +1,7 @@
 # 开发环境配置
 server:
   # 服务器的HTTP端口，默认为8080
-  port: 8001
+  port: 8000
   servlet:
     # 应用的访问路径
     context-path: /
diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/Device.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/Device.java
index 0c7da91..1b4ec8f 100644
--- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/Device.java
+++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/Device.java
@@ -59,7 +59,7 @@ public class Device extends TenantEntity {
     @Schema(name = "原始设备")
     private Long originalDeviceId;
 
-    @Schema( name = "设备编号")
+    @Schema(name = "设备编号")
     private String deviceNo;
 
     @Schema(name = "设备名称")
@@ -71,6 +71,9 @@ public class Device extends TenantEntity {
     @Schema(name = "设备MAC")
     private String deviceMac;
 
+    @Schema(name = "蓝牙名称")
+    private String bluetoothName;
+
     @Schema(name = "设备IMEI")
     private String deviceImei;
 
diff --git a/pom.xml b/pom.xml
index 7d1f7f3..8cb9b27 100644
--- a/pom.xml
+++ b/pom.xml
@@ -94,6 +94,10 @@
                 <monitor.username>fys</monitor.username>
                 <monitor.password>123456</monitor.password>
             </properties>
+            <!-- <activation> -->
+            <!--     &lt;!&ndash; 默认环境 &ndash;&gt; -->
+            <!--     <activeByDefault>true</activeByDefault> -->
+            <!-- </activation> -->
         </profile>
     </profiles>