sun15684712291/sdwu_dw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

完成用户第一阶段的需求

Browse Source
This commit is contained in:
sunyg
2025-08-01 08:33:03 +08:00
parent 9b6f200292
commit 7514482e33
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-admin/src/main/resources/application.yml
View File

@ -50,7 +50,7 @@ spring:
# 国际化资源文件路径 # 国际化资源文件路径
basename: i18n/messages basename: i18n/messages
profiles: profiles:
active: prod active: dev
# 文件上传 # 文件上传
servlet: servlet:
multipart: multipart:
@ -71,7 +71,7 @@ token:
# 令牌密钥 # 令牌密钥
secret: abcdefghijklmnopqrstuvwxyz secret: abcdefghijklmnopqrstuvwxyz
# 令牌有效期（默认30分钟） # 令牌有效期（默认30分钟）
expireTime: 30 expireTime: 1000
# MyBatis配置 # MyBatis配置
mybatis: mybatis:

4
ruoyi-dw/src/main/java/com/ruoyi/dw/service/impl/CjStudentServiceImpl.java
View File

@ -321,8 +321,8 @@ public class CjStudentServiceImpl implements ICjStudentService
return null; return null;
} }
String province = address.substring(0, provinceIndex + 1); // 包含"省" String province = address.substring(0, provinceIndex ); // 不包含"省"
String city = address.substring(provinceIndex + 1, cityIndex + 1); // 从省后到"市"结束 String city = address.substring(provinceIndex + 1, cityIndex); // 从省后到"市"结束
Map<String, String> result = new HashMap<>(); Map<String, String> result = new HashMap<>();
result.put("province", province); result.put("province", province);

4
ruoyi-dw/src/main/resources/mapper/dw/DwIndexConfigMapper.xml
View File

@ -106,7 +106,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
from cj_student from cj_student
where sfqr = 1 where sfqr = 1
and cast(bynf as unsigned) 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 group by bynf order by bynf desc
</select> </select>
@ -120,7 +120,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
FROM cj_student FROM cj_student
where sfqr = 1 and sydsh is not null where sfqr = 1 and sydsh is not null
and cast(bynf as unsigned) 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 GROUP BY
CASE CASE
WHEN sydsh = '山东' THEN sydshi WHEN sydsh = '山东' THEN sydshi

2
ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/AuthenticationEntryPointImpl.java
View File

@ -27,7 +27,7 @@ public class AuthenticationEntryPointImpl implements AuthenticationEntryPoint, S
public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException e) public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException e)
{ {
int code = HttpStatus.UNAUTHORIZED; int code = HttpStatus.UNAUTHORIZED;
String msg = StringUtils.format("请求访问：{}，认证失败，无法访问系统资源", request.getRequestURI()); String msg = "登录信息过期，请重新登录";
try try
{ {
response.setStatus(401); response.setStatus(401);