新增改动

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/openapi/controller/OpenApiController.java

@@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fasterxml.classmate.TypeResolver;
 import com.google.common.collect.Lists;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.constant.CommonConstant;
@@ -31,7 +30,6 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.client.RestTemplate;
-import springfox.documentation.spring.web.DocumentationCache;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.*;
@@ -50,10 +48,6 @@ public class OpenApiController extends JeecgController<OpenApi, OpenApiService>
     @Autowired
     private OpenApiHeaderService openApiHeaderService;
     @Autowired
-    private DocumentationCache documentationCache;
-    @Autowired
-    private TypeResolver typeResolver;
-    @Autowired
     private ISysUserService sysUserService;
     @Autowired
     private OpenApiAuthService openApiAuthService;

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/common/blob.ftl

@@ -39,11 +39,11 @@
         </#if>
     </#list>
     @Excel(name = "${po.filedComment}", width = 15,replace = {"是_${switch_extend_arr1}","否_${switch_extend_arr2}"} )
-    @ApiModelProperty(value = "${po.filedComment}")
+    @Schema(description = "${po.filedComment}")
     private ${po.fieldType} ${po.fieldName};
 <#elseif po.classType=='pca'>
     @Excel(name = "${po.filedComment}", width = 15,exportConvert=true,importConvert = true )
-    @ApiModelProperty(value = "${po.filedComment}")
+    @Schema(description = "${po.filedComment}")
     private ${po.fieldType} ${po.fieldName};
 
     public String convertis${po.fieldName?cap_first}() {
@@ -56,10 +56,10 @@
 <#elseif po.classType=='cat_tree'>
     <#assign list_field_dictCode=', dictTable = "sys_category", dicText = "name", dicCode = "id"'>
     @Excel(name = "${po.filedComment}", width = 15${list_field_dictCode})
-    @ApiModelProperty(value = "${po.filedComment}")
+    @Schema(description = "${po.filedComment}")
     private ${po.fieldType} ${po.fieldName};
 <#else>
-    @ApiModelProperty(value = "${po.filedComment}")
+    @Schema(description = "${po.filedComment}")
   <#if po.fieldDbName == 'del_flag'>
     @TableLogic
   </#if>

jeecg-boot/jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/loader/DynamicRouteLoader.java

@@ -10,7 +10,7 @@ import com.alibaba.nacos.api.config.ConfigService;
 import com.alibaba.nacos.api.config.listener.Listener;
 import com.alibaba.nacos.api.exception.NacosException;
 import com.alibaba.nacos.common.utils.StringUtils;
-import com.google.common.collect.Lists;
+import com.alibaba.nacos.shaded.com.google.common.collect.Lists;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.base.BaseMap;
 import org.jeecg.common.constant.CacheConstant;

jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-rocketmq/src/main/java/org/jeecg/modules/test/rocketmq/controller/JeecgMqTestController.java

@@ -2,8 +2,8 @@ package org.jeecg.modules.test.rocketmq.controller;
 
 
 import cn.hutool.core.util.RandomUtil;
-import io.swagger.annotations.Api;
+import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.jeecg.boot.starter.rabbitmq.client.RabbitMqClient;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.base.BaseMap;
@@ -23,7 +23,7 @@ import javax.servlet.http.HttpServletRequest;
  */
 @RestController
 @RequestMapping("/sys/test")
-@Api(tags = "【微服务】MQ单元测试")
+@Tag(name = "【微服务】MQ单元测试")
 public class JeecgMqTestController {
 
     @Autowired
@@ -38,7 +38,7 @@ public class JeecgMqTestController {
      * @return
      */
     @GetMapping(value = "/rocketmq")
-    @ApiOperation(value = "测试rocketmq", notes = "测试rocketmq")
+    @Operation(description = "测试rocketmq")
     public Result<?> rabbitMqClientTest(HttpServletRequest req) {
         //rabbitmq消息队列测试
         BaseMap map = new BaseMap();
@@ -49,7 +49,7 @@ public class JeecgMqTestController {
     }
 
     @GetMapping(value = "/rocketmq2")
-    @ApiOperation(value = "rocketmq消息总线测试", notes = "rocketmq消息总线测试")
+    @Operation(description = "rocketmq消息总线测试")
     public Result<?> rabbitmq2(HttpServletRequest req) {
 
         //rabbitmq消息总线测试