diff --git a/blade-ops/blade-swagger/pom.xml b/blade-ops/blade-swagger/pom.xml index c8250c73..fe4d6be1 100644 --- a/blade-ops/blade-swagger/pom.xml +++ b/blade-ops/blade-swagger/pom.xml @@ -14,6 +14,10 @@ ${bladex.project.version} jar + + 4.1.90.Final + + org.springblade @@ -27,6 +31,13 @@ com.github.xiaoymin knife4j-aggregation-spring-boot-starter + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/controller/DashBoardController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/controller/DashBoardController.java index 2f1dbfe6..0151e0a9 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/controller/DashBoardController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/controller/DashBoardController.java @@ -24,7 +24,7 @@ import java.util.Map; @NonDS @RestController @AllArgsConstructor -@Api(value = "首页", tags = "首页") +@Api(value = "首页接口", tags = "首页接口") public class DashBoardController { /** diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/controller/DictController.java b/blade-service/blade-system/src/main/java/org/springblade/system/controller/DictController.java index 2b8bbe40..b820a224 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/controller/DictController.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/controller/DictController.java @@ -53,7 +53,7 @@ import static org.springblade.core.cache.constant.CacheConstant.DICT_CACHE; @RestController @AllArgsConstructor @RequestMapping("/dict") -@Api(value = "字典", tags = "字典") +@Api(value = "系统字典", tags = "系统字典") public class DictController extends BladeController { private final IDictService dictService; 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 3fc5614e..47b46f78 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 @@ -46,7 +46,7 @@ import static org.springblade.core.cache.constant.CacheConstant.PARAM_CACHE; @RestController @AllArgsConstructor @RequestMapping("/param") -@Api(value = "参数管理", tags = "接口") +@Api(value = "参数配置", tags = "参数配置") public class ParamController extends BladeController { private final IParamService paramService; diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/controller/SearchController.java b/blade-service/blade-system/src/main/java/org/springblade/system/controller/SearchController.java index f4d10e9c..1f6d494a 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/controller/SearchController.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/controller/SearchController.java @@ -51,7 +51,7 @@ import java.util.List; @RestController @AllArgsConstructor @RequestMapping("/search") -@Api(value = "查询", tags = "查询") +@Api(value = "信息查询", tags = "信息查询") public class SearchController { private final IRoleService roleService; diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/controller/TenantPackageController.java b/blade-service/blade-system/src/main/java/org/springblade/system/controller/TenantPackageController.java index 194e45c5..b3e37e86 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/controller/TenantPackageController.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/controller/TenantPackageController.java @@ -47,7 +47,7 @@ import static org.springblade.core.cache.constant.CacheConstant.SYS_CACHE; @RestController @AllArgsConstructor @RequestMapping("/tenant-package") -@Api(value = "租户产品表", tags = "租户产品表接口") +@Api(value = "租户产品包", tags = "租户产品包") public class TenantPackageController extends BladeController { private final ITenantPackageService tenantPackageService; diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/controller/UserController.java b/blade-service/blade-system/src/main/java/org/springblade/system/controller/UserController.java index f8ab7757..b0f9f69b 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/controller/UserController.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/controller/UserController.java @@ -21,10 +21,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; +import io.swagger.annotations.*; import lombok.AllArgsConstructor; import org.springblade.common.cache.CacheNames; import org.springblade.core.cache.utils.CacheUtil; @@ -68,7 +65,8 @@ import static org.springblade.core.cache.constant.CacheConstant.USER_CACHE; */ @NonDS @RestController -@RequestMapping +@RequestMapping("/user") +@Api(value = "用户", tags = "用户") @AllArgsConstructor public class UserController { diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/feign/UserClient.java b/blade-service/blade-system/src/main/java/org/springblade/system/feign/UserClient.java index 16eccb0c..3229ac8f 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/feign/UserClient.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/feign/UserClient.java @@ -30,6 +30,7 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; +import springfox.documentation.annotations.ApiIgnore; /** * 用户服务Feign实现类 @@ -37,6 +38,7 @@ import org.springframework.web.bind.annotation.RestController; * @author Chill */ @NonDS +@ApiIgnore @RestController @AllArgsConstructor public class UserClient implements IUserClient { diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/feign/UserSearchClient.java b/blade-service/blade-system/src/main/java/org/springblade/system/feign/UserSearchClient.java index 845724b3..22062d43 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/feign/UserSearchClient.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/feign/UserSearchClient.java @@ -24,6 +24,7 @@ import org.springblade.system.entity.User; import org.springblade.system.service.IUserSearchService; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; +import springfox.documentation.annotations.ApiIgnore; import java.util.List; @@ -33,6 +34,7 @@ import java.util.List; * @author Chill */ @NonDS +@ApiIgnore @RestController @AllArgsConstructor public class UserSearchClient implements IUserSearchClient { diff --git a/doc/nacos/blade.yaml b/doc/nacos/blade.yaml index eab7d3b5..9da418f9 100644 --- a/doc/nacos/blade.yaml +++ b/doc/nacos/blade.yaml @@ -59,7 +59,7 @@ knife4j: enableRequestCache: true enableFilterMultipartApis: false enableFilterMultipartApiMethodType: POST - language: zh-CN + language: zh_cn enableFooter: false enableFooterCustom: true footerCustomContent: Copyright © 2023 BladeX All Rights Reserved @@ -73,8 +73,8 @@ swagger: license-url: https://bladex.vip terms-of-service-url: https://bladex.vip contact: - name: smallchill - email: smallchill@163.com + name: 翼宿 + email: bladejava@qq.com url: https://gitee.com/smallc #blade配置