From 560820644817b0f14fd61898921a7d5ba63a2c10 Mon Sep 17 00:00:00 2001
From: Y.Payne <yupeng@anxinlirong>
Date: 星期日, 23 三月 2025 11:41:31 +0800
Subject: [PATCH] Merge branch 'main' of github.com:PeinYu/ruoyi-ai
---
ruoyi-admin/src/main/java/org/ruoyi/controller/AuthController.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/ruoyi-admin/src/main/java/org/ruoyi/controller/AuthController.java b/ruoyi-admin/src/main/java/org/ruoyi/controller/AuthController.java
index e78d09c..9fdc93a 100644
--- a/ruoyi-admin/src/main/java/org/ruoyi/controller/AuthController.java
+++ b/ruoyi-admin/src/main/java/org/ruoyi/controller/AuthController.java
@@ -2,6 +2,9 @@
import cn.dev33.satoken.annotation.SaIgnore;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.json.JSONUtil;
+import cn.hutool.json.ObjectMapper;
+import me.chanjar.weixin.common.error.WxErrorException;
import org.ruoyi.common.core.constant.Constants;
import org.ruoyi.common.core.domain.R;
import org.ruoyi.common.core.domain.model.EmailLoginBody;
@@ -48,6 +51,15 @@
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);
+ }
+
/**
* 鐧诲綍鏂规硶
*
@@ -85,6 +97,7 @@
/**
* 璁垮鐧诲綍
+ *
* @param loginBody 鐧诲綍淇℃伅
* @return token淇℃伅
*/
@@ -123,7 +136,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