完成用户第一阶段的需求

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:

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<String, String> result = new HashMap<>();
         result.put("province", province);

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
     </select>
 
@@ -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

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);