|
|
@@ -11,6 +11,7 @@ import com.ruoyi.common.log.enums.BusinessType; |
|
|
import com.ruoyi.common.security.annotation.InnerAuth; |
|
|
import com.ruoyi.common.security.annotation.InnerAuth; |
|
|
import com.ruoyi.common.security.annotation.RequiresPermissions; |
|
|
import com.ruoyi.common.security.annotation.RequiresPermissions; |
|
|
import com.ruoyi.common.security.utils.SecurityUtils; |
|
|
import com.ruoyi.common.security.utils.SecurityUtils; |
|
|
|
|
|
import com.ruoyi.system.api.RemoteMmpService; |
|
|
import com.ruoyi.system.api.domain.SysDept; |
|
|
import com.ruoyi.system.api.domain.SysDept; |
|
|
import com.ruoyi.system.api.domain.SysRole; |
|
|
import com.ruoyi.system.api.domain.SysRole; |
|
|
import com.ruoyi.system.api.domain.SysUser; |
|
|
import com.ruoyi.system.api.domain.SysUser; |
|
|
@@ -56,6 +57,9 @@ public class SysUserController extends BaseController { |
|
|
@Autowired |
|
|
@Autowired |
|
|
private ISysConfigService configService; |
|
|
private ISysConfigService configService; |
|
|
|
|
|
|
|
|
|
|
|
@Autowired |
|
|
|
|
|
private RemoteMmpService remoteMmpService; |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* 获取用户列表 |
|
|
* 获取用户列表 |
|
|
*/ |
|
|
*/ |
|
|
@@ -142,6 +146,7 @@ public class SysUserController extends BaseController { |
|
|
Set<String> roles = permissionService.getRolePermission(user); |
|
|
Set<String> roles = permissionService.getRolePermission(user); |
|
|
// 权限集合 |
|
|
// 权限集合 |
|
|
Set<String> permissions = permissionService.getMenuPermission(user); |
|
|
Set<String> permissions = permissionService.getMenuPermission(user); |
|
|
|
|
|
remoteMmpService.gitLinkLogin(user.getUserName(), user.getGitLinkUsername(),user.getGitLinkPassword()); |
|
|
AjaxResult ajax = AjaxResult.success(); |
|
|
AjaxResult ajax = AjaxResult.success(); |
|
|
ajax.put("user", user); |
|
|
ajax.put("user", user); |
|
|
ajax.put("roles", roles); |
|
|
ajax.put("roles", roles); |
|
|
|