From 4b539390029c93f965df2ee46d05c739df90631b Mon Sep 17 00:00:00 2001
From: ageer <ageerle@163.com>
Date: 星期六, 12 四月 2025 15:18:16 +0800
Subject: [PATCH] feat: mcp支持,模块重构
---
ruoyi-admin/src/main/java/org/ruoyi/controller/AuthController.java | 29 ++++++++++++-----------------
1 files changed, 12 insertions(+), 17 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/controller/system/AuthController.java b/ruoyi-admin/src/main/java/org/ruoyi/controller/AuthController.java
similarity index 89%
rename from ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/controller/system/AuthController.java
rename to ruoyi-admin/src/main/java/org/ruoyi/controller/AuthController.java
index 360abeb..e78d09c 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/controller/system/AuthController.java
+++ b/ruoyi-admin/src/main/java/org/ruoyi/controller/AuthController.java
@@ -1,12 +1,14 @@
-package org.ruoyi.system.controller.system;
+package org.ruoyi.controller;
import cn.dev33.satoken.annotation.SaIgnore;
import cn.hutool.core.collection.CollUtil;
-import jakarta.servlet.http.HttpServletRequest;
-import lombok.RequiredArgsConstructor;
import org.ruoyi.common.core.constant.Constants;
import org.ruoyi.common.core.domain.R;
-import org.ruoyi.common.core.domain.model.*;
+import org.ruoyi.common.core.domain.model.EmailLoginBody;
+import org.ruoyi.common.core.domain.model.LoginBody;
+import org.ruoyi.common.core.domain.model.RegisterBody;
+import org.ruoyi.common.core.domain.model.SmsLoginBody;
+import org.ruoyi.common.core.domain.model.VisitorLoginBody;
import org.ruoyi.common.core.utils.MapstructUtils;
import org.ruoyi.common.core.utils.StreamUtils;
import org.ruoyi.common.core.utils.StringUtils;
@@ -14,12 +16,16 @@
import org.ruoyi.common.tenant.helper.TenantHelper;
import org.ruoyi.system.domain.bo.SysTenantBo;
import org.ruoyi.system.domain.vo.LoginTenantVo;
-import org.ruoyi.system.domain.vo.LoginVo;
import org.ruoyi.system.domain.vo.SysTenantVo;
import org.ruoyi.system.domain.vo.TenantListVo;
import org.ruoyi.system.service.ISysTenantService;
+
import org.ruoyi.system.service.SysLoginService;
import org.ruoyi.system.service.SysRegisterService;
+import org.ruoyi.system.domain.vo.LoginVo;
+
+import jakarta.servlet.http.HttpServletRequest;
+import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -42,15 +48,6 @@
private final SysRegisterService registerService;
private final ISysTenantService tenantService;
-
-// @PostMapping("/xcxLogin")
-// public R<LoginVo> login(@Validated @RequestBody String xcxCode) throws WxErrorException {
-//
-// String openidFromCode = loginService.getOpenidFromCode((String) JSONUtil.parseObj(xcxCode).get("xcxCode"));
-// LoginVo loginVo = loginService.mpLogin(openidFromCode);
-// return R.ok(loginVo);
-// }
-
/**
* 鐧诲綍鏂规硶
*
@@ -67,7 +64,6 @@
body.getUsername(), body.getPassword(),
body.getCode(), body.getUuid());
loginVo.setToken(token);
- loginVo.setAccess_token(token);
loginVo.setUserInfo(LoginHelper.getLoginUser());
return R.ok(loginVo);
}
@@ -89,7 +85,6 @@
/**
* 璁垮鐧诲綍
- *
* @param loginBody 鐧诲綍淇℃伅
* @return token淇℃伅
*/
@@ -128,7 +123,7 @@
*/
@PostMapping("/register")
public R<Void> register(@Validated @RequestBody RegisterBody user, HttpServletRequest request) {
- String domainName = request.getServerName();
+ String domainName = request.getServerName();
user.setDomainName(domainName);
registerService.register(user);
return R.ok();
--
Gitblit v1.9.3