From 181166f4c06311447dc3e8aec39ef61f1ce4b2e1 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 30 三月 2023 18:59:07 +0800
Subject: [PATCH] update 优化 !pr324 代码结构
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/AuthController.java | 35 +++++++++++++++++++++++++++++++----
1 files changed, 31 insertions(+), 4 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..d5b906c 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
@@ -2,7 +2,9 @@
import cn.dev33.satoken.annotation.SaIgnore;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.convert.Convert;
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;
@@ -56,15 +58,15 @@
LoginVo loginVo = new LoginVo();
// 鐢熸垚浠ょ墝
String token = loginService.login(
- body.getTenantId(),
- body.getUsername(), body.getPassword(),
- body.getCode(), body.getUuid());
+ body.getTenantId(),
+ body.getUsername(), body.getPassword(),
+ body.getCode(), body.getUuid());
loginVo.setToken(token);
return R.ok(loginVo);
}
/**
- * 鐭俊鐧诲綍(绀轰緥)
+ * 鐭俊鐧诲綍
*
* @param body 鐧诲綍淇℃伅
* @return 缁撴灉
@@ -74,6 +76,21 @@
LoginVo loginVo = new LoginVo();
// 鐢熸垚浠ょ墝
String token = loginService.smsLogin(body.getTenantId(), body.getPhonenumber(), body.getSmsCode());
+ loginVo.setToken(token);
+ return R.ok(loginVo);
+ }
+
+ /**
+ * 閭欢鐧诲綍
+ *
+ * @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);
}
@@ -134,4 +151,14 @@
return R.ok(vo);
}
+ /**
+ * 娉ㄥ唽寮�鍏�
+ *
+ * @return ture锛氭墦寮� false锛氬叧闂�
+ */
+ @GetMapping("/registerEnabled")
+ public R<Boolean> registerEnabled() {
+ return R.ok(Convert.toBool(configService.selectConfigByKey("sys.account.registerUser")));
+ }
+
}
--
Gitblit v1.9.3