diff --git a/skyeye-adm/adm-web/pom.xml b/skyeye-adm/adm-web/pom.xml
index c24f3cff..1e7d33eb 100644
--- a/skyeye-adm/adm-web/pom.xml
+++ b/skyeye-adm/adm-web/pom.xml
@@ -58,17 +58,18 @@
org.springframework.boot
spring-boot-maven-plugin
+ ${spring-boot.version}
+
+
+
+ repackage
+
+
+
true
true
-
-
- org.springframework
- springloaded
- 1.2.5.RELEASE
-
-
diff --git a/skyeye-adm/adm-web/src/main/resources/bootstrap.yml b/skyeye-adm/adm-web/src/main/resources/bootstrap.yml
index fe1eee50..4e13627f 100644
--- a/skyeye-adm/adm-web/src/main/resources/bootstrap.yml
+++ b/skyeye-adm/adm-web/src/main/resources/bootstrap.yml
@@ -16,12 +16,12 @@ spring:
cloud:
nacos:
discovery:
- server-addr: 172.18.92.40:9000 # 配置服务注册nacos地址
+ server-addr: 172.18.92.40:8848 # 配置服务注册nacos地址
namespace: ${spring.profiles.active} # 配置命名空间
service: ${spring.application.name} # 配置服务名
config:
# 指定nacos server的地址
- server-addr: 172.18.92.40:9000
+ server-addr: 172.18.92.40:8848
# 配置文件后缀
file-extension: yml
# 命名空间 常用场景之一是不同环境的配置的区分隔离,例如开发测试环境和生产环境的资源(如配置、服务)隔离等
diff --git a/skyeye-auto/auto-web/pom.xml b/skyeye-auto/auto-web/pom.xml
index 2db5e9a2..dec939da 100644
--- a/skyeye-auto/auto-web/pom.xml
+++ b/skyeye-auto/auto-web/pom.xml
@@ -58,16 +58,14 @@
org.springframework.boot
spring-boot-maven-plugin
-
- true
-
-
-
- org.springframework
- springloaded
- 1.2.5.RELEASE
-
-
+ ${spring-boot.version}
+
+
+
+ repackage
+
+
+
diff --git a/skyeye-boss/boss-web/pom.xml b/skyeye-boss/boss-web/pom.xml
index c260f1ff..1929d6a2 100644
--- a/skyeye-boss/boss-web/pom.xml
+++ b/skyeye-boss/boss-web/pom.xml
@@ -58,16 +58,14 @@
org.springframework.boot
spring-boot-maven-plugin
-
- true
-
-
-
- org.springframework
- springloaded
- 1.2.5.RELEASE
-
-
+ ${spring-boot.version}
+
+
+
+ repackage
+
+
+
diff --git a/skyeye-checkwork/checkwork-web/pom.xml b/skyeye-checkwork/checkwork-web/pom.xml
index bbf7c625..ce32b76b 100644
--- a/skyeye-checkwork/checkwork-web/pom.xml
+++ b/skyeye-checkwork/checkwork-web/pom.xml
@@ -53,16 +53,14 @@
org.springframework.boot
spring-boot-maven-plugin
-
- true
-
-
-
- org.springframework
- springloaded
- 1.2.5.RELEASE
-
-
+ ${spring-boot.version}
+
+
+
+ repackage
+
+
+
diff --git a/skyeye-choose-topic/choose-topic-web/pom.xml b/skyeye-choose-topic/choose-topic-web/pom.xml
index a58a6323..0190ca4b 100644
--- a/skyeye-choose-topic/choose-topic-web/pom.xml
+++ b/skyeye-choose-topic/choose-topic-web/pom.xml
@@ -53,16 +53,14 @@
org.springframework.boot
spring-boot-maven-plugin
-
- true
-
-
-
- org.springframework
- springloaded
- 1.2.5.RELEASE
-
-
+ ${spring-boot.version}
+
+
+
+ repackage
+
+
+
diff --git a/skyeye-crm/crm-web/pom.xml b/skyeye-crm/crm-web/pom.xml
index 64964b75..2bd86d01 100644
--- a/skyeye-crm/crm-web/pom.xml
+++ b/skyeye-crm/crm-web/pom.xml
@@ -58,16 +58,14 @@
org.springframework.boot
spring-boot-maven-plugin
-
- true
-
-
-
- org.springframework
- springloaded
- 1.2.5.RELEASE
-
-
+ ${spring-boot.version}
+
+
+
+ repackage
+
+
+
diff --git a/skyeye-deploy/deploy-web/pom.xml b/skyeye-deploy/deploy-web/pom.xml
index af78f58c..de02928e 100644
--- a/skyeye-deploy/deploy-web/pom.xml
+++ b/skyeye-deploy/deploy-web/pom.xml
@@ -72,16 +72,14 @@
org.springframework.boot
spring-boot-maven-plugin
-
- true
-
-
-
- org.springframework
- springloaded
- 1.2.5.RELEASE
-
-
+ ${spring-boot.version}
+
+
+
+ repackage
+
+
+
diff --git a/skyeye-erp/erp-web/pom.xml b/skyeye-erp/erp-web/pom.xml
index 9085f7bf..d478400a 100644
--- a/skyeye-erp/erp-web/pom.xml
+++ b/skyeye-erp/erp-web/pom.xml
@@ -53,16 +53,14 @@
org.springframework.boot
spring-boot-maven-plugin
-
- true
-
-
-
- org.springframework
- springloaded
- 1.2.5.RELEASE
-
-
+ ${spring-boot.version}
+
+
+
+ repackage
+
+
+
diff --git a/skyeye-flowable/flowable-web/pom.xml b/skyeye-flowable/flowable-web/pom.xml
index 83e324f8..a9b04281 100644
--- a/skyeye-flowable/flowable-web/pom.xml
+++ b/skyeye-flowable/flowable-web/pom.xml
@@ -58,16 +58,14 @@
org.springframework.boot
spring-boot-maven-plugin
-
- true
-
-
-
- org.springframework
- springloaded
- 1.2.5.RELEASE
-
-
+ ${spring-boot.version}
+
+
+
+ repackage
+
+
+
diff --git a/skyeye-flowable/flowable-web/src/main/java/com/SkyFlowableApplication.java b/skyeye-flowable/flowable-web/src/main/java/com/SkyFlowableApplication.java
index 950b1dae..3deeb91b 100644
--- a/skyeye-flowable/flowable-web/src/main/java/com/SkyFlowableApplication.java
+++ b/skyeye-flowable/flowable-web/src/main/java/com/SkyFlowableApplication.java
@@ -18,7 +18,8 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
@SpringBootApplication
@EnableAutoConfiguration(exclude = {
org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration.class,
- org.flowable.spring.boot.FlowableSecurityAutoConfiguration.class
+ org.flowable.spring.boot.FlowableSecurityAutoConfiguration.class,
+ org.springframework.boot.actuate.autoconfigure.security.servlet.ManagementWebSecurityAutoConfiguration.class
})
@EnableConfigurationProperties({FlowableModelerAppProperties.class})
@ComponentScan(basePackages = {"com.skyeye"})
@@ -27,9 +28,6 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
@EnableFeignClients
public class SkyFlowableApplication {
- @Value("${IMAGES_PATH}")
- private String tPath;
-
public static void main(String[] args) {
System.setProperty("spring.devtools.restart.enabled", "false");
SpringApplication.run(SkyFlowableApplication.class, args);
diff --git a/skyeye-flowable/flowable-web/src/main/resources/bootstrap.yml b/skyeye-flowable/flowable-web/src/main/resources/bootstrap.yml
index 89d45387..1a7b2e2f 100644
--- a/skyeye-flowable/flowable-web/src/main/resources/bootstrap.yml
+++ b/skyeye-flowable/flowable-web/src/main/resources/bootstrap.yml
@@ -17,12 +17,12 @@ spring:
cloud:
nacos:
discovery:
- server-addr: localhost:9000 # 配置服务注册nacos地址
+ server-addr: 172.18.92.40:8848 # 配置服务注册nacos地址
namespace: ${spring.profiles.active} # 配置命名空间
service: ${spring.application.name} # 配置服务名
config:
# 指定nacos server的地址
- server-addr: localhost:9000
+ server-addr: 172.18.92.40:8848
# 配置文件后缀
file-extension: yml
# 命名空间 常用场景之一是不同环境的配置的区分隔离,例如开发测试环境和生产环境的资源(如配置、服务)隔离等
diff --git a/skyeye-ifs/ifs-web/pom.xml b/skyeye-ifs/ifs-web/pom.xml
index 66b230fb..06e96dfe 100644
--- a/skyeye-ifs/ifs-web/pom.xml
+++ b/skyeye-ifs/ifs-web/pom.xml
@@ -53,16 +53,14 @@
org.springframework.boot
spring-boot-maven-plugin
-
- true
-
-
-
- org.springframework
- springloaded
- 1.2.5.RELEASE
-
-
+ ${spring-boot.version}
+
+
+
+ repackage
+
+
+
diff --git a/skyeye-monitor/pom.xml b/skyeye-monitor/pom.xml
index 39a444ba..3f676831 100644
--- a/skyeye-monitor/pom.xml
+++ b/skyeye-monitor/pom.xml
@@ -138,16 +138,14 @@
org.springframework.boot
spring-boot-maven-plugin
-
- true
-
-
-
- org.springframework
- springloaded
- 1.2.5.RELEASE
-
-
+ ${spring-boot.version}
+
+
+
+ repackage
+
+
+
diff --git a/skyeye-project/project-web/pom.xml b/skyeye-project/project-web/pom.xml
index 9c7eea4f..bd6cb5a7 100644
--- a/skyeye-project/project-web/pom.xml
+++ b/skyeye-project/project-web/pom.xml
@@ -53,16 +53,14 @@
org.springframework.boot
spring-boot-maven-plugin
-
- true
-
-
-
- org.springframework
- springloaded
- 1.2.5.RELEASE
-
-
+ ${spring-boot.version}
+
+
+
+ repackage
+
+
+
diff --git a/skyeye-promote/skyeye-web/pom.xml b/skyeye-promote/skyeye-web/pom.xml
index 8c4c6726..ace271d7 100644
--- a/skyeye-promote/skyeye-web/pom.xml
+++ b/skyeye-promote/skyeye-web/pom.xml
@@ -90,16 +90,14 @@
org.springframework.boot
spring-boot-maven-plugin
-
- true
-
-
-
- org.springframework
- springloaded
- 1.2.5.RELEASE
-
-
+ ${spring-boot.version}
+
+
+
+ repackage
+
+
+
diff --git a/skyeye-promote/skyeye-web/src/main/resources/bootstrap.yaml b/skyeye-promote/skyeye-web/src/main/resources/bootstrap.yaml
index 620511cd..b6c0082a 100644
--- a/skyeye-promote/skyeye-web/src/main/resources/bootstrap.yaml
+++ b/skyeye-promote/skyeye-web/src/main/resources/bootstrap.yaml
@@ -16,12 +16,12 @@ spring:
cloud:
nacos:
discovery:
- server-addr: localhost:9000 # 配置服务注册nacos地址
+ server-addr: 172.18.92.40:8848 # 配置服务注册nacos地址
namespace: ${spring.profiles.active} # 配置命名空间
service: ${spring.application.name} # 配置服务名
config:
# 指定nacos server的地址
- server-addr: localhost:9000
+ server-addr: 172.18.92.40:8848
# 配置文件后缀
file-extension: yml
# 命名空间 常用场景之一是不同环境的配置的区分隔离,例如开发测试环境和生产环境的资源(如配置、服务)隔离等
diff --git a/skyeye-report/report-web/pom.xml b/skyeye-report/report-web/pom.xml
index 6339ff6f..aa79a8d8 100644
--- a/skyeye-report/report-web/pom.xml
+++ b/skyeye-report/report-web/pom.xml
@@ -58,16 +58,14 @@
org.springframework.boot
spring-boot-maven-plugin
-
- true
-
-
-
- org.springframework
- springloaded
- 1.2.5.RELEASE
-
-
+ ${spring-boot.version}
+
+
+
+ repackage
+
+
+
diff --git a/skyeye-school/school-web/pom.xml b/skyeye-school/school-web/pom.xml
index fd31cd57..9eb3ea6d 100644
--- a/skyeye-school/school-web/pom.xml
+++ b/skyeye-school/school-web/pom.xml
@@ -72,26 +72,14 @@
org.springframework.boot
spring-boot-maven-plugin
-
- true
-
-
- ${basedir}/lib
- WEB-INF/lib
- false
-
- **/*.jar
-
-
-
-
-
-
- org.springframework
- springloaded
- 1.2.5.RELEASE
-
-
+ ${spring-boot.version}
+
+
+
+ repackage
+
+
+
diff --git a/skyeye-seal-service/seal-service-web/pom.xml b/skyeye-seal-service/seal-service-web/pom.xml
index 3856feb0..f901937e 100644
--- a/skyeye-seal-service/seal-service-web/pom.xml
+++ b/skyeye-seal-service/seal-service-web/pom.xml
@@ -58,16 +58,14 @@
org.springframework.boot
spring-boot-maven-plugin
-
- true
-
-
-
- org.springframework
- springloaded
- 1.2.5.RELEASE
-
-
+ ${spring-boot.version}
+
+
+
+ repackage
+
+
+
diff --git a/skyeye-shop/shop-web/pom.xml b/skyeye-shop/shop-web/pom.xml
index 84f886c1..ab98b742 100644
--- a/skyeye-shop/shop-web/pom.xml
+++ b/skyeye-shop/shop-web/pom.xml
@@ -66,16 +66,14 @@
org.springframework.boot
spring-boot-maven-plugin
-
- true
-
-
-
- org.springframework
- springloaded
- 1.2.5.RELEASE
-
-
+ ${spring-boot.version}
+
+
+
+ repackage
+
+
+
diff --git a/skyeye-tms/tms-web/pom.xml b/skyeye-tms/tms-web/pom.xml
index 3cae195e..4e3a628d 100644
--- a/skyeye-tms/tms-web/pom.xml
+++ b/skyeye-tms/tms-web/pom.xml
@@ -53,16 +53,14 @@
org.springframework.boot
spring-boot-maven-plugin
-
- true
-
-
-
- org.springframework
- springloaded
- 1.2.5.RELEASE
-
-
+ ${spring-boot.version}
+
+
+
+ repackage
+
+
+
diff --git a/skyeye-wages/wages-web/pom.xml b/skyeye-wages/wages-web/pom.xml
index 0a4477b6..406a4ccb 100644
--- a/skyeye-wages/wages-web/pom.xml
+++ b/skyeye-wages/wages-web/pom.xml
@@ -58,16 +58,14 @@
org.springframework.boot
spring-boot-maven-plugin
-
- true
-
-
-
- org.springframework
- springloaded
- 1.2.5.RELEASE
-
-
+ ${spring-boot.version}
+
+
+
+ repackage
+
+
+
diff --git a/skyeye-wall/wall-web/pom.xml b/skyeye-wall/wall-web/pom.xml
index 3d10e55f..94d5bd52 100644
--- a/skyeye-wall/wall-web/pom.xml
+++ b/skyeye-wall/wall-web/pom.xml
@@ -58,16 +58,14 @@
org.springframework.boot
spring-boot-maven-plugin
-
- true
-
-
-
- org.springframework
- springloaded
- 1.2.5.RELEASE
-
-
+ ${spring-boot.version}
+
+
+
+ repackage
+
+
+
diff --git a/skyeye-zuul/pom.xml b/skyeye-zuul/pom.xml
index df9533c7..5bb2d627 100644
--- a/skyeye-zuul/pom.xml
+++ b/skyeye-zuul/pom.xml
@@ -44,16 +44,14 @@
org.springframework.boot
spring-boot-maven-plugin
-
- true
-
-
-
- org.springframework
- springloaded
- 1.2.5.RELEASE
-
-
+ ${spring-boot.version}
+
+
+
+ repackage
+
+
+
diff --git a/skyeye-zuul/src/main/java/com/SkyeyeZuulApplication.java b/skyeye-zuul/src/main/java/com/SkyeyeZuulApplication.java
index 60a0497c..b9209a37 100644
--- a/skyeye-zuul/src/main/java/com/SkyeyeZuulApplication.java
+++ b/skyeye-zuul/src/main/java/com/SkyeyeZuulApplication.java
@@ -13,7 +13,8 @@ import org.springframework.context.annotation.ComponentScan;
@SpringBootApplication(exclude = {
DataSourceAutoConfiguration.class,
- NutzDaoAutoConfiguration.class
+ NutzDaoAutoConfiguration.class,
+ org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration.class
})
@ComponentScan(basePackages = {"com.skyeye"})
@EnableDiscoveryClient // 开启服务发现
diff --git a/skyeye-zuul/src/main/java/com/skyeye/config/CorsResponseHeaderFilter.java b/skyeye-zuul/src/main/java/com/skyeye/config/CorsResponseHeaderFilter.java
new file mode 100644
index 00000000..2ac80861
--- /dev/null
+++ b/skyeye-zuul/src/main/java/com/skyeye/config/CorsResponseHeaderFilter.java
@@ -0,0 +1,54 @@
+/*******************************************************************************
+ * Copyright 卫志强 QQ:598748873@qq.com Inc. All rights reserved. 开源地址:https://gitee.com/doc_wei01/skyeye
+ ******************************************************************************/
+
+package com.skyeye.config;
+
+import org.springframework.cloud.gateway.filter.GatewayFilterChain;
+import org.springframework.cloud.gateway.filter.GlobalFilter;
+import org.springframework.cloud.gateway.filter.NettyWriteResponseFilter;
+import org.springframework.core.Ordered;
+import org.springframework.http.HttpHeaders;
+import org.springframework.stereotype.Component;
+import org.springframework.web.server.ServerWebExchange;
+import reactor.core.publisher.Mono;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * @ClassName: CorsResponseHeaderFilter
+ * @Description: 解决 Spring Cloud Gateway 2.x 跨域时,出现重复 Origin 的 BUG
+ * 参考文档:
+ * @author: skyeye云系列--卫志强
+ * @date: 2024/9/15 14:04
+ * @Copyright: 2024 https://gitee.com/doc_wei01/skyeye Inc. All rights reserved.
+ * 注意:本内容仅限购买后使用.禁止私自外泄以及用于其他的商业目的
+ */
+@Component
+public class CorsResponseHeaderFilter implements GlobalFilter, Ordered {
+
+ @Override
+ public int getOrder() {
+ // 指定此过滤器位于 NettyWriteResponseFilter 之后
+ // 即待处理完响应体后接着处理响应头
+ return NettyWriteResponseFilter.WRITE_RESPONSE_FILTER_ORDER + 1;
+ }
+
+ @Override
+ public Mono filter(ServerWebExchange exchange, GatewayFilterChain chain) {
+ return chain.filter(exchange).then(Mono.defer(() -> {
+ List>> collect = exchange.getResponse().getHeaders().entrySet().stream()
+ .filter(kv -> (kv.getValue() != null && kv.getValue().size() > 1))
+ .filter(kv -> (kv.getKey().equals(HttpHeaders.ACCESS_CONTROL_ALLOW_ORIGIN)
+ || kv.getKey().equals(HttpHeaders.ACCESS_CONTROL_ALLOW_CREDENTIALS))).collect(Collectors.toList());
+ collect.stream().forEach(kv -> kv.setValue(new ArrayList() {{
+ add(kv.getValue().get(0));
+ }}));
+ return chain.filter(exchange);
+ }));
+ }
+
+}
diff --git a/skyeye-zuul/src/main/java/com/skyeye/config/MyWebMvcConfigurerAdapter.java b/skyeye-zuul/src/main/java/com/skyeye/config/MyWebMvcConfigurerAdapter.java
deleted file mode 100644
index 51cd893c..00000000
--- a/skyeye-zuul/src/main/java/com/skyeye/config/MyWebMvcConfigurerAdapter.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright 卫志强 QQ:598748873@qq.com Inc. All rights reserved. 开源地址:https://gitee.com/doc_wei01/skyeye
- ******************************************************************************/
-
-package com.skyeye.config;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.CorsRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-
-/**
- * @ClassName: MyWebMvcConfigurerAdapter
- * @Description: 拦截器配置
- * @author: skyeye云系列--卫志强
- * @date: 2020年9月22日 下午9:13:16
- * @Copyright: 2020 https://gitee.com/doc_wei01/skyeye Inc. All rights reserved.
- * 注意:本内容仅限购买后使用.禁止私自外泄以及用于其他的商业目
- */
-@Configuration
-public class MyWebMvcConfigurerAdapter implements WebMvcConfigurer {
-
- @Override
- public void addCorsMappings(CorsRegistry registry) {
- registry.addMapping("/**")// 设置允许跨域的路径
- .allowedOriginPatterns("*")// 设置允许跨域请求的域名
- .allowCredentials(true)// 是否允许证书 不再默认开启
- .allowedMethods("GET", "POST", "PUT", "DELETE")// 设置允许的方法
- .allowedHeaders("*")// 设置允许头部
- .maxAge(3600);// 跨域允许时间
- }
-
-}
diff --git a/skyeye-zuul/src/main/java/com/skyeye/filter/SkyeyeZuulFilter.java b/skyeye-zuul/src/main/java/com/skyeye/filter/SkyeyeZuulFilter.java
index 70ccb8db..97403d08 100644
--- a/skyeye-zuul/src/main/java/com/skyeye/filter/SkyeyeZuulFilter.java
+++ b/skyeye-zuul/src/main/java/com/skyeye/filter/SkyeyeZuulFilter.java
@@ -4,14 +4,16 @@
package com.skyeye.filter;
-import org.springframework.cloud.gateway.filter.GatewayFilterChain;
-import org.springframework.cloud.gateway.filter.GlobalFilter;
-import org.springframework.core.Ordered;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
import org.springframework.http.HttpStatus;
import org.springframework.http.server.reactive.ServerHttpRequest;
import org.springframework.http.server.reactive.ServerHttpResponse;
import org.springframework.stereotype.Component;
+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;
import java.util.Arrays;
@@ -26,17 +28,37 @@ import java.util.List;
* 注意:本内容仅限购买后使用.禁止私自外泄以及用于其他的商业目的
*/
@Component
-public class SkyeyeZuulFilter implements GlobalFilter, Ordered {
+public class SkyeyeZuulFilter implements WebFilter {
+
+ private static final String ALL = "*";
+
+ private static final String MAX_AGE = "3600L";
private static final List METHOD_LIST = Arrays.asList("GET", "POST", "PUT", "DELETE");
@Override
- public Mono filter(ServerWebExchange exchange, GatewayFilterChain chain) {
+ public Mono filter(ServerWebExchange exchange, WebFilterChain chain) {
// 1.获取请求对象
ServerHttpRequest request = exchange.getRequest();
// 2.获取响应对象
ServerHttpResponse response = exchange.getResponse();
+ // 非跨域请求,直接放行
+ if (!CorsUtils.isCorsRequest(request)) {
+ return chain.filter(exchange);
+ }
+
+ // 设置跨域响应头
+ HttpHeaders headers = response.getHeaders();
+ headers.add("Access-Control-Allow-Origin", ALL);
+ headers.add("Access-Control-Allow-Methods", ALL);
+ headers.add("Access-Control-Allow-Headers", ALL);
+ headers.add("Access-Control-Max-Age", MAX_AGE);
+ if (request.getMethod() == HttpMethod.OPTIONS) {
+ response.setStatusCode(HttpStatus.OK);
+ return Mono.empty();
+ }
+
String method = request.getMethod().name().toUpperCase();
if (!METHOD_LIST.contains(method)) {
response.setStatusCode(HttpStatus.METHOD_NOT_ALLOWED);
@@ -50,9 +72,4 @@ public class SkyeyeZuulFilter implements GlobalFilter, Ordered {
// 放行
return chain.filter(exchange);
}
-
- @Override
- public int getOrder() {
- return 0;
- }
}
diff --git a/skyeye-zuul/src/main/resources/bootstrap.yml b/skyeye-zuul/src/main/resources/bootstrap.yml
index c1c33af5..bebdf070 100644
--- a/skyeye-zuul/src/main/resources/bootstrap.yml
+++ b/skyeye-zuul/src/main/resources/bootstrap.yml
@@ -1,4 +1,3 @@
-
server:
port: 7000
@@ -13,12 +12,12 @@ spring:
cloud:
nacos:
discovery:
- server-addr: localhost:9000 # 配置服务注册nacos地址
+ server-addr: 172.18.92.40:8848 # 配置服务注册nacos地址
namespace: ${spring.profiles.active} # 配置命名空间
service: ${spring.application.name} # 配置服务名
config:
# 指定nacos server的地址
- server-addr: localhost:9000
+ server-addr: 172.18.92.40:8848
# 配置文件后缀
file-extension: yml
# 命名空间 常用场景之一是不同环境的配置的区分隔离,例如开发测试环境和生产环境的资源(如配置、服务)隔离等
@@ -33,71 +32,105 @@ spring:
- id: fileBase #路由的ID,没有固定规则但要求唯一,建议配合服务名
uri: lb://skyeye-pro-${spring.profiles.active} #匹配后提供服务的路由地址
predicates:
- - Path=/fileBase/** # 断言,路径相匹配的进行路由
+ - Path=/${spring.profiles.active}/fileBase/** # 断言,路径相匹配的进行路由
+ filters:
+ - StripPrefix=2
- id: reqBase
uri: lb://skyeye-pro-${spring.profiles.active}
predicates:
- - Path=/reqBase/**
+ - Path=/${spring.profiles.active}/reqBase/**
+ filters:
+ - StripPrefix=2
- id: shop
uri: lb://skyeye-shop-${spring.profiles.active}
predicates:
- - Path=/shop/**
+ - Path=/${spring.profiles.active}/shop/**
+ filters:
+ - StripPrefix=2
- id: flowable
uri: lb://skyeye-flowable-${spring.profiles.active}
predicates:
- - Path=/flowable/**
+ - Path=/${spring.profiles.active}/flowable/**
+ filters:
+ - StripPrefix=2
- id: school
uri: lb://skyeye-school-${spring.profiles.active}
predicates:
- - Path=/school/**
+ - Path=/${spring.profiles.active}/school/**
+ filters:
+ - StripPrefix=2
- id: report
uri: lb://skyeye-report-${spring.profiles.active}
predicates:
- - Path=/report/**
+ - Path=/${spring.profiles.active}/report/**
+ filters:
+ - StripPrefix=2
- id: adm
uri: lb://skyeye-adm-${spring.profiles.active}
predicates:
- - Path=/adm/**,/survey/**,/note/**,/knowlg/**,/mail/**,/diskCloud/**,/email/**,/notice/**,/businessFlow/**,/forum/**,/jobdiary/**,/ehr/**,/lightApp/**
+ - Path=/${spring.profiles.active}/adm/**,/${spring.profiles.active}/survey/**,/${spring.profiles.active}/note/**,/${spring.profiles.active}/knowlg/**,/${spring.profiles.active}/mail/**,/${spring.profiles.active}/diskCloud/**,/${spring.profiles.active}/email/**,/${spring.profiles.active}/notice/**,/${spring.profiles.active}/businessFlow/**,/${spring.profiles.active}/forum/**,/${spring.profiles.active}/jobdiary/**,/${spring.profiles.active}/ehr/**,/${spring.profiles.active}/lightApp/**
+ filters:
+ - StripPrefix=2
- id: schedule
uri: lb://skyeye-schedule-${spring.profiles.active}
predicates:
- - Path=/schedule/**
+ - Path=/${spring.profiles.active}/schedule/**
+ filters:
+ - StripPrefix=2
- id: wages
uri: lb://skyeye-wages-${spring.profiles.active}
predicates:
- - Path=/wages/**
+ - Path=/${spring.profiles.active}/wages/**
+ filters:
+ - StripPrefix=2
- id: crm
uri: lb://skyeye-crm-${spring.profiles.active}
predicates:
- - Path=/crm/**
+ - Path=/${spring.profiles.active}/crm/**
+ filters:
+ - StripPrefix=2
- id: ifs
uri: lb://skyeye-ifs-${spring.profiles.active}
predicates:
- - Path=/ifs/**
+ - Path=/${spring.profiles.active}/ifs/**
+ filters:
+ - StripPrefix=2
- id: erp
uri: lb://skyeye-erp-${spring.profiles.active}
predicates:
- - Path=/erp/**
+ - Path=/${spring.profiles.active}/erp/**
+ filters:
+ - StripPrefix=2
- id: boss
uri: lb://skyeye-boss-${spring.profiles.active}
predicates:
- - Path=/boss/**
+ - Path=/${spring.profiles.active}/boss/**
+ filters:
+ - StripPrefix=2
- id: checkwork
uri: lb://skyeye-checkwork-${spring.profiles.active}
predicates:
- - Path=/checkwork/**
+ - Path=/${spring.profiles.active}/checkwork/**
+ filters:
+ - StripPrefix=2
- id: sealService
uri: lb://skyeye-seal-service-${spring.profiles.active}
predicates:
- - Path=/sealService/**
+ - Path=/${spring.profiles.active}/sealService/**
+ filters:
+ - StripPrefix=2
- id: wall
uri: lb://skyeye-wall-${spring.profiles.active}
predicates:
- - Path=/wall/**
+ - Path=/${spring.profiles.active}/wall/**
+ filters:
+ - StripPrefix=2
- id: tms
uri: lb://skyeye-tms-${spring.profiles.active}
predicates:
- - Path=/tms/**
+ - Path=/${spring.profiles.active}/tms/**
+ filters:
+ - StripPrefix=2
logging:
level:
com: debug
\ No newline at end of file