From f7b1b518525dd2254efea2931a3dc6b447080f89 Mon Sep 17 00:00:00 2001
From: wangwh <2397901735@qq.com>
Date: Sat, 24 Aug 2024 11:25:37 +0800
Subject: [PATCH] 网关去掉开发配置
---
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtAccountService.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtAccountService.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtAccountService.java
index 86a6a72..470b7cb 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtAccountService.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtAccountService.java
@@ -153,9 +153,23 @@
* @param accType 账号类型
* @return
*/
- public CtAccount getByAccAndType(String acc, String accType){
+ public CtAccount getByAccAndType(String acc, int accType){
QueryWrapper<CtAccount> accountWrapper = new QueryWrapper<>();
accountWrapper.eq("acc", acc)
+ .eq("acc_type", accType);
+ CtAccount ctAccount = this.getOne(accountWrapper);
+ return ctAccount;
+ }
+
+ /**
+ * 根据用户编号和类型查询
+ * @param userId 用户编号
+ * @param accType 账号类型
+ * @return
+ */
+ public CtAccount getByUserIdAndType(String userId, int accType){
+ QueryWrapper<CtAccount> accountWrapper = new QueryWrapper<>();
+ accountWrapper.eq("user_id", userId)
.eq("acc_type", accType);
CtAccount ctAccount = this.getOne(accountWrapper);
return ctAccount;
@@ -214,7 +228,7 @@
if (checkCredential(ctAccountLoginDTO.getCipher(), ctAccount)) {
//返回结果
UserLoginDTO userLoginDTO = new UserLoginDTO();
- CtUser ctUser = ctUserService.getByIdFromRedis(ctAccount.getUserId());
+ CtUser ctUser = ctUserService.getById(ctAccount.getUserId());
if (ObjectUtils.isEmpty(ctUser)){
return ReturnFailUtils.getRepInfo("账号或密码错误,请确认后重试!");
}
--
Gitblit v1.8.0