Merge branch 'master' of http://47.115.223.229:8888/yangjun/nursing_unit_java

# Conflicts:
#	nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/mapper/xml/CameraInfoMapper.xml

nursing-unit-system/nu-system-start/src/main/resources/application-uat.yml

@@ -7,7 +7,7 @@ server:
     include-stacktrace: ALWAYS
     include-message: ALWAYS
   servlet:
-    context-path: /nursingunit001
+    context-path: /biz101
   compression:
     enabled: true
     min-response-size: 1024
@@ -192,11 +192,11 @@ spring:
           password: uGDBkM25I6nZCNM2
           driver-class-name: com.mysql.cj.jdbc.Driver
         # 多数据源配置-试验田 TODO 需要创建对应只读账号 不同服务器间需要更改ip端口  另外注意是否采用了VPC
-        nuro:
-          url: jdbc:mysql://mysql8-prod:3306/nursing_unit?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
-          username: fw8864sshdang
-          password: uGDBkM25I6nZCNM2
-          driver-class-name: com.mysql.cj.jdbc.Driver
+#        nuro:
+#          url: jdbc:mysql://mysql8-prod:3306/nursing_unit?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+#          username: fw8864sshdang
+#          password: uGDBkM25I6nZCNM2
+#          driver-class-name: com.mysql.cj.jdbc.Driver
   #redis 配置
   redis:
     database: 0
@@ -256,9 +256,9 @@ jeecg:
     #服务指令上传目录
     directivepath: /opt/upFiles001/directive
     #文件上传根目录 设置
-    upload: /opt/nu001/upFiles
+    upload: /opt/biz101/upFiles
     #webapp文件路径
-    webapp: /opt/nu001/webapp
+    webapp: /opt/biz101/webapp
   shiro:
     excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/bigscreen/category/**,/bigscreen/visual/**,/bigscreen/map/**,/jmreport/bigscreen2/**
   #阿里云oss存储和大鱼短信秘钥配置

pom.xml

@@ -458,7 +458,7 @@
             <id>dev</id>
             <activation>
                 <!--默认激活配置-->
-                <activeByDefault>true</activeByDefault>
+                <activeByDefault>false</activeByDefault>
             </activation>
             <properties>
                 <!--当前环境-->
@@ -470,7 +470,7 @@
             <id>uat</id>
             <activation>
                 <!--默认激活配置-->
-                <activeByDefault>false</activeByDefault>
+                <activeByDefault>true</activeByDefault>
             </activation>
             <properties>
                 <!--当前环境-->