elink-star
/
epmet-cloud-chengyang
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修复gateway

national_dev
duanliangtao 1 year ago
parent
b01d959ef9
commit
f8a8e0927f
3 changed files with 76 additions and 36 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 11
      code/smart-community/epmet-commons/epmet-commons-tools/pom.xml
  2. 65
      code/smart-community/epmet-gateway/pom.xml
  3. 36
      code/smart-community/pom.xml

11
code/smart-community/epmet-commons/epmet-commons-tools/pom.xml
View File

@ -29,15 +29,8 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>com.tongweb.springboot</groupId>
<artifactId>spring-boot-starter-web</artifactId> <artifactId>tongweb-spring-boot-starter-2.x</artifactId>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
</exclusion>
</exclusions>
<scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>

65
code/smart-community/epmet-gateway/pom.xml
View File

@ -26,19 +26,34 @@
<artifactId>reactor-extra</artifactId> <artifactId>reactor-extra</artifactId>
</exclusion> </exclusion>
<exclusion> <exclusion>
<groupId>io.projectreactor</groupId> <groupId>io.projectreactor.netty</groupId>
<artifactId>reactor-core</artifactId> <artifactId>reactor-netty-http</artifactId>
</exclusion> </exclusion>
<exclusion> <exclusion>
<groupId>org.springframework.boot</groupId> <groupId>io.projectreactor.netty</groupId>
<artifactId>spring-boot-starter-webflux</artifactId> <artifactId>reactor-netty</artifactId>
</exclusion>
<exclusion>
<groupId>io.projectreactor</groupId>
<artifactId>reactor-core</artifactId>
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.tongweb.springboot</groupId> <groupId>io.netty</groupId>
<artifactId>tongweb-spring-boot-starter-2.x</artifactId> <artifactId>netty-resolver-dns-native-macos</artifactId>
<version>${tongWeb.version}</version> <classifier>osx-aarch_64</classifier>
<version>4.1.82.Final</version>
</dependency>
<dependency>
<groupId>com.tongweb</groupId>
<artifactId>tongweb-spring-boot-reactor-starter</artifactId>
<exclusions>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-resolver-dns-native-macos</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<!-- <dependency>--> <!-- <dependency>-->
@ -76,12 +91,24 @@
<groupId>com.epmet</groupId> <groupId>com.epmet</groupId>
<artifactId>epmet-commons-tools</artifactId> <artifactId>epmet-commons-tools</artifactId>
<version>2.0.0</version> <version>2.0.0</version>
<exclusions>
<exclusion>
<groupId>com.tongweb.springboot</groupId>
<artifactId>tongweb-spring-boot-starter-2.x</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.epmet</groupId> <groupId>com.epmet</groupId>
<artifactId>epmet-common-clienttoken</artifactId> <artifactId>epmet-common-clienttoken</artifactId>
<version>2.0.0</version> <version>2.0.0</version>
<scope>compile</scope> <scope>compile</scope>
<exclusions>
<exclusion>
<groupId>com.tongweb.springboot</groupId>
<artifactId>tongweb-spring-boot-starter-2.x</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<!--用于外部应用认证的查询--> <!--用于外部应用认证的查询-->
@ -89,22 +116,46 @@
<groupId>com.epmet</groupId> <groupId>com.epmet</groupId>
<artifactId>common-service-client</artifactId> <artifactId>common-service-client</artifactId>
<version>2.0.0</version> <version>2.0.0</version>
<exclusions>
<exclusion>
<groupId>com.tongweb.springboot</groupId>
<artifactId>tongweb-spring-boot-starter-2.x</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.epmet</groupId> <groupId>com.epmet</groupId>
<artifactId>epmet-commons-openapi</artifactId> <artifactId>epmet-commons-openapi</artifactId>
<version>2.0.0</version> <version>2.0.0</version>
<exclusions>
<exclusion>
<groupId>com.tongweb.springboot</groupId>
<artifactId>tongweb-spring-boot-starter-2.x</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.epmet</groupId> <groupId>com.epmet</groupId>
<artifactId>epmet-admin-client</artifactId> <artifactId>epmet-admin-client</artifactId>
<version>2.0.0</version> <version>2.0.0</version>
<exclusions>
<exclusion>
<groupId>com.tongweb.springboot</groupId>
<artifactId>tongweb-spring-boot-starter-2.x</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.epmet</groupId> <groupId>com.epmet</groupId>
<artifactId>epmet-commons-security</artifactId> <artifactId>epmet-commons-security</artifactId>
<version>2.0.0</version> <version>2.0.0</version>
<scope>compile</scope> <scope>compile</scope>
<exclusions>
<exclusion>
<groupId>com.tongweb.springboot</groupId>
<artifactId>tongweb-spring-boot-starter-2.x</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
</dependencies> </dependencies>

36
code/smart-community/pom.xml
View File

@ -23,12 +23,12 @@
<modules> <modules>
<module>epmet-commons</module> <module>epmet-commons</module>
<module>epmet-gateway</module> <module>epmet-gateway</module>
<module>epmet-auth</module> <!--<module>epmet-auth</module>
<module>epmet-auth-client</module> <module>epmet-auth-client</module>
<module>epmet-admin</module> <module>epmet-admin</module>
<module>epmet-module</module> <module>epmet-module</module>
<module>epmet-user</module> <module>epmet-user</module>
<module>epmet-openapi</module> <module>epmet-openapi</module>-->
</modules> </modules>
<properties> <properties>
@ -55,6 +55,18 @@
<type>pom</type> <type>pom</type>
<scope>import</scope> <scope>import</scope>
</dependency> </dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-bom</artifactId>
<version>4.1.85.Final</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>io.projectreactor</groupId>
<artifactId>reactor-core</artifactId>
<version>3.4.23</version>
</dependency>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dependencies</artifactId> <artifactId>spring-cloud-dependencies</artifactId>
@ -133,25 +145,9 @@
<dependencies> <dependencies>
<!-- 排除tomcat依赖 --> <!-- 排除tomcat依赖 -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-el</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- tongWeb --> <!-- tongWeb -->
<dependency>
<groupId>com.tongweb.springboot</groupId>
<artifactId>tongweb-spring-boot-starter-2.x</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId> <artifactId>spring-boot-starter-test</artifactId>

Write Preview
Loading…
Cancel
Save