diff --git a/cloud/fIle-center/pom.xml b/cloud/fIle-center/pom.xml index 80e3f31..8b2954d 100644 --- a/cloud/fIle-center/pom.xml +++ b/cloud/fIle-center/pom.xml @@ -61,6 +61,6 @@ - ${project.artifactId} + file-center \ No newline at end of file diff --git a/cloud/fIle-center/src/main/resources/application.yml b/cloud/fIle-center/src/main/resources/application.yml index c54fb4a..266b210 100644 --- a/cloud/fIle-center/src/main/resources/application.yml +++ b/cloud/fIle-center/src/main/resources/application.yml @@ -155,15 +155,15 @@ ribbon: #设置最大容错超时时间 -hystrix: - command: - default: - execution: - timeout: - enabled: true - isolation: - thread: - timeoutInMilliseconds: 90000 +#hystrix: +# command: +# default: +# execution: +# timeout: +# enabled: true +# isolation: +# thread: +# timeoutInMilliseconds: 90000 diff --git a/cloud/fIle-center/src/main/resources/bootstrap.yml b/cloud/fIle-center/src/main/resources/bootstrap.yml index 0365757..ea4d989 100644 --- a/cloud/fIle-center/src/main/resources/bootstrap.yml +++ b/cloud/fIle-center/src/main/resources/bootstrap.yml @@ -25,7 +25,8 @@ management: eureka: client: serviceUrl: - defaultZone: http://localhost:8761/eureka/,http://localhost:8762/eureka/ +# defaultZone: http://localhost:8761/eureka/,http://localhost:8762/eureka/ + defaultZone: http://121.40.109.21:8761/eureka/,http://121.40.109.21:8762/eureka/ #http://134.224.249.33:1111/eureka/ 正式库 #http://134.224.249.33:1111/eureka/ 测试库 #http://127.0.0.1:8761/eureka,http://127.0.0.1:8762/eureka @@ -33,7 +34,8 @@ eureka: instance-info-replication-interval-seconds: 10 instance: prefer-ip-address: true - instance-id: ${spring.application.name}:${spring.cloud.client.ip-address}:${spring.application.instance_id:${server.port}} #固定端口 + instance-id: ${spring.application.name} +# instance-id: ${spring.application.name}:${spring.cloud.client.ip-address}:${spring.application.instance_id:${server.port}} #固定端口 # instance-id: ${spring.application.name}:${spring.cloud.client.ip-address}:${spring.application.instance_id:${randomServerPort.value[5000,5005]}} #随机端口 lease-renewal-interval-in-seconds: 10 #每隔几秒告诉eureka服务器我还存活，用于心跳检测 lease-expiration-duration-in-seconds: 10 #如果心跳检测一直没有发送，10秒后会从eureka服务器中将此服务剔除 diff --git a/cloud/getaway/pom.xml b/cloud/getaway/pom.xml index 767a31e..3b95e2b 100644 --- a/cloud/getaway/pom.xml +++ b/cloud/getaway/pom.xml @@ -60,6 +60,7 @@ + ${project.artifactId} diff --git a/cloud/getaway/src/main/java/com/sincere/getaway/client/config/PermitUrlProperties.java b/cloud/getaway/src/main/java/com/sincere/getaway/client/config/PermitUrlProperties.java index b0427e3..83395cf 100644 --- a/cloud/getaway/src/main/java/com/sincere/getaway/client/config/PermitUrlProperties.java +++ b/cloud/getaway/src/main/java/com/sincere/getaway/client/config/PermitUrlProperties.java @@ -16,7 +16,7 @@ public class PermitUrlProperties { */ private static final String[] ENDPOINTS = { - "/v2/api-docs/**", "/swagger-ui.html", "/swagger-resources/**", "/webjars/**" , // api-gateway webflux swagger + "/v2/api-docs/**", "/swagger-ui.html","/swagger/index.html", "/swagger-resources/**", "/webjars/**" , // api-gateway webflux swagger "/**/v2/api-docs/**", "/**/swagger-ui.html", "/**/swagger-resources/**", "/**/webjars/**" //业务中心swagger }; diff --git a/cloud/getaway/src/main/java/com/sincere/getaway/client/config/SwaggerProvider.java b/cloud/getaway/src/main/java/com/sincere/getaway/client/config/SwaggerProvider.java index bbf8998..43f87c6 100644 --- a/cloud/getaway/src/main/java/com/sincere/getaway/client/config/SwaggerProvider.java +++ b/cloud/getaway/src/main/java/com/sincere/getaway/client/config/SwaggerProvider.java @@ -2,6 +2,7 @@ package com.sincere.getaway.client.config; import lombok.AllArgsConstructor; import org.springframework.cloud.gateway.config.GatewayProperties; +import org.springframework.cloud.gateway.route.RouteDefinition; import org.springframework.cloud.gateway.route.RouteLocator; import org.springframework.cloud.gateway.support.NameUtils; import org.springframework.context.annotation.Primary; @@ -33,15 +34,19 @@ public class SwaggerProvider implements SwaggerResourcesProvider { .filter(predicateDefinition -> ("Path").equalsIgnoreCase(predicateDefinition.getName())) .forEach(predicateDefinition -> resources.add(swaggerResource(routeDefinition.getId(), predicateDefinition.getArgs().get(NameUtils.GENERATED_NAME_PREFIX + "0") - .replace("/**", API_URI))))); + .replace("/**", API_URI),routeDefinition)))); return resources; } - private SwaggerResource swaggerResource(String name, String location) { + private SwaggerResource swaggerResource(String name, String location, RouteDefinition routeDefinition) { SwaggerResource swaggerResource = new SwaggerResource(); swaggerResource.setName(name); swaggerResource.setLocation(location); swaggerResource.setSwaggerVersion("2.0"); +// swaggerResource.setUrl(routeDefinition.getUri().toString()); + System.out.println("location:-------------------------------------------"+location); + System.out.println("host-----------------------------------------------"+routeDefinition.getUri().toString()); + System.out.println("name:-------------------------------------------"+routeDefinition.toString()); return swaggerResource; } } diff --git a/cloud/getaway/src/main/resources/application.yml b/cloud/getaway/src/main/resources/application.yml index 4d39ef6..2e482fb 100644 --- a/cloud/getaway/src/main/resources/application.yml +++ b/cloud/getaway/src/main/resources/application.yml @@ -21,15 +21,35 @@ spring: - Path=/usersearch/** filters: - StripPrefix=1 - - id: haikangserver - uri: lb://haikangserver + - id: SmartCampusWebApi + uri: http://120.26.116.253:9022 +# uri: lb://SmartCampusWebApi predicates: - - Path=/haikangserver/** + - Path=/SmartCampusWebApi/** filters: - StripPrefix=1 - id: file-center uri: lb://file-center +# uri: http://121.40.30.78:5000 predicates: - Path=/file-center/** filters: - - StripPrefix=1 \ No newline at end of file + - StripPrefix=1 +# discovery: +# locator: +# lowerCaseServiceId: true +# enabled: true + + + +#设置最大超时时间 +ribbon: + httpclient: + enabled: false + okhttp: + enabled: true + ReadTimeout: 90000 + ConnectTimeout: 90000 + OkToRetryOnAllOperations: true + MaxAutoRetries: 1 + MaxAutoRetriesNextServer: 1 \ No newline at end of file diff --git a/cloud/pom.xml b/cloud/pom.xml index 46b4e7b..952dc96 100644 --- a/cloud/pom.xml +++ b/cloud/pom.xml @@ -113,6 +113,79 @@ + + + + + org.springframework.boot + spring-boot-maven-plugin + + + maven-compiler-plugin + + ${java.version} + ${java.version} + UTF-8 + + + + org.apache.maven.plugins + maven-jar-plugin + + + false + + + + + + + + src/main/resources + + **/*.properties + **/*.yml + **/*.xml + **/*.tld + **/*.p12 + **/*.conf + **/*.txt + **/*.wsdl + **/*.xsd + **/*.ftl + **/*.lua + **/*.json + processes/* + **/spring.factories + + false + + + src/main/java + + **/*.properties + **/*.xml + **/*.tld + + false + + + src/main/view + + **/*.* + + false + + + + src/main/proto + + **/*.proto + + false + + + diff --git a/cloud/server1/pom.xml b/cloud/server1/pom.xml index f0d27e7..dbdd09e 100644 --- a/cloud/server1/pom.xml +++ b/cloud/server1/pom.xml @@ -28,6 +28,7 @@ spring-boot-maven-plugin + ${project.artifactId} diff --git a/cloud/server2/pom.xml b/cloud/server2/pom.xml index 56ada0f..b6807f2 100644 --- a/cloud/server2/pom.xml +++ b/cloud/server2/pom.xml @@ -30,6 +30,7 @@ + ${project.artifactId} -- libgit2 0.21.0