From fda6085cc8e662bf3a47837be2cfc7c55605d286 Mon Sep 17 00:00:00 2001 From: lijiahang Date: Wed, 27 Dec 2023 15:09:23 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BF=AE=E6=94=B9=E6=9D=83?= =?UTF-8?q?=E9=99=90=E8=A7=84=E8=8C=83.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../generator/template/ServerTemplate.java | 18 +++++------ .../resources/templates/orion-sql-menu.sql.vm | 4 ++- .../controller/HostConnectLogController.java | 5 --- .../infra/controller/DictKeyController.java | 2 +- .../controller/OperatorLogController.http | 5 +++ .../controller/OperatorLogController.java | 2 +- .../controller/PermissionController.java | 2 +- .../controller/SystemUserController.java | 4 +-- .../system/menu/grant/menu-grant-table.vue | 11 ++++--- .../dict-key/components/dict-key-table.vue | 2 +- .../system/menu/components/menu-table.vue | 2 +- .../user/info/components/user-session.vue | 19 ++++++++--- orion-ops-ui/src/views/user/info/index.vue | 6 ++-- .../role/components/role-menu-grant-modal.vue | 15 +++++---- .../src/views/user/role/types/const.ts | 32 +++++++++---------- .../views/user/user/components/user-table.vue | 2 +- sql/init-2-schema-tables.sql | 31 ++++++++++++++++++ sql/init-3-data.sql | 21 ++++++++---- 18 files changed, 118 insertions(+), 65 deletions(-) diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/java/com/orion/ops/framework/mybatis/core/generator/template/ServerTemplate.java b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/java/com/orion/ops/framework/mybatis/core/generator/template/ServerTemplate.java index 9705f965..7815c883 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/java/com/orion/ops/framework/mybatis/core/generator/template/ServerTemplate.java +++ b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/java/com/orion/ops/framework/mybatis/core/generator/template/ServerTemplate.java @@ -72,15 +72,15 @@ public class ServerTemplate extends Template { return this; } - /** - * 生成导出 - * - * @return this - */ - public ServerTemplate enableExport() { - table.enableExport = false; - return this; - } + // /** + // * 生成导出 + // * + // * @return this + // */ + // public ServerTemplate enableExport() { + // table.enableExport = true; + // return this; + // } /** * 不生成单元测试 diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-sql-menu.sql.vm b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-sql-menu.sql.vm index 91bd15d3..a6cbc96a 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-sql-menu.sql.vm +++ b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-sql-menu.sql.vm @@ -25,6 +25,8 @@ VALUES (@TMP_SUB_ID, '查询$table.comment', '${package.ModuleName}:${typeHyphen}:query', 3, 10), (@TMP_SUB_ID, '创建$table.comment', '${package.ModuleName}:${typeHyphen}:create', 3, 20), (@TMP_SUB_ID, '修改$table.comment', '${package.ModuleName}:${typeHyphen}:update', 3, 30), - (@TMP_SUB_ID, '删除$table.comment', '${package.ModuleName}:${typeHyphen}:delete', 3, 40), + (@TMP_SUB_ID, '删除$table.comment', '${package.ModuleName}:${typeHyphen}:delete', 3, 40); + #if(false) (@TMP_SUB_ID, '导出$table.comment', '${package.ModuleName}:${typeHyphen}:export', 3, 50), (@TMP_SUB_ID, '导入$table.comment', '${package.ModuleName}:${typeHyphen}:import', 3, 60); + #end diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/HostConnectLogController.java b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/HostConnectLogController.java index ccef5d90..053fedb7 100644 --- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/HostConnectLogController.java +++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/HostConnectLogController.java @@ -47,10 +47,5 @@ public class HostConnectLogController { return hostConnectLogService.getHostConnectLogPage(request); } - // FIXME management 菜单一键全选 - // 前端选择 - // 前端用户 - // sql 元数据/菜单 - } diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/DictKeyController.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/DictKeyController.java index aa89c5ab..27a8353b 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/DictKeyController.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/DictKeyController.java @@ -75,7 +75,7 @@ public class DictKeyController { @PutMapping("/refresh-cache") @Operation(summary = "刷新字典缓存") - @PreAuthorize("@ss.hasPermission('infra:dict-key:refresh-cache')") + @PreAuthorize("@ss.hasPermission('infra:dict-key:management:refresh-cache')") public HttpWrapper refreshCache() { dictKeyService.refreshCache(); return HttpWrapper.ok(); diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/OperatorLogController.http b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/OperatorLogController.http index 7fc7ed88..7a81850a 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/OperatorLogController.http +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/OperatorLogController.http @@ -14,4 +14,9 @@ Authorization: {{token}} "endTime": "" } +### 查询登录日志 +GET {{baseUrl}}/infra/operator-log/login-history?username=admin +Content-Type: application/json +Authorization: {{token}} + ### \ No newline at end of file diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/OperatorLogController.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/OperatorLogController.java index 4c89342a..4e806383 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/OperatorLogController.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/OperatorLogController.java @@ -50,7 +50,7 @@ public class OperatorLogController { @IgnoreLog(IgnoreLogMode.RET) @GetMapping("/login-history") @Operation(summary = "查询用户登录日志") - @PreAuthorize("@ss.hasPermission('infra:operator-log:query')") + @PreAuthorize("@ss.hasPermission('infra:system-user:login-history')") public List getLoginHistory(@RequestParam("username") String username) { return operatorLogService.getLoginHistory(username); } diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/PermissionController.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/PermissionController.java index af3d17bf..fce01c9f 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/PermissionController.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/PermissionController.java @@ -41,7 +41,7 @@ public class PermissionController { @PutMapping("/refresh-cache") @Operation(summary = "刷新角色权限缓存") - @PreAuthorize("@ss.hasPermission('infra:system-menu:refresh-cache')") + @PreAuthorize("@ss.hasPermission('infra:system-menu:management:refresh-cache')") public HttpWrapper refreshCache() { permissionService.initPermissionCache(); return HttpWrapper.ok(); diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/SystemUserController.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/SystemUserController.java index 271bc296..edec1acf 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/SystemUserController.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/SystemUserController.java @@ -94,7 +94,7 @@ public class SystemUserController { @OperatorLog(SystemUserOperatorType.RESET_PASSWORD) @PutMapping("/reset-password") @Operation(summary = "重置用户密码") - @PreAuthorize("@ss.hasPermission('infra:system-user:reset-password')") + @PreAuthorize("@ss.hasPermission('infra:system-user:management:reset-password')") public HttpWrapper resetUserPassword(@Validated @RequestBody UserResetPasswordRequest request) { systemUserService.resetPassword(request); return HttpWrapper.ok(); @@ -153,7 +153,7 @@ public class SystemUserController { @OperatorLog(SystemUserOperatorType.OFFLINE) @PutMapping("/session/offline") @Operation(summary = "下线用户会话") - @PreAuthorize("@ss.hasPermission('infra:system-user:offline-session')") + @PreAuthorize("@ss.hasPermission('infra:system-user:management:offline-session')") public HttpWrapper offlineUserSession(@Validated @RequestBody UserSessionOfflineRequest request) { systemUserManagementService.offlineUserSession(request); return HttpWrapper.ok(); diff --git a/orion-ops-ui/src/components/system/menu/grant/menu-grant-table.vue b/orion-ops-ui/src/components/system/menu/grant/menu-grant-table.vue index d0596bcf..3b8ba3be 100644 --- a/orion-ops-ui/src/components/system/menu/grant/menu-grant-table.vue +++ b/orion-ops-ui/src/components/system/menu/grant/menu-grant-table.vue @@ -8,7 +8,7 @@ - +