diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/annotation/NoResponseAdvice.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/annotation/NoResponseAdvice.java deleted file mode 100644 index 1ed7cf68..00000000 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/annotation/NoResponseAdvice.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright (c) 2022-present Charles7c Authors. All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package top.charles7c.cnadmin.common.annotation; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -/** - * 响应拦截忽略注解 - * - * @author BULL_BCLS - * @since 2023/10/8 20:44 - */ -@Target({ElementType.METHOD}) -@Retention(RetentionPolicy.RUNTIME) -public @interface NoResponseAdvice {} \ No newline at end of file diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseController.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseController.java index d006e4ab..6e842dd2 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseController.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseController.java @@ -37,7 +37,6 @@ import cn.hutool.core.lang.tree.Tree; import cn.hutool.core.util.StrUtil; import top.charles7c.cnadmin.common.annotation.CrudRequestMapping; -import top.charles7c.cnadmin.common.annotation.NoResponseAdvice; import top.charles7c.cnadmin.common.constant.StringConsts; import top.charles7c.cnadmin.common.model.query.PageQuery; import top.charles7c.cnadmin.common.model.query.SortQuery; @@ -196,7 +195,6 @@ public abstract class BaseController, L, D, Q, * 响应对象 */ @Operation(summary = "导出数据", description = "导出数据") - @NoResponseAdvice @GetMapping("/export") public void export(Q query, SortQuery sortQuery, HttpServletResponse response) { this.checkPermission(Api.EXPORT); diff --git a/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/common/CommonController.java b/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/common/CommonController.java index 3c17bdbb..f0d4282f 100644 --- a/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/common/CommonController.java +++ b/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/common/CommonController.java @@ -127,7 +127,7 @@ public class CommonController { @Operation(summary = "查询参数", description = "查询参数") @GetMapping("/option") @Cacheable(cacheNames = CacheConsts.OPTION_KEY_PREFIX) - public R listOption(@Validated OptionQuery query) { + public R> listOption(@Validated OptionQuery query) { return R.ok(optionService.list(query).stream().map(option -> new LabelValueResp(option.getCode(), StrUtil.nullToDefault(option.getValue(), option.getDefaultValue()))).collect(Collectors.toList())); }