|
|
@@ -500,10 +500,10 @@ public class LoginController {
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * DingTalk H5 client config.
|
|
|
+ * 获取钉钉配置
|
|
|
*/
|
|
|
@GetMapping("/sys/dingtalk/clientConfig")
|
|
|
- @ApiOperation("DingTalk H5 client config")
|
|
|
+ @ApiOperation("获取钉钉配置")
|
|
|
public ResponseEntity dingTalkClientConfig(@RequestParam(required = false) String tenantId) {
|
|
|
String resolvedTenantId = StringUtils.defaultIfBlank(tenantId, "10009");
|
|
|
com.jeeplus.auth.config.DingTalkProperties.TenantConfig tenantConfig = dingTalkAuthService.getTenantConfig(resolvedTenantId);
|
|
|
@@ -518,8 +518,8 @@ public class LoginController {
|
|
|
* 钉钉authCode登录
|
|
|
*/
|
|
|
@PostMapping("/sys/dingtalk/login")
|
|
|
- @ApiLog(value = "DingTalk authCode login", type = LogTypeEnum.LOGIN)
|
|
|
- @ApiOperation("DingTalk authCode login")
|
|
|
+ @ApiLog(value = "钉钉授权登录", type = LogTypeEnum.LOGIN)
|
|
|
+ @ApiOperation("钉钉授权登录")
|
|
|
public ResponseEntity dingTalkAuthCodeLogin(@RequestBody LoginForm loginForm) {
|
|
|
String tenantId = StringUtils.defaultIfBlank(loginForm.getTenantId(), "10009");
|
|
|
DingTalkAuthService.DingTalkUser dingTalkUser = dingTalkAuthService.getUserByAuthCode(tenantId, loginForm.getAuthCode());
|
|
|
@@ -604,8 +604,8 @@ public class LoginController {
|
|
|
* 将当前的钉钉用户绑定到系统账户,然后登录。
|
|
|
*/
|
|
|
@PostMapping("/sys/dingtalk/bindLogin")
|
|
|
- @ApiLog(value = "DingTalk bind login", type = LogTypeEnum.LOGIN)
|
|
|
- @ApiOperation("DingTalk bind login")
|
|
|
+ @ApiLog(value = "钉钉授权并绑定用户进行登录", type = LogTypeEnum.LOGIN)
|
|
|
+ @ApiOperation("钉钉授权并绑定用户进行登录")
|
|
|
public ResponseEntity dingTalkBindLogin(@RequestBody LoginForm loginForm) {
|
|
|
DingTalkAuthService.BindInfo bindInfo = dingTalkAuthService.getBindInfo(loginForm.getDingTalkBindKey());
|
|
|
String username = loginForm.getUsername();
|