Skip to content

I
ims
提交 da09788e 作者: zhenjie
操作

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

上级 ef1b83a3 1394ba09
正在显示 包含 219 行增加 和 231 行删除
kustomization/overlays/dev/kustomization.yaml
...@@ -17,4 +17,4 @@ patches: ...@@ -17,4 +17,4 @@ patches:
images: images:
- name: REGISTRY/NAMESPACE/IMAGE:TAG - name: REGISTRY/NAMESPACE/IMAGE:TAG
newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/ims 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"
<modelVersion>4.0.0</modelVersion> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<groupId>com.mmc.csf</groupId> <modelVersion>4.0.0</modelVersion>
<artifactId>iuav-ims</artifactId> <groupId>com.mmc.csf</groupId>
<version>0.0.1-SNAPSHOT</version> <artifactId>iuav-ims</artifactId>
<packaging>pom</packaging> <version>0.0.1-SNAPSHOT</version>
<name>信息发布管理系统</name> <packaging>pom</packaging>
<description>培训相关</description> <name>信息发布管理系统</name>
<description>培训相关</description>
<parent>
<groupId>org.springframework.boot</groupId> <parent>
<artifactId>spring-boot-starter-parent</artifactId> <groupId>org.springframework.boot</groupId>
<version>2.2.6.RELEASE</version> <artifactId>spring-boot-starter-parent</artifactId>
<relativePath /> <version>2.2.6.RELEASE</version>
</parent> <relativePath/>
</parent>
<properties>
<spring-cloud.version>Hoxton.SR6</spring-cloud.version> <properties>
<!--Swagger Resources --> <spring-cloud.version>Hoxton.SR6</spring-cloud.version>
<!--Swagger Resources --> <!--Swagger Resources -->
<springfox.version>2.9.2</springfox.version> <!--Swagger Resources -->
<spring-cloud-alibaba-seata.version>2.2.1.RELEASE</spring-cloud-alibaba-seata.version> <springfox.version>2.9.2</springfox.version>
<seata.version>1.1.0</seata.version> <spring-cloud-alibaba-seata.version>2.2.1.RELEASE</spring-cloud-alibaba-seata.version>
</properties> <seata.version>1.1.0</seata.version>
</properties>
<dependencies>
<dependencies>
<!-- lombok 工具通过在代码编译时期动态的将注解替换为具体的代码, IDEA 需要添加 lombok 插件 -->
<dependency> <!-- lombok 工具通过在代码编译时期动态的将注解替换为具体的代码, IDEA 需要添加 lombok 插件 -->
<groupId>org.projectlombok</groupId> <dependency>
<artifactId>lombok</artifactId> <groupId>org.projectlombok</groupId>
<version>1.18.20</version> <artifactId>lombok</artifactId>
<scope>provided</scope> <version>1.18.20</version>
</dependency> <scope>provided</scope>
<dependency> </dependency>
<groupId>org.springframework.boot</groupId> <dependency>
<artifactId>spring-boot-starter-test</artifactId> <groupId>org.springframework.boot</groupId>
<scope>test</scope> <artifactId>spring-boot-starter-test</artifactId>
</dependency> <scope>test</scope>
</dependency>
<dependency>
<groupId>com.alibaba</groupId> <dependency>
<artifactId>fastjson</artifactId> <groupId>com.alibaba</groupId>
<version>1.2.58</version> <artifactId>fastjson</artifactId>
</dependency> <version>1.2.58</version>
</dependency>
<!-- swagger2 -->
<dependency> <dependency>
<groupId>io.springfox</groupId> <groupId>com.github.xiaoymin</groupId>
<artifactId>springfox-swagger2</artifactId> <artifactId>knife4j-spring-boot-starter</artifactId>
<version>2.8.0</version> <version>3.0.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.springfox</groupId> <groupId>com.github.xiaoymin</groupId>
<artifactId>springfox-swagger-ui</artifactId> <artifactId>knife4j-spring-ui</artifactId>
<version>2.8.0</version> <version>3.0.2</version>
</dependency> </dependency>
<!-- 引入swagger-bootstrap-ui包 --> <!--logback 日志 -->
<dependency> <dependency>
<groupId>com.github.xiaoymin</groupId> <groupId>net.logstash.logback</groupId>
<artifactId>knife4j-spring-boot-starter</artifactId> <artifactId>logstash-logback-encoder</artifactId>
<version>2.0.5</version> <version>5.3</version>
</dependency> </dependency>
<dependency> </dependencies>
<groupId>io.springfox</groupId>
<artifactId>springfox-bean-validators</artifactId> <!-- 标识 SpringCloud 的版本 -->
<version>${springfox.version}</version> <dependencyManagement>
</dependency> <dependencies>
<dependency>
<!--logback 日志 --> <groupId>org.springframework.cloud</groupId>
<dependency> <artifactId>spring-cloud-dependencies</artifactId>
<groupId>net.logstash.logback</groupId> <version>${spring-cloud.version}</version>
<artifactId>logstash-logback-encoder</artifactId> <type>pom</type>
<version>5.3</version> <scope>import</scope>
</dependency> </dependency>
</dependencies> <dependency>
<groupId>com.alibaba.cloud</groupId>
<!-- 标识 SpringCloud 的版本 --> <artifactId>spring-cloud-starter-alibaba-seata</artifactId>
<dependencyManagement> <version>${spring-cloud-alibaba-seata.version}</version>
<dependencies> </dependency>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>io.seata</groupId>
<artifactId>spring-cloud-dependencies</artifactId> <artifactId>seata-spring-boot-starter</artifactId>
<version>${spring-cloud.version}</version> <version>${seata.version}</version>
<type>pom</type> </dependency>
<scope>import</scope>
</dependency> <dependency>
<groupId>com.alibaba</groupId>
<dependency> <artifactId>druid-spring-boot-starter</artifactId>
<groupId>com.alibaba.cloud</groupId> <version>1.1.10</version>
<artifactId>spring-cloud-starter-alibaba-seata</artifactId> </dependency>
<version>${spring-cloud-alibaba-seata.version}</version>
</dependency> <dependency>
<groupId>org.mybatis.spring.boot</groupId>
<dependency> <artifactId>mybatis-spring-boot-starter</artifactId>
<groupId>io.seata</groupId> <version>2.1.2</version>
<artifactId>seata-spring-boot-starter</artifactId> </dependency>
<version>${seata.version}</version>
</dependency> <dependency>
<groupId>mysql</groupId>
<dependency> <artifactId>mysql-connector-java</artifactId>
<groupId>com.alibaba</groupId> <version>8.0.15</version>
<artifactId>druid-spring-boot-starter</artifactId> <scope>provided</scope>
<version>1.1.10</version> </dependency>
</dependency>
<dependency>
<dependency> <groupId>cn.afterturn</groupId>
<groupId>org.mybatis.spring.boot</groupId> <artifactId>easypoi-base</artifactId>
<artifactId>mybatis-spring-boot-starter</artifactId> <version>4.1.0</version>
<version>2.1.2</version> </dependency>
</dependency> <dependency>
<groupId>cn.afterturn</groupId>
<dependency> <artifactId>easypoi-web</artifactId>
<groupId>mysql</groupId> <version>4.1.0</version>
<artifactId>mysql-connector-java</artifactId> </dependency>
<version>8.0.15</version>
<scope>provided</scope> <dependency>
</dependency> <groupId>cn.afterturn</groupId>
<artifactId>easypoi-annotation</artifactId>
<dependency> <version>4.1.0</version>
<groupId>cn.afterturn</groupId> </dependency>
<artifactId>easypoi-base</artifactId>
<version>4.1.0</version> <dependency>
</dependency> <groupId>org.apache.commons</groupId>
<dependency> <artifactId>commons-collections4</artifactId>
<groupId>cn.afterturn</groupId> <version>4.4</version>
<artifactId>easypoi-web</artifactId> </dependency>
<version>4.1.0</version>
</dependency> <dependency>
<groupId>com.alibaba</groupId>
<dependency> <artifactId>easyexcel</artifactId>
<groupId>cn.afterturn</groupId> <version>3.1.3</version>
<artifactId>easypoi-annotation</artifactId> </dependency>
<version>4.1.0</version>
</dependency> <dependency>
<groupId>com.aliyun.oss</groupId>
<dependency> <artifactId>aliyun-sdk-oss</artifactId>
<groupId>org.apache.commons</groupId> <version>3.10.2</version>
<artifactId>commons-collections4</artifactId> </dependency>
<version>4.4</version>
</dependency> <!-- https://mvnrepository.com/artifact/commons-fileupload/commons-fileupload -->
<dependency>
<dependency> <groupId>commons-fileupload</groupId>
<groupId>com.alibaba</groupId> <artifactId>commons-fileupload</artifactId>
<artifactId>easyexcel</artifactId> <version>1.4</version>
<version>3.1.3</version> </dependency>
</dependency>
<dependency>
<dependency> <groupId>org.redisson</groupId>
<groupId>com.aliyun.oss</groupId> <artifactId>redisson-spring-boot-starter</artifactId>
<artifactId>aliyun-sdk-oss</artifactId> <version>3.13.1</version>
<version>3.10.2</version> </dependency>
</dependency>
<dependency>
<!-- https://mvnrepository.com/artifact/commons-fileupload/commons-fileupload --> <groupId>com.google.guava</groupId>
<dependency> <artifactId>guava</artifactId>
<groupId>commons-fileupload</groupId> <version>18.0</version>
<artifactId>commons-fileupload</artifactId> </dependency>
<version>1.4</version>
</dependency> <dependency>
<groupId>org.apache.poi</groupId>
<dependency> <artifactId>poi</artifactId>
<groupId>org.redisson</groupId> <version>4.1.0</version>
<artifactId>redisson-spring-boot-starter</artifactId> <scope>compile</scope>
<version>3.13.1</version> </dependency>
</dependency>
</dependencies>
<dependency> </dependencyManagement>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId> <!-- 配置远程仓库 -->
<version>18.0</version> <repositories>
</dependency> <repository>
<id>spring-milestones</id>
<dependency> <name>Spring Milestones</name>
<groupId>org.apache.poi</groupId> <url>https://repo.spring.io/milestone</url>
<artifactId>poi</artifactId> <snapshots>
<version>4.1.0</version> <enabled>false</enabled>
<scope>compile</scope> </snapshots>
</dependency> </repository>
</repositories>
</dependencies> <modules>
</dependencyManagement> <module>release-service</module>
<module>csf-common</module>
<!-- 配置远程仓库 --> </modules>
<repositories>
<repository>
<id>spring-milestones</id>
<name>Spring Milestones</name>
<url>https://repo.spring.io/milestone</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
</repositories>
<modules>
<module>release-service</module>
<module>csf-common</module>
</modules>
</project> </project>
\ No newline at end of file
release-service/src/main/java/com/mmc/csf/release/config/Knife4jConfiguration.java
package com.mmc.csf.release.config; 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.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import springfox.documentation.builders.ApiInfoBuilder; import springfox.documentation.builders.ApiInfoBuilder;
...@@ -9,37 +8,39 @@ import springfox.documentation.builders.RequestHandlerSelectors; ...@@ -9,37 +8,39 @@ import springfox.documentation.builders.RequestHandlerSelectors;
import springfox.documentation.service.ApiInfo; import springfox.documentation.service.ApiInfo;
import springfox.documentation.spi.DocumentationType; import springfox.documentation.spi.DocumentationType;
import springfox.documentation.spring.web.plugins.Docket; import springfox.documentation.spring.web.plugins.Docket;
import springfox.documentation.swagger2.annotations.EnableSwagger2; import springfox.documentation.swagger2.annotations.EnableSwagger2WebMvc;
/** /**
* @author:zhenjie * knife4j配置
* @Date:2023/5/16 10:07 *
* @author 23214
* @date 2023/05/20
*/ */
@Configuration @Configuration
@EnableSwagger2 @EnableSwagger2WebMvc
@EnableKnife4j
public class Knife4jConfiguration { public class Knife4jConfiguration {
@Bean(value = "defaultApi2") @Bean(value = "defaultApi2")
public Docket defaultApi2() { public Docket defaultApi2() {
Docket docket=new Docket(DocumentationType.SWAGGER_2) Docket docket =
.apiInfo(apiInfo()) new Docket(DocumentationType.SWAGGER_2)
//分组名称 .apiInfo(apiInfo())
.groupName("信息发布服务") // 分组名称
.select() .groupName("信息发布服务")
//这里指定Controller扫描包路径 .select()
.apis(RequestHandlerSelectors.basePackage("com.mmc.csf.release.controller")) // 这里指定Controller扫描包路径
.paths(PathSelectors.any()) .apis(RequestHandlerSelectors.basePackage("com.mmc.csf.release.controller"))
.build(); .paths(PathSelectors.any())
return docket; .build();
} return docket;
private ApiInfo apiInfo(){ }
return new ApiInfoBuilder()
.title("iuav信息发布相关") private ApiInfo apiInfo() {
.description("swagger-bootstrap-ui-demo RESTful APIs") return new ApiInfoBuilder()
.termsOfServiceUrl("https://www.iuav.com/") .title("iuav信息发布相关")
.contact("group@qq.com") .description("swagger-bootstrap-ui-demo RESTful APIs")
.version("1.0") .termsOfServiceUrl("https://www.iuav.com/")
.build(); .version("1.0")
} .build();
}
} }
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论