public/MaxKey
1
0
Fork 0
mirror of https://gitee.com/dromara/MaxKey.git synced 2026-05-20 09:38:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

v 3.2.0

Browse Source
This commit is contained in:
MaxKey
2021-12-14 12:38:06 +08:00
parent c490551aef
commit de702ada8e
53 changed files with 302 additions and 344 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/api/endpoint/RestTimeBasedOtpController.java
View File

@@ -27,10 +27,10 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
@Api(tags = "基于时间令牌验证 API文档模块")
@Tag(name = "基于时间令牌验证 API文档模块")
@Controller
@RequestMapping(value={"/im/api/otp"})
public class RestTimeBasedOtpController {
@@ -43,7 +43,7 @@ public class RestTimeBasedOtpController {
@Qualifier("userInfoService")
private UserInfoService userInfoService;
@ApiOperation(value = "基于时间令牌验证 API文档模块", notes = "传递参数username和token",httpMethod="GET")
@Operation(summary = "基于时间令牌验证 API文档模块", description = "传递参数username和token",method="GET")
@ResponseBody
@RequestMapping(value = "/timebased/validate", method = RequestMethod.GET)
public boolean getUser(@RequestParam String username,

10
maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/GroupMemberController.java
View File

@@ -129,9 +129,15 @@ public class GroupMemberController {
String[] arrMemberNames = memberNames.split(",");
for (int i = 0; i < arrMemberIds.length; i++) {
GroupMember newGroupMember = new GroupMember(groupId,groupMember.getGroupName(), arrMemberIds[i], arrMemberNames[i],"USER");
GroupMember newGroupMember =
new GroupMember(
groupId,
groupMember.getGroupName(),
arrMemberIds[i],
arrMemberNames[i],
"USER",
WebContext.getUserInfo().getInstId());
newGroupMember.setId(WebContext.genId());
newGroupMember.setInstId(WebContext.getUserInfo().getInstId());
result = groupMemberService.insert(newGroupMember);
}
if(!result) {

4
maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/GroupPrivilegesController.java
View File

@@ -109,9 +109,9 @@ public class GroupPrivilegesController {
String[] arrAppIds = appIds.split(",");
for (int i = 0; i < arrAppIds.length; i++) {
GroupPrivileges newGroupApp = new GroupPrivileges(groupId, arrAppIds[i]);
GroupPrivileges newGroupApp =
new GroupPrivileges(groupId, arrAppIds[i],WebContext.getUserInfo().getInstId());
newGroupApp.setId(WebContext.genId());
newGroupApp.setInstId(WebContext.getUserInfo().getInstId());
result = groupPrivilegesService.insert(newGroupApp);
}
if(!result) {

14
maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/PermissionsController.java
View File

@@ -62,8 +62,11 @@ public class PermissionsController {
_logger.debug("-save :" + rolePermissions);
//have
RolePermissions queryRolePermissions = new RolePermissions(rolePermissions.getAppId(),rolePermissions.getRoleId());
queryRolePermissions.setInstId(WebContext.getUserInfo().getInstId());
RolePermissions queryRolePermissions =
new RolePermissions(
rolePermissions.getAppId(),
rolePermissions.getRoleId(),
WebContext.getUserInfo().getInstId());
List<RolePermissions> rolePermissionsedList = rolesService.queryRolePermissions(queryRolePermissions);
HashMap<String,String >permedMap =new HashMap<String,String >();
@@ -114,8 +117,11 @@ public class PermissionsController {
public List<RolePermissions> querypermissions(@ModelAttribute("rolePermissions") RolePermissions rolePermissions) {
_logger.debug("-querypermissions :" + rolePermissions);
//have
RolePermissions queryRolePermissions = new RolePermissions(rolePermissions.getAppId(),rolePermissions.getRoleId());
queryRolePermissions.setInstId(WebContext.getUserInfo().getInstId());
RolePermissions queryRolePermissions =
new RolePermissions(
rolePermissions.getAppId(),
rolePermissions.getRoleId(),
WebContext.getUserInfo().getInstId());
List<RolePermissions> rolePermissionsedList = rolesService.queryRolePermissions(queryRolePermissions);
return rolePermissionsedList;
}

10
maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/RoleMemberController.java
View File

@@ -116,9 +116,15 @@ public class RoleMemberController {
String[] arrMemberNames = memberNames.split(",");
for (int i = 0; i < arrMemberIds.length; i++) {
RoleMember newRoleMember = new RoleMember(groupId,roleMember.getRoleName(), arrMemberIds[i], arrMemberNames[i],"USER");
RoleMember newRoleMember =
new RoleMember(
groupId,
roleMember.getRoleName(),
arrMemberIds[i],
arrMemberNames[i],
"USER",
WebContext.getUserInfo().getInstId());
newRoleMember.setId(WebContext.genId());
newRoleMember.setInstId(WebContext.getUserInfo().getInstId());
result = roleMemberService.insert(newRoleMember);
}
if(!result) {