From 8482203c3b572e15249b3439d295219188543140 Mon Sep 17 00:00:00 2001
From: AprilWind <2100166581@qq.com>
Date: 星期三, 24 四月 2024 22:29:46 +0800
Subject: [PATCH] !520 add 新增岗位编码与部门编码 并将岗位放到部门下 * add 新增岗位编码以及查询 * add 新增部门编码以及查询
---
ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java | 48 ++++++++++++++++++++++++++++++++++--------------
1 files changed, 34 insertions(+), 14 deletions(-)
diff --git a/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java b/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java
index e41b4d0..43e689b 100644
--- a/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java
+++ b/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java
@@ -14,16 +14,19 @@
import org.dromara.common.core.domain.R;
import org.dromara.common.core.domain.model.LoginBody;
import org.dromara.common.core.domain.model.RegisterBody;
-import org.dromara.common.core.utils.MapstructUtils;
-import org.dromara.common.core.utils.MessageUtils;
-import org.dromara.common.core.utils.StreamUtils;
-import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.core.domain.model.SocialLoginBody;
+import org.dromara.common.core.utils.*;
+import org.dromara.common.encrypt.annotation.ApiEncrypt;
+import org.dromara.common.json.utils.JsonUtils;
+import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.common.social.config.properties.SocialLoginConfigProperties;
import org.dromara.common.social.config.properties.SocialProperties;
import org.dromara.common.social.utils.SocialUtils;
import org.dromara.common.tenant.helper.TenantHelper;
-import org.dromara.system.domain.SysClient;
+import org.dromara.common.websocket.dto.WebSocketMessageDto;
+import org.dromara.common.websocket.utils.WebSocketUtils;
import org.dromara.system.domain.bo.SysTenantBo;
+import org.dromara.system.domain.vo.SysClientVo;
import org.dromara.system.domain.vo.SysTenantVo;
import org.dromara.system.service.ISysClientService;
import org.dromara.system.service.ISysConfigService;
@@ -40,6 +43,8 @@
import java.net.URL;
import java.util.List;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
/**
* 璁よ瘉
@@ -48,7 +53,6 @@
*/
@Slf4j
@SaIgnore
-@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/auth")
@@ -61,31 +65,44 @@
private final ISysTenantService tenantService;
private final ISysSocialService socialUserService;
private final ISysClientService clientService;
+ private final ScheduledExecutorService scheduledExecutorService;
/**
* 鐧诲綍鏂规硶
*
- * @param loginBody 鐧诲綍淇℃伅
+ * @param body 鐧诲綍淇℃伅
* @return 缁撴灉
*/
+ @ApiEncrypt
@PostMapping("/login")
- public R<LoginVo> login(@Validated @RequestBody LoginBody loginBody) {
+ public R<LoginVo> login(@RequestBody String body) {
+ LoginBody loginBody = JsonUtils.parseObject(body, LoginBody.class);
+ ValidatorUtils.validate(loginBody);
// 鎺堟潈绫诲瀷鍜屽鎴风id
String clientId = loginBody.getClientId();
String grantType = loginBody.getGrantType();
- SysClient client = clientService.queryByClientId(clientId);
+ SysClientVo client = clientService.queryByClientId(clientId);
// 鏌ヨ涓嶅埌 client 鎴� client 鍐呬笉鍖呭惈 grantType
if (ObjectUtil.isNull(client) || !StringUtils.contains(client.getGrantType(), grantType)) {
log.info("瀹㈡埛绔痠d: {} 璁よ瘉绫诲瀷锛歿} 寮傚父!.", clientId, grantType);
return R.fail(MessageUtils.message("auth.grant.type.error"));
} else if (!UserConstants.NORMAL.equals(client.getStatus())) {
- return R.fail(MessageUtils.message("auth.grant.type.stop"));
+ return R.fail(MessageUtils.message("auth.grant.type.blocked"));
}
// 鏍￠獙绉熸埛
loginService.checkTenant(loginBody.getTenantId());
// 鐧诲綍
- return R.ok(IAuthStrategy.login(loginBody, client));
+ LoginVo loginVo = IAuthStrategy.login(body, client, grantType);
+
+ Long userId = LoginHelper.getUserId();
+ scheduledExecutorService.schedule(() -> {
+ WebSocketMessageDto dto = new WebSocketMessageDto();
+ dto.setMessage("娆㈣繋鐧诲綍RuoYi-Vue-Plus鍚庡彴绠＄悊绯荤粺");
+ dto.setSessionKeys(List.of(userId));
+ WebSocketUtils.publishMessage(dto);
+ }, 3, TimeUnit.SECONDS);
+ return R.ok(loginVo);
}
/**
@@ -112,9 +129,11 @@
* @return 缁撴灉
*/
@PostMapping("/social/callback")
- public R<Void> socialCallback(@RequestBody LoginBody loginBody) {
+ public R<Void> socialCallback(@RequestBody SocialLoginBody loginBody) {
// 鑾峰彇绗笁鏂圭櫥褰曚俊鎭�
- AuthResponse<AuthUser> response = SocialUtils.loginAuth(loginBody, socialProperties);
+ AuthResponse<AuthUser> response = SocialUtils.loginAuth(
+ loginBody.getSource(), loginBody.getSocialCode(),
+ loginBody.getSocialState(), socialProperties);
AuthUser authUserData = response.getData();
// 鍒ゆ柇鎺堟潈鍝嶅簲鏄惁鎴愬姛
if (!response.ok()) {
@@ -149,6 +168,7 @@
/**
* 鐢ㄦ埛娉ㄥ唽
*/
+ @ApiEncrypt
@PostMapping("/register")
public R<Void> register(@Validated @RequestBody RegisterBody user) {
if (!configService.selectRegisterEnabled(user.getTenantId())) {
@@ -178,7 +198,7 @@
}
// 鏍规嵁鍩熷悕杩涜绛涢��
List<TenantListVo> list = StreamUtils.filter(voList, vo ->
- StringUtils.equals(vo.getDomain(), host));
+ StringUtils.equals(vo.getDomain(), host));
// 杩斿洖瀵硅薄
LoginTenantVo vo = new LoginTenantVo();
vo.setVoList(CollUtil.isNotEmpty(list) ? list : voList);
--
Gitblit v1.9.3