From 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 19 三月 2025 15:50:03 +0800
Subject: [PATCH] fix: resolve merge conflicts in .gitignore
---
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/WxLoginController.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/WxLoginController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/WxLoginController.java
index 7f39fab..17b3fba 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/WxLoginController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/WxLoginController.java
@@ -10,6 +10,7 @@
import com.ruoyi.common.core.domain.entity.SysMenu;
import com.ruoyi.common.core.domain.entity.SysRole;
+import com.ruoyi.common.core.domain.entity.TTenantResp;
import com.ruoyi.common.core.domain.model.LoginBody;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.domain.model.LoginUserApplet;
@@ -29,6 +30,7 @@
import com.ruoyi.system.utils.wx.tools.WxUtils;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
@@ -116,19 +118,26 @@
appletUserDecodeData.setOpenId(openid);
// 先使用openId和当前手机号进行查询
TTenant tenant = tTenantService.getOne(Wrappers.lambdaQuery(TTenant.class)
- .eq(TTenant::getOpenId, appletUserDecodeData.getOpenId())
- .eq(TTenant::getPhone, appletUserDecodeData.getPhoneNumber()));
+ .and(e->e.eq(TTenant::getOpenId, appletUserDecodeData.getOpenId()).or()
+ .eq(TTenant::getPhone, appletUserDecodeData.getPhoneNumber())));
if (tenant==null){
// appUser.setTenantAttributes();
// appUser.setTenantType();
+ tenant = new TTenant();
tenant.setPhone(appletUserDecodeData.getPhoneNumber());
tenant.setAccount(appletUserDecodeData.getPhoneNumber());
tenant.setPassword(SecurityUtils.encryptPassword(appletUserDecodeData.getPhoneNumber().substring(5)));
tenant.setOpenId(appletUserDecodeData.getOpenId());
+ // 手机号中间四位替换为*
+ tenant.setResidentName(appletUserDecodeData.getPhoneNumber().replaceAll("(\\d{3})\\d{4}(\\d{4})", "$1****$2"));
tTenantService.save(tenant);
}
LoginUserApplet loginUserApplet = new LoginUserApplet();
- loginUserApplet.setUserId(Long.valueOf(tenant.getId()));
+ TTenantResp tTenantResp = new TTenantResp();
+ BeanUtils.copyProperties(tenant, tTenantResp);
+ tTenantResp.setResidentName(appletUserDecodeData.getPhoneNumber());
+ loginUserApplet.setUser(tTenantResp);
+ loginUserApplet.setUserId(tenant.getId());
Map<String, Object> tokenInfos = new HashMap<>();
tokenInfos.put("token",tokenService.createTokenApplet(loginUserApplet));
tokenInfos.put("info",loginUserApplet);
--
Gitblit v1.7.1