diff --git a/pom.xml b/pom.xml
index e444178..79f0fd7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,35 +14,39 @@
市北党建e家网关模块
+
+ com.esua.epdc
+ epdc-commons-tools
+ 1.0.0
+
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.shibei
+ com.esua.epdc
epdc-common-clienttoken
+ 1.0.0
+ compile
- com.esua.epdc.shibei
- epdc-commons-tools
+ com.esua.epdc
+ epdc-common-clienttoken
+ 1.0.0
@@ -82,6 +86,8 @@
9094
+ dev
+ dev
2
@@ -110,6 +116,12 @@
lb://epdc-oss-server
lb://epdc-events-server
+ http://127.0.0.1:9060
+
+
+ http://127.0.0.1:9085
+
+
lb://epdc-services-server
@@ -120,16 +132,18 @@
lb://epdc-websocket-server
- http://127.0.0.1:9060
-
lb://epdc-custom-server
lb://epdc-points-server
http://127.0.0.1:9069
+ lb://epdc-analysis-server
+
false
47.104.224.45:8848
+
+ 6a3577b4-7b79-43f6-aebb-9c3f31263f6a
http://localhost:9411
@@ -137,13 +151,15 @@
test
- 9094
+ 10000
+ test
+ test
2
- 47.104.224.45
- 6379
- elink@888
+ 114.215.125.123
+ 9603
+ epdc!redis@master1405
lb://epdc-auth-server
@@ -159,6 +175,10 @@
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
@@ -169,18 +189,24 @@
lb://epdc-kpi-server
lb://epdc-custom-server
lb://epdc-points-server
+ lb://epdc-analysis-server
+
true
47.104.224.45:8848
+ 47.104.85.99
+ 6a3577b4-7b79-43f6-aebb-9c3f31263f6a
http://localhost:9411
+
prod
9094
+ prod
prod
@@ -196,6 +222,10 @@
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
@@ -207,93 +237,8 @@
lb://epdc-kpi-server
lb://epdc-custom-server
lb://epdc-points-server
-
-
- 0
- 10.5.34.164
- 6379
- Elink@833066
-
- true
- 10.5.34.164:8848
-
- http://localhost:9411
-
-
-
-
- prod_kongcun
-
- 9094
- 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-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
-
-
- 0
- 172.16.1.238
- 6379
- Elink833066
-
-
- true
- 172.16.1.238:8848
-
- http://localhost:9411
-
-
-
-
- prod_shibei_aliyun
-
- 9094
- 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-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-analysis-server
+
0
@@ -304,50 +249,8 @@
true
172.16.0.52:8848
-
- http://localhost:9411
-
-
-
-
- prod_jinshui
-
- 9104
- 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-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
-
-
- 0
- 172.19.0.11
- 6379
- epdc!redis@master1405
-
-
- true
- 172.20.0.4:80
+
+
http://localhost:9411
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 23efd71..2baead3 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,6 +8,9 @@ server:
spring:
application:
name: epdc-gateway-server
+ #环境 dev|test|prod
+ profiles:
+ active: @spring.profiles.active@
servlet:
multipart:
enabled: true
@@ -162,26 +165,42 @@ spring:
- Path=${server.servlet.context-path}/custom/**
filters:
- StripPrefix=1
- #数据分析模块
+ #积分管理
+ - id: epdc-points-server
+ uri: @gateway.routes.epdc-points-server.uri@
+ order: 18
+ predicates:
+ - Path=${server.servlet.context-path}/points/**
+ filters:
+ - StripPrefix=1
- id: epdc-cloud-analysis-server
uri: @gateway.routes.epdc-cloud-analysis-server.uri@
- order: 18
+ order: 19
predicates:
- Path=${server.servlet.context-path}/cloudAnalysis/**
filters:
- StripPrefix=1
- #积分管理
- - id: epdc-points-server
- uri: @gateway.routes.epdc-points-server.uri@
- order: 19
+ #工作日志
+ - id: epdc-work-record-server
+ uri: @gateway.routes.epdc-work-record-server.uri@
+ order: 20
predicates:
- - Path=${server.servlet.context-path}/points/**
+ - Path=${server.servlet.context-path}/workRecord/**
+ filters:
+ - StripPrefix=1
+ - id: epdc-analysis-server
+ uri: @gateway.routes.epdc-analysis-server.uri@
+ order: 21
+ predicates:
+ - Path=${server.servlet.context-path}/analysis/**
filters:
- StripPrefix=1
nacos:
discovery:
server-addr: @nacos.server-addr@
register-enabled: @nacos.register-enabled@
+ ip: @nacos.ip@
+ namespace: @nacos.namespace@
zipkin:
# 指定了 zipkin 服务器的地址
base-url: @spring.zipkin.base-url@
@@ -243,7 +262,7 @@ renren:
- /api/work/** #工作端接口
- /api/analysis/** #数据端接口
- /cloudAnalysis/** #数据端接口
-
+ - /workRecord/** #工作日志接口
epdc:
# 党建e家接口
@@ -264,3 +283,4 @@ epdc:
- /api/work/** #工作端接口不拦截
- /api/analysis/** #数据端接口不拦截
- /cloudAnalysis/** #数据端接口
+ - /workRecord/** #工作日志接口
diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml
index 7cd7516..96e2a17 100644
--- a/src/main/resources/logback-spring.xml
+++ b/src/main/resources/logback-spring.xml
@@ -144,10 +144,10 @@
-
-
-
-
+
+
+
+
@@ -156,4 +156,4 @@
-
\ No newline at end of file
+