From f4f653b1f69eae7eee5249b9f41e43bdf3239aa1 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 09 四月 2026 15:45:56 +0800
Subject: [PATCH] 修改bug
---
ruoyi-admin/src/main/resources/application-prod.yml | 26 +++++++++++---------------
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DashboardStatisticsController.java | 6 ------
pom.xml | 2 +-
ruoyi-admin/src/main/resources/application.yml | 2 +-
4 files changed, 13 insertions(+), 23 deletions(-)
diff --git a/pom.xml b/pom.xml
index 5ae3d78..a35e1a7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -186,7 +186,7 @@
<module>ruoyi-quartz</module>
<module>ruoyi-generator</module>
<module>ruoyi-common</module>
- <module>ruoyi-applet</module>
+<!-- <module>ruoyi-applet</module>-->
</modules>
<packaging>pom</packaging>
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DashboardStatisticsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DashboardStatisticsController.java
index 3b19da2..46cd4e3 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DashboardStatisticsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DashboardStatisticsController.java
@@ -3,8 +3,6 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.domain.model.LoginUser;
-import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.model.*;
import com.ruoyi.system.query.StoryListQuery;
@@ -15,15 +13,11 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
-import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
-import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
-import java.util.HashMap;
import java.util.List;
-import java.util.Optional;
/**
* 数据统计面板 前端控制器
diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml
index 78e25d1..1e5ac12 100644
--- a/ruoyi-admin/src/main/resources/application-prod.yml
+++ b/ruoyi-admin/src/main/resources/application-prod.yml
@@ -20,7 +20,7 @@
port: 9908
servlet:
# 应用的访问路径
- context-path: /manage/
+ context-path: /
tomcat:
# tomcat的URI编码
uri-encoding: UTF-8
@@ -65,24 +65,17 @@
devtools:
restart:
# 热部署开关
- enabled: true
+ enabled: false
# redis 配置
redis:
# 地址
- # host: 127.0.0.1
- # # 端口，默认为6379
- # port: 6379
- # # 数据库索引
- # database: 0
- # # 密码
- # password: 123456
host: 127.0.0.1
# 端口，默认为6379
port: 6379
# 数据库索引
- database: 0
+ database: 1
# 密码
- password: jsd2026!
+ password: 123456
# 连接超时时间
timeout: 10s
lettuce:
@@ -102,9 +95,9 @@
druid:
# 主库数据源
master:
- url: jdbc:mysql://127.0.0.1:3306/jiashida?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
- username: root
- password: Jiashida@2026!
+ url: jdbc:mysql://localhost:3306/estate_dgzp?useSSL=false&autoReconnect=true&useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull&allowPublicKeyRetrieval=true
+ username: admin
+ password: ZXtzbsMuCIFbmBW4HtOjRd
# 从库数据源
slave:
# 从数据源开关/默认关闭
@@ -183,6 +176,7 @@
# 请求前缀
pathMapping: /
+
# 防止XSS攻击
xss:
# 过滤开关
@@ -194,10 +188,12 @@
# file upload
file:
upload:
+ dir: F:\file\estate
+ dirFile: F:\file\estate\files
location: /file/
qrLocation: /file/qrCode/
accessPath: /file/
- allowExt: .jpg|.png|.gif|.jpeg|.doc|.docx|.apk|.MP4|.mp4|.pdf|.PDF|.xls|.xlsx|.rar|.zip|.rar|.ppt|.PPT|.pptx|.CAJ|.caj|.bmp
+ allowExt: .jpg|.png|.gif|.jpeg|.doc|.docx|.apk|.MP4|.mp4|.pdf|.PDF|.xls|.xlsx|.rar|.zip|.rar
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index db8d17c..b205a93 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -1,4 +1,4 @@
# 项目相关配置
spring:
profiles:
- active: test
\ No newline at end of file
+ active: prod
\ No newline at end of file
--
Gitblit v1.7.1