From 92e15c2f16fb5e7fc7426241557da55a7fdcf136 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期四, 30 三月 2023 22:53:00 +0800
Subject: [PATCH] reset !pr324 有逻辑性问题 暂时回滚
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/AuthController.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/AuthController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/AuthController.java
index d7f210e..12cf1fe 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/AuthController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/AuthController.java
@@ -3,6 +3,7 @@
import cn.dev33.satoken.annotation.SaIgnore;
import cn.hutool.core.collection.CollUtil;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.model.EmailLoginBody;
import com.ruoyi.common.core.domain.model.LoginBody;
import com.ruoyi.common.core.domain.model.RegisterBody;
import com.ruoyi.common.core.domain.model.SmsLoginBody;
@@ -64,7 +65,7 @@
}
/**
- * 鐭俊鐧诲綍(绀轰緥)
+ * 鐭俊鐧诲綍
*
* @param body 鐧诲綍淇℃伅
* @return 缁撴灉
@@ -79,6 +80,21 @@
}
/**
+ * 閭欢鐧诲綍
+ *
+ * @param body 鐧诲綍淇℃伅
+ * @return 缁撴灉
+ */
+ @PostMapping("/emailLogin")
+ public R<LoginVo> emailLogin(@Validated @RequestBody EmailLoginBody body) {
+ LoginVo loginVo = new LoginVo();
+ // 鐢熸垚浠ょ墝
+ String token = loginService.emailLogin(body.getTenantId(), body.getEmail(), body.getEmailCode());
+ loginVo.setToken(token);
+ return R.ok(loginVo);
+ }
+
+ /**
* 灏忕▼搴忕櫥褰�(绀轰緥)
*
* @param xcxCode 灏忕▼搴廲ode
--
Gitblit v1.9.3