Pre Merge pull request !375 from DoubleFire/N/A

!397 修复actuator暴漏问题
Merge pull request !397 from 威士忌的纯度/N/A
2026-01-26 11:51:55 +08:00 · 2025-03-10 03:45:51 +00:00 · 2025-03-10 03:45:34 +00:00 · 2025-03-07 10:22:52 +00:00 · 2024-08-19 12:22:24 +00:00
2 changed files with 2 additions and 2 deletions
--- a/docker/nginx/conf/nginx.conf
+++ b/docker/nginx/conf/nginx.conf
@@ -29,7 +29,7 @@ http {
        }
        # 避免actuator暴露
-        if ($request_uri ~ "/actuator") {
+        if ($uri ~ "/actuator") {
            return 403;
        }
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
@@ -53,7 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		</if>
 		<!-- 数据范围过滤 -->
 		${params.dataScope}
-		order by r.role_sort
+		order by r.role_sort, r.role_id
 	</select>
 	<select id="selectRolePermissionByUserId" parameterType="Long" resultMap="SysRoleResult">
Author	SHA1	Message	Date
DoubleFire	a2c712e2bb	Pre Merge pull request !375 from DoubleFire/N/A	2025-03-10 03:45:51 +00:00
若依	a6bcebb62b	!397 修复actuator暴漏问题 Merge pull request !397 from 威士忌的纯度/N/A	2025-03-10 03:45:34 +00:00
威士忌的纯度	1cb262daa3	修复actuator暴漏问题 Signed-off-by: 威士忌的纯度 <whr888888@vip.qq.com>	2025-03-07 10:22:52 +00:00
DoubleFire	0300517faa	role_sort相同时分页查询的数据不正确 Signed-off-by: DoubleFire <oxsss@qq.com>	2024-08-19 12:22:24 +00:00