Skip to content

zhoujh@polysoft.com.cn / nafmii-parent

Go to a project
Commit 39c9cc3b by zhoujinghao
Options

swagger 修改

1 parent ab187a28
Inline Side-by-side
Showing 14 changed files with 88 additions and 84 deletions
nafmii-admin/pom.xml
...@@ -109,18 +109,15 @@ ...@@ -109,18 +109,15 @@
<groupId>de.codecentric</groupId> <groupId>de.codecentric</groupId>
<artifactId>spring-boot-admin-starter-server</artifactId> <artifactId>spring-boot-admin-starter-server</artifactId>
</dependency> </dependency>
<!--Knife4j API文档生产工具-->
<dependency> <dependency>
<groupId>io.springfox</groupId> <groupId>com.github.xiaoymin</groupId>
<artifactId>springfox-swagger-ui</artifactId> <artifactId>knife4j-micro-spring-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.google.guava</groupId> <groupId>com.github.xiaoymin</groupId>
<artifactId>guava</artifactId> <artifactId>knife4j-spring-boot-starter</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.nafmii</groupId> <groupId>org.nafmii</groupId>
......
nafmii-admin/src/main/java/org/nafmii/nafmiiadmin/NafmiiAdminApplication.java
...@@ -3,7 +3,6 @@ package org.nafmii.nafmiiadmin; ...@@ -3,7 +3,6 @@ package org.nafmii.nafmiiadmin;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration;
import org.springframework.cloud.netflix.eureka.EnableEurekaClient; import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.cloud.openfeign.EnableFeignClients;
import springfox.documentation.swagger2.annotations.EnableSwagger2; import springfox.documentation.swagger2.annotations.EnableSwagger2;
......
nafmii-admin/src/main/java/org/nafmii/nafmiiadmin/swagger/SwaggerConfig.java 0 → 100644
package org.nafmii.nafmiiadmin.swagger;
import org.springframework.beans.factory.annotation.Value;
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.service.ApiInfo;
import springfox.documentation.spi.DocumentationType;
import springfox.documentation.spring.web.plugins.Docket;
import springfox.documentation.swagger2.annotations.EnableSwagger2;
/**
* 用于在swagger-ui.html上展示所有Api接口
* User: FrankBai
* Date: 2020/02/14
**/
@Configuration
@EnableSwagger2
public class SwaggerConfig {
@Bean
public Docket adminApi() {
// String basePackage = ADMIN_SWAGGER;// 要暴露的API接口的基础包名
return new Docket (DocumentationType.SWAGGER_2)
.select ()
.apis (RequestHandlerSelectors.basePackage ("org.nafmii.nafmiiadmin"))
.paths (PathSelectors.any ())
.build ()
.apiInfo (apiInfo ())
.useDefaultResponseMessages (false);
}
private static ApiInfo apiInfo() {
return new ApiInfoBuilder ()
.title ("NAFMIIweb管理平台应用层接口说明")
.description ("NAFMIIweb管理平台应用层接口说明")
.version ("1.0")
.build ();
}
}
nafmii-admin/src/main/resources/application.properties
...@@ -7,9 +7,6 @@ logging.file.max-history=15 ...@@ -7,9 +7,6 @@ logging.file.max-history=15
logging.file.max-size=300MB logging.file.max-size=300MB
logging.pattern.dateformat=yyyy-MM-dd hh:MM:ss logging.pattern.dateformat=yyyy-MM-dd hh:MM:ss
eureka.client.serviceUrl.defaultZone=http://127.0.0.1:8761/eureka eureka.client.serviceUrl.defaultZone=http://127.0.0.1:8761/eureka
admin.swagger=org.nafmii.nafmiiadmin
admin.title=NAFMIIweb管理平台应用层接口说明
admin.description=NAFMIIweb管理平台应用层接口说明
eureka.instance.statusPageUrl = http://127.0.0.1:8001/swagger-ui.html eureka.instance.statusPageUrl = http://127.0.0.1:8001/swagger-ui.html
eureka.instance.prefer-ip-address = true eureka.instance.prefer-ip-address = true
eureka.instance.instance-id = ${spring.cloud.client.ip-address}:${server.port} eureka.instance.instance-id = ${spring.cloud.client.ip-address}:${server.port}
\ No newline at end of file \ No newline at end of file
nafmii-app/pom.xml
...@@ -36,12 +36,21 @@ ...@@ -36,12 +36,21 @@
<groupId>com.github.pagehelper</groupId> <groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper-spring-boot-starter</artifactId> <artifactId>pagehelper-spring-boot-starter</artifactId>
</dependency> </dependency>
<!--MyBatis分页插件-->
<dependency>
<groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper</artifactId>
</dependency>
<!--feign --> <!--feign -->
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-openfeign</artifactId> <artifactId>spring-cloud-starter-openfeign</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId> <artifactId>spring-boot-starter-actuator</artifactId>
</dependency> </dependency>
...@@ -53,28 +62,6 @@ ...@@ -53,28 +62,6 @@
<groupId>org.mybatis.generator</groupId> <groupId>org.mybatis.generator</groupId>
<artifactId>mybatis-generator-core</artifactId> <artifactId>mybatis-generator-core</artifactId>
</dependency> </dependency>
<!--MyBatis分页插件-->
<dependency>
<groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper</artifactId>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
<dependency>
<groupId>org.nafmii</groupId>
<artifactId>nafmii-common</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId> <artifactId>spring-boot-starter-web</artifactId>
...@@ -85,11 +72,6 @@ ...@@ -85,11 +72,6 @@
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</dependency>
<!-- MyBatis--> <!-- MyBatis-->
<dependency> <dependency>
<groupId>org.mybatis</groupId> <groupId>org.mybatis</groupId>
...@@ -127,6 +109,19 @@ ...@@ -127,6 +109,19 @@
<groupId>de.codecentric</groupId> <groupId>de.codecentric</groupId>
<artifactId>spring-boot-admin-starter-server</artifactId> <artifactId>spring-boot-admin-starter-server</artifactId>
</dependency> </dependency>
<!--Knife4j API文档生产工具-->
<dependency>
<groupId>com.github.xiaoymin</groupId>
<artifactId>knife4j-micro-spring-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>com.github.xiaoymin</groupId>
<artifactId>knife4j-spring-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>org.nafmii</groupId>
<artifactId>nafmii-common</artifactId>
</dependency>
</dependencies> </dependencies>
<build> <build>
......
nafmii-app/src/main/java/org/nafmii/NafmiiAppApplication.java
...@@ -9,8 +9,8 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2; ...@@ -9,8 +9,8 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class}) @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
@EnableEurekaClient @EnableEurekaClient
@EnableFeignClients
@EnableSwagger2 @EnableSwagger2
@EnableFeignClients
public class NafmiiAppApplication { public class NafmiiAppApplication {
public static void main(String[] args) { public static void main(String[] args) {
......
nafmii-app/src/main/java/org/nafmii/adminService/AdminService.java
...@@ -17,7 +17,6 @@ import java.util.List; ...@@ -17,7 +17,6 @@ import java.util.List;
* @remark: * @remark:
*/ */
@FeignClient(value = "nafmii-admin") @FeignClient(value = "nafmii-admin")
@Component
public interface AdminService { public interface AdminService {
//测试feign //测试feign
@GetMapping("web/nafmii/test/search") @GetMapping("web/nafmii/test/search")
......
nafmii-app/src/main/java/org/nafmii/controller/AppController.java
...@@ -24,7 +24,6 @@ public class AppController { ...@@ -24,7 +24,6 @@ public class AppController {
@Autowired @Autowired
private AppService appService; private AppService appService;
@ApiOperation( value = "测试",notes = "测试") @ApiOperation( value = "测试",notes = "测试")
@GetMapping("search") @GetMapping("search")
public String search(){ public String search(){
String test = appService.search(); String test = appService.search();
......
nafmii-common/src/main/java/org/nafmii/swagger/SwaggerConfig.java → nafmii-app/src/main/java/org/nafmii/swagger/SwaggerConfig.java
package org.nafmii.swagger; package org.nafmii.swagger;
import org.springframework.beans.factory.annotation.Value;
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;
...@@ -13,7 +12,6 @@ import springfox.documentation.spring.web.plugins.Docket; ...@@ -13,7 +12,6 @@ import springfox.documentation.spring.web.plugins.Docket;
import springfox.documentation.swagger2.annotations.EnableSwagger2; import springfox.documentation.swagger2.annotations.EnableSwagger2;
/** /**
* 用于在swagger-ui.html上展示所有Api接口 * 用于在swagger-ui.html上展示所有Api接口
* User: FrankBai * User: FrankBai
...@@ -22,18 +20,12 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2; ...@@ -22,18 +20,12 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
@Configuration @Configuration
@EnableSwagger2 @EnableSwagger2
public class SwaggerConfig { public class SwaggerConfig {
@Value("${admin.swagger}")
private static String ADMIN_SWAGGER;
@Value("${admin.title}")
private static String ADMIN_TITLE;
@Value("${admin.description}")
private static String ADMIN_DESCRIPTION;
@Bean @Bean
public Docket adminApi() { public Docket adminApi() {
// String basePackage = ADMIN_SWAGGER;// 要暴露的API接口的基础包名 // String basePackage = ADMIN_SWAGGER;// 要暴露的API接口的基础包名
return new Docket (DocumentationType.SWAGGER_2) return new Docket (DocumentationType.SWAGGER_2)
.select () .select ()
.apis (RequestHandlerSelectors.basePackage (ADMIN_SWAGGER)) .apis (RequestHandlerSelectors.basePackage ("org.nafmii"))
.paths (PathSelectors.any ()) .paths (PathSelectors.any ())
.build () .build ()
.apiInfo (apiInfo ()) .apiInfo (apiInfo ())
...@@ -42,8 +34,8 @@ public class SwaggerConfig { ...@@ -42,8 +34,8 @@ public class SwaggerConfig {
private static ApiInfo apiInfo() { private static ApiInfo apiInfo() {
return new ApiInfoBuilder () return new ApiInfoBuilder ()
.title (ADMIN_TITLE) .title ("NAFMIIapp应用层接口说明")
.description (ADMIN_DESCRIPTION) .description ("NAFMIIapp应用层接口说明")
.version ("1.0") .version ("1.0")
.build (); .build ();
} }
......
nafmii-app/src/main/resources/application.properties
server.port=8002 server.port=8002
eureka.client.serviceUrl.defaultZone=http://127.0.0.1:8761/eureka
spring.application.name=nafmii-app spring.application.name=nafmii-app
admin.title=NAFMIIweb管理平台应用层接口说明 logging.level.root=info
admin.description=NAFMIIweb管理平台应用层接口说明 logging.file.path=d:/data/logs/nafmii-app/
logging.file.max-history=15
logging.file.max-size=300MB
logging.pattern.dateformat=yyyy-MM-dd hh:MM:ss
eureka.client.serviceUrl.defaultZone=http://127.0.0.1:8761/eureka
eureka.instance.statusPageUrl = http://127.0.0.1:8002/swagger-ui.html eureka.instance.statusPageUrl = http://127.0.0.1:8002/swagger-ui.html
eureka.instance.prefer-ip-address = true eureka.instance.prefer-ip-address = true
eureka.instance.instance-id = ${spring.cloud.client.ip-address}:${server.port} eureka.instance.instance-id = ${spring.cloud.client.ip-address}:${server.port}
\ No newline at end of file \ No newline at end of file
logging.level.root=debug
admin.swagger=org.nafmii.controller
nafmii-common/pom.xml
...@@ -21,15 +21,17 @@ ...@@ -21,15 +21,17 @@
<groupId>net.logstash.logback</groupId> <groupId>net.logstash.logback</groupId>
<artifactId>logstash-logback-encoder</artifactId> <artifactId>logstash-logback-encoder</artifactId>
</dependency> </dependency>
<!--Knife4j API文档生产工具-->
<dependency> <dependency>
<groupId>io.springfox</groupId> <groupId>com.github.xiaoymin</groupId>
<artifactId>springfox-swagger-ui</artifactId> <artifactId>knife4j-micro-spring-boot-starter</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.springfox</groupId> <groupId>com.github.xiaoymin</groupId>
<artifactId>springfox-swagger2</artifactId> <artifactId>knife4j-spring-boot-starter</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
......
nafmii-gateway/pom.xml
...@@ -16,12 +16,10 @@ ...@@ -16,12 +16,10 @@
<java.version>1.8</java.version> <java.version>1.8</java.version>
</properties> </properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-gateway</artifactId> <artifactId>spring-cloud-starter-gateway</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId> <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
......
nafmii-gateway/src/main/resources/application.yml
...@@ -37,4 +37,3 @@ management: #开启SpringBoot Admin的监控 ...@@ -37,4 +37,3 @@ management: #开启SpringBoot Admin的监控
endpoint: endpoint:
health: health:
show-details: always show-details: always
\ No newline at end of file \ No newline at end of file
pom.xml
...@@ -40,7 +40,6 @@ ...@@ -40,7 +40,6 @@
<pagehelper.version>5.2.0</pagehelper.version> <pagehelper.version>5.2.0</pagehelper.version>
<druid.version>1.1.23</druid.version> <druid.version>1.1.23</druid.version>
<hutool.version>5.4.0</hutool.version> <hutool.version>5.4.0</hutool.version>
<guava.version>20.0</guava.version>
<mybatis-generator.version>1.4.0</mybatis-generator.version> <mybatis-generator.version>1.4.0</mybatis-generator.version>
<mybatis.version>3.5.5</mybatis.version> <mybatis.version>3.5.5</mybatis.version>
<mysql-connector.version>8.0.20</mysql-connector.version> <mysql-connector.version>8.0.20</mysql-connector.version>
...@@ -91,22 +90,7 @@ ...@@ -91,22 +90,7 @@
<dependencyManagement> <dependencyManagement>
<dependencies> <dependencies>
<!--swagger 相关依赖--> <!--swagger 相关依赖-->
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId>
<version>2.6.1</version>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId>
<version>2.6.1</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${guava.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.nafmii</groupId> <groupId>org.nafmii</groupId>
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!