diff --git a/migrate-swagger-to-springdoc.sh b/migrate-swagger-to-springdoc.sh
new file mode 100755
index 0000000..6e72d55
--- /dev/null
+++ b/migrate-swagger-to-springdoc.sh
@@ -0,0 +1,84 @@
+#!/bin/bash
+
+# Swagger 到 SpringDoc OpenAPI 注解迁移脚本
+
+echo "开始 Swagger 到 SpringDoc OpenAPI 注解迁移..."
+
+# 查找所有 Java 文件
+find src/main/java -name "*.java" -type f | while read file; do
+ echo "处理文件: $file"
+
+ # 替换 import 语句
+ sed -i '' 's/import io\.swagger\.annotations\.Api;/import io.swagger.v3.oas.annotations.tags.Tag;/g' "$file"
+ sed -i '' 's/import io\.swagger\.annotations\.ApiModel;/import io.swagger.v3.oas.annotations.media.Schema;/g' "$file"
+ sed -i '' 's/import io\.swagger\.annotations\.ApiModelProperty;/import io.swagger.v3.oas.annotations.media.Schema;/g' "$file"
+ sed -i '' 's/import io\.swagger\.annotations\.ApiOperation;/import io.swagger.v3.oas.annotations.Operation;/g' "$file"
+ sed -i '' 's/import io\.swagger\.annotations\.ApiParam;/import io.swagger.v3.oas.annotations.Parameter;/g' "$file"
+
+ # 替换注解
+ sed -i '' 's/@Api(tags = \([^)]*\))/@Tag(name = \1)/g' "$file"
+ sed -i '' 's/@ApiModel(value = \([^,]*\), description = \([^)]*\))/@Schema(name = \1, description = \2)/g' "$file"
+ sed -i '' 's/@ApiModel(description = \([^)]*\))/@Schema(description = \1)/g' "$file"
+ sed -i '' 's/@ApiModelProperty(value = \([^)]*\))/@Schema(description = \1)/g' "$file"
+ sed -i '' 's/@ApiModelProperty(\([^)]*\))/@Schema(description = \1)/g' "$file"
+ sed -i '' 's/@ApiOperation(\([^)]*\))/@Operation(summary = \1)/g' "$file"
+ sed -i '' 's/@ApiParam(\([^)]*\))/@Parameter(\1)/g' "$file"
+
+done
+
+echo "注解迁移完成！"
+
+# 更新 SwaggerConfig.java
+echo "更新 SwaggerConfig.java..."
+
+cat > src/main/java/com/gxwebsoft/common/core/config/OpenApiConfig.java << 'EOF'
+package com.gxwebsoft.common.core.config;
+
+import io.swagger.v3.oas.models.OpenAPI;
+import io.swagger.v3.oas.models.info.Contact;
+import io.swagger.v3.oas.models.info.Info;
+import io.swagger.v3.oas.models.security.SecurityRequirement;
+import io.swagger.v3.oas.models.security.SecurityScheme;
+import io.swagger.v3.oas.models.Components;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import javax.annotation.Resource;
+
+/**
+ * OpenAPI 配置
+ *
+ * @author WebSoft
+ * @since 2025-09-11
+ */
+@Configuration
+public class OpenApiConfig {
+
+ @Resource
+ private ConfigProperties config;
+
+ @Bean
+ public OpenAPI customOpenAPI() {
+ return new OpenAPI()
+ .info(new Info()
+ .title(config.getSwaggerTitle())
+ .description(config.getSwaggerDescription())
+ .version(config.getSwaggerVersion())
+ .contact(new Contact()
+ .name("科技小王子")
+ .url("https://websoft.top")
+ .email("170083662@qq.com")))
+ .addSecurityItem(new SecurityRequirement().addList("Authorization"))
+ .components(new Components()
+ .addSecuritySchemes("Authorization",
+ new SecurityScheme()
+ .type(SecurityScheme.Type.HTTP)
+ .scheme("bearer")
+ .bearerFormat("JWT")
+ .description("JWT 认证")));
+ }
+}
+EOF
+
+echo "OpenAPI 配置文件创建完成！"
+echo "迁移脚本执行完成！请检查编译结果。"
diff --git a/pom-backup.xml b/pom-backup.xml
new file mode 100644
index 0000000..83b4bc2
--- /dev/null
+++ b/pom-backup.xml
@@ -0,0 +1,370 @@
+
+
+ 4.0.0
+
+ com.gxwebsoft
+ com-gxwebsoft-modules
+ 1.5.0
+
+ com-gxwebsoft-api
+ WebSoftApi project for Spring Boot
+
+
+ org.springframework.boot
+ spring-boot-starter-parent
+ 2.7.18
+
+
+
+
+ 17
+ UTF-8
+ UTF-8
+
+
+
+
+
+ org.springframework.boot
+ spring-boot-devtools
+ runtime
+ true
+
+
+
+
+ org.springframework.boot
+ spring-boot-starter-test
+ test
+
+
+
+
+ org.springframework.boot
+ spring-boot-starter-web
+
+
+
+
+ com.fasterxml.jackson.datatype
+ jackson-datatype-jsr310
+
+
+
+
+ org.springframework.boot
+ spring-boot-starter-aop
+
+
+
+
+ org.springframework.boot
+ spring-boot-configuration-processor
+ true
+
+
+
+
+ org.projectlombok
+ lombok
+ true
+
+
+
+
+ mysql
+ mysql-connector-java
+ runtime
+
+
+
+
+ com.alibaba
+ druid-spring-boot-starter
+ 1.2.6
+
+
+
+
+ com.baomidou
+ mybatis-plus-boot-starter
+ 3.4.3.3
+
+
+
+
+ com.github.yulichang
+ mybatis-plus-join-boot-starter
+ 1.4.5
+
+
+
+
+ com.baomidou
+ mybatis-plus-generator
+ 3.4.1
+
+
+
+
+ cn.hutool
+ hutool-core
+ 5.8.11
+
+
+ cn.hutool
+ hutool-extra
+ 5.8.11
+
+
+ cn.hutool
+ hutool-http
+ 5.8.11
+
+
+ cn.hutool
+ hutool-crypto
+ 5.8.11
+
+
+
+
+ cn.afterturn
+ easypoi-base
+ 4.4.0
+
+
+
+
+ org.apache.tika
+ tika-core
+ 2.1.0
+
+
+
+
+ com.github.livesense
+ jodconverter-core
+ 1.0.5
+
+
+
+
+ org.springframework.boot
+ spring-boot-starter-mail
+
+
+
+
+ com.ibeetl
+ beetl
+ 3.6.1.RELEASE
+
+
+
+
+ io.springfox
+ springfox-boot-starter
+ 3.0.0
+
+
+
+
+ org.springframework.boot
+ spring-boot-starter-security
+
+
+
+
+ io.jsonwebtoken
+ jjwt-impl
+ 0.11.2
+
+
+ io.jsonwebtoken
+ jjwt-jackson
+ 0.11.2
+
+
+
+
+ com.github.whvcse
+ easy-captcha
+ 1.6.2
+
+
+
+
+ org.springframework.boot
+ spring-boot-starter-data-redis
+
+
+
+
+ org.springframework.boot
+ spring-boot-starter-actuator
+
+
+
+
+ com.aliyun
+ aliyun-java-sdk-core
+ 4.4.3
+
+
+
+ com.alipay.sdk
+ alipay-sdk-java
+ 4.35.0.ALL
+
+
+
+ org.bouncycastle
+ bcprov-jdk15on
+ 1.70
+
+
+
+ commons-logging
+ commons-logging
+ 1.2
+
+
+
+ com.alibaba
+ fastjson
+ 2.0.20
+
+
+
+
+ com.google.zxing
+ core
+ 3.3.3
+
+
+
+ com.google.code.gson
+ gson
+ 2.8.0
+
+
+
+ com.vaadin.external.google
+ android-json
+ 0.0.20131108.vaadin1
+ compile
+
+
+
+
+ com.corundumstudio.socketio
+ netty-socketio
+ 2.0.3
+
+
+
+
+ com.github.wechatpay-apiv3
+ wechatpay-java
+ 0.2.15
+
+
+
+ com.github.binarywang
+ weixin-java-miniapp
+ 4.5.0
+
+
+
+
+ com.aliyun.oss
+ aliyun-sdk-oss
+ 3.17.0
+
+
+
+
+ com.aliyun
+ green20220302
+ 1.0.8
+
+
+
+ org.springframework.boot
+ spring-boot-starter-freemarker
+
+
+
+
+ com.getui.push
+ restful-sdk
+ 1.0.0.14
+
+
+
+
+ com.github.xiaoymin
+ knife4j-spring-boot-starter
+ 3.0.3
+
+
+
+
+
+
+
+
+ src/main/java
+
+ **/*Mapper.xml
+
+
+
+ src/main/resources
+
+ **
+
+
+
+
+
+ org.springframework.boot
+ spring-boot-maven-plugin
+ 2.5.4
+
+
+
+ org.projectlombok
+ lombok
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+
+ 17
+ 17
+
+
+
+
+
+
+
+
+
+ aliYunMaven
+ https://maven.aliyun.com/repository/public
+
+
+ com.e-iceblue
+ e-iceblue
+ https://repo.e-iceblue.cn/repository/maven-public/
+
+
+
+
diff --git a/pom-optimized.xml b/pom-optimized.xml
new file mode 100644
index 0000000..73af85a
--- /dev/null
+++ b/pom-optimized.xml
@@ -0,0 +1,364 @@
+
+
+ 4.0.0
+
+ com.gxwebsoft
+ com-gxwebsoft-server
+ 1.5.2
+
+ com-gxwebsoft-api
+ WebSoftApi project for Spring Boot
+
+
+ org.springframework.boot
+ spring-boot-starter-parent
+ 2.7.18
+
+
+
+
+ 17
+ UTF-8
+ UTF-8
+
+
+
+
+
+ org.springframework.boot
+ spring-boot-devtools
+ runtime
+ true
+
+
+
+
+ org.springframework.boot
+ spring-boot-starter-test
+ test
+
+
+
+
+ org.springframework.boot
+ spring-boot-starter-web
+
+
+
+
+ com.fasterxml.jackson.datatype
+ jackson-datatype-jsr310
+
+
+
+
+ org.springframework.boot
+ spring-boot-starter-aop
+
+
+
+
+ org.springframework.boot
+ spring-boot-configuration-processor
+ true
+
+
+
+
+ org.projectlombok
+ lombok
+ true
+
+
+
+
+ com.mysql
+ mysql-connector-j
+ runtime
+
+
+
+
+ com.alibaba
+ druid-spring-boot-starter
+ 1.2.20
+
+
+
+
+ com.baomidou
+ mybatis-plus-boot-starter
+ 3.4.3.3
+
+
+
+
+ com.github.yulichang
+ mybatis-plus-join-boot-starter
+ 1.4.5
+
+
+
+
+ com.baomidou
+ mybatis-plus-generator
+ 3.4.1
+
+
+
+
+ cn.hutool
+ hutool-core
+ 5.8.25
+
+
+ cn.hutool
+ hutool-extra
+ 5.8.25
+
+
+ cn.hutool
+ hutool-http
+ 5.8.25
+
+
+ cn.hutool
+ hutool-crypto
+ 5.8.25
+
+
+
+
+ cn.afterturn
+ easypoi-base
+ 4.4.0
+
+
+
+
+ org.apache.tika
+ tika-core
+ 2.9.1
+
+
+
+
+ com.github.livesense
+ jodconverter-core
+ 1.0.5
+
+
+
+
+ org.springframework.boot
+ spring-boot-starter-mail
+
+
+
+
+ com.ibeetl
+ beetl
+ 3.15.10.RELEASE
+
+
+
+
+ org.springdoc
+ springdoc-openapi-ui
+ 1.7.0
+
+
+
+
+ org.springframework.boot
+ spring-boot-starter-security
+
+
+
+
+ io.jsonwebtoken
+ jjwt-api
+ 0.11.5
+
+
+ io.jsonwebtoken
+ jjwt-impl
+ 0.11.5
+ runtime
+
+
+ io.jsonwebtoken
+ jjwt-jackson
+ 0.11.5
+ runtime
+
+
+
+
+ com.github.whvcse
+ easy-captcha
+ 1.6.2
+
+
+
+
+ org.springframework.boot
+ spring-boot-starter-data-redis
+
+
+
+
+ com.aliyun
+ aliyun-java-sdk-core
+ 4.4.3
+
+
+
+ com.alipay.sdk
+ alipay-sdk-java
+ 4.35.0.ALL
+
+
+
+ org.bouncycastle
+ bcprov-jdk18on
+ 1.77
+
+
+
+ commons-logging
+ commons-logging
+ 1.3.0
+
+
+
+ com.alibaba
+ fastjson
+ 2.0.43
+
+
+
+
+ com.google.zxing
+ core
+ 3.5.2
+
+
+
+ com.google.code.gson
+ gson
+ 2.10.1
+
+
+
+ com.vaadin.external.google
+ android-json
+ 0.0.20131108.vaadin1
+ compile
+
+
+
+
+ com.corundumstudio.socketio
+ netty-socketio
+ 2.0.2
+
+
+
+
+ com.github.wechatpay-apiv3
+ wechatpay-java
+ 0.2.17
+
+
+
+
+ com.github.binarywang
+ weixin-java-miniapp
+ 4.6.0
+
+
+
+
+ com.aliyun.oss
+ aliyun-sdk-oss
+ 3.17.4
+
+
+
+
+ com.github.xiaoymin
+ knife4j-openapi3-spring-boot-starter
+ 4.3.0
+
+
+
+
+ com.squareup.okhttp3
+ okhttp
+ 4.12.0
+
+
+
+
+ com.github.ben-manes.caffeine
+ caffeine
+ 3.1.8
+
+
+
+
+ org.springframework.boot
+ spring-boot-starter-websocket
+
+
+
+
+
+
+
+ src/main/java
+
+ **/*Mapper.xml
+
+
+
+ src/main/resources
+
+ **
+
+
+
+
+
+ org.springframework.boot
+ spring-boot-maven-plugin
+
+
+
+ org.projectlombok
+ lombok
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+
+ 17
+ 17
+
+
+
+
+
+
+
+ aliYunMaven
+ https://maven.aliyun.com/repository/public
+
+
+
+
diff --git a/pom.xml b/pom.xml
index d32d3f6..73af85a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,14 +13,12 @@
org.springframework.boot
spring-boot-starter-parent
- 2.5.4
+ 2.7.18
17
- 17
- 17
UTF-8
UTF-8
@@ -47,7 +45,7 @@
spring-boot-starter-web
-
+
com.fasterxml.jackson.datatype
jackson-datatype-jsr310
@@ -75,8 +73,8 @@
- mysql
- mysql-connector-java
+ com.mysql
+ mysql-connector-j
runtime
@@ -84,7 +82,7 @@
com.alibaba
druid-spring-boot-starter
- 1.2.6
+ 1.2.20
@@ -112,22 +110,22 @@
cn.hutool
hutool-core
- 5.8.11
+ 5.8.25
cn.hutool
hutool-extra
- 5.8.11
+ 5.8.25
cn.hutool
hutool-http
- 5.8.11
+ 5.8.25
cn.hutool
hutool-crypto
- 5.8.11
+ 5.8.25
@@ -141,7 +139,7 @@
org.apache.tika
tika-core
- 2.1.0
+ 2.9.1
@@ -161,14 +159,14 @@
com.ibeetl
beetl
- 3.6.1.RELEASE
+ 3.15.10.RELEASE
-
+
- io.springfox
- springfox-boot-starter
- 3.0.0
+ org.springdoc
+ springdoc-openapi-ui
+ 1.7.0
@@ -178,15 +176,22 @@
+
+ io.jsonwebtoken
+ jjwt-api
+ 0.11.5
+
io.jsonwebtoken
jjwt-impl
- 0.11.2
+ 0.11.5
+ runtime
io.jsonwebtoken
jjwt-jackson
- 0.11.2
+ 0.11.5
+ runtime
@@ -202,12 +207,6 @@
spring-boot-starter-data-redis
-
-
- org.springframework.boot
- spring-boot-starter-actuator
-
-
com.aliyun
@@ -220,36 +219,36 @@
alipay-sdk-java
4.35.0.ALL
-
+
org.bouncycastle
- bcprov-jdk15on
- 1.70
+ bcprov-jdk18on
+ 1.77
-
+
commons-logging
commons-logging
- 1.2
+ 1.3.0
-
+
com.alibaba
fastjson
- 2.0.20
+ 2.0.43
com.google.zxing
core
- 3.3.3
+ 3.5.2
com.google.code.gson
gson
- 2.8.0
+ 2.10.1
@@ -263,55 +262,56 @@
com.corundumstudio.socketio
netty-socketio
- 2.0.3
+ 2.0.2
com.github.wechatpay-apiv3
wechatpay-java
- 0.2.15
+ 0.2.17
+
com.github.binarywang
weixin-java-miniapp
- 4.5.0
+ 4.6.0
com.aliyun.oss
aliyun-sdk-oss
- 3.17.0
+ 3.17.4
-
-
- com.aliyun
- green20220302
- 1.0.8
-
-
-
- org.springframework.boot
- spring-boot-starter-freemarker
-
-
-
-
- com.getui.push
- restful-sdk
- 1.0.0.14
-
-
-
+
com.github.xiaoymin
- knife4j-spring-boot-starter
- 3.0.3
+ knife4j-openapi3-spring-boot-starter
+ 4.3.0
+
+
+ com.squareup.okhttp3
+ okhttp
+ 4.12.0
+
+
+
+
+ com.github.ben-manes.caffeine
+ caffeine
+ 3.1.8
+
+
+
+
+ org.springframework.boot
+ spring-boot-starter-websocket
+
@@ -334,7 +334,6 @@
org.springframework.boot
spring-boot-maven-plugin
- 2.5.4
@@ -344,17 +343,15 @@
-
- org.apache.maven.plugins
- maven-compiler-plugin
-
- 17
- 17
-
-
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+
+ 17
+ 17
+
+
-
-
@@ -362,11 +359,6 @@
aliYunMaven
https://maven.aliyun.com/repository/public
-
- com.e-iceblue
- e-iceblue
- https://repo.e-iceblue.cn/repository/maven-public/
-
diff --git a/src/main/java/com/gxwebsoft/cms/controller/CmsAdController.java b/src/main/java/com/gxwebsoft/cms/controller/CmsAdController.java
index 006681c..a65a624 100644
--- a/src/main/java/com/gxwebsoft/cms/controller/CmsAdController.java
+++ b/src/main/java/com/gxwebsoft/cms/controller/CmsAdController.java
@@ -10,8 +10,8 @@ import com.gxwebsoft.common.core.web.PageParam;
import com.gxwebsoft.common.core.web.BatchParam;
import com.gxwebsoft.common.core.annotation.OperationLog;
import com.gxwebsoft.common.system.entity.User;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -24,21 +24,21 @@ import java.util.List;
* @author 科技小王子
* @since 2024-09-10 20:47:57
*/
-@Api(tags = "广告位管理")
+@Tag(name = "广告位管理")
@RestController
@RequestMapping("/api/cms/cms-ad")
public class CmsAdController extends BaseController {
@Resource
private CmsAdService cmsAdService;
- @ApiOperation("分页查询广告位")
+ @Operation(summary = "分页查询广告位")
@GetMapping("/page")
public ApiResult> page(CmsAdParam param) {
// 使用关联查询
return success(cmsAdService.pageRel(param));
}
- @ApiOperation("查询全部广告位")
+ @Operation(summary = "查询全部广告位")
@GetMapping()
public ApiResult> list(CmsAdParam param) {
PageParam page = new PageParam<>(param);
@@ -50,7 +50,7 @@ public class CmsAdController extends BaseController {
@PreAuthorize("hasAuthority('cms:cmsAd:list')")
@OperationLog
- @ApiOperation("根据id查询广告位")
+ @Operation(summary = "根据id查询广告位")
@GetMapping("/{id}")
public ApiResult get(@PathVariable("id") Integer id) {
return success(cmsAdService.getById(id));
@@ -58,7 +58,7 @@ public class CmsAdController extends BaseController {
//return success(cmsAdService.getByIdRel(id));
}
- @ApiOperation("添加广告位")
+ @Operation(summary = "添加广告位")
@PostMapping()
public ApiResult save(@RequestBody CmsAd cmsAd) {
// 记录当前登录用户id
@@ -72,7 +72,7 @@ public class CmsAdController extends BaseController {
return fail("添加失败");
}
- @ApiOperation("修改广告位")
+ @Operation(summary = "修改广告位")
@PutMapping()
public ApiResult update(@RequestBody CmsAd cmsAd) {
if (cmsAdService.updateById(cmsAd)) {
@@ -81,7 +81,7 @@ public class CmsAdController extends BaseController {
return fail("修改失败");
}
- @ApiOperation("删除广告位")
+ @Operation(summary = "删除广告位")
@DeleteMapping("/{id}")
public ApiResult remove(@PathVariable("id") Integer id) {
if (cmsAdService.removeById(id)) {
@@ -90,7 +90,7 @@ public class CmsAdController extends BaseController {
return fail("删除失败");
}
- @ApiOperation("批量添加广告位")
+ @Operation(summary = "批量添加广告位")
@PostMapping("/batch")
public ApiResult saveBatch(@RequestBody List list) {
if (cmsAdService.saveBatch(list)) {
@@ -99,7 +99,7 @@ public class CmsAdController extends BaseController {
return fail("添加失败");
}
- @ApiOperation("批量修改广告位")
+ @Operation(summary = "批量修改广告位")
@PutMapping("/batch")
public ApiResult removeBatch(@RequestBody BatchParam batchParam) {
if (batchParam.update(cmsAdService, "ad_id")) {
@@ -108,7 +108,7 @@ public class CmsAdController extends BaseController {
return fail("修改失败");
}
- @ApiOperation("批量删除广告位")
+ @Operation(summary = "批量删除广告位")
@DeleteMapping("/batch")
public ApiResult removeBatch(@RequestBody List ids) {
if (cmsAdService.removeByIds(ids)) {
diff --git a/src/main/java/com/gxwebsoft/cms/controller/CmsAdRecordController.java b/src/main/java/com/gxwebsoft/cms/controller/CmsAdRecordController.java
index 53ad1c7..e449a3f 100644
--- a/src/main/java/com/gxwebsoft/cms/controller/CmsAdRecordController.java
+++ b/src/main/java/com/gxwebsoft/cms/controller/CmsAdRecordController.java
@@ -10,8 +10,8 @@ import com.gxwebsoft.common.core.web.PageParam;
import com.gxwebsoft.common.core.web.BatchParam;
import com.gxwebsoft.common.core.annotation.OperationLog;
import com.gxwebsoft.common.system.entity.User;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -24,21 +24,21 @@ import java.util.List;
* @author 科技小王子
* @since 2024-09-10 20:47:57
*/
-@Api(tags = "广告图片管理")
+@Tag(name = "广告图片管理")
@RestController
@RequestMapping("/api/cms/cms-ad-record")
public class CmsAdRecordController extends BaseController {
@Resource
private CmsAdRecordService cmsAdRecordService;
- @ApiOperation("分页查询广告图片")
+ @Operation(summary = "分页查询广告图片")
@GetMapping("/page")
public ApiResult> page(CmsAdRecordParam param) {
// 使用关联查询
return success(cmsAdRecordService.pageRel(param));
}
- @ApiOperation("查询全部广告图片")
+ @Operation(summary = "查询全部广告图片")
@GetMapping()
public ApiResult> list(CmsAdRecordParam param) {
PageParam page = new PageParam<>(param);
@@ -50,7 +50,7 @@ public class CmsAdRecordController extends BaseController {
@PreAuthorize("hasAuthority('cms:cmsAdRecord:list')")
@OperationLog
- @ApiOperation("根据id查询广告图片")
+ @Operation(summary = "根据id查询广告图片")
@GetMapping("/{id}")
public ApiResult get(@PathVariable("id") Integer id) {
return success(cmsAdRecordService.getById(id));
@@ -58,7 +58,7 @@ public class CmsAdRecordController extends BaseController {
//return success(cmsAdRecordService.getByIdRel(id));
}
- @ApiOperation("添加广告图片")
+ @Operation(summary = "添加广告图片")
@PostMapping()
public ApiResult save(@RequestBody CmsAdRecord cmsAdRecord) {
if (cmsAdRecordService.save(cmsAdRecord)) {
@@ -67,7 +67,7 @@ public class CmsAdRecordController extends BaseController {
return fail("添加失败");
}
- @ApiOperation("修改广告图片")
+ @Operation(summary = "修改广告图片")
@PutMapping()
public ApiResult update(@RequestBody CmsAdRecord cmsAdRecord) {
if (cmsAdRecordService.updateById(cmsAdRecord)) {
@@ -76,7 +76,7 @@ public class CmsAdRecordController extends BaseController {
return fail("修改失败");
}
- @ApiOperation("删除广告图片")
+ @Operation(summary = "删除广告图片")
@DeleteMapping("/{id}")
public ApiResult remove(@PathVariable("id") Integer id) {
if (cmsAdRecordService.removeById(id)) {
@@ -85,7 +85,7 @@ public class CmsAdRecordController extends BaseController {
return fail("删除失败");
}
- @ApiOperation("批量添加广告图片")
+ @Operation(summary = "批量添加广告图片")
@PostMapping("/batch")
public ApiResult saveBatch(@RequestBody List list) {
if (cmsAdRecordService.saveBatch(list)) {
@@ -94,7 +94,7 @@ public class CmsAdRecordController extends BaseController {
return fail("添加失败");
}
- @ApiOperation("批量修改广告图片")
+ @Operation(summary = "批量修改广告图片")
@PutMapping("/batch")
public ApiResult removeBatch(@RequestBody BatchParam batchParam) {
if (batchParam.update(cmsAdRecordService, "ad_record_id")) {
@@ -103,7 +103,7 @@ public class CmsAdRecordController extends BaseController {
return fail("修改失败");
}
- @ApiOperation("批量删除广告图片")
+ @Operation(summary = "批量删除广告图片")
@DeleteMapping("/batch")
public ApiResult removeBatch(@RequestBody List ids) {
if (cmsAdRecordService.removeByIds(ids)) {
diff --git a/src/main/java/com/gxwebsoft/cms/controller/CmsArticleCategoryController.java b/src/main/java/com/gxwebsoft/cms/controller/CmsArticleCategoryController.java
index e36ef2f..c6a67ab 100644
--- a/src/main/java/com/gxwebsoft/cms/controller/CmsArticleCategoryController.java
+++ b/src/main/java/com/gxwebsoft/cms/controller/CmsArticleCategoryController.java
@@ -10,8 +10,8 @@ import com.gxwebsoft.common.core.web.PageParam;
import com.gxwebsoft.common.core.web.BatchParam;
import com.gxwebsoft.common.core.annotation.OperationLog;
import com.gxwebsoft.common.system.entity.User;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -24,35 +24,35 @@ import java.util.List;
* @author 科技小王子
* @since 2024-09-10 20:47:57
*/
-@Api(tags = "文章分类表管理")
+@Tag(name = "文章分类表管理")
@RestController
@RequestMapping("/api/cms/cms-article-category")
public class CmsArticleCategoryController extends BaseController {
@Resource
private CmsArticleCategoryService cmsArticleCategoryService;
- @ApiOperation("分页查询文章分类表")
+ @Operation(summary = "分页查询文章分类表")
@GetMapping("/page")
public ApiResult> page(CmsArticleCategoryParam param) {
// 使用关联查询
return success(cmsArticleCategoryService.pageRel(param));
}
- @ApiOperation("查询全部文章分类表")
+ @Operation(summary = "查询全部文章分类表")
@GetMapping()
public ApiResult> list(CmsArticleCategoryParam param) {
// 使用关联查询
return success(cmsArticleCategoryService.listRel(param));
}
- @ApiOperation("根据id查询文章分类表")
+ @Operation(summary = "根据id查询文章分类表")
@GetMapping("/{id}")
public ApiResult get(@PathVariable("id") Integer id) {
// 使用关联查询
return success(cmsArticleCategoryService.getByIdRel(id));
}
- @ApiOperation("添加文章分类表")
+ @Operation(summary = "添加文章分类表")
@PostMapping()
public ApiResult save(@RequestBody CmsArticleCategory cmsArticleCategory) {
// 记录当前登录用户id
@@ -66,7 +66,7 @@ public class CmsArticleCategoryController extends BaseController {
return fail("添加失败");
}
- @ApiOperation("修改文章分类表")
+ @Operation(summary = "修改文章分类表")
@PutMapping()
public ApiResult update(@RequestBody CmsArticleCategory cmsArticleCategory) {
if (cmsArticleCategoryService.updateById(cmsArticleCategory)) {
@@ -75,7 +75,7 @@ public class CmsArticleCategoryController extends BaseController {
return fail("修改失败");
}
- @ApiOperation("删除文章分类表")
+ @Operation(summary = "删除文章分类表")
@DeleteMapping("/{id}")
public ApiResult remove(@PathVariable("id") Integer id) {
if (cmsArticleCategoryService.removeById(id)) {
@@ -84,7 +84,7 @@ public class CmsArticleCategoryController extends BaseController {
return fail("删除失败");
}
- @ApiOperation("批量添加文章分类表")
+ @Operation(summary = "批量添加文章分类表")
@PostMapping("/batch")
public ApiResult saveBatch(@RequestBody List list) {
if (cmsArticleCategoryService.saveBatch(list)) {
@@ -93,7 +93,7 @@ public class CmsArticleCategoryController extends BaseController {
return fail("添加失败");
}
- @ApiOperation("批量修改文章分类表")
+ @Operation(summary = "批量修改文章分类表")
@PutMapping("/batch")
public ApiResult removeBatch(@RequestBody BatchParam batchParam) {
if (batchParam.update(cmsArticleCategoryService, "category_id")) {
@@ -102,7 +102,7 @@ public class CmsArticleCategoryController extends BaseController {
return fail("修改失败");
}
- @ApiOperation("批量删除文章分类表")
+ @Operation(summary = "批量删除文章分类表")
@DeleteMapping("/batch")
public ApiResult removeBatch(@RequestBody List ids) {
if (cmsArticleCategoryService.removeByIds(ids)) {
diff --git a/src/main/java/com/gxwebsoft/cms/controller/CmsArticleCommentController.java b/src/main/java/com/gxwebsoft/cms/controller/CmsArticleCommentController.java
index f2b4338..51ed99e 100644
--- a/src/main/java/com/gxwebsoft/cms/controller/CmsArticleCommentController.java
+++ b/src/main/java/com/gxwebsoft/cms/controller/CmsArticleCommentController.java
@@ -10,8 +10,8 @@ import com.gxwebsoft.common.core.web.PageParam;
import com.gxwebsoft.common.core.web.BatchParam;
import com.gxwebsoft.common.core.annotation.OperationLog;
import com.gxwebsoft.common.system.entity.User;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -24,21 +24,21 @@ import java.util.List;
* @author 科技小王子
* @since 2024-09-10 20:47:57
*/
-@Api(tags = "文章评论表管理")
+@Tag(name = "文章评论表管理")
@RestController
@RequestMapping("/api/cms/cms-article-comment")
public class CmsArticleCommentController extends BaseController {
@Resource
private CmsArticleCommentService cmsArticleCommentService;
- @ApiOperation("分页查询文章评论表")
+ @Operation(summary = "分页查询文章评论表")
@GetMapping("/page")
public ApiResult> page(CmsArticleCommentParam param) {
// 使用关联查询
return success(cmsArticleCommentService.pageRel(param));
}
- @ApiOperation("查询全部文章评论表")
+ @Operation(summary = "查询全部文章评论表")
@GetMapping()
public ApiResult> list(CmsArticleCommentParam param) {
PageParam page = new PageParam<>(param);
@@ -50,7 +50,7 @@ public class CmsArticleCommentController extends BaseController {
@PreAuthorize("hasAuthority('cms:cmsArticleComment:list')")
@OperationLog
- @ApiOperation("根据id查询文章评论表")
+ @Operation(summary = "根据id查询文章评论表")
@GetMapping("/{id}")
public ApiResult get(@PathVariable("id") Integer id) {
return success(cmsArticleCommentService.getById(id));
@@ -58,7 +58,7 @@ public class CmsArticleCommentController extends BaseController {
//return success(cmsArticleCommentService.getByIdRel(id));
}
- @ApiOperation("添加文章评论表")
+ @Operation(summary = "添加文章评论表")
@PostMapping()
public ApiResult save(@RequestBody CmsArticleComment cmsArticleComment) {
// 记录当前登录用户id
@@ -72,7 +72,7 @@ public class CmsArticleCommentController extends BaseController {
return fail("添加失败");
}
- @ApiOperation("修改文章评论表")
+ @Operation(summary = "修改文章评论表")
@PutMapping()
public ApiResult update(@RequestBody CmsArticleComment cmsArticleComment) {
if (cmsArticleCommentService.updateById(cmsArticleComment)) {
@@ -81,7 +81,7 @@ public class CmsArticleCommentController extends BaseController {
return fail("修改失败");
}
- @ApiOperation("删除文章评论表")
+ @Operation(summary = "删除文章评论表")
@DeleteMapping("/{id}")
public ApiResult remove(@PathVariable("id") Integer id) {
if (cmsArticleCommentService.removeById(id)) {
@@ -90,7 +90,7 @@ public class CmsArticleCommentController extends BaseController {
return fail("删除失败");
}
- @ApiOperation("批量添加文章评论表")
+ @Operation(summary = "批量添加文章评论表")
@PostMapping("/batch")
public ApiResult saveBatch(@RequestBody List list) {
if (cmsArticleCommentService.saveBatch(list)) {
@@ -99,7 +99,7 @@ public class CmsArticleCommentController extends BaseController {
return fail("添加失败");
}
- @ApiOperation("批量修改文章评论表")
+ @Operation(summary = "批量修改文章评论表")
@PutMapping("/batch")
public ApiResult removeBatch(@RequestBody BatchParam batchParam) {
if (batchParam.update(cmsArticleCommentService, "comment_id")) {
@@ -108,7 +108,7 @@ public class CmsArticleCommentController extends BaseController {
return fail("修改失败");
}
- @ApiOperation("批量删除文章评论表")
+ @Operation(summary = "批量删除文章评论表")
@DeleteMapping("/batch")
public ApiResult removeBatch(@RequestBody List ids) {
if (cmsArticleCommentService.removeByIds(ids)) {
diff --git a/src/main/java/com/gxwebsoft/cms/controller/CmsArticleContentController.java b/src/main/java/com/gxwebsoft/cms/controller/CmsArticleContentController.java
index 3f587fc..abfc529 100644
--- a/src/main/java/com/gxwebsoft/cms/controller/CmsArticleContentController.java
+++ b/src/main/java/com/gxwebsoft/cms/controller/CmsArticleContentController.java
@@ -10,8 +10,8 @@ import com.gxwebsoft.common.core.web.PageParam;
import com.gxwebsoft.common.core.web.BatchParam;
import com.gxwebsoft.common.core.annotation.OperationLog;
import com.gxwebsoft.common.system.entity.User;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -24,21 +24,21 @@ import java.util.List;
* @author 科技小王子
* @since 2024-09-10 20:47:57
*/
-@Api(tags = "文章记录表管理")
+@Tag(name = "文章记录表管理")
@RestController
@RequestMapping("/api/cms/cms-article-content")
public class CmsArticleContentController extends BaseController {
@Resource
private CmsArticleContentService cmsArticleContentService;
- @ApiOperation("分页查询文章记录表")
+ @Operation(summary = "分页查询文章记录表")
@GetMapping("/page")
public ApiResult> page(CmsArticleContentParam param) {
// 使用关联查询
return success(cmsArticleContentService.pageRel(param));
}
- @ApiOperation("查询全部文章记录表")
+ @Operation(summary = "查询全部文章记录表")
@GetMapping()
public ApiResult> list(CmsArticleContentParam param) {
PageParam page = new PageParam<>(param);
@@ -50,7 +50,7 @@ public class CmsArticleContentController extends BaseController {
@PreAuthorize("hasAuthority('cms:cmsArticleContent:list')")
@OperationLog
- @ApiOperation("根据id查询文章记录表")
+ @Operation(summary = "根据id查询文章记录表")
@GetMapping("/{id}")
public ApiResult get(@PathVariable("id") Integer id) {
return success(cmsArticleContentService.getById(id));
@@ -58,7 +58,7 @@ public class CmsArticleContentController extends BaseController {
//return success(cmsArticleContentService.getByIdRel(id));
}
- @ApiOperation("添加文章记录表")
+ @Operation(summary = "添加文章记录表")
@PostMapping()
public ApiResult save(@RequestBody CmsArticleContent cmsArticleContent) {
if (cmsArticleContentService.save(cmsArticleContent)) {
@@ -67,7 +67,7 @@ public class CmsArticleContentController extends BaseController {
return fail("添加失败");
}
- @ApiOperation("修改文章记录表")
+ @Operation(summary = "修改文章记录表")
@PutMapping()
public ApiResult update(@RequestBody CmsArticleContent cmsArticleContent) {
if (cmsArticleContentService.updateById(cmsArticleContent)) {
@@ -76,7 +76,7 @@ public class CmsArticleContentController extends BaseController {
return fail("修改失败");
}
- @ApiOperation("删除文章记录表")
+ @Operation(summary = "删除文章记录表")
@DeleteMapping("/{id}")
public ApiResult remove(@PathVariable("id") Integer id) {
if (cmsArticleContentService.removeById(id)) {
@@ -85,7 +85,7 @@ public class CmsArticleContentController extends BaseController {
return fail("删除失败");
}
- @ApiOperation("批量添加文章记录表")
+ @Operation(summary = "批量添加文章记录表")
@PostMapping("/batch")
public ApiResult saveBatch(@RequestBody List list) {
if (cmsArticleContentService.saveBatch(list)) {
@@ -94,7 +94,7 @@ public class CmsArticleContentController extends BaseController {
return fail("添加失败");
}
- @ApiOperation("批量修改文章记录表")
+ @Operation(summary = "批量修改文章记录表")
@PutMapping("/batch")
public ApiResult removeBatch(@RequestBody BatchParam batchParam) {
if (batchParam.update(cmsArticleContentService, "id")) {
@@ -103,7 +103,7 @@ public class CmsArticleContentController extends BaseController {
return fail("修改失败");
}
- @ApiOperation("批量删除文章记录表")
+ @Operation(summary = "批量删除文章记录表")
@DeleteMapping("/batch")
public ApiResult removeBatch(@RequestBody List ids) {
if (cmsArticleContentService.removeByIds(ids)) {
diff --git a/src/main/java/com/gxwebsoft/cms/controller/CmsArticleController.java b/src/main/java/com/gxwebsoft/cms/controller/CmsArticleController.java
index abc26a8..58f0ae7 100644
--- a/src/main/java/com/gxwebsoft/cms/controller/CmsArticleController.java
+++ b/src/main/java/com/gxwebsoft/cms/controller/CmsArticleController.java
@@ -16,8 +16,8 @@ import com.gxwebsoft.common.core.web.BatchParam;
import com.gxwebsoft.common.core.annotation.OperationLog;
import com.gxwebsoft.common.system.entity.User;
import com.gxwebsoft.common.system.service.UserService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -32,7 +32,7 @@ import java.util.Map;
* @author 科技小王子
* @since 2024-09-10 20:47:57
*/
-@Api(tags = "文章管理")
+@Tag(name = "文章管理")
@RestController
@RequestMapping("/api/cms/cms-article")
public class CmsArticleController extends BaseController {
@@ -43,21 +43,21 @@ public class CmsArticleController extends BaseController {
@Resource
private UserService userService;
- @ApiOperation("分页查询文章")
+ @Operation(summary = "分页查询文章")
@GetMapping("/page")
public ApiResult> page(CmsArticleParam param) {
// 使用关联查询
return success(cmsArticleService.pageRel(param));
}
- @ApiOperation("查询全部文章")
+ @Operation(summary = "查询全部文章")
@GetMapping()
public ApiResult> list(CmsArticleParam param) {
// 使用关联查询
return success(cmsArticleService.listRel(param));
}
- @ApiOperation("根据id查询文章")
+ @Operation(summary = "根据id查询文章")
@GetMapping("/{id}")
public ApiResult get(@PathVariable("id") Integer id) {
// 使用关联查询
@@ -73,7 +73,7 @@ public class CmsArticleController extends BaseController {
return success(article);
}
@PreAuthorize("hasAuthority('cms:cmsArticle:save')")
- @ApiOperation("添加文章")
+ @Operation(summary = "添加文章")
@PostMapping()
public ApiResult save(@RequestBody CmsArticle article) {
// 记录当前登录用户id
@@ -99,7 +99,7 @@ public class CmsArticleController extends BaseController {
}
@PreAuthorize("hasAuthority('cms:cmsArticle:update')")
- @ApiOperation("修改文章")
+ @Operation(summary = "修改文章")
@PutMapping()
public ApiResult update(@RequestBody CmsArticle cmsArticle) {
// 是否密码可见
@@ -113,7 +113,7 @@ public class CmsArticleController extends BaseController {
}
@PreAuthorize("hasAuthority('cms:cmsArticle:remove')")
- @ApiOperation("删除文章")
+ @Operation(summary = "删除文章")
@DeleteMapping("/{id}")
public ApiResult remove(@PathVariable("id") Integer id) {
if (cmsArticleService.removeById(id)) {
@@ -123,7 +123,7 @@ public class CmsArticleController extends BaseController {
}
@PreAuthorize("hasAuthority('cms:cmsArticle:save')")
- @ApiOperation("批量添加文章")
+ @Operation(summary = "批量添加文章")
@PostMapping("/batch")
public ApiResult saveBatch(@RequestBody List list) {
if (cmsArticleService.saveBatch(list)) {
@@ -133,7 +133,7 @@ public class CmsArticleController extends BaseController {
}
@PreAuthorize("hasAuthority('cms:cmsArticle:update')")
- @ApiOperation("批量修改文章")
+ @Operation(summary = "批量修改文章")
@PutMapping("/batch")
public ApiResult removeBatch(@RequestBody BatchParam batchParam) {
if (batchParam.update(cmsArticleService, "article_id")) {
@@ -143,7 +143,7 @@ public class CmsArticleController extends BaseController {
}
@PreAuthorize("hasAuthority('cms:cmsArticle:remove')")
- @ApiOperation("批量删除文章")
+ @Operation(summary = "批量删除文章")
@DeleteMapping("/batch")
public ApiResult removeBatch(@RequestBody List ids) {
if (cmsArticleService.removeByIds(ids)) {
@@ -152,7 +152,7 @@ public class CmsArticleController extends BaseController {
return fail("删除失败");
}
- @ApiOperation("读取上一篇")
+ @Operation(summary = "读取上一篇")
@GetMapping("/getPrevious/{id}")
public ApiResult getPrevious(@PathVariable("id") Integer id) {
LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>();
@@ -165,7 +165,7 @@ public class CmsArticleController extends BaseController {
return success(article);
}
- @ApiOperation("读取下一篇")
+ @Operation(summary = "读取下一篇")
@GetMapping("/getNext/{id}")
public ApiResult getNext(@PathVariable("id") Integer id) {
LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>();
@@ -178,7 +178,7 @@ public class CmsArticleController extends BaseController {
return success(article);
}
- @ApiOperation("统计信息")
+ @Operation(summary = "统计信息")
@GetMapping("/data")
public ApiResult> data(CmsArticleParam param) {
Map data = new HashMap<>();
@@ -206,7 +206,7 @@ public class CmsArticleController extends BaseController {
return success(data);
}
- @ApiOperation("密码校验")
+ @Operation(summary = "密码校验")
@GetMapping("/checkArticlePassword")
public ApiResult checkArticlePassword(CmsArticle param) {
if (!userService.comparePassword(param.getPassword(), param.getPassword2())) {
diff --git a/src/main/java/com/gxwebsoft/cms/controller/CmsArticleCountController.java b/src/main/java/com/gxwebsoft/cms/controller/CmsArticleCountController.java
index 8e9ba7a..f80a684 100644
--- a/src/main/java/com/gxwebsoft/cms/controller/CmsArticleCountController.java
+++ b/src/main/java/com/gxwebsoft/cms/controller/CmsArticleCountController.java
@@ -10,8 +10,8 @@ import com.gxwebsoft.common.core.web.PageParam;
import com.gxwebsoft.common.core.web.BatchParam;
import com.gxwebsoft.common.core.annotation.OperationLog;
import com.gxwebsoft.common.system.entity.User;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -24,21 +24,21 @@ import java.util.List;
* @author 科技小王子
* @since 2024-09-10 20:47:57
*/
-@Api(tags = "点赞文章管理")
+@Tag(name = "点赞文章管理")
@RestController
@RequestMapping("/api/cms/cms-article-count")
public class CmsArticleCountController extends BaseController {
@Resource
private CmsArticleCountService cmsArticleCountService;
- @ApiOperation("分页查询点赞文章")
+ @Operation(summary = "分页查询点赞文章")
@GetMapping("/page")
public ApiResult> page(CmsArticleCountParam param) {
// 使用关联查询
return success(cmsArticleCountService.pageRel(param));
}
- @ApiOperation("查询全部点赞文章")
+ @Operation(summary = "查询全部点赞文章")
@GetMapping()
public ApiResult> list(CmsArticleCountParam param) {
PageParam page = new PageParam<>(param);
@@ -50,7 +50,7 @@ public class CmsArticleCountController extends BaseController {
@PreAuthorize("hasAuthority('cms:cmsArticleCount:list')")
@OperationLog
- @ApiOperation("根据id查询点赞文章")
+ @Operation(summary = "根据id查询点赞文章")
@GetMapping("/{id}")
public ApiResult get(@PathVariable("id") Integer id) {
return success(cmsArticleCountService.getById(id));
@@ -58,7 +58,7 @@ public class CmsArticleCountController extends BaseController {
//return success(cmsArticleCountService.getByIdRel(id));
}
- @ApiOperation("添加点赞文章")
+ @Operation(summary = "添加点赞文章")
@PostMapping()
public ApiResult save(@RequestBody CmsArticleCount cmsArticleCount) {
// 记录当前登录用户id
@@ -72,7 +72,7 @@ public class CmsArticleCountController extends BaseController {
return fail("添加失败");
}
- @ApiOperation("修改点赞文章")
+ @Operation(summary = "修改点赞文章")
@PutMapping()
public ApiResult update(@RequestBody CmsArticleCount cmsArticleCount) {
if (cmsArticleCountService.updateById(cmsArticleCount)) {
@@ -81,7 +81,7 @@ public class CmsArticleCountController extends BaseController {
return fail("修改失败");
}
- @ApiOperation("删除点赞文章")
+ @Operation(summary = "删除点赞文章")
@DeleteMapping("/{id}")
public ApiResult remove(@PathVariable("id") Integer id) {
if (cmsArticleCountService.removeById(id)) {
@@ -90,7 +90,7 @@ public class CmsArticleCountController extends BaseController {
return fail("删除失败");
}
- @ApiOperation("批量添加点赞文章")
+ @Operation(summary = "批量添加点赞文章")
@PostMapping("/batch")
public ApiResult saveBatch(@RequestBody List list) {
if (cmsArticleCountService.saveBatch(list)) {
@@ -99,7 +99,7 @@ public class CmsArticleCountController extends BaseController {
return fail("添加失败");
}
- @ApiOperation("批量修改点赞文章")
+ @Operation(summary = "批量修改点赞文章")
@PutMapping("/batch")
public ApiResult removeBatch(@RequestBody BatchParam batchParam) {
if (batchParam.update(cmsArticleCountService, "id")) {
@@ -108,7 +108,7 @@ public class CmsArticleCountController extends BaseController {
return fail("修改失败");
}
- @ApiOperation("批量删除点赞文章")
+ @Operation(summary = "批量删除点赞文章")
@DeleteMapping("/batch")
public ApiResult removeBatch(@RequestBody List ids) {
if (cmsArticleCountService.removeByIds(ids)) {
diff --git a/src/main/java/com/gxwebsoft/cms/controller/CmsArticleLikeController.java b/src/main/java/com/gxwebsoft/cms/controller/CmsArticleLikeController.java
index 9f73631..2b9d2ef 100644
--- a/src/main/java/com/gxwebsoft/cms/controller/CmsArticleLikeController.java
+++ b/src/main/java/com/gxwebsoft/cms/controller/CmsArticleLikeController.java
@@ -10,8 +10,8 @@ import com.gxwebsoft.common.core.web.PageParam;
import com.gxwebsoft.common.core.web.BatchParam;
import com.gxwebsoft.common.core.annotation.OperationLog;
import com.gxwebsoft.common.system.entity.User;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -24,21 +24,21 @@ import java.util.List;
* @author 科技小王子
* @since 2024-09-10 20:47:57
*/
-@Api(tags = "点赞文章管理")
+@Tag(name = "点赞文章管理")
@RestController
@RequestMapping("/api/cms/cms-article-like")
public class CmsArticleLikeController extends BaseController {
@Resource
private CmsArticleLikeService cmsArticleLikeService;
- @ApiOperation("分页查询点赞文章")
+ @Operation(summary = "分页查询点赞文章")
@GetMapping("/page")
public ApiResult> page(CmsArticleLikeParam param) {
// 使用关联查询
return success(cmsArticleLikeService.pageRel(param));
}
- @ApiOperation("查询全部点赞文章")
+ @Operation(summary = "查询全部点赞文章")
@GetMapping()
public ApiResult> list(CmsArticleLikeParam param) {
PageParam page = new PageParam<>(param);
@@ -50,7 +50,7 @@ public class CmsArticleLikeController extends BaseController {
@PreAuthorize("hasAuthority('cms:cmsArticleLike:list')")
@OperationLog
- @ApiOperation("根据id查询点赞文章")
+ @Operation(summary = "根据id查询点赞文章")
@GetMapping("/{id}")
public ApiResult get(@PathVariable("id") Integer id) {
return success(cmsArticleLikeService.getById(id));
@@ -58,7 +58,7 @@ public class CmsArticleLikeController extends BaseController {
//return success(cmsArticleLikeService.getByIdRel(id));
}
- @ApiOperation("添加点赞文章")
+ @Operation(summary = "添加点赞文章")
@PostMapping()
public ApiResult save(@RequestBody CmsArticleLike cmsArticleLike) {
// 记录当前登录用户id
@@ -72,7 +72,7 @@ public class CmsArticleLikeController extends BaseController {
return fail("添加失败");
}
- @ApiOperation("修改点赞文章")
+ @Operation(summary = "修改点赞文章")
@PutMapping()
public ApiResult update(@RequestBody CmsArticleLike cmsArticleLike) {
if (cmsArticleLikeService.updateById(cmsArticleLike)) {
@@ -81,7 +81,7 @@ public class CmsArticleLikeController extends BaseController {
return fail("修改失败");
}
- @ApiOperation("删除点赞文章")
+ @Operation(summary = "删除点赞文章")
@DeleteMapping("/{id}")
public ApiResult remove(@PathVariable("id") Integer id) {
if (cmsArticleLikeService.removeById(id)) {
@@ -90,7 +90,7 @@ public class CmsArticleLikeController extends BaseController {
return fail("删除失败");
}
- @ApiOperation("批量添加点赞文章")
+ @Operation(summary = "批量添加点赞文章")
@PostMapping("/batch")
public ApiResult saveBatch(@RequestBody List list) {
if (cmsArticleLikeService.saveBatch(list)) {
@@ -99,7 +99,7 @@ public class CmsArticleLikeController extends BaseController {
return fail("添加失败");
}
- @ApiOperation("批量修改点赞文章")
+ @Operation(summary = "批量修改点赞文章")
@PutMapping("/batch")
public ApiResult removeBatch(@RequestBody BatchParam batchParam) {
if (batchParam.update(cmsArticleLikeService, "id")) {
@@ -108,7 +108,7 @@ public class CmsArticleLikeController extends BaseController {
return fail("修改失败");
}
- @ApiOperation("批量删除点赞文章")
+ @Operation(summary = "批量删除点赞文章")
@DeleteMapping("/batch")
public ApiResult removeBatch(@RequestBody List ids) {
if (cmsArticleLikeService.removeByIds(ids)) {
diff --git a/src/main/java/com/gxwebsoft/cms/controller/CmsComponentsController.java b/src/main/java/com/gxwebsoft/cms/controller/CmsComponentsController.java
index 878702a..8ca1713 100644
--- a/src/main/java/com/gxwebsoft/cms/controller/CmsComponentsController.java
+++ b/src/main/java/com/gxwebsoft/cms/controller/CmsComponentsController.java
@@ -10,8 +10,8 @@ import com.gxwebsoft.common.core.web.PageParam;
import com.gxwebsoft.common.core.web.BatchParam;
import com.gxwebsoft.common.core.annotation.OperationLog;
import com.gxwebsoft.common.system.entity.User;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -24,21 +24,21 @@ import java.util.List;
* @author 科技小王子
* @since 2024-09-10 20:47:57
*/
-@Api(tags = "组件管理")
+@Tag(name = "组件管理")
@RestController
@RequestMapping("/api/cms/cms-components")
public class CmsComponentsController extends BaseController {
@Resource
private CmsComponentsService cmsComponentsService;
- @ApiOperation("分页查询组件")
+ @Operation(summary = "分页查询组件")
@GetMapping("/page")
public ApiResult> page(CmsComponentsParam param) {
// 使用关联查询
return success(cmsComponentsService.pageRel(param));
}
- @ApiOperation("查询全部组件")
+ @Operation(summary = "查询全部组件")
@GetMapping()
public ApiResult> list(CmsComponentsParam param) {
PageParam page = new PageParam<>(param);
@@ -50,7 +50,7 @@ public class CmsComponentsController extends BaseController {
@PreAuthorize("hasAuthority('cms:cmsComponents:list')")
@OperationLog
- @ApiOperation("根据id查询组件")
+ @Operation(summary = "根据id查询组件")
@GetMapping("/{id}")
public ApiResult get(@PathVariable("id") Integer id) {
return success(cmsComponentsService.getById(id));
@@ -58,7 +58,7 @@ public class CmsComponentsController extends BaseController {
//return success(cmsComponentsService.getByIdRel(id));
}
- @ApiOperation("添加组件")
+ @Operation(summary = "添加组件")
@PostMapping()
public ApiResult save(@RequestBody CmsComponents cmsComponents) {
// 记录当前登录用户id
@@ -72,7 +72,7 @@ public class CmsComponentsController extends BaseController {
return fail("添加失败");
}
- @ApiOperation("修改组件")
+ @Operation(summary = "修改组件")
@PutMapping()
public ApiResult update(@RequestBody CmsComponents cmsComponents) {
if (cmsComponentsService.updateById(cmsComponents)) {
@@ -81,7 +81,7 @@ public class CmsComponentsController extends BaseController {
return fail("修改失败");
}
- @ApiOperation("删除组件")
+ @Operation(summary = "删除组件")
@DeleteMapping("/{id}")
public ApiResult remove(@PathVariable("id") Integer id) {
if (cmsComponentsService.removeById(id)) {
@@ -90,7 +90,7 @@ public class CmsComponentsController extends BaseController {
return fail("删除失败");
}
- @ApiOperation("批量添加组件")
+ @Operation(summary = "批量添加组件")
@PostMapping("/batch")
public ApiResult saveBatch(@RequestBody List list) {
if (cmsComponentsService.saveBatch(list)) {
@@ -99,7 +99,7 @@ public class CmsComponentsController extends BaseController {
return fail("添加失败");
}
- @ApiOperation("批量修改组件")
+ @Operation(summary = "批量修改组件")
@PutMapping("/batch")
public ApiResult removeBatch(@RequestBody BatchParam batchParam) {
if (batchParam.update(cmsComponentsService, "id")) {
@@ -108,7 +108,7 @@ public class CmsComponentsController extends BaseController {
return fail("修改失败");
}
- @ApiOperation("批量删除组件")
+ @Operation(summary = "批量删除组件")
@DeleteMapping("/batch")
public ApiResult removeBatch(@RequestBody List ids) {
if (cmsComponentsService.removeByIds(ids)) {
diff --git a/src/main/java/com/gxwebsoft/cms/controller/CmsDesignController.java b/src/main/java/com/gxwebsoft/cms/controller/CmsDesignController.java
index 9c53fac..7c5882b 100644
--- a/src/main/java/com/gxwebsoft/cms/controller/CmsDesignController.java
+++ b/src/main/java/com/gxwebsoft/cms/controller/CmsDesignController.java
@@ -10,8 +10,8 @@ import com.gxwebsoft.common.core.web.PageParam;
import com.gxwebsoft.common.core.web.BatchParam;
import com.gxwebsoft.common.core.annotation.OperationLog;
import com.gxwebsoft.common.system.entity.User;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -24,21 +24,21 @@ import java.util.List;
* @author 科技小王子
* @since 2024-09-10 20:47:57
*/
-@Api(tags = "页面管理记录表管理")
+@Tag(name = "页面管理记录表管理")
@RestController
@RequestMapping("/api/cms/cms-design")
public class CmsDesignController extends BaseController {
@Resource
private CmsDesignService cmsDesignService;
- @ApiOperation("分页查询页面管理记录表")
+ @Operation(summary = "分页查询页面管理记录表")
@GetMapping("/page")
public ApiResult> page(CmsDesignParam param) {
// 使用关联查询
return success(cmsDesignService.pageRel(param));
}
- @ApiOperation("查询全部页面管理记录表")
+ @Operation(summary = "查询全部页面管理记录表")
@GetMapping()
public ApiResult> list(CmsDesignParam param) {
PageParam page = new PageParam<>(param);
@@ -50,7 +50,7 @@ public class CmsDesignController extends BaseController {
@PreAuthorize("hasAuthority('cms:cmsDesign:list')")
@OperationLog
- @ApiOperation("根据id查询页面管理记录表")
+ @Operation(summary = "根据id查询页面管理记录表")
@GetMapping("/{id}")
public ApiResult get(@PathVariable("id") Integer id) {
return success(cmsDesignService.getById(id));
@@ -58,7 +58,7 @@ public class CmsDesignController extends BaseController {
//return success(cmsDesignService.getByIdRel(id));
}
- @ApiOperation("添加页面管理记录表")
+ @Operation(summary = "添加页面管理记录表")
@PostMapping()
public ApiResult save(@RequestBody CmsDesign cmsDesign) {
// 记录当前登录用户id
@@ -72,7 +72,7 @@ public class CmsDesignController extends BaseController {
return fail("添加失败");
}
- @ApiOperation("修改页面管理记录表")
+ @Operation(summary = "修改页面管理记录表")
@PutMapping()
public ApiResult update(@RequestBody CmsDesign cmsDesign) {
if (cmsDesignService.updateById(cmsDesign)) {
@@ -81,7 +81,7 @@ public class CmsDesignController extends BaseController {
return fail("修改失败");
}
- @ApiOperation("删除页面管理记录表")
+ @Operation(summary = "删除页面管理记录表")
@DeleteMapping("/{id}")
public ApiResult remove(@PathVariable("id") Integer id) {
if (cmsDesignService.removeById(id)) {
@@ -90,7 +90,7 @@ public class CmsDesignController extends BaseController {
return fail("删除失败");
}
- @ApiOperation("批量添加页面管理记录表")
+ @Operation(summary = "批量添加页面管理记录表")
@PostMapping("/batch")
public ApiResult saveBatch(@RequestBody List list) {
if (cmsDesignService.saveBatch(list)) {
@@ -99,7 +99,7 @@ public class CmsDesignController extends BaseController {
return fail("添加失败");
}
- @ApiOperation("批量修改页面管理记录表")
+ @Operation(summary = "批量修改页面管理记录表")
@PutMapping("/batch")
public ApiResult removeBatch(@RequestBody BatchParam batchParam) {
if (batchParam.update(cmsDesignService, "page_id")) {
@@ -108,7 +108,7 @@ public class CmsDesignController extends BaseController {
return fail("修改失败");
}
- @ApiOperation("批量删除页面管理记录表")
+ @Operation(summary = "批量删除页面管理记录表")
@DeleteMapping("/batch")
public ApiResult removeBatch(@RequestBody List ids) {
if (cmsDesignService.removeByIds(ids)) {
diff --git a/src/main/java/com/gxwebsoft/cms/controller/CmsDesignRecordController.java b/src/main/java/com/gxwebsoft/cms/controller/CmsDesignRecordController.java
index ef2ac46..d921d01 100644
--- a/src/main/java/com/gxwebsoft/cms/controller/CmsDesignRecordController.java
+++ b/src/main/java/com/gxwebsoft/cms/controller/CmsDesignRecordController.java
@@ -10,8 +10,8 @@ import com.gxwebsoft.common.core.web.PageParam;
import com.gxwebsoft.common.core.web.BatchParam;
import com.gxwebsoft.common.core.annotation.OperationLog;
import com.gxwebsoft.common.system.entity.User;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -24,21 +24,21 @@ import java.util.List;
* @author 科技小王子
* @since 2024-09-10 20:47:57
*/
-@Api(tags = "页面组件表管理")
+@Tag(name = "页面组件表管理")
@RestController
@RequestMapping("/api/cms/cms-design-record")
public class CmsDesignRecordController extends BaseController {
@Resource
private CmsDesignRecordService cmsDesignRecordService;
- @ApiOperation("分页查询页面组件表")
+ @Operation(summary = "分页查询页面组件表")
@GetMapping("/page")
public ApiResult> page(CmsDesignRecordParam param) {
// 使用关联查询
return success(cmsDesignRecordService.pageRel(param));
}
- @ApiOperation("查询全部页面组件表")
+ @Operation(summary = "查询全部页面组件表")
@GetMapping()
public ApiResult> list(CmsDesignRecordParam param) {
PageParam page = new PageParam<>(param);
@@ -50,7 +50,7 @@ public class CmsDesignRecordController extends BaseController {
@PreAuthorize("hasAuthority('cms:cmsDesignRecord:list')")
@OperationLog
- @ApiOperation("根据id查询页面组件表")
+ @Operation(summary = "根据id查询页面组件表")
@GetMapping("/{id}")
public ApiResult get(@PathVariable("id") Integer id) {
return success(cmsDesignRecordService.getById(id));
@@ -58,7 +58,7 @@ public class CmsDesignRecordController extends BaseController {
//return success(cmsDesignRecordService.getByIdRel(id));
}
- @ApiOperation("添加页面组件表")
+ @Operation(summary = "添加页面组件表")
@PostMapping()
public ApiResult save(@RequestBody CmsDesignRecord cmsDesignRecord) {
// 记录当前登录用户id
@@ -72,7 +72,7 @@ public class CmsDesignRecordController extends BaseController {
return fail("添加失败");
}
- @ApiOperation("修改页面组件表")
+ @Operation(summary = "修改页面组件表")
@PutMapping()
public ApiResult update(@RequestBody CmsDesignRecord cmsDesignRecord) {
if (cmsDesignRecordService.updateById(cmsDesignRecord)) {
@@ -81,7 +81,7 @@ public class CmsDesignRecordController extends BaseController {
return fail("修改失败");
}
- @ApiOperation("删除页面组件表")
+ @Operation(summary = "删除页面组件表")
@DeleteMapping("/{id}")
public ApiResult remove(@PathVariable("id") Integer id) {
if (cmsDesignRecordService.removeById(id)) {
@@ -90,7 +90,7 @@ public class CmsDesignRecordController extends BaseController {
return fail("删除失败");
}
- @ApiOperation("批量添加页面组件表")
+ @Operation(summary = "批量添加页面组件表")
@PostMapping("/batch")
public ApiResult saveBatch(@RequestBody List list) {
if (cmsDesignRecordService.saveBatch(list)) {
@@ -99,7 +99,7 @@ public class CmsDesignRecordController extends BaseController {
return fail("添加失败");
}
- @ApiOperation("批量修改页面组件表")
+ @Operation(summary = "批量修改页面组件表")
@PutMapping("/batch")
public ApiResult removeBatch(@RequestBody BatchParam batchParam) {
if (batchParam.update(cmsDesignRecordService, "id")) {
@@ -108,7 +108,7 @@ public class CmsDesignRecordController extends BaseController {
return fail("修改失败");
}
- @ApiOperation("批量删除页面组件表")
+ @Operation(summary = "批量删除页面组件表")
@DeleteMapping("/batch")
public ApiResult removeBatch(@RequestBody List ids) {
if (cmsDesignRecordService.removeByIds(ids)) {
diff --git a/src/main/java/com/gxwebsoft/cms/controller/CmsDocsBookController.java b/src/main/java/com/gxwebsoft/cms/controller/CmsDocsBookController.java
index cbe5f63..02846cf 100644
--- a/src/main/java/com/gxwebsoft/cms/controller/CmsDocsBookController.java
+++ b/src/main/java/com/gxwebsoft/cms/controller/CmsDocsBookController.java
@@ -10,8 +10,8 @@ import com.gxwebsoft.common.core.web.PageParam;
import com.gxwebsoft.common.core.web.BatchParam;
import com.gxwebsoft.common.core.annotation.OperationLog;
import com.gxwebsoft.common.system.entity.User;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -24,21 +24,21 @@ import java.util.List;
* @author 科技小王子
* @since 2024-09-10 20:47:57
*/
-@Api(tags = "书籍记录表管理")
+@Tag(name = "书籍记录表管理")
@RestController
@RequestMapping("/api/cms/cms-docs-book")
public class CmsDocsBookController extends BaseController {
@Resource
private CmsDocsBookService cmsDocsBookService;
- @ApiOperation("分页查询书籍记录表")
+ @Operation(summary = "分页查询书籍记录表")
@GetMapping("/page")
public ApiResult> page(CmsDocsBookParam param) {
// 使用关联查询
return success(cmsDocsBookService.pageRel(param));
}
- @ApiOperation("查询全部书籍记录表")
+ @Operation(summary = "查询全部书籍记录表")
@GetMapping()
public ApiResult> list(CmsDocsBookParam param) {
PageParam page = new PageParam<>(param);
@@ -50,7 +50,7 @@ public class CmsDocsBookController extends BaseController {
@PreAuthorize("hasAuthority('cms:cmsDocsBook:list')")
@OperationLog
- @ApiOperation("根据id查询书籍记录表")
+ @Operation(summary = "根据id查询书籍记录表")
@GetMapping("/{id}")
public ApiResult get(@PathVariable("id") Integer id) {
return success(cmsDocsBookService.getById(id));
@@ -58,7 +58,7 @@ public class CmsDocsBookController extends BaseController {
//return success(cmsDocsBookService.getByIdRel(id));
}
- @ApiOperation("添加书籍记录表")
+ @Operation(summary = "添加书籍记录表")
@PostMapping()
public ApiResult save(@RequestBody CmsDocsBook cmsDocsBook) {
if (cmsDocsBookService.save(cmsDocsBook)) {
@@ -67,7 +67,7 @@ public class CmsDocsBookController extends BaseController {
return fail("添加失败");
}
- @ApiOperation("修改书籍记录表")
+ @Operation(summary = "修改书籍记录表")
@PutMapping()
public ApiResult update(@RequestBody CmsDocsBook cmsDocsBook) {
if (cmsDocsBookService.updateById(cmsDocsBook)) {
@@ -76,7 +76,7 @@ public class CmsDocsBookController extends BaseController {
return fail("修改失败");
}
- @ApiOperation("删除书籍记录表")
+ @Operation(summary = "删除书籍记录表")
@DeleteMapping("/{id}")
public ApiResult remove(@PathVariable("id") Integer id) {
if (cmsDocsBookService.removeById(id)) {
@@ -85,7 +85,7 @@ public class CmsDocsBookController extends BaseController {
return fail("删除失败");
}
- @ApiOperation("批量添加书籍记录表")
+ @Operation(summary = "批量添加书籍记录表")
@PostMapping("/batch")
public ApiResult saveBatch(@RequestBody List list) {
if (cmsDocsBookService.saveBatch(list)) {
@@ -94,7 +94,7 @@ public class CmsDocsBookController extends BaseController {
return fail("添加失败");
}
- @ApiOperation("批量修改书籍记录表")
+ @Operation(summary = "批量修改书籍记录表")
@PutMapping("/batch")
public ApiResult removeBatch(@RequestBody BatchParam batchParam) {
if (batchParam.update(cmsDocsBookService, "book_id")) {
@@ -103,7 +103,7 @@ public class CmsDocsBookController extends BaseController {
return fail("修改失败");
}
- @ApiOperation("批量删除书籍记录表")
+ @Operation(summary = "批量删除书籍记录表")
@DeleteMapping("/batch")
public ApiResult removeBatch(@RequestBody List ids) {
if (cmsDocsBookService.removeByIds(ids)) {
diff --git a/src/main/java/com/gxwebsoft/cms/controller/CmsDocsContentController.java b/src/main/java/com/gxwebsoft/cms/controller/CmsDocsContentController.java
index 7ba6fc7..c35e90c 100644
--- a/src/main/java/com/gxwebsoft/cms/controller/CmsDocsContentController.java
+++ b/src/main/java/com/gxwebsoft/cms/controller/CmsDocsContentController.java
@@ -10,8 +10,8 @@ import com.gxwebsoft.common.core.web.PageParam;
import com.gxwebsoft.common.core.web.BatchParam;
import com.gxwebsoft.common.core.annotation.OperationLog;
import com.gxwebsoft.common.system.entity.User;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -24,21 +24,21 @@ import java.util.List;
* @author 科技小王子
* @since 2024-09-10 20:47:57
*/
-@Api(tags = "文档内容记录表管理")
+@Tag(name = "文档内容记录表管理")
@RestController
@RequestMapping("/api/cms/cms-docs-content")
public class CmsDocsContentController extends BaseController {
@Resource
private CmsDocsContentService cmsDocsContentService;
- @ApiOperation("分页查询文档内容记录表")
+ @Operation(summary = "分页查询文档内容记录表")
@GetMapping("/page")
public ApiResult> page(CmsDocsContentParam param) {
// 使用关联查询
return success(cmsDocsContentService.pageRel(param));
}
- @ApiOperation("查询全部文档内容记录表")
+ @Operation(summary = "查询全部文档内容记录表")
@GetMapping()
public ApiResult> list(CmsDocsContentParam param) {
PageParam page = new PageParam<>(param);
@@ -50,7 +50,7 @@ public class CmsDocsContentController extends BaseController {
@PreAuthorize("hasAuthority('cms:cmsDocsContent:list')")
@OperationLog
- @ApiOperation("根据id查询文档内容记录表")
+ @Operation(summary = "根据id查询文档内容记录表")
@GetMapping("/{id}")
public ApiResult get(@PathVariable("id") Integer id) {
return success(cmsDocsContentService.getById(id));
@@ -58,7 +58,7 @@ public class CmsDocsContentController extends BaseController {
//return success(cmsDocsContentService.getByIdRel(id));
}
- @ApiOperation("添加文档内容记录表")
+ @Operation(summary = "添加文档内容记录表")
@PostMapping()
public ApiResult save(@RequestBody CmsDocsContent cmsDocsContent) {
if (cmsDocsContentService.save(cmsDocsContent)) {
@@ -67,7 +67,7 @@ public class CmsDocsContentController extends BaseController {
return fail("添加失败");
}
- @ApiOperation("修改文档内容记录表")
+ @Operation(summary = "修改文档内容记录表")
@PutMapping()
public ApiResult update(@RequestBody CmsDocsContent cmsDocsContent) {
if (cmsDocsContentService.updateById(cmsDocsContent)) {
@@ -76,7 +76,7 @@ public class CmsDocsContentController extends BaseController {
return fail("修改失败");
}
- @ApiOperation("删除文档内容记录表")
+ @Operation(summary = "删除文档内容记录表")
@DeleteMapping("/{id}")
public ApiResult remove(@PathVariable("id") Integer id) {
if (cmsDocsContentService.removeById(id)) {
@@ -85,7 +85,7 @@ public class CmsDocsContentController extends BaseController {
return fail("删除失败");
}
- @ApiOperation("批量添加文档内容记录表")
+ @Operation(summary = "批量添加文档内容记录表")
@PostMapping("/batch")
public ApiResult saveBatch(@RequestBody List list) {
if (cmsDocsContentService.saveBatch(list)) {
@@ -94,7 +94,7 @@ public class CmsDocsContentController extends BaseController {
return fail("添加失败");
}
- @ApiOperation("批量修改文档内容记录表")
+ @Operation(summary = "批量修改文档内容记录表")
@PutMapping("/batch")
public ApiResult removeBatch(@RequestBody BatchParam batchParam) {
if (batchParam.update(cmsDocsContentService, "id")) {
@@ -103,7 +103,7 @@ public class CmsDocsContentController extends BaseController {
return fail("修改失败");
}
- @ApiOperation("批量删除文档内容记录表")
+ @Operation(summary = "批量删除文档内容记录表")
@DeleteMapping("/batch")
public ApiResult removeBatch(@RequestBody List ids) {
if (cmsDocsContentService.removeByIds(ids)) {
diff --git a/src/main/java/com/gxwebsoft/cms/controller/CmsDocsController.java b/src/main/java/com/gxwebsoft/cms/controller/CmsDocsController.java
index 77b4d2d..a70a571 100644
--- a/src/main/java/com/gxwebsoft/cms/controller/CmsDocsController.java
+++ b/src/main/java/com/gxwebsoft/cms/controller/CmsDocsController.java
@@ -10,8 +10,8 @@ import com.gxwebsoft.common.core.web.PageParam;
import com.gxwebsoft.common.core.web.BatchParam;
import com.gxwebsoft.common.core.annotation.OperationLog;
import com.gxwebsoft.common.system.entity.User;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -24,21 +24,21 @@ import java.util.List;
* @author 科技小王子
* @since 2024-09-10 20:47:57
*/
-@Api(tags = "文档管理记录表管理")
+@Tag(name = "文档管理记录表管理")
@RestController
@RequestMapping("/api/cms/cms-docs")
public class CmsDocsController extends BaseController {
@Resource
private CmsDocsService cmsDocsService;
- @ApiOperation("分页查询文档管理记录表")
+ @Operation(summary = "分页查询文档管理记录表")
@GetMapping("/page")
public ApiResult> page(CmsDocsParam param) {
// 使用关联查询
return success(cmsDocsService.pageRel(param));
}
- @ApiOperation("查询全部文档管理记录表")
+ @Operation(summary = "查询全部文档管理记录表")
@GetMapping()
public ApiResult> list(CmsDocsParam param) {
PageParam page = new PageParam<>(param);
@@ -50,7 +50,7 @@ public class CmsDocsController extends BaseController {
@PreAuthorize("hasAuthority('cms:cmsDocs:list')")
@OperationLog
- @ApiOperation("根据id查询文档管理记录表")
+ @Operation(summary = "根据id查询文档管理记录表")
@GetMapping("/{id}")
public ApiResult get(@PathVariable("id") Integer id) {
return success(cmsDocsService.getById(id));
@@ -58,7 +58,7 @@ public class CmsDocsController extends BaseController {
//return success(cmsDocsService.getByIdRel(id));
}
- @ApiOperation("添加文档管理记录表")
+ @Operation(summary = "添加文档管理记录表")
@PostMapping()
public ApiResult save(@RequestBody CmsDocs cmsDocs) {
// 记录当前登录用户id
@@ -72,7 +72,7 @@ public class CmsDocsController extends BaseController {
return fail("添加失败");
}
- @ApiOperation("修改文档管理记录表")
+ @Operation(summary = "修改文档管理记录表")
@PutMapping()
public ApiResult update(@RequestBody CmsDocs cmsDocs) {
if (cmsDocsService.updateById(cmsDocs)) {
@@ -81,7 +81,7 @@ public class CmsDocsController extends BaseController {
return fail("修改失败");
}
- @ApiOperation("删除文档管理记录表")
+ @Operation(summary = "删除文档管理记录表")
@DeleteMapping("/{id}")
public ApiResult remove(@PathVariable("id") Integer id) {
if (cmsDocsService.removeById(id)) {
@@ -90,7 +90,7 @@ public class CmsDocsController extends BaseController {
return fail("删除失败");
}
- @ApiOperation("批量添加文档管理记录表")
+ @Operation(summary = "批量添加文档管理记录表")
@PostMapping("/batch")
public ApiResult saveBatch(@RequestBody List list) {
if (cmsDocsService.saveBatch(list)) {
@@ -99,7 +99,7 @@ public class CmsDocsController extends BaseController {
return fail("添加失败");
}
- @ApiOperation("批量修改文档管理记录表")
+ @Operation(summary = "批量修改文档管理记录表")
@PutMapping("/batch")
public ApiResult removeBatch(@RequestBody BatchParam batchParam) {
if (batchParam.update(cmsDocsService, "docs_id")) {
@@ -108,7 +108,7 @@ public class CmsDocsController extends BaseController {
return fail("修改失败");
}
- @ApiOperation("批量删除文档管理记录表")
+ @Operation(summary = "批量删除文档管理记录表")
@DeleteMapping("/batch")
public ApiResult removeBatch(@RequestBody List ids) {
if (cmsDocsService.removeByIds(ids)) {
diff --git a/src/main/java/com/gxwebsoft/cms/controller/CmsDomainController.java b/src/main/java/com/gxwebsoft/cms/controller/CmsDomainController.java
index 4f2539e..c0685cc 100644
--- a/src/main/java/com/gxwebsoft/cms/controller/CmsDomainController.java
+++ b/src/main/java/com/gxwebsoft/cms/controller/CmsDomainController.java
@@ -11,8 +11,8 @@ import com.gxwebsoft.cms.entity.CmsDomain;
import com.gxwebsoft.cms.param.CmsDomainParam;
import com.gxwebsoft.common.core.annotation.OperationLog;
import com.gxwebsoft.common.system.entity.User;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -25,7 +25,7 @@ import java.util.List;
* @author 科技小王子
* @since 2024-09-10 20:36:14
*/
-@Api(tags = "网站域名记录表管理")
+@Tag(name = "网站域名记录表管理")
@RestController
@RequestMapping("/api/cms/cms-domain")
public class CmsDomainController extends BaseController {
@@ -36,14 +36,14 @@ public class CmsDomainController extends BaseController {
@Resource
private RedisUtil redisUtil;
- @ApiOperation("分页查询网站域名记录表")
+ @Operation(summary = "分页查询网站域名记录表")
@GetMapping("/page")
public ApiResult> page(CmsDomainParam param) {
// 使用关联查询
return success(cmsDomainService.pageRel(param));
}
- @ApiOperation("查询全部网站域名记录表")
+ @Operation(summary = "查询全部网站域名记录表")
@GetMapping()
public ApiResult> list(CmsDomainParam param) {
// 使用关联查询
@@ -52,14 +52,14 @@ public class CmsDomainController extends BaseController {
@PreAuthorize("hasAuthority('cms:cmsDomain:list')")
@OperationLog
- @ApiOperation("根据id查询网站域名记录表")
+ @Operation(summary = "根据id查询网站域名记录表")
@GetMapping("/{id}")
public ApiResult get(@PathVariable("id") Integer id) {
// 使用关联查询
return success(cmsDomainService.getByIdRel(id));
}
- @ApiOperation("添加网站域名记录表")
+ @Operation(summary = "添加网站域名记录表")
@PostMapping()
public ApiResult save(@RequestBody CmsDomain cmsDomain) {
// 记录当前登录用户id
@@ -73,7 +73,7 @@ public class CmsDomainController extends BaseController {
return fail("添加失败");
}
- @ApiOperation("修改网站域名记录表")
+ @Operation(summary = "修改网站域名记录表")
@PutMapping()
public ApiResult update(@RequestBody CmsDomain cmsDomain) {
if (cmsDomainService.updateById(cmsDomain)) {
@@ -82,7 +82,7 @@ public class CmsDomainController extends BaseController {
return fail("修改失败");
}
- @ApiOperation("删除网站域名记录表")
+ @Operation(summary = "删除网站域名记录表")
@DeleteMapping("/{id}")
public ApiResult remove(@PathVariable("id") Integer id) {
if (cmsDomainService.removeById(id)) {
@@ -91,7 +91,7 @@ public class CmsDomainController extends BaseController {
return fail("删除失败");
}
- @ApiOperation("批量添加网站域名记录表")
+ @Operation(summary = "批量添加网站域名记录表")
@PostMapping("/batch")
public ApiResult saveBatch(@RequestBody List list) {
if (cmsDomainService.saveBatch(list)) {
@@ -100,7 +100,7 @@ public class CmsDomainController extends BaseController {
return fail("添加失败");
}
- @ApiOperation("批量修改网站域名记录表")
+ @Operation(summary = "批量修改网站域名记录表")
@PutMapping("/batch")
public ApiResult removeBatch(@RequestBody BatchParam batchParam) {
if (batchParam.update(cmsDomainService, "id")) {
@@ -109,7 +109,7 @@ public class CmsDomainController extends BaseController {
return fail("修改失败");
}
- @ApiOperation("批量删除网站域名记录表")
+ @Operation(summary = "批量删除网站域名记录表")
@DeleteMapping("/batch")
public ApiResult removeBatch(@RequestBody List ids) {
if (cmsDomainService.removeByIds(ids)) {
@@ -118,14 +118,14 @@ public class CmsDomainController extends BaseController {
return fail("删除失败");
}
- @ApiOperation("查询授权域名信息")
+ @Operation(summary = "查询授权域名信息")
@GetMapping("/getTenantIdByDomain")
public ApiResult getTenantIdByDomain(CmsDomainParam param) {
final CmsDomain domain = cmsDomainService.getOne(new LambdaQueryWrapper().eq(CmsDomain::getDomain, param.getDomain()).last("limit 1"));
return success(domain);
}
- @ApiOperation("授权二级域名")
+ @Operation(summary = "授权二级域名")
@PostMapping("/domain")
public ApiResult domain(@RequestBody CmsDomain cmsDomain) {
final User loginUser = getLoginUser();
@@ -156,7 +156,7 @@ public class CmsDomainController extends BaseController {
return fail("授权失败");
}
- @ApiOperation("查询授权主域名")
+ @Operation(summary = "查询授权主域名")
@GetMapping("/getAuthorizedDomain/{id}")
public ApiResult getAuthorizedDomain(@PathVariable("id") Integer id) {
final List list = cmsDomainService.list(new LambdaQueryWrapper()
@@ -170,7 +170,7 @@ public class CmsDomainController extends BaseController {
return success(list.get(0));
}
- @ApiOperation("检查域名是否已存在")
+ @Operation(summary = "检查域名是否已存在")
@GetMapping("/existence")
public ApiResult existence(ExistenceParam param) {
if (param.isExistence(cmsDomainService, CmsDomain::getDomain)) {
diff --git a/src/main/java/com/gxwebsoft/cms/controller/CmsFormController.java b/src/main/java/com/gxwebsoft/cms/controller/CmsFormController.java
index 98d6af9..ce9ab34 100644
--- a/src/main/java/com/gxwebsoft/cms/controller/CmsFormController.java
+++ b/src/main/java/com/gxwebsoft/cms/controller/CmsFormController.java
@@ -10,8 +10,8 @@ import com.gxwebsoft.common.core.web.PageParam;
import com.gxwebsoft.common.core.web.BatchParam;
import com.gxwebsoft.common.core.annotation.OperationLog;
import com.gxwebsoft.common.system.entity.User;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -24,21 +24,21 @@ import java.util.List;
* @author 科技小王子
* @since 2024-09-10 20:47:57
*/
-@Api(tags = "表单设计表管理")
+@Tag(name = "表单设计表管理")
@RestController
@RequestMapping("/api/cms/cms-form")
public class CmsFormController extends BaseController {
@Resource
private CmsFormService cmsFormService;
- @ApiOperation("分页查询表单设计表")
+ @Operation(summary = "分页查询表单设计表")
@GetMapping("/page")
public ApiResult> page(CmsFormParam param) {
// 使用关联查询
return success(cmsFormService.pageRel(param));
}
- @ApiOperation("查询全部表单设计表")
+ @Operation(summary = "查询全部表单设计表")
@GetMapping()
public ApiResult> list(CmsFormParam param) {
PageParam page = new PageParam<>(param);
@@ -50,7 +50,7 @@ public class CmsFormController extends BaseController {
@PreAuthorize("hasAuthority('cms:cmsForm:list')")
@OperationLog
- @ApiOperation("根据id查询表单设计表")
+ @Operation(summary = "根据id查询表单设计表")
@GetMapping("/{id}")
public ApiResult get(@PathVariable("id") Integer id) {
return success(cmsFormService.getById(id));
@@ -58,7 +58,7 @@ public class CmsFormController extends BaseController {
//return success(cmsFormService.getByIdRel(id));
}
- @ApiOperation("添加表单设计表")
+ @Operation(summary = "添加表单设计表")
@PostMapping()
public ApiResult save(@RequestBody CmsForm cmsForm) {
// 记录当前登录用户id
@@ -72,7 +72,7 @@ public class CmsFormController extends BaseController {
return fail("添加失败");
}
- @ApiOperation("修改表单设计表")
+ @Operation(summary = "修改表单设计表")
@PutMapping()
public ApiResult update(@RequestBody CmsForm cmsForm) {
if (cmsFormService.updateById(cmsForm)) {
@@ -81,7 +81,7 @@ public class CmsFormController extends BaseController {
return fail("修改失败");
}
- @ApiOperation("删除表单设计表")
+ @Operation(summary = "删除表单设计表")
@DeleteMapping("/{id}")
public ApiResult remove(@PathVariable("id") Integer id) {
if (cmsFormService.removeById(id)) {
@@ -90,7 +90,7 @@ public class CmsFormController extends BaseController {
return fail("删除失败");
}
- @ApiOperation("批量添加表单设计表")
+ @Operation(summary = "批量添加表单设计表")
@PostMapping("/batch")
public ApiResult saveBatch(@RequestBody List list) {
if (cmsFormService.saveBatch(list)) {
@@ -99,7 +99,7 @@ public class CmsFormController extends BaseController {
return fail("添加失败");
}
- @ApiOperation("批量修改表单设计表")
+ @Operation(summary = "批量修改表单设计表")
@PutMapping("/batch")
public ApiResult removeBatch(@RequestBody BatchParam batchParam) {
if (batchParam.update(cmsFormService, "form_id")) {
@@ -108,7 +108,7 @@ public class CmsFormController extends BaseController {
return fail("修改失败");
}
- @ApiOperation("批量删除表单设计表")
+ @Operation(summary = "批量删除表单设计表")
@DeleteMapping("/batch")
public ApiResult removeBatch(@RequestBody List ids) {
if (cmsFormService.removeByIds(ids)) {
diff --git a/src/main/java/com/gxwebsoft/cms/controller/CmsFormRecordController.java b/src/main/java/com/gxwebsoft/cms/controller/CmsFormRecordController.java
index e0b4bdf..0aedacc 100644
--- a/src/main/java/com/gxwebsoft/cms/controller/CmsFormRecordController.java
+++ b/src/main/java/com/gxwebsoft/cms/controller/CmsFormRecordController.java
@@ -10,8 +10,8 @@ import com.gxwebsoft.common.core.web.PageParam;
import com.gxwebsoft.common.core.web.BatchParam;
import com.gxwebsoft.common.core.annotation.OperationLog;
import com.gxwebsoft.common.system.entity.User;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -24,21 +24,21 @@ import java.util.List;
* @author 科技小王子
* @since 2024-09-10 20:47:57
*/
-@Api(tags = "表单数据记录表管理")
+@Tag(name = "表单数据记录表管理")
@RestController
@RequestMapping("/api/cms/cms-form-record")
public class CmsFormRecordController extends BaseController {
@Resource
private CmsFormRecordService cmsFormRecordService;
- @ApiOperation("分页查询表单数据记录表")
+ @Operation(summary = "分页查询表单数据记录表")
@GetMapping("/page")
public ApiResult> page(CmsFormRecordParam param) {
// 使用关联查询
return success(cmsFormRecordService.pageRel(param));
}
- @ApiOperation("查询全部表单数据记录表")
+ @Operation(summary = "查询全部表单数据记录表")
@GetMapping()
public ApiResult> list(CmsFormRecordParam param) {
PageParam page = new PageParam<>(param);
@@ -50,7 +50,7 @@ public class CmsFormRecordController extends BaseController {
@PreAuthorize("hasAuthority('cms:cmsFormRecord:list')")
@OperationLog
- @ApiOperation("根据id查询表单数据记录表")
+ @Operation(summary = "根据id查询表单数据记录表")
@GetMapping("/{id}")
public ApiResult get(@PathVariable("id") Integer id) {
return success(cmsFormRecordService.getById(id));
@@ -58,7 +58,7 @@ public class CmsFormRecordController extends BaseController {
//return success(cmsFormRecordService.getByIdRel(id));
}
- @ApiOperation("添加表单数据记录表")
+ @Operation(summary = "添加表单数据记录表")
@PostMapping()
public ApiResult save(@RequestBody CmsFormRecord cmsFormRecord) {
// 记录当前登录用户id
@@ -72,7 +72,7 @@ public class CmsFormRecordController extends BaseController {
return fail("添加失败");
}
- @ApiOperation("修改表单数据记录表")
+ @Operation(summary = "修改表单数据记录表")
@PutMapping()
public ApiResult update(@RequestBody CmsFormRecord cmsFormRecord) {
if (cmsFormRecordService.updateById(cmsFormRecord)) {
@@ -81,7 +81,7 @@ public class CmsFormRecordController extends BaseController {
return fail("修改失败");
}
- @ApiOperation("删除表单数据记录表")
+ @Operation(summary = "删除表单数据记录表")
@DeleteMapping("/{id}")
public ApiResult remove(@PathVariable("id") Integer id) {
if (cmsFormRecordService.removeById(id)) {
@@ -90,7 +90,7 @@ public class CmsFormRecordController extends BaseController {
return fail("删除失败");
}
- @ApiOperation("批量添加表单数据记录表")
+ @Operation(summary = "批量添加表单数据记录表")
@PostMapping("/batch")
public ApiResult saveBatch(@RequestBody List list) {
if (cmsFormRecordService.saveBatch(list)) {
@@ -99,7 +99,7 @@ public class CmsFormRecordController extends BaseController {
return fail("添加失败");
}
- @ApiOperation("批量修改表单数据记录表")
+ @Operation(summary = "批量修改表单数据记录表")
@PutMapping("/batch")
public ApiResult removeBatch(@RequestBody BatchParam batchParam) {
if (batchParam.update(cmsFormRecordService, "form_record_id")) {
@@ -108,7 +108,7 @@ public class CmsFormRecordController extends BaseController {
return fail("修改失败");
}
- @ApiOperation("批量删除表单数据记录表")
+ @Operation(summary = "批量删除表单数据记录表")
@DeleteMapping("/batch")
public ApiResult removeBatch(@RequestBody List ids) {
if (cmsFormRecordService.removeByIds(ids)) {
diff --git a/src/main/java/com/gxwebsoft/cms/controller/CmsLinkController.java b/src/main/java/com/gxwebsoft/cms/controller/CmsLinkController.java
index 63dd3c7..7431470 100644
--- a/src/main/java/com/gxwebsoft/cms/controller/CmsLinkController.java
+++ b/src/main/java/com/gxwebsoft/cms/controller/CmsLinkController.java
@@ -10,8 +10,8 @@ import com.gxwebsoft.common.core.web.PageParam;
import com.gxwebsoft.common.core.web.BatchParam;
import com.gxwebsoft.common.core.annotation.OperationLog;
import com.gxwebsoft.common.system.entity.User;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -24,21 +24,21 @@ import java.util.List;
* @author 科技小王子
* @since 2024-09-10 20:47:57
*/
-@Api(tags = "常用链接管理")
+@Tag(name = "常用链接管理")
@RestController
@RequestMapping("/api/cms/cms-link")
public class CmsLinkController extends BaseController {
@Resource
private CmsLinkService cmsLinkService;
- @ApiOperation("分页查询常用链接")
+ @Operation(summary = "分页查询常用链接")
@GetMapping("/page")
public ApiResult> page(CmsLinkParam param) {
// 使用关联查询
return success(cmsLinkService.pageRel(param));
}
- @ApiOperation("查询全部常用链接")
+ @Operation(summary = "查询全部常用链接")
@GetMapping()
public ApiResult> list(CmsLinkParam param) {
PageParam page = new PageParam<>(param);
@@ -50,7 +50,7 @@ public class CmsLinkController extends BaseController {
@PreAuthorize("hasAuthority('cms:cmsLink:list')")
@OperationLog
- @ApiOperation("根据id查询常用链接")
+ @Operation(summary = "根据id查询常用链接")
@GetMapping("/{id}")
public ApiResult get(@PathVariable("id") Integer id) {
return success(cmsLinkService.getById(id));
@@ -58,7 +58,7 @@ public class CmsLinkController extends BaseController {
//return success(cmsLinkService.getByIdRel(id));
}
- @ApiOperation("添加常用链接")
+ @Operation(summary = "添加常用链接")
@PostMapping()
public ApiResult save(@RequestBody CmsLink cmsLink) {
// 记录当前登录用户id
@@ -72,7 +72,7 @@ public class CmsLinkController extends BaseController {
return fail("添加失败");
}
- @ApiOperation("修改常用链接")
+ @Operation(summary = "修改常用链接")
@PutMapping()
public ApiResult update(@RequestBody CmsLink cmsLink) {
if (cmsLinkService.updateById(cmsLink)) {
@@ -81,7 +81,7 @@ public class CmsLinkController extends BaseController {
return fail("修改失败");
}
- @ApiOperation("删除常用链接")
+ @Operation(summary = "删除常用链接")
@DeleteMapping("/{id}")
public ApiResult remove(@PathVariable("id") Integer id) {
if (cmsLinkService.removeById(id)) {
@@ -90,7 +90,7 @@ public class CmsLinkController extends BaseController {
return fail("删除失败");
}
- @ApiOperation("批量添加常用链接")
+ @Operation(summary = "批量添加常用链接")
@PostMapping("/batch")
public ApiResult saveBatch(@RequestBody List list) {
if (cmsLinkService.saveBatch(list)) {
@@ -99,7 +99,7 @@ public class CmsLinkController extends BaseController {
return fail("添加失败");
}
- @ApiOperation("批量修改常用链接")
+ @Operation(summary = "批量修改常用链接")
@PutMapping("/batch")
public ApiResult removeBatch(@RequestBody BatchParam batchParam) {
if (batchParam.update(cmsLinkService, "id")) {
@@ -108,7 +108,7 @@ public class CmsLinkController extends BaseController {
return fail("修改失败");
}
- @ApiOperation("批量删除常用链接")
+ @Operation(summary = "批量删除常用链接")
@DeleteMapping("/batch")
public ApiResult removeBatch(@RequestBody List ids) {
if (cmsLinkService.removeByIds(ids)) {
diff --git a/src/main/java/com/gxwebsoft/cms/controller/CmsMpAdController.java b/src/main/java/com/gxwebsoft/cms/controller/CmsMpAdController.java
index 910fa84..e95698f 100644
--- a/src/main/java/com/gxwebsoft/cms/controller/CmsMpAdController.java
+++ b/src/main/java/com/gxwebsoft/cms/controller/CmsMpAdController.java
@@ -10,8 +10,8 @@ import com.gxwebsoft.common.core.web.PageParam;
import com.gxwebsoft.common.core.web.BatchParam;
import com.gxwebsoft.common.core.annotation.OperationLog;
import com.gxwebsoft.common.system.entity.User;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -24,21 +24,21 @@ import java.util.List;
* @author 科技小王子
* @since 2024-09-10 20:47:57
*/
-@Api(tags = "小程序广告位管理")
+@Tag(name = "小程序广告位管理")
@RestController
@RequestMapping("/api/cms/cms-mp-ad")
public class CmsMpAdController extends BaseController {
@Resource
private CmsMpAdService cmsMpAdService;
- @ApiOperation("分页查询小程序广告位")
+ @Operation(summary = "分页查询小程序广告位")
@GetMapping("/page")
public ApiResult> page(CmsMpAdParam param) {
// 使用关联查询
return success(cmsMpAdService.pageRel(param));
}
- @ApiOperation("查询全部小程序广告位")
+ @Operation(summary = "查询全部小程序广告位")
@GetMapping()
public ApiResult> list(CmsMpAdParam param) {
PageParam page = new PageParam<>(param);
@@ -50,7 +50,7 @@ public class CmsMpAdController extends BaseController {
@PreAuthorize("hasAuthority('cms:cmsMpAd:list')")
@OperationLog
- @ApiOperation("根据id查询小程序广告位")
+ @Operation(summary = "根据id查询小程序广告位")
@GetMapping("/{id}")
public ApiResult get(@PathVariable("id") Integer id) {
return success(cmsMpAdService.getById(id));
@@ -58,7 +58,7 @@ public class CmsMpAdController extends BaseController {
//return success(cmsMpAdService.getByIdRel(id));
}
- @ApiOperation("添加小程序广告位")
+ @Operation(summary = "添加小程序广告位")
@PostMapping()
public ApiResult save(@RequestBody CmsMpAd cmsMpAd) {
// 记录当前登录用户id
@@ -72,7 +72,7 @@ public class CmsMpAdController extends BaseController {
return fail("添加失败");
}
- @ApiOperation("修改小程序广告位")
+ @Operation(summary = "修改小程序广告位")
@PutMapping()
public ApiResult update(@RequestBody CmsMpAd cmsMpAd) {
if (cmsMpAdService.updateById(cmsMpAd)) {
@@ -81,7 +81,7 @@ public class CmsMpAdController extends BaseController {
return fail("修改失败");
}
- @ApiOperation("删除小程序广告位")
+ @Operation(summary = "删除小程序广告位")
@DeleteMapping("/{id}")
public ApiResult remove(@PathVariable("id") Integer id) {
if (cmsMpAdService.removeById(id)) {
@@ -90,7 +90,7 @@ public class CmsMpAdController extends BaseController {
return fail("删除失败");
}
- @ApiOperation("批量添加小程序广告位")
+ @Operation(summary = "批量添加小程序广告位")
@PostMapping("/batch")
public ApiResult saveBatch(@RequestBody List list) {
if (cmsMpAdService.saveBatch(list)) {
@@ -99,7 +99,7 @@ public class CmsMpAdController extends BaseController {
return fail("添加失败");
}
- @ApiOperation("批量修改小程序广告位")
+ @Operation(summary = "批量修改小程序广告位")
@PutMapping("/batch")
public ApiResult removeBatch(@RequestBody BatchParam batchParam) {
if (batchParam.update(cmsMpAdService, "ad_id")) {
@@ -108,7 +108,7 @@ public class CmsMpAdController extends BaseController {
return fail("修改失败");
}
- @ApiOperation("批量删除小程序广告位")
+ @Operation(summary = "批量删除小程序广告位")
@DeleteMapping("/batch")
public ApiResult removeBatch(@RequestBody List ids) {
if (cmsMpAdService.removeByIds(ids)) {
diff --git a/src/main/java/com/gxwebsoft/cms/controller/CmsMpController.java b/src/main/java/com/gxwebsoft/cms/controller/CmsMpController.java
index b55229b..32486fc 100644
--- a/src/main/java/com/gxwebsoft/cms/controller/CmsMpController.java
+++ b/src/main/java/com/gxwebsoft/cms/controller/CmsMpController.java
@@ -10,8 +10,8 @@ import com.gxwebsoft.common.core.web.PageParam;
import com.gxwebsoft.common.core.web.BatchParam;
import com.gxwebsoft.common.core.annotation.OperationLog;
import com.gxwebsoft.common.system.entity.User;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -24,21 +24,21 @@ import java.util.List;
* @author 科技小王子
* @since 2024-09-10 20:47:57
*/
-@Api(tags = "小程序信息管理")
+@Tag(name = "小程序信息管理")
@RestController
@RequestMapping("/api/cms/cms-mp")
public class CmsMpController extends BaseController {
@Resource
private CmsMpService cmsMpService;
- @ApiOperation("分页查询小程序信息")
+ @Operation(summary = "分页查询小程序信息")
@GetMapping("/page")
public ApiResult> page(CmsMpParam param) {
// 使用关联查询
return success(cmsMpService.pageRel(param));
}
- @ApiOperation("查询全部小程序信息")
+ @Operation(summary = "查询全部小程序信息")
@GetMapping()
public ApiResult> list(CmsMpParam param) {
PageParam page = new PageParam<>(param);
@@ -50,7 +50,7 @@ public class CmsMpController extends BaseController {
@PreAuthorize("hasAuthority('cms:cmsMp:list')")
@OperationLog
- @ApiOperation("根据id查询小程序信息")
+ @Operation(summary = "根据id查询小程序信息")
@GetMapping("/{id}")
public ApiResult get(@PathVariable("id") Integer id) {
return success(cmsMpService.getById(id));
@@ -58,7 +58,7 @@ public class CmsMpController extends BaseController {
//return success(cmsMpService.getByIdRel(id));
}
- @ApiOperation("添加小程序信息")
+ @Operation(summary = "添加小程序信息")
@PostMapping()
public ApiResult save(@RequestBody CmsMp cmsMp) {
// 记录当前登录用户id
@@ -72,7 +72,7 @@ public class CmsMpController extends BaseController {
return fail("添加失败");
}
- @ApiOperation("修改小程序信息")
+ @Operation(summary = "修改小程序信息")
@PutMapping()
public ApiResult update(@RequestBody CmsMp cmsMp) {
if (cmsMpService.updateById(cmsMp)) {
@@ -81,7 +81,7 @@ public class CmsMpController extends BaseController {
return fail("修改失败");
}
- @ApiOperation("删除小程序信息")
+ @Operation(summary = "删除小程序信息")
@DeleteMapping("/{id}")
public ApiResult remove(@PathVariable("id") Integer id) {
if (cmsMpService.removeById(id)) {
@@ -90,7 +90,7 @@ public class CmsMpController extends BaseController {
return fail("删除失败");
}
- @ApiOperation("批量添加小程序信息")
+ @Operation(summary = "批量添加小程序信息")
@PostMapping("/batch")
public ApiResult saveBatch(@RequestBody List list) {
if (cmsMpService.saveBatch(list)) {
@@ -99,7 +99,7 @@ public class CmsMpController extends BaseController {
return fail("添加失败");
}
- @ApiOperation("批量修改小程序信息")
+ @Operation(summary = "批量修改小程序信息")
@PutMapping("/batch")
public ApiResult removeBatch(@RequestBody BatchParam batchParam) {
if (batchParam.update(cmsMpService, "mp_id")) {
@@ -108,7 +108,7 @@ public class CmsMpController extends BaseController {
return fail("修改失败");
}
- @ApiOperation("批量删除小程序信息")
+ @Operation(summary = "批量删除小程序信息")
@DeleteMapping("/batch")
public ApiResult removeBatch(@RequestBody List ids) {
if (cmsMpService.removeByIds(ids)) {
diff --git a/src/main/java/com/gxwebsoft/cms/controller/CmsMpFieldController.java b/src/main/java/com/gxwebsoft/cms/controller/CmsMpFieldController.java
index db09338..f1f255e 100644
--- a/src/main/java/com/gxwebsoft/cms/controller/CmsMpFieldController.java
+++ b/src/main/java/com/gxwebsoft/cms/controller/CmsMpFieldController.java
@@ -10,8 +10,8 @@ import com.gxwebsoft.common.core.web.PageParam;
import com.gxwebsoft.common.core.web.BatchParam;
import com.gxwebsoft.common.core.annotation.OperationLog;
import com.gxwebsoft.common.system.entity.User;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -24,21 +24,21 @@ import java.util.List;
* @author 科技小王子
* @since 2024-09-10 20:47:57
*/
-@Api(tags = "小程序配置管理")
+@Tag(name = "小程序配置管理")
@RestController
@RequestMapping("/api/cms/cms-mp-field")
public class CmsMpFieldController extends BaseController {
@Resource
private CmsMpFieldService cmsMpFieldService;
- @ApiOperation("分页查询小程序配置")
+ @Operation(summary = "分页查询小程序配置")
@GetMapping("/page")
public ApiResult> page(CmsMpFieldParam param) {
// 使用关联查询
return success(cmsMpFieldService.pageRel(param));
}
- @ApiOperation("查询全部小程序配置")
+ @Operation(summary = "查询全部小程序配置")
@GetMapping()
public ApiResult> list(CmsMpFieldParam param) {
PageParam page = new PageParam<>(param);
@@ -50,7 +50,7 @@ public class CmsMpFieldController extends BaseController {
@PreAuthorize("hasAuthority('cms:cmsMpField:list')")
@OperationLog
- @ApiOperation("根据id查询小程序配置")
+ @Operation(summary = "根据id查询小程序配置")
@GetMapping("/{id}")
public ApiResult get(@PathVariable("id") Integer id) {
return success(cmsMpFieldService.getById(id));
@@ -58,7 +58,7 @@ public class CmsMpFieldController extends BaseController {
//return success(cmsMpFieldService.getByIdRel(id));
}
- @ApiOperation("添加小程序配置")
+ @Operation(summary = "添加小程序配置")
@PostMapping()
public ApiResult save(@RequestBody CmsMpField cmsMpField) {
if (cmsMpFieldService.save(cmsMpField)) {
@@ -67,7 +67,7 @@ public class CmsMpFieldController extends BaseController {
return fail("添加失败");
}
- @ApiOperation("修改小程序配置")
+ @Operation(summary = "修改小程序配置")
@PutMapping()
public ApiResult update(@RequestBody CmsMpField cmsMpField) {
if (cmsMpFieldService.updateById(cmsMpField)) {
@@ -76,7 +76,7 @@ public class CmsMpFieldController extends BaseController {
return fail("修改失败");
}
- @ApiOperation("删除小程序配置")
+ @Operation(summary = "删除小程序配置")
@DeleteMapping("/{id}")
public ApiResult remove(@PathVariable("id") Integer id) {
if (cmsMpFieldService.removeById(id)) {
@@ -85,7 +85,7 @@ public class CmsMpFieldController extends BaseController {
return fail("删除失败");
}
- @ApiOperation("批量添加小程序配置")
+ @Operation(summary = "批量添加小程序配置")
@PostMapping("/batch")
public ApiResult saveBatch(@RequestBody List list) {
if (cmsMpFieldService.saveBatch(list)) {
@@ -94,7 +94,7 @@ public class CmsMpFieldController extends BaseController {
return fail("添加失败");
}
- @ApiOperation("批量修改小程序配置")
+ @Operation(summary = "批量修改小程序配置")
@PutMapping("/batch")
public ApiResult removeBatch(@RequestBody BatchParam batchParam) {
if (batchParam.update(cmsMpFieldService, "id")) {
@@ -103,7 +103,7 @@ public class CmsMpFieldController extends BaseController {
return fail("修改失败");
}
- @ApiOperation("批量删除小程序配置")
+ @Operation(summary = "批量删除小程序配置")
@DeleteMapping("/batch")
public ApiResult removeBatch(@RequestBody List ids) {
if (cmsMpFieldService.removeByIds(ids)) {
diff --git a/src/main/java/com/gxwebsoft/cms/controller/CmsMpMenuController.java b/src/main/java/com/gxwebsoft/cms/controller/CmsMpMenuController.java
index 3808582..f04c396 100644
--- a/src/main/java/com/gxwebsoft/cms/controller/CmsMpMenuController.java
+++ b/src/main/java/com/gxwebsoft/cms/controller/CmsMpMenuController.java
@@ -10,8 +10,8 @@ import com.gxwebsoft.common.core.web.PageParam;
import com.gxwebsoft.common.core.web.BatchParam;
import com.gxwebsoft.common.core.annotation.OperationLog;
import com.gxwebsoft.common.system.entity.User;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -24,21 +24,21 @@ import java.util.List;
* @author 科技小王子
* @since 2024-09-10 20:47:57
*/
-@Api(tags = "小程序端菜单管理")
+@Tag(name = "小程序端菜单管理")
@RestController
@RequestMapping("/api/cms/cms-mp-menu")
public class CmsMpMenuController extends BaseController {
@Resource
private CmsMpMenuService cmsMpMenuService;
- @ApiOperation("分页查询小程序端菜单")
+ @Operation(summary = "分页查询小程序端菜单")
@GetMapping("/page")
public ApiResult> page(CmsMpMenuParam param) {
// 使用关联查询
return success(cmsMpMenuService.pageRel(param));
}
- @ApiOperation("查询全部小程序端菜单")
+ @Operation(summary = "查询全部小程序端菜单")
@GetMapping()
public ApiResult> list(CmsMpMenuParam param) {
PageParam page = new PageParam<>(param);
@@ -50,7 +50,7 @@ public class CmsMpMenuController extends BaseController {
@PreAuthorize("hasAuthority('cms:cmsMpMenu:list')")
@OperationLog
- @ApiOperation("根据id查询小程序端菜单")
+ @Operation(summary = "根据id查询小程序端菜单")
@GetMapping("/{id}")
public ApiResult get(@PathVariable("id") Integer id) {
return success(cmsMpMenuService.getById(id));
@@ -58,7 +58,7 @@ public class CmsMpMenuController extends BaseController {
//return success(cmsMpMenuService.getByIdRel(id));
}
- @ApiOperation("添加小程序端菜单")
+ @Operation(summary = "添加小程序端菜单")
@PostMapping()
public ApiResult save(@RequestBody CmsMpMenu cmsMpMenu) {
// 记录当前登录用户id
@@ -72,7 +72,7 @@ public class CmsMpMenuController extends BaseController {
return fail("添加失败");
}
- @ApiOperation("修改小程序端菜单")
+ @Operation(summary = "修改小程序端菜单")
@PutMapping()
public ApiResult update(@RequestBody CmsMpMenu cmsMpMenu) {
if (cmsMpMenuService.updateById(cmsMpMenu)) {
@@ -81,7 +81,7 @@ public class CmsMpMenuController extends BaseController {
return fail("修改失败");
}
- @ApiOperation("删除小程序端菜单")
+ @Operation(summary = "删除小程序端菜单")
@DeleteMapping("/{id}")
public ApiResult remove(@PathVariable("id") Integer id) {
if (cmsMpMenuService.removeById(id)) {
@@ -90,7 +90,7 @@ public class CmsMpMenuController extends BaseController {
return fail("删除失败");
}
- @ApiOperation("批量添加小程序端菜单")
+ @Operation(summary = "批量添加小程序端菜单")
@PostMapping("/batch")
public ApiResult saveBatch(@RequestBody List list) {
if (cmsMpMenuService.saveBatch(list)) {
@@ -99,7 +99,7 @@ public class CmsMpMenuController extends BaseController {
return fail("添加失败");
}
- @ApiOperation("批量修改小程序端菜单")
+ @Operation(summary = "批量修改小程序端菜单")
@PutMapping("/batch")
public ApiResult removeBatch(@RequestBody BatchParam batchParam) {
if (batchParam.update(cmsMpMenuService, "menu_id")) {
@@ -108,7 +108,7 @@ public class CmsMpMenuController extends BaseController {
return fail("修改失败");
}
- @ApiOperation("批量删除小程序端菜单")
+ @Operation(summary = "批量删除小程序端菜单")
@DeleteMapping("/batch")
public ApiResult removeBatch(@RequestBody List ids) {
if (cmsMpMenuService.removeByIds(ids)) {
diff --git a/src/main/java/com/gxwebsoft/cms/controller/CmsNavigationController.java b/src/main/java/com/gxwebsoft/cms/controller/CmsNavigationController.java
index f7cfc3d..966cff3 100644
--- a/src/main/java/com/gxwebsoft/cms/controller/CmsNavigationController.java
+++ b/src/main/java/com/gxwebsoft/cms/controller/CmsNavigationController.java
@@ -18,8 +18,8 @@ import com.gxwebsoft.common.core.web.BatchParam;
import com.gxwebsoft.common.core.annotation.OperationLog;
import com.gxwebsoft.common.system.entity.User;
import com.gxwebsoft.common.system.service.UserService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -32,7 +32,7 @@ import java.util.List;
* @author 科技小王子
* @since 2024-09-10 20:47:57
*/
-@Api(tags = "网站导航记录表管理")
+@Tag(name = "网站导航记录表管理")
@RestController
@RequestMapping("/api/cms/cms-navigation")
public class CmsNavigationController extends BaseController {
@@ -43,28 +43,28 @@ public class CmsNavigationController extends BaseController {
@Resource
private UserService userService;
- @ApiOperation("分页查询网站导航记录表")
+ @Operation(summary = "分页查询网站导航记录表")
@GetMapping("/page")
public ApiResult> page(CmsNavigationParam param) {
// 使用关联查询
return success(cmsNavigationService.pageRel(param));
}
- @ApiOperation("查询全部网站导航记录表")
+ @Operation(summary = "查询全部网站导航记录表")
@GetMapping()
public ApiResult> list(CmsNavigationParam param) {
// 使用关联查询
return success(cmsNavigationService.listRel(param));
}
- @ApiOperation("根据id查询网站导航记录表")
+ @Operation(summary = "根据id查询网站导航记录表")
@GetMapping("/{id}")
public ApiResult get(@PathVariable("id") Integer id) {
// 使用关联查询
return success(cmsNavigationService.getByIdRel(id));
}
- @ApiOperation("添加网站导航记录表")
+ @Operation(summary = "添加网站导航记录表")
@PostMapping()
public ApiResult save(@RequestBody CmsNavigation cmsNavigation) {
// 记录当前登录用户id
@@ -81,7 +81,7 @@ public class CmsNavigationController extends BaseController {
return fail("添加失败");
}
- @ApiOperation("修改网站导航记录表")
+ @Operation(summary = "修改网站导航记录表")
@PutMapping()
public ApiResult update(@RequestBody CmsNavigation cmsNavigation) {
if (cmsNavigationService.updateById(cmsNavigation)) {
@@ -92,7 +92,7 @@ public class CmsNavigationController extends BaseController {
return fail("修改失败");
}
- @ApiOperation("删除网站导航记录表")
+ @Operation(summary = "删除网站导航记录表")
@DeleteMapping("/{id}")
public ApiResult remove(@PathVariable("id") Integer id) {
if (cmsNavigationService.removeById(id)) {
@@ -101,7 +101,7 @@ public class CmsNavigationController extends BaseController {
return fail("删除失败");
}
- @ApiOperation("批量添加网站导航记录表")
+ @Operation(summary = "批量添加网站导航记录表")
@PostMapping("/batch")
public ApiResult saveBatch(@RequestBody List list) {
if (cmsNavigationService.saveBatch(list)) {
@@ -110,7 +110,7 @@ public class CmsNavigationController extends BaseController {
return fail("添加失败");
}
- @ApiOperation("批量修改网站导航记录表")
+ @Operation(summary = "批量修改网站导航记录表")
@PutMapping("/batch")
public ApiResult removeBatch(@RequestBody BatchParam batchParam) {
if (batchParam.update(cmsNavigationService, "navigation_id")) {
@@ -119,7 +119,7 @@ public class CmsNavigationController extends BaseController {
return fail("修改失败");
}
- @ApiOperation("批量删除网站导航记录表")
+ @Operation(summary = "批量删除网站导航记录表")
@DeleteMapping("/batch")
public ApiResult removeBatch(@RequestBody List ids) {
if (cmsNavigationService.removeByIds(ids)) {
@@ -127,7 +127,7 @@ public class CmsNavigationController extends BaseController {
}
return fail("删除失败");
}
- @ApiOperation("获取树形结构的网站导航数据")
+ @Operation(summary = "获取树形结构的网站导航数据")
@GetMapping("/tree")
public ApiResult> tree(CmsNavigationParam param) {
param.setHide(0);
@@ -135,7 +135,7 @@ public class CmsNavigationController extends BaseController {
return success(CommonUtil.toTreeData(navigations, 0, CmsNavigation::getParentId, CmsNavigation::getNavigationId, CmsNavigation::setChildren));
}
- @ApiOperation("根据path获取导航")
+ @Operation(summary = "根据path获取导航")
@GetMapping("/getNavigationByPath")
public ApiResult getNavigationByPath(CmsNavigationParam param) {
final CmsNavigation one = cmsNavigationService.getOne(new LambdaUpdateWrapper().eq(CmsNavigation::getPath, param.getPath()).last("limit 1"));
@@ -161,7 +161,7 @@ public class CmsNavigationController extends BaseController {
return success(navigation);
}
- @ApiOperation("密码校验")
+ @Operation(summary = "密码校验")
@GetMapping("/checkNavigationPassword")
public ApiResult checkNavigationPassword(CmsNavigationParam param) {
if (!userService.comparePassword(param.getPassword(), param.getPassword2())) {
diff --git a/src/main/java/com/gxwebsoft/cms/controller/CmsProductController.java b/src/main/java/com/gxwebsoft/cms/controller/CmsProductController.java
index b0b7499..f355b41 100644
--- a/src/main/java/com/gxwebsoft/cms/controller/CmsProductController.java
+++ b/src/main/java/com/gxwebsoft/cms/controller/CmsProductController.java
@@ -11,8 +11,8 @@ import com.gxwebsoft.common.core.web.PageResult;
import com.gxwebsoft.common.core.web.BatchParam;
import com.gxwebsoft.common.core.annotation.OperationLog;
import com.gxwebsoft.common.system.entity.User;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -27,28 +27,28 @@ import java.util.Map;
* @author 科技小王子
* @since 2024-09-27 16:03:44
*/
-@Api(tags = "产品管理")
+@Tag(name = "产品管理")
@RestController
@RequestMapping("/api/cms/cms-product")
public class CmsProductController extends BaseController {
@Resource
private CmsProductService cmsProductService;
- @ApiOperation("分页查询产品")
+ @Operation(summary = "分页查询产品")
@GetMapping("/page")
public ApiResult> page(CmsProductParam param) {
// 使用关联查询
return success(cmsProductService.pageRel(param));
}
- @ApiOperation("查询全部产品")
+ @Operation(summary = "查询全部产品")
@GetMapping()
public ApiResult> list(CmsProductParam param) {
// 使用关联查询
return success(cmsProductService.listRel(param));
}
- @ApiOperation("根据id查询产品")
+ @Operation(summary = "根据id查询产品")
@GetMapping("/{id}")
public ApiResult get(@PathVariable("id") Integer id) {
// 使用关联查询
@@ -56,7 +56,7 @@ public class CmsProductController extends BaseController {
}
@PreAuthorize("hasAuthority('cms:cmsProduct:save')")
@OperationLog
- @ApiOperation("添加产品")
+ @Operation(summary = "添加产品")
@PostMapping()
public ApiResult save(@RequestBody CmsProduct cmsProduct) {
// 记录当前登录用户id
@@ -71,7 +71,7 @@ public class CmsProductController extends BaseController {
}
@PreAuthorize("hasAuthority('cms:cmsProduct:update')")
@OperationLog
- @ApiOperation("修改产品")
+ @Operation(summary = "修改产品")
@PutMapping()
public ApiResult update(@RequestBody CmsProduct cmsProduct) {
if (cmsProductService.updateById(cmsProduct)) {
@@ -81,7 +81,7 @@ public class CmsProductController extends BaseController {
}
@PreAuthorize("hasAuthority('cms:cmsProduct:remove')")
@OperationLog
- @ApiOperation("删除产品")
+ @Operation(summary = "删除产品")
@DeleteMapping("/{id}")
public ApiResult remove(@PathVariable("id") Integer id) {
if (cmsProductService.removeById(id)) {
@@ -91,7 +91,7 @@ public class CmsProductController extends BaseController {
}
@PreAuthorize("hasAuthority('cms:cmsProduct:save')")
@OperationLog
- @ApiOperation("批量添加产品")
+ @Operation(summary = "批量添加产品")
@PostMapping("/batch")
public ApiResult saveBatch(@RequestBody List list) {
if (cmsProductService.saveBatch(list)) {
@@ -101,7 +101,7 @@ public class CmsProductController extends BaseController {
}
@PreAuthorize("hasAuthority('cms:cmsProduct:update')")
@OperationLog
- @ApiOperation("批量修改产品")
+ @Operation(summary = "批量修改产品")
@PutMapping("/batch")
public ApiResult removeBatch(@RequestBody BatchParam batchParam) {
if (batchParam.update(cmsProductService, "product_id")) {
@@ -111,7 +111,7 @@ public class CmsProductController extends BaseController {
}
@PreAuthorize("hasAuthority('cms:cmsProduct:remove')")
@OperationLog
- @ApiOperation("批量删除产品")
+ @Operation(summary = "批量删除产品")
@DeleteMapping("/batch")
public ApiResult removeBatch(@RequestBody List ids) {
if (cmsProductService.removeByIds(ids)) {
@@ -120,7 +120,7 @@ public class CmsProductController extends BaseController {
return fail("删除失败");
}
- @ApiOperation("统计信息")
+ @Operation(summary = "统计信息")
@GetMapping("/data")
public ApiResult> data(CmsProductSpecParam param) {
Map data = new HashMap<>();
diff --git a/src/main/java/com/gxwebsoft/cms/controller/CmsProductSpecController.java b/src/main/java/com/gxwebsoft/cms/controller/CmsProductSpecController.java
index 6cb8ab7..9280417 100644
--- a/src/main/java/com/gxwebsoft/cms/controller/CmsProductSpecController.java
+++ b/src/main/java/com/gxwebsoft/cms/controller/CmsProductSpecController.java
@@ -10,8 +10,8 @@ import com.gxwebsoft.common.core.web.PageParam;
import com.gxwebsoft.common.core.web.BatchParam;
import com.gxwebsoft.common.core.annotation.OperationLog;
import com.gxwebsoft.common.system.entity.User;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -24,21 +24,21 @@ import java.util.List;
* @author 科技小王子
* @since 2024-09-27 16:03:44
*/
-@Api(tags = "规格管理")
+@Tag(name = "规格管理")
@RestController
@RequestMapping("/api/cms/cms-product-spec")
public class CmsProductSpecController extends BaseController {
@Resource
private CmsProductSpecService cmsProductSpecService;
- @ApiOperation("分页查询规格")
+ @Operation(summary = "分页查询规格")
@GetMapping("/page")
public ApiResult> page(CmsProductSpecParam param) {
// 使用关联查询
return success(cmsProductSpecService.pageRel(param));
}
- @ApiOperation("查询全部规格")
+ @Operation(summary = "查询全部规格")
@GetMapping()
public ApiResult> list(CmsProductSpecParam param) {
// 使用关联查询
@@ -47,14 +47,14 @@ public class CmsProductSpecController extends BaseController {
@PreAuthorize("hasAuthority('cms:cmsProductSpec:list')")
@OperationLog
- @ApiOperation("根据id查询规格")
+ @Operation(summary = "根据id查询规格")
@GetMapping("/{id}")
public ApiResult get(@PathVariable("id") Integer id) {
// 使用关联查询
return success(cmsProductSpecService.getByIdRel(id));
}
- @ApiOperation("添加规格")
+ @Operation(summary = "添加规格")
@PostMapping()
public ApiResult save(@RequestBody CmsProductSpec cmsProductSpec) {
// 记录当前登录用户id
@@ -68,7 +68,7 @@ public class CmsProductSpecController extends BaseController {
return fail("添加失败");
}
- @ApiOperation("修改规格")
+ @Operation(summary = "修改规格")
@PutMapping()
public ApiResult update(@RequestBody CmsProductSpec cmsProductSpec) {
if (cmsProductSpecService.updateById(cmsProductSpec)) {
@@ -77,7 +77,7 @@ public class CmsProductSpecController extends BaseController {
return fail("修改失败");
}
- @ApiOperation("删除规格")
+ @Operation(summary = "删除规格")
@DeleteMapping("/{id}")
public ApiResult remove(@PathVariable("id") Integer id) {
if (cmsProductSpecService.removeById(id)) {
@@ -86,7 +86,7 @@ public class CmsProductSpecController extends BaseController {
return fail("删除失败");
}
- @ApiOperation("批量添加规格")
+ @Operation(summary = "批量添加规格")
@PostMapping("/batch")
public ApiResult saveBatch(@RequestBody List list) {
if (cmsProductSpecService.saveBatch(list)) {
@@ -95,7 +95,7 @@ public class CmsProductSpecController extends BaseController {
return fail("添加失败");
}
- @ApiOperation("批量修改规格")
+ @Operation(summary = "批量修改规格")
@PutMapping("/batch")
public ApiResult removeBatch(@RequestBody BatchParam batchParam) {
if (batchParam.update(cmsProductSpecService, "spec_id")) {
@@ -104,7 +104,7 @@ public class CmsProductSpecController extends BaseController {
return fail("修改失败");
}
- @ApiOperation("批量删除规格")
+ @Operation(summary = "批量删除规格")
@DeleteMapping("/batch")
public ApiResult removeBatch(@RequestBody List ids) {
if (cmsProductSpecService.removeByIds(ids)) {
diff --git a/src/main/java/com/gxwebsoft/cms/controller/CmsProductSpecValueController.java b/src/main/java/com/gxwebsoft/cms/controller/CmsProductSpecValueController.java
index a9e81d2..40cd7c0 100644
--- a/src/main/java/com/gxwebsoft/cms/controller/CmsProductSpecValueController.java
+++ b/src/main/java/com/gxwebsoft/cms/controller/CmsProductSpecValueController.java
@@ -10,8 +10,8 @@ import com.gxwebsoft.common.core.web.PageParam;
import com.gxwebsoft.common.core.web.BatchParam;
import com.gxwebsoft.common.core.annotation.OperationLog;
import com.gxwebsoft.common.system.entity.User;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -24,21 +24,21 @@ import java.util.List;
* @author 科技小王子
* @since 2024-09-27 16:03:44
*/
-@Api(tags = "规格值管理")
+@Tag(name = "规格值管理")
@RestController
@RequestMapping("/api/cms/cms-product-spec-value")
public class CmsProductSpecValueController extends BaseController {
@Resource
private CmsProductSpecValueService cmsProductSpecValueService;
- @ApiOperation("分页查询规格值")
+ @Operation(summary = "分页查询规格值")
@GetMapping("/page")
public ApiResult> page(CmsProductSpecValueParam param) {
// 使用关联查询
return success(cmsProductSpecValueService.pageRel(param));
}
- @ApiOperation("查询全部规格值")
+ @Operation(summary = "查询全部规格值")
@GetMapping()
public ApiResult> list(CmsProductSpecValueParam param) {
// 使用关联查询
@@ -47,14 +47,14 @@ public class CmsProductSpecValueController extends BaseController {
@PreAuthorize("hasAuthority('cms:cmsProductSpecValue:list')")
@OperationLog
- @ApiOperation("根据id查询规格值")
+ @Operation(summary = "根据id查询规格值")
@GetMapping("/{id}")
public ApiResult get(@PathVariable("id") Integer id) {
// 使用关联查询
return success(cmsProductSpecValueService.getByIdRel(id));
}
- @ApiOperation("添加规格值")
+ @Operation(summary = "添加规格值")
@PostMapping()
public ApiResult save(@RequestBody CmsProductSpecValue cmsProductSpecValue) {
if (cmsProductSpecValueService.save(cmsProductSpecValue)) {
@@ -63,7 +63,7 @@ public class CmsProductSpecValueController extends BaseController {
return fail("添加失败");
}
- @ApiOperation("修改规格值")
+ @Operation(summary = "修改规格值")
@PutMapping()
public ApiResult update(@RequestBody CmsProductSpecValue cmsProductSpecValue) {
if (cmsProductSpecValueService.updateById(cmsProductSpecValue)) {
@@ -72,7 +72,7 @@ public class CmsProductSpecValueController extends BaseController {
return fail("修改失败");
}
- @ApiOperation("删除规格值")
+ @Operation(summary = "删除规格值")
@DeleteMapping("/{id}")
public ApiResult remove(@PathVariable("id") Integer id) {
if (cmsProductSpecValueService.removeById(id)) {
@@ -81,7 +81,7 @@ public class CmsProductSpecValueController extends BaseController {
return fail("删除失败");
}
- @ApiOperation("批量添加规格值")
+ @Operation(summary = "批量添加规格值")
@PostMapping("/batch")
public ApiResult saveBatch(@RequestBody List list) {
if (cmsProductSpecValueService.saveBatch(list)) {
@@ -90,7 +90,7 @@ public class CmsProductSpecValueController extends BaseController {
return fail("添加失败");
}
- @ApiOperation("批量修改规格值")
+ @Operation(summary = "批量修改规格值")
@PutMapping("/batch")
public ApiResult removeBatch(@RequestBody BatchParam batchParam) {
if (batchParam.update(cmsProductSpecValueService, "spec_value_id")) {
@@ -99,7 +99,7 @@ public class CmsProductSpecValueController extends BaseController {
return fail("修改失败");
}
- @ApiOperation("批量删除规格值")
+ @Operation(summary = "批量删除规格值")
@DeleteMapping("/batch")
public ApiResult removeBatch(@RequestBody List ids) {
if (cmsProductSpecValueService.removeByIds(ids)) {
diff --git a/src/main/java/com/gxwebsoft/cms/controller/CmsProductUrlController.java b/src/main/java/com/gxwebsoft/cms/controller/CmsProductUrlController.java
index e061891..43d3156 100644
--- a/src/main/java/com/gxwebsoft/cms/controller/CmsProductUrlController.java
+++ b/src/main/java/com/gxwebsoft/cms/controller/CmsProductUrlController.java
@@ -10,8 +10,8 @@ import com.gxwebsoft.common.core.web.PageParam;
import com.gxwebsoft.common.core.web.BatchParam;
import com.gxwebsoft.common.core.annotation.OperationLog;
import com.gxwebsoft.common.system.entity.User;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -24,21 +24,21 @@ import java.util.List;
* @author 科技小王子
* @since 2024-09-27 16:03:44
*/
-@Api(tags = "域名管理")
+@Tag(name = "域名管理")
@RestController
@RequestMapping("/api/cms/cms-product-url")
public class CmsProductUrlController extends BaseController {
@Resource
private CmsProductUrlService cmsProductUrlService;
- @ApiOperation("分页查询域名")
+ @Operation(summary = "分页查询域名")
@GetMapping("/page")
public ApiResult> page(CmsProductUrlParam param) {
// 使用关联查询
return success(cmsProductUrlService.pageRel(param));
}
- @ApiOperation("查询全部域名")
+ @Operation(summary = "查询全部域名")
@GetMapping()
public ApiResult> list(CmsProductUrlParam param) {
// 使用关联查询
@@ -47,14 +47,14 @@ public class CmsProductUrlController extends BaseController {
@PreAuthorize("hasAuthority('cms:cmsProductUrl:list')")
@OperationLog
- @ApiOperation("根据id查询域名")
+ @Operation(summary = "根据id查询域名")
@GetMapping("/{id}")
public ApiResult get(@PathVariable("id") Integer id) {
// 使用关联查询
return success(cmsProductUrlService.getByIdRel(id));
}
- @ApiOperation("添加域名")
+ @Operation(summary = "添加域名")
@PostMapping()
public ApiResult save(@RequestBody CmsProductUrl cmsProductUrl) {
if (cmsProductUrlService.save(cmsProductUrl)) {
@@ -63,7 +63,7 @@ public class CmsProductUrlController extends BaseController {
return fail("添加失败");
}
- @ApiOperation("修改域名")
+ @Operation(summary = "修改域名")
@PutMapping()
public ApiResult update(@RequestBody CmsProductUrl cmsProductUrl) {
if (cmsProductUrlService.updateById(cmsProductUrl)) {
@@ -72,7 +72,7 @@ public class CmsProductUrlController extends BaseController {
return fail("修改失败");
}
- @ApiOperation("删除域名")
+ @Operation(summary = "删除域名")
@DeleteMapping("/{id}")
public ApiResult remove(@PathVariable("id") Integer id) {
if (cmsProductUrlService.removeById(id)) {
@@ -81,7 +81,7 @@ public class CmsProductUrlController extends BaseController {
return fail("删除失败");
}
- @ApiOperation("批量添加域名")
+ @Operation(summary = "批量添加域名")
@PostMapping("/batch")
public ApiResult saveBatch(@RequestBody List list) {
if (cmsProductUrlService.saveBatch(list)) {
@@ -90,7 +90,7 @@ public class CmsProductUrlController extends BaseController {
return fail("添加失败");
}
- @ApiOperation("批量修改域名")
+ @Operation(summary = "批量修改域名")
@PutMapping("/batch")
public ApiResult removeBatch(@RequestBody BatchParam batchParam) {
if (batchParam.update(cmsProductUrlService, "id")) {
@@ -99,7 +99,7 @@ public class CmsProductUrlController extends BaseController {
return fail("修改失败");
}
- @ApiOperation("批量删除域名")
+ @Operation(summary = "批量删除域名")
@DeleteMapping("/batch")
public ApiResult removeBatch(@RequestBody List ids) {
if (cmsProductUrlService.removeByIds(ids)) {
diff --git a/src/main/java/com/gxwebsoft/cms/controller/CmsWebsiteController.java b/src/main/java/com/gxwebsoft/cms/controller/CmsWebsiteController.java
index 5c4c250..597e849 100644
--- a/src/main/java/com/gxwebsoft/cms/controller/CmsWebsiteController.java
+++ b/src/main/java/com/gxwebsoft/cms/controller/CmsWebsiteController.java
@@ -29,8 +29,8 @@ import com.gxwebsoft.common.core.annotation.OperationLog;
import com.gxwebsoft.common.system.entity.Company;
import com.gxwebsoft.common.system.entity.User;
import com.gxwebsoft.common.system.service.CompanyService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.util.CollectionUtils;
@@ -51,7 +51,7 @@ import static com.gxwebsoft.common.core.constants.WebsiteConstants.CACHE_KEY_ROO
* @since 2024-09-10 20:36:14
*/
@Slf4j
-@Api(tags = "网站信息记录表管理")
+@Tag(name = "网站信息记录表管理")
@RestController
@RequestMapping("/api/cms/cms-website")
public class CmsWebsiteController extends BaseController {
@@ -68,14 +68,14 @@ public class CmsWebsiteController extends BaseController {
@Resource
private CmsDomainService domainService;
- @ApiOperation("分页查询网站信息记录表")
+ @Operation(summary = "分页查询网站信息记录表")
@GetMapping("/page")
public ApiResult> page(CmsWebsiteParam param) {
// 使用关联查询
return success(cmsWebsiteService.pageRel(param));
}
- @ApiOperation("查询全部网站信息记录表")
+ @Operation(summary = "查询全部网站信息记录表")
@GetMapping()
public ApiResult> list(CmsWebsiteParam param) {
PageParam page = new PageParam<>(param);
@@ -87,7 +87,7 @@ public class CmsWebsiteController extends BaseController {
@PreAuthorize("hasAuthority('cms:website:list')")
@OperationLog
- @ApiOperation("根据id查询网站信息记录表")
+ @Operation(summary = "根据id查询网站信息记录表")
@GetMapping("/{id}")
public ApiResult get(@PathVariable("id") Integer id) {
return success(cmsWebsiteService.getById(id));
@@ -96,7 +96,7 @@ public class CmsWebsiteController extends BaseController {
}
@PreAuthorize("hasAuthority('cms:website:save')")
- @ApiOperation("添加网站信息记录表")
+ @Operation(summary = "添加网站信息记录表")
@PostMapping()
public ApiResult save(@RequestBody CmsWebsite cmsWebsite) {
// 记录当前登录用户id
@@ -111,7 +111,7 @@ public class CmsWebsiteController extends BaseController {
}
@PreAuthorize("hasAuthority('cms:website:update')")
- @ApiOperation("修改网站信息记录表")
+ @Operation(summary = "修改网站信息记录表")
@PutMapping()
public ApiResult update(@RequestBody CmsWebsite cmsWebsite) {
if (cmsWebsiteService.updateById(cmsWebsite)) {
@@ -121,7 +121,7 @@ public class CmsWebsiteController extends BaseController {
}
@PreAuthorize("hasAuthority('cms:website:remove')")
- @ApiOperation("删除网站信息记录表")
+ @Operation(summary = "删除网站信息记录表")
@DeleteMapping("/{id}")
public ApiResult remove(@PathVariable("id") Integer id) {
if (cmsWebsiteService.removeById(id)) {
@@ -131,7 +131,7 @@ public class CmsWebsiteController extends BaseController {
}
@PreAuthorize("hasAuthority('cms:website:save')")
- @ApiOperation("批量添加网站信息记录表")
+ @Operation(summary = "批量添加网站信息记录表")
@PostMapping("/batch")
public ApiResult saveBatch(@RequestBody List list) {
if (cmsWebsiteService.saveBatch(list)) {
@@ -141,7 +141,7 @@ public class CmsWebsiteController extends BaseController {
}
@PreAuthorize("hasAuthority('cms:website:update')")
- @ApiOperation("批量修改网站信息记录表")
+ @Operation(summary = "批量修改网站信息记录表")
@PutMapping("/batch")
public ApiResult removeBatch(@RequestBody BatchParam batchParam) {
if (batchParam.update(cmsWebsiteService, "website_id")) {
@@ -151,7 +151,7 @@ public class CmsWebsiteController extends BaseController {
}
@PreAuthorize("hasAuthority('cms:website:remove')")
- @ApiOperation("批量删除网站信息记录表")
+ @Operation(summary = "批量删除网站信息记录表")
@DeleteMapping("/batch")
public ApiResult removeBatch(@RequestBody List ids) {
if (cmsWebsiteService.removeByIds(ids)) {
@@ -160,7 +160,7 @@ public class CmsWebsiteController extends BaseController {
return fail("删除失败");
}
- @ApiOperation("网站基本信息")
+ @Operation(summary = "网站基本信息")
@GetMapping("/getSiteInfo")
public ApiResult getSiteInfo(HttpServletRequest request) {
String key = CACHE_KEY_ROOT_SITE_INFO.concat(getTenantId().toString());
@@ -262,7 +262,7 @@ public class CmsWebsiteController extends BaseController {
}
@PreAuthorize("hasAuthority('cms:website:remove')")
- @ApiOperation("清除缓存")
+ @Operation(summary = "清除缓存")
@DeleteMapping("/clearSiteInfo/{key}")
public ApiResult clearSiteInfo(@PathVariable("key") String key) {
final String siteInfo = redisUtil.get(key);
diff --git a/src/main/java/com/gxwebsoft/cms/controller/CmsWebsiteFieldController.java b/src/main/java/com/gxwebsoft/cms/controller/CmsWebsiteFieldController.java
index 7345bb2..9d62b4f 100644
--- a/src/main/java/com/gxwebsoft/cms/controller/CmsWebsiteFieldController.java
+++ b/src/main/java/com/gxwebsoft/cms/controller/CmsWebsiteFieldController.java
@@ -13,8 +13,8 @@ import com.gxwebsoft.common.core.annotation.OperationLog;
import com.gxwebsoft.common.system.entity.User;
import com.gxwebsoft.common.system.entity.WebsiteField;
import com.gxwebsoft.common.system.param.WebsiteFieldParam;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -28,35 +28,35 @@ import java.util.List;
* @author 科技小王子
* @since 2024-09-10 20:36:14
*/
-@Api(tags = "应用参数管理")
+@Tag(name = "应用参数管理")
@RestController
@RequestMapping("/api/cms/cms-website-field")
public class CmsWebsiteFieldController extends BaseController {
@Resource
private CmsWebsiteFieldService cmsWebsiteFieldService;
- @ApiOperation("分页查询应用参数")
+ @Operation(summary = "分页查询应用参数")
@GetMapping("/page")
public ApiResult> page(CmsWebsiteFieldParam param) {
// 使用关联查询
return success(cmsWebsiteFieldService.pageRel(param));
}
- @ApiOperation("查询全部应用参数")
+ @Operation(summary = "查询全部应用参数")
@GetMapping()
public ApiResult> list(CmsWebsiteFieldParam param) {
// 使用关联查询
return success(cmsWebsiteFieldService.listRel(param));
}
- @ApiOperation("根据id查询应用参数")
+ @Operation(summary = "根据id查询应用参数")
@GetMapping("/{id}")
public ApiResult get(@PathVariable("id") Integer id) {
// 使用关联查询
return success(cmsWebsiteFieldService.getByIdRel(id));
}
- @ApiOperation("添加应用参数")
+ @Operation(summary = "添加应用参数")
@PostMapping()
public ApiResult save(@RequestBody CmsWebsiteField cmsWebsiteField) {
if (cmsWebsiteFieldService.save(cmsWebsiteField)) {
@@ -65,7 +65,7 @@ public class CmsWebsiteFieldController extends BaseController {
return fail("添加失败");
}
- @ApiOperation("修改应用参数")
+ @Operation(summary = "修改应用参数")
@PutMapping()
public ApiResult update(@RequestBody CmsWebsiteField cmsWebsiteField) {
if (cmsWebsiteFieldService.updateById(cmsWebsiteField)) {
@@ -74,7 +74,7 @@ public class CmsWebsiteFieldController extends BaseController {
return fail("修改失败");
}
- @ApiOperation("删除应用参数")
+ @Operation(summary = "删除应用参数")
@DeleteMapping("/{id}")
public ApiResult remove(@PathVariable("id") Integer id) {
if (cmsWebsiteFieldService.removeById(id)) {
@@ -83,7 +83,7 @@ public class CmsWebsiteFieldController extends BaseController {
return fail("删除失败");
}
- @ApiOperation("批量添加应用参数")
+ @Operation(summary = "批量添加应用参数")
@PostMapping("/batch")
public ApiResult saveBatch(@RequestBody List list) {
if (cmsWebsiteFieldService.saveBatch(list)) {
@@ -92,7 +92,7 @@ public class CmsWebsiteFieldController extends BaseController {
return fail("添加失败");
}
- @ApiOperation("批量修改应用参数")
+ @Operation(summary = "批量修改应用参数")
@PutMapping("/batch")
public ApiResult removeBatch(@RequestBody BatchParam batchParam) {
if (batchParam.update(cmsWebsiteFieldService, "id")) {
@@ -101,7 +101,7 @@ public class CmsWebsiteFieldController extends BaseController {
return fail("修改失败");
}
- @ApiOperation("批量删除应用参数")
+ @Operation(summary = "批量删除应用参数")
@DeleteMapping("/batch")
public ApiResult removeBatch(@RequestBody List ids) {
if (cmsWebsiteFieldService.removeByIds(ids)) {
@@ -110,7 +110,7 @@ public class CmsWebsiteFieldController extends BaseController {
return fail("删除失败");
}
- @ApiOperation("获取网站配置参数-对象形式")
+ @Operation(summary = "获取网站配置参数-对象形式")
@GetMapping("/config")
public ApiResult getConfig(CmsWebsiteFieldParam param) {
// 使用关联查询
diff --git a/src/main/java/com/gxwebsoft/cms/entity/CmsAd.java b/src/main/java/com/gxwebsoft/cms/entity/CmsAd.java
index 5f76dd2..162bf4a 100644
--- a/src/main/java/com/gxwebsoft/cms/entity/CmsAd.java
+++ b/src/main/java/com/gxwebsoft/cms/entity/CmsAd.java
@@ -5,8 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableLogic;
import java.io.Serializable;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -18,61 +18,61 @@ import lombok.EqualsAndHashCode;
*/
@Data
@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "CmsAd对象", description = "广告位")
+@Schema(name = "CmsAd对象", description = "广告位")
public class CmsAd implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "ID")
+ @Schema(description = "ID")
@TableId(value = "ad_id", type = IdType.AUTO)
private Integer adId;
- @ApiModelProperty(value = "页面ID")
+ @Schema(description = "页面ID")
private Integer designId;
- @ApiModelProperty(value = "广告类型")
+ @Schema(description = "广告类型")
private String adType;
- @ApiModelProperty(value = "广告位名称")
+ @Schema(description = "广告位名称")
private String name;
- @ApiModelProperty(value = "宽")
+ @Schema(description = "宽")
private String width;
- @ApiModelProperty(value = "高")
+ @Schema(description = "高")
private String height;
- @ApiModelProperty(value = "广告图片")
+ @Schema(description = "广告图片")
private String images;
- @ApiModelProperty(value = "路由/链接地址")
+ @Schema(description = "路由/链接地址")
private String path;
- @ApiModelProperty(value = "用户ID")
+ @Schema(description = "用户ID")
private Integer userId;
- @ApiModelProperty(value = "页面ID")
+ @Schema(description = "页面ID")
private Integer pageId;
- @ApiModelProperty(value = "页面名称")
+ @Schema(description = "页面名称")
private String pageName;
- @ApiModelProperty(value = "排序(数字越小越靠前)")
+ @Schema(description = "排序(数字越小越靠前)")
private Integer sortNumber;
- @ApiModelProperty(value = "备注")
+ @Schema(description = "备注")
private String comments;
- @ApiModelProperty(value = "状态, 0正常, 1冻结")
+ @Schema(description = "状态, 0正常, 1冻结")
private Integer status;
- @ApiModelProperty(value = "是否删除, 0否, 1是")
+ @Schema(description = "是否删除, 0否, 1是")
@TableLogic
private Integer deleted;
- @ApiModelProperty(value = "租户id")
+ @Schema(description = "租户id")
private Integer tenantId;
- @ApiModelProperty(value = "创建时间")
+ @Schema(description = "创建时间")
private Date createTime;
}
diff --git a/src/main/java/com/gxwebsoft/cms/entity/CmsAdRecord.java b/src/main/java/com/gxwebsoft/cms/entity/CmsAdRecord.java
index 91962ff..31a541a 100644
--- a/src/main/java/com/gxwebsoft/cms/entity/CmsAdRecord.java
+++ b/src/main/java/com/gxwebsoft/cms/entity/CmsAdRecord.java
@@ -6,8 +6,8 @@ import java.util.Date;
import java.io.Serializable;
import java.util.Date;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -19,39 +19,39 @@ import lombok.EqualsAndHashCode;
*/
@Data
@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "CmsAdRecord对象", description = "广告图片")
+@Schema(name = "CmsAdRecord对象", description = "广告图片")
public class CmsAdRecord implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "ID")
+ @Schema(description = "ID")
@TableId(value = "ad_record_id", type = IdType.AUTO)
private Integer adRecordId;
- @ApiModelProperty(value = "广告标题")
+ @Schema(description = "广告标题")
private String title;
- @ApiModelProperty(value = "图片地址")
+ @Schema(description = "图片地址")
private String path;
- @ApiModelProperty(value = "链接地址")
+ @Schema(description = "链接地址")
private String url;
- @ApiModelProperty(value = "广告位ID")
+ @Schema(description = "广告位ID")
private Integer adId;
- @ApiModelProperty(value = "排序(数字越小越靠前)")
+ @Schema(description = "排序(数字越小越靠前)")
private Integer sortNumber;
- @ApiModelProperty(value = "备注")
+ @Schema(description = "备注")
private String comments;
- @ApiModelProperty(value = "状态, 0正常, 1冻结")
+ @Schema(description = "状态, 0正常, 1冻结")
private Integer status;
- @ApiModelProperty(value = "租户id")
+ @Schema(description = "租户id")
private Integer tenantId;
- @ApiModelProperty(value = "创建时间")
+ @Schema(description = "创建时间")
private Date createTime;
}
diff --git a/src/main/java/com/gxwebsoft/cms/entity/CmsArticle.java b/src/main/java/com/gxwebsoft/cms/entity/CmsArticle.java
index a99414a..348400a 100644
--- a/src/main/java/com/gxwebsoft/cms/entity/CmsArticle.java
+++ b/src/main/java/com/gxwebsoft/cms/entity/CmsArticle.java
@@ -8,8 +8,8 @@ import com.baomidou.mybatisplus.annotation.TableLogic;
import java.io.Serializable;
import java.util.Date;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -21,151 +21,151 @@ import lombok.EqualsAndHashCode;
*/
@Data
@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "CmsArticle对象", description = "文章")
+@Schema(name = "CmsArticle对象", description = "文章")
public class CmsArticle implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "文章ID")
+ @Schema(description = "文章ID")
@TableId(value = "article_id", type = IdType.AUTO)
private Integer articleId;
- @ApiModelProperty(value = "文章标题")
+ @Schema(description = "文章标题")
private String title;
- @ApiModelProperty(value = "文章类型 0常规 1视频")
+ @Schema(description = "文章类型 0常规 1视频")
private Integer type;
- @ApiModelProperty(value = "文章模型")
+ @Schema(description = "文章模型")
private String model;
- @ApiModelProperty(value = "列表显示方式(10小图展示 20大图展示)")
+ @Schema(description = "列表显示方式(10小图展示 20大图展示)")
private Integer showType;
- @ApiModelProperty(value = "话题")
+ @Schema(description = "话题")
private String topic;
- @ApiModelProperty(value = "文章分类ID")
+ @Schema(description = "文章分类ID")
private Integer categoryId;
- @ApiModelProperty(value = "当前分类")
+ @Schema(description = "当前分类")
@TableField(exist = false)
private String categoryName;
- @ApiModelProperty(value = "父级分类ID")
+ @Schema(description = "父级分类ID")
@TableField(exist = false)
private Integer parentId;
- @ApiModelProperty(value = "父级分类")
+ @Schema(description = "父级分类")
@TableField(exist = false)
private String parentName;
- @ApiModelProperty(value = "封面图")
+ @Schema(description = "封面图")
private String image;
- @ApiModelProperty(value = "来源")
+ @Schema(description = "来源")
private String source;
- @ApiModelProperty(value = "虚拟阅读量(仅用作展示)")
+ @Schema(description = "虚拟阅读量(仅用作展示)")
private Integer virtualViews;
- @ApiModelProperty(value = "实际阅读量")
+ @Schema(description = "实际阅读量")
private Integer actualViews;
- @ApiModelProperty(value = "可见类型 0所有人 1登录可见 2密码可见")
+ @Schema(description = "可见类型 0所有人 1登录可见 2密码可见")
private Integer permission;
- @ApiModelProperty(value = "访问密码")
+ @Schema(description = "访问密码")
private String password;
- @ApiModelProperty(value = "验证密码(前端回传)")
+ @Schema(description = "验证密码(前端回传)")
@TableField(exist = false)
private String password2;
- @ApiModelProperty(value = "发布来源客户端 (APP、H5、小程序等)")
+ @Schema(description = "发布来源客户端 (APP、H5、小程序等)")
private String platform;
- @ApiModelProperty(value = "文章附件")
+ @Schema(description = "文章附件")
private String files;
- @ApiModelProperty(value = "视频地址")
+ @Schema(description = "视频地址")
private String video;
- @ApiModelProperty(value = "接受的文件类型")
+ @Schema(description = "接受的文件类型")
private String accept;
- @ApiModelProperty(value = "经度")
+ @Schema(description = "经度")
private String longitude;
- @ApiModelProperty(value = "纬度")
+ @Schema(description = "纬度")
private String latitude;
- @ApiModelProperty(value = "所在省份")
+ @Schema(description = "所在省份")
private String province;
- @ApiModelProperty(value = "所在城市")
+ @Schema(description = "所在城市")
private String city;
- @ApiModelProperty(value = "所在辖区")
+ @Schema(description = "所在辖区")
private String region;
- @ApiModelProperty(value = "街道地址")
+ @Schema(description = "街道地址")
private String address;
- @ApiModelProperty(value = "点赞数")
+ @Schema(description = "点赞数")
private Integer likes;
- @ApiModelProperty(value = "评论数")
+ @Schema(description = "评论数")
private Integer commentNumbers;
- @ApiModelProperty(value = "提醒谁看")
+ @Schema(description = "提醒谁看")
private String toUsers;
- @ApiModelProperty(value = "用户ID")
+ @Schema(description = "用户ID")
private Integer userId;
- @ApiModelProperty(value = "作者")
+ @Schema(description = "作者")
private String author;
- @ApiModelProperty(value = "商户ID")
+ @Schema(description = "商户ID")
private Long merchantId;
- @ApiModelProperty(value = "商户名称")
+ @Schema(description = "商户名称")
private String merchantName;
- @ApiModelProperty(value = "商户名称")
+ @Schema(description = "商户名称")
private String merchantAvatar;
- @ApiModelProperty(value = "昵称")
+ @Schema(description = "昵称")
@TableField(exist = false)
private String nickname;
- @ApiModelProperty(value = "头像")
+ @Schema(description = "头像")
@TableField(exist = false)
private String avatar;
- @ApiModelProperty(value = "排序(数字越小越靠前)")
+ @Schema(description = "排序(数字越小越靠前)")
private Integer sortNumber;
- @ApiModelProperty(value = "备注")
+ @Schema(description = "备注")
private String comments;
- @ApiModelProperty(value = "状态, 0已发布, 1待审核 2已驳回 3违规内容")
+ @Schema(description = "状态, 0已发布, 1待审核 2已驳回 3违规内容")
private Integer status;
- @ApiModelProperty(value = "是否删除, 0否, 1是")
+ @Schema(description = "是否删除, 0否, 1是")
@TableLogic
private Integer deleted;
- @ApiModelProperty(value = "租户id")
+ @Schema(description = "租户id")
private Integer tenantId;
- @ApiModelProperty(value = "创建时间")
+ @Schema(description = "创建时间")
private Date createTime;
- @ApiModelProperty(value = "修改时间")
+ @Schema(description = "修改时间")
private Date updateTime;
- @ApiModelProperty(value = "文章内容")
+ @Schema(description = "文章内容")
@TableField(exist = false)
private String content;
diff --git a/src/main/java/com/gxwebsoft/cms/entity/CmsArticleCategory.java b/src/main/java/com/gxwebsoft/cms/entity/CmsArticleCategory.java
index c16de0a..aee4a5a 100644
--- a/src/main/java/com/gxwebsoft/cms/entity/CmsArticleCategory.java
+++ b/src/main/java/com/gxwebsoft/cms/entity/CmsArticleCategory.java
@@ -7,8 +7,8 @@ import com.baomidou.mybatisplus.annotation.TableLogic;
import java.io.Serializable;
import java.util.Date;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -20,73 +20,73 @@ import lombok.EqualsAndHashCode;
*/
@Data
@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "CmsArticleCategory对象", description = "文章分类表")
+@Schema(name = "CmsArticleCategory对象", description = "文章分类表")
public class CmsArticleCategory implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "文章分类ID")
+ @Schema(description = "文章分类ID")
@TableId(value = "category_id", type = IdType.AUTO)
private Integer categoryId;
- @ApiModelProperty(value = "分类标识")
+ @Schema(description = "分类标识")
private String categoryCode;
- @ApiModelProperty(value = "分类名称")
+ @Schema(description = "分类名称")
private String title;
- @ApiModelProperty(value = "类型 0列表 1单页 2外链")
+ @Schema(description = "类型 0列表 1单页 2外链")
private Integer type;
- @ApiModelProperty(value = "分类图片")
+ @Schema(description = "分类图片")
private String image;
- @ApiModelProperty(value = "上级分类ID")
+ @Schema(description = "上级分类ID")
private Integer parentId;
- @ApiModelProperty(value = "路由/链接地址")
+ @Schema(description = "路由/链接地址")
private String path;
- @ApiModelProperty(value = "组件路径")
+ @Schema(description = "组件路径")
private String component;
- @ApiModelProperty(value = "绑定的页面")
+ @Schema(description = "绑定的页面")
private Integer pageId;
- @ApiModelProperty(value = "用户ID")
+ @Schema(description = "用户ID")
private Integer userId;
- @ApiModelProperty(value = "文章数量")
+ @Schema(description = "文章数量")
private Integer count;
- @ApiModelProperty(value = "排序(数字越小越靠前)")
+ @Schema(description = "排序(数字越小越靠前)")
private Integer sortNumber;
- @ApiModelProperty(value = "备注")
+ @Schema(description = "备注")
private String comments;
- @ApiModelProperty(value = "是否隐藏, 0否, 1是(仅注册路由不显示在左侧菜单)")
+ @Schema(description = "是否隐藏, 0否, 1是(仅注册路由不显示在左侧菜单)")
private Integer hide;
- @ApiModelProperty(value = "是否推荐")
+ @Schema(description = "是否推荐")
private Integer recommend;
- @ApiModelProperty(value = "是否显示在首页")
+ @Schema(description = "是否显示在首页")
private Integer showIndex;
- @ApiModelProperty(value = "状态, 0正常, 1禁用")
+ @Schema(description = "状态, 0正常, 1禁用")
private Integer status;
- @ApiModelProperty(value = "是否删除, 0否, 1是")
+ @Schema(description = "是否删除, 0否, 1是")
@TableLogic
private Integer deleted;
- @ApiModelProperty(value = "租户id")
+ @Schema(description = "租户id")
private Integer tenantId;
- @ApiModelProperty(value = "创建时间")
+ @Schema(description = "创建时间")
private Date createTime;
- @ApiModelProperty(value = "修改时间")
+ @Schema(description = "修改时间")
private Date updateTime;
}
diff --git a/src/main/java/com/gxwebsoft/cms/entity/CmsArticleComment.java b/src/main/java/com/gxwebsoft/cms/entity/CmsArticleComment.java
index b724273..b5c7cf2 100644
--- a/src/main/java/com/gxwebsoft/cms/entity/CmsArticleComment.java
+++ b/src/main/java/com/gxwebsoft/cms/entity/CmsArticleComment.java
@@ -7,8 +7,8 @@ import com.baomidou.mybatisplus.annotation.TableLogic;
import java.io.Serializable;
import java.util.Date;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -20,58 +20,58 @@ import lombok.EqualsAndHashCode;
*/
@Data
@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "CmsArticleComment对象", description = "文章评论表")
+@Schema(name = "CmsArticleComment对象", description = "文章评论表")
public class CmsArticleComment implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "评价ID")
+ @Schema(description = "评价ID")
@TableId(value = "comment_id", type = IdType.AUTO)
private Integer commentId;
- @ApiModelProperty(value = "文章ID")
+ @Schema(description = "文章ID")
private Integer articleId;
- @ApiModelProperty(value = "评分 (10好评 20中评 30差评)")
+ @Schema(description = "评分 (10好评 20中评 30差评)")
private Integer score;
- @ApiModelProperty(value = "评价内容")
+ @Schema(description = "评价内容")
private String content;
- @ApiModelProperty(value = "是否为图片评价")
+ @Schema(description = "是否为图片评价")
private Integer isPicture;
- @ApiModelProperty(value = "评论者ID")
+ @Schema(description = "评论者ID")
private Integer userId;
- @ApiModelProperty(value = "被评价者ID")
+ @Schema(description = "被评价者ID")
private Integer toUserId;
- @ApiModelProperty(value = "回复的评论ID")
+ @Schema(description = "回复的评论ID")
private Integer replyCommentId;
- @ApiModelProperty(value = "回复者ID")
+ @Schema(description = "回复者ID")
private Integer replyUserId;
- @ApiModelProperty(value = "排序(数字越小越靠前)")
+ @Schema(description = "排序(数字越小越靠前)")
private Integer sortNumber;
- @ApiModelProperty(value = "备注")
+ @Schema(description = "备注")
private String comments;
- @ApiModelProperty(value = "状态, 0未读, 1已读")
+ @Schema(description = "状态, 0未读, 1已读")
private Integer status;
- @ApiModelProperty(value = "是否删除, 0否, 1是")
+ @Schema(description = "是否删除, 0否, 1是")
@TableLogic
private Integer deleted;
- @ApiModelProperty(value = "租户id")
+ @Schema(description = "租户id")
private Integer tenantId;
- @ApiModelProperty(value = "创建时间")
+ @Schema(description = "创建时间")
private Date createTime;
- @ApiModelProperty(value = "修改时间")
+ @Schema(description = "修改时间")
private Date updateTime;
}
diff --git a/src/main/java/com/gxwebsoft/cms/entity/CmsArticleContent.java b/src/main/java/com/gxwebsoft/cms/entity/CmsArticleContent.java
index 71f199c..fc9de9f 100644
--- a/src/main/java/com/gxwebsoft/cms/entity/CmsArticleContent.java
+++ b/src/main/java/com/gxwebsoft/cms/entity/CmsArticleContent.java
@@ -6,8 +6,8 @@ import java.util.Date;
import java.io.Serializable;
import java.util.Date;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -19,23 +19,23 @@ import lombok.EqualsAndHashCode;
*/
@Data
@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "CmsArticleContent对象", description = "文章记录表")
+@Schema(name = "CmsArticleContent对象", description = "文章记录表")
public class CmsArticleContent implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
- @ApiModelProperty(value = "文章ID")
+ @Schema(description = "文章ID")
private Integer articleId;
- @ApiModelProperty(value = "文章内容")
+ @Schema(description = "文章内容")
private String content;
- @ApiModelProperty(value = "租户id")
+ @Schema(description = "租户id")
private Integer tenantId;
- @ApiModelProperty(value = "创建时间")
+ @Schema(description = "创建时间")
private Date createTime;
}
diff --git a/src/main/java/com/gxwebsoft/cms/entity/CmsArticleCount.java b/src/main/java/com/gxwebsoft/cms/entity/CmsArticleCount.java
index 1b9816d..2f44b54 100644
--- a/src/main/java/com/gxwebsoft/cms/entity/CmsArticleCount.java
+++ b/src/main/java/com/gxwebsoft/cms/entity/CmsArticleCount.java
@@ -6,8 +6,8 @@ import java.util.Date;
import java.io.Serializable;
import java.util.Date;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -19,24 +19,24 @@ import lombok.EqualsAndHashCode;
*/
@Data
@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "CmsArticleCount对象", description = "点赞文章")
+@Schema(name = "CmsArticleCount对象", description = "点赞文章")
public class CmsArticleCount implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "主键ID")
+ @Schema(description = "主键ID")
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
- @ApiModelProperty(value = "文章ID")
+ @Schema(description = "文章ID")
private Integer articleId;
- @ApiModelProperty(value = "用户ID")
+ @Schema(description = "用户ID")
private Integer userId;
- @ApiModelProperty(value = "租户id")
+ @Schema(description = "租户id")
private Integer tenantId;
- @ApiModelProperty(value = "创建时间")
+ @Schema(description = "创建时间")
private Date createTime;
}
diff --git a/src/main/java/com/gxwebsoft/cms/entity/CmsArticleLike.java b/src/main/java/com/gxwebsoft/cms/entity/CmsArticleLike.java
index 71c57aa..2f88528 100644
--- a/src/main/java/com/gxwebsoft/cms/entity/CmsArticleLike.java
+++ b/src/main/java/com/gxwebsoft/cms/entity/CmsArticleLike.java
@@ -6,8 +6,8 @@ import java.util.Date;
import java.io.Serializable;
import java.util.Date;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -19,24 +19,24 @@ import lombok.EqualsAndHashCode;
*/
@Data
@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "CmsArticleLike对象", description = "点赞文章")
+@Schema(name = "CmsArticleLike对象", description = "点赞文章")
public class CmsArticleLike implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "主键ID")
+ @Schema(description = "主键ID")
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
- @ApiModelProperty(value = "文章ID")
+ @Schema(description = "文章ID")
private Integer articleId;
- @ApiModelProperty(value = "用户ID")
+ @Schema(description = "用户ID")
private Integer userId;
- @ApiModelProperty(value = "租户id")
+ @Schema(description = "租户id")
private Integer tenantId;
- @ApiModelProperty(value = "创建时间")
+ @Schema(description = "创建时间")
private Date createTime;
}
diff --git a/src/main/java/com/gxwebsoft/cms/entity/CmsComponents.java b/src/main/java/com/gxwebsoft/cms/entity/CmsComponents.java
index 8ea9a57..d4edc07 100644
--- a/src/main/java/com/gxwebsoft/cms/entity/CmsComponents.java
+++ b/src/main/java/com/gxwebsoft/cms/entity/CmsComponents.java
@@ -6,8 +6,8 @@ import java.util.Date;
import java.io.Serializable;
import java.util.Date;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -19,51 +19,51 @@ import lombok.EqualsAndHashCode;
*/
@Data
@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "CmsComponents对象", description = "组件")
+@Schema(name = "CmsComponents对象", description = "组件")
public class CmsComponents implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "ID")
+ @Schema(description = "ID")
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
- @ApiModelProperty(value = "组件标题")
+ @Schema(description = "组件标题")
private String title;
- @ApiModelProperty(value = "关联导航ID")
+ @Schema(description = "关联导航ID")
private Integer navigationId;
- @ApiModelProperty(value = "组件类型")
+ @Schema(description = "组件类型")
private String type;
- @ApiModelProperty(value = "页面关键词")
+ @Schema(description = "页面关键词")
private String keywords;
- @ApiModelProperty(value = "页面描述")
+ @Schema(description = "页面描述")
private String description;
- @ApiModelProperty(value = "组件路径")
+ @Schema(description = "组件路径")
private String path;
- @ApiModelProperty(value = "组件图标")
+ @Schema(description = "组件图标")
private String icon;
- @ApiModelProperty(value = "用户ID")
+ @Schema(description = "用户ID")
private Integer userId;
- @ApiModelProperty(value = "排序(数字越小越靠前)")
+ @Schema(description = "排序(数字越小越靠前)")
private Integer sortNumber;
- @ApiModelProperty(value = "备注")
+ @Schema(description = "备注")
private String comments;
- @ApiModelProperty(value = "状态, 0正常, 1冻结")
+ @Schema(description = "状态, 0正常, 1冻结")
private Integer status;
- @ApiModelProperty(value = "租户id")
+ @Schema(description = "租户id")
private Integer tenantId;
- @ApiModelProperty(value = "创建时间")
+ @Schema(description = "创建时间")
private Date createTime;
}
diff --git a/src/main/java/com/gxwebsoft/cms/entity/CmsDesign.java b/src/main/java/com/gxwebsoft/cms/entity/CmsDesign.java
index a0bfc41..fc0cc4e 100644
--- a/src/main/java/com/gxwebsoft/cms/entity/CmsDesign.java
+++ b/src/main/java/com/gxwebsoft/cms/entity/CmsDesign.java
@@ -8,8 +8,8 @@ import com.baomidou.mybatisplus.annotation.TableLogic;
import java.io.Serializable;
import java.util.Date;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -21,78 +21,78 @@ import lombok.EqualsAndHashCode;
*/
@Data
@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "CmsDesign对象", description = "页面管理记录表")
+@Schema(name = "CmsDesign对象", description = "页面管理记录表")
public class CmsDesign implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "ID")
+ @Schema(description = "ID")
@TableId(value = "page_id", type = IdType.AUTO)
private Integer pageId;
- @ApiModelProperty(value = "页面标题")
+ @Schema(description = "页面标题")
private String name;
- @ApiModelProperty(value = "所属栏目ID")
+ @Schema(description = "所属栏目ID")
private Integer categoryId;
- @ApiModelProperty(value = "页面关键词")
+ @Schema(description = "页面关键词")
private String keywords;
- @ApiModelProperty(value = "页面描述")
+ @Schema(description = "页面描述")
private String description;
- @ApiModelProperty(value = "路由地址")
+ @Schema(description = "路由地址")
@TableField(exist = false)
private String path;
- @ApiModelProperty(value = "组件路径")
+ @Schema(description = "组件路径")
@TableField(exist = false)
private String component;
- @ApiModelProperty(value = "缩列图")
+ @Schema(description = "缩列图")
private String photo;
- @ApiModelProperty(value = "购买链接")
+ @Schema(description = "购买链接")
private String buyUrl;
- @ApiModelProperty(value = "页面样式")
+ @Schema(description = "页面样式")
private String style;
- @ApiModelProperty(value = "页面内容")
+ @Schema(description = "页面内容")
private String content;
- @ApiModelProperty(value = "是否开启布局")
+ @Schema(description = "是否开启布局")
private Boolean showLayout;
- @ApiModelProperty(value = "页面布局")
+ @Schema(description = "页面布局")
private String layout;
- @ApiModelProperty(value = "上级id, 0是顶级")
+ @Schema(description = "上级id, 0是顶级")
private Integer parentId;
- @ApiModelProperty(value = "用户ID")
+ @Schema(description = "用户ID")
private Integer userId;
- @ApiModelProperty(value = "设为首页")
+ @Schema(description = "设为首页")
private Integer home;
- @ApiModelProperty(value = "排序(数字越小越靠前)")
+ @Schema(description = "排序(数字越小越靠前)")
private Integer sortNumber;
- @ApiModelProperty(value = "备注")
+ @Schema(description = "备注")
private String comments;
- @ApiModelProperty(value = "状态, 0正常, 1冻结")
+ @Schema(description = "状态, 0正常, 1冻结")
private Integer status;
- @ApiModelProperty(value = "是否删除, 0否, 1是")
+ @Schema(description = "是否删除, 0否, 1是")
@TableLogic
private Integer deleted;
- @ApiModelProperty(value = "租户id")
+ @Schema(description = "租户id")
private Integer tenantId;
- @ApiModelProperty(value = "创建时间")
+ @Schema(description = "创建时间")
private Date createTime;
}
diff --git a/src/main/java/com/gxwebsoft/cms/entity/CmsDesignRecord.java b/src/main/java/com/gxwebsoft/cms/entity/CmsDesignRecord.java
index 168bc06..9aeb8f4 100644
--- a/src/main/java/com/gxwebsoft/cms/entity/CmsDesignRecord.java
+++ b/src/main/java/com/gxwebsoft/cms/entity/CmsDesignRecord.java
@@ -6,8 +6,8 @@ import java.util.Date;
import java.io.Serializable;
import java.util.Date;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -19,57 +19,57 @@ import lombok.EqualsAndHashCode;
*/
@Data
@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "CmsDesignRecord对象", description = "页面组件表")
+@Schema(name = "CmsDesignRecord对象", description = "页面组件表")
public class CmsDesignRecord implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "ID")
+ @Schema(description = "ID")
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
- @ApiModelProperty(value = "关联导航ID")
+ @Schema(description = "关联导航ID")
private Integer navigationId;
- @ApiModelProperty(value = "组件")
+ @Schema(description = "组件")
private String title;
- @ApiModelProperty(value = "组件标识")
+ @Schema(description = "组件标识")
private String dictCode;
- @ApiModelProperty(value = "组件样式")
+ @Schema(description = "组件样式")
private String styles;
- @ApiModelProperty(value = "卡片阴影显示时机")
+ @Schema(description = "卡片阴影显示时机")
private String shadow;
- @ApiModelProperty(value = "页面关键词")
+ @Schema(description = "页面关键词")
private String keywords;
- @ApiModelProperty(value = "页面描述")
+ @Schema(description = "页面描述")
private String description;
- @ApiModelProperty(value = "页面路由地址")
+ @Schema(description = "页面路由地址")
private String path;
- @ApiModelProperty(value = "缩列图")
+ @Schema(description = "缩列图")
private String photo;
- @ApiModelProperty(value = "用户ID")
+ @Schema(description = "用户ID")
private Integer userId;
- @ApiModelProperty(value = "排序(数字越小越靠前)")
+ @Schema(description = "排序(数字越小越靠前)")
private Integer sortNumber;
- @ApiModelProperty(value = "备注")
+ @Schema(description = "备注")
private String comments;
- @ApiModelProperty(value = "状态, 0正常, 1冻结")
+ @Schema(description = "状态, 0正常, 1冻结")
private Integer status;
- @ApiModelProperty(value = "租户id")
+ @Schema(description = "租户id")
private Integer tenantId;
- @ApiModelProperty(value = "创建时间")
+ @Schema(description = "创建时间")
private Date createTime;
}
diff --git a/src/main/java/com/gxwebsoft/cms/entity/CmsDocs.java b/src/main/java/com/gxwebsoft/cms/entity/CmsDocs.java
index 88ebfaa..957f37c 100644
--- a/src/main/java/com/gxwebsoft/cms/entity/CmsDocs.java
+++ b/src/main/java/com/gxwebsoft/cms/entity/CmsDocs.java
@@ -7,8 +7,8 @@ import com.baomidou.mybatisplus.annotation.TableLogic;
import java.io.Serializable;
import java.util.Date;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -20,55 +20,55 @@ import lombok.EqualsAndHashCode;
*/
@Data
@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "CmsDocs对象", description = "文档管理记录表")
+@Schema(name = "CmsDocs对象", description = "文档管理记录表")
public class CmsDocs implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "文档ID")
+ @Schema(description = "文档ID")
@TableId(value = "docs_id", type = IdType.AUTO)
private Integer docsId;
- @ApiModelProperty(value = "文档标题")
+ @Schema(description = "文档标题")
private String title;
- @ApiModelProperty(value = "上级目录")
+ @Schema(description = "上级目录")
private Integer parentId;
- @ApiModelProperty(value = "书籍ID")
+ @Schema(description = "书籍ID")
private Integer bookId;
- @ApiModelProperty(value = "可见性(public,private,protected)")
+ @Schema(description = "可见性(public,private,protected)")
private String visibility;
- @ApiModelProperty(value = "虚拟阅读量(仅用作展示)")
+ @Schema(description = "虚拟阅读量(仅用作展示)")
private Integer virtualViews;
- @ApiModelProperty(value = "实际阅读量")
+ @Schema(description = "实际阅读量")
private Integer actualViews;
- @ApiModelProperty(value = "用户ID")
+ @Schema(description = "用户ID")
private Integer userId;
- @ApiModelProperty(value = "备注")
+ @Schema(description = "备注")
private String comments;
- @ApiModelProperty(value = "排序(数字越小越靠前)")
+ @Schema(description = "排序(数字越小越靠前)")
private Integer sortNumber;
- @ApiModelProperty(value = "状态, 0正常, 1冻结")
+ @Schema(description = "状态, 0正常, 1冻结")
private Integer status;
- @ApiModelProperty(value = "是否删除, 0否, 1是")
+ @Schema(description = "是否删除, 0否, 1是")
@TableLogic
private Integer deleted;
- @ApiModelProperty(value = "租户id")
+ @Schema(description = "租户id")
private Integer tenantId;
- @ApiModelProperty(value = "创建时间")
+ @Schema(description = "创建时间")
private Date createTime;
- @ApiModelProperty(value = "修改时间")
+ @Schema(description = "修改时间")
private Date updateTime;
}
diff --git a/src/main/java/com/gxwebsoft/cms/entity/CmsDocsBook.java b/src/main/java/com/gxwebsoft/cms/entity/CmsDocsBook.java
index 3ab0530..dab8c89 100644
--- a/src/main/java/com/gxwebsoft/cms/entity/CmsDocsBook.java
+++ b/src/main/java/com/gxwebsoft/cms/entity/CmsDocsBook.java
@@ -7,8 +7,8 @@ import com.baomidou.mybatisplus.annotation.TableLogic;
import java.io.Serializable;
import java.util.Date;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -20,43 +20,43 @@ import lombok.EqualsAndHashCode;
*/
@Data
@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "CmsDocsBook对象", description = "书籍记录表")
+@Schema(name = "CmsDocsBook对象", description = "书籍记录表")
public class CmsDocsBook implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "ID")
+ @Schema(description = "ID")
@TableId(value = "book_id", type = IdType.AUTO)
private Integer bookId;
- @ApiModelProperty(value = "书籍名称")
+ @Schema(description = "书籍名称")
private String name;
- @ApiModelProperty(value = "书籍标识")
+ @Schema(description = "书籍标识")
private String code;
- @ApiModelProperty(value = "封面图")
+ @Schema(description = "封面图")
private String photo;
- @ApiModelProperty(value = "备注")
+ @Schema(description = "备注")
private String comments;
- @ApiModelProperty(value = "文档内容")
+ @Schema(description = "文档内容")
private String content;
- @ApiModelProperty(value = "排序(数字越小越靠前)")
+ @Schema(description = "排序(数字越小越靠前)")
private Integer sortNumber;
- @ApiModelProperty(value = "状态, 0正常, 1冻结")
+ @Schema(description = "状态, 0正常, 1冻结")
private Integer status;
- @ApiModelProperty(value = "是否删除, 0否, 1是")
+ @Schema(description = "是否删除, 0否, 1是")
@TableLogic
private Integer deleted;
- @ApiModelProperty(value = "租户id")
+ @Schema(description = "租户id")
private Integer tenantId;
- @ApiModelProperty(value = "创建时间")
+ @Schema(description = "创建时间")
private Date createTime;
}
diff --git a/src/main/java/com/gxwebsoft/cms/entity/CmsDocsContent.java b/src/main/java/com/gxwebsoft/cms/entity/CmsDocsContent.java
index 430af07..6c5a11f 100644
--- a/src/main/java/com/gxwebsoft/cms/entity/CmsDocsContent.java
+++ b/src/main/java/com/gxwebsoft/cms/entity/CmsDocsContent.java
@@ -6,8 +6,8 @@ import java.util.Date;
import java.io.Serializable;
import java.util.Date;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -19,24 +19,24 @@ import lombok.EqualsAndHashCode;
*/
@Data
@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "CmsDocsContent对象", description = "文档内容记录表")
+@Schema(name = "CmsDocsContent对象", description = "文档内容记录表")
public class CmsDocsContent implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "ID")
+ @Schema(description = "ID")
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
- @ApiModelProperty(value = "文档ID")
+ @Schema(description = "文档ID")
private Integer docsId;
- @ApiModelProperty(value = "文档内容")
+ @Schema(description = "文档内容")
private String content;
- @ApiModelProperty(value = "租户id")
+ @Schema(description = "租户id")
private Integer tenantId;
- @ApiModelProperty(value = "创建时间")
+ @Schema(description = "创建时间")
private Date createTime;
}
diff --git a/src/main/java/com/gxwebsoft/cms/entity/CmsDomain.java b/src/main/java/com/gxwebsoft/cms/entity/CmsDomain.java
index 7f88219..b607a04 100644
--- a/src/main/java/com/gxwebsoft/cms/entity/CmsDomain.java
+++ b/src/main/java/com/gxwebsoft/cms/entity/CmsDomain.java
@@ -7,8 +7,8 @@ import com.baomidou.mybatisplus.annotation.TableLogic;
import java.io.Serializable;
import java.util.Date;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -20,52 +20,52 @@ import lombok.EqualsAndHashCode;
*/
@Data
@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "CmsDomain对象", description = "网站域名记录表")
+@Schema(name = "CmsDomain对象", description = "网站域名记录表")
public class CmsDomain implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "ID")
+ @Schema(description = "ID")
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
- @ApiModelProperty(value = "类型 0赠送域名 1绑定域名 ")
+ @Schema(description = "类型 0赠送域名 1绑定域名 ")
private Integer type;
- @ApiModelProperty(value = "域名")
+ @Schema(description = "域名")
private String domain;
- @ApiModelProperty(value = "主机记录")
+ @Schema(description = "主机记录")
private String hostName;
- @ApiModelProperty(value = "记录值")
+ @Schema(description = "记录值")
private String hostValue;
- @ApiModelProperty(value = "状态")
+ @Schema(description = "状态")
private Integer status;
- @ApiModelProperty(value = "排序号")
+ @Schema(description = "排序号")
private Integer sortNumber;
- @ApiModelProperty(value = "网站ID")
+ @Schema(description = "网站ID")
private Integer websiteId;
- @ApiModelProperty(value = "租户ID")
+ @Schema(description = "租户ID")
private Integer appId;
- @ApiModelProperty(value = "用户ID")
+ @Schema(description = "用户ID")
private Integer userId;
- @ApiModelProperty(value = "是否删除, 0否, 1是")
+ @Schema(description = "是否删除, 0否, 1是")
@TableLogic
private Integer deleted;
- @ApiModelProperty(value = "租户id")
+ @Schema(description = "租户id")
private Integer tenantId;
- @ApiModelProperty(value = "创建时间")
+ @Schema(description = "创建时间")
private Date createTime;
- @ApiModelProperty(value = "修改时间")
+ @Schema(description = "修改时间")
private Date updateTime;
}
diff --git a/src/main/java/com/gxwebsoft/cms/entity/CmsForm.java b/src/main/java/com/gxwebsoft/cms/entity/CmsForm.java
index 470ca8b..83cfafc 100644
--- a/src/main/java/com/gxwebsoft/cms/entity/CmsForm.java
+++ b/src/main/java/com/gxwebsoft/cms/entity/CmsForm.java
@@ -8,8 +8,8 @@ import com.baomidou.mybatisplus.annotation.TableLogic;
import java.io.Serializable;
import java.util.Date;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -21,67 +21,67 @@ import lombok.EqualsAndHashCode;
*/
@Data
@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "CmsForm对象", description = "表单设计表")
+@Schema(name = "CmsForm对象", description = "表单设计表")
public class CmsForm implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "ID")
+ @Schema(description = "ID")
@TableId(value = "form_id", type = IdType.AUTO)
private Integer formId;
- @ApiModelProperty(value = "表单标题")
+ @Schema(description = "表单标题")
private String name;
- @ApiModelProperty(value = "顶部图片")
+ @Schema(description = "顶部图片")
private String photo;
- @ApiModelProperty(value = "背景图片")
+ @Schema(description = "背景图片")
private String background;
- @ApiModelProperty(value = "视频文件")
+ @Schema(description = "视频文件")
private String video;
- @ApiModelProperty(value = "提交次数")
+ @Schema(description = "提交次数")
private Integer submitNumber;
- @ApiModelProperty(value = "页面布局")
+ @Schema(description = "页面布局")
private String layout;
- @ApiModelProperty(value = "是否隐藏顶部图片")
+ @Schema(description = "是否隐藏顶部图片")
private Integer hidePhoto;
- @ApiModelProperty(value = "是否隐藏背景图片")
+ @Schema(description = "是否隐藏背景图片")
private Integer hideBackground;
- @ApiModelProperty(value = "是否隐藏视频")
+ @Schema(description = "是否隐藏视频")
private Integer hideVideo;
- @ApiModelProperty(value = "背景图片透明度")
+ @Schema(description = "背景图片透明度")
private BigDecimal opacity;
- @ApiModelProperty(value = "用户ID")
+ @Schema(description = "用户ID")
private Integer userId;
- @ApiModelProperty(value = "商户ID")
+ @Schema(description = "商户ID")
private Long merchantId;
- @ApiModelProperty(value = "排序(数字越小越靠前)")
+ @Schema(description = "排序(数字越小越靠前)")
private Integer sortNumber;
- @ApiModelProperty(value = "备注")
+ @Schema(description = "备注")
private String comments;
- @ApiModelProperty(value = "状态, 0正常, 1冻结")
+ @Schema(description = "状态, 0正常, 1冻结")
private Integer status;
- @ApiModelProperty(value = "是否删除, 0否, 1是")
+ @Schema(description = "是否删除, 0否, 1是")
@TableLogic
private Integer deleted;
- @ApiModelProperty(value = "租户id")
+ @Schema(description = "租户id")
private Integer tenantId;
- @ApiModelProperty(value = "创建时间")
+ @Schema(description = "创建时间")
private Date createTime;
}
diff --git a/src/main/java/com/gxwebsoft/cms/entity/CmsFormRecord.java b/src/main/java/com/gxwebsoft/cms/entity/CmsFormRecord.java
index c8a6d03..59e5166 100644
--- a/src/main/java/com/gxwebsoft/cms/entity/CmsFormRecord.java
+++ b/src/main/java/com/gxwebsoft/cms/entity/CmsFormRecord.java
@@ -7,8 +7,8 @@ import com.baomidou.mybatisplus.annotation.TableLogic;
import java.io.Serializable;
import java.util.Date;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -20,49 +20,49 @@ import lombok.EqualsAndHashCode;
*/
@Data
@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "CmsFormRecord对象", description = "表单数据记录表")
+@Schema(name = "CmsFormRecord对象", description = "表单数据记录表")
public class CmsFormRecord implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "ID")
+ @Schema(description = "ID")
@TableId(value = "form_record_id", type = IdType.AUTO)
private Integer formRecordId;
- @ApiModelProperty(value = "手机号")
+ @Schema(description = "手机号")
private String phone;
- @ApiModelProperty(value = "表单数据")
+ @Schema(description = "表单数据")
private String formData;
- @ApiModelProperty(value = "表单ID")
+ @Schema(description = "表单ID")
private Integer formId;
- @ApiModelProperty(value = "用户ID")
+ @Schema(description = "用户ID")
private Integer userId;
- @ApiModelProperty(value = "商户ID")
+ @Schema(description = "商户ID")
private Long merchantId;
- @ApiModelProperty(value = "姓名")
+ @Schema(description = "姓名")
private String name;
- @ApiModelProperty(value = "排序(数字越小越靠前)")
+ @Schema(description = "排序(数字越小越靠前)")
private Integer sortNumber;
- @ApiModelProperty(value = "备注")
+ @Schema(description = "备注")
private String comments;
- @ApiModelProperty(value = "状态, 0正常, 1冻结")
+ @Schema(description = "状态, 0正常, 1冻结")
private Integer status;
- @ApiModelProperty(value = "是否删除, 0否, 1是")
+ @Schema(description = "是否删除, 0否, 1是")
@TableLogic
private Integer deleted;
- @ApiModelProperty(value = "租户id")
+ @Schema(description = "租户id")
private Integer tenantId;
- @ApiModelProperty(value = "创建时间")
+ @Schema(description = "创建时间")
private Date createTime;
}
diff --git a/src/main/java/com/gxwebsoft/cms/entity/CmsLink.java b/src/main/java/com/gxwebsoft/cms/entity/CmsLink.java
index b534d5c..6ccb220 100644
--- a/src/main/java/com/gxwebsoft/cms/entity/CmsLink.java
+++ b/src/main/java/com/gxwebsoft/cms/entity/CmsLink.java
@@ -7,8 +7,8 @@ import com.baomidou.mybatisplus.annotation.TableLogic;
import java.io.Serializable;
import java.util.Date;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -20,52 +20,52 @@ import lombok.EqualsAndHashCode;
*/
@Data
@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "CmsLink对象", description = "常用链接")
+@Schema(name = "CmsLink对象", description = "常用链接")
public class CmsLink implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "自增ID")
+ @Schema(description = "自增ID")
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
- @ApiModelProperty(value = "链接名称")
+ @Schema(description = "链接名称")
private String name;
- @ApiModelProperty(value = "图标")
+ @Schema(description = "图标")
private String icon;
- @ApiModelProperty(value = "链接地址")
+ @Schema(description = "链接地址")
private String url;
- @ApiModelProperty(value = "链接分类")
+ @Schema(description = "链接分类")
private String linkType;
- @ApiModelProperty(value = "应用ID")
+ @Schema(description = "应用ID")
private Integer appId;
- @ApiModelProperty(value = "用户ID")
+ @Schema(description = "用户ID")
private Integer userId;
- @ApiModelProperty(value = "是否推荐")
+ @Schema(description = "是否推荐")
private Integer recommend;
- @ApiModelProperty(value = "备注")
+ @Schema(description = "备注")
private String comments;
- @ApiModelProperty(value = "排序(数字越小越靠前)")
+ @Schema(description = "排序(数字越小越靠前)")
private Integer sortNumber;
- @ApiModelProperty(value = "是否删除, 0否, 1是")
+ @Schema(description = "是否删除, 0否, 1是")
@TableLogic
private Integer deleted;
- @ApiModelProperty(value = "状态, 0正常, 1待确认")
+ @Schema(description = "状态, 0正常, 1待确认")
private Integer status;
- @ApiModelProperty(value = "租户id")
+ @Schema(description = "租户id")
private Integer tenantId;
- @ApiModelProperty(value = "创建时间")
+ @Schema(description = "创建时间")
private Date createTime;
}
diff --git a/src/main/java/com/gxwebsoft/cms/entity/CmsMp.java b/src/main/java/com/gxwebsoft/cms/entity/CmsMp.java
index 8248fb5..e921212 100644
--- a/src/main/java/com/gxwebsoft/cms/entity/CmsMp.java
+++ b/src/main/java/com/gxwebsoft/cms/entity/CmsMp.java
@@ -7,8 +7,8 @@ import com.baomidou.mybatisplus.annotation.TableLogic;
import java.io.Serializable;
import java.util.Date;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -20,79 +20,79 @@ import lombok.EqualsAndHashCode;
*/
@Data
@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "CmsMp对象", description = "小程序信息")
+@Schema(name = "CmsMp对象", description = "小程序信息")
public class CmsMp implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "ID")
+ @Schema(description = "ID")
@TableId(value = "mp_id", type = IdType.AUTO)
private Integer mpId;
- @ApiModelProperty(value = "是否主账号")
+ @Schema(description = "是否主账号")
private Integer type;
- @ApiModelProperty(value = "小程序ID")
+ @Schema(description = "小程序ID")
private String appId;
- @ApiModelProperty(value = "小程序密钥")
+ @Schema(description = "小程序密钥")
private String appSecret;
- @ApiModelProperty(value = "小程序名称")
+ @Schema(description = "小程序名称")
private String mpName;
- @ApiModelProperty(value = "小程序简称")
+ @Schema(description = "小程序简称")
private String shortName;
- @ApiModelProperty(value = "头像")
+ @Schema(description = "头像")
private String avatar;
- @ApiModelProperty(value = "小程序码")
+ @Schema(description = "小程序码")
private String mpQrcode;
- @ApiModelProperty(value = "微信认证")
+ @Schema(description = "微信认证")
private Integer authentication;
- @ApiModelProperty(value = "主体信息")
+ @Schema(description = "主体信息")
private String companyName;
- @ApiModelProperty(value = "小程序备案")
+ @Schema(description = "小程序备案")
private String icpNo;
- @ApiModelProperty(value = "登录邮箱")
+ @Schema(description = "登录邮箱")
private String email;
- @ApiModelProperty(value = "登录密码")
+ @Schema(description = "登录密码")
private String password;
- @ApiModelProperty(value = "原始ID")
+ @Schema(description = "原始ID")
private String ghId;
- @ApiModelProperty(value = "入口页面")
+ @Schema(description = "入口页面")
private String mainPath;
- @ApiModelProperty(value = "过期时间")
+ @Schema(description = "过期时间")
private Date expirationTime;
- @ApiModelProperty(value = "排序(数字越小越靠前)")
+ @Schema(description = "排序(数字越小越靠前)")
private Integer sortNumber;
- @ApiModelProperty(value = "介绍")
+ @Schema(description = "介绍")
private String comments;
- @ApiModelProperty(value = "用户ID")
+ @Schema(description = "用户ID")
private Integer userId;
- @ApiModelProperty(value = "状态, 0正常, 1冻结")
+ @Schema(description = "状态, 0正常, 1冻结")
private Integer status;
- @ApiModelProperty(value = "是否删除, 0否, 1是")
+ @Schema(description = "是否删除, 0否, 1是")
@TableLogic
private Integer deleted;
- @ApiModelProperty(value = "租户id")
+ @Schema(description = "租户id")
private Integer tenantId;
- @ApiModelProperty(value = "创建时间")
+ @Schema(description = "创建时间")
private Date createTime;
}
diff --git a/src/main/java/com/gxwebsoft/cms/entity/CmsMpAd.java b/src/main/java/com/gxwebsoft/cms/entity/CmsMpAd.java
index 0684040..d724f96 100644
--- a/src/main/java/com/gxwebsoft/cms/entity/CmsMpAd.java
+++ b/src/main/java/com/gxwebsoft/cms/entity/CmsMpAd.java
@@ -7,8 +7,8 @@ import com.baomidou.mybatisplus.annotation.TableLogic;
import java.io.Serializable;
import java.util.Date;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -20,58 +20,58 @@ import lombok.EqualsAndHashCode;
*/
@Data
@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "CmsMpAd对象", description = "小程序广告位")
+@Schema(name = "CmsMpAd对象", description = "小程序广告位")
public class CmsMpAd implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "ID")
+ @Schema(description = "ID")
@TableId(value = "ad_id", type = IdType.AUTO)
private Integer adId;
- @ApiModelProperty(value = "页面ID")
+ @Schema(description = "页面ID")
private Integer pageId;
- @ApiModelProperty(value = "广告类型")
+ @Schema(description = "广告类型")
private String adType;
- @ApiModelProperty(value = "广告位名称")
+ @Schema(description = "广告位名称")
private String name;
- @ApiModelProperty(value = "宽")
+ @Schema(description = "宽")
private String width;
- @ApiModelProperty(value = "高")
+ @Schema(description = "高")
private String height;
- @ApiModelProperty(value = "广告图片")
+ @Schema(description = "广告图片")
private String images;
- @ApiModelProperty(value = "路由/链接地址")
+ @Schema(description = "路由/链接地址")
private String path;
- @ApiModelProperty(value = "页面名称")
+ @Schema(description = "页面名称")
private String pageName;
- @ApiModelProperty(value = "用户ID")
+ @Schema(description = "用户ID")
private Integer userId;
- @ApiModelProperty(value = "排序(数字越小越靠前)")
+ @Schema(description = "排序(数字越小越靠前)")
private Integer sortNumber;
- @ApiModelProperty(value = "备注")
+ @Schema(description = "备注")
private String comments;
- @ApiModelProperty(value = "状态, 0正常, 1冻结")
+ @Schema(description = "状态, 0正常, 1冻结")
private Integer status;
- @ApiModelProperty(value = "是否删除, 0否, 1是")
+ @Schema(description = "是否删除, 0否, 1是")
@TableLogic
private Integer deleted;
- @ApiModelProperty(value = "租户id")
+ @Schema(description = "租户id")
private Integer tenantId;
- @ApiModelProperty(value = "创建时间")
+ @Schema(description = "创建时间")
private Date createTime;
}
diff --git a/src/main/java/com/gxwebsoft/cms/entity/CmsMpField.java b/src/main/java/com/gxwebsoft/cms/entity/CmsMpField.java
index 8981fdc..5363ce0 100644
--- a/src/main/java/com/gxwebsoft/cms/entity/CmsMpField.java
+++ b/src/main/java/com/gxwebsoft/cms/entity/CmsMpField.java
@@ -7,8 +7,8 @@ import com.baomidou.mybatisplus.annotation.TableLogic;
import java.io.Serializable;
import java.util.Date;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -20,40 +20,40 @@ import lombok.EqualsAndHashCode;
*/
@Data
@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "CmsMpField对象", description = "小程序配置")
+@Schema(name = "CmsMpField对象", description = "小程序配置")
public class CmsMpField implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "自增ID")
+ @Schema(description = "自增ID")
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
- @ApiModelProperty(value = "类型，0文本 1图片 2其他")
+ @Schema(description = "类型，0文本 1图片 2其他")
private Integer type;
- @ApiModelProperty(value = "名称")
+ @Schema(description = "名称")
private String name;
- @ApiModelProperty(value = "备注")
+ @Schema(description = "备注")
private String comments;
- @ApiModelProperty(value = "名称")
+ @Schema(description = "名称")
private String value;
- @ApiModelProperty(value = "页面ID")
+ @Schema(description = "页面ID")
private Integer pageId;
- @ApiModelProperty(value = "排序(数字越小越靠前)")
+ @Schema(description = "排序(数字越小越靠前)")
private Integer sortNumber;
- @ApiModelProperty(value = "是否删除, 0否, 1是")
+ @Schema(description = "是否删除, 0否, 1是")
@TableLogic
private Integer deleted;
- @ApiModelProperty(value = "租户id")
+ @Schema(description = "租户id")
private Integer tenantId;
- @ApiModelProperty(value = "创建时间")
+ @Schema(description = "创建时间")
private Date createTime;
}
diff --git a/src/main/java/com/gxwebsoft/cms/entity/CmsMpMenu.java b/src/main/java/com/gxwebsoft/cms/entity/CmsMpMenu.java
index 110d2f2..523e027 100644
--- a/src/main/java/com/gxwebsoft/cms/entity/CmsMpMenu.java
+++ b/src/main/java/com/gxwebsoft/cms/entity/CmsMpMenu.java
@@ -6,8 +6,8 @@ import java.util.Date;
import java.io.Serializable;
import java.util.Date;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -19,105 +19,105 @@ import lombok.EqualsAndHashCode;
*/
@Data
@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "CmsMpMenu对象", description = "小程序端菜单")
+@Schema(name = "CmsMpMenu对象", description = "小程序端菜单")
public class CmsMpMenu implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "ID")
+ @Schema(description = "ID")
@TableId(value = "menu_id", type = IdType.AUTO)
private Integer menuId;
- @ApiModelProperty(value = "上级id, 0是顶级")
+ @Schema(description = "上级id, 0是顶级")
private Integer parentId;
- @ApiModelProperty(value = "菜单名称")
+ @Schema(description = "菜单名称")
private String title;
- @ApiModelProperty(value = "类型 0功能图标 1订单状态图标 2首页导航图标 3 商城导航图标 4管理人员功能图标")
+ @Schema(description = "类型 0功能图标 1订单状态图标 2首页导航图标 3 商城导航图标 4管理人员功能图标")
private Integer type;
- @ApiModelProperty(value = "是否微信小程序菜单")
+ @Schema(description = "是否微信小程序菜单")
private Boolean isMpWeixin;
- @ApiModelProperty(value = "菜单路由地址")
+ @Schema(description = "菜单路由地址")
private String path;
- @ApiModelProperty(value = "菜单组件地址, 目录可为空")
+ @Schema(description = "菜单组件地址, 目录可为空")
private String component;
- @ApiModelProperty(value = "打开位置")
+ @Schema(description = "打开位置")
private String target;
- @ApiModelProperty(value = "菜单图标")
+ @Schema(description = "菜单图标")
private String avatar;
- @ApiModelProperty(value = "图标颜色")
+ @Schema(description = "图标颜色")
private String color;
- @ApiModelProperty(value = "上传图标")
+ @Schema(description = "上传图标")
private String icon;
- @ApiModelProperty(value = "是否隐藏, 0否, 1是(仅注册路由不显示在左侧菜单)")
+ @Schema(description = "是否隐藏, 0否, 1是(仅注册路由不显示在左侧菜单)")
private Integer hide;
- @ApiModelProperty(value = "位置 0不限 1顶部 2底部")
+ @Schema(description = "位置 0不限 1顶部 2底部")
private Integer position;
- @ApiModelProperty(value = "0 第一行 1第二行")
+ @Schema(description = "0 第一行 1第二行")
private Integer rows;
- @ApiModelProperty(value = "菜单侧栏选中的path")
+ @Schema(description = "菜单侧栏选中的path")
private String active;
- @ApiModelProperty(value = "其它路由元信息")
+ @Schema(description = "其它路由元信息")
private String meta;
- @ApiModelProperty(value = "绑定的页面")
+ @Schema(description = "绑定的页面")
private Integer pageId;
- @ApiModelProperty(value = "绑定的文章分类ID")
+ @Schema(description = "绑定的文章分类ID")
private Integer articleCategoryId;
- @ApiModelProperty(value = "绑定的文章ID")
+ @Schema(description = "绑定的文章ID")
private Integer articleId;
- @ApiModelProperty(value = "绑定的表单ID")
+ @Schema(description = "绑定的表单ID")
private Integer formId;
- @ApiModelProperty(value = "绑定的书籍标识")
+ @Schema(description = "绑定的书籍标识")
private String bookCode;
- @ApiModelProperty(value = "绑定的商品分类ID")
+ @Schema(description = "绑定的商品分类ID")
private Integer goodsCategoryId;
- @ApiModelProperty(value = "绑定的商品ID")
+ @Schema(description = "绑定的商品ID")
private Integer goodsId;
- @ApiModelProperty(value = "用户ID")
+ @Schema(description = "用户ID")
private Integer userId;
- @ApiModelProperty(value = "是否管理人员可见")
+ @Schema(description = "是否管理人员可见")
private Integer adminShow;
- @ApiModelProperty(value = "设为首页")
+ @Schema(description = "设为首页")
private Integer home;
- @ApiModelProperty(value = "分组名称")
+ @Schema(description = "分组名称")
private String groupName;
- @ApiModelProperty(value = "排序(数字越小越靠前)")
+ @Schema(description = "排序(数字越小越靠前)")
private Integer sortNumber;
- @ApiModelProperty(value = "备注")
+ @Schema(description = "备注")
private String comments;
- @ApiModelProperty(value = "状态, 0正常, 1冻结")
+ @Schema(description = "状态, 0正常, 1冻结")
private Integer status;
- @ApiModelProperty(value = "租户id")
+ @Schema(description = "租户id")
private Integer tenantId;
- @ApiModelProperty(value = "创建时间")
+ @Schema(description = "创建时间")
private Date createTime;
}
diff --git a/src/main/java/com/gxwebsoft/cms/entity/CmsMpPages.java b/src/main/java/com/gxwebsoft/cms/entity/CmsMpPages.java
index 36461c5..adc22cc 100644
--- a/src/main/java/com/gxwebsoft/cms/entity/CmsMpPages.java
+++ b/src/main/java/com/gxwebsoft/cms/entity/CmsMpPages.java
@@ -7,8 +7,8 @@ import com.baomidou.mybatisplus.annotation.TableLogic;
import java.io.Serializable;
import java.util.Date;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -20,58 +20,58 @@ import lombok.EqualsAndHashCode;
*/
@Data
@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "CmsMpPages对象", description = "小程序页面")
+@Schema(name = "CmsMpPages对象", description = "小程序页面")
public class CmsMpPages implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "ID")
+ @Schema(description = "ID")
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
- @ApiModelProperty(value = "上级id, 0是顶级")
+ @Schema(description = "上级id, 0是顶级")
private Integer parentId;
- @ApiModelProperty(value = "页面名称")
+ @Schema(description = "页面名称")
private String title;
- @ApiModelProperty(value = "页面路径")
+ @Schema(description = "页面路径")
private String path;
- @ApiModelProperty(value = "设为首页")
+ @Schema(description = "设为首页")
private Integer home;
- @ApiModelProperty(value = "分包")
+ @Schema(description = "分包")
private String subpackage;
- @ApiModelProperty(value = "图标")
+ @Schema(description = "图标")
private String icon;
- @ApiModelProperty(value = "未选中图标")
+ @Schema(description = "未选中图标")
private String iconPath;
- @ApiModelProperty(value = "选中的图标")
+ @Schema(description = "选中的图标")
private String selectedIconPath;
- @ApiModelProperty(value = "排序(数字越小越靠前)")
+ @Schema(description = "排序(数字越小越靠前)")
private Integer sortNumber;
- @ApiModelProperty(value = "备注")
+ @Schema(description = "备注")
private String comments;
- @ApiModelProperty(value = "用户ID")
+ @Schema(description = "用户ID")
private Integer userId;
- @ApiModelProperty(value = "状态, 0正常, 1冻结")
+ @Schema(description = "状态, 0正常, 1冻结")
private Integer status;
- @ApiModelProperty(value = "是否删除, 0否, 1是")
+ @Schema(description = "是否删除, 0否, 1是")
@TableLogic
private Integer deleted;
- @ApiModelProperty(value = "租户id")
+ @Schema(description = "租户id")
private Integer tenantId;
- @ApiModelProperty(value = "创建时间")
+ @Schema(description = "创建时间")
private Date createTime;
}
diff --git a/src/main/java/com/gxwebsoft/cms/entity/CmsNavigation.java b/src/main/java/com/gxwebsoft/cms/entity/CmsNavigation.java
index cf5c9f2..3501f04 100644
--- a/src/main/java/com/gxwebsoft/cms/entity/CmsNavigation.java
+++ b/src/main/java/com/gxwebsoft/cms/entity/CmsNavigation.java
@@ -9,8 +9,8 @@ import java.io.Serializable;
import java.util.Date;
import java.util.List;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -22,137 +22,137 @@ import lombok.EqualsAndHashCode;
*/
@Data
@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "CmsNavigation对象", description = "网站导航记录表")
+@Schema(name = "CmsNavigation对象", description = "网站导航记录表")
public class CmsNavigation implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "ID")
+ @Schema(description = "ID")
@TableId(value = "navigation_id", type = IdType.AUTO)
private Integer navigationId;
- @ApiModelProperty(value = "上级id, 0是顶级")
+ @Schema(description = "上级id, 0是顶级")
private Integer parentId;
- @ApiModelProperty(value = "菜单名称")
+ @Schema(description = "菜单名称")
private String title;
- @ApiModelProperty(value = "模型")
+ @Schema(description = "模型")
private String model;
- @ApiModelProperty(value = "标识")
+ @Schema(description = "标识")
private String code;
- @ApiModelProperty(value = "菜单路由地址")
+ @Schema(description = "菜单路由地址")
private String path;
- @ApiModelProperty(value = "菜单组件地址, 目录可为空")
+ @Schema(description = "菜单组件地址, 目录可为空")
private String component;
- @ApiModelProperty(value = "打开位置")
+ @Schema(description = "打开位置")
private String target;
- @ApiModelProperty(value = "菜单图标")
+ @Schema(description = "菜单图标")
private String icon;
- @ApiModelProperty(value = "图标颜色")
+ @Schema(description = "图标颜色")
private String color;
- @ApiModelProperty(value = "是否隐藏, 0否, 1是(仅注册路由不显示在左侧菜单)")
+ @Schema(description = "是否隐藏, 0否, 1是(仅注册路由不显示在左侧菜单)")
private Integer hide;
- @ApiModelProperty(value = "可见类型 0所有人 1登录可见 2密码可见")
+ @Schema(description = "可见类型 0所有人 1登录可见 2密码可见")
private Integer permission;
- @ApiModelProperty(value = "访问密码")
+ @Schema(description = "访问密码")
private String password;
- @ApiModelProperty(value = "验证密码(前端回传)")
+ @Schema(description = "验证密码(前端回传)")
@TableField(exist = false)
private String password2;
- @ApiModelProperty(value = "位置 0不限 1顶部 2底部")
+ @Schema(description = "位置 0不限 1顶部 2底部")
private Integer position;
- @ApiModelProperty(value = "仅在顶部显示")
+ @Schema(description = "仅在顶部显示")
private Integer top;
- @ApiModelProperty(value = "仅在底部显示")
+ @Schema(description = "仅在底部显示")
private Integer bottom;
- @ApiModelProperty(value = "菜单侧栏选中的path")
+ @Schema(description = "菜单侧栏选中的path")
private String active;
- @ApiModelProperty(value = "其它路由元信息")
+ @Schema(description = "其它路由元信息")
private String meta;
- @ApiModelProperty(value = "css样式")
+ @Schema(description = "css样式")
private String style;
- @ApiModelProperty(value = "父级栏目路由")
+ @Schema(description = "父级栏目路由")
private String parentPath;
- @ApiModelProperty(value = "父级栏目名称")
+ @Schema(description = "父级栏目名称")
private String parentName;
- @ApiModelProperty(value = "模型名称")
+ @Schema(description = "模型名称")
private String modelName;
- @ApiModelProperty(value = "类型（已废弃）")
+ @Schema(description = "类型（已废弃）")
private Integer type;
- @ApiModelProperty(value = "绑定的页面（已废弃）")
+ @Schema(description = "绑定的页面（已废弃）")
private Integer pageId;
- @ApiModelProperty(value = "是否微信小程序菜单")
+ @Schema(description = "是否微信小程序菜单")
private Boolean isMpWeixin;
- @ApiModelProperty(value = "用户ID")
+ @Schema(description = "用户ID")
private Integer userId;
- @ApiModelProperty(value = "设为首页")
+ @Schema(description = "设为首页")
private Integer home;
- @ApiModelProperty(value = "排序(数字越小越靠前)")
+ @Schema(description = "排序(数字越小越靠前)")
private Integer sortNumber;
- @ApiModelProperty(value = "备注")
+ @Schema(description = "备注")
private String comments;
- @ApiModelProperty(value = "是否删除, 0否, 1是")
+ @Schema(description = "是否删除, 0否, 1是")
@TableLogic
private Integer deleted;
- @ApiModelProperty(value = "状态, 0正常, 1冻结")
+ @Schema(description = "状态, 0正常, 1冻结")
private Integer status;
- @ApiModelProperty(value = "租户id")
+ @Schema(description = "租户id")
private Integer tenantId;
- @ApiModelProperty(value = "创建时间")
+ @Schema(description = "创建时间")
private Date createTime;
- @ApiModelProperty(value = "页面名称")
+ @Schema(description = "页面名称")
@TableField(exist = false)
private String pageName;
- @ApiModelProperty("子菜单")
+ @Schema(description = "子菜单")
@TableField(exist = false)
private List children;
- @ApiModelProperty(value = "页面布局")
+ @Schema(description = "页面布局")
@TableField(exist = false)
private String layout;
- @ApiModelProperty(value = "关联的页面")
+ @Schema(description = "关联的页面")
@TableField(exist = false)
private CmsDesign design;
- @ApiModelProperty(value = "当前栏目名称")
+ @Schema(description = "当前栏目名称")
@TableField(exist = false)
private String categoryName;
- @ApiModelProperty(value = "当前栏目链接")
+ @Schema(description = "当前栏目链接")
@TableField(exist = false)
private String categoryPath;
diff --git a/src/main/java/com/gxwebsoft/cms/entity/CmsProduct.java b/src/main/java/com/gxwebsoft/cms/entity/CmsProduct.java
index 4e11e37..b147d02 100644
--- a/src/main/java/com/gxwebsoft/cms/entity/CmsProduct.java
+++ b/src/main/java/com/gxwebsoft/cms/entity/CmsProduct.java
@@ -6,8 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.TableLogic;
import java.io.Serializable;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -19,100 +19,100 @@ import lombok.EqualsAndHashCode;
*/
@Data
@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "CmsProduct对象", description = "产品")
+@Schema(name = "CmsProduct对象", description = "产品")
public class CmsProduct implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "自增ID")
+ @Schema(description = "自增ID")
@TableId(value = "product_id", type = IdType.AUTO)
private Integer productId;
- @ApiModelProperty(value = "类型 0软件产品 1实物商品 2虚拟商品")
+ @Schema(description = "类型 0软件产品 1实物商品 2虚拟商品")
private Integer type;
- @ApiModelProperty(value = "产品编码")
+ @Schema(description = "产品编码")
private String code;
- @ApiModelProperty(value = "产品标题")
+ @Schema(description = "产品标题")
private String title;
- @ApiModelProperty(value = "封面图")
+ @Schema(description = "封面图")
private String image;
- @ApiModelProperty(value = "标签")
+ @Schema(description = "标签")
private String tag;
- @ApiModelProperty(value = "产品详情")
+ @Schema(description = "产品详情")
private String content;
- @ApiModelProperty(value = "父级分类ID")
+ @Schema(description = "父级分类ID")
private Integer parentId;
- @ApiModelProperty(value = "产品分类ID")
+ @Schema(description = "产品分类ID")
private Integer categoryId;
- @ApiModelProperty(value = "产品规格 0单规格 1多规格")
+ @Schema(description = "产品规格 0单规格 1多规格")
private Integer specs;
- @ApiModelProperty(value = "货架")
+ @Schema(description = "货架")
private String position;
- @ApiModelProperty(value = "单位名称 (个)")
+ @Schema(description = "单位名称 (个)")
private String unitName;
- @ApiModelProperty(value = "进货价格")
+ @Schema(description = "进货价格")
private BigDecimal price;
- @ApiModelProperty(value = "销售价格")
+ @Schema(description = "销售价格")
private BigDecimal salePrice;
- @ApiModelProperty(value = "库存计算方式(10下单减库存 20付款减库存)")
+ @Schema(description = "库存计算方式(10下单减库存 20付款减库存)")
private Integer deductStockType;
- @ApiModelProperty(value = "轮播图")
+ @Schema(description = "轮播图")
private String files;
- @ApiModelProperty(value = "销量")
+ @Schema(description = "销量")
private Integer sales;
- @ApiModelProperty(value = "库存")
+ @Schema(description = "库存")
private Integer stock;
- @ApiModelProperty(value = "消费赚取积分")
+ @Schema(description = "消费赚取积分")
private BigDecimal gainIntegral;
- @ApiModelProperty(value = "推荐")
+ @Schema(description = "推荐")
private Integer recommend;
- @ApiModelProperty(value = "商户ID")
+ @Schema(description = "商户ID")
private Long merchantId;
- @ApiModelProperty(value = "状态（0：未上架，1：上架）")
+ @Schema(description = "状态（0：未上架，1：上架）")
private Boolean isShow;
- @ApiModelProperty(value = "状态, 0上架 1待上架 2待审核 3审核不通过")
+ @Schema(description = "状态, 0上架 1待上架 2待审核 3审核不通过")
private Integer status;
- @ApiModelProperty(value = "备注")
+ @Schema(description = "备注")
private String comments;
- @ApiModelProperty(value = "排序号")
+ @Schema(description = "排序号")
private Integer sortNumber;
- @ApiModelProperty(value = "用户ID")
+ @Schema(description = "用户ID")
private Integer userId;
- @ApiModelProperty(value = "是否删除, 0否, 1是")
+ @Schema(description = "是否删除, 0否, 1是")
@TableLogic
private Integer deleted;
- @ApiModelProperty(value = "租户id")
+ @Schema(description = "租户id")
private Integer tenantId;
- @ApiModelProperty(value = "创建时间")
+ @Schema(description = "创建时间")
private LocalDateTime createTime;
- @ApiModelProperty(value = "修改时间")
+ @Schema(description = "修改时间")
private LocalDateTime updateTime;
}
diff --git a/src/main/java/com/gxwebsoft/cms/entity/CmsProductSpec.java b/src/main/java/com/gxwebsoft/cms/entity/CmsProductSpec.java
index 260aa4a..4f58fd5 100644
--- a/src/main/java/com/gxwebsoft/cms/entity/CmsProductSpec.java
+++ b/src/main/java/com/gxwebsoft/cms/entity/CmsProductSpec.java
@@ -4,8 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import java.io.Serializable;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -17,39 +17,39 @@ import lombok.EqualsAndHashCode;
*/
@Data
@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "CmsProductSpec对象", description = "规格")
+@Schema(name = "CmsProductSpec对象", description = "规格")
public class CmsProductSpec implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "规格ID")
+ @Schema(description = "规格ID")
@TableId(value = "spec_id", type = IdType.AUTO)
private Integer specId;
- @ApiModelProperty(value = "规格名称")
+ @Schema(description = "规格名称")
private String specName;
- @ApiModelProperty(value = "规格值")
+ @Schema(description = "规格值")
private String specValue;
- @ApiModelProperty(value = "创建用户")
+ @Schema(description = "创建用户")
private Integer userId;
- @ApiModelProperty(value = "更新者")
+ @Schema(description = "更新者")
private Integer updater;
- @ApiModelProperty(value = "备注")
+ @Schema(description = "备注")
private String comments;
- @ApiModelProperty(value = "状态, 0正常, 1待修,2异常已修，3异常未修")
+ @Schema(description = "状态, 0正常, 1待修,2异常已修，3异常未修")
private Integer status;
- @ApiModelProperty(value = "排序号")
+ @Schema(description = "排序号")
private Integer sortNumber;
- @ApiModelProperty(value = "租户id")
+ @Schema(description = "租户id")
private Integer tenantId;
- @ApiModelProperty(value = "创建时间")
+ @Schema(description = "创建时间")
private LocalDateTime createTime;
}
diff --git a/src/main/java/com/gxwebsoft/cms/entity/CmsProductSpecValue.java b/src/main/java/com/gxwebsoft/cms/entity/CmsProductSpecValue.java
index 970846d..ef53383 100644
--- a/src/main/java/com/gxwebsoft/cms/entity/CmsProductSpecValue.java
+++ b/src/main/java/com/gxwebsoft/cms/entity/CmsProductSpecValue.java
@@ -4,8 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import java.io.Serializable;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -17,30 +17,30 @@ import lombok.EqualsAndHashCode;
*/
@Data
@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "CmsProductSpecValue对象", description = "规格值")
+@Schema(name = "CmsProductSpecValue对象", description = "规格值")
public class CmsProductSpecValue implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "规格值ID")
+ @Schema(description = "规格值ID")
@TableId(value = "spec_value_id", type = IdType.AUTO)
private Integer specValueId;
- @ApiModelProperty(value = "规格组ID")
+ @Schema(description = "规格组ID")
private Integer specId;
- @ApiModelProperty(value = "规格值")
+ @Schema(description = "规格值")
private String specValue;
- @ApiModelProperty(value = "备注")
+ @Schema(description = "备注")
private String comments;
- @ApiModelProperty(value = "排序号")
+ @Schema(description = "排序号")
private Integer sortNumber;
- @ApiModelProperty(value = "租户id")
+ @Schema(description = "租户id")
private Integer tenantId;
- @ApiModelProperty(value = "创建时间")
+ @Schema(description = "创建时间")
private LocalDateTime createTime;
}
diff --git a/src/main/java/com/gxwebsoft/cms/entity/CmsProductUrl.java b/src/main/java/com/gxwebsoft/cms/entity/CmsProductUrl.java
index b8b8738..6ca7292 100644
--- a/src/main/java/com/gxwebsoft/cms/entity/CmsProductUrl.java
+++ b/src/main/java/com/gxwebsoft/cms/entity/CmsProductUrl.java
@@ -4,8 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import java.io.Serializable;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -17,45 +17,45 @@ import lombok.EqualsAndHashCode;
*/
@Data
@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "CmsProductUrl对象", description = "域名")
+@Schema(name = "CmsProductUrl对象", description = "域名")
public class CmsProductUrl implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "自增ID")
+ @Schema(description = "自增ID")
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
- @ApiModelProperty(value = "产品ID")
+ @Schema(description = "产品ID")
private Integer productId;
- @ApiModelProperty(value = "域名类型")
+ @Schema(description = "域名类型")
private String type;
- @ApiModelProperty(value = "域名")
+ @Schema(description = "域名")
private String domain;
- @ApiModelProperty(value = "账号")
+ @Schema(description = "账号")
private String account;
- @ApiModelProperty(value = "密码")
+ @Schema(description = "密码")
private String password;
- @ApiModelProperty(value = "商户ID")
+ @Schema(description = "商户ID")
private Integer merchantId;
- @ApiModelProperty(value = "备注")
+ @Schema(description = "备注")
private String comments;
- @ApiModelProperty(value = "排序(数字越小越靠前)")
+ @Schema(description = "排序(数字越小越靠前)")
private Integer sortNumber;
- @ApiModelProperty(value = "状态, 0正常, 1待确认")
+ @Schema(description = "状态, 0正常, 1待确认")
private Integer status;
- @ApiModelProperty(value = "创建时间")
+ @Schema(description = "创建时间")
private LocalDateTime createTime;
- @ApiModelProperty(value = "租户id")
+ @Schema(description = "租户id")
private Integer tenantId;
}
diff --git a/src/main/java/com/gxwebsoft/cms/entity/CmsWebsite.java b/src/main/java/com/gxwebsoft/cms/entity/CmsWebsite.java
index a417c4f..1581ea9 100644
--- a/src/main/java/com/gxwebsoft/cms/entity/CmsWebsite.java
+++ b/src/main/java/com/gxwebsoft/cms/entity/CmsWebsite.java
@@ -13,8 +13,8 @@ import java.util.Map;
import com.gxwebsoft.common.system.entity.User;
import com.gxwebsoft.common.system.entity.WebsiteField;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -26,180 +26,180 @@ import lombok.EqualsAndHashCode;
*/
@Data
@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "CmsWebsite对象", description = "网站信息记录表")
+@Schema(name = "CmsWebsite对象", description = "网站信息记录表")
public class CmsWebsite implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "站点ID")
+ @Schema(description = "站点ID")
@TableId(value = "website_id", type = IdType.AUTO)
private Integer websiteId;
- @ApiModelProperty(value = "网站名称")
+ @Schema(description = "网站名称")
private String websiteName;
- @ApiModelProperty(value = "网站标识")
+ @Schema(description = "网站标识")
private String websiteCode;
- @ApiModelProperty(value = "网站LOGO")
+ @Schema(description = "网站LOGO")
private String websiteIcon;
- @ApiModelProperty(value = "网站LOGO")
+ @Schema(description = "网站LOGO")
private String websiteLogo;
- @ApiModelProperty(value = "网站LOGO(深色模式)")
+ @Schema(description = "网站LOGO(深色模式)")
private String websiteDarkLogo;
- @ApiModelProperty(value = "网站类型")
+ @Schema(description = "网站类型")
private String websiteType;
- @ApiModelProperty(value = "网站关键词")
+ @Schema(description = "网站关键词")
private String keywords;
- @ApiModelProperty(value = "域名前缀")
+ @Schema(description = "域名前缀")
private String prefix;
- @ApiModelProperty(value = "绑定域名")
+ @Schema(description = "绑定域名")
private String domain;
- @ApiModelProperty(value = "全局样式")
+ @Schema(description = "全局样式")
private String style;
- @ApiModelProperty(value = "后台管理地址")
+ @Schema(description = "后台管理地址")
private String adminUrl;
- @ApiModelProperty(value = "应用版本 10免费版 20授权版 30永久授权")
+ @Schema(description = "应用版本 10免费版 20授权版 30永久授权")
private Integer version;
- @ApiModelProperty(value = "服务到期时间")
+ @Schema(description = "服务到期时间")
private Date expirationTime;
- @ApiModelProperty(value = "模版ID")
+ @Schema(description = "模版ID")
private Integer templateId;
- @ApiModelProperty(value = "行业类型(父级)")
+ @Schema(description = "行业类型(父级)")
private String industryParent;
- @ApiModelProperty(value = "行业类型(子级)")
+ @Schema(description = "行业类型(子级)")
private String industryChild;
- @ApiModelProperty(value = "企业ID")
+ @Schema(description = "企业ID")
private Integer companyId;
- @ApiModelProperty(value = "所在国家")
+ @Schema(description = "所在国家")
private String country;
- @ApiModelProperty(value = "所在省份")
+ @Schema(description = "所在省份")
private String province;
- @ApiModelProperty(value = "所在城市")
+ @Schema(description = "所在城市")
private String city;
- @ApiModelProperty(value = "所在辖区")
+ @Schema(description = "所在辖区")
private String region;
- @ApiModelProperty(value = "经度")
+ @Schema(description = "经度")
private String longitude;
- @ApiModelProperty(value = "纬度")
+ @Schema(description = "纬度")
private String latitude;
- @ApiModelProperty(value = "街道地址")
+ @Schema(description = "街道地址")
private String address;
- @ApiModelProperty(value = "联系电话")
+ @Schema(description = "联系电话")
private String phone;
- @ApiModelProperty(value = "电子邮箱")
+ @Schema(description = "电子邮箱")
private String email;
- @ApiModelProperty(value = "ICP备案号")
+ @Schema(description = "ICP备案号")
private String icpNo;
- @ApiModelProperty(value = "公安备案")
+ @Schema(description = "公安备案")
private String policeNo;
- @ApiModelProperty(value = "备注")
+ @Schema(description = "备注")
private String comments;
- @ApiModelProperty(value = "是否推荐")
+ @Schema(description = "是否推荐")
private Integer recommend;
- @ApiModelProperty(value = "状态 0未开通 1运行中 2维护中 3已关闭 4已欠费停机 5违规关停")
+ @Schema(description = "状态 0未开通 1运行中 2维护中 3已关闭 4已欠费停机 5违规关停")
private Integer status;
- @ApiModelProperty(value = "维护说明")
+ @Schema(description = "维护说明")
private String statusText;
- @ApiModelProperty(value = "关闭说明")
+ @Schema(description = "关闭说明")
private String statusClose;
- @ApiModelProperty(value = "全局样式")
+ @Schema(description = "全局样式")
private String styles;
- @ApiModelProperty(value = "排序号")
+ @Schema(description = "排序号")
private Integer sortNumber;
- @ApiModelProperty(value = "用户ID")
+ @Schema(description = "用户ID")
private Integer userId;
- @ApiModelProperty(value = "是否删除, 0否, 1是")
+ @Schema(description = "是否删除, 0否, 1是")
@TableLogic
private Integer deleted;
- @ApiModelProperty(value = "租户id")
+ @Schema(description = "租户id")
private Integer tenantId;
- @ApiModelProperty(value = "创建时间")
+ @Schema(description = "创建时间")
private Date createTime;
- @ApiModelProperty(value = "修改时间")
+ @Schema(description = "修改时间")
private Date updateTime;
- @ApiModelProperty(value = "预设字段")
+ @Schema(description = "预设字段")
@TableField(exist = false)
private HashMap fields;
- @ApiModelProperty(value = "小程序导航图标")
+ @Schema(description = "小程序导航图标")
@TableField(exist = false)
private Map> mpMenus;
- @ApiModelProperty(value = "网站导航栏")
+ @Schema(description = "网站导航栏")
@TableField(exist = false)
private List navigations;
- @ApiModelProperty(value = "顶部菜单")
+ @Schema(description = "顶部菜单")
@TableField(exist = false)
private List topNavs;
- @ApiModelProperty(value = "底部菜单")
+ @Schema(description = "底部菜单")
@TableField(exist = false)
private List bottomNavs;
- @ApiModelProperty(value = "幻灯片广告")
+ @Schema(description = "幻灯片广告")
@TableField(exist = false)
private CmsAd slide;
- @ApiModelProperty(value = "站点广告")
+ @Schema(description = "站点广告")
@TableField(exist = false)
private List ads;
- @ApiModelProperty(value = "首页布局")
+ @Schema(description = "首页布局")
@TableField(exist = false)
private String layout;
- @ApiModelProperty(value = "友情链接")
+ @Schema(description = "友情链接")
@TableField(exist = false)
private List links;
- @ApiModelProperty(value = "配置信息")
+ @Schema(description = "配置信息")
@TableField(exist = false)
private Object config;
- @ApiModelProperty(value = "服务器时间")
+ @Schema(description = "服务器时间")
@TableField(exist = false)
private HashMap serverTime;
- @ApiModelProperty(value = "当前登录用户")
+ @Schema(description = "当前登录用户")
@TableField(exist = false)
private User loginUser;
diff --git a/src/main/java/com/gxwebsoft/cms/entity/CmsWebsiteField.java b/src/main/java/com/gxwebsoft/cms/entity/CmsWebsiteField.java
index f435d8f..694a03c 100644
--- a/src/main/java/com/gxwebsoft/cms/entity/CmsWebsiteField.java
+++ b/src/main/java/com/gxwebsoft/cms/entity/CmsWebsiteField.java
@@ -7,8 +7,8 @@ import com.baomidou.mybatisplus.annotation.TableLogic;
import java.io.Serializable;
import java.util.Date;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -20,49 +20,49 @@ import lombok.EqualsAndHashCode;
*/
@Data
@EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "CmsWebsiteField对象", description = "应用参数")
+@Schema(name = "CmsWebsiteField对象", description = "应用参数")
public class CmsWebsiteField implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "自增ID")
+ @Schema(description = "自增ID")
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
- @ApiModelProperty(value = "类型，0文本 1图片 2其他")
+ @Schema(description = "类型，0文本 1图片 2其他")
private Integer type;
- @ApiModelProperty(value = "名称")
+ @Schema(description = "名称")
private String name;
- @ApiModelProperty(value = "默认值")
+ @Schema(description = "默认值")
private String defaultValue;
- @ApiModelProperty(value = "可修改的值 [on|off]")
+ @Schema(description = "可修改的值 [on|off]")
private String modifyRange;
- @ApiModelProperty(value = "备注")
+ @Schema(description = "备注")
private String comments;
- @ApiModelProperty(value = "css样式")
+ @Schema(description = "css样式")
private String style;
- @ApiModelProperty(value = "名称")
+ @Schema(description = "名称")
private String value;
- @ApiModelProperty(value = "国际化语言")
+ @Schema(description = "国际化语言")
private String lang;
- @ApiModelProperty(value = "排序(数字越小越靠前)")
+ @Schema(description = "排序(数字越小越靠前)")
private Integer sortNumber;
- @ApiModelProperty(value = "是否删除, 0否, 1是")
+ @Schema(description = "是否删除, 0否, 1是")
@TableLogic
private Integer deleted;
- @ApiModelProperty(value = "租户id")
+ @Schema(description = "租户id")
private Integer tenantId;
- @ApiModelProperty(value = "创建时间")
+ @Schema(description = "创建时间")
private Date createTime;
}
diff --git a/src/main/java/com/gxwebsoft/cms/param/CmsAdParam.java b/src/main/java/com/gxwebsoft/cms/param/CmsAdParam.java
index bc52c37..95a9826 100644
--- a/src/main/java/com/gxwebsoft/cms/param/CmsAdParam.java
+++ b/src/main/java/com/gxwebsoft/cms/param/CmsAdParam.java
@@ -4,8 +4,8 @@ import com.gxwebsoft.common.core.annotation.QueryField;
import com.gxwebsoft.common.core.annotation.QueryType;
import com.gxwebsoft.common.core.web.BaseParam;
import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -18,59 +18,59 @@ import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = false)
@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "CmsAdParam对象", description = "广告位查询参数")
+@Schema(name = "CmsAdParam对象", description = "广告位查询参数")
public class CmsAdParam extends BaseParam {
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "ID")
+ @Schema(description = "ID")
@QueryField(type = QueryType.EQ)
private Integer adId;
- @ApiModelProperty(value = "页面ID")
+ @Schema(description = "页面ID")
@QueryField(type = QueryType.EQ)
private Integer designId;
- @ApiModelProperty(value = "广告类型")
+ @Schema(description = "广告类型")
private String adType;
- @ApiModelProperty(value = "广告位名称")
+ @Schema(description = "广告位名称")
private String name;
- @ApiModelProperty(value = "宽")
+ @Schema(description = "宽")
private String width;
- @ApiModelProperty(value = "高")
+ @Schema(description = "高")
private String height;
- @ApiModelProperty(value = "广告图片")
+ @Schema(description = "广告图片")
private String images;
- @ApiModelProperty(value = "路由/链接地址")
+ @Schema(description = "路由/链接地址")
private String path;
- @ApiModelProperty(value = "用户ID")
+ @Schema(description = "用户ID")
@QueryField(type = QueryType.EQ)
private Integer userId;
- @ApiModelProperty(value = "页面ID")
+ @Schema(description = "页面ID")
@QueryField(type = QueryType.EQ)
private Integer pageId;
- @ApiModelProperty(value = "页面名称")
+ @Schema(description = "页面名称")
private String pageName;
- @ApiModelProperty(value = "排序(数字越小越靠前)")
+ @Schema(description = "排序(数字越小越靠前)")
@QueryField(type = QueryType.EQ)
private Integer sortNumber;
- @ApiModelProperty(value = "备注")
+ @Schema(description = "备注")
private String comments;
- @ApiModelProperty(value = "状态, 0正常, 1冻结")
+ @Schema(description = "状态, 0正常, 1冻结")
@QueryField(type = QueryType.EQ)
private Integer status;
- @ApiModelProperty(value = "是否删除, 0否, 1是")
+ @Schema(description = "是否删除, 0否, 1是")
@QueryField(type = QueryType.EQ)
private Integer deleted;
diff --git a/src/main/java/com/gxwebsoft/cms/param/CmsAdRecordParam.java b/src/main/java/com/gxwebsoft/cms/param/CmsAdRecordParam.java
index 83fafce..dd125c0 100644
--- a/src/main/java/com/gxwebsoft/cms/param/CmsAdRecordParam.java
+++ b/src/main/java/com/gxwebsoft/cms/param/CmsAdRecordParam.java
@@ -4,8 +4,8 @@ import com.gxwebsoft.common.core.annotation.QueryField;
import com.gxwebsoft.common.core.annotation.QueryType;
import com.gxwebsoft.common.core.web.BaseParam;
import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -18,35 +18,35 @@ import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = false)
@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "CmsAdRecordParam对象", description = "广告图片查询参数")
+@Schema(name = "CmsAdRecordParam对象", description = "广告图片查询参数")
public class CmsAdRecordParam extends BaseParam {
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "ID")
+ @Schema(description = "ID")
@QueryField(type = QueryType.EQ)
private Integer adRecordId;
- @ApiModelProperty(value = "广告标题")
+ @Schema(description = "广告标题")
private String title;
- @ApiModelProperty(value = "图片地址")
+ @Schema(description = "图片地址")
private String path;
- @ApiModelProperty(value = "链接地址")
+ @Schema(description = "链接地址")
private String url;
- @ApiModelProperty(value = "广告位ID")
+ @Schema(description = "广告位ID")
@QueryField(type = QueryType.EQ)
private Integer adId;
- @ApiModelProperty(value = "排序(数字越小越靠前)")
+ @Schema(description = "排序(数字越小越靠前)")
@QueryField(type = QueryType.EQ)
private Integer sortNumber;
- @ApiModelProperty(value = "备注")
+ @Schema(description = "备注")
private String comments;
- @ApiModelProperty(value = "状态, 0正常, 1冻结")
+ @Schema(description = "状态, 0正常, 1冻结")
@QueryField(type = QueryType.EQ)
private Integer status;
diff --git a/src/main/java/com/gxwebsoft/cms/param/CmsArticleCategoryParam.java b/src/main/java/com/gxwebsoft/cms/param/CmsArticleCategoryParam.java
index 495a8a0..601236c 100644
--- a/src/main/java/com/gxwebsoft/cms/param/CmsArticleCategoryParam.java
+++ b/src/main/java/com/gxwebsoft/cms/param/CmsArticleCategoryParam.java
@@ -4,8 +4,8 @@ import com.gxwebsoft.common.core.annotation.QueryField;
import com.gxwebsoft.common.core.annotation.QueryType;
import com.gxwebsoft.common.core.web.BaseParam;
import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -18,73 +18,73 @@ import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = false)
@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "CmsArticleCategoryParam对象", description = "文章分类表查询参数")
+@Schema(name = "CmsArticleCategoryParam对象", description = "文章分类表查询参数")
public class CmsArticleCategoryParam extends BaseParam {
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "文章分类ID")
+ @Schema(description = "文章分类ID")
@QueryField(type = QueryType.EQ)
private Integer categoryId;
- @ApiModelProperty(value = "分类标识")
+ @Schema(description = "分类标识")
private String categoryCode;
- @ApiModelProperty(value = "分类名称")
+ @Schema(description = "分类名称")
private String title;
- @ApiModelProperty(value = "类型 0列表 1单页 2外链")
+ @Schema(description = "类型 0列表 1单页 2外链")
@QueryField(type = QueryType.EQ)
private Integer type;
- @ApiModelProperty(value = "分类图片")
+ @Schema(description = "分类图片")
private String image;
- @ApiModelProperty(value = "上级分类ID")
+ @Schema(description = "上级分类ID")
@QueryField(type = QueryType.EQ)
private Integer parentId;
- @ApiModelProperty(value = "路由/链接地址")
+ @Schema(description = "路由/链接地址")
private String path;
- @ApiModelProperty(value = "组件路径")
+ @Schema(description = "组件路径")
private String component;
- @ApiModelProperty(value = "绑定的页面")
+ @Schema(description = "绑定的页面")
@QueryField(type = QueryType.EQ)
private Integer pageId;
- @ApiModelProperty(value = "用户ID")
+ @Schema(description = "用户ID")
@QueryField(type = QueryType.EQ)
private Integer userId;
- @ApiModelProperty(value = "文章数量")
+ @Schema(description = "文章数量")
@QueryField(type = QueryType.EQ)
private Integer count;
- @ApiModelProperty(value = "排序(数字越小越靠前)")
+ @Schema(description = "排序(数字越小越靠前)")
@QueryField(type = QueryType.EQ)
private Integer sortNumber;
- @ApiModelProperty(value = "备注")
+ @Schema(description = "备注")
private String comments;
- @ApiModelProperty(value = "是否隐藏, 0否, 1是(仅注册路由不显示在左侧菜单)")
+ @Schema(description = "是否隐藏, 0否, 1是(仅注册路由不显示在左侧菜单)")
@QueryField(type = QueryType.EQ)
private Integer hide;
- @ApiModelProperty(value = "是否推荐")
+ @Schema(description = "是否推荐")
@QueryField(type = QueryType.EQ)
private Integer recommend;
- @ApiModelProperty(value = "是否显示在首页")
+ @Schema(description = "是否显示在首页")
@QueryField(type = QueryType.EQ)
private Integer showIndex;
- @ApiModelProperty(value = "状态, 0正常, 1禁用")
+ @Schema(description = "状态, 0正常, 1禁用")
@QueryField(type = QueryType.EQ)
private Integer status;
- @ApiModelProperty(value = "是否删除, 0否, 1是")
+ @Schema(description = "是否删除, 0否, 1是")
@QueryField(type = QueryType.EQ)
private Integer deleted;
diff --git a/src/main/java/com/gxwebsoft/cms/param/CmsArticleCommentParam.java b/src/main/java/com/gxwebsoft/cms/param/CmsArticleCommentParam.java
index 4c45767..e185eaf 100644
--- a/src/main/java/com/gxwebsoft/cms/param/CmsArticleCommentParam.java
+++ b/src/main/java/com/gxwebsoft/cms/param/CmsArticleCommentParam.java
@@ -4,8 +4,8 @@ import com.gxwebsoft.common.core.annotation.QueryField;
import com.gxwebsoft.common.core.annotation.QueryType;
import com.gxwebsoft.common.core.web.BaseParam;
import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -18,57 +18,57 @@ import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = false)
@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "CmsArticleCommentParam对象", description = "文章评论表查询参数")
+@Schema(name = "CmsArticleCommentParam对象", description = "文章评论表查询参数")
public class CmsArticleCommentParam extends BaseParam {
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "评价ID")
+ @Schema(description = "评价ID")
@QueryField(type = QueryType.EQ)
private Integer commentId;
- @ApiModelProperty(value = "文章ID")
+ @Schema(description = "文章ID")
@QueryField(type = QueryType.EQ)
private Integer articleId;
- @ApiModelProperty(value = "评分 (10好评 20中评 30差评)")
+ @Schema(description = "评分 (10好评 20中评 30差评)")
@QueryField(type = QueryType.EQ)
private Integer score;
- @ApiModelProperty(value = "评价内容")
+ @Schema(description = "评价内容")
private String content;
- @ApiModelProperty(value = "是否为图片评价")
+ @Schema(description = "是否为图片评价")
@QueryField(type = QueryType.EQ)
private Integer isPicture;
- @ApiModelProperty(value = "评论者ID")
+ @Schema(description = "评论者ID")
@QueryField(type = QueryType.EQ)
private Integer userId;
- @ApiModelProperty(value = "被评价者ID")
+ @Schema(description = "被评价者ID")
@QueryField(type = QueryType.EQ)
private Integer toUserId;
- @ApiModelProperty(value = "回复的评论ID")
+ @Schema(description = "回复的评论ID")
@QueryField(type = QueryType.EQ)
private Integer replyCommentId;
- @ApiModelProperty(value = "回复者ID")
+ @Schema(description = "回复者ID")
@QueryField(type = QueryType.EQ)
private Integer replyUserId;
- @ApiModelProperty(value = "排序(数字越小越靠前)")
+ @Schema(description = "排序(数字越小越靠前)")
@QueryField(type = QueryType.EQ)
private Integer sortNumber;
- @ApiModelProperty(value = "备注")
+ @Schema(description = "备注")
private String comments;
- @ApiModelProperty(value = "状态, 0未读, 1已读")
+ @Schema(description = "状态, 0未读, 1已读")
@QueryField(type = QueryType.EQ)
private Integer status;
- @ApiModelProperty(value = "是否删除, 0否, 1是")
+ @Schema(description = "是否删除, 0否, 1是")
@QueryField(type = QueryType.EQ)
private Integer deleted;
diff --git a/src/main/java/com/gxwebsoft/cms/param/CmsArticleContentParam.java b/src/main/java/com/gxwebsoft/cms/param/CmsArticleContentParam.java
index 44970af..4976eff 100644
--- a/src/main/java/com/gxwebsoft/cms/param/CmsArticleContentParam.java
+++ b/src/main/java/com/gxwebsoft/cms/param/CmsArticleContentParam.java
@@ -4,8 +4,8 @@ import com.gxwebsoft.common.core.annotation.QueryField;
import com.gxwebsoft.common.core.annotation.QueryType;
import com.gxwebsoft.common.core.web.BaseParam;
import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -18,18 +18,18 @@ import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = false)
@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "CmsArticleContentParam对象", description = "文章记录表查询参数")
+@Schema(name = "CmsArticleContentParam对象", description = "文章记录表查询参数")
public class CmsArticleContentParam extends BaseParam {
private static final long serialVersionUID = 1L;
@QueryField(type = QueryType.EQ)
private Integer id;
- @ApiModelProperty(value = "文章ID")
+ @Schema(description = "文章ID")
@QueryField(type = QueryType.EQ)
private Integer articleId;
- @ApiModelProperty(value = "文章内容")
+ @Schema(description = "文章内容")
private String content;
}
diff --git a/src/main/java/com/gxwebsoft/cms/param/CmsArticleCountParam.java b/src/main/java/com/gxwebsoft/cms/param/CmsArticleCountParam.java
index 8598014..9878abe 100644
--- a/src/main/java/com/gxwebsoft/cms/param/CmsArticleCountParam.java
+++ b/src/main/java/com/gxwebsoft/cms/param/CmsArticleCountParam.java
@@ -4,8 +4,8 @@ import com.gxwebsoft.common.core.annotation.QueryField;
import com.gxwebsoft.common.core.annotation.QueryType;
import com.gxwebsoft.common.core.web.BaseParam;
import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -18,19 +18,19 @@ import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = false)
@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "CmsArticleCountParam对象", description = "点赞文章查询参数")
+@Schema(name = "CmsArticleCountParam对象", description = "点赞文章查询参数")
public class CmsArticleCountParam extends BaseParam {
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "主键ID")
+ @Schema(description = "主键ID")
@QueryField(type = QueryType.EQ)
private Integer id;
- @ApiModelProperty(value = "文章ID")
+ @Schema(description = "文章ID")
@QueryField(type = QueryType.EQ)
private Integer articleId;
- @ApiModelProperty(value = "用户ID")
+ @Schema(description = "用户ID")
@QueryField(type = QueryType.EQ)
private Integer userId;
diff --git a/src/main/java/com/gxwebsoft/cms/param/CmsArticleLikeParam.java b/src/main/java/com/gxwebsoft/cms/param/CmsArticleLikeParam.java
index 5f82991..435d6da 100644
--- a/src/main/java/com/gxwebsoft/cms/param/CmsArticleLikeParam.java
+++ b/src/main/java/com/gxwebsoft/cms/param/CmsArticleLikeParam.java
@@ -4,8 +4,8 @@ import com.gxwebsoft.common.core.annotation.QueryField;
import com.gxwebsoft.common.core.annotation.QueryType;
import com.gxwebsoft.common.core.web.BaseParam;
import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -18,19 +18,19 @@ import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = false)
@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "CmsArticleLikeParam对象", description = "点赞文章查询参数")
+@Schema(name = "CmsArticleLikeParam对象", description = "点赞文章查询参数")
public class CmsArticleLikeParam extends BaseParam {
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "主键ID")
+ @Schema(description = "主键ID")
@QueryField(type = QueryType.EQ)
private Integer id;
- @ApiModelProperty(value = "文章ID")
+ @Schema(description = "文章ID")
@QueryField(type = QueryType.EQ)
private Integer articleId;
- @ApiModelProperty(value = "用户ID")
+ @Schema(description = "用户ID")
@QueryField(type = QueryType.EQ)
private Integer userId;
diff --git a/src/main/java/com/gxwebsoft/cms/param/CmsArticleParam.java b/src/main/java/com/gxwebsoft/cms/param/CmsArticleParam.java
index 28ea846..d9f484d 100644
--- a/src/main/java/com/gxwebsoft/cms/param/CmsArticleParam.java
+++ b/src/main/java/com/gxwebsoft/cms/param/CmsArticleParam.java
@@ -4,8 +4,8 @@ import com.gxwebsoft.common.core.annotation.QueryField;
import com.gxwebsoft.common.core.annotation.QueryType;
import com.gxwebsoft.common.core.web.BaseParam;
import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -18,122 +18,122 @@ import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = false)
@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "CmsArticleParam对象", description = "文章查询参数")
+@Schema(name = "CmsArticleParam对象", description = "文章查询参数")
public class CmsArticleParam extends BaseParam {
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "文章ID")
+ @Schema(description = "文章ID")
@QueryField(type = QueryType.EQ)
private Integer articleId;
- @ApiModelProperty(value = "文章标题")
+ @Schema(description = "文章标题")
private String title;
- @ApiModelProperty(value = "文章类型 0常规 1视频")
+ @Schema(description = "文章类型 0常规 1视频")
@QueryField(type = QueryType.EQ)
private Integer type;
- @ApiModelProperty(value = "文章模型")
+ @Schema(description = "文章模型")
private String model;
- @ApiModelProperty(value = "列表显示方式(10小图展示 20大图展示)")
+ @Schema(description = "列表显示方式(10小图展示 20大图展示)")
@QueryField(type = QueryType.EQ)
private Integer showType;
- @ApiModelProperty(value = "话题")
+ @Schema(description = "话题")
private String topic;
- @ApiModelProperty(value = "栏目ID")
+ @Schema(description = "栏目ID")
@QueryField(type = QueryType.EQ)
private Integer navigationId;
- @ApiModelProperty(value = "文章分类ID")
+ @Schema(description = "文章分类ID")
@QueryField(type = QueryType.EQ)
private Integer categoryId;
- @ApiModelProperty(value = "封面图")
+ @Schema(description = "封面图")
private String image;
- @ApiModelProperty(value = "来源")
+ @Schema(description = "来源")
private String source;
- @ApiModelProperty(value = "虚拟阅读量(仅用作展示)")
+ @Schema(description = "虚拟阅读量(仅用作展示)")
@QueryField(type = QueryType.EQ)
private Integer virtualViews;
- @ApiModelProperty(value = "实际阅读量")
+ @Schema(description = "实际阅读量")
@QueryField(type = QueryType.EQ)
private Integer actualViews;
- @ApiModelProperty(value = "可见类型 0所有人 1登录可见 2密码可见")
+ @Schema(description = "可见类型 0所有人 1登录可见 2密码可见")
@QueryField(type = QueryType.EQ)
private Integer permission;
- @ApiModelProperty(value = "访问密码")
+ @Schema(description = "访问密码")
@QueryField(type = QueryType.EQ)
private String password;
- @ApiModelProperty(value = "访问密码")
+ @Schema(description = "访问密码")
@QueryField(type = QueryType.EQ)
private String password2;
- @ApiModelProperty(value = "发布来源客户端 (APP、H5、小程序等)")
+ @Schema(description = "发布来源客户端 (APP、H5、小程序等)")
private String platform;
- @ApiModelProperty(value = "文章附件")
+ @Schema(description = "文章附件")
private String files;
- @ApiModelProperty(value = "视频地址")
+ @Schema(description = "视频地址")
private String video;
- @ApiModelProperty(value = "接受的文件类型")
+ @Schema(description = "接受的文件类型")
private String accept;
- @ApiModelProperty(value = "经度")
+ @Schema(description = "经度")
private String longitude;
- @ApiModelProperty(value = "纬度")
+ @Schema(description = "纬度")
private String latitude;
- @ApiModelProperty(value = "所在省份")
+ @Schema(description = "所在省份")
private String province;
- @ApiModelProperty(value = "所在城市")
+ @Schema(description = "所在城市")
private String city;
- @ApiModelProperty(value = "所在辖区")
+ @Schema(description = "所在辖区")
private String region;
- @ApiModelProperty(value = "街道地址")
+ @Schema(description = "街道地址")
private String address;
- @ApiModelProperty(value = "点赞数")
+ @Schema(description = "点赞数")
@QueryField(type = QueryType.EQ)
private Integer likes;
- @ApiModelProperty(value = "评论数")
+ @Schema(description = "评论数")
@QueryField(type = QueryType.EQ)
private Integer commentNumbers;
- @ApiModelProperty(value = "提醒谁看")
+ @Schema(description = "提醒谁看")
private String toUsers;
- @ApiModelProperty(value = "用户ID")
+ @Schema(description = "用户ID")
@QueryField(type = QueryType.EQ)
private Integer userId;
- @ApiModelProperty(value = "排序(数字越小越靠前)")
+ @Schema(description = "排序(数字越小越靠前)")
@QueryField(type = QueryType.EQ)
private Integer sortNumber;
- @ApiModelProperty(value = "备注")
+ @Schema(description = "备注")
private String comments;
- @ApiModelProperty(value = "状态, 0已发布, 1待审核 2已驳回 3违规内容")
+ @Schema(description = "状态, 0已发布, 1待审核 2已驳回 3违规内容")
@QueryField(type = QueryType.EQ)
private Integer status;
- @ApiModelProperty(value = "是否删除, 0否, 1是")
+ @Schema(description = "是否删除, 0否, 1是")
@QueryField(type = QueryType.EQ)
private Integer deleted;
diff --git a/src/main/java/com/gxwebsoft/cms/param/CmsComponentsParam.java b/src/main/java/com/gxwebsoft/cms/param/CmsComponentsParam.java
index b8286e6..9be566f 100644
--- a/src/main/java/com/gxwebsoft/cms/param/CmsComponentsParam.java
+++ b/src/main/java/com/gxwebsoft/cms/param/CmsComponentsParam.java
@@ -4,8 +4,8 @@ import com.gxwebsoft.common.core.annotation.QueryField;
import com.gxwebsoft.common.core.annotation.QueryType;
import com.gxwebsoft.common.core.web.BaseParam;
import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -18,48 +18,48 @@ import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = false)
@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "CmsComponentsParam对象", description = "组件查询参数")
+@Schema(name = "CmsComponentsParam对象", description = "组件查询参数")
public class CmsComponentsParam extends BaseParam {
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "ID")
+ @Schema(description = "ID")
@QueryField(type = QueryType.EQ)
private Integer id;
- @ApiModelProperty(value = "组件标题")
+ @Schema(description = "组件标题")
private String title;
- @ApiModelProperty(value = "关联导航ID")
+ @Schema(description = "关联导航ID")
@QueryField(type = QueryType.EQ)
private Integer navigationId;
- @ApiModelProperty(value = "组件类型")
+ @Schema(description = "组件类型")
private String type;
- @ApiModelProperty(value = "页面关键词")
+ @Schema(description = "页面关键词")
private String keywords;
- @ApiModelProperty(value = "页面描述")
+ @Schema(description = "页面描述")
private String description;
- @ApiModelProperty(value = "组件路径")
+ @Schema(description = "组件路径")
private String path;
- @ApiModelProperty(value = "组件图标")
+ @Schema(description = "组件图标")
private String icon;
- @ApiModelProperty(value = "用户ID")
+ @Schema(description = "用户ID")
@QueryField(type = QueryType.EQ)
private Integer userId;
- @ApiModelProperty(value = "排序(数字越小越靠前)")
+ @Schema(description = "排序(数字越小越靠前)")
@QueryField(type = QueryType.EQ)
private Integer sortNumber;
- @ApiModelProperty(value = "备注")
+ @Schema(description = "备注")
private String comments;
- @ApiModelProperty(value = "状态, 0正常, 1冻结")
+ @Schema(description = "状态, 0正常, 1冻结")
@QueryField(type = QueryType.EQ)
private Integer status;
diff --git a/src/main/java/com/gxwebsoft/cms/param/CmsDesignParam.java b/src/main/java/com/gxwebsoft/cms/param/CmsDesignParam.java
index e16bf00..e0cf02c 100644
--- a/src/main/java/com/gxwebsoft/cms/param/CmsDesignParam.java
+++ b/src/main/java/com/gxwebsoft/cms/param/CmsDesignParam.java
@@ -4,8 +4,8 @@ import com.gxwebsoft.common.core.annotation.QueryField;
import com.gxwebsoft.common.core.annotation.QueryType;
import com.gxwebsoft.common.core.web.BaseParam;
import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -18,70 +18,70 @@ import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = false)
@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "CmsDesignParam对象", description = "页面管理记录表查询参数")
+@Schema(name = "CmsDesignParam对象", description = "页面管理记录表查询参数")
public class CmsDesignParam extends BaseParam {
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "ID")
+ @Schema(description = "ID")
@QueryField(type = QueryType.EQ)
private Integer pageId;
- @ApiModelProperty(value = "页面标题")
+ @Schema(description = "页面标题")
private String name;
- @ApiModelProperty(value = "所属栏目ID")
+ @Schema(description = "所属栏目ID")
@QueryField(type = QueryType.EQ)
private Integer categoryId;
- @ApiModelProperty(value = "页面关键词")
+ @Schema(description = "页面关键词")
private String keywords;
- @ApiModelProperty(value = "页面描述")
+ @Schema(description = "页面描述")
private String description;
- @ApiModelProperty(value = "缩列图")
+ @Schema(description = "缩列图")
private String photo;
- @ApiModelProperty(value = "购买链接")
+ @Schema(description = "购买链接")
private String buyUrl;
- @ApiModelProperty(value = "页面样式")
+ @Schema(description = "页面样式")
private String style;
- @ApiModelProperty(value = "页面内容")
+ @Schema(description = "页面内容")
private String content;
- @ApiModelProperty(value = "是否开启布局")
+ @Schema(description = "是否开启布局")
@QueryField(type = QueryType.EQ)
private Integer showLayout;
- @ApiModelProperty(value = "页面布局")
+ @Schema(description = "页面布局")
private String layout;
- @ApiModelProperty(value = "上级id, 0是顶级")
+ @Schema(description = "上级id, 0是顶级")
@QueryField(type = QueryType.EQ)
private Integer parentId;
- @ApiModelProperty(value = "用户ID")
+ @Schema(description = "用户ID")
@QueryField(type = QueryType.EQ)
private Integer userId;
- @ApiModelProperty(value = "设为首页")
+ @Schema(description = "设为首页")
@QueryField(type = QueryType.EQ)
private Integer home;
- @ApiModelProperty(value = "排序(数字越小越靠前)")
+ @Schema(description = "排序(数字越小越靠前)")
@QueryField(type = QueryType.EQ)
private Integer sortNumber;
- @ApiModelProperty(value = "备注")
+ @Schema(description = "备注")
private String comments;
- @ApiModelProperty(value = "状态, 0正常, 1冻结")
+ @Schema(description = "状态, 0正常, 1冻结")
@QueryField(type = QueryType.EQ)
private Integer status;
- @ApiModelProperty(value = "是否删除, 0否, 1是")
+ @Schema(description = "是否删除, 0否, 1是")
@QueryField(type = QueryType.EQ)
private Integer deleted;
diff --git a/src/main/java/com/gxwebsoft/cms/param/CmsDesignRecordParam.java b/src/main/java/com/gxwebsoft/cms/param/CmsDesignRecordParam.java
index 2012d9a..eaeb6f4 100644
--- a/src/main/java/com/gxwebsoft/cms/param/CmsDesignRecordParam.java
+++ b/src/main/java/com/gxwebsoft/cms/param/CmsDesignRecordParam.java
@@ -4,8 +4,8 @@ import com.gxwebsoft.common.core.annotation.QueryField;
import com.gxwebsoft.common.core.annotation.QueryType;
import com.gxwebsoft.common.core.web.BaseParam;
import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -18,54 +18,54 @@ import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = false)
@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "CmsDesignRecordParam对象", description = "页面组件表查询参数")
+@Schema(name = "CmsDesignRecordParam对象", description = "页面组件表查询参数")
public class CmsDesignRecordParam extends BaseParam {
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "ID")
+ @Schema(description = "ID")
@QueryField(type = QueryType.EQ)
private Integer id;
- @ApiModelProperty(value = "关联导航ID")
+ @Schema(description = "关联导航ID")
@QueryField(type = QueryType.EQ)
private Integer navigationId;
- @ApiModelProperty(value = "组件")
+ @Schema(description = "组件")
private String title;
- @ApiModelProperty(value = "组件标识")
+ @Schema(description = "组件标识")
private String dictCode;
- @ApiModelProperty(value = "组件样式")
+ @Schema(description = "组件样式")
private String styles;
- @ApiModelProperty(value = "卡片阴影显示时机")
+ @Schema(description = "卡片阴影显示时机")
private String shadow;
- @ApiModelProperty(value = "页面关键词")
+ @Schema(description = "页面关键词")
private String keywords;
- @ApiModelProperty(value = "页面描述")
+ @Schema(description = "页面描述")
private String description;
- @ApiModelProperty(value = "页面路由地址")
+ @Schema(description = "页面路由地址")
private String path;
- @ApiModelProperty(value = "缩列图")
+ @Schema(description = "缩列图")
private String photo;
- @ApiModelProperty(value = "用户ID")
+ @Schema(description = "用户ID")
@QueryField(type = QueryType.EQ)
private Integer userId;
- @ApiModelProperty(value = "排序(数字越小越靠前)")
+ @Schema(description = "排序(数字越小越靠前)")
@QueryField(type = QueryType.EQ)
private Integer sortNumber;
- @ApiModelProperty(value = "备注")
+ @Schema(description = "备注")
private String comments;
- @ApiModelProperty(value = "状态, 0正常, 1冻结")
+ @Schema(description = "状态, 0正常, 1冻结")
@QueryField(type = QueryType.EQ)
private Integer status;
diff --git a/src/main/java/com/gxwebsoft/cms/param/CmsDocsBookParam.java b/src/main/java/com/gxwebsoft/cms/param/CmsDocsBookParam.java
index 6a03548..36a3e89 100644
--- a/src/main/java/com/gxwebsoft/cms/param/CmsDocsBookParam.java
+++ b/src/main/java/com/gxwebsoft/cms/param/CmsDocsBookParam.java
@@ -4,8 +4,8 @@ import com.gxwebsoft.common.core.annotation.QueryField;
import com.gxwebsoft.common.core.annotation.QueryType;
import com.gxwebsoft.common.core.web.BaseParam;
import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -18,38 +18,38 @@ import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = false)
@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "CmsDocsBookParam对象", description = "书籍记录表查询参数")
+@Schema(name = "CmsDocsBookParam对象", description = "书籍记录表查询参数")
public class CmsDocsBookParam extends BaseParam {
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "ID")
+ @Schema(description = "ID")
@QueryField(type = QueryType.EQ)
private Integer bookId;
- @ApiModelProperty(value = "书籍名称")
+ @Schema(description = "书籍名称")
private String name;
- @ApiModelProperty(value = "书籍标识")
+ @Schema(description = "书籍标识")
private String code;
- @ApiModelProperty(value = "封面图")
+ @Schema(description = "封面图")
private String photo;
- @ApiModelProperty(value = "备注")
+ @Schema(description = "备注")
private String comments;
- @ApiModelProperty(value = "文档内容")
+ @Schema(description = "文档内容")
private String content;
- @ApiModelProperty(value = "排序(数字越小越靠前)")
+ @Schema(description = "排序(数字越小越靠前)")
@QueryField(type = QueryType.EQ)
private Integer sortNumber;
- @ApiModelProperty(value = "状态, 0正常, 1冻结")
+ @Schema(description = "状态, 0正常, 1冻结")
@QueryField(type = QueryType.EQ)
private Integer status;
- @ApiModelProperty(value = "是否删除, 0否, 1是")
+ @Schema(description = "是否删除, 0否, 1是")
@QueryField(type = QueryType.EQ)
private Integer deleted;
diff --git a/src/main/java/com/gxwebsoft/cms/param/CmsDocsContentParam.java b/src/main/java/com/gxwebsoft/cms/param/CmsDocsContentParam.java
index 26e17a7..c8d4e7a 100644
--- a/src/main/java/com/gxwebsoft/cms/param/CmsDocsContentParam.java
+++ b/src/main/java/com/gxwebsoft/cms/param/CmsDocsContentParam.java
@@ -4,8 +4,8 @@ import com.gxwebsoft.common.core.annotation.QueryField;
import com.gxwebsoft.common.core.annotation.QueryType;
import com.gxwebsoft.common.core.web.BaseParam;
import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -18,19 +18,19 @@ import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = false)
@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "CmsDocsContentParam对象", description = "文档内容记录表查询参数")
+@Schema(name = "CmsDocsContentParam对象", description = "文档内容记录表查询参数")
public class CmsDocsContentParam extends BaseParam {
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "ID")
+ @Schema(description = "ID")
@QueryField(type = QueryType.EQ)
private Integer id;
- @ApiModelProperty(value = "文档ID")
+ @Schema(description = "文档ID")
@QueryField(type = QueryType.EQ)
private Integer docsId;
- @ApiModelProperty(value = "文档内容")
+ @Schema(description = "文档内容")
private String content;
}
diff --git a/src/main/java/com/gxwebsoft/cms/param/CmsDocsParam.java b/src/main/java/com/gxwebsoft/cms/param/CmsDocsParam.java
index 809c6f3..6208b13 100644
--- a/src/main/java/com/gxwebsoft/cms/param/CmsDocsParam.java
+++ b/src/main/java/com/gxwebsoft/cms/param/CmsDocsParam.java
@@ -4,8 +4,8 @@ import com.gxwebsoft.common.core.annotation.QueryField;
import com.gxwebsoft.common.core.annotation.QueryType;
import com.gxwebsoft.common.core.web.BaseParam;
import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -18,52 +18,52 @@ import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = false)
@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "CmsDocsParam对象", description = "文档管理记录表查询参数")
+@Schema(name = "CmsDocsParam对象", description = "文档管理记录表查询参数")
public class CmsDocsParam extends BaseParam {
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "文档ID")
+ @Schema(description = "文档ID")
@QueryField(type = QueryType.EQ)
private Integer docsId;
- @ApiModelProperty(value = "文档标题")
+ @Schema(description = "文档标题")
private String title;
- @ApiModelProperty(value = "上级目录")
+ @Schema(description = "上级目录")
@QueryField(type = QueryType.EQ)
private Integer parentId;
- @ApiModelProperty(value = "书籍ID")
+ @Schema(description = "书籍ID")
@QueryField(type = QueryType.EQ)
private Integer bookId;
- @ApiModelProperty(value = "可见性(public,private,protected)")
+ @Schema(description = "可见性(public,private,protected)")
private String visibility;
- @ApiModelProperty(value = "虚拟阅读量(仅用作展示)")
+ @Schema(description = "虚拟阅读量(仅用作展示)")
@QueryField(type = QueryType.EQ)
private Integer virtualViews;
- @ApiModelProperty(value = "实际阅读量")
+ @Schema(description = "实际阅读量")
@QueryField(type = QueryType.EQ)
private Integer actualViews;
- @ApiModelProperty(value = "用户ID")
+ @Schema(description = "用户ID")
@QueryField(type = QueryType.EQ)
private Integer userId;
- @ApiModelProperty(value = "备注")
+ @Schema(description = "备注")
private String comments;
- @ApiModelProperty(value = "排序(数字越小越靠前)")
+ @Schema(description = "排序(数字越小越靠前)")
@QueryField(type = QueryType.EQ)
private Integer sortNumber;
- @ApiModelProperty(value = "状态, 0正常, 1冻结")
+ @Schema(description = "状态, 0正常, 1冻结")
@QueryField(type = QueryType.EQ)
private Integer status;
- @ApiModelProperty(value = "是否删除, 0否, 1是")
+ @Schema(description = "是否删除, 0否, 1是")
@QueryField(type = QueryType.EQ)
private Integer deleted;
diff --git a/src/main/java/com/gxwebsoft/cms/param/CmsDomainParam.java b/src/main/java/com/gxwebsoft/cms/param/CmsDomainParam.java
index 435dcf4..d1cacfb 100644
--- a/src/main/java/com/gxwebsoft/cms/param/CmsDomainParam.java
+++ b/src/main/java/com/gxwebsoft/cms/param/CmsDomainParam.java
@@ -4,8 +4,8 @@ import com.gxwebsoft.common.core.annotation.QueryField;
import com.gxwebsoft.common.core.annotation.QueryType;
import com.gxwebsoft.common.core.web.BaseParam;
import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -18,48 +18,48 @@ import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = false)
@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "CmsDomainParam对象", description = "网站域名记录表查询参数")
+@Schema(name = "CmsDomainParam对象", description = "网站域名记录表查询参数")
public class CmsDomainParam extends BaseParam {
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "ID")
+ @Schema(description = "ID")
@QueryField(type = QueryType.EQ)
private Integer id;
- @ApiModelProperty(value = "类型 0赠送域名 1绑定域名 ")
+ @Schema(description = "类型 0赠送域名 1绑定域名 ")
@QueryField(type = QueryType.EQ)
private Integer type;
- @ApiModelProperty(value = "域名")
+ @Schema(description = "域名")
private String domain;
- @ApiModelProperty(value = "主机记录")
+ @Schema(description = "主机记录")
private String hostName;
- @ApiModelProperty(value = "记录值")
+ @Schema(description = "记录值")
private String hostValue;
- @ApiModelProperty(value = "状态")
+ @Schema(description = "状态")
@QueryField(type = QueryType.EQ)
private Integer status;
- @ApiModelProperty(value = "排序号")
+ @Schema(description = "排序号")
@QueryField(type = QueryType.EQ)
private Integer sortNumber;
- @ApiModelProperty(value = "网站ID")
+ @Schema(description = "网站ID")
@QueryField(type = QueryType.EQ)
private Integer websiteId;
- @ApiModelProperty(value = "租户ID")
+ @Schema(description = "租户ID")
@QueryField(type = QueryType.EQ)
private Integer appId;
- @ApiModelProperty(value = "用户ID")
+ @Schema(description = "用户ID")
@QueryField(type = QueryType.EQ)
private Integer userId;
- @ApiModelProperty(value = "是否删除, 0否, 1是")
+ @Schema(description = "是否删除, 0否, 1是")
@QueryField(type = QueryType.EQ)
private Integer deleted;
diff --git a/src/main/java/com/gxwebsoft/cms/param/CmsFormParam.java b/src/main/java/com/gxwebsoft/cms/param/CmsFormParam.java
index 97e0797..1ce4c88 100644
--- a/src/main/java/com/gxwebsoft/cms/param/CmsFormParam.java
+++ b/src/main/java/com/gxwebsoft/cms/param/CmsFormParam.java
@@ -4,8 +4,8 @@ import com.gxwebsoft.common.core.annotation.QueryField;
import com.gxwebsoft.common.core.annotation.QueryType;
import com.gxwebsoft.common.core.web.BaseParam;
import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -20,69 +20,69 @@ import java.math.BigDecimal;
@Data
@EqualsAndHashCode(callSuper = false)
@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "CmsFormParam对象", description = "表单设计表查询参数")
+@Schema(name = "CmsFormParam对象", description = "表单设计表查询参数")
public class CmsFormParam extends BaseParam {
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "ID")
+ @Schema(description = "ID")
@QueryField(type = QueryType.EQ)
private Integer formId;
- @ApiModelProperty(value = "表单标题")
+ @Schema(description = "表单标题")
private String name;
- @ApiModelProperty(value = "顶部图片")
+ @Schema(description = "顶部图片")
private String photo;
- @ApiModelProperty(value = "背景图片")
+ @Schema(description = "背景图片")
private String background;
- @ApiModelProperty(value = "视频文件")
+ @Schema(description = "视频文件")
private String video;
- @ApiModelProperty(value = "提交次数")
+ @Schema(description = "提交次数")
@QueryField(type = QueryType.EQ)
private Integer submitNumber;
- @ApiModelProperty(value = "页面布局")
+ @Schema(description = "页面布局")
private String layout;
- @ApiModelProperty(value = "是否隐藏顶部图片")
+ @Schema(description = "是否隐藏顶部图片")
@QueryField(type = QueryType.EQ)
private Integer hidePhoto;
- @ApiModelProperty(value = "是否隐藏背景图片")
+ @Schema(description = "是否隐藏背景图片")
@QueryField(type = QueryType.EQ)
private Integer hideBackground;
- @ApiModelProperty(value = "是否隐藏视频")
+ @Schema(description = "是否隐藏视频")
@QueryField(type = QueryType.EQ)
private Integer hideVideo;
- @ApiModelProperty(value = "背景图片透明度")
+ @Schema(description = "背景图片透明度")
@QueryField(type = QueryType.EQ)
private BigDecimal opacity;
- @ApiModelProperty(value = "用户ID")
+ @Schema(description = "用户ID")
@QueryField(type = QueryType.EQ)
private Integer userId;
- @ApiModelProperty(value = "商户ID")
+ @Schema(description = "商户ID")
@QueryField(type = QueryType.EQ)
private Long merchantId;
- @ApiModelProperty(value = "排序(数字越小越靠前)")
+ @Schema(description = "排序(数字越小越靠前)")
@QueryField(type = QueryType.EQ)
private Integer sortNumber;
- @ApiModelProperty(value = "备注")
+ @Schema(description = "备注")
private String comments;
- @ApiModelProperty(value = "状态, 0正常, 1冻结")
+ @Schema(description = "状态, 0正常, 1冻结")
@QueryField(type = QueryType.EQ)
private Integer status;
- @ApiModelProperty(value = "是否删除, 0否, 1是")
+ @Schema(description = "是否删除, 0否, 1是")
@QueryField(type = QueryType.EQ)
private Integer deleted;
diff --git a/src/main/java/com/gxwebsoft/cms/param/CmsFormRecordParam.java b/src/main/java/com/gxwebsoft/cms/param/CmsFormRecordParam.java
index 226fead..d070843 100644
--- a/src/main/java/com/gxwebsoft/cms/param/CmsFormRecordParam.java
+++ b/src/main/java/com/gxwebsoft/cms/param/CmsFormRecordParam.java
@@ -4,8 +4,8 @@ import com.gxwebsoft.common.core.annotation.QueryField;
import com.gxwebsoft.common.core.annotation.QueryType;
import com.gxwebsoft.common.core.web.BaseParam;
import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -18,47 +18,47 @@ import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = false)
@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "CmsFormRecordParam对象", description = "表单数据记录表查询参数")
+@Schema(name = "CmsFormRecordParam对象", description = "表单数据记录表查询参数")
public class CmsFormRecordParam extends BaseParam {
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "ID")
+ @Schema(description = "ID")
@QueryField(type = QueryType.EQ)
private Integer formRecordId;
- @ApiModelProperty(value = "手机号")
+ @Schema(description = "手机号")
private String phone;
- @ApiModelProperty(value = "表单数据")
+ @Schema(description = "表单数据")
private String formData;
- @ApiModelProperty(value = "表单ID")
+ @Schema(description = "表单ID")
@QueryField(type = QueryType.EQ)
private Integer formId;
- @ApiModelProperty(value = "用户ID")
+ @Schema(description = "用户ID")
@QueryField(type = QueryType.EQ)
private Integer userId;
- @ApiModelProperty(value = "商户ID")
+ @Schema(description = "商户ID")
@QueryField(type = QueryType.EQ)
private Long merchantId;
- @ApiModelProperty(value = "姓名")
+ @Schema(description = "姓名")
private String name;
- @ApiModelProperty(value = "排序(数字越小越靠前)")
+ @Schema(description = "排序(数字越小越靠前)")
@QueryField(type = QueryType.EQ)
private Integer sortNumber;
- @ApiModelProperty(value = "备注")
+ @Schema(description = "备注")
private String comments;
- @ApiModelProperty(value = "状态, 0正常, 1冻结")
+ @Schema(description = "状态, 0正常, 1冻结")
@QueryField(type = QueryType.EQ)
private Integer status;
- @ApiModelProperty(value = "是否删除, 0否, 1是")
+ @Schema(description = "是否删除, 0否, 1是")
@QueryField(type = QueryType.EQ)
private Integer deleted;
diff --git a/src/main/java/com/gxwebsoft/cms/param/CmsLinkParam.java b/src/main/java/com/gxwebsoft/cms/param/CmsLinkParam.java
index 8377c33..c94e2f7 100644
--- a/src/main/java/com/gxwebsoft/cms/param/CmsLinkParam.java
+++ b/src/main/java/com/gxwebsoft/cms/param/CmsLinkParam.java
@@ -4,8 +4,8 @@ import com.gxwebsoft.common.core.annotation.QueryField;
import com.gxwebsoft.common.core.annotation.QueryType;
import com.gxwebsoft.common.core.web.BaseParam;
import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -18,50 +18,50 @@ import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = false)
@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "CmsLinkParam对象", description = "常用链接查询参数")
+@Schema(name = "CmsLinkParam对象", description = "常用链接查询参数")
public class CmsLinkParam extends BaseParam {
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "自增ID")
+ @Schema(description = "自增ID")
@QueryField(type = QueryType.EQ)
private Integer id;
- @ApiModelProperty(value = "链接名称")
+ @Schema(description = "链接名称")
private String name;
- @ApiModelProperty(value = "图标")
+ @Schema(description = "图标")
private String icon;
- @ApiModelProperty(value = "链接地址")
+ @Schema(description = "链接地址")
private String url;
- @ApiModelProperty(value = "链接分类")
+ @Schema(description = "链接分类")
private String linkType;
- @ApiModelProperty(value = "应用ID")
+ @Schema(description = "应用ID")
@QueryField(type = QueryType.EQ)
private Integer appId;
- @ApiModelProperty(value = "用户ID")
+ @Schema(description = "用户ID")
@QueryField(type = QueryType.EQ)
private Integer userId;
- @ApiModelProperty(value = "是否推荐")
+ @Schema(description = "是否推荐")
@QueryField(type = QueryType.EQ)
private Integer recommend;
- @ApiModelProperty(value = "备注")
+ @Schema(description = "备注")
private String comments;
- @ApiModelProperty(value = "排序(数字越小越靠前)")
+ @Schema(description = "排序(数字越小越靠前)")
@QueryField(type = QueryType.EQ)
private Integer sortNumber;
- @ApiModelProperty(value = "是否删除, 0否, 1是")
+ @Schema(description = "是否删除, 0否, 1是")
@QueryField(type = QueryType.EQ)
private Integer deleted;
- @ApiModelProperty(value = "状态, 0正常, 1待确认")
+ @Schema(description = "状态, 0正常, 1待确认")
@QueryField(type = QueryType.EQ)
private Integer status;
diff --git a/src/main/java/com/gxwebsoft/cms/param/CmsMpAdParam.java b/src/main/java/com/gxwebsoft/cms/param/CmsMpAdParam.java
index 2789428..0d807af 100644
--- a/src/main/java/com/gxwebsoft/cms/param/CmsMpAdParam.java
+++ b/src/main/java/com/gxwebsoft/cms/param/CmsMpAdParam.java
@@ -4,8 +4,8 @@ import com.gxwebsoft.common.core.annotation.QueryField;
import com.gxwebsoft.common.core.annotation.QueryType;
import com.gxwebsoft.common.core.web.BaseParam;
import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -18,55 +18,55 @@ import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = false)
@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "CmsMpAdParam对象", description = "小程序广告位查询参数")
+@Schema(name = "CmsMpAdParam对象", description = "小程序广告位查询参数")
public class CmsMpAdParam extends BaseParam {
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "ID")
+ @Schema(description = "ID")
@QueryField(type = QueryType.EQ)
private Integer adId;
- @ApiModelProperty(value = "页面ID")
+ @Schema(description = "页面ID")
@QueryField(type = QueryType.EQ)
private Integer pageId;
- @ApiModelProperty(value = "广告类型")
+ @Schema(description = "广告类型")
private String adType;
- @ApiModelProperty(value = "广告位名称")
+ @Schema(description = "广告位名称")
private String name;
- @ApiModelProperty(value = "宽")
+ @Schema(description = "宽")
private String width;
- @ApiModelProperty(value = "高")
+ @Schema(description = "高")
private String height;
- @ApiModelProperty(value = "广告图片")
+ @Schema(description = "广告图片")
private String images;
- @ApiModelProperty(value = "路由/链接地址")
+ @Schema(description = "路由/链接地址")
private String path;
- @ApiModelProperty(value = "页面名称")
+ @Schema(description = "页面名称")
private String pageName;
- @ApiModelProperty(value = "用户ID")
+ @Schema(description = "用户ID")
@QueryField(type = QueryType.EQ)
private Integer userId;
- @ApiModelProperty(value = "排序(数字越小越靠前)")
+ @Schema(description = "排序(数字越小越靠前)")
@QueryField(type = QueryType.EQ)
private Integer sortNumber;
- @ApiModelProperty(value = "备注")
+ @Schema(description = "备注")
private String comments;
- @ApiModelProperty(value = "状态, 0正常, 1冻结")
+ @Schema(description = "状态, 0正常, 1冻结")
@QueryField(type = QueryType.EQ)
private Integer status;
- @ApiModelProperty(value = "是否删除, 0否, 1是")
+ @Schema(description = "是否删除, 0否, 1是")
@QueryField(type = QueryType.EQ)
private Integer deleted;
diff --git a/src/main/java/com/gxwebsoft/cms/param/CmsMpFieldParam.java b/src/main/java/com/gxwebsoft/cms/param/CmsMpFieldParam.java
index f0cb2c3..4717e19 100644
--- a/src/main/java/com/gxwebsoft/cms/param/CmsMpFieldParam.java
+++ b/src/main/java/com/gxwebsoft/cms/param/CmsMpFieldParam.java
@@ -4,8 +4,8 @@ import com.gxwebsoft.common.core.annotation.QueryField;
import com.gxwebsoft.common.core.annotation.QueryType;
import com.gxwebsoft.common.core.web.BaseParam;
import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -18,36 +18,36 @@ import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = false)
@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "CmsMpFieldParam对象", description = "小程序配置查询参数")
+@Schema(name = "CmsMpFieldParam对象", description = "小程序配置查询参数")
public class CmsMpFieldParam extends BaseParam {
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "自增ID")
+ @Schema(description = "自增ID")
@QueryField(type = QueryType.EQ)
private Integer id;
- @ApiModelProperty(value = "类型，0文本 1图片 2其他")
+ @Schema(description = "类型，0文本 1图片 2其他")
@QueryField(type = QueryType.EQ)
private Integer type;
- @ApiModelProperty(value = "名称")
+ @Schema(description = "名称")
private String name;
- @ApiModelProperty(value = "备注")
+ @Schema(description = "备注")
private String comments;
- @ApiModelProperty(value = "名称")
+ @Schema(description = "名称")
private String value;
- @ApiModelProperty(value = "页面ID")
+ @Schema(description = "页面ID")
@QueryField(type = QueryType.EQ)
private Integer pageId;
- @ApiModelProperty(value = "排序(数字越小越靠前)")
+ @Schema(description = "排序(数字越小越靠前)")
@QueryField(type = QueryType.EQ)
private Integer sortNumber;
- @ApiModelProperty(value = "是否删除, 0否, 1是")
+ @Schema(description = "是否删除, 0否, 1是")
@QueryField(type = QueryType.EQ)
private Integer deleted;
diff --git a/src/main/java/com/gxwebsoft/cms/param/CmsMpMenuParam.java b/src/main/java/com/gxwebsoft/cms/param/CmsMpMenuParam.java
index 13b709e..be5692e 100644
--- a/src/main/java/com/gxwebsoft/cms/param/CmsMpMenuParam.java
+++ b/src/main/java/com/gxwebsoft/cms/param/CmsMpMenuParam.java
@@ -4,8 +4,8 @@ import com.gxwebsoft.common.core.annotation.QueryField;
import com.gxwebsoft.common.core.annotation.QueryType;
import com.gxwebsoft.common.core.web.BaseParam;
import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -18,115 +18,115 @@ import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = false)
@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "CmsMpMenuParam对象", description = "小程序端菜单查询参数")
+@Schema(name = "CmsMpMenuParam对象", description = "小程序端菜单查询参数")
public class CmsMpMenuParam extends BaseParam {
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "ID")
+ @Schema(description = "ID")
@QueryField(type = QueryType.EQ)
private Integer menuId;
- @ApiModelProperty(value = "上级id, 0是顶级")
+ @Schema(description = "上级id, 0是顶级")
@QueryField(type = QueryType.EQ)
private Integer parentId;
- @ApiModelProperty(value = "菜单名称")
+ @Schema(description = "菜单名称")
private String title;
- @ApiModelProperty(value = "类型 0功能图标 1订单状态图标 2首页导航图标 3 商城导航图标 4管理人员功能图标")
+ @Schema(description = "类型 0功能图标 1订单状态图标 2首页导航图标 3 商城导航图标 4管理人员功能图标")
@QueryField(type = QueryType.EQ)
private Integer type;
- @ApiModelProperty(value = "是否微信小程序菜单")
+ @Schema(description = "是否微信小程序菜单")
@QueryField(type = QueryType.EQ)
private Boolean isMpWeixin;
- @ApiModelProperty(value = "菜单路由地址")
+ @Schema(description = "菜单路由地址")
private String path;
- @ApiModelProperty(value = "菜单组件地址, 目录可为空")
+ @Schema(description = "菜单组件地址, 目录可为空")
private String component;
- @ApiModelProperty(value = "打开位置")
+ @Schema(description = "打开位置")
private String target;
- @ApiModelProperty(value = "菜单图标")
+ @Schema(description = "菜单图标")
private String avatar;
- @ApiModelProperty(value = "图标颜色")
+ @Schema(description = "图标颜色")
private String color;
- @ApiModelProperty(value = "上传图标")
+ @Schema(description = "上传图标")
private String icon;
- @ApiModelProperty(value = "是否隐藏, 0否, 1是(仅注册路由不显示在左侧菜单)")
+ @Schema(description = "是否隐藏, 0否, 1是(仅注册路由不显示在左侧菜单)")
@QueryField(type = QueryType.EQ)
private Integer hide;
- @ApiModelProperty(value = "位置 0不限 1顶部 2底部")
+ @Schema(description = "位置 0不限 1顶部 2底部")
@QueryField(type = QueryType.EQ)
private Integer position;
- @ApiModelProperty(value = "0 第一行 1第二行")
+ @Schema(description = "0 第一行 1第二行")
@QueryField(type = QueryType.EQ)
private Integer rows;
- @ApiModelProperty(value = "菜单侧栏选中的path")
+ @Schema(description = "菜单侧栏选中的path")
private String active;
- @ApiModelProperty(value = "其它路由元信息")
+ @Schema(description = "其它路由元信息")
private String meta;
- @ApiModelProperty(value = "绑定的页面")
+ @Schema(description = "绑定的页面")
@QueryField(type = QueryType.EQ)
private Integer pageId;
- @ApiModelProperty(value = "绑定的文章分类ID")
+ @Schema(description = "绑定的文章分类ID")
@QueryField(type = QueryType.EQ)
private Integer articleCategoryId;
- @ApiModelProperty(value = "绑定的文章ID")
+ @Schema(description = "绑定的文章ID")
@QueryField(type = QueryType.EQ)
private Integer articleId;
- @ApiModelProperty(value = "绑定的表单ID")
+ @Schema(description = "绑定的表单ID")
@QueryField(type = QueryType.EQ)
private Integer formId;
- @ApiModelProperty(value = "绑定的书籍标识")
+ @Schema(description = "绑定的书籍标识")
private String bookCode;
- @ApiModelProperty(value = "绑定的商品分类ID")
+ @Schema(description = "绑定的商品分类ID")
@QueryField(type = QueryType.EQ)
private Integer goodsCategoryId;
- @ApiModelProperty(value = "绑定的商品ID")
+ @Schema(description = "绑定的商品ID")
@QueryField(type = QueryType.EQ)
private Integer goodsId;
- @ApiModelProperty(value = "用户ID")
+ @Schema(description = "用户ID")
@QueryField(type = QueryType.EQ)
private Integer userId;
- @ApiModelProperty(value = "是否管理人员可见")
+ @Schema(description = "是否管理人员可见")
@QueryField(type = QueryType.EQ)
private Integer adminShow;
- @ApiModelProperty(value = "设为首页")
+ @Schema(description = "设为首页")
@QueryField(type = QueryType.EQ)
private Integer home;
- @ApiModelProperty(value = "分组名称")
+ @Schema(description = "分组名称")
private String groupName;
- @ApiModelProperty(value = "排序(数字越小越靠前)")
+ @Schema(description = "排序(数字越小越靠前)")
@QueryField(type = QueryType.EQ)
private Integer sortNumber;
- @ApiModelProperty(value = "备注")
+ @Schema(description = "备注")
private String comments;
- @ApiModelProperty(value = "状态, 0正常, 1冻结")
+ @Schema(description = "状态, 0正常, 1冻结")
@QueryField(type = QueryType.EQ)
private Integer status;
diff --git a/src/main/java/com/gxwebsoft/cms/param/CmsMpPagesParam.java b/src/main/java/com/gxwebsoft/cms/param/CmsMpPagesParam.java
index 8c2b533..e93a5f4 100644
--- a/src/main/java/com/gxwebsoft/cms/param/CmsMpPagesParam.java
+++ b/src/main/java/com/gxwebsoft/cms/param/CmsMpPagesParam.java
@@ -4,8 +4,8 @@ import com.gxwebsoft.common.core.annotation.QueryField;
import com.gxwebsoft.common.core.annotation.QueryType;
import com.gxwebsoft.common.core.web.BaseParam;
import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -18,56 +18,56 @@ import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = false)
@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "CmsMpPagesParam对象", description = "小程序页面查询参数")
+@Schema(name = "CmsMpPagesParam对象", description = "小程序页面查询参数")
public class CmsMpPagesParam extends BaseParam {
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "ID")
+ @Schema(description = "ID")
@QueryField(type = QueryType.EQ)
private Integer id;
- @ApiModelProperty(value = "上级id, 0是顶级")
+ @Schema(description = "上级id, 0是顶级")
@QueryField(type = QueryType.EQ)
private Integer parentId;
- @ApiModelProperty(value = "页面名称")
+ @Schema(description = "页面名称")
private String title;
- @ApiModelProperty(value = "页面路径")
+ @Schema(description = "页面路径")
private String path;
- @ApiModelProperty(value = "设为首页")
+ @Schema(description = "设为首页")
@QueryField(type = QueryType.EQ)
private Integer home;
- @ApiModelProperty(value = "分包")
+ @Schema(description = "分包")
private String subpackage;
- @ApiModelProperty(value = "图标")
+ @Schema(description = "图标")
private String icon;
- @ApiModelProperty(value = "未选中图标")
+ @Schema(description = "未选中图标")
private String iconPath;
- @ApiModelProperty(value = "选中的图标")
+ @Schema(description = "选中的图标")
private String selectedIconPath;
- @ApiModelProperty(value = "排序(数字越小越靠前)")
+ @Schema(description = "排序(数字越小越靠前)")
@QueryField(type = QueryType.EQ)
private Integer sortNumber;
- @ApiModelProperty(value = "备注")
+ @Schema(description = "备注")
private String comments;
- @ApiModelProperty(value = "用户ID")
+ @Schema(description = "用户ID")
@QueryField(type = QueryType.EQ)
private Integer userId;
- @ApiModelProperty(value = "状态, 0正常, 1冻结")
+ @Schema(description = "状态, 0正常, 1冻结")
@QueryField(type = QueryType.EQ)
private Integer status;
- @ApiModelProperty(value = "是否删除, 0否, 1是")
+ @Schema(description = "是否删除, 0否, 1是")
@QueryField(type = QueryType.EQ)
private Integer deleted;
diff --git a/src/main/java/com/gxwebsoft/cms/param/CmsMpParam.java b/src/main/java/com/gxwebsoft/cms/param/CmsMpParam.java
index 365263c..e428af2 100644
--- a/src/main/java/com/gxwebsoft/cms/param/CmsMpParam.java
+++ b/src/main/java/com/gxwebsoft/cms/param/CmsMpParam.java
@@ -4,8 +4,8 @@ import com.gxwebsoft.common.core.annotation.QueryField;
import com.gxwebsoft.common.core.annotation.QueryType;
import com.gxwebsoft.common.core.web.BaseParam;
import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -18,77 +18,77 @@ import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = false)
@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "CmsMpParam对象", description = "小程序信息查询参数")
+@Schema(name = "CmsMpParam对象", description = "小程序信息查询参数")
public class CmsMpParam extends BaseParam {
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "ID")
+ @Schema(description = "ID")
@QueryField(type = QueryType.EQ)
private Integer mpId;
- @ApiModelProperty(value = "是否主账号")
+ @Schema(description = "是否主账号")
@QueryField(type = QueryType.EQ)
private Integer type;
- @ApiModelProperty(value = "小程序ID")
+ @Schema(description = "小程序ID")
private String appId;
- @ApiModelProperty(value = "小程序密钥")
+ @Schema(description = "小程序密钥")
private String appSecret;
- @ApiModelProperty(value = "小程序名称")
+ @Schema(description = "小程序名称")
private String mpName;
- @ApiModelProperty(value = "小程序简称")
+ @Schema(description = "小程序简称")
private String shortName;
- @ApiModelProperty(value = "头像")
+ @Schema(description = "头像")
private String avatar;
- @ApiModelProperty(value = "小程序码")
+ @Schema(description = "小程序码")
private String mpQrcode;
- @ApiModelProperty(value = "微信认证")
+ @Schema(description = "微信认证")
@QueryField(type = QueryType.EQ)
private Integer authentication;
- @ApiModelProperty(value = "主体信息")
+ @Schema(description = "主体信息")
private String companyName;
- @ApiModelProperty(value = "小程序备案")
+ @Schema(description = "小程序备案")
private String icpNo;
- @ApiModelProperty(value = "登录邮箱")
+ @Schema(description = "登录邮箱")
private String email;
- @ApiModelProperty(value = "登录密码")
+ @Schema(description = "登录密码")
private String password;
- @ApiModelProperty(value = "原始ID")
+ @Schema(description = "原始ID")
private String ghId;
- @ApiModelProperty(value = "入口页面")
+ @Schema(description = "入口页面")
private String mainPath;
- @ApiModelProperty(value = "过期时间")
+ @Schema(description = "过期时间")
private String expirationTime;
- @ApiModelProperty(value = "排序(数字越小越靠前)")
+ @Schema(description = "排序(数字越小越靠前)")
@QueryField(type = QueryType.EQ)
private Integer sortNumber;
- @ApiModelProperty(value = "介绍")
+ @Schema(description = "介绍")
private String comments;
- @ApiModelProperty(value = "用户ID")
+ @Schema(description = "用户ID")
@QueryField(type = QueryType.EQ)
private Integer userId;
- @ApiModelProperty(value = "状态, 0正常, 1冻结")
+ @Schema(description = "状态, 0正常, 1冻结")
@QueryField(type = QueryType.EQ)
private Integer status;
- @ApiModelProperty(value = "是否删除, 0否, 1是")
+ @Schema(description = "是否删除, 0否, 1是")
@QueryField(type = QueryType.EQ)
private Integer deleted;
diff --git a/src/main/java/com/gxwebsoft/cms/param/CmsNavigationParam.java b/src/main/java/com/gxwebsoft/cms/param/CmsNavigationParam.java
index 04ad530..fe13c05 100644
--- a/src/main/java/com/gxwebsoft/cms/param/CmsNavigationParam.java
+++ b/src/main/java/com/gxwebsoft/cms/param/CmsNavigationParam.java
@@ -4,8 +4,8 @@ import com.gxwebsoft.common.core.annotation.QueryField;
import com.gxwebsoft.common.core.annotation.QueryType;
import com.gxwebsoft.common.core.web.BaseParam;
import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -18,120 +18,120 @@ import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = false)
@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "CmsNavigationParam对象", description = "网站导航记录表查询参数")
+@Schema(name = "CmsNavigationParam对象", description = "网站导航记录表查询参数")
public class CmsNavigationParam extends BaseParam {
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "ID")
+ @Schema(description = "ID")
@QueryField(type = QueryType.EQ)
private Integer navigationId;
- @ApiModelProperty(value = "上级id, 0是顶级")
+ @Schema(description = "上级id, 0是顶级")
@QueryField(type = QueryType.EQ)
private Integer parentId;
- @ApiModelProperty(value = "菜单名称")
+ @Schema(description = "菜单名称")
private String title;
- @ApiModelProperty(value = "模型")
+ @Schema(description = "模型")
private String model;
- @ApiModelProperty(value = "标识")
+ @Schema(description = "标识")
private String code;
- @ApiModelProperty(value = "菜单路由地址")
+ @Schema(description = "菜单路由地址")
private String path;
- @ApiModelProperty(value = "菜单组件地址, 目录可为空")
+ @Schema(description = "菜单组件地址, 目录可为空")
private String component;
- @ApiModelProperty(value = "打开位置")
+ @Schema(description = "打开位置")
private String target;
- @ApiModelProperty(value = "菜单图标")
+ @Schema(description = "菜单图标")
private String icon;
- @ApiModelProperty(value = "图标颜色")
+ @Schema(description = "图标颜色")
private String color;
- @ApiModelProperty(value = "是否隐藏, 0否, 1是(仅注册路由不显示在左侧菜单)")
+ @Schema(description = "是否隐藏, 0否, 1是(仅注册路由不显示在左侧菜单)")
@QueryField(type = QueryType.EQ)
private Integer hide;
- @ApiModelProperty(value = "可见类型 0所有人 1登录可见 2密码可见")
+ @Schema(description = "可见类型 0所有人 1登录可见 2密码可见")
@QueryField(type = QueryType.EQ)
private Integer permission;
- @ApiModelProperty(value = "访问密码")
+ @Schema(description = "访问密码")
@QueryField(type = QueryType.EQ)
private String password;
- @ApiModelProperty(value = "访问密码")
+ @Schema(description = "访问密码")
@QueryField(type = QueryType.EQ)
private String password2;
- @ApiModelProperty(value = "位置 0不限 1顶部 2底部")
+ @Schema(description = "位置 0不限 1顶部 2底部")
@QueryField(type = QueryType.EQ)
private Integer position;
- @ApiModelProperty(value = "仅在顶部显示")
+ @Schema(description = "仅在顶部显示")
@QueryField(type = QueryType.EQ)
private Integer top;
- @ApiModelProperty(value = "仅在底部显示")
+ @Schema(description = "仅在底部显示")
@QueryField(type = QueryType.EQ)
private Integer bottom;
- @ApiModelProperty(value = "菜单侧栏选中的path")
+ @Schema(description = "菜单侧栏选中的path")
private String active;
- @ApiModelProperty(value = "其它路由元信息")
+ @Schema(description = "其它路由元信息")
private String meta;
- @ApiModelProperty(value = "css样式")
+ @Schema(description = "css样式")
private String style;
- @ApiModelProperty(value = "父级栏目路由")
+ @Schema(description = "父级栏目路由")
private String parentPath;
- @ApiModelProperty(value = "父级栏目名称")
+ @Schema(description = "父级栏目名称")
private String parentName;
- @ApiModelProperty(value = "模型名称")
+ @Schema(description = "模型名称")
private String modelName;
- @ApiModelProperty(value = "类型（已废弃）")
+ @Schema(description = "类型（已废弃）")
@QueryField(type = QueryType.EQ)
private Integer type;
- @ApiModelProperty(value = "绑定的页面（已废弃）")
+ @Schema(description = "绑定的页面（已废弃）")
@QueryField(type = QueryType.EQ)
private Integer pageId;
- @ApiModelProperty(value = "是否微信小程序菜单")
+ @Schema(description = "是否微信小程序菜单")
@QueryField(type = QueryType.EQ)
private Boolean isMpWeixin;
- @ApiModelProperty(value = "用户ID")
+ @Schema(description = "用户ID")
@QueryField(type = QueryType.EQ)
private Integer userId;
- @ApiModelProperty(value = "设为首页")
+ @Schema(description = "设为首页")
@QueryField(type = QueryType.EQ)
private Integer home;
- @ApiModelProperty(value = "排序(数字越小越靠前)")
+ @Schema(description = "排序(数字越小越靠前)")
@QueryField(type = QueryType.EQ)
private Integer sortNumber;
- @ApiModelProperty(value = "备注")
+ @Schema(description = "备注")
private String comments;
- @ApiModelProperty(value = "是否删除, 0否, 1是")
+ @Schema(description = "是否删除, 0否, 1是")
@QueryField(type = QueryType.EQ)
private Integer deleted;
- @ApiModelProperty(value = "状态, 0正常, 1冻结")
+ @Schema(description = "状态, 0正常, 1冻结")
@QueryField(type = QueryType.EQ)
private Integer status;
diff --git a/src/main/java/com/gxwebsoft/cms/param/CmsProductParam.java b/src/main/java/com/gxwebsoft/cms/param/CmsProductParam.java
index 28add14..c8b59e2 100644
--- a/src/main/java/com/gxwebsoft/cms/param/CmsProductParam.java
+++ b/src/main/java/com/gxwebsoft/cms/param/CmsProductParam.java
@@ -4,8 +4,8 @@ import com.gxwebsoft.common.core.annotation.QueryField;
import com.gxwebsoft.common.core.annotation.QueryType;
import com.gxwebsoft.common.core.web.BaseParam;
import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -20,103 +20,103 @@ import java.math.BigDecimal;
@Data
@EqualsAndHashCode(callSuper = false)
@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "CmsProductParam对象", description = "产品查询参数")
+@Schema(name = "CmsProductParam对象", description = "产品查询参数")
public class CmsProductParam extends BaseParam {
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "自增ID")
+ @Schema(description = "自增ID")
@QueryField(type = QueryType.EQ)
private Integer productId;
- @ApiModelProperty(value = "类型 0软件产品 1实物商品 2虚拟商品")
+ @Schema(description = "类型 0软件产品 1实物商品 2虚拟商品")
@QueryField(type = QueryType.EQ)
private Integer type;
- @ApiModelProperty(value = "产品编码")
+ @Schema(description = "产品编码")
private String code;
- @ApiModelProperty(value = "产品标题")
+ @Schema(description = "产品标题")
private String title;
- @ApiModelProperty(value = "封面图")
+ @Schema(description = "封面图")
private String image;
- @ApiModelProperty(value = "产品详情")
+ @Schema(description = "产品详情")
private String content;
- @ApiModelProperty(value = "父级分类ID")
+ @Schema(description = "父级分类ID")
@QueryField(type = QueryType.EQ)
private Integer parentId;
- @ApiModelProperty(value = "产品分类ID")
+ @Schema(description = "产品分类ID")
@QueryField(type = QueryType.EQ)
private Integer categoryId;
- @ApiModelProperty(value = "产品规格 0单规格 1多规格")
+ @Schema(description = "产品规格 0单规格 1多规格")
@QueryField(type = QueryType.EQ)
private Integer specs;
- @ApiModelProperty(value = "货架")
+ @Schema(description = "货架")
private String position;
- @ApiModelProperty(value = "单位名称 (个)")
+ @Schema(description = "单位名称 (个)")
private String unitName;
- @ApiModelProperty(value = "进货价格")
+ @Schema(description = "进货价格")
@QueryField(type = QueryType.EQ)
private BigDecimal price;
- @ApiModelProperty(value = "销售价格")
+ @Schema(description = "销售价格")
@QueryField(type = QueryType.EQ)
private BigDecimal salePrice;
- @ApiModelProperty(value = "库存计算方式(10下单减库存 20付款减库存)")
+ @Schema(description = "库存计算方式(10下单减库存 20付款减库存)")
@QueryField(type = QueryType.EQ)
private Integer deductStockType;
- @ApiModelProperty(value = "轮播图")
+ @Schema(description = "轮播图")
private String files;
- @ApiModelProperty(value = "销量")
+ @Schema(description = "销量")
@QueryField(type = QueryType.EQ)
private Integer sales;
- @ApiModelProperty(value = "库存")
+ @Schema(description = "库存")
@QueryField(type = QueryType.EQ)
private Integer stock;
- @ApiModelProperty(value = "消费赚取积分")
+ @Schema(description = "消费赚取积分")
@QueryField(type = QueryType.EQ)
private BigDecimal gainIntegral;
- @ApiModelProperty(value = "推荐")
+ @Schema(description = "推荐")
@QueryField(type = QueryType.EQ)
private Integer recommend;
- @ApiModelProperty(value = "商户ID")
+ @Schema(description = "商户ID")
@QueryField(type = QueryType.EQ)
private Long merchantId;
- @ApiModelProperty(value = "状态（0：未上架，1：上架）")
+ @Schema(description = "状态（0：未上架，1：上架）")
@QueryField(type = QueryType.EQ)
private Boolean isShow;
- @ApiModelProperty(value = "状态, 0上架 1待上架 2待审核 3审核不通过")
+ @Schema(description = "状态, 0上架 1待上架 2待审核 3审核不通过")
@QueryField(type = QueryType.EQ)
private Integer status;
- @ApiModelProperty(value = "备注")
+ @Schema(description = "备注")
private String comments;
- @ApiModelProperty(value = "排序号")
+ @Schema(description = "排序号")
@QueryField(type = QueryType.EQ)
private Integer sortNumber;
- @ApiModelProperty(value = "用户ID")
+ @Schema(description = "用户ID")
@QueryField(type = QueryType.EQ)
private Integer userId;
- @ApiModelProperty(value = "是否删除, 0否, 1是")
+ @Schema(description = "是否删除, 0否, 1是")
@QueryField(type = QueryType.EQ)
private Integer deleted;
diff --git a/src/main/java/com/gxwebsoft/cms/param/CmsProductSpecParam.java b/src/main/java/com/gxwebsoft/cms/param/CmsProductSpecParam.java
index 0ffb5d6..6f31993 100644
--- a/src/main/java/com/gxwebsoft/cms/param/CmsProductSpecParam.java
+++ b/src/main/java/com/gxwebsoft/cms/param/CmsProductSpecParam.java
@@ -4,8 +4,8 @@ import com.gxwebsoft.common.core.annotation.QueryField;
import com.gxwebsoft.common.core.annotation.QueryType;
import com.gxwebsoft.common.core.web.BaseParam;
import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -18,36 +18,36 @@ import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = false)
@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "CmsProductSpecParam对象", description = "规格查询参数")
+@Schema(name = "CmsProductSpecParam对象", description = "规格查询参数")
public class CmsProductSpecParam extends BaseParam {
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "规格ID")
+ @Schema(description = "规格ID")
@QueryField(type = QueryType.EQ)
private Integer specId;
- @ApiModelProperty(value = "规格名称")
+ @Schema(description = "规格名称")
private String specName;
- @ApiModelProperty(value = "规格值")
+ @Schema(description = "规格值")
private String specValue;
- @ApiModelProperty(value = "创建用户")
+ @Schema(description = "创建用户")
@QueryField(type = QueryType.EQ)
private Integer userId;
- @ApiModelProperty(value = "更新者")
+ @Schema(description = "更新者")
@QueryField(type = QueryType.EQ)
private Integer updater;
- @ApiModelProperty(value = "备注")
+ @Schema(description = "备注")
private String comments;
- @ApiModelProperty(value = "状态, 0正常, 1待修,2异常已修，3异常未修")
+ @Schema(description = "状态, 0正常, 1待修,2异常已修，3异常未修")
@QueryField(type = QueryType.EQ)
private Integer status;
- @ApiModelProperty(value = "排序号")
+ @Schema(description = "排序号")
@QueryField(type = QueryType.EQ)
private Integer sortNumber;
diff --git a/src/main/java/com/gxwebsoft/cms/param/CmsProductSpecValueParam.java b/src/main/java/com/gxwebsoft/cms/param/CmsProductSpecValueParam.java
index 88f10e9..e8e1174 100644
--- a/src/main/java/com/gxwebsoft/cms/param/CmsProductSpecValueParam.java
+++ b/src/main/java/com/gxwebsoft/cms/param/CmsProductSpecValueParam.java
@@ -4,8 +4,8 @@ import com.gxwebsoft.common.core.annotation.QueryField;
import com.gxwebsoft.common.core.annotation.QueryType;
import com.gxwebsoft.common.core.web.BaseParam;
import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -18,25 +18,25 @@ import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = false)
@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "CmsProductSpecValueParam对象", description = "规格值查询参数")
+@Schema(name = "CmsProductSpecValueParam对象", description = "规格值查询参数")
public class CmsProductSpecValueParam extends BaseParam {
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "规格值ID")
+ @Schema(description = "规格值ID")
@QueryField(type = QueryType.EQ)
private Integer specValueId;
- @ApiModelProperty(value = "规格组ID")
+ @Schema(description = "规格组ID")
@QueryField(type = QueryType.EQ)
private Integer specId;
- @ApiModelProperty(value = "规格值")
+ @Schema(description = "规格值")
private String specValue;
- @ApiModelProperty(value = "备注")
+ @Schema(description = "备注")
private String comments;
- @ApiModelProperty(value = "排序号")
+ @Schema(description = "排序号")
@QueryField(type = QueryType.EQ)
private Integer sortNumber;
diff --git a/src/main/java/com/gxwebsoft/cms/param/CmsProductUrlParam.java b/src/main/java/com/gxwebsoft/cms/param/CmsProductUrlParam.java
index e808fe4..78be55a 100644
--- a/src/main/java/com/gxwebsoft/cms/param/CmsProductUrlParam.java
+++ b/src/main/java/com/gxwebsoft/cms/param/CmsProductUrlParam.java
@@ -4,8 +4,8 @@ import com.gxwebsoft.common.core.annotation.QueryField;
import com.gxwebsoft.common.core.annotation.QueryType;
import com.gxwebsoft.common.core.web.BaseParam;
import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -18,42 +18,42 @@ import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = false)
@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "CmsProductUrlParam对象", description = "域名查询参数")
+@Schema(name = "CmsProductUrlParam对象", description = "域名查询参数")
public class CmsProductUrlParam extends BaseParam {
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "自增ID")
+ @Schema(description = "自增ID")
@QueryField(type = QueryType.EQ)
private Integer id;
- @ApiModelProperty(value = "产品ID")
+ @Schema(description = "产品ID")
@QueryField(type = QueryType.EQ)
private Integer productId;
- @ApiModelProperty(value = "域名类型")
+ @Schema(description = "域名类型")
private String type;
- @ApiModelProperty(value = "域名")
+ @Schema(description = "域名")
private String domain;
- @ApiModelProperty(value = "账号")
+ @Schema(description = "账号")
private String account;
- @ApiModelProperty(value = "密码")
+ @Schema(description = "密码")
private String password;
- @ApiModelProperty(value = "商户ID")
+ @Schema(description = "商户ID")
@QueryField(type = QueryType.EQ)
private Long merchantId;
- @ApiModelProperty(value = "备注")
+ @Schema(description = "备注")
private String comments;
- @ApiModelProperty(value = "排序(数字越小越靠前)")
+ @Schema(description = "排序(数字越小越靠前)")
@QueryField(type = QueryType.EQ)
private Integer sortNumber;
- @ApiModelProperty(value = "状态, 0正常, 1待确认")
+ @Schema(description = "状态, 0正常, 1待确认")
@QueryField(type = QueryType.EQ)
private Integer status;
diff --git a/src/main/java/com/gxwebsoft/cms/param/CmsWebsiteFieldParam.java b/src/main/java/com/gxwebsoft/cms/param/CmsWebsiteFieldParam.java
index 3643a0a..6a69566 100644
--- a/src/main/java/com/gxwebsoft/cms/param/CmsWebsiteFieldParam.java
+++ b/src/main/java/com/gxwebsoft/cms/param/CmsWebsiteFieldParam.java
@@ -4,8 +4,8 @@ import com.gxwebsoft.common.core.annotation.QueryField;
import com.gxwebsoft.common.core.annotation.QueryType;
import com.gxwebsoft.common.core.web.BaseParam;
import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -18,41 +18,41 @@ import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = false)
@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "CmsWebsiteFieldParam对象", description = "应用参数查询参数")
+@Schema(name = "CmsWebsiteFieldParam对象", description = "应用参数查询参数")
public class CmsWebsiteFieldParam extends BaseParam {
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "自增ID")
+ @Schema(description = "自增ID")
@QueryField(type = QueryType.EQ)
private Integer id;
- @ApiModelProperty(value = "类型，0文本 1图片 2其他")
+ @Schema(description = "类型，0文本 1图片 2其他")
@QueryField(type = QueryType.EQ)
private Integer type;
- @ApiModelProperty(value = "名称")
+ @Schema(description = "名称")
private String name;
- @ApiModelProperty(value = "默认值")
+ @Schema(description = "默认值")
private String defaultValue;
- @ApiModelProperty(value = "可修改的值 [on|off]")
+ @Schema(description = "可修改的值 [on|off]")
private String modifyRange;
- @ApiModelProperty(value = "备注")
+ @Schema(description = "备注")
private String comments;
- @ApiModelProperty(value = "css样式")
+ @Schema(description = "css样式")
private String style;
- @ApiModelProperty(value = "名称")
+ @Schema(description = "名称")
private String value;
- @ApiModelProperty(value = "排序(数字越小越靠前)")
+ @Schema(description = "排序(数字越小越靠前)")
@QueryField(type = QueryType.EQ)
private Integer sortNumber;
- @ApiModelProperty(value = "是否删除, 0否, 1是")
+ @Schema(description = "是否删除, 0否, 1是")
@QueryField(type = QueryType.EQ)
private Integer deleted;
diff --git a/src/main/java/com/gxwebsoft/cms/param/CmsWebsiteParam.java b/src/main/java/com/gxwebsoft/cms/param/CmsWebsiteParam.java
index fa6b9f2..15a193c 100644
--- a/src/main/java/com/gxwebsoft/cms/param/CmsWebsiteParam.java
+++ b/src/main/java/com/gxwebsoft/cms/param/CmsWebsiteParam.java
@@ -4,8 +4,8 @@ import com.gxwebsoft.common.core.annotation.QueryField;
import com.gxwebsoft.common.core.annotation.QueryType;
import com.gxwebsoft.common.core.web.BaseParam;
import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -18,130 +18,130 @@ import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = false)
@JsonInclude(JsonInclude.Include.NON_NULL)
-@ApiModel(value = "CmsWebsiteParam对象", description = "网站信息记录表查询参数")
+@Schema(name = "CmsWebsiteParam对象", description = "网站信息记录表查询参数")
public class CmsWebsiteParam extends BaseParam {
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "站点ID")
+ @Schema(description = "站点ID")
@QueryField(type = QueryType.EQ)
private Integer websiteId;
- @ApiModelProperty(value = "网站名称")
+ @Schema(description = "网站名称")
private String websiteName;
- @ApiModelProperty(value = "网站标识")
+ @Schema(description = "网站标识")
private String websiteCode;
- @ApiModelProperty(value = "网站LOGO")
+ @Schema(description = "网站LOGO")
private String websiteIcon;
- @ApiModelProperty(value = "网站LOGO")
+ @Schema(description = "网站LOGO")
private String websiteLogo;
- @ApiModelProperty(value = "网站LOGO(深色模式)")
+ @Schema(description = "网站LOGO(深色模式)")
private String websiteDarkLogo;
- @ApiModelProperty(value = "网站类型")
+ @Schema(description = "网站类型")
private String websiteType;
- @ApiModelProperty(value = "网站关键词")
+ @Schema(description = "网站关键词")
private String keywords;
- @ApiModelProperty(value = "域名前缀")
+ @Schema(description = "域名前缀")
private String prefix;
- @ApiModelProperty(value = "绑定域名")
+ @Schema(description = "绑定域名")
private String domain;
- @ApiModelProperty(value = "全局样式")
+ @Schema(description = "全局样式")
private String style;
- @ApiModelProperty(value = "后台管理地址")
+ @Schema(description = "后台管理地址")
private String adminUrl;
- @ApiModelProperty(value = "应用版本 10免费版 20授权版 30永久授权")
+ @Schema(description = "应用版本 10免费版 20授权版 30永久授权")
@QueryField(type = QueryType.EQ)
private Integer version;
- @ApiModelProperty(value = "服务到期时间")
+ @Schema(description = "服务到期时间")
private String expirationTime;
- @ApiModelProperty(value = "模版ID")
+ @Schema(description = "模版ID")
@QueryField(type = QueryType.EQ)
private Integer templateId;
- @ApiModelProperty(value = "行业类型(父级)")
+ @Schema(description = "行业类型(父级)")
private String industryParent;
- @ApiModelProperty(value = "行业类型(子级)")
+ @Schema(description = "行业类型(子级)")
private String industryChild;
- @ApiModelProperty(value = "企业ID")
+ @Schema(description = "企业ID")
@QueryField(type = QueryType.EQ)
private Integer companyId;
- @ApiModelProperty(value = "所在国家")
+ @Schema(description = "所在国家")
private String country;
- @ApiModelProperty(value = "所在省份")
+ @Schema(description = "所在省份")
private String province;
- @ApiModelProperty(value = "所在城市")
+ @Schema(description = "所在城市")
private String city;
- @ApiModelProperty(value = "所在辖区")
+ @Schema(description = "所在辖区")
private String region;
- @ApiModelProperty(value = "经度")
+ @Schema(description = "经度")
private String longitude;
- @ApiModelProperty(value = "纬度")
+ @Schema(description = "纬度")
private String latitude;
- @ApiModelProperty(value = "街道地址")
+ @Schema(description = "街道地址")
private String address;
- @ApiModelProperty(value = "联系电话")
+ @Schema(description = "联系电话")
private String phone;
- @ApiModelProperty(value = "电子邮箱")
+ @Schema(description = "电子邮箱")
private String email;
- @ApiModelProperty(value = "ICP备案号")
+ @Schema(description = "ICP备案号")
private String icpNo;
- @ApiModelProperty(value = "公安备案")
+ @Schema(description = "公安备案")
private String policeNo;
- @ApiModelProperty(value = "备注")
+ @Schema(description = "备注")
private String comments;
- @ApiModelProperty(value = "是否推荐")
+ @Schema(description = "是否推荐")
@QueryField(type = QueryType.EQ)
private Integer recommend;
- @ApiModelProperty(value = "状态 0未开通 1运行中 2维护中 3已关闭 4已欠费停机 5违规关停")
+ @Schema(description = "状态 0未开通 1运行中 2维护中 3已关闭 4已欠费停机 5违规关停")
@QueryField(type = QueryType.EQ)
private Integer status;
- @ApiModelProperty(value = "维护说明")
+ @Schema(description = "维护说明")
private String statusText;
- @ApiModelProperty(value = "关闭说明")
+ @Schema(description = "关闭说明")
private String statusClose;
- @ApiModelProperty(value = "全局样式")
+ @Schema(description = "全局样式")
private String styles;
- @ApiModelProperty(value = "排序号")
+ @Schema(description = "排序号")
@QueryField(type = QueryType.EQ)
private Integer sortNumber;
- @ApiModelProperty(value = "用户ID")
+ @Schema(description = "用户ID")
@QueryField(type = QueryType.EQ)
private Integer userId;
- @ApiModelProperty(value = "是否删除, 0否, 1是")
+ @Schema(description = "是否删除, 0否, 1是")
@QueryField(type = QueryType.EQ)
private Integer deleted;
diff --git a/src/main/java/com/gxwebsoft/common/core/aspect/OperationLogAspect.java b/src/main/java/com/gxwebsoft/common/core/aspect/OperationLogAspect.java
index 9c59a9e..2e71792 100644
--- a/src/main/java/com/gxwebsoft/common/core/aspect/OperationLogAspect.java
+++ b/src/main/java/com/gxwebsoft/common/core/aspect/OperationLogAspect.java
@@ -12,8 +12,8 @@ import com.gxwebsoft.common.core.utils.JSONUtil;
import com.gxwebsoft.common.system.entity.OperationRecord;
import com.gxwebsoft.common.system.entity.User;
import com.gxwebsoft.common.system.service.OperationRecordService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.annotation.*;
import org.aspectj.lang.reflect.MethodSignature;
@@ -183,9 +183,9 @@ public class OperationLogAspect {
if (om != null && StrUtil.isNotEmpty(om.value())) {
return om.value();
}
- Api api = joinPoint.getTarget().getClass().getAnnotation(Api.class);
- if (api != null && api.tags() != null) {
- return ArrayUtil.join(api.tags(), ",");
+ Tag tag = joinPoint.getTarget().getClass().getAnnotation(Tag.class);
+ if (tag != null && StrUtil.isNotEmpty(tag.name())) {
+ return tag.name();
}
return null;
}
@@ -201,9 +201,9 @@ public class OperationLogAspect {
if (StrUtil.isNotEmpty(ol.value())) {
return ol.value();
}
- ApiOperation ao = method.getAnnotation(ApiOperation.class);
- if (ao != null && StrUtil.isNotEmpty(ao.value())) {
- return ao.value();
+ Operation operation = method.getAnnotation(Operation.class);
+ if (operation != null && StrUtil.isNotEmpty(operation.summary())) {
+ return operation.summary();
}
return null;
}
diff --git a/src/main/java/com/gxwebsoft/common/core/config/OpenApiConfig.java b/src/main/java/com/gxwebsoft/common/core/config/OpenApiConfig.java
new file mode 100644
index 0000000..3f2a255
--- /dev/null
+++ b/src/main/java/com/gxwebsoft/common/core/config/OpenApiConfig.java
@@ -0,0 +1,46 @@
+package com.gxwebsoft.common.core.config;
+
+import io.swagger.v3.oas.models.OpenAPI;
+import io.swagger.v3.oas.models.info.Contact;
+import io.swagger.v3.oas.models.info.Info;
+import io.swagger.v3.oas.models.security.SecurityRequirement;
+import io.swagger.v3.oas.models.security.SecurityScheme;
+import io.swagger.v3.oas.models.Components;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import javax.annotation.Resource;
+
+/**
+ * OpenAPI 配置
+ *
+ * @author WebSoft
+ * @since 2025-09-11
+ */
+@Configuration
+public class OpenApiConfig {
+
+ @Resource
+ private ConfigProperties config;
+
+ @Bean
+ public OpenAPI customOpenAPI() {
+ return new OpenAPI()
+ .info(new Info()
+ .title(config.getSwaggerTitle())
+ .description(config.getSwaggerDescription())
+ .version(config.getSwaggerVersion())
+ .contact(new Contact()
+ .name("科技小王子")
+ .url("https://websoft.top")
+ .email("170083662@qq.com")))
+ .addSecurityItem(new SecurityRequirement().addList("Authorization"))
+ .components(new Components()
+ .addSecuritySchemes("Authorization",
+ new SecurityScheme()
+ .type(SecurityScheme.Type.HTTP)
+ .scheme("bearer")
+ .bearerFormat("JWT")
+ .description("JWT 认证")));
+ }
+}
diff --git a/src/main/java/com/gxwebsoft/common/core/config/SpringFoxSwaggerHostResolver.java b/src/main/java/com/gxwebsoft/common/core/config/SpringFoxSwaggerHostResolver.java
deleted file mode 100644
index 25e6f78..0000000
--- a/src/main/java/com/gxwebsoft/common/core/config/SpringFoxSwaggerHostResolver.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.gxwebsoft.common.core.config;
-
-import io.swagger.v3.oas.models.OpenAPI;
-import io.swagger.v3.oas.models.servers.Server;
-import org.springframework.stereotype.Component;
-import org.springframework.util.StringUtils;
-import springfox.documentation.oas.web.OpenApiTransformationContext;
-import springfox.documentation.oas.web.WebMvcOpenApiTransformationFilter;
-import springfox.documentation.spi.DocumentationType;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.List;
-
-@Component
-public class SpringFoxSwaggerHostResolver implements WebMvcOpenApiTransformationFilter {
- @Override
- public OpenAPI transform(OpenApiTransformationContext context) {
-
- HttpServletRequest request = context.request().get();
-
- OpenAPI swagger = context.getSpecification();
-
- String scheme = "http";
- String referer = request.getHeader("Referer");
-
- if(StringUtils.hasLength(referer)){
- //获取协议
- scheme = referer.split(":")[0];
- }
-
- List servers = new ArrayList<>();
- String finalScheme = scheme;
- //重新组装server信息
- swagger.getServers().forEach(item->{
-
- //替换协议,去掉默认端口
- item.setUrl(clearDefaultPort(item.getUrl().replace("http", finalScheme)));
- servers.add(item);
- });
- swagger.setServers(servers);
- return swagger;
- }
-
- //清除默认端口
- private String clearDefaultPort(String url){
-
- String port = url.split(":")[2];
- if("80".equals(port)||"443".equals(port)){
- return url.replace(":80","").replace(":443","");
- }
- return url;
- }
-
- @Override
- public boolean supports(DocumentationType documentationType) {
- return documentationType.equals(DocumentationType.OAS_30);
- }
-}
diff --git a/src/main/java/com/gxwebsoft/common/core/config/SwaggerConfig.java b/src/main/java/com/gxwebsoft/common/core/config/SwaggerConfig.java
deleted file mode 100644
index ae23ecd..0000000
--- a/src/main/java/com/gxwebsoft/common/core/config/SwaggerConfig.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package com.gxwebsoft.common.core.config;
-
-import cn.hutool.core.util.StrUtil;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import springfox.documentation.builders.ApiInfoBuilder;
-import springfox.documentation.builders.PathSelectors;
-import springfox.documentation.builders.RequestHandlerSelectors;
-import springfox.documentation.oas.annotations.EnableOpenApi;
-import springfox.documentation.service.*;
-import springfox.documentation.spi.DocumentationType;
-import springfox.documentation.spi.service.contexts.SecurityContext;
-import springfox.documentation.spring.web.plugins.Docket;
-
-import javax.annotation.Resource;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * Swagger配置
- *
- * @author WebSoft
- * @since 2018-02-22 11:29:05
- */
-@EnableOpenApi
-@Configuration
-public class SwaggerConfig {
- @Resource
- private ConfigProperties config;
-
- @Bean
- public Docket createRestApi() {
- Docket docket = new Docket(DocumentationType.OAS_30);
- if (StrUtil.isNotBlank(config.getSwaggerHost())) {
- docket.host(config.getSwaggerHost());
- }
- return docket
- .apiInfo(apiInfo())
- .select()
- .apis(RequestHandlerSelectors.basePackage(config.getSwaggerBasePackage()))
- .paths(PathSelectors.any())
- .build()
- .securitySchemes(securitySchemes())
- .securityContexts(securityContexts());
- }
-
- private ApiInfo apiInfo() {
- return new ApiInfoBuilder()
- .title(config.getSwaggerTitle())
- .description(config.getSwaggerDescription())
- .version(config.getSwaggerVersion())
- .contact(new Contact("科技小王子","https://websoft.top","170083662@qq.com"))
- .termsOfServiceUrl("https://server.gxwebsoft.com/api")
- .build();
- }
-
- private List securitySchemes() {
- return Collections.singletonList(
- new ApiKey("Authorization", "Authorization", "header")
- );
- }
-
- private List securityContexts() {
- AuthorizationScope[] scopes = {new AuthorizationScope("global", "accessEverything")};
- List references = Collections.singletonList(
- new SecurityReference("Authorization", scopes)
- );
- return Collections.singletonList(SecurityContext.builder()
- .securityReferences(references)
- .build());
- }
-
-}
diff --git a/src/main/java/com/gxwebsoft/common/core/controller/CertificateController.java b/src/main/java/com/gxwebsoft/common/core/controller/CertificateController.java
index a4fe186..4eb61d1 100644
--- a/src/main/java/com/gxwebsoft/common/core/controller/CertificateController.java
+++ b/src/main/java/com/gxwebsoft/common/core/controller/CertificateController.java
@@ -4,9 +4,9 @@ import com.gxwebsoft.common.core.service.CertificateHealthService;
import com.gxwebsoft.common.core.service.CertificateService;
import com.gxwebsoft.common.core.web.ApiResult;
import com.gxwebsoft.common.core.web.BaseController;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
import lombok.extern.slf4j.Slf4j;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -23,7 +23,7 @@ import java.util.Map;
* @since 2024-07-26
*/
@Slf4j
-@Api(tags = "证书管理")
+@Tag(name = "证书管理")
@RestController
@RequestMapping("/api/system/certificate")
public class CertificateController extends BaseController {
@@ -34,7 +34,7 @@ public class CertificateController extends BaseController {
@Resource
private CertificateHealthService certificateHealthService;
- @ApiOperation("获取所有证书状态")
+ @Operation(summary = "获取所有证书状态")
@GetMapping("/status")
@PreAuthorize("hasAuthority('system:certificate:view')")
public ApiResult> getCertificateStatus() {
@@ -47,7 +47,7 @@ public class CertificateController extends BaseController {
}
}
- @ApiOperation("证书健康检查")
+ @Operation(summary = "证书健康检查")
@GetMapping("/health")
@PreAuthorize("hasAuthority('system:certificate:view')")
public ApiResult> healthCheck() {
@@ -64,7 +64,7 @@ public class CertificateController extends BaseController {
}
}
- @ApiOperation("获取证书诊断信息")
+ @Operation(summary = "获取证书诊断信息")
@GetMapping("/diagnostic")
@PreAuthorize("hasAuthority('system:certificate:view')")
public ApiResult> getDiagnosticInfo() {
@@ -77,12 +77,12 @@ public class CertificateController extends BaseController {
}
}
- @ApiOperation("检查特定证书")
+ @Operation(summary = "检查特定证书")
@GetMapping("/check/{certType}/{fileName}")
@PreAuthorize("hasAuthority('system:certificate:view')")
public ApiResult> checkSpecificCertificate(
- @ApiParam(value = "证书类型", example = "wechat") @PathVariable String certType,
- @ApiParam(value = "文件名", example = "apiclient_key.pem") @PathVariable String fileName) {
+ @Parameter(description = "证书类型", example = "wechat") @PathVariable String certType,
+ @Parameter(description = "文件名", example = "apiclient_key.pem") @PathVariable String fileName) {
try {
Map result = certificateHealthService.checkSpecificCertificate(certType, fileName);
return success("检查证书完成", result);
@@ -92,12 +92,12 @@ public class CertificateController extends BaseController {
}
}
- @ApiOperation("验证证书文件")
+ @Operation(summary = "验证证书文件")
@GetMapping("/validate/{certType}/{fileName}")
@PreAuthorize("hasAuthority('system:certificate:view')")
public ApiResult validateCertificate(
- @ApiParam(value = "证书类型", example = "wechat") @PathVariable String certType,
- @ApiParam(value = "文件名", example = "apiclient_cert.pem") @PathVariable String fileName) {
+ @Parameter(description = "证书类型", example = "wechat") @PathVariable String certType,
+ @Parameter(description = "文件名", example = "apiclient_cert.pem") @PathVariable String fileName) {
try {
CertificateService.CertificateInfo certInfo =
certificateService.validateX509Certificate(certType, fileName);
@@ -113,12 +113,12 @@ public class CertificateController extends BaseController {
}
}
- @ApiOperation("检查证书文件是否存在")
+ @Operation(summary = "检查证书文件是否存在")
@GetMapping("/exists/{certType}/{fileName}")
@PreAuthorize("hasAuthority('system:certificate:view')")
public ApiResult checkCertificateExists(
- @ApiParam(value = "证书类型", example = "alipay") @PathVariable String certType,
- @ApiParam(value = "文件名", example = "appCertPublicKey.crt") @PathVariable String fileName) {
+ @Parameter(description = "证书类型", example = "alipay") @PathVariable String certType,
+ @Parameter(description = "文件名", example = "appCertPublicKey.crt") @PathVariable String fileName) {
try {
boolean exists = certificateService.certificateExists(certType, fileName);
String message = exists ? "证书文件存在" : "证书文件不存在";
@@ -129,12 +129,12 @@ public class CertificateController extends BaseController {
}
}
- @ApiOperation("获取证书文件路径")
+ @Operation(summary = "获取证书文件路径")
@GetMapping("/path/{certType}/{fileName}")
@PreAuthorize("hasAuthority('system:certificate:view')")
public ApiResult getCertificatePath(
- @ApiParam(value = "证书类型", example = "wechat") @PathVariable String certType,
- @ApiParam(value = "文件名", example = "wechatpay_cert.pem") @PathVariable String fileName) {
+ @Parameter(description = "证书类型", example = "wechat") @PathVariable String certType,
+ @Parameter(description = "文件名", example = "wechatpay_cert.pem") @PathVariable String fileName) {
try {
String path = certificateService.getCertificateFilePath(certType, fileName);
return success("获取证书路径成功", path);
@@ -144,11 +144,11 @@ public class CertificateController extends BaseController {
}
}
- @ApiOperation("获取微信支付证书路径")
+ @Operation(summary = "获取微信支付证书路径")
@GetMapping("/wechat-path/{fileName}")
@PreAuthorize("hasAuthority('system:certificate:view')")
public ApiResult getWechatPayCertPath(
- @ApiParam(value = "文件名", example = "apiclient_key.pem") @PathVariable String fileName) {
+ @Parameter(description = "文件名", example = "apiclient_key.pem") @PathVariable String fileName) {
try {
String path = certificateService.getWechatPayCertPath(fileName);
return success("获取微信支付证书路径成功", path);
@@ -158,11 +158,11 @@ public class CertificateController extends BaseController {
}
}
- @ApiOperation("获取支付宝证书路径")
+ @Operation(summary = "获取支付宝证书路径")
@GetMapping("/alipay-path/{fileName}")
@PreAuthorize("hasAuthority('system:certificate:view')")
public ApiResult getAlipayCertPath(
- @ApiParam(value = "文件名", example = "appCertPublicKey.crt") @PathVariable String fileName) {
+ @Parameter(description = "文件名", example = "appCertPublicKey.crt") @PathVariable String fileName) {
try {
String path = certificateService.getAlipayCertPath(fileName);
return success("获取支付宝证书路径成功", path);
@@ -172,7 +172,7 @@ public class CertificateController extends BaseController {
}
}
- @ApiOperation("检查数据库证书配置")
+ @Operation(summary = "检查数据库证书配置")
@GetMapping("/database-check")
@PreAuthorize("hasAuthority('system:certificate:view')")
public ApiResult> checkDatabaseCertificates() {
@@ -185,7 +185,7 @@ public class CertificateController extends BaseController {
}
}
- @ApiOperation("刷新证书缓存")
+ @Operation(summary = "刷新证书缓存")
@PostMapping("/refresh")
@PreAuthorize("hasAuthority('system:certificate:manage')")
public ApiResult refreshCertificateCache() {
diff --git a/src/main/java/com/gxwebsoft/common/core/controller/WechatCertTestController.java b/src/main/java/com/gxwebsoft/common/core/controller/WechatCertTestController.java
index ff6b05e..396f5dc 100644
--- a/src/main/java/com/gxwebsoft/common/core/controller/WechatCertTestController.java
+++ b/src/main/java/com/gxwebsoft/common/core/controller/WechatCertTestController.java
@@ -4,9 +4,9 @@ import com.gxwebsoft.common.core.utils.WechatCertAutoConfig;
import com.gxwebsoft.common.core.web.ApiResult;
import com.gxwebsoft.common.core.web.BaseController;
import com.wechat.pay.java.core.Config;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -23,13 +23,13 @@ import java.util.Map;
@Slf4j
@RestController
@RequestMapping("/api/wechat-cert-test")
-@Api(tags = "微信支付证书自动配置测试")
+@Tag(name = "微信支付证书自动配置测试")
public class WechatCertTestController extends BaseController {
@Autowired
private WechatCertAutoConfig wechatCertAutoConfig;
- @ApiOperation("测试默认开发环境证书配置")
+ @Operation(summary = "测试默认开发环境证书配置")
@PostMapping("/test-default")
public ApiResult> testDefaultConfig() {
Map result = new HashMap<>();
@@ -64,13 +64,13 @@ public class WechatCertTestController extends BaseController {
}
}
- @ApiOperation("测试自定义证书配置")
+ @Operation(summary = "测试自定义证书配置")
@PostMapping("/test-custom")
public ApiResult> testCustomConfig(
- @ApiParam("商户号") @RequestParam String merchantId,
- @ApiParam("私钥文件路径") @RequestParam String privateKeyPath,
- @ApiParam("证书序列号") @RequestParam String merchantSerialNumber,
- @ApiParam("APIv3密钥") @RequestParam String apiV3Key) {
+ @Parameter(description = "商户号") @RequestParam String merchantId,
+ @Parameter(description = "私钥文件路径") @RequestParam String privateKeyPath,
+ @Parameter(description = "证书序列号") @RequestParam String merchantSerialNumber,
+ @Parameter(description = "APIv3密钥") @RequestParam String apiV3Key) {
Map result = new HashMap<>();
@@ -108,14 +108,14 @@ public class WechatCertTestController extends BaseController {
}
}
- @ApiOperation("获取使用说明")
+ @Operation(summary = "获取使用说明")
@GetMapping("/instructions")
public ApiResult getInstructions() {
String instructions = wechatCertAutoConfig.getUsageInstructions();
return success("获取使用说明成功", instructions);
}
- @ApiOperation("获取故障排除信息")
+ @Operation(summary = "获取故障排除信息")
@GetMapping("/troubleshooting")
public ApiResult> getTroubleshooting() {
Map troubleshooting = getTroubleshootingInfo();
diff --git a/src/main/java/com/gxwebsoft/common/core/utils/GreenWebUtils.java b/src/main/java/com/gxwebsoft/common/core/utils/GreenWebUtils.java
deleted file mode 100644
index ea72c9f..0000000
--- a/src/main/java/com/gxwebsoft/common/core/utils/GreenWebUtils.java
+++ /dev/null
@@ -1,317 +0,0 @@
-package com.gxwebsoft.common.core.utils;
-
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson2.JSONObject;
-import com.alibaba.fastjson2.TypeReference;
-import com.aliyun.green20220302.Client;
-import com.aliyun.green20220302.models.*;
-import com.aliyun.teaopenapi.models.Config;
-import com.aliyun.teautil.models.RuntimeOptions;
-import com.gxwebsoft.common.core.enums.GreenWebType;
-import com.gxwebsoft.common.system.vo.faceId.HeadPortraitResult;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpResponse;
-import org.apache.http.util.EntityUtils;
-import org.springframework.stereotype.Component;
-import org.springframework.util.StringUtils;
-
-import java.util.*;
-
-
-@Component
-public class GreenWebUtils {
- private static Client contentGreenClient = null;
-
- static final String accessKeyId = "LTAI5t8UTh8CTXEi2dYxobhj";
- static final String accessKeySecret = "fNdJOT4KAjrVrzHNAcSJuUCy9ZljD9";
-
- static final String[] badAudioLabel = {"violence", "political_content", "sexual_content", "sexual_sounds", "contraband", "profanity", "religion", "cyberbullying", "negative_content", "specified_speaking", "specified_lyrics"};
-// static final String[] badVideoLabel = {"pornographic_adultContent","pornographic_adultToys","pornographic_artwork","pornographic_adultContent_tii","sexual_suggestiveContent","sexual_breastNudity","sexual_cleavage","sexual_femaleUnderwear","sexual_maleTopless","sexual_femaleShoulder","sexual_cartoon","sexual_pregnancy","sexual_underage","political_politicalFigure_1","political_politicalFigure_2","political_politicalFigure_3","political_politicalFigure_name_tii",""};
-
- private static class ContentGreenClientHolder {
- private static final Client INSTANCE = createContentGreenClient();
- }
-
- private static Client createContentGreenClient() {
- Config config = new Config();
- config.setAccessKeyId(accessKeyId);
- config.setAccessKeySecret(accessKeySecret);
- config.setRegionId("cn-shenzhen");
- config.setEndpoint("green-cip.cn-shenzhen.aliyuncs.com");
- config.setReadTimeout(6000);
- config.setConnectTimeout(3000);
- try {
- return new Client(config);
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
- }
-
-
- public static Client getContentGreenClient() {
-
- if (contentGreenClient == null) {
- contentGreenClient = ContentGreenClientHolder.INSTANCE;
- }
- return contentGreenClient;
- }
-
- /**
- * 文本审核
- *
- * @param text
- * @param type
- * @return
- */
- public static boolean testText(String text, GreenWebType type) {
- if (!StringUtils.hasText(text)) {
- return false;
- }
-
- JSONObject serviceParameters = new JSONObject();
- serviceParameters.put("content", text);
-
- // 创建RuntimeObject实例并设置运行参数。
- RuntimeOptions runtime = new RuntimeOptions();
- runtime.readTimeout = 10000;
- runtime.connectTimeout = 10000;
-
- TextModerationRequest textModerationRequest = new TextModerationRequest();
- textModerationRequest.setService(type.name());
- textModerationRequest.setServiceParameters(serviceParameters.toJSONString());
-
-// try {
- TextModerationResponse response = null;
- try {
- response = getContentGreenClient().textModerationWithOptions(textModerationRequest, runtime);
- } catch (Exception e) {
- e.printStackTrace();
- return false;
- }
- if (response.statusCode != 200) {
- return false;
- }
-
- TextModerationResponseBody result = response.getBody();
- Integer code = result.getCode();
- if (code != null && code == 200) {
- TextModerationResponseBody.TextModerationResponseBodyData data = result.getData();
- return !StringUtils.hasText(data.getReason());
-
- } else {
- return false;
- }
- }
-
- /**
- * 图片审核
- *
- * @param imgUrl
- * @param type
- * @return
- */
-
- public static boolean testImage(String imgUrl, GreenWebType type) {
-
- if(!imgUrl.contains("?x-oss-process=image/resize")) {
- imgUrl += "?x-oss-process=image/resize,w_750/quality,Q_90";
- }
-
- Map serviceParameters = new HashMap<>();
- //公网可访问的URL。
- serviceParameters.put("imageUrl", imgUrl);
- serviceParameters.put("dataId", UUID.randomUUID().toString());
-
- ImageModerationRequest request = new ImageModerationRequest();
- // 图片检测service: baselineCheck通用基线检测。
- request.setService(type.name());
- request.setServiceParameters(JSON.toJSONString(serviceParameters));
-
- RuntimeOptions runtime = new RuntimeOptions();
- runtime.readTimeout = 10000;
- runtime.connectTimeout = 10000;
- ImageModerationResponse response = null;
- try {
- response = getContentGreenClient().imageModerationWithOptions(request, runtime);
- System.out.println(response);
- } catch (Exception e) {
- e.printStackTrace();
- return false;
- }
-
- ImageModerationResponseBody body = response.getBody();
-
- String[] unSafeLabelArr = {"pornographic_adultContent_tii","pornographic_adultContent","sexual_suggestiveContent",""};
- if (body.getCode() == 200) {
- ImageModerationResponseBody.ImageModerationResponseBodyData data = body.getData();
- System.out.println("dataId=" + data.getDataId());
- List results = data.getResult();
- for (ImageModerationResponseBody.ImageModerationResponseBodyDataResult result : results) {
-
- if (!"nonLabel".equals(result.getLabel())) {
- System.out.println(String.format("Label: %s,Confidence: %f",result.getLabel(),result.getConfidence()));
- return false;
- }
- }
- } else {
- return false;
- }
- return true;
- }
-
- /**
- * 视频审核（异步）
- *
- * @param videoUrl
- * @param type
- * @return
- */
- public static String testVideo(String videoUrl, GreenWebType type) {
-
- JSONObject serviceParameters = new JSONObject();
- serviceParameters.put("url", videoUrl);
-
- VideoModerationRequest videoModerationRequest = new VideoModerationRequest();
- // 检测类型：videoDetection
- videoModerationRequest.setService(type.name());
- videoModerationRequest.setServiceParameters(serviceParameters.toJSONString());
-
-
- try {
- VideoModerationResponse response = getContentGreenClient().videoModeration(videoModerationRequest);
- if (response.getStatusCode() == 200) {
- VideoModerationResponseBody result = response.getBody();
- System.out.println(JSON.toJSONString(result));
- System.out.println("requestId = " + result.getRequestId());
- System.out.println("code = " + result.getCode());
- System.out.println("msg = " + result.getMessage());
- Integer code = result.getCode();
- if (200 == code) {
- VideoModerationResponseBody.VideoModerationResponseBodyData data = result.getData();
- return data.taskId;
- } else {
- return null;
- }
- } else {
- return null;
- }
- } catch (Exception e) {
- e.printStackTrace();
- return null;
- }
-
- }
-
- /**
- * 获取视频审核结果
- *
- * @param taskId
- * @param type
- * @return
- */
- public static boolean getTestVideoResult(String taskId, GreenWebType type) {
-
-
- JSONObject serviceParameters = new JSONObject();
- // 提交任务时返回的taskId。
- serviceParameters.put("taskId", taskId);
- VideoModerationResultRequest videoModerationResultRequest = new VideoModerationResultRequest();
- videoModerationResultRequest.setService(type.name());
- videoModerationResultRequest.setServiceParameters(serviceParameters.toJSONString());
- try {
- VideoModerationResultResponse response = getContentGreenClient().videoModerationResult(videoModerationResultRequest);
- if (response.getStatusCode() == 200) {
- VideoModerationResultResponseBody result = response.getBody();
- System.out.println("requestId=" + result.getRequestId());
- System.out.println("code=" + result.getCode());
- System.out.println("msg=" + result.getMessage());
- if (200 == result.getCode()) {
- VideoModerationResultResponseBody.VideoModerationResultResponseBodyData data = result.getData();
- VideoModerationResultResponseBody.VideoModerationResultResponseBodyDataAudioResult audioResult = data.getAudioResult();
- VideoModerationResultResponseBody.VideoModerationResultResponseBodyDataFrameResult frameResult = data.getFrameResult();
- boolean hasBadAudio = audioResult.sliceDetails.stream().filter(w -> {
- String labels = w.getLabels();
- String[] labelArr = labels.split(",");
- return Arrays.stream(labelArr).filter(l -> {
- return Arrays.stream(badAudioLabel).filter(b -> b.equals(l)).findFirst().isPresent();
- }).findFirst().isPresent();
- }).findFirst().isPresent();
- if (hasBadAudio) {
- return false;
- }
- boolean hasBadVideo = frameResult.getFrames().stream().filter(w -> {
- return w.getResults().stream().filter(r -> {
- return r.getResult().stream().filter(r2 -> {
- return !"nonLabel".equals(r2.label);
- }).findFirst().isPresent();
- }).findFirst().isPresent();
- }).findFirst().isPresent();
- if (hasBadVideo) {
- return false;
- }
- } else {
- return false;
- }
- } else {
- return false;
- }
- } catch (Exception e) {
- return false;
- }
- return true;
- }
-
-
- /**
- * 鉴别头像是否是真人头像（非卡通） 2. 鉴别图片是否有性感，色情信息 3. 鉴别头像是否有广告，敏感信息，以及二维码等 4. 鉴别头像性别。
- *
- * @param imageBase64
- * @param imageType
- * @param genter
- * @return
- */
- public static boolean testAvatar(String imageBase64, String imageType, Integer genter) {
- String host = "https://edishead.market.alicloudapi.com";
- String path = "/faceId/headPortrait/getResult";
- String method = "POST";
- String appcode = "566b5786c5874464909d8c0b7f64cdc7";
- Map headers = new HashMap();
- //最后在header中的格式(中间是英文空格)为Authorization:APPCODE 83359fd73fe94948385f570e3c139105
- headers.put("Authorization", "APPCODE " + appcode);
- //根据API的要求，定义相对应的Content-Type
- headers.put("Content-Type", "application/x-www-form-urlencoded; charset=UTF-8");
- Map querys = new HashMap();
- Map bodys = new HashMap();
- bodys.put("image", imageBase64);
- bodys.put("imageType", imageType);
- HttpResponse response = null;
- try {
- response = HttpUtils.doPost(host, path, method, headers, querys, bodys);
- HttpEntity entity = response.getEntity();
- String string = EntityUtils.toString(entity);
- HeadPortraitResult result = JSONObject.parseObject(string, new TypeReference() {
- });
- if (!"0000".equals(result.getCode())) {
- return false;
- }
- if (!"normal".equals(result.getPorn()) || !"normal".equals(result.getAd())) {
- return false;
- }
- if (result.getFaceCount() != 1 || result.getCartoonImg()) {
- return false;
- }
-
- if (!genter.equals(result.getGenterList()[0])) {
- return false;
- }
-
-
- } catch (Exception e) {
- e.printStackTrace();
- return false;
- }
- System.out.println(response.toString());
- return true;
- }
-}
diff --git a/src/main/java/com/gxwebsoft/common/core/web/ApiResult.java b/src/main/java/com/gxwebsoft/common/core/web/ApiResult.java
index eab091a..0313839 100644
--- a/src/main/java/com/gxwebsoft/common/core/web/ApiResult.java
+++ b/src/main/java/com/gxwebsoft/common/core/web/ApiResult.java
@@ -1,7 +1,7 @@
package com.gxwebsoft.common.core.web;
import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import java.io.Serializable;
@@ -15,16 +15,16 @@ import java.io.Serializable;
public class ApiResult