mirror of
https://github.com/weizhiqiang1995/erp-pro.git
synced 2025-03-03 19:03:11 +08:00
Merge branch 'company_server' of https://gitee.com/doc_wei01/skyeye into company_server
This commit is contained in:
commit
1afb576ea6
30 changed files with 312 additions and 290 deletions
|
@ -58,17 +58,18 @@
|
|||
<plugin>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-maven-plugin</artifactId>
|
||||
<version>${spring-boot.version}</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<goals>
|
||||
<goal>repackage</goal> <!-- 将引入的 jar 打入其中 -->
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
<configuration>
|
||||
<fork>true</fork>
|
||||
<includeSystemScope>true</includeSystemScope>
|
||||
</configuration>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.springframework</groupId>
|
||||
<artifactId>springloaded</artifactId>
|
||||
<version>1.2.5.RELEASE</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</plugin>
|
||||
|
||||
<!--打包跳过测试 -->
|
||||
|
|
|
@ -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
|
||||
# 命名空间 常用场景之一是不同环境的配置的区分隔离,例如开发测试环境和生产环境的资源(如配置、服务)隔离等
|
||||
|
|
|
@ -58,16 +58,14 @@
|
|||
<plugin>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-maven-plugin</artifactId>
|
||||
<configuration>
|
||||
<fork>true</fork>
|
||||
</configuration>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.springframework</groupId>
|
||||
<artifactId>springloaded</artifactId>
|
||||
<version>1.2.5.RELEASE</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<version>${spring-boot.version}</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<goals>
|
||||
<goal>repackage</goal> <!-- 将引入的 jar 打入其中 -->
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
|
||||
<!--打包跳过测试 -->
|
||||
|
|
|
@ -58,16 +58,14 @@
|
|||
<plugin>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-maven-plugin</artifactId>
|
||||
<configuration>
|
||||
<fork>true</fork>
|
||||
</configuration>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.springframework</groupId>
|
||||
<artifactId>springloaded</artifactId>
|
||||
<version>1.2.5.RELEASE</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<version>${spring-boot.version}</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<goals>
|
||||
<goal>repackage</goal> <!-- 将引入的 jar 打入其中 -->
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
|
||||
<!--打包跳过测试 -->
|
||||
|
|
|
@ -53,16 +53,14 @@
|
|||
<plugin>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-maven-plugin</artifactId>
|
||||
<configuration>
|
||||
<fork>true</fork>
|
||||
</configuration>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.springframework</groupId>
|
||||
<artifactId>springloaded</artifactId>
|
||||
<version>1.2.5.RELEASE</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<version>${spring-boot.version}</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<goals>
|
||||
<goal>repackage</goal> <!-- 将引入的 jar 打入其中 -->
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
|
||||
<!--打包跳过测试 -->
|
||||
|
|
|
@ -53,16 +53,14 @@
|
|||
<plugin>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-maven-plugin</artifactId>
|
||||
<configuration>
|
||||
<fork>true</fork>
|
||||
</configuration>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.springframework</groupId>
|
||||
<artifactId>springloaded</artifactId>
|
||||
<version>1.2.5.RELEASE</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<version>${spring-boot.version}</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<goals>
|
||||
<goal>repackage</goal> <!-- 将引入的 jar 打入其中 -->
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
|
||||
<!--打包跳过测试 -->
|
||||
|
|
|
@ -58,16 +58,14 @@
|
|||
<plugin>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-maven-plugin</artifactId>
|
||||
<configuration>
|
||||
<fork>true</fork>
|
||||
</configuration>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.springframework</groupId>
|
||||
<artifactId>springloaded</artifactId>
|
||||
<version>1.2.5.RELEASE</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<version>${spring-boot.version}</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<goals>
|
||||
<goal>repackage</goal> <!-- 将引入的 jar 打入其中 -->
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
|
||||
<!--打包跳过测试 -->
|
||||
|
|
|
@ -72,16 +72,14 @@
|
|||
<plugin>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-maven-plugin</artifactId>
|
||||
<configuration>
|
||||
<fork>true</fork>
|
||||
</configuration>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.springframework</groupId>
|
||||
<artifactId>springloaded</artifactId>
|
||||
<version>1.2.5.RELEASE</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<version>${spring-boot.version}</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<goals>
|
||||
<goal>repackage</goal> <!-- 将引入的 jar 打入其中 -->
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
|
||||
<!--打包跳过测试 -->
|
||||
|
|
|
@ -53,16 +53,14 @@
|
|||
<plugin>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-maven-plugin</artifactId>
|
||||
<configuration>
|
||||
<fork>true</fork>
|
||||
</configuration>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.springframework</groupId>
|
||||
<artifactId>springloaded</artifactId>
|
||||
<version>1.2.5.RELEASE</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<version>${spring-boot.version}</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<goals>
|
||||
<goal>repackage</goal> <!-- 将引入的 jar 打入其中 -->
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
|
||||
<!--打包跳过测试 -->
|
||||
|
|
|
@ -58,16 +58,14 @@
|
|||
<plugin>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-maven-plugin</artifactId>
|
||||
<configuration>
|
||||
<fork>true</fork>
|
||||
</configuration>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.springframework</groupId>
|
||||
<artifactId>springloaded</artifactId>
|
||||
<version>1.2.5.RELEASE</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<version>${spring-boot.version}</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<goals>
|
||||
<goal>repackage</goal> <!-- 将引入的 jar 打入其中 -->
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
|
||||
<!--打包跳过测试 -->
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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
|
||||
# 命名空间 常用场景之一是不同环境的配置的区分隔离,例如开发测试环境和生产环境的资源(如配置、服务)隔离等
|
||||
|
|
|
@ -53,16 +53,14 @@
|
|||
<plugin>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-maven-plugin</artifactId>
|
||||
<configuration>
|
||||
<fork>true</fork>
|
||||
</configuration>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.springframework</groupId>
|
||||
<artifactId>springloaded</artifactId>
|
||||
<version>1.2.5.RELEASE</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<version>${spring-boot.version}</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<goals>
|
||||
<goal>repackage</goal> <!-- 将引入的 jar 打入其中 -->
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
|
||||
<!--打包跳过测试 -->
|
||||
|
|
|
@ -138,16 +138,14 @@
|
|||
<plugin>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-maven-plugin</artifactId>
|
||||
<configuration>
|
||||
<fork>true</fork>
|
||||
</configuration>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.springframework</groupId>
|
||||
<artifactId>springloaded</artifactId>
|
||||
<version>1.2.5.RELEASE</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<version>${spring-boot.version}</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<goals>
|
||||
<goal>repackage</goal> <!-- 将引入的 jar 打入其中 -->
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
|
||||
<!--打包跳过测试 -->
|
||||
|
|
|
@ -53,16 +53,14 @@
|
|||
<plugin>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-maven-plugin</artifactId>
|
||||
<configuration>
|
||||
<fork>true</fork>
|
||||
</configuration>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.springframework</groupId>
|
||||
<artifactId>springloaded</artifactId>
|
||||
<version>1.2.5.RELEASE</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<version>${spring-boot.version}</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<goals>
|
||||
<goal>repackage</goal> <!-- 将引入的 jar 打入其中 -->
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
|
||||
<!--打包跳过测试 -->
|
||||
|
|
|
@ -90,16 +90,14 @@
|
|||
<plugin>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-maven-plugin</artifactId>
|
||||
<configuration>
|
||||
<fork>true</fork>
|
||||
</configuration>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.springframework</groupId>
|
||||
<artifactId>springloaded</artifactId>
|
||||
<version>1.2.5.RELEASE</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<version>${spring-boot.version}</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<goals>
|
||||
<goal>repackage</goal> <!-- 将引入的 jar 打入其中 -->
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
|
||||
<!--打包跳过测试 -->
|
||||
|
|
|
@ -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
|
||||
# 命名空间 常用场景之一是不同环境的配置的区分隔离,例如开发测试环境和生产环境的资源(如配置、服务)隔离等
|
||||
|
|
|
@ -58,16 +58,14 @@
|
|||
<plugin>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-maven-plugin</artifactId>
|
||||
<configuration>
|
||||
<fork>true</fork>
|
||||
</configuration>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.springframework</groupId>
|
||||
<artifactId>springloaded</artifactId>
|
||||
<version>1.2.5.RELEASE</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<version>${spring-boot.version}</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<goals>
|
||||
<goal>repackage</goal> <!-- 将引入的 jar 打入其中 -->
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
|
||||
<!--打包跳过测试 -->
|
||||
|
|
|
@ -72,26 +72,14 @@
|
|||
<plugin>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-maven-plugin</artifactId>
|
||||
<configuration>
|
||||
<fork>true</fork>
|
||||
<webResources>
|
||||
<resource>
|
||||
<directory>${basedir}/lib</directory>
|
||||
<targetPath>WEB-INF/lib</targetPath>
|
||||
<filtering>false</filtering>
|
||||
<includes>
|
||||
<include>**/*.jar</include>
|
||||
</includes>
|
||||
</resource>
|
||||
</webResources>
|
||||
</configuration>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.springframework</groupId>
|
||||
<artifactId>springloaded</artifactId>
|
||||
<version>1.2.5.RELEASE</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<version>${spring-boot.version}</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<goals>
|
||||
<goal>repackage</goal> <!-- 将引入的 jar 打入其中 -->
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
|
||||
<!--打包跳过测试 -->
|
||||
|
|
|
@ -58,16 +58,14 @@
|
|||
<plugin>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-maven-plugin</artifactId>
|
||||
<configuration>
|
||||
<fork>true</fork>
|
||||
</configuration>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.springframework</groupId>
|
||||
<artifactId>springloaded</artifactId>
|
||||
<version>1.2.5.RELEASE</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<version>${spring-boot.version}</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<goals>
|
||||
<goal>repackage</goal> <!-- 将引入的 jar 打入其中 -->
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
|
||||
<!--打包跳过测试 -->
|
||||
|
|
|
@ -66,16 +66,14 @@
|
|||
<plugin>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-maven-plugin</artifactId>
|
||||
<configuration>
|
||||
<fork>true</fork>
|
||||
</configuration>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.springframework</groupId>
|
||||
<artifactId>springloaded</artifactId>
|
||||
<version>1.2.5.RELEASE</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<version>${spring-boot.version}</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<goals>
|
||||
<goal>repackage</goal> <!-- 将引入的 jar 打入其中 -->
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
|
||||
<!--打包跳过测试 -->
|
||||
|
|
|
@ -53,16 +53,14 @@
|
|||
<plugin>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-maven-plugin</artifactId>
|
||||
<configuration>
|
||||
<fork>true</fork>
|
||||
</configuration>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.springframework</groupId>
|
||||
<artifactId>springloaded</artifactId>
|
||||
<version>1.2.5.RELEASE</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<version>${spring-boot.version}</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<goals>
|
||||
<goal>repackage</goal> <!-- 将引入的 jar 打入其中 -->
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
|
||||
<!--打包跳过测试 -->
|
||||
|
|
|
@ -58,16 +58,14 @@
|
|||
<plugin>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-maven-plugin</artifactId>
|
||||
<configuration>
|
||||
<fork>true</fork>
|
||||
</configuration>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.springframework</groupId>
|
||||
<artifactId>springloaded</artifactId>
|
||||
<version>1.2.5.RELEASE</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<version>${spring-boot.version}</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<goals>
|
||||
<goal>repackage</goal> <!-- 将引入的 jar 打入其中 -->
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
|
||||
<!--打包跳过测试 -->
|
||||
|
|
|
@ -58,16 +58,14 @@
|
|||
<plugin>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-maven-plugin</artifactId>
|
||||
<configuration>
|
||||
<fork>true</fork>
|
||||
</configuration>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.springframework</groupId>
|
||||
<artifactId>springloaded</artifactId>
|
||||
<version>1.2.5.RELEASE</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<version>${spring-boot.version}</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<goals>
|
||||
<goal>repackage</goal> <!-- 将引入的 jar 打入其中 -->
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
|
||||
<!--打包跳过测试 -->
|
||||
|
|
|
@ -44,16 +44,14 @@
|
|||
<plugin>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-maven-plugin</artifactId>
|
||||
<configuration>
|
||||
<fork>true</fork>
|
||||
</configuration>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.springframework</groupId>
|
||||
<artifactId>springloaded</artifactId>
|
||||
<version>1.2.5.RELEASE</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<version>${spring-boot.version}</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<goals>
|
||||
<goal>repackage</goal> <!-- 将引入的 jar 打入其中 -->
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
|
||||
<!--打包跳过测试 -->
|
||||
|
|
|
@ -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 // 开启服务发现
|
||||
|
|
|
@ -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
|
||||
* 参考文档:<a href="https://blog.csdn.net/zimou5581/article/details/90043178" />
|
||||
* @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<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain) {
|
||||
return chain.filter(exchange).then(Mono.defer(() -> {
|
||||
List<Map.Entry<String, List<String>>> 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<String>() {{
|
||||
add(kv.getValue().get(0));
|
||||
}}));
|
||||
return chain.filter(exchange);
|
||||
}));
|
||||
}
|
||||
|
||||
}
|
|
@ -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);// 跨域允许时间
|
||||
}
|
||||
|
||||
}
|
|
@ -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<String> METHOD_LIST = Arrays.asList("GET", "POST", "PUT", "DELETE");
|
||||
|
||||
@Override
|
||||
public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain) {
|
||||
public Mono<Void> 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;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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
|
Loading…
Reference in a new issue