From d0ba77ae92bd9d401a6c6b216555829351d5ef5d Mon Sep 17 00:00:00 2001 From: sh Date: Wed, 6 May 2026 12:05:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=BC=8F=E6=B4=9E=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E2=80=94=E2=80=94=E9=99=90=E5=88=B6=E6=B3=A8=E5=86=8C?= =?UTF-8?q?=E6=97=B6=E5=80=99=E4=B8=8D=E8=83=BD=E4=BF=AE=E6=94=B9=E6=89=8B?= =?UTF-8?q?=E6=9C=BA=E5=8F=B7=E5=92=8Copenid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/system/SysLoginController.java | 11 ++++++++++- .../com/ruoyi/cms/service/impl/ESJobSearchImpl.java | 4 ++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java index 3926274..870f4c5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java @@ -16,7 +16,6 @@ import com.ruoyi.common.utils.ip.IpUtils; import com.ruoyi.framework.web.service.OauthLoginHlwService; import com.ruoyi.framework.web.service.OauthLoginService; import io.swagger.annotations.ApiOperation; -import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.web.bind.annotation.*; @@ -248,6 +247,16 @@ public class SysLoginController return AjaxResult.error("请求过于频繁，请稍后再试"); } + //手机号和openid不能修改 + if(registerBody.getAppUser()!=null){ + AppUser appUser=registerBody.getAppUser(); + if (StringUtils.isNotBlank(appUser.getPhone()) || StringUtils.isNotBlank(appUser.getOpenid())) { + return AjaxResult.error("信息完善接口不允许修改手机号或openid"); + } + appUser.setPhone(null); + appUser.setOpenid(null); + } + String token=loginService.registerAppUser(registerBody); return AjaxResult.success().put("token",token); } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/ESJobSearchImpl.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/ESJobSearchImpl.java index 3c9c979..f82189e 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/ESJobSearchImpl.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/ESJobSearchImpl.java @@ -60,9 +60,9 @@ public class ESJobSearchImpl implements IESJobSearchService // 锁的key（唯一标识ES索引初始化） private static final String ES_INIT_LOCK_KEY = "es:job_document:init:lock"; // 锁过期时间（30分钟，确保初始化完成） - private static final Integer LOCK_EXPIRE_SECONDS = 600;//1800 + private static final Integer LOCK_EXPIRE_SECONDS = 1800; // 等待锁时间（5分钟，避免无限等待） - private static final Integer WAIT_LOCK_SECONDS = 1;//300 + private static final Integer WAIT_LOCK_SECONDS = 10;//300 @Autowired