diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/auth/AdminAuthServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/auth/AdminAuthServiceImpl.java index ea402b80b..eb7a12c9b 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/auth/AdminAuthServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/auth/AdminAuthServiceImpl.java @@ -219,9 +219,9 @@ public class AdminAuthServiceImpl implements AdminAuthService { reqDTO.setUserAgent(ServletUtils.getUserAgent()); reqDTO.setUserIp(clientIP); reqDTO.setResult(loginResult.getResult()); - IPQueryDataRespDTO ipQueryDataRespDTO = ipQueryService.querySource(clientIP); // 设置登录时通过ip云服务查询到的地域信息 - if (ipQueryService.serviceEnable() && ObjectUtil.isNotNull(ipQueryDataRespDTO)) { + if (ipQueryService.serviceEnable()) { + IPQueryDataRespDTO ipQueryDataRespDTO = ipQueryService.querySource(clientIP); reqDTO.setRegion(StringUtils.join(ipQueryDataRespDTO.getProv(), ipQueryDataRespDTO.getCity(), ipQueryDataRespDTO.getArea())); } loginLogService.createLoginLog(reqDTO); @@ -333,9 +333,9 @@ public class AdminAuthServiceImpl implements AdminAuthService { } else { reqDTO.setUsername(memberService.getMemberUserMobile(userId)); } - IPQueryDataRespDTO ipQueryDataRespDTO = ipQueryService.querySource(clientIP); // 设置登录时通过ip云服务查询到的地域信息 - if (ipQueryService.serviceEnable() && ObjectUtil.isNotNull(ipQueryDataRespDTO)) { + if (ipQueryService.serviceEnable()) { + IPQueryDataRespDTO ipQueryDataRespDTO = ipQueryService.querySource(clientIP); reqDTO.setRegion(StringUtils.join(ipQueryDataRespDTO.getProv(), ipQueryDataRespDTO.getCity(), ipQueryDataRespDTO.getArea())); } reqDTO.setUserAgent(ServletUtils.getUserAgent()); diff --git a/cf-module-system/cf-module-system-biz/src/main/resources/application.yaml b/cf-module-system/cf-module-system-biz/src/main/resources/application.yaml index 8cb879068..b3f97f18a 100644 --- a/cf-module-system/cf-module-system-biz/src/main/resources/application.yaml +++ b/cf-module-system/cf-module-system-biz/src/main/resources/application.yaml @@ -221,9 +221,9 @@ chenfeng: enable: false publicKey: cfimes ipquery: - enable: true + enable: false apiUrl: https://ipquery.market.alicloudapi.com/query - appCode: hBeRhmOnCR8f/XiD8zJ3lDaBSjbBA5ZZA2OEGswEOYQOK/hXVaT8E+AUOnEBcgFiw0R+39BvQ6TOVe2k + appCode: S8cdIA44xF6xOtO8K0WNmEkkE/15mzmkOYD2u3sAcmGgsZg/bBX1hpIppWv/X8X8PW1cS3BtNoaTVho/ cache: lock-timeout: 300000 lock-wait-time: 500