v3.0.0 init

2026-04-12 19:17:20 +00:00 · 2026-02-06 03:00:23 +08:00
parent eb2e8f3ff8
commit 7b8cfe02a1
1524 changed files with 53132 additions and 58866 deletions
--- a/ruoyi-modules/ruoyi-wechat/src/main/java/org/ruoyi/controller/WeixinUserController.java
+++ b/ruoyi-modules/ruoyi-wechat/src/main/java/org/ruoyi/controller/WeixinUserController.java
@@ -3,9 +3,9 @@ package org.ruoyi.controller;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.ruoyi.common.core.domain.R;
+import org.ruoyi.common.core.domain.dto.VisitorLoginUserDto;
+import org.ruoyi.common.core.service.UserLoginService;
 import org.ruoyi.domin.WeixinQrCode;
-import org.ruoyi.service.VxLoginService;
-import org.ruoyi.system.domain.vo.LoginVo;
 import org.ruoyi.util.WeixinApiUtil;
 import org.ruoyi.util.WeixinQrCodeCacheUtil;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,7 +26,7 @@ public class WeixinUserController {
    private WeixinApiUtil weixinApiUtil;

    @Autowired
-    private VxLoginService loginService;
+    private UserLoginService userLoginService;

    @GetMapping(value = "/user/qrcode")
    public R<WeixinQrCode> getQrCode() {
@@ -42,12 +42,12 @@ public class WeixinUserController {
     * 未完成，返回 check failed
     */
    @GetMapping(value = "/user/login/qrcode")
-    public R<LoginVo> userLogin(String ticket) {
+    public R<VisitorLoginUserDto> userLogin(String ticket,String clientId) {
        String openId = WeixinQrCodeCacheUtil.get(ticket);
        if (StringUtils.isNotEmpty(openId)) {
            log.info("login success,open id:{}", openId);
-            LoginVo loginVo = loginService.mpLogin(openId);
-            return R.ok(loginVo);
+            VisitorLoginUserDto loginBody = userLoginService.mpLogin(openId,clientId);
+            return R.ok(loginBody);
        }
        log.info("login error,ticket:{}", ticket);
        return R.fail("check failed");
--- a/ruoyi-modules/ruoyi-wechat/src/main/java/org/ruoyi/controller/WxPortalController.java
+++ b/ruoyi-modules/ruoyi-wechat/src/main/java/org/ruoyi/controller/WxPortalController.java
@@ -6,7 +6,7 @@ import me.chanjar.weixin.cp.bean.message.WxCpXmlMessage;
 import me.chanjar.weixin.cp.bean.message.WxCpXmlOutMessage;
 import me.chanjar.weixin.cp.util.crypto.WxCpCryptUtil;
 import org.apache.commons.lang3.StringUtils;
-import org.ruoyi.common.core.utils.JsonUtils;
+import org.ruoyi.common.json.utils.JsonUtils;
 import org.ruoyi.config.WxCpConfiguration;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
@@ -63,7 +63,7 @@ public class WxPortalController {
        final WxCpService wxCpService = WxCpConfiguration.getCpService(1000002);
        WxCpXmlMessage inMessage = WxCpXmlMessage.fromEncryptedXml(requestBody, wxCpService.getWxCpConfigStorage(),
                timestamp, nonce, signature);
-        log.debug("\n消息解密后内容为：\n{} ", JsonUtils.toJson(inMessage));
+        log.debug("\n消息解密后内容为：\n{} ", JsonUtils.toJsonString(inMessage));
        WxCpXmlOutMessage outMessage = this.route(1000002, inMessage);
        if (outMessage == null) {
            return "";
--- a/ruoyi-modules/ruoyi-wechat/src/main/java/org/ruoyi/handler/ContactChangeHandler.java
+++ b/ruoyi-modules/ruoyi-wechat/src/main/java/org/ruoyi/handler/ContactChangeHandler.java
@@ -7,7 +7,7 @@ import me.chanjar.weixin.cp.api.WxCpService;
 import me.chanjar.weixin.cp.bean.message.WxCpXmlMessage;
 import me.chanjar.weixin.cp.bean.message.WxCpXmlOutMessage;
 import org.ruoyi.builder.TextBuilder;
-import org.ruoyi.common.core.utils.JsonUtils;
+import org.ruoyi.common.json.utils.JsonUtils;
 import org.springframework.stereotype.Component;

 import java.util.Map;
@@ -24,7 +24,7 @@ public class ContactChangeHandler extends AbstractHandler {
    @Override
    public WxCpXmlOutMessage handle(WxCpXmlMessage wxMessage, Map<String, Object> context, WxCpService cpService,
                                    WxSessionManager sessionManager) {
-        String content = "收到通讯录变更事件，内容：" + JsonUtils.toJson(wxMessage);
+        String content = "收到通讯录变更事件，内容：" + JsonUtils.toJsonString(wxMessage);
        log.info(content);

        return new TextBuilder().build(content, wxMessage, cpService);
--- a/ruoyi-modules/ruoyi-wechat/src/main/java/org/ruoyi/handler/LogHandler.java
+++ b/ruoyi-modules/ruoyi-wechat/src/main/java/org/ruoyi/handler/LogHandler.java
@@ -5,7 +5,7 @@ import me.chanjar.weixin.common.session.WxSessionManager;
 import me.chanjar.weixin.cp.api.WxCpService;
 import me.chanjar.weixin.cp.bean.message.WxCpXmlMessage;
 import me.chanjar.weixin.cp.bean.message.WxCpXmlOutMessage;
-import org.ruoyi.common.core.utils.JsonUtils;
+import org.ruoyi.common.json.utils.JsonUtils;
 import org.springframework.stereotype.Component;

 import java.util.Map;
@@ -19,7 +19,7 @@ public class LogHandler extends AbstractHandler {
    @Override
    public WxCpXmlOutMessage handle(WxCpXmlMessage wxMessage, Map<String, Object> context, WxCpService cpService,
                                    WxSessionManager sessionManager) {
-        log.info("\n接收到请求消息，内容：{}", JsonUtils.toJson(wxMessage));
+        log.info("\n接收到请求消息，内容：{}", JsonUtils.toJsonString(wxMessage));
        return null;
    }

--- a/ruoyi-modules/ruoyi-wechat/src/main/java/org/ruoyi/handler/MsgHandler.java
+++ b/ruoyi-modules/ruoyi-wechat/src/main/java/org/ruoyi/handler/MsgHandler.java
@@ -7,7 +7,6 @@ import me.chanjar.weixin.cp.api.WxCpService;
 import me.chanjar.weixin.cp.bean.message.WxCpXmlMessage;
 import me.chanjar.weixin.cp.bean.message.WxCpXmlOutMessage;
 import org.ruoyi.builder.TextBuilder;
-import org.ruoyi.service.IChatVxService;
 import org.springframework.stereotype.Component;

 import java.util.Map;
@@ -19,8 +18,6 @@ import java.util.Map;
@RequiredArgsConstructor
 public class MsgHandler extends AbstractHandler {

-    private final IChatVxService chatVxService;
-
    @Override
    public WxCpXmlOutMessage handle(WxCpXmlMessage wxMessage, Map<String, Object> context, WxCpService cpService,
                                    WxSessionManager sessionManager) {
@@ -33,9 +30,7 @@ public class MsgHandler extends AbstractHandler {
            //TODO 可以选择将消息保存到本地
        }
        //TODO 组装回复消息
-        String content = chatVxService.chat(wxMessage.getContent());
-
-        return new TextBuilder().build(content, wxMessage, cpService);
+        return new TextBuilder().build("你好", wxMessage, cpService);

    }

--- a/ruoyi-modules/ruoyi-wechat/src/main/java/org/ruoyi/service/VxLoginService.java
+++ b/ruoyi-modules/ruoyi-wechat/src/main/java/org/ruoyi/service/VxLoginService.java
@@ -1,108 +0,0 @@
-package org.ruoyi.service;
-
-import cn.dev33.satoken.secure.BCrypt;
-import cn.dev33.satoken.stp.StpUtil;
-import cn.hutool.core.util.ObjectUtil;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.math.NumberUtils;
-import org.ruoyi.common.core.constant.Constants;
-import org.ruoyi.common.core.domain.model.VisitorLoginUser;
-import org.ruoyi.common.core.enums.DeviceType;
-import org.ruoyi.common.core.enums.UserType;
-import org.ruoyi.common.core.service.ConfigService;
-import org.ruoyi.common.core.utils.MessageUtils;
-import org.ruoyi.common.core.utils.ServletUtils;
-import org.ruoyi.common.core.utils.SpringUtils;
-import org.ruoyi.common.log.event.LogininforEvent;
-import org.ruoyi.common.satoken.utils.LoginHelper;
-import org.ruoyi.system.domain.SysUser;
-import org.ruoyi.system.domain.bo.SysUserBo;
-import org.ruoyi.system.domain.vo.LoginVo;
-import org.ruoyi.system.domain.vo.SysUserVo;
-import org.ruoyi.system.service.ISysUserService;
-import org.springframework.stereotype.Service;
-
-import java.util.UUID;
-
-/**
- * 微信公众号登录
- *
- * @author ageerle@163.com
- * date 2025/4/30
- */
-@Slf4j
-@Service
-@RequiredArgsConstructor
-public class VxLoginService {
-
-    private final ISysUserService userService;
-
-    private final ConfigService configService;
-
-    public LoginVo mpLogin(String openid) {
-        // 使用 openid 查询绑定用户 如未绑定用户 则根据业务自行处理 例如 创建默认用户
-        SysUserVo user = userService.selectUserByOpenId(openid);
-        VisitorLoginUser loginUser = new VisitorLoginUser();
-        if (ObjectUtil.isNull(user)) {
-            SysUserBo sysUser = new SysUserBo();
-            String name = "用户" + UUID.randomUUID().toString().replace("-", "");
-            // 设置默认用户名
-            sysUser.setUserName(name);
-            // 设置默认昵称
-            sysUser.setNickName(name);
-            // 设置默认密码
-            sysUser.setPassword(BCrypt.hashpw("123456"));
-            // 设置微信openId
-            sysUser.setOpenId(openid);
-            String configValue = configService.getConfigValue("mail", "amount");
-            // 设置默认余额
-            sysUser.setUserBalance(NumberUtils.toDouble(configValue, 1));
-            // 注册用户,设置默认租户为0
-            SysUser registerUser = userService.registerUser(sysUser, "0");
-
-            // 构建登录用户信息
-            loginUser.setTenantId("0");
-            loginUser.setUserId(registerUser.getUserId());
-            loginUser.setUsername(registerUser.getUserName());
-            loginUser.setUserType(UserType.APP_USER.getUserType());
-            loginUser.setOpenid(openid);
-            loginUser.setNickName(registerUser.getNickName());
-        } else {
-            // 此处可根据登录用户的数据不同 自行创建 loginUser
-            loginUser.setTenantId(user.getTenantId());
-            loginUser.setUserId(user.getUserId());
-            loginUser.setUsername(user.getUserName());
-            loginUser.setUserType(user.getUserType());
-            loginUser.setNickName(user.getNickName());
-            loginUser.setAvatar(user.getWxAvatar());
-            loginUser.setOpenid(openid);
-        }
-        // 生成token
-        LoginHelper.loginByDevice(loginUser, DeviceType.XCX);
-        recordLogininfor(loginUser.getTenantId(), loginUser.getUsername(), Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success"));
-        LoginVo loginVo = new LoginVo();
-        // 生成令牌
-        loginVo.setToken(StpUtil.getTokenValue());
-        loginVo.setUserInfo(loginUser);
-        return loginVo;
-    }
-
-    /**
-     * 记录登录信息
-     *
-     * @param tenantId 租户ID
-     * @param username 用户名
-     * @param status   状态
-     * @param message  消息内容
-     */
-    private void recordLogininfor(String tenantId, String username, String status, String message) {
-        LogininforEvent logininforEvent = new LogininforEvent();
-        logininforEvent.setTenantId(tenantId);
-        logininforEvent.setUsername(username);
-        logininforEvent.setStatus(status);
-        logininforEvent.setMessage(message);
-        logininforEvent.setRequest(ServletUtils.getRequest());
-        SpringUtils.context().publishEvent(logininforEvent);
-    }
-}
--- a/ruoyi-modules/ruoyi-wechat/src/main/java/org/ruoyi/service/impl/ChatVxServiceImpl.java
+++ b/ruoyi-modules/ruoyi-wechat/src/main/java/org/ruoyi/service/impl/ChatVxServiceImpl.java
@@ -1,37 +0,0 @@
-package org.ruoyi.service.impl;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.ruoyi.common.chat.entity.chat.ChatCompletion;
-import org.ruoyi.common.chat.entity.chat.ChatCompletionResponse;
-import org.ruoyi.common.chat.entity.chat.Message;
-import org.ruoyi.common.chat.openai.OpenAiStreamClient;
-import org.ruoyi.service.IChatVxService;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Service
-@Slf4j
-@RequiredArgsConstructor
-public class ChatVxServiceImpl implements IChatVxService {
-
-    private final OpenAiStreamClient openAiStreamClient;
-
-    @Override
-    public String chat(String prompt) {
-        List<Message> messageList = new ArrayList<>();
-        Message message = Message.builder().role(Message.Role.USER).content(prompt).build();
-        messageList.add(message);
-        ChatCompletion chatCompletion = ChatCompletion
-                .builder()
-                .messages(messageList)
-                .model("gpt-4o-mini")
-                .stream(false)
-                .build();
-        ChatCompletionResponse chatCompletionResponse = openAiStreamClient.chatCompletion(chatCompletion);
-        return chatCompletionResponse.getChoices().get(0).getMessage().getContent().toString();
-    }
-
-}
--- a/ruoyi-modules/ruoyi-wechat/src/main/java/org/ruoyi/util/WeixinApiUtil.java
+++ b/ruoyi-modules/ruoyi-wechat/src/main/java/org/ruoyi/util/WeixinApiUtil.java
@@ -74,6 +74,6 @@ public class WeixinApiUtil {
    }

    public String getKey(String key) {
-        return configService.getConfigValue("weixin", key);
+        return configService.getConfigValue("weixin");
    }
 }