parent: 3b72f1 | patch | commitdiff
kaiyu
2021-03-25 247f19f6c3f17c2ac2f37b55c7d0550731f31ffe
refs
author kaiyu <404897439@qq.com>
Thursday, March 25, 2021 17:24 +0800
committer kaiyu <404897439@qq.com>
Thursday, March 25, 2021 17:24 +0800
commit247f19f6c3f17c2ac2f37b55c7d0550731f31ffe
tree 716630e5498c70760cec7496c37422a1c200a9cc tree | zip | gz
parent 3b72f1f4dd46191857583a166d5b67722c6b118e view | diff
680467cafe81445bda4cd71d93fb489ca436c5a1 view | diff 
Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	screen-common/src/main/java/com/moral/constant/Constants.java
#	screen-common/src/main/java/com/moral/constant/ResponseCodeEnum.java
#	screen-manage/src/main/resources/application-dev.yml
2 files added
34 files modified
1111 ■■■■■ changed files
pom.xml 2 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/config/Interceptor/WebAppConfiguration.java 2 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/controller/GroupController.java 137 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/controller/LoginController.java 95 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/controller/MenuController.java 73 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/controller/UserController.java 54 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/entity/Group.java 2 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/mapper/MenuMapper.java 3 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/GroupMenuService.java 3 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/GroupService.java 11 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/MenuService.java 3 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/UserGroupService.java 3 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/UserService.java 5 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/impl/GroupMenuServiceImpl.java 33 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/impl/GroupServiceImpl.java 125 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/impl/MenuServiceImpl.java 15 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/impl/UserGroupServiceImpl.java 30 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java 128 ●●●●● diff | view | raw | blame | history
screen-api/src/main/resources/mapper/MenuMapper.xml 13 ●●●●● diff | view | raw | blame | history
screen-api/src/main/resources/mapper/UserMapper.xml 9 ●●●●● diff | view | raw | blame | history
screen-common/src/main/java/com/moral/constant/Constants.java 2 ●●●●● diff | view | raw | blame | history
screen-common/src/main/java/com/moral/constant/ResponseCodeEnum.java 8 ●●●●● diff | view | raw | blame | history
screen-common/src/main/java/com/moral/util/TokenUtils.java 9 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/controller/ManageMenuController.java 51 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/controller/ManageRoleController.java 26 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/entity/Group.java 2 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/mapper/ManageMenuMapper.java 4 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/mapper/ManageRoleMenuMapper.java 6 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/service/ManageMenuService.java 7 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/service/ManageRoleMenuService.java 8 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/service/impl/ManageMenuServiceImpl.java 60 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/service/impl/ManageRoleMenuServiceImpl.java 82 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/service/impl/ManageRoleServiceImpl.java 43 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/resources/application-dev.yml 5 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/resources/mapper/ManageMenuMapper.xml 17 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/resources/mapper/ManageRoleMenuMapper.xml 35 ●●●●● diff | view | raw | blame | history