xieyinlu/ruoyi-ai
1
0
Fork 0
mirror of https://gitcode.com/ageerle/ruoyi-ai.git synced 2026-04-04 23:37:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(wechat): 修复微信公众号无法登录

Browse Source
This commit is contained in:
ageerle
2026-03-09 10:27:53 +08:00
parent 84dbc2cfbf
commit e601eb6db5
19 changed files with 142 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/controller/chat/ChatConfigController.java → ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/controller/system/ChatConfigController.java
View File

@@ -1,26 +1,27 @@
package org.ruoyi.controller.chat;
package org.ruoyi.system.controller.system;
import java.util.List;
import lombok.RequiredArgsConstructor;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.*;
import cn.dev33.satoken.annotation.SaCheckPermission;
import org.ruoyi.common.web.core.BaseController;
import org.ruoyi.service.chat.IChatConfigService;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import org.ruoyi.common.idempotent.annotation.RepeatSubmit;
import org.ruoyi.common.log.annotation.Log;
import org.ruoyi.common.mybatis.core.page.PageQuery;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
import lombok.RequiredArgsConstructor;
import org.ruoyi.common.core.domain.R;
import org.ruoyi.common.core.validate.AddGroup;
import org.ruoyi.common.core.validate.EditGroup;
import org.ruoyi.common.log.enums.BusinessType;
import org.ruoyi.common.excel.utils.ExcelUtil;
import org.ruoyi.domain.vo.chat.ChatConfigVo;
import org.ruoyi.domain.bo.chat.ChatConfigBo;
import org.ruoyi.common.idempotent.annotation.RepeatSubmit;
import org.ruoyi.common.log.annotation.Log;
import org.ruoyi.common.log.enums.BusinessType;
import org.ruoyi.common.mybatis.core.page.PageQuery;
import org.ruoyi.common.mybatis.core.page.TableDataInfo;
import org.ruoyi.common.web.core.BaseController;
import org.ruoyi.system.domain.bo.ChatConfigBo;
import org.ruoyi.system.domain.vo.ChatConfigVo;
import org.ruoyi.system.service.IChatConfigService;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* 配置信息
@@ -79,6 +80,25 @@ public class ChatConfigController extends BaseController {
return toAjax(chatConfigService.insertByBo(bo));
}
/**
* 新增或者修改配置信息
*/
@SaCheckPermission("system:config:add")
@Log(title = "新增或者修改配置信息", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PostMapping("/saveOrUpdate")
public R<Void> saveOrUpdate(@RequestBody List<ChatConfigBo> boList) {
for (ChatConfigBo chatConfigBo : boList) {
if (chatConfigBo.getId() == null) {
chatConfigService.insertByBo(chatConfigBo);
} else {
chatConfigService.updateByBo(chatConfigBo);
}
}
return toAjax(true);
}
/**
* 修改配置信息
*/

9
ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/domain/entity/chat/ChatConfig.java → ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/domain/ChatConfig.java
View File

@@ -1,9 +1,12 @@
package org.ruoyi.domain.entity.chat;
package org.ruoyi.system.domain;
import org.ruoyi.common.tenant.core.TenantEntity;
import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.Version;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.ruoyi.common.tenant.core.TenantEntity;
import java.io.Serial;

13
ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/domain/bo/chat/ChatConfigBo.java → ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/domain/bo/ChatConfigBo.java
View File

@@ -1,13 +1,14 @@
package org.ruoyi.domain.bo.chat;
package org.ruoyi.system.domain.bo;
import org.ruoyi.common.core.validate.AddGroup;
import org.ruoyi.common.core.validate.EditGroup;
import org.ruoyi.domain.entity.chat.ChatConfig;
import org.ruoyi.common.mybatis.core.domain.BaseEntity;
import io.github.linpeilie.annotations.AutoMapper;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
import org.ruoyi.common.core.validate.AddGroup;
import org.ruoyi.common.core.validate.EditGroup;
import org.ruoyi.common.mybatis.core.domain.BaseEntity;
import org.ruoyi.system.domain.ChatConfig;
/**
* 配置信息业务对象 chat_config

5
ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/domain/vo/chat/ChatConfigVo.java → ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/domain/vo/ChatConfigVo.java
View File

@@ -1,16 +1,15 @@
package org.ruoyi.domain.vo.chat;
package org.ruoyi.system.domain.vo;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import org.ruoyi.domain.entity.chat.ChatConfig;
import org.ruoyi.system.domain.ChatConfig;
import java.io.Serial;
import java.io.Serializable;
/**
* 配置信息视图对象 chat_config
*

6
ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/mapper/chat/ChatConfigMapper.java → ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/mapper/ChatConfigMapper.java
View File

@@ -1,8 +1,8 @@
package org.ruoyi.mapper.chat;
package org.ruoyi.system.mapper;
import org.ruoyi.domain.entity.chat.ChatConfig;
import org.ruoyi.domain.vo.chat.ChatConfigVo;
import org.ruoyi.common.mybatis.core.mapper.BaseMapperPlus;
import org.ruoyi.system.domain.ChatConfig;
import org.ruoyi.system.domain.vo.ChatConfigVo;
/**
* 配置信息Mapper接口

6
ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/service/chat/IChatConfigService.java → ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/service/IChatConfigService.java
View File

@@ -1,9 +1,9 @@
package org.ruoyi.service.chat;
package org.ruoyi.system.service;
import org.ruoyi.common.mybatis.core.page.PageQuery;
import org.ruoyi.common.mybatis.core.page.TableDataInfo;
import org.ruoyi.domain.bo.chat.ChatConfigBo;
import org.ruoyi.domain.vo.chat.ChatConfigVo;
import org.ruoyi.system.domain.bo.ChatConfigBo;
import org.ruoyi.system.domain.vo.ChatConfigVo;
import java.util.Collection;
import java.util.List;

24
ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/service/chat/impl/ChatConfigServiceImpl.java → ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/service/impl/ChatConfigServiceImpl.java
View File

@@ -1,24 +1,24 @@
package org.ruoyi.service.chat.impl;
package org.ruoyi.system.service.impl;
import org.ruoyi.common.core.utils.MapstructUtils;
import org.ruoyi.common.core.utils.StringUtils;
import org.ruoyi.common.mybatis.core.page.TableDataInfo;
import org.ruoyi.common.mybatis.core.page.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.ruoyi.service.chat.IChatConfigService;
import org.ruoyi.common.core.utils.MapstructUtils;
import org.ruoyi.common.core.utils.StringUtils;
import org.ruoyi.common.mybatis.core.page.PageQuery;
import org.ruoyi.common.mybatis.core.page.TableDataInfo;
import org.ruoyi.system.domain.ChatConfig;
import org.ruoyi.system.domain.bo.ChatConfigBo;
import org.ruoyi.system.domain.vo.ChatConfigVo;
import org.ruoyi.system.mapper.ChatConfigMapper;
import org.ruoyi.system.service.IChatConfigService;
import org.springframework.stereotype.Service;
import org.ruoyi.domain.bo.chat.ChatConfigBo;
import org.ruoyi.domain.vo.chat.ChatConfigVo;
import org.ruoyi.domain.entity.chat.ChatConfig;
import org.ruoyi.mapper.chat.ChatConfigMapper;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* 配置信息Service业务层处理

13
ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/service/impl/SysConfigServiceImpl.java
View File

@@ -18,9 +18,11 @@ import org.ruoyi.common.mybatis.core.page.PageQuery;
import org.ruoyi.common.mybatis.core.page.TableDataInfo;
import org.ruoyi.common.redis.utils.CacheUtils;
import org.ruoyi.common.tenant.helper.TenantHelper;
import org.ruoyi.system.domain.ChatConfig;
import org.ruoyi.system.domain.SysConfig;
import org.ruoyi.system.domain.bo.SysConfigBo;
import org.ruoyi.system.domain.vo.SysConfigVo;
import org.ruoyi.system.mapper.ChatConfigMapper;
import org.ruoyi.system.mapper.SysConfigMapper;
import org.ruoyi.system.service.ISysConfigService;
import org.springframework.cache.annotation.CachePut;
@@ -41,6 +43,9 @@ public class SysConfigServiceImpl implements ISysConfigService, ConfigService {
private final SysConfigMapper baseMapper;
private final ChatConfigMapper configMapper;
/**
* 分页查询参数配置列表
*
@@ -212,4 +217,12 @@ public class SysConfigServiceImpl implements ISysConfigService, ConfigService {
return SpringUtils.getAopProxy(this).selectConfigByKey(configKey);
}
@Override
public String getConfigValue(String category, String configKey) {
ChatConfig config = configMapper.selectOne(new LambdaQueryWrapper<ChatConfig>()
.eq(ChatConfig::getCategory, category)
.eq(ChatConfig::getConfigName, configKey));
return ObjectUtils.notNullGetter(config, ChatConfig::getConfigValue, StringUtils.EMPTY);
}
}

18
ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/service/impl/UserLoginServiceImpl.java
View File

@@ -7,8 +7,10 @@ import cn.hutool.crypto.digest.BCrypt;
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang3.math.NumberUtils;
import org.ruoyi.common.core.constant.Constants;
import org.ruoyi.common.core.constant.SystemConstants;
import org.ruoyi.common.core.domain.dto.VisitorLoginUserDto;
import org.ruoyi.common.core.enums.UserType;
import org.ruoyi.common.core.exception.ServiceException;
import org.ruoyi.common.core.service.UserLoginService;
import org.ruoyi.common.core.utils.MessageUtils;
import org.ruoyi.common.satoken.utils.LoginHelper;
@@ -33,12 +35,19 @@ public class UserLoginServiceImpl implements UserLoginService {
public VisitorLoginUserDto mpLogin(String openid, String clientId) {
// 校验客户端
SysClientVo client = clientService.queryByClientId(clientId);
if (ObjectUtil.isNull(client)) {
throw new ServiceException(MessageUtils.message("auth.grant.type.error"));
} else if (!SystemConstants.NORMAL.equals(client.getStatus())) {
throw new ServiceException(MessageUtils.message("auth.grant.type.blocked"));
}
// 使用 openid 查询绑定用户 如未绑定用户 则根据业务自行处理 例如 创建默认用户
SysUserVo user = userService.selectUserByOpenId(openid);
VisitorLoginUserDto loginUser = new VisitorLoginUserDto();
if (ObjectUtil.isNull(user)) {
SysUserBo sysUser = new SysUserBo();
String name = "用户" + UUID.randomUUID().toString().replace("-", "");
String name = "用户" + UUID.randomUUID().toString().replace("-", "").substring(0, 7);
// 设置默认用户名
sysUser.setUserName(name);
// 设置默认昵称
@@ -47,6 +56,8 @@ public class UserLoginServiceImpl implements UserLoginService {
sysUser.setPassword(BCrypt.hashpw("123456"));
// 设置微信openId
sysUser.setOpenId(openid);
// 设置用户类型
sysUser.setUserType(UserType.SYS_USER.getUserType());
// 设置默认余额
sysUser.setUserBalance(NumberUtils.toDouble("1"));
// 注册用户,设置默认租户为0
@@ -54,16 +65,15 @@ public class UserLoginServiceImpl implements UserLoginService {
// 构建登录用户信息
loginUser.setUserId(sysUser.getUserId());
loginUser.setUsername(sysUser.getUserName());
loginUser.setUserType(UserType.APP_USER.getUserType());
loginUser.setUserType(UserType.SYS_USER.getUserType());
loginUser.setOpenid(openid);
} else {
// 此处可根据登录用户的数据不同 自行创建 loginUser
loginUser.setUserId(user.getUserId());
loginUser.setUsername(user.getUserName());
loginUser.setUserType(user.getUserType());
loginUser.setUserType(UserType.SYS_USER.getUserType());
loginUser.setOpenid(openid);
}
SysClientVo client = clientService.queryByClientId(clientId);
SaLoginParameter model = new SaLoginParameter();
model.setDeviceType(client.getDeviceType());
// 自定义分配 不同用户体系 不同 token 授权时间 不设置默认走全局 yml 配置

2
ruoyi-modules/ruoyi-wechat/src/main/java/org/ruoyi/util/WeixinApiUtil.java
View File

@@ -74,6 +74,6 @@ public class WeixinApiUtil {
}
public String getKey(String key) {
return configService.getConfigValue("weixin");
return configService.getConfigValue("wechat",key);
}
}