Merge branch 'develop' of ssh://git.mmcuav.cn:8222/iuav/ims into develop

kustomization/overlays/dev/kustomization.yaml

@@ -17,4 +17,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/ims
-  newTag: 22e5dcdd0bd2ade526032be0291855d8821edb37
+  newTag: 09968b4f255a4f7bc2a5ae9be3384a39bd1e27f1

pom.xml

-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.mmc.csf</groupId>
     <artifactId>iuav-ims</artifactId>
@@ -11,7 +12,7 @@
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
         <version>2.2.6.RELEASE</version>
-		<relativePath />
+        <relativePath/>
     </parent>
 
     <properties>
@@ -44,31 +45,16 @@
             <version>1.2.58</version>
         </dependency>
 
-		<!-- swagger2 -->
-		<dependency>
-			<groupId>io.springfox</groupId>
-			<artifactId>springfox-swagger2</artifactId>
-			<version>2.8.0</version>
-		</dependency>
-		<dependency>
-			<groupId>io.springfox</groupId>
-			<artifactId>springfox-swagger-ui</artifactId>
-			<version>2.8.0</version>
-		</dependency>
-		<!-- 引入swagger-bootstrap-ui包 -->
         <dependency>
             <groupId>com.github.xiaoymin</groupId>
             <artifactId>knife4j-spring-boot-starter</artifactId>
-			<version>2.0.5</version>
+            <version>3.0.2</version>
         </dependency>
-
         <dependency>
-			<groupId>io.springfox</groupId>
-			<artifactId>springfox-bean-validators</artifactId>
-			<version>${springfox.version}</version>
+            <groupId>com.github.xiaoymin</groupId>
+            <artifactId>knife4j-spring-ui</artifactId>
+            <version>3.0.2</version>
         </dependency>
-
-
         <!--logback 日志 -->
         <dependency>
             <groupId>net.logstash.logback</groupId>

release-service/src/main/java/com/mmc/csf/release/config/Knife4jConfiguration.java

 package com.mmc.csf.release.config;
 
-import com.github.xiaoymin.knife4j.spring.annotations.EnableKnife4j;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import springfox.documentation.builders.ApiInfoBuilder;
@@ -9,36 +8,38 @@ import springfox.documentation.builders.RequestHandlerSelectors;
 import springfox.documentation.service.ApiInfo;
 import springfox.documentation.spi.DocumentationType;
 import springfox.documentation.spring.web.plugins.Docket;
-import springfox.documentation.swagger2.annotations.EnableSwagger2;
+import springfox.documentation.swagger2.annotations.EnableSwagger2WebMvc;
 
 /**
- * @author:zhenjie
- * @Date:2023/5/16 10:07
+ * knife4j配置
+ *
+ * @author 23214
+ * @date 2023/05/20
  */
 @Configuration
-@EnableSwagger2
-@EnableKnife4j
+@EnableSwagger2WebMvc
 public class Knife4jConfiguration {
 
   @Bean(value = "defaultApi2")
   public Docket defaultApi2() {
-        Docket docket=new Docket(DocumentationType.SWAGGER_2)
+    Docket docket =
+        new Docket(DocumentationType.SWAGGER_2)
             .apiInfo(apiInfo())
-                //分组名称
+            // 分组名称
             .groupName("信息发布服务")
             .select()
-                //这里指定Controller扫描包路径
+            // 这里指定Controller扫描包路径
             .apis(RequestHandlerSelectors.basePackage("com.mmc.csf.release.controller"))
             .paths(PathSelectors.any())
             .build();
     return docket;
   }
-    private ApiInfo apiInfo(){
+
+  private ApiInfo apiInfo() {
     return new ApiInfoBuilder()
         .title("iuav信息发布相关")
         .description("swagger-bootstrap-ui-demo RESTful APIs")
         .termsOfServiceUrl("https://www.iuav.com/")
-                .contact("group@qq.com")
         .version("1.0")
         .build();
   }