Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
D
dsk-cr20g
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
dsk-cr20g
Commits
81f73ec9
Commit
81f73ec9
authored
Sep 15, 2023
by
施翔轲
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
新增大司空企业管理员角色
parent
e1fff62e
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
2 deletions
+12
-2
SysTenantController.java
...va/com/dsk/web/controller/system/SysTenantController.java
+2
-2
TenantConstants.java
...rc/main/java/com/dsk/common/constant/TenantConstants.java
+10
-0
No files found.
dsk-admin/src/main/java/com/dsk/web/controller/system/SysTenantController.java
View file @
81f73ec9
...
...
@@ -145,7 +145,7 @@ public class SysTenantController extends BaseController {
/**
* 清除动态租户
*/
@SaCheckRole
(
TenantConstants
.
SUPER_ADMIN_ROLE_KEY
)
@SaCheckRole
(
{
TenantConstants
.
SUPER_ADMIN_ROLE_KEY
,
TenantConstants
.
DSK_TENANT_ADMIN_ROLE_KEY
}
)
@GetMapping
(
"/dynamic/clear"
)
public
R
<
Void
>
dynamicClear
()
{
TenantHelper
.
clearDynamic
();
...
...
@@ -158,7 +158,7 @@ public class SysTenantController extends BaseController {
* @param tenantId 租户id
* @param packageId 套餐id
*/
@SaCheckRole
(
TenantConstants
.
SUPER_ADMIN_ROLE_KEY
)
@SaCheckRole
(
{
TenantConstants
.
SUPER_ADMIN_ROLE_KEY
,
TenantConstants
.
DSK_TENANT_ADMIN_ROLE_KEY
}
)
@SaCheckPermission
(
"system:tenant:edit"
)
@Log
(
title
=
"租户"
,
businessType
=
BusinessType
.
UPDATE
)
@GetMapping
(
"/syncTenantPackage"
)
...
...
dsk-common/src/main/java/com/dsk/common/constant/TenantConstants.java
View file @
81f73ec9
...
...
@@ -37,6 +37,16 @@ public interface TenantConstants {
*/
String
TENANT_ADMIN_ROLE_NAME
=
"管理员"
;
/**
* 大司空租户管理员角色
*/
String
DSK_TENANT_ADMIN_ROLE_KEY
=
"accountAdmin"
;
/**
* 大司空租户管理员角色名称
*/
String
DSK_TENANT_ADMIN_ROLE_NAME
=
"企业管理员"
;
/**
* 默认租户ID
*/
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment