From 8247945eb6daf7088331356fca98c5dd5e7156d8 Mon Sep 17 00:00:00 2001 From: yujt Date: Wed, 2 Sep 2020 17:23:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=90=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitmodules | 9 + epdc-cloud-client-yushan | 1 + epdc-cloud-commons-yushan | 1 + Dockerfile => epdc-cloud-gateway/Dockerfile | 0 epdc-cloud-gateway/pom.xml | 267 +++++++++++++++++ .../elink/esua/epdc/GatewayApplication.java | 0 .../elink/esua/epdc/config/CorsConfig.java | 0 .../esua/epdc/config/ModuleConfigImpl.java | 0 .../esua/epdc/feign/ResourceFeignClient.java | 0 .../fallback/ResourceFeignClientFallback.java | 0 .../elink/esua/epdc/filter/AuthFilter.java | 0 .../filter/CpAuthGatewayFilterFactory.java | 0 .../elink/esua/epdc/filter/CpProperty.java | 0 .../src}/main/resources/application.yml | 0 .../src}/main/resources/logback-spring.xml | 0 epdc-cloud-parent-yushan | 1 + pom.xml | 271 +----------------- 17 files changed, 290 insertions(+), 260 deletions(-) create mode 100644 .gitmodules create mode 160000 epdc-cloud-client-yushan create mode 160000 epdc-cloud-commons-yushan rename Dockerfile => epdc-cloud-gateway/Dockerfile (100%) mode change 100755 => 100644 create mode 100644 epdc-cloud-gateway/pom.xml rename {src => epdc-cloud-gateway/src}/main/java/com/elink/esua/epdc/GatewayApplication.java (100%) rename {src => epdc-cloud-gateway/src}/main/java/com/elink/esua/epdc/config/CorsConfig.java (100%) rename {src => epdc-cloud-gateway/src}/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java (100%) rename {src => epdc-cloud-gateway/src}/main/java/com/elink/esua/epdc/feign/ResourceFeignClient.java (100%) rename {src => epdc-cloud-gateway/src}/main/java/com/elink/esua/epdc/feign/fallback/ResourceFeignClientFallback.java (100%) rename {src => epdc-cloud-gateway/src}/main/java/com/elink/esua/epdc/filter/AuthFilter.java (100%) rename {src => epdc-cloud-gateway/src}/main/java/com/elink/esua/epdc/filter/CpAuthGatewayFilterFactory.java (100%) rename {src => epdc-cloud-gateway/src}/main/java/com/elink/esua/epdc/filter/CpProperty.java (100%) rename {src => epdc-cloud-gateway/src}/main/resources/application.yml (100%) rename {src => epdc-cloud-gateway/src}/main/resources/logback-spring.xml (100%) create mode 160000 epdc-cloud-parent-yushan diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..682ae57 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,9 @@ +[submodule "epdc-cloud-client-yushan"] + path = epdc-cloud-client-yushan + url = http://121.42.41.42:7070/r/epdc-cloud-client-yushan.git +[submodule "epdc-cloud-commons-yushan"] + path = epdc-cloud-commons-yushan + url = http://121.42.41.42:7070/r/epdc-cloud-commons-yushan.git +[submodule "epdc-cloud-parent-yushan"] + path = epdc-cloud-parent-yushan + url = http://121.42.41.42:7070/r/epdc-cloud-parent-yushan.git diff --git a/epdc-cloud-client-yushan b/epdc-cloud-client-yushan new file mode 160000 index 0000000..8c3f710 --- /dev/null +++ b/epdc-cloud-client-yushan @@ -0,0 +1 @@ +Subproject commit 8c3f710e726265ff1b3b47ac6ab005d025218974 diff --git a/epdc-cloud-commons-yushan b/epdc-cloud-commons-yushan new file mode 160000 index 0000000..8e13368 --- /dev/null +++ b/epdc-cloud-commons-yushan @@ -0,0 +1 @@ +Subproject commit 8e13368aad9310e107299b137fedd118c76bb57d diff --git a/Dockerfile b/epdc-cloud-gateway/Dockerfile old mode 100755 new mode 100644 similarity index 100% rename from Dockerfile rename to epdc-cloud-gateway/Dockerfile diff --git a/epdc-cloud-gateway/pom.xml b/epdc-cloud-gateway/pom.xml new file mode 100644 index 0000000..0062baf --- /dev/null +++ b/epdc-cloud-gateway/pom.xml @@ -0,0 +1,267 @@ + + + 4.0.0 + + + com.esua.epdc.yushan + epdc-cloud-parent-yushan + 1.0.0 + ../epdc-cloud-parent-yushan + + + epdc-cloud-gateway + jar + 榆山党建e家网关模块 + + + + org.springframework.cloud + spring-cloud-starter-gateway + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + org.springframework.cloud + spring-cloud-starter-netflix-hystrix + + + + + org.springframework.cloud + spring-cloud-starter-zipkin + + + + + com.esua.epdc.yushan + epdc-commons-tools + ${epdc-cloud-commons.version} + + + + com.esua.epdc.yushan + epdc-common-clienttoken + ${epdc-cloud-commons.version} + + + + + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + + + org.apache.maven.plugins + maven-surefire-plugin + + true + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + com.spotify + dockerfile-maven-plugin + + + + + + + dev + + true + + + 9094 + dev + dev + + + 9 + 114.215.125.123 + 9603 + epdc!redis@master1405 + + + lb://epdc-auth-server + + http://127.0.0.1:9092 + lb://epdc-activiti-server + + + http://127.0.0.1:9040 + lb://epdc-app-server + + lb://epdc-heart-server + + lb://epdc-job-server + + lb://epdc-message-server + + + http://127.0.0.1:9064 + lb://epdc-oss-server + lb://epdc-events-server + + http://127.0.0.1:9060 + + + http://127.0.0.1:9085 + + + lb://epdc-services-server + + + + http://127.0.0.1:9068 + lb://epdc-demo-server + http://127.0.0.1:9063 + + lb://epdc-websocket-server + + + lb://epdc-custom-server + lb://epdc-points-server + + http://127.0.0.1:9069 + lb://epdc-analysis-server + + http://127.0.0.1:10009 + + + false + 47.104.224.45:8848 + + de000340-5fc4-45aa-bdbc-dd96852012ad + + http://localhost:9411 + + + + test + + 17020 + test + test + + + 9 + 114.215.125.123 + 9603 + epdc!redis@master1405 + + + lb://epdc-auth-server + lb://epdc-admin-server + lb://epdc-activiti-server + + lb://epdc-api-server + lb://epdc-app-server + lb://epdc-heart-server + lb://epdc-job-server + lb://epdc-message-server + + lb://epdc-news-server + lb://epdc-oss-server + lb://epdc-events-server + lb://epdc-cloud-analysis-server + + lb://epdc-work-record-server + + lb://epdc-services-server + + lb://epdc-user-server + lb://epdc-demo-server + lb://epdc-group-server + lb://epdc-websocket-server + + lb://epdc-kpi-server + lb://epdc-custom-server + lb://epdc-points-server + lb://epdc-analysis-server + + lb://epdc-property-server + + + + true + 47.104.224.45:8848 + 192.168.0.15 + de000340-5fc4-45aa-bdbc-dd96852012ad + + http://localhost:9411 + + + + + prod + + 9094 + prod + prod + + + lb://epdc-auth-server + lb://epdc-admin-server + lb://epdc-activiti-server + + lb://epdc-api-server + lb://epdc-app-server + lb://epdc-heart-server + lb://epdc-job-server + lb://epdc-message-server + + lb://epdc-news-server + lb://epdc-oss-server + lb://epdc-cloud-analysis-server + + lb://epdc-work-record-server + + lb://epdc-events-server + lb://epdc-services-server + + lb://epdc-user-server + lb://epdc-demo-server + lb://epdc-group-server + lb://epdc-websocket-server + + lb://epdc-kpi-server + lb://epdc-custom-server + lb://epdc-points-server + lb://epdc-analysis-server + + lb://epdc-property-server + + + + 0 + 172.16.1.243 + 6379 + Elink833066 + + + true + 172.16.1.243:8848 + + + + http://localhost:9411 + + + + + diff --git a/src/main/java/com/elink/esua/epdc/GatewayApplication.java b/epdc-cloud-gateway/src/main/java/com/elink/esua/epdc/GatewayApplication.java similarity index 100% rename from src/main/java/com/elink/esua/epdc/GatewayApplication.java rename to epdc-cloud-gateway/src/main/java/com/elink/esua/epdc/GatewayApplication.java diff --git a/src/main/java/com/elink/esua/epdc/config/CorsConfig.java b/epdc-cloud-gateway/src/main/java/com/elink/esua/epdc/config/CorsConfig.java similarity index 100% rename from src/main/java/com/elink/esua/epdc/config/CorsConfig.java rename to epdc-cloud-gateway/src/main/java/com/elink/esua/epdc/config/CorsConfig.java diff --git a/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java b/epdc-cloud-gateway/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java similarity index 100% rename from src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java rename to epdc-cloud-gateway/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java diff --git a/src/main/java/com/elink/esua/epdc/feign/ResourceFeignClient.java b/epdc-cloud-gateway/src/main/java/com/elink/esua/epdc/feign/ResourceFeignClient.java similarity index 100% rename from src/main/java/com/elink/esua/epdc/feign/ResourceFeignClient.java rename to epdc-cloud-gateway/src/main/java/com/elink/esua/epdc/feign/ResourceFeignClient.java diff --git a/src/main/java/com/elink/esua/epdc/feign/fallback/ResourceFeignClientFallback.java b/epdc-cloud-gateway/src/main/java/com/elink/esua/epdc/feign/fallback/ResourceFeignClientFallback.java similarity index 100% rename from src/main/java/com/elink/esua/epdc/feign/fallback/ResourceFeignClientFallback.java rename to epdc-cloud-gateway/src/main/java/com/elink/esua/epdc/feign/fallback/ResourceFeignClientFallback.java diff --git a/src/main/java/com/elink/esua/epdc/filter/AuthFilter.java b/epdc-cloud-gateway/src/main/java/com/elink/esua/epdc/filter/AuthFilter.java similarity index 100% rename from src/main/java/com/elink/esua/epdc/filter/AuthFilter.java rename to epdc-cloud-gateway/src/main/java/com/elink/esua/epdc/filter/AuthFilter.java diff --git a/src/main/java/com/elink/esua/epdc/filter/CpAuthGatewayFilterFactory.java b/epdc-cloud-gateway/src/main/java/com/elink/esua/epdc/filter/CpAuthGatewayFilterFactory.java similarity index 100% rename from src/main/java/com/elink/esua/epdc/filter/CpAuthGatewayFilterFactory.java rename to epdc-cloud-gateway/src/main/java/com/elink/esua/epdc/filter/CpAuthGatewayFilterFactory.java diff --git a/src/main/java/com/elink/esua/epdc/filter/CpProperty.java b/epdc-cloud-gateway/src/main/java/com/elink/esua/epdc/filter/CpProperty.java similarity index 100% rename from src/main/java/com/elink/esua/epdc/filter/CpProperty.java rename to epdc-cloud-gateway/src/main/java/com/elink/esua/epdc/filter/CpProperty.java diff --git a/src/main/resources/application.yml b/epdc-cloud-gateway/src/main/resources/application.yml similarity index 100% rename from src/main/resources/application.yml rename to epdc-cloud-gateway/src/main/resources/application.yml diff --git a/src/main/resources/logback-spring.xml b/epdc-cloud-gateway/src/main/resources/logback-spring.xml similarity index 100% rename from src/main/resources/logback-spring.xml rename to epdc-cloud-gateway/src/main/resources/logback-spring.xml diff --git a/epdc-cloud-parent-yushan b/epdc-cloud-parent-yushan new file mode 160000 index 0000000..db92131 --- /dev/null +++ b/epdc-cloud-parent-yushan @@ -0,0 +1 @@ +Subproject commit db9213163f8005cba05ad21334bebb72484174b7 diff --git a/pom.xml b/pom.xml index b4e2b5e..595bc18 100644 --- a/pom.xml +++ b/pom.xml @@ -3,265 +3,16 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - - com.esua.epdc.yushan - epdc-cloud-parent-yushan - 1.0.0 - ../epdc-cloud-parent-yushan - - + com.esua.epdc.yushan epdc-cloud-gateway-yushan - jar - 榆山党建e家网关模块 - - - - org.springframework.cloud - spring-cloud-starter-gateway - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-discovery - - - - org.springframework.cloud - spring-cloud-starter-netflix-hystrix - - - - - org.springframework.cloud - spring-cloud-starter-zipkin - - - - - com.esua.epdc.yushan - epdc-commons-tools - ${epdc-cloud-commons.version} - - - - com.esua.epdc.yushan - epdc-common-clienttoken - ${epdc-cloud-commons.version} - - - - - - ${project.artifactId} - - - org.springframework.boot - spring-boot-maven-plugin - - - org.apache.maven.plugins - maven-surefire-plugin - - true - - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - com.spotify - dockerfile-maven-plugin - - - - - - - dev - - true - - - 9094 - dev - dev - - - 9 - 114.215.125.123 - 9603 - epdc!redis@master1405 - - - lb://epdc-auth-server - - http://127.0.0.1:9092 - lb://epdc-activiti-server - - - http://127.0.0.1:9040 - lb://epdc-app-server - - lb://epdc-heart-server - - lb://epdc-job-server - - lb://epdc-message-server - - - http://127.0.0.1:9064 - lb://epdc-oss-server - lb://epdc-events-server - - http://127.0.0.1:9060 - - - http://127.0.0.1:9085 - - - lb://epdc-services-server - - - - http://127.0.0.1:9068 - lb://epdc-demo-server - http://127.0.0.1:9063 - - lb://epdc-websocket-server - - - lb://epdc-custom-server - lb://epdc-points-server - - http://127.0.0.1:9069 - lb://epdc-analysis-server - - http://127.0.0.1:10009 - - - false - 47.104.224.45:8848 - - de000340-5fc4-45aa-bdbc-dd96852012ad - - http://localhost:9411 - - - - test - - 17020 - test - test - - - 9 - 114.215.125.123 - 9603 - epdc!redis@master1405 - - - lb://epdc-auth-server - lb://epdc-admin-server - lb://epdc-activiti-server - - lb://epdc-api-server - lb://epdc-app-server - lb://epdc-heart-server - lb://epdc-job-server - lb://epdc-message-server - - lb://epdc-news-server - lb://epdc-oss-server - lb://epdc-events-server - lb://epdc-cloud-analysis-server - - lb://epdc-work-record-server - - lb://epdc-services-server - - lb://epdc-user-server - lb://epdc-demo-server - lb://epdc-group-server - lb://epdc-websocket-server - - lb://epdc-kpi-server - lb://epdc-custom-server - lb://epdc-points-server - lb://epdc-analysis-server - - lb://epdc-property-server - - - - true - 47.104.224.45:8848 - 192.168.0.15 - de000340-5fc4-45aa-bdbc-dd96852012ad - - http://localhost:9411 - - - - - prod - - 9094 - prod - prod - - - lb://epdc-auth-server - lb://epdc-admin-server - lb://epdc-activiti-server - - lb://epdc-api-server - lb://epdc-app-server - lb://epdc-heart-server - lb://epdc-job-server - lb://epdc-message-server - - lb://epdc-news-server - lb://epdc-oss-server - lb://epdc-cloud-analysis-server - - lb://epdc-work-record-server - - lb://epdc-events-server - lb://epdc-services-server - - lb://epdc-user-server - lb://epdc-demo-server - lb://epdc-group-server - lb://epdc-websocket-server - - lb://epdc-kpi-server - lb://epdc-custom-server - lb://epdc-points-server - lb://epdc-analysis-server - - lb://epdc-property-server - - - - 0 - 172.16.1.243 - 6379 - Elink833066 - - - true - 172.16.1.243:8848 - - - - http://localhost:9411 - - - - + 1.0.0 + pom + 榆山党群e家网关微服务模块 + + + epdc-cloud-gateway + epdc-cloud-client-yushan + epdc-cloud-commons-yushan + epdc-cloud-parent-yushan +