Skip to content

Commit fae3a4e

Browse files
author
heavyrian2012
committed
当用户登录时,根据电话号码获取用户信息时,包括被删除用户。如果用户被删除,恢复被删除用户。
1 parent aa4629a commit fae3a4e

6 files changed

Lines changed: 12 additions & 4 deletions

File tree

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
2424
<java.version>1.8</java.version>
2525
<log4j2.version>2.17.2</log4j2.version>
26-
<wfc.sdk.version>1.4.3</wfc.sdk.version>
26+
<wfc.sdk.version>1.4.4</wfc.sdk.version>
2727
</properties>
2828

2929
<dependencies>

src/lib/common-1.4.3.jar

-1020 KB
Binary file not shown.

src/lib/common-1.4.4.jar

1 MB
Binary file not shown.

src/lib/sdk-1.4.3.jar

-175 KB
Binary file not shown.

src/lib/sdk-1.4.4.jar

175 KB
Binary file not shown.

src/main/java/cn/wildfirechat/app/ServiceImpl.java

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -712,7 +712,7 @@ private RestResult onLoginSuccess(HttpServletResponse httpResponse, String mobil
712712
Subject subject = SecurityUtils.getSubject();
713713
try {
714714
//使用电话号码查询用户信息。
715-
IMResult<InputOutputUserInfo> userResult = UserAdmin.getUserByMobile(mobile);
715+
IMResult<InputOutputUserInfo> userResult = UserAdmin.getUserByMobile(mobile, true);
716716

717717
//如果用户信息不存在,创建用户
718718
InputOutputUserInfo user;
@@ -751,13 +751,21 @@ private RestResult onLoginSuccess(HttpServletResponse httpResponse, String mobil
751751
LOG.info("Create user failure {}", userIdResult.code);
752752
return RestResult.error(RestResult.RestCode.ERROR_SERVER_ERROR);
753753
}
754-
755-
756754
} else if (userResult.getCode() != 0) {
757755
LOG.error("Get user failure {}", userResult.code);
758756
return RestResult.error(RestResult.RestCode.ERROR_SERVER_ERROR);
759757
} else {
760758
user = userResult.getResult();
759+
if(user.getDeleted() > 0) {
760+
user.setDeleted(0);
761+
IMResult<OutputCreateUser> userIdResult = UserAdmin.createUser(user);
762+
if (userIdResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
763+
isNewUser = true;
764+
} else {
765+
LOG.info("Create user failure {}", userIdResult.code);
766+
return RestResult.error(RestResult.RestCode.ERROR_SERVER_ERROR);
767+
}
768+
}
761769
}
762770

763771
//使用用户id获取token

0 commit comments

Comments
 (0)