diff --git a/cloud/autho/pom.xml b/cloud/autho/pom.xml index 9a416dc..8ae9c2f 100644 --- a/cloud/autho/pom.xml +++ b/cloud/autho/pom.xml @@ -69,7 +69,7 @@ - quartz_server + auth @@ -91,7 +91,7 @@ - com.sincere.userSearch.UserApplication + com.sincere.autho.AuthoApplication true lib/ diff --git a/cloud/autho/src/main/resources/application.yaml b/cloud/autho/src/main/resources/application.yaml index fb5f629..3ed66f4 100644 --- a/cloud/autho/src/main/resources/application.yaml +++ b/cloud/autho/src/main/resources/application.yaml @@ -24,5 +24,5 @@ eureka: lease-renewal-interval-in-seconds: 10 client: service-url: - defaultZone: http://localhost:8761/eureka/,http://localhost:8762/eureka/ + defaultZone: http://121.40.109.21:8761/eureka/,http://121.40.109.21:8762/eureka/ diff --git a/cloud/getaway/src/main/java/com/sincere/getaway/client/config/CorsConfig.java b/cloud/getaway/src/main/java/com/sincere/getaway/client/config/CorsConfig.java new file mode 100644 index 0000000..d012500 --- /dev/null +++ b/cloud/getaway/src/main/java/com/sincere/getaway/client/config/CorsConfig.java @@ -0,0 +1,75 @@ +//package com.sincere.getaway.client.config; +// +//import org.springframework.cloud.client.discovery.DiscoveryClient; +//import org.springframework.cloud.gateway.discovery.DiscoveryClientRouteDefinitionLocator; +//import org.springframework.cloud.gateway.discovery.DiscoveryLocatorProperties; +//import org.springframework.cloud.gateway.route.RouteDefinitionLocator; +//import org.springframework.context.annotation.Bean; +//import org.springframework.context.annotation.Configuration; +//import org.springframework.http.HttpHeaders; +//import org.springframework.http.HttpMethod; +//import org.springframework.http.HttpStatus; +//import org.springframework.http.codec.ServerCodecConfigurer; +//import org.springframework.http.codec.support.DefaultServerCodecConfigurer; +//import org.springframework.http.server.reactive.ServerHttpRequest; +//import org.springframework.http.server.reactive.ServerHttpResponse; +//import org.springframework.web.cors.reactive.CorsUtils; +//import org.springframework.web.server.ServerWebExchange; +//import org.springframework.web.server.WebFilter; +//import org.springframework.web.server.WebFilterChain; +//import reactor.core.publisher.Mono; +// +///** +// * * 程序名 : CorsConfig +// * 建立日期: 2018-09-09 +// * 作者 : someday +// * 模块 : 网关 +// * 描述 : 跨域 +// * 备注 : version20180909001 +// *

+// * 修改历史 +// * 序号 日期 修改人 修改原因 +// */ +//@Configuration +//public class CorsConfig { +// private static final String ALL = "*"; +// private static final String MAX_AGE = "18000L"; +// +// @Bean +// public RouteDefinitionLocator discoveryClientRouteDefinitionLocator(DiscoveryClient discoveryClient, +// DiscoveryLocatorProperties properties) { +// return new DiscoveryClientRouteDefinitionLocator(discoveryClient, properties); +// } +// +// @Bean +// public ServerCodecConfigurer serverCodecConfigurer() { +// return new DefaultServerCodecConfigurer(); +// } +// +// @Bean +// public WebFilter corsFilter() { +// return (ServerWebExchange ctx, WebFilterChain chain) -> { +// ServerHttpRequest request = ctx.getRequest(); +// if (!CorsUtils.isCorsRequest(request)) { +// return chain.filter(ctx); +// } +// HttpHeaders requestHeaders = request.getHeaders(); +// ServerHttpResponse response = ctx.getResponse(); +// HttpMethod requestMethod = requestHeaders.getAccessControlRequestMethod(); +// HttpHeaders headers = response.getHeaders(); +// headers.add(HttpHeaders.ACCESS_CONTROL_ALLOW_ORIGIN, requestHeaders.getOrigin()); +// headers.addAll(HttpHeaders.ACCESS_CONTROL_ALLOW_HEADERS, requestHeaders.getAccessControlRequestHeaders()); +// if (requestMethod != null) { +// headers.add(HttpHeaders.ACCESS_CONTROL_ALLOW_METHODS, requestMethod.name()); +// } +// headers.add(HttpHeaders.ACCESS_CONTROL_ALLOW_CREDENTIALS, "true"); +// headers.add(HttpHeaders.ACCESS_CONTROL_EXPOSE_HEADERS, ALL); +// headers.add(HttpHeaders.ACCESS_CONTROL_MAX_AGE, MAX_AGE); +// if (request.getMethod() == HttpMethod.OPTIONS) { +// response.setStatusCode(HttpStatus.OK); +// return Mono.empty(); +// } +// return chain.filter(ctx); +// }; +// } +//} diff --git a/cloud/getaway/src/main/resources/application.yml b/cloud/getaway/src/main/resources/application.yml index 12b0c82..f77e571 100644 --- a/cloud/getaway/src/main/resources/application.yml +++ b/cloud/getaway/src/main/resources/application.yml @@ -22,7 +22,7 @@ spring: allowedHeaders: "*" routes: - id: usersearch - uri: lb://usersearch + uri: http://121.40.30.78:9004 predicates: - Path=/usersearch/** filters: @@ -42,11 +42,13 @@ spring: filters: - StripPrefix=1 - id: authserver - uri: lb://authserver + uri: http://121.40.30.78:9005 predicates: - Path=/authserver/** filters: - StripPrefix=1 + default-filters: + - DedupeResponseHeader=Access-Control-Allow-Origin, RETAIN_UNIQUE # discovery: # locator: # lowerCaseServiceId: true @@ -68,4 +70,4 @@ ribbon: url: - ignored: /SmartCampusWebApi/**，/authserver/** \ No newline at end of file + ignored: /SmartCampusWebApi/**,/authserver/** \ No newline at end of file diff --git a/cloud/pom.xml b/cloud/pom.xml index 98c138a..ca8d962 100644 --- a/cloud/pom.xml +++ b/cloud/pom.xml @@ -113,7 +113,7 @@ - + diff --git a/cloud/user_search/src/main/resources/application.yaml b/cloud/user_search/src/main/resources/application.yaml index 3520bbc..70490ac 100644 --- a/cloud/user_search/src/main/resources/application.yaml +++ b/cloud/user_search/src/main/resources/application.yaml @@ -24,5 +24,5 @@ eureka: lease-renewal-interval-in-seconds: 10 client: service-url: - defaultZone: http://localhost:8761/eureka/,http://localhost:8762/eureka/ + defaultZone: http://121.40.109.21:8761/eureka/,http://121.40.109.21:8762/eureka/ -- libgit2 0.21.0