Commit 71a11f58 by ypenglv

调整配置

1 parent 5c6048bd
......@@ -5,12 +5,12 @@
<parent>
<groupId>org.nafmii</groupId>
<artifactId>nafmii-parent</artifactId>
<version>0.0.1-SNAPSHOT</version>
<relativePath/> <!-- lookup parent from repository -->
<version>1.0.0</version>
<relativePath>../</relativePath>
</parent>
<groupId>org.nafmii</groupId>
<artifactId>nafmii-app-burypoint</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>1.0.0</version>
<name>nafmii-app-burypoint</name>
<description>Demo project for Spring Boot</description>
......@@ -52,7 +52,7 @@
<dependency>
<groupId>org.nafmii</groupId>
<artifactId>nafmii-common</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>1.0.0</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-actuator -->
<dependency>
......
......@@ -6,11 +6,20 @@ import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
import javax.annotation.PostConstruct;
import java.util.Date;
import java.util.TimeZone;
@SpringBootApplication(scanBasePackages={"org.nafmii.burypoint"})
@EnableEurekaClient
@MapperScan("org.nafmii.burypoint/**/dao")
@EnableFtpServer
public class NafmiiBuryPointApplication {
@PostConstruct
void setDefaultTimezone() {
TimeZone.setDefault(TimeZone.getTimeZone("GMT+8"));
System.out.println("当前时间:" + new Date());
}
public static void main(String[] args) {
SpringApplication.run(NafmiiBuryPointApplication.class, args);
......
......@@ -5,11 +5,12 @@
<parent>
<groupId>org.nafmii</groupId>
<artifactId>nafmii-parent</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>1.0.0</version>
<relativePath>../</relativePath>
</parent>
<groupId>org.nafmii</groupId>
<artifactId>nafmii-app-business</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>1.0.0</version>
<name>nafmii-app-business</name>
<description>Demo project for Spring Boot</description>
......@@ -51,7 +52,7 @@
<dependency>
<groupId>org.nafmii</groupId>
<artifactId>nafmii-common</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>1.0.0</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-actuator -->
<dependency>
......
server:
port: 27000
port: 24000
tomcat:
uri-encoding: UTF-8
spring:
......
......@@ -5,12 +5,12 @@
<parent>
<groupId>org.nafmii</groupId>
<artifactId>nafmii-parent</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>1.0.0</version>
</parent>
<groupId>org.nafmii</groupId>
<artifactId>nafmii-app-user</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>1.0.0</version>
<name>nafmii-app-user</name>
<modelVersion>4.0.0</modelVersion>
<description>app用户中心</description>
......@@ -49,7 +49,7 @@
<dependency>
<groupId>org.nafmii</groupId>
<artifactId>nafmii-common</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>mysql</groupId>
......
......@@ -6,12 +6,20 @@ import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
import javax.annotation.PostConstruct;
import java.util.Date;
import java.util.TimeZone;
@SpringBootApplication(scanBasePackages={"org.nafmii.app"})
@EnableEurekaClient
@MapperScan("org.nafmii.app/**/dao")
@EnableFtpServer
public class NafmiiAppUserApplication {
@PostConstruct
void setDefaultTimezone() {
TimeZone.setDefault(TimeZone.getTimeZone("GMT+8"));
System.out.println("当前时间:" + new Date());
}
public static void main(String[] args) {
SpringApplication.run(NafmiiAppUserApplication.class, args);
}
......
......@@ -3,13 +3,14 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.nafmii</groupId>
<artifactId>nafmii-parent</artifactId>
<version>0.0.1-SNAPSHOT</version><!-- lookup parent from repository -->
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.1.13.RELEASE</version>
<relativePath/>
</parent>
<groupId>org.nafmii</groupId>
<artifactId>nafmii-common</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>1.0.0</version>
<name>nafmii-common</name>
<description>Demo project for Spring Boot</description>
<properties>
......@@ -234,18 +235,19 @@
<optional>true</optional>
</dependency>
</dependencies>
<!-- 项目部署到私服配置 -->
<distributionManagement> <!-- 远程部署管理信息 -->
<repository> <!--部署项目产生的构件到远程仓库需要的信息 -->
<id>nafmii-nexus-releases</id>
<name>Nexus Release Repository</name>
<url>http://10.10.81.188:8081/repository/maven-releases/</url>
</repository>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.18.1</version>
<configuration>
<skipTests>true</skipTests>
</configuration>
</plugin>
</plugins>
</build>
<snapshotRepository> <!-- 如果没有配置该元素,默认部署到repository元素配置的仓库 -->
<id>nafmii-nexus-snapshots</id>
<name>Nexus Snapshot Repository</name>
<url>http://10.10.81.188:8081/repository/maven-snapshots/</url>
</snapshotRepository>
</distributionManagement>
</project>
......@@ -172,7 +172,7 @@
-->
<!--开发环境:打印控制台-->
<springProfile name="dev">
<root level="DEBUG">
<root level="INFO">
<appender-ref ref="CONSOLE" />
</root>
</springProfile>
......
......@@ -5,11 +5,12 @@
<parent>
<groupId>org.nafmii</groupId>
<artifactId>nafmii-parent</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>1.0.0</version>
<relativePath>../</relativePath>
</parent>
<groupId>org.nafmii</groupId>
<artifactId>nafmii-eureka</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>1.0.0</version>
<name>nafmii-eureka</name>
<description>Demo project for Spring Boot</description>
<properties>
......
......@@ -6,10 +6,18 @@ import org.springframework.cloud.netflix.eureka.server.EnableEurekaServer;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
import javax.annotation.PostConstruct;
import java.util.Date;
import java.util.TimeZone;
@SpringBootApplication
@EnableEurekaServer
public class NafmiiEurekaApplication extends WebSecurityConfigurerAdapter {
@PostConstruct
void setDefaultTimezone() {
TimeZone.setDefault(TimeZone.getTimeZone("GMT+8"));
System.out.println("当前时间:" + new Date());
}
public static void main(String[] args) {
SpringApplication.run(NafmiiEurekaApplication.class, args);
}
......
......@@ -3,13 +3,14 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.nafmii</groupId>
<artifactId>nafmii-parent</artifactId>
<version>0.0.1-SNAPSHOT</version><!-- lookup parent from repository -->
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.1.13.RELEASE</version>
<relativePath/>
</parent>
<groupId>org.nafmii</groupId>
<artifactId>nafmii-feign</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>1.0.0</version>
<name>nafmii-feign</name>
<description>Demo project for Spring Boot</description>
<properties>
......@@ -23,20 +24,22 @@
<dependency>
<groupId>org.nafmii</groupId>
<artifactId>nafmii-common</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>1.0.0</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.18.1</version>
<configuration>
<skipTests>true</skipTests>
</configuration>
</plugin>
</plugins>
</build>
<!-- 项目部署到私服配置 -->
<distributionManagement> <!-- 远程部署管理信息 -->
<repository> <!--部署项目产生的构件到远程仓库需要的信息 -->
<id>nafmii-nexus-releases</id>
<name>Nexus Release Repository</name>
<url>http://10.10.81.188:8081/repository/maven-releases/</url>
</repository>
<snapshotRepository> <!-- 如果没有配置该元素,默认部署到repository元素配置的仓库 -->
<id>nafmii-nexus-snapshots</id>
<name>Nexus Snapshot Repository</name>
<url>http://10.10.81.188:8081/repository/maven-snapshots/</url>
</snapshotRepository>
</distributionManagement>
</project>
......@@ -4,12 +4,13 @@
<parent>
<groupId>org.nafmii</groupId>
<artifactId>nafmii-parent</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>1.0.0</version>
<relativePath>../</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.nafmii</groupId>
<artifactId>nafmii-gateway</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>1.0.0</version>
<name>nafmii-gateway</name>
<description>nafmii-gateway project for Spring Boot</description>
<properties>
......@@ -62,7 +63,7 @@
<dependency>
<groupId>org.nafmii</groupId>
<artifactId>nafmii-common</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>1.0.0</version>
</dependency>
</dependencies>
<dependencyManagement>
......
......@@ -6,10 +6,19 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
import javax.annotation.PostConstruct;
import java.util.Date;
import java.util.TimeZone;
@SpringBootApplication(exclude= {DataSourceAutoConfiguration.class},scanBasePackages={"org.nafmii.gateway","org.nafmii.common.exception"})
@EnableEurekaClient
@EnableDiscoveryClient
public class NafmiiGatewayApplication {
@PostConstruct
void setDefaultTimezone() {
TimeZone.setDefault(TimeZone.getTimeZone("GMT+8"));
System.out.println("当前时间:" + new Date());
}
public static void main(String[] args) {
SpringApplication.run(NafmiiGatewayApplication.class, args);
}
......
......@@ -38,13 +38,21 @@ public class AccessFilter implements GlobalFilter, Ordered {
//相关不需要的接口地址
String skip0 ="/nafmii-app/app/nafmii/user/userLogin";
String skip1 ="/nafmii-admin/nafmii/admin/user/login";
String skip2 ="/nafmii-app/v2/api-docs";
String skip3 ="/nafmii-admin/v2/api-docs";
String skip2 ="/nafmii-app-user/v2/api-docs";
String skip3 ="/nafmii-web-center/v2/api-docs";
String skip4 ="/nafmii-app-business/v2/api-docs";
String skip5 ="/nafmii-app-burypoint/v2/api-docs";
String skip6 ="/nafmii-outside-server/v2/api-docs";
String skip7 ="/nafmii-quartz/v2/api-docs";
//跳过不需要验证的url
if (antPathMatcher.match(skip0, url)
||antPathMatcher.match(skip1,url)
||antPathMatcher.match(skip2,url)
||antPathMatcher.match(skip3,url) ){
||antPathMatcher.match(skip3,url)
||antPathMatcher.match(skip4,url)
||antPathMatcher.match(skip5,url)
||antPathMatcher.match(skip6,url)
||antPathMatcher.match(skip7,url) ){
return chain.filter(exchange);
}
......
......@@ -29,10 +29,14 @@ public class MySwaggerResourceProvider implements SwaggerResourcesProvider {
* 网关路由
*/
private final RouteLocator routeLocator;
private final String serverName1= "NAFMII-APP";
private final String serverName1= "NAFMII-APP-USER";
private final String serverName2= "NAFMII-GATEWAY";
private final String serverName3= "NAFMII-ADMIN";
private final String serverName3= "NAFMII-WEB-CENTER";
private final String serverName4= "NAFMII-QUARTZ";
private final String serverName5= "NAFMII-APP-BUSINESS";
private final String serverName6= "NAFMII-APP-BURYPOINT";
private final String serverName7= "NAFMII-OUTSIDE-SERVER";
private final String serverName8= "NAFMII-QUARTZ";
/**
* 网关应用名称
......@@ -55,6 +59,10 @@ public class MySwaggerResourceProvider implements SwaggerResourcesProvider {
.filter(route -> !serverName2.equals(route.getUri().getHost()))
.filter(route -> !serverName3.equals(route.getUri().getHost()))
.filter(route -> !serverName4.equals(route.getUri().getHost()))
.filter(route -> !serverName5.equals(route.getUri().getHost()))
.filter(route -> !serverName6.equals(route.getUri().getHost()))
.filter(route -> !serverName7.equals(route.getUri().getHost()))
.filter(route -> !serverName8.equals(route.getUri().getHost()))
.subscribe(route -> routeHosts.add(route.getUri().getHost()));
// 记录已经添加过的server,存在同一个应用注册了多个服务在nacos上
......
server:
port: 24000
port: 30000
tomcat:
uri-encoding: UTF-8
spring:
......
......@@ -5,12 +5,12 @@
<parent>
<groupId>org.nafmii</groupId>
<artifactId>nafmii-parent</artifactId>
<version>0.0.1-SNAPSHOT</version>
<relativePath/> <!-- lookup parent from repository -->
<version>1.0.0</version>
<relativePath>../</relativePath><!-- lookup parent from repository -->
</parent>
<groupId>org.nafmii.outside</groupId>
<artifactId>nafmii-outside-server</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>1.0.0</version>
<name>nafmii-outside-server</name>
<description>外部接口服务</description>
<properties>
......@@ -56,12 +56,12 @@
<dependency>
<groupId>org.nafmii</groupId>
<artifactId>nafmii-common</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>org.nafmii</groupId>
<artifactId>nafmii-feign</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
......
......@@ -6,12 +6,20 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
import org.springframework.cloud.openfeign.EnableFeignClients;
import javax.annotation.PostConstruct;
import java.util.Date;
import java.util.TimeZone;
@SpringBootApplication
@EnableEurekaClient
@EnableFeignClients(basePackages = {"org.nafmii.feign"})
@EnableFtpServer
public class NafmiiOutsideServerApplication {
@PostConstruct
void setDefaultTimezone() {
TimeZone.setDefault(TimeZone.getTimeZone("GMT+8"));
System.out.println("当前时间:" + new Date());
}
public static void main(String[] args) {
SpringApplication.run(NafmiiOutsideServerApplication.class, args);
}
......
......@@ -5,11 +5,12 @@
<parent>
<groupId>org.nafmii</groupId>
<artifactId>nafmii-parent</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>1.0.0</version>
<relativePath>../</relativePath>
</parent>
<groupId>org.nafmii</groupId>
<artifactId>nafmii-quartz</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>1.0.0</version>
<name>nafmii-quartz</name>
<description>Demo project for Spring Boot</description>
<properties>
......@@ -66,7 +67,7 @@
<dependency>
<groupId>org.nafmii</groupId>
<artifactId>nafmii-common</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>mysql</groupId>
......
......@@ -4,10 +4,18 @@ import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
import javax.annotation.PostConstruct;
import java.util.Date;
import java.util.TimeZone;
@SpringBootApplication
@EnableEurekaClient
public class NafmiiQuartzApplication {
@PostConstruct
void setDefaultTimezone() {
TimeZone.setDefault(TimeZone.getTimeZone("GMT+8"));
System.out.println("当前时间:" + new Date());
}
public static void main(String[] args) {
SpringApplication.run(NafmiiQuartzApplication.class, args);
}
......
......@@ -5,12 +5,13 @@
<parent>
<groupId>org.nafmii</groupId>
<artifactId>nafmii-parent</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>1.0.0</version>
<relativePath>../</relativePath>
</parent>
<groupId>org.nafmii</groupId>
<artifactId>nafmii-web-center</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>1.0.0</version>
<name>nafmii-web-center</name>
<modelVersion>4.0.0</modelVersion>
<description>中心端(后台管理系统)</description>
......@@ -63,7 +64,7 @@
<dependency>
<groupId>org.nafmii</groupId>
<artifactId>nafmii-common</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>1.0.0</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.springframework.cloud/spring-cloud-starter-sleuth -->
<dependency>
......
......@@ -6,12 +6,20 @@ import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
import javax.annotation.PostConstruct;
import java.util.Date;
import java.util.TimeZone;
@SpringBootApplication
@EnableEurekaClient
@MapperScan(basePackages ={"org.nafmii.admin/**/dao"})
@EnableFtpServer
public class NafmiiWebCenterApplication {
@PostConstruct
void setDefaultTimezone() {
TimeZone.setDefault(TimeZone.getTimeZone("GMT+8"));
System.out.println("当前时间:" + new Date());
}
public static void main(String[] args) {
SpringApplication.run(NafmiiWebCenterApplication.class, args);
}
......
......@@ -10,7 +10,7 @@
<groupId>org.nafmii</groupId>
<artifactId>nafmii-parent</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>1.0.0</version>
<packaging>pom</packaging>
<name>nafmii-parent</name>
<modelVersion>4.0.0</modelVersion>
......@@ -21,7 +21,6 @@
<module>nafmii-web-center</module>
<module>nafmii-eureka</module>
<module>nafmii-gateway</module>
<module>nafmii-common</module>
<module>nafmii-quartz</module>
<module>nafmii-app-user</module>
<module>nafmii-feign</module>
......@@ -29,5 +28,19 @@
<module>nafmii-app-burypoint</module>
<module>nafmii-app-business</module>
</modules>
<!-- 项目部署到私服配置 -->
<distributionManagement> <!-- 远程部署管理信息 -->
<repository> <!--部署项目产生的构件到远程仓库需要的信息 -->
<id>nafmii-nexus-releases</id>
<name>Nexus Release Repository</name>
<url>http://10.10.81.188:8081/repository/maven-releases</url>
</repository>
<snapshotRepository> <!-- 如果没有配置该元素,默认部署到repository元素配置的仓库 -->
<id>nafmii-nexus-snapshots</id>
<name>Nexus Snapshot Repository</name>
<url>http://10.10.81.188:8081/repository/maven-snapshots/</url>
</snapshotRepository>
</distributionManagement>
</project>
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!