diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/GitServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/GitServiceImpl.java index ea6d5f6c..b5666a1e 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/GitServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/GitServiceImpl.java @@ -34,6 +34,10 @@ public class GitServiceImpl implements GitService { private Integer redisPort; @Value("${git.endpoint}") String gitendpoint; + @Value("${git.clientId}") + String clientId; + @Value("${git.clientSecret}") + String clientSecret; @Resource private NewHttpUtils httpUtils; private static final Logger log = LoggerFactory.getLogger(GitServiceImpl.class); @@ -45,8 +49,8 @@ public class GitServiceImpl implements GitService { params.put("grant_type", "password"); params.put("username", username); params.put("password", decrypt(password)); - params.put("client_id", "jEdGwrIJixCUIJM9vj2MwA6zmoTVhUdXxiSAaaCiXwA"); - params.put("client_secret", "L3wBKTNnRo-wPen7bxR3F1myCvtVDgpWa6MnpfyWeJE"); + params.put("client_id", clientId); + params.put("client_secret", clientSecret); try { // 发送POST请求 String req = httpUtils.sendPost(gitendpoint + "/oauth/token", null, JsonUtils.mapToJson(params)); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java index e42bde3e..1ab65dea 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java @@ -11,6 +11,7 @@ import com.ruoyi.common.log.enums.BusinessType; import com.ruoyi.common.security.annotation.InnerAuth; import com.ruoyi.common.security.annotation.RequiresPermissions; 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.SysRole; import com.ruoyi.system.api.domain.SysUser; @@ -56,6 +57,9 @@ public class SysUserController extends BaseController { @Autowired private ISysConfigService configService; + @Autowired + private RemoteMmpService remoteMmpService; + /** * 获取用户列表 */ @@ -142,6 +146,7 @@ public class SysUserController extends BaseController { Set roles = permissionService.getRolePermission(user); // 权限集合 Set permissions = permissionService.getMenuPermission(user); + remoteMmpService.gitLinkLogin(user.getUserName(), user.getGitLinkUsername(),user.getGitLinkPassword()); AjaxResult ajax = AjaxResult.success(); ajax.put("user", user); ajax.put("roles", roles);