Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: support eureka and nacos registry #8

Closed
wants to merge 14 commits into from
Closed

feat: support eureka and nacos registry #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
f0ea601
feat: support gateway lightweight deployment: get registry type dynam…
CocaColaYYDS Aug 2, 2022
f78bfd1
feat: remove registry check for dubbo application
ethanhanjiahao Oct 8, 2022
9294e5f
feat: remove ServiceFilters content
trickMin Nov 22, 2022
bef03ae
fix: update dubbo meta schema.sql
ethanhanjiahao Sep 27, 2022
92cd0c7
fix: update RegistryCenterServiceImplTest and remove DaoMetaUnitTest
CocaColaYYDS Oct 9, 2022
97c2999
feat：dubbo protocal transfer enhance
shuxingzfw Jul 6, 2022
36e4195
feat: api gateway support nacos service discovery
markGbug Aug 26, 2022
91dae75
feat: update Springboot maven version to 2.5.14
trickMin Aug 30, 2022
220bc7a
feat: gateway entry traffic-mark plugin
CocaColaYYDS May 10, 2022
4fe0cee
feat: support to hidden plugins
CocaColaYYDS Jul 21, 2022
92ff44a
fix/to: add route delete check by traffic mark rules.
CocaColaYYDS Aug 18, 2022
9ab13da
feat: update traffic_mark package
ethanhanjiahao Sep 28, 2022
c14d90b
feat: update h2 driver for sprintboot2
ethanhanjiahao Sep 28, 2022
b676d5e
feat: add traffic_mark sql
ethanhanjiahao Oct 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 4 additions & 10 deletions gateway-api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<modelVersion>4.0.0</modelVersion>

<artifactId>gateway-api</artifactId>
<version>0.1.5-SNAPSHOT</version>
<version>0.1.6-SNAPSHOT</version>
<packaging>jar</packaging>
<dependencies>
<dependency>
Expand Down Expand Up @@ -69,7 +69,7 @@
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-core</artifactId>
<version>1.5.20</version>
<version>1.6.6</version>
</dependency>

<dependency>
Expand All @@ -94,14 +94,8 @@

<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-spring-boot-starter-jaxws</artifactId>
<version>3.1.12</version>
<exclusions>
<exclusion>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
</exclusion>
</exclusions>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
<version>3.5.3</version>
</dependency>
</dependencies>

Expand Down
113 changes: 62 additions & 51 deletions gateway-portal/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
<spring.boot.version>1.5.4.RELEASE</spring.boot.version>
<grpc.version>1.48.1</grpc.version>
<mockit.version>2.0.9</mockit.version>
<start-class>org.hango.cloud.dashboard.DashboardApplication</start-class>
</properties>

Expand All @@ -35,18 +36,9 @@
</repositories>

