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 | 17 +++--------------
1 files changed, 3 insertions(+), 14 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 d5b906c..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
@@ -2,7 +2,6 @@
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;
@@ -58,9 +57,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);
}
@@ -149,16 +148,6 @@
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