Commit 00443e8e authored by 李健华's avatar 李健华

Merge branch 'hotfix/deleteDeregister-20220616' into 'master'

Hotfix/delete deregister 20220616

See merge request !73
parents 2a28c43c 0f3e4820
...@@ -592,7 +592,7 @@ public class UserServiceImpl implements IUserService, IBaseController { ...@@ -592,7 +592,7 @@ public class UserServiceImpl implements IUserService, IBaseController {
/* 删除用户身份证和手机的hashMapping */ /* 删除用户身份证和手机的hashMapping */
userHashMappingRepository.deleteByUserId(userId); userHashMappingRepository.deleteByUserId(userId);
/* 删除用户手机号加身份证hashMapping */ /* 删除用户手机号加身份证hashMapping */
userHashPhoneNoIdNoMappingRepository.deleteByUserId(userId); // userHashPhoneNoIdNoMappingRepository.deleteByUserId(userId);
/* 删除用户uuid和手机号mapping */ /* 删除用户uuid和手机号mapping */
uuidPhoneMappingRepository.deleteByUuid(user.getUuid()); uuidPhoneMappingRepository.deleteByUuid(user.getUuid());
......
...@@ -58,6 +58,9 @@ public class IpUtil { ...@@ -58,6 +58,9 @@ public class IpUtil {
* @return * @return
*/ */
public static final boolean whiteOf(String ipv4) { public static final boolean whiteOf(String ipv4) {
if (!TechEnvironment.isPro()) {
return true;
}
if (ValidationUtil.validateIpv4(ipv4)) { if (ValidationUtil.validateIpv4(ipv4)) {
for (String ipField : WHITE_ADDRESS) { for (String ipField : WHITE_ADDRESS) {
if (ipv4.startsWith(ipField)) { if (ipv4.startsWith(ipField)) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment