diff --git a/blade-auth/src/main/java/org/springblade/auth/endpoint/BladeTokenEndPoint.java b/blade-auth/src/main/java/org/springblade/auth/endpoint/BladeTokenEndPoint.java index 85356c2d..b8afcb85 100644 --- a/blade-auth/src/main/java/org/springblade/auth/endpoint/BladeTokenEndPoint.java +++ b/blade-auth/src/main/java/org/springblade/auth/endpoint/BladeTokenEndPoint.java @@ -20,7 +20,6 @@ import com.wf.captcha.SpecCaptcha; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.common.cache.CacheNames; -import org.springblade.core.cache.constant.CacheConstant; import org.springblade.core.cache.utils.CacheUtil; import org.springblade.core.jwt.JwtUtil; import org.springblade.core.jwt.props.JwtProperties; @@ -39,6 +38,8 @@ import org.springframework.web.bind.annotation.RestController; import java.time.Duration; +import static org.springblade.core.cache.constant.CacheConstant.*; + /** * BladeEndPoint * @@ -81,15 +82,16 @@ public class BladeTokenEndPoint { @GetMapping("/oauth/clear-cache") public Kv clearCache() { - CacheUtil.clear(CacheConstant.BIZ_CACHE); - CacheUtil.clear(CacheConstant.USER_CACHE); - CacheUtil.clear(CacheConstant.DICT_CACHE); - CacheUtil.clear(CacheConstant.FLOW_CACHE); - CacheUtil.clear(CacheConstant.SYS_CACHE); - CacheUtil.clear(CacheConstant.PARAM_CACHE); - CacheUtil.clear(CacheConstant.RESOURCE_CACHE); - CacheUtil.clear(CacheConstant.MENU_CACHE); - CacheUtil.clear(CacheConstant.MENU_CACHE, Boolean.FALSE); + CacheUtil.clear(BIZ_CACHE); + CacheUtil.clear(USER_CACHE); + CacheUtil.clear(DICT_CACHE); + CacheUtil.clear(FLOW_CACHE); + CacheUtil.clear(SYS_CACHE); + CacheUtil.clear(PARAM_CACHE); + CacheUtil.clear(RESOURCE_CACHE); + CacheUtil.clear(MENU_CACHE); + CacheUtil.clear(MENU_CACHE, Boolean.FALSE); + CacheUtil.clear(PARAM_CACHE, Boolean.FALSE); return Kv.create().set("success", "true").set("msg", "success"); } diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/controller/ParamController.java b/blade-service/blade-system/src/main/java/org/springblade/system/controller/ParamController.java index 8ef51ac2..3fc5614e 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/controller/ParamController.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/controller/ParamController.java @@ -86,6 +86,7 @@ public class ParamController extends BladeController { @ApiOperation(value = "新增或修改", notes = "传入param") public R submit(@Valid @RequestBody Param param) { CacheUtil.clear(PARAM_CACHE); + CacheUtil.clear(PARAM_CACHE, Boolean.FALSE); return R.status(paramService.saveOrUpdate(param)); } @@ -98,6 +99,7 @@ public class ParamController extends BladeController { @ApiOperation(value = "逻辑删除", notes = "传入ids") public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { CacheUtil.clear(PARAM_CACHE); + CacheUtil.clear(PARAM_CACHE, Boolean.FALSE); return R.status(paramService.deleteLogic(Func.toLongList(ids))); }