Merge remote-tracking branch 'upstream/main'

# Conflicts:
#	fys-admin/src/main/java/com/fuyuanshen/app/service/AppDeviceBizService.java
#	fys-admin/src/main/java/com/fuyuanshen/app/service/AppLoginService.java
#	fys-admin/src/main/java/com/fuyuanshen/web/handler/mqtt/DeviceReceiverMessageHandler.java
#	fys-admin/src/main/resources/application-prod.yml
#	fys-modules/fys-app/src/main/java/com/fuyuanshen/app/service/impl/AppUserServiceImpl.java

pom.xml

@@ -102,6 +102,20 @@
             <!--     <activeByDefault>true</activeByDefault> -->
             <!-- </activation> -->
         </profile>
+        <profile>
+            <id>jingquan</id>
+            <properties>
+                <!-- 环境标识，需要与配置文件的名称相对应 -->
+                <profiles.active>jingquan</profiles.active>
+                <logging.level>info</logging.level>
+                <monitor.username>fys</monitor.username>
+                <monitor.password>123456</monitor.password>
+            </properties>
+            <!-- <activation> -->
+            <!--     &lt;!&ndash; 默认环境 &ndash;&gt; -->
+            <!--     <activeByDefault>true</activeByDefault> -->
+            <!-- </activation> -->
+        </profile>
     </profiles>
 
     <!-- 依赖声明 -->