From 65f184ace6ca6d96c3403353b024097194fdffbe Mon Sep 17 00:00:00 2001 From: PIGCLOUD Date: Wed, 14 Oct 2026 13:32:25 +0800 Subject: [PATCH] =?UTF-8?q?fix(upms):=20=E4=BF=9D=E5=AD=98=E7=BD=91?= =?UTF-8?q?=E7=AB=99=E9=85=8D=E7=BD=AE=E6=97=B6=E4=BF=9D=E7=95=99=E5=90=84?= =?UTF-8?q?=E7=BB=88=E7=AB=AF=E9=AA=8C=E8=AF=81=E7=A0=81=E5=BC=80=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 移除网站验证码模式变更时对所有 OAuth 终端 captcha_flag 的批量同步，保留前端对默认登录终端的同步行为。 Refs: pig/pigx#7631 (cherry picked from commit 836c2ea5e22f9e9a88f60d8a699e4a66e88979b9) --- .../impl/SysSiteConfigServiceImpl.java | 38 ------------------- 1 file changed, 38 deletions(-) diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysSiteConfigServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysSiteConfigServiceImpl.java index 79d5344cf..11fe8c4d9 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysSiteConfigServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysSiteConfigServiceImpl.java @@ -18,23 +18,15 @@ package com.pig4cloud.pigx.admin.service.impl; import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.util.StrUtil; -import cn.hutool.json.JSONObject; -import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.pig4cloud.pigx.admin.api.dto.SiteConfigDTO; -import com.pig4cloud.pigx.admin.api.entity.SysOauthClientDetails; import com.pig4cloud.pigx.admin.api.entity.SysPublicParam; -import com.pig4cloud.pigx.admin.config.ClientDetailsInitRunner; import com.pig4cloud.pigx.admin.service.SysI18nService; -import com.pig4cloud.pigx.admin.service.SysOauthClientDetailsService; import com.pig4cloud.pigx.admin.service.SysPublicParamService; import com.pig4cloud.pigx.admin.service.SysSiteConfigService; import com.pig4cloud.pigx.common.core.constant.CacheConstants; -import com.pig4cloud.pigx.common.core.constant.CommonConstants; import com.pig4cloud.pigx.common.core.constant.enums.DictTypeEnum; import com.pig4cloud.pigx.common.core.constant.enums.YesNoEnum; -import com.pig4cloud.pigx.common.core.util.SpringContextHolder; import lombok.RequiredArgsConstructor; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; @@ -94,8 +86,6 @@ public class SysSiteConfigServiceImpl implements SysSiteConfigService { private final SysI18nService sysI18nService; - private final SysOauthClientDetailsService sysOauthClientDetailsService; - @Override @Cacheable(value = CacheConstants.SITE_CONFIG_DETAILS) public Map getAggregatedConfig() { @@ -164,11 +154,6 @@ public class SysSiteConfigServiceImpl implements SysSiteConfigService { sysPublicParamService.save(newParam); } } - - // 同步 captcha_flag 到 OAuth 客户端扩展信息 - if (dto.getCaptchaType() != null) { - syncCaptchaFlagToClients(!"none".equals(dto.getCaptchaType())); - } } /** @@ -180,27 +165,4 @@ public class SysSiteConfigServiceImpl implements SysSiteConfigService { // 仅触发 @CacheEvict，无需额外逻辑 } - /** - * 同步验证码开关到所有 OAuth 客户端的 additionalInformation - * - * @param captchaEnable 是否启用验证码 - */ - private void syncCaptchaFlagToClients(Boolean captchaEnable) { - String captchaFlag = YesNoEnum.getCode(captchaEnable); - List clients = sysOauthClientDetailsService.list(); - - for (SysOauthClientDetails client : clients) { - if (StrUtil.isBlank(client.getAdditionalInformation())) { - continue; - } - JSONObject informationObj = JSONUtil.parseObj(client.getAdditionalInformation()); - informationObj.set(CommonConstants.CAPTCHA_FLAG, captchaFlag); - client.setAdditionalInformation(informationObj.toString()); - sysOauthClientDetailsService.updateById(client); - } - - // 刷新 Redis 客户端缓存 - SpringContextHolder.publishEvent(new ClientDetailsInitRunner.ClientDetailsInitEvent(this)); - } - }