From 83c4dd24f674b5f2c3d10ab98d04e8562202449b Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 27 十二月 2024 21:31:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applet/src/main/java/com/jilongda/applet/utils/LoginInfoUtil.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/applet/src/main/java/com/jilongda/applet/utils/LoginInfoUtil.java b/applet/src/main/java/com/jilongda/applet/utils/LoginInfoUtil.java
index 899ef21..fc4e046 100644
--- a/applet/src/main/java/com/jilongda/applet/utils/LoginInfoUtil.java
+++ b/applet/src/main/java/com/jilongda/applet/utils/LoginInfoUtil.java
@@ -16,14 +16,14 @@
public Integer getUserId(){
- String username = JwtTokenUtils.getUsername();
- TAppUser appUser = appUserService.getOne(new QueryWrapper<TAppUser>().eq("phone", username).eq("isDelete",0));
- return appUser.getId();
+// String username = JwtTokenUtils.getUsername();
+// TAppUser appUser = appUserService.getOne(new QueryWrapper<TAppUser>().eq("openId", username).eq("isDelete",0));
+ return 1;
}
public TAppUser getLoginUser(){
String username = JwtTokenUtils.getUsername();
- TAppUser TAppUser = appUserService.getOne(new QueryWrapper<TAppUser>().eq("phone", username).eq("isDelete",0));
+ TAppUser TAppUser = appUserService.getOne(new QueryWrapper<TAppUser>().eq("openId", username).eq("isDelete",0));
return TAppUser;
}
@@ -36,13 +36,13 @@
*/
public void logoff(){
String username = JwtTokenUtils.getUsername();
- TAppUser userName = appUserService.getOne(new QueryWrapper<TAppUser>().eq("phone", username).eq("isDelete",0));
+ TAppUser userName = appUserService.getOne(new QueryWrapper<TAppUser>().eq("openId", username).eq("isDelete",0));
userName.setIsDelete(true);
appUserService.saveOrUpdate(userName);
}
public Boolean checkPhoneExits(String phone){
- TAppUser userName = appUserService.getOne(new QueryWrapper<TAppUser>().eq("phone", phone).eq("isDelete",0));
+ TAppUser userName = appUserService.getOne(new QueryWrapper<TAppUser>().eq("openId", phone).eq("isDelete",0));
if(userName!=null){
return true;
}else{
--
Gitblit v1.7.1