<dependencies>
<dependency>
<!-- Import dependency management from Spring Boot -->
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>${spring.boot.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<version>${spring.boot.version}</version>
</dependency>

<dependency>
Expand All @@ -61,7 +53,6 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
<version>${spring.boot.version}</version>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
Expand All @@ -73,15 +64,9 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<version>${spring.boot.version}</version>
<scope>test</scope>
</dependency>

<!--<dependency>-->
<!--<groupId>org.springframework.security</groupId>-->
<!--<artifactId>spring-security-web</artifactId>-->
<!--<version>${version.org.springframework.security}</version>-->
<!--</dependency>-->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
Expand Down Expand Up @@ -114,27 +99,23 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jul-to-slf4j</artifactId>
<version>1.7.30</version>
<scope>compile</scope>
</dependency>

<!--<dependency>-->
<!--<groupId>org.springframework.security</groupId>-->
<!--<artifactId>spring-security-config</artifactId>-->
<!--<version>${version.org.springframework.security}</version>-->
<!--</dependency>-->
<dependency>
<groupId>com.querydsl</groupId>
<artifactId>querydsl-core</artifactId>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
<version>${spring.boot.version}</version>
</dependency>

<!-- jdbc相关 -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-jdbc</artifactId>
<version>${spring.boot.version}</version>
</dependency>
<dependency>
<groupId>mysql</groupId>
Expand All @@ -144,7 +125,6 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-dbcp2</artifactId>
<version>2.1.1</version>
<exclusions>
<exclusion>
<artifactId>commons-logging</artifactId>
Expand All @@ -156,13 +136,11 @@
<dependency>
<groupId>redis.clients</groupId>
<artifactId>jedis</artifactId>
<version>2.10.2</version>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-redis</artifactId>
<version>${spring.boot.version}</version>
<exclusions>
<exclusion>
<groupId>redis.clients</groupId>
Expand All @@ -175,7 +153,6 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.6</version>
</dependency>
<dependency>
<groupId>io.swagger</groupId>
Expand All @@ -186,7 +163,6 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.8</version>
</dependency>
<dependency>
<groupId>commons-httpclient</groupId>
Expand All @@ -209,7 +185,6 @@
<dependency>
<groupId>com.nimbusds</groupId>
<artifactId>nimbus-jose-jwt</artifactId>
<version>4.3.1</version>
</dependency>

<dependency>
Expand All @@ -221,7 +196,6 @@
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>1.25</version>
</dependency>


Expand All @@ -246,10 +220,16 @@
<artifactId>jest</artifactId>
<version>5.3.3</version>
</dependency>

<dependency>
<artifactId>gson</artifactId>
<groupId>com.google.code.gson</groupId>
</dependency>

<dependency>
<groupId>org.elasticsearch</groupId>
<artifactId>elasticsearch</artifactId>
<version>6.8.4</version>
<groupId>io.netty</groupId>
<artifactId>netty-common</artifactId>
<version>4.1.77.Final</version>
</dependency>

<!-- Needed for Async Logging with Log4j -->
Expand All @@ -267,19 +247,17 @@
<dependency>
<groupId>org.hango.cloud</groupId>
<artifactId>gateway-api</artifactId>
<version>0.1.5-SNAPSHOT</version>
<version>0.1.6-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-consul-discovery</artifactId>
<version>1.3.4.RELEASE</version>
</dependency>

<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-eureka</artifactId>
<version>1.3.4.RELEASE</version>
<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
Expand Down Expand Up @@ -311,13 +289,13 @@
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<version>2.1.214</version>
<scope>runtime</scope>
</dependency>

<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
<version>3.6.0</version>
<version>3.6.3</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
Expand Down Expand Up @@ -383,7 +361,6 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-aop</artifactId>
<version>${spring.boot.version}</version>
<exclusions>
<exclusion>
<artifactId>spring-expression</artifactId>
Expand All @@ -394,7 +371,7 @@
<dependency>
<groupId>org.redisson</groupId>
<artifactId>redisson-spring-boot-starter</artifactId>
<version>2.15.2</version>
<version>3.16.4</version>
</dependency>

<!--单元测试 -->
Expand All @@ -408,25 +385,24 @@
<dependency>
<groupId>net.minidev</groupId>
<artifactId>json-smart</artifactId>
<version>2.2.1</version>
<scope>test</scope>
</dependency>

<!--gRPC与protobuf依赖-->
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-netty-shaded</artifactId>
<version>1.20.0</version>
<version>${grpc.version}</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
<version>1.20.0</version>
<version>${grpc.version}</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-stub</artifactId>
<version>1.20.0</version>
<version>${grpc.version}</version>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
Expand Down Expand Up @@ -455,21 +431,20 @@
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
<version>2.0.1.Final</version>
</dependency>

<!-- https://mvnrepository.com/artifact/org.powermock/powermock-module-junit4 -->
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-module-junit4</artifactId>
<version>1.6.5</version>
<version>${mockit.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-mockito</artifactId>
<version>1.6.5</version>
<artifactId>powermock-api-mockito2</artifactId>
<version>${mockit.version}</version>
</dependency>

<!--webservice依赖-->
Expand All @@ -482,8 +457,19 @@
<groupId>com.hubspot.jinjava</groupId>
<artifactId>jinjava</artifactId>
<version>2.5.6</version>
<exclusions>
<exclusion>
<artifactId>jsoup</artifactId>
<groupId>org.jsoup</groupId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<artifactId>jsoup</artifactId>
<groupId>org.jsoup</groupId>
<version>1.14.2</version>
</dependency>
</dependencies>


Expand All @@ -503,6 +489,31 @@
<failOnMissingWebXml>false</failOnMissingWebXml>
</configuration>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.19.1</version>
<configuration>
<argLine>${argLine}</argLine>
<includes>
<include>**/*Test.java</include>
</includes>
<excludes>
<exclude>**/BaseTest.java</exclude>
</excludes>
</configuration>
<executions>
<execution>
<id>default-test</id>
<phase>test</phase>
<goals>
<goal>test</goal>
</goals>
<configuration>
<argLine>${surefireArgLine}</argLine>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

Expand Down
19 changes: 9 additions & 10 deletions gateway-portal/src/main/java/org/hango/cloud/dashboard/DashboardApplication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,11 @@
import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.data.elasticsearch.ElasticsearchAutoConfiguration;
import org.springframework.boot.autoconfigure.data.elasticsearch.ElasticsearchDataAutoConfiguration;
import org.springframework.boot.autoconfigure.data.elasticsearch.ElasticsearchRepositoriesAutoConfiguration;
import org.springframework.boot.autoconfigure.data.mongo.MongoDataAutoConfiguration;
import org.springframework.boot.autoconfigure.data.mongo.MongoRepositoriesAutoConfiguration;
import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration;
import org.springframework.boot.autoconfigure.elasticsearch.jest.JestAutoConfiguration;
import org.springframework.boot.autoconfigure.gson.GsonAutoConfiguration;
import org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration;
import org.springframework.boot.autoconfigure.web.HttpMessageConverters;
import org.springframework.boot.web.support.SpringBootServletInitializer;
import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationAutoConfiguration;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ImportResource;
import org.springframework.context.annotation.PropertySource;
Expand All @@ -31,7 +25,12 @@
* @Author: Wang Dacheng(wangdacheng)
* @Date: 创建时间: 2017/12/4 上午10:33.
*/
@SpringBootApplication(exclude = {GsonAutoConfiguration.class, JestAutoConfiguration.class, RedisAutoConfiguration.class})
@SpringBootApplication(
exclude = {
GsonAutoConfiguration.class,
RedisAutoConfiguration.class,
AutoServiceRegistrationAutoConfiguration.class
})
@ImportResource({"classpath:applicationContext.xml"})
@EnableScheduling
@PropertySource({"classpath:gdashboard-application.properties", "classpath:gdashboard-jdbc.properties"})
Expand Down
Loading