diff --git a/backend/src/main/java/io/dataease/auth/api/dto/DynamicMenuDto.java b/backend/src/main/java/io/dataease/auth/api/dto/DynamicMenuDto.java index e83e0f1ced..8c679ef8a0 100644 --- a/backend/src/main/java/io/dataease/auth/api/dto/DynamicMenuDto.java +++ b/backend/src/main/java/io/dataease/auth/api/dto/DynamicMenuDto.java @@ -31,6 +31,8 @@ public class DynamicMenuDto implements Serializable { private Boolean isPlugin; + private Boolean noLayout; + private List children; } diff --git a/backend/src/main/java/io/dataease/auth/server/AuthServer.java b/backend/src/main/java/io/dataease/auth/server/AuthServer.java index 51621b4df7..0f52b94437 100644 --- a/backend/src/main/java/io/dataease/auth/server/AuthServer.java +++ b/backend/src/main/java/io/dataease/auth/server/AuthServer.java @@ -14,10 +14,10 @@ import io.dataease.commons.utils.BeanUtils; import io.dataease.commons.utils.CodingUtil; import io.dataease.commons.utils.ServletUtils; -import io.dataease.plugins.config.SpringContextUtil; +/*import io.dataease.plugins.config.SpringContextUtil; import io.dataease.plugins.xpack.display.dto.response.SysSettingDto; -import io.dataease.plugins.xpack.display.service.DisPlayXpackService; +import io.dataease.plugins.xpack.display.service.DisPlayXpackService;*/ import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; @@ -110,7 +110,7 @@ public class AuthServer implements AuthApi { SysUserEntity userById = authUserService.getUserById(4L); String nickName = userById.getNickName(); // System.out.println(nickName); - Map beansOfType = SpringContextUtil.getApplicationContext().getBeansOfType(DisPlayXpackService.class); + /* Map beansOfType = SpringContextUtil.getApplicationContext().getBeansOfType(DisPlayXpackService.class); for (Map.Entry entry : beansOfType.entrySet()) { Object key = entry.getKey(); DisPlayXpackService value = (DisPlayXpackService)entry.getValue(); @@ -118,7 +118,7 @@ public class AuthServer implements AuthApi { String name = entry.getValue().getClass().getName(); System.out.println("key: "+ key + ", value: "+ name); - } + }*/ return "apple"; } } diff --git a/backend/src/main/java/io/dataease/auth/service/impl/DynamicMenuServiceImpl.java b/backend/src/main/java/io/dataease/auth/service/impl/DynamicMenuServiceImpl.java index bb045872bd..9b336f06f8 100644 --- a/backend/src/main/java/io/dataease/auth/service/impl/DynamicMenuServiceImpl.java +++ b/backend/src/main/java/io/dataease/auth/service/impl/DynamicMenuServiceImpl.java @@ -73,6 +73,7 @@ public class DynamicMenuServiceImpl implements DynamicMenuService { dynamicMenuDto.setPermission(sysMenu.getPermission()); dynamicMenuDto.setHidden(sysMenu.getHidden()); dynamicMenuDto.setIsPlugin(true); + dynamicMenuDto.setNoLayout(!!sysMenu.isNoLayout()); return dynamicMenuDto; } diff --git a/backend/src/main/java/io/dataease/plugins/server/XAuthServer.java b/backend/src/main/java/io/dataease/plugins/server/XAuthServer.java new file mode 100644 index 0000000000..434a182526 --- /dev/null +++ b/backend/src/main/java/io/dataease/plugins/server/XAuthServer.java @@ -0,0 +1,48 @@ +package io.dataease.plugins.server; + + +import io.dataease.auth.api.dto.CurrentUserDto; +import io.dataease.commons.utils.AuthUtils; +import io.dataease.controller.handler.annotation.I18n; +import io.dataease.plugins.config.SpringContextUtil; +import io.dataease.plugins.xpack.auth.dto.request.XpackBaseTreeRequest; +import io.dataease.plugins.xpack.auth.dto.request.XpackSysAuthRequest; +import io.dataease.plugins.xpack.auth.dto.response.XpackSysAuthDetail; +import io.dataease.plugins.xpack.auth.dto.response.XpackVAuthModelDTO; +import org.springframework.web.bind.annotation.*; +import io.dataease.plugins.xpack.auth.service.AuthXpackService; +import java.util.List; +import java.util.Map; + +@RequestMapping("/plugin/auth") +@RestController +public class XAuthServer { + + @PostMapping("/authModels") + @I18n + public List authModels(@RequestBody XpackBaseTreeRequest request){ + AuthXpackService sysAuthService = SpringContextUtil.getBean(AuthXpackService.class); + CurrentUserDto user = AuthUtils.getUser(); + return sysAuthService.searchAuthModelTree(request, user.getUserId(), user.getIsAdmin()); + } + + @PostMapping("/authDetails") + public Map> authDetails(@RequestBody XpackSysAuthRequest request){ + AuthXpackService sysAuthService = SpringContextUtil.getBean(AuthXpackService.class); + return sysAuthService.searchAuthDetails(request); + } + + @GetMapping("/authDetailsModel/{authType}") + @I18n + public ListauthDetailsModel(@PathVariable String authType){ + AuthXpackService sysAuthService = SpringContextUtil.getBean(AuthXpackService.class); + return sysAuthService.searchAuthDetailsModel(authType); + } + + @PostMapping("/authChange") + public void authChange(@RequestBody XpackSysAuthRequest request){ + AuthXpackService sysAuthService = SpringContextUtil.getBean(AuthXpackService.class); + CurrentUserDto user = AuthUtils.getUser(); + sysAuthService.authChange(request, user.getUserId(), user.getUsername(), user.getIsAdmin()); + } +} diff --git a/backend/src/main/java/io/dataease/plugins/server/DeptServer.java b/backend/src/main/java/io/dataease/plugins/server/XDeptServer.java similarity index 99% rename from backend/src/main/java/io/dataease/plugins/server/DeptServer.java rename to backend/src/main/java/io/dataease/plugins/server/XDeptServer.java index 5c4c032e0b..69969cc8ed 100644 --- a/backend/src/main/java/io/dataease/plugins/server/DeptServer.java +++ b/backend/src/main/java/io/dataease/plugins/server/XDeptServer.java @@ -16,7 +16,7 @@ import java.util.stream.Collectors; @RequestMapping("/plugin/dept") @RestController -public class DeptServer { +public class XDeptServer { @PostMapping("/childNodes/{pid}") public List childNodes(@PathVariable("pid") Long pid){ diff --git a/backend/src/main/java/io/dataease/plugins/server/DisplayServer.java b/backend/src/main/java/io/dataease/plugins/server/XDisplayServer.java similarity index 73% rename from backend/src/main/java/io/dataease/plugins/server/DisplayServer.java rename to backend/src/main/java/io/dataease/plugins/server/XDisplayServer.java index cf22cb073d..36e26fc1bb 100644 --- a/backend/src/main/java/io/dataease/plugins/server/DisplayServer.java +++ b/backend/src/main/java/io/dataease/plugins/server/XDisplayServer.java @@ -3,7 +3,7 @@ package io.dataease.plugins.server; import io.dataease.plugins.config.SpringContextUtil; import io.dataease.plugins.xpack.display.dto.response.SysSettingDto; -import io.dataease.plugins.xpack.display.service.DisPlayXpackService; +import io.dataease.plugins.xpack.display.service.DisplayXpackService; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import java.util.List; @@ -11,20 +11,20 @@ import java.util.Map; @RequestMapping("/api/display") @RestController -public class DisplayServer { +public class XDisplayServer { @GetMapping("/uiInfo") public List uiInfo() { - DisPlayXpackService disPlayXpackService = SpringContextUtil.getBean(DisPlayXpackService.class); + DisplayXpackService disPlayXpackService = SpringContextUtil.getBean(DisplayXpackService.class); return disPlayXpackService.systemSettings(); } @PostMapping(value="/save", consumes = {"multipart/form-data"}) public void saveUIInfo(@RequestPart("request") Map> systemParameterMap, @RequestPart(value = "files", required = false) List bodyFiles) throws Exception { - DisPlayXpackService disPlayXpackService = SpringContextUtil.getBean(DisPlayXpackService.class); + DisplayXpackService disPlayXpackService = SpringContextUtil.getBean(DisplayXpackService.class); disPlayXpackService.save(systemParameterMap, bodyFiles); } diff --git a/backend/src/main/java/io/dataease/plugins/server/RoleServer.java b/backend/src/main/java/io/dataease/plugins/server/XRoleServer.java similarity index 98% rename from backend/src/main/java/io/dataease/plugins/server/RoleServer.java rename to backend/src/main/java/io/dataease/plugins/server/XRoleServer.java index f935daa624..97905e18c5 100644 --- a/backend/src/main/java/io/dataease/plugins/server/RoleServer.java +++ b/backend/src/main/java/io/dataease/plugins/server/XRoleServer.java @@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.*; import java.util.List; @RequestMapping("/plugin/role") @RestController -public class RoleServer { +public class XRoleServer { @PostMapping("/create") diff --git a/frontend/src/store/modules/permission.js b/frontend/src/store/modules/permission.js index 19e0a1c79a..5b70a388ec 100644 --- a/frontend/src/store/modules/permission.js +++ b/frontend/src/store/modules/permission.js @@ -41,7 +41,8 @@ export const filterAsyncRouter = (routers) => { // 遍历后台传来的路由 router.component = 'system/plugin/dynamic' router.props = { jsname: jsName, - menuid: router.id + menuid: router.id, + noLayout: router.noLayout } } if (router.component) { diff --git a/frontend/src/views/system/authority/index.vue b/frontend/src/views/system/authority/index.vue index 3dffe71ed4..06e6e401ac 100644 --- a/frontend/src/views/system/authority/index.vue +++ b/frontend/src/views/system/authority/index.vue @@ -2,13 +2,13 @@ - {{$t('auth.authConfig')}} + {{ $t('auth.authConfig') }} - - - - + + + + diff --git a/frontend/src/views/system/plugin/dynamic.vue b/frontend/src/views/system/plugin/dynamic.vue index dfdf6b3fa6..44e9dcfd32 100644 --- a/frontend/src/views/system/plugin/dynamic.vue +++ b/frontend/src/views/system/plugin/dynamic.vue @@ -1,10 +1,17 @@