Merge branch 'master' of http://60.171.161.56:20000/tjf/deviceManage

pom.xml

@@ -8,9 +8,9 @@
     <artifactId>ruoyi</artifactId>
     <version>3.8.9</version>
 
-    <name>ruoyi</name>
-    <url>http://www.ruoyi.vip</url>
-    <description>若依管理系统</description>
+    <name>boman</name>
+    <url>https://www.baidu.com/</url>
+    <description>物业管理系统</description>
     
     <properties>
         <ruoyi.version>3.8.9</ruoyi.version>

ruoyi-admin/src/main/resources/application-druid.yml

@@ -39,7 +39,7 @@ spring:
 #        port: 20001
         port: 6379
         # 数据库索引
-        database: 9
+        database: 10
         # 密码
 #        password: Boman123
         password: 123456
@@ -97,13 +97,13 @@ spring:
             webStatFilter:
                 enabled: true
             statViewServlet:
-                enabled: true
+                enabled: false
                 # 设置白名单，不填则允许所有访问
                 allow:
                 url-pattern: /druid/*
                 # 控制台管理用户名和密码
-                login-username: ruoyi
-                login-password: 123456
+                login-username: admin
+                login-password: Boman123
             filter:
                 stat:
                     enabled: true

ruoyi-admin/src/main/resources/application-prod.yml

@@ -7,9 +7,9 @@ ruoyi:
     # 版权年份
     copyrightYear: 2025
     # 实例演示开关
-    demoEnabled: true
+    demoEnabled: false
     # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
-    profile: /home/ruoyi/uploadPath/wuyeguanli
+    profile: /home/ruoyi/uploadPath/deviceManage
     # 获取ip地址开关
     addressEnabled: false
     # 验证码类型 math 数组计算 char 字符验证
@@ -18,7 +18,7 @@ ruoyi:
 # 开发环境配置
 server:
     # 服务器的HTTP端口，默认为8080
-    port: 8074
+    port: 8099
     servlet:
         # 应用的访问路径
         context-path: /
@@ -61,7 +61,7 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://127.0.0.1:3306/wuye_guanli?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
+                url: jdbc:mysql://127.0.0.1:3306/device_manage?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
                 username: root
                 password: zhaoshang@2018
             # 从库数据源
@@ -102,11 +102,11 @@ spring:
                 allow:
                 url-pattern: /druid/*
                 # 控制台管理用户名和密码
-                login-username:
-                login-password:
+                login-username: admin
+                login-password: Boman123
             filter:
                 stat:
-                    enabled: true
+                    enabled: false
                     # 慢SQL记录
                     log-slow-sql: true
                     slow-sql-millis: 1000