From 1ed1752f678f769e43e9faa34809701850c7f727 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 30 三月 2023 19:14:38 +0800
Subject: [PATCH] update 优化 验证码有效期 迁移到数据库 参数管理内
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/AuthController.java | 27 ++++++++++++++++++++++-----
1 files changed, 22 insertions(+), 5 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 9c0a638..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,6 +2,7 @@
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;
@@ -10,10 +11,12 @@
import com.ruoyi.common.core.utils.MapstructUtils;
import com.ruoyi.common.core.utils.StreamUtils;
import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.tenant.helper.TenantHelper;
import com.ruoyi.system.domain.bo.SysTenantBo;
import com.ruoyi.system.domain.vo.SysTenantVo;
import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.system.service.ISysTenantService;
+import com.ruoyi.web.domain.vo.LoginTenantVo;
import com.ruoyi.web.domain.vo.LoginVo;
import com.ruoyi.web.domain.vo.TenantListVo;
import com.ruoyi.web.service.SysLoginService;
@@ -55,9 +58,9 @@
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);
}
@@ -134,14 +137,28 @@
* @return 绉熸埛鍒楄〃
*/
@GetMapping("/tenant/list")
- public R<List<TenantListVo>> tenantList(HttpServletRequest request) throws Exception {
+ public R<LoginTenantVo> tenantList(HttpServletRequest request) throws Exception {
List<SysTenantVo> tenantList = tenantService.queryList(new SysTenantBo());
List<TenantListVo> voList = MapstructUtils.convert(tenantList, TenantListVo.class);
// 鑾峰彇鍩熷悕
String host = new URL(request.getRequestURL().toString()).getHost();
// 鏍规嵁鍩熷悕杩涜绛涢��
List<TenantListVo> list = StreamUtils.filter(voList, vo -> StringUtils.equals(vo.getDomain(), host));
- return R.ok(CollUtil.isNotEmpty(list) ? list : voList);
+ // 杩斿洖瀵硅薄
+ LoginTenantVo vo = new LoginTenantVo();
+ vo.setVoList(CollUtil.isNotEmpty(list) ? list : voList);
+ vo.setTenantEnabled(TenantHelper.isEnable());
+ 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