From 7514482e33b851c2fc7721bff40e8bc742584cf8 Mon Sep 17 00:00:00 2001 From: sunyugang Date: Fri, 1 Aug 2025 08:33:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E7=94=A8=E6=88=B7=E7=AC=AC?= =?UTF-8?q?=E4=B8=80=E9=98=B6=E6=AE=B5=E7=9A=84=E9=9C=80=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-admin/src/main/resources/application.yml | 4 ++-- .../java/com/ruoyi/dw/service/impl/CjStudentServiceImpl.java | 4 ++-- ruoyi-dw/src/main/resources/mapper/dw/DwIndexConfigMapper.xml | 4 ++-- .../security/handle/AuthenticationEntryPointImpl.java | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 6633a8d..1a2fc33 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -50,7 +50,7 @@ spring: # 国际化资源文件路径 basename: i18n/messages profiles: - active: prod + active: dev # 文件上传 servlet: multipart: @@ -71,7 +71,7 @@ token: # 令牌密钥 secret: abcdefghijklmnopqrstuvwxyz # 令牌有效期（默认30分钟） - expireTime: 30 + expireTime: 1000 # MyBatis配置 mybatis: diff --git a/ruoyi-dw/src/main/java/com/ruoyi/dw/service/impl/CjStudentServiceImpl.java b/ruoyi-dw/src/main/java/com/ruoyi/dw/service/impl/CjStudentServiceImpl.java index 2032aec..e2fd306 100644 --- a/ruoyi-dw/src/main/java/com/ruoyi/dw/service/impl/CjStudentServiceImpl.java +++ b/ruoyi-dw/src/main/java/com/ruoyi/dw/service/impl/CjStudentServiceImpl.java @@ -321,8 +321,8 @@ public class CjStudentServiceImpl implements ICjStudentService return null; } - String province = address.substring(0, provinceIndex + 1); // 包含"省" - String city = address.substring(provinceIndex + 1, cityIndex + 1); // 从省后到"市"结束 + String province = address.substring(0, provinceIndex ); // 不包含"省" + String city = address.substring(provinceIndex + 1, cityIndex); // 从省后到"市"结束 Map result = new HashMap<>(); result.put("province", province); diff --git a/ruoyi-dw/src/main/resources/mapper/dw/DwIndexConfigMapper.xml b/ruoyi-dw/src/main/resources/mapper/dw/DwIndexConfigMapper.xml index 6b5bbd8..3ca74c4 100644 --- a/ruoyi-dw/src/main/resources/mapper/dw/DwIndexConfigMapper.xml +++ b/ruoyi-dw/src/main/resources/mapper/dw/DwIndexConfigMapper.xml @@ -106,7 +106,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from cj_student where sfqr = 1 and cast(bynf as unsigned) - between YEAR(CURRENT_DATE) - #{year} + 1 and YEAR(CURRENT_DATE) + between YEAR(CURRENT_DATE) - #{year} and YEAR(CURRENT_DATE) group by bynf order by bynf desc @@ -120,7 +120,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" FROM cj_student where sfqr = 1 and sydsh is not null and cast(bynf as unsigned) - between YEAR(CURRENT_DATE) - #{year} + 1 and YEAR(CURRENT_DATE) + between YEAR(CURRENT_DATE) - #{year} and YEAR(CURRENT_DATE) GROUP BY CASE WHEN sydsh = '山东' THEN sydshi diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/AuthenticationEntryPointImpl.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/AuthenticationEntryPointImpl.java index 9574882..c8e42ea 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/AuthenticationEntryPointImpl.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/AuthenticationEntryPointImpl.java @@ -27,7 +27,7 @@ public class AuthenticationEntryPointImpl implements AuthenticationEntryPoint, S public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException e) { int code = HttpStatus.UNAUTHORIZED; - String msg = StringUtils.format("请求访问：{}，认证失败，无法访问系统资源", request.getRequestURI()); + String msg = "登录信息过期，请重新登录"; try { response.setStatus(401);