tongtong/youlai-boot
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 包结构调整，整合ip2region解析ip的所在区域

Browse Source
This commit is contained in:
Ray.Hao
2024-06-27 14:47:50 +08:00
parent a0530dc380
commit d13adf233d
32 changed files with 90 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
src/main/resources/data/ip2region.xdb Normal file
View File

Binary file not shown.

2
src/main/resources/mapper/SysMenuMapper.xml
View File

@@ -48,7 +48,7 @@
LEFT JOIN sys_role_menu t2 ON t1.id = t2.menu_id
LEFT JOIN sys_role t3 ON t2.role_id = t3.id
WHERE
t1.type != '${@com.youlai.system.common.enums.MenuTypeEnum@BUTTON.getValue()}'
t1.type != '${@com.youlai.system.enums.MenuTypeEnum@BUTTON.getValue()}'
ORDER BY
t1.sort
</select>

4
src/main/resources/mapper/SysRoleMenuMapper.xml
View File

@@ -33,7 +33,7 @@
INNER JOIN sys_role t2 ON t1.role_id = t2.id AND t2.is_deleted = 0 AND t2.`status` = 1
INNER JOIN sys_menu t3 ON t1.menu_id = t3.id
WHERE
type = '${@com.youlai.system.common.enums.MenuTypeEnum@BUTTON.getValue()}'
type = '${@com.youlai.system.enums.MenuTypeEnum@BUTTON.getValue()}'
<if test="roleCode!=null and roleCode.trim() neq ''">
AND t2.`code` = #{roleCode}
</if>
@@ -48,7 +48,7 @@
INNER JOIN sys_menu t2 ON t2.id = t1.menu_id
INNER JOIN sys_role t3 ON t3.id = t1.role_id
WHERE
t2.type = '${@com.youlai.system.common.enums.MenuTypeEnum@BUTTON.getValue()}'
t2.type = '${@com.youlai.system.enums.MenuTypeEnum@BUTTON.getValue()}'
AND t2.perm IS NOT NULL
AND t3.CODE IN
<foreach collection="roles" item="role" separator="," open="(" close=")">