合并gateway代码

pom.xml

@@ -14,35 +14,39 @@
     <description>市北党建e家网关模块</description>
 
     <dependencies>
+        <dependency>
+            <groupId>com.esua.epdc</groupId>
+            <artifactId>epdc-commons-tools</artifactId>
+            <version>1.0.0</version>
+        </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-gateway</artifactId>
         </dependency>
-
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
         </dependency>
-
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
         </dependency>
-
         <!-- zipkin client -->
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-zipkin</artifactId>
         </dependency>
-
         <dependency>
-            <groupId>com.esua.epdc.shibei</groupId>
+            <groupId>com.esua.epdc</groupId>
             <artifactId>epdc-common-clienttoken</artifactId>
+            <version>1.0.0</version>
+            <scope>compile</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.esua.epdc.shibei</groupId>
-            <artifactId>epdc-commons-tools</artifactId>
+            <groupId>com.esua.epdc</groupId>
+            <artifactId>epdc-common-clienttoken</artifactId>
+            <version>1.0.0</version>
         </dependency>
     </dependencies>
 
@@ -82,6 +86,8 @@
             </activation>
             <properties>
                 <server.port>9094</server.port>
+                <spring.profiles.active>dev</spring.profiles.active>
+                <docker.tag>dev</docker.tag>
 
                 <!-- redis配置 -->
                 <spring.redis.index>2</spring.redis.index>
@@ -110,6 +116,12 @@
                 <gateway.routes.epdc-oss-server.uri>lb://epdc-oss-server</gateway.routes.epdc-oss-server.uri>
                 <gateway.routes.epdc-events-server.uri>lb://epdc-events-server</gateway.routes.epdc-events-server.uri>
                 <!--                <gateway.routes.epdc-events-server.uri>http://127.0.0.1:9066</gateway.routes.epdc-events-server.uri>-->
+                <gateway.routes.epdc-cloud-analysis-server.uri>http://127.0.0.1:9060
+                </gateway.routes.epdc-cloud-analysis-server.uri>
+                <!--                <gateway.routes.epdc-cloud-analysis-server.uri>lb://epdc-cloud-analysis-server</gateway.routes.epdc-cloud-analysis-server.uri>-->
+                <gateway.routes.epdc-work-record-server.uri>http://127.0.0.1:9085
+                </gateway.routes.epdc-work-record-server.uri>
+                <!--                <gateway.routes.epdc-work-record-server.uri>lb://epdc-work-record-server</gateway.routes.epdc-work-record-server.uri>-->
                 <gateway.routes.epdc-services-server.uri>lb://epdc-services-server
                 </gateway.routes.epdc-services-server.uri>
                 <!--                <gateway.routes.epdc-services-server.uri>http://127.0.0.1:9067</gateway.routes.epdc-services-server.uri>-->
@@ -120,16 +132,18 @@
                 <!--<gateway.routes.epdc-group-server.uri>lb://epdc-group-server</gateway.routes.epdc-group-server.uri>-->
                 <gateway.routes.epdc-websocket-server.uri>lb://epdc-websocket-server
                 </gateway.routes.epdc-websocket-server.uri>
-                <gateway.routes.epdc-cloud-analysis-server.uri>http://127.0.0.1:9060</gateway.routes.epdc-cloud-analysis-server.uri>
-<!--                <gateway.routes.epdc-cloud-analysis-server.uri>lb://epdc-cloud-analysis-server</gateway.routes.epdc-cloud-analysis-server.uri>-->
                 <!--                <gateway.routes.epdc-custom-server.uri>http://127.0.0.1:9076</gateway.routes.epdc-kpi-server.uri>-->
                 <gateway.routes.epdc-custom-server.uri>lb://epdc-custom-server</gateway.routes.epdc-custom-server.uri>
                 <gateway.routes.epdc-points-server.uri>lb://epdc-points-server</gateway.routes.epdc-points-server.uri>
                 <!--                <gateway.routes.epdc-kpi-server.uri>lb://epdc-kpi-server</gateway.routes.epdc-kpi-server.uri>-->
                 <gateway.routes.epdc-kpi-server.uri>http://127.0.0.1:9069</gateway.routes.epdc-kpi-server.uri>
+                <gateway.routes.epdc-analysis-server.uri>lb://epdc-analysis-server
+                </gateway.routes.epdc-analysis-server.uri>
                 <!-- nacos -->
                 <nacos.register-enabled>false</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
+                <nacos.ip></nacos.ip>
+                <nacos.namespace>6a3577b4-7b79-43f6-aebb-9c3f31263f6a</nacos.namespace>
 
                 <spring.zipkin.base-url>http://localhost:9411</spring.zipkin.base-url>
             </properties>
@@ -137,13 +151,15 @@
         <profile>
             <id>test</id>
             <properties>
-                <server.port>9094</server.port>
+                <server.port>10000</server.port>
+                <spring.profiles.active>test</spring.profiles.active>
+                <docker.tag>test</docker.tag>
 
                 <!-- redis配置 -->
                 <spring.redis.index>2</spring.redis.index>
-                <spring.redis.host>47.104.224.45</spring.redis.host>
-                <spring.redis.port>6379</spring.redis.port>
-                <spring.redis.password>elink@888</spring.redis.password>
+                <spring.redis.host>114.215.125.123</spring.redis.host>
+                <spring.redis.port>9603</spring.redis.port>
+                <spring.redis.password>epdc!redis@master1405</spring.redis.password>
 
                 <!-- gateway routes -->
                 <gateway.routes.epdc-auth-server.uri>lb://epdc-auth-server</gateway.routes.epdc-auth-server.uri>
@@ -159,6 +175,10 @@
                 <gateway.routes.epdc-news-server.uri>lb://epdc-news-server</gateway.routes.epdc-news-server.uri>
                 <gateway.routes.epdc-oss-server.uri>lb://epdc-oss-server</gateway.routes.epdc-oss-server.uri>
                 <gateway.routes.epdc-events-server.uri>lb://epdc-events-server</gateway.routes.epdc-events-server.uri>
+                <gateway.routes.epdc-cloud-analysis-server.uri>lb://epdc-cloud-analysis-server
+                </gateway.routes.epdc-cloud-analysis-server.uri>
+                <gateway.routes.epdc-work-record-server.uri>lb://epdc-work-record-server
+                </gateway.routes.epdc-work-record-server.uri>
                 <gateway.routes.epdc-services-server.uri>lb://epdc-services-server
                 </gateway.routes.epdc-services-server.uri>
                 <gateway.routes.epdc-user-server.uri>lb://epdc-user-server</gateway.routes.epdc-user-server.uri>
@@ -169,18 +189,24 @@
                 <gateway.routes.epdc-kpi-server.uri>lb://epdc-kpi-server</gateway.routes.epdc-kpi-server.uri>
                 <gateway.routes.epdc-custom-server.uri>lb://epdc-custom-server</gateway.routes.epdc-custom-server.uri>
                 <gateway.routes.epdc-points-server.uri>lb://epdc-points-server</gateway.routes.epdc-points-server.uri>
+                <gateway.routes.epdc-analysis-server.uri>lb://epdc-analysis-server
+                </gateway.routes.epdc-analysis-server.uri>
 
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
+                <nacos.ip>47.104.85.99</nacos.ip>
+                <nacos.namespace>6a3577b4-7b79-43f6-aebb-9c3f31263f6a</nacos.namespace>
 
                 <spring.zipkin.base-url>http://localhost:9411</spring.zipkin.base-url>
             </properties>
         </profile>
+
         <profile>
             <id>prod</id>
             <properties>
                 <server.port>9094</server.port>
+                <spring.profiles.active>prod</spring.profiles.active>
                 <docker.tag>prod</docker.tag>
 
                 <!-- gateway routes -->
@@ -196,6 +222,10 @@
                 </gateway.routes.epdc-message-server.uri>
                 <gateway.routes.epdc-news-server.uri>lb://epdc-news-server</gateway.routes.epdc-news-server.uri>
                 <gateway.routes.epdc-oss-server.uri>lb://epdc-oss-server</gateway.routes.epdc-oss-server.uri>
+                <gateway.routes.epdc-cloud-analysis-server.uri>lb://epdc-cloud-analysis-server
+                </gateway.routes.epdc-cloud-analysis-server.uri>
+                <gateway.routes.epdc-work-record-server.uri>lb://epdc-work-record-server
+                </gateway.routes.epdc-work-record-server.uri>
                 <gateway.routes.epdc-events-server.uri>lb://epdc-events-server</gateway.routes.epdc-events-server.uri>
                 <gateway.routes.epdc-services-server.uri>lb://epdc-services-server
                 </gateway.routes.epdc-services-server.uri>
@@ -207,93 +237,8 @@
                 <gateway.routes.epdc-kpi-server.uri>lb://epdc-kpi-server</gateway.routes.epdc-kpi-server.uri>
                 <gateway.routes.epdc-custom-server.uri>lb://epdc-custom-server</gateway.routes.epdc-custom-server.uri>
                 <gateway.routes.epdc-points-server.uri>lb://epdc-points-server</gateway.routes.epdc-points-server.uri>
-
-                <!-- redis配置 -->
-                <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>10.5.34.164</spring.redis.host>
-                <spring.redis.port>6379</spring.redis.port>
-                <spring.redis.password>Elink@833066</spring.redis.password>
-                <!-- nacos -->
-                <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>10.5.34.164:8848</nacos.server-addr>
-
-                <spring.zipkin.base-url>http://localhost:9411</spring.zipkin.base-url>
-            </properties>
-        </profile>
-
-        <profile>
-            <id>prod_kongcun</id>
-            <properties>
-                <server.port>9094</server.port>
-                <docker.tag>prod</docker.tag>
-
-                <!-- gateway routes -->
-                <gateway.routes.epdc-auth-server.uri>lb://epdc-auth-server</gateway.routes.epdc-auth-server.uri>
-                <gateway.routes.epdc-admin-server.uri>lb://epdc-admin-server</gateway.routes.epdc-admin-server.uri>
-                <gateway.routes.epdc-activiti-server.uri>lb://epdc-activiti-server
-                </gateway.routes.epdc-activiti-server.uri>
-                <gateway.routes.epdc-api-server.uri>lb://epdc-api-server</gateway.routes.epdc-api-server.uri>
-                <gateway.routes.epdc-app-server.uri>lb://epdc-app-server</gateway.routes.epdc-app-server.uri>
-                <gateway.routes.epdc-heart-server.uri>lb://epdc-heart-server</gateway.routes.epdc-heart-server.uri>
-                <gateway.routes.epdc-job-server.uri>lb://epdc-job-server</gateway.routes.epdc-job-server.uri>
-                <gateway.routes.epdc-message-server.uri>lb://epdc-message-server
-                </gateway.routes.epdc-message-server.uri>
-                <gateway.routes.epdc-news-server.uri>lb://epdc-news-server</gateway.routes.epdc-news-server.uri>
-                <gateway.routes.epdc-oss-server.uri>lb://epdc-oss-server</gateway.routes.epdc-oss-server.uri>
-                <gateway.routes.epdc-events-server.uri>lb://epdc-events-server</gateway.routes.epdc-events-server.uri>
-                <gateway.routes.epdc-services-server.uri>lb://epdc-services-server
-                </gateway.routes.epdc-services-server.uri>
-                <gateway.routes.epdc-user-server.uri>lb://epdc-user-server</gateway.routes.epdc-user-server.uri>
-                <gateway.routes.epdc-demo-server.uri>lb://epdc-demo-server</gateway.routes.epdc-demo-server.uri>
-                <gateway.routes.epdc-group-server.uri>lb://epdc-group-server</gateway.routes.epdc-group-server.uri>
-                <gateway.routes.epdc-websocket-server.uri>lb://epdc-websocket-server
-                </gateway.routes.epdc-websocket-server.uri>
-                <gateway.routes.epdc-kpi-server.uri>lb://epdc-kpi-server</gateway.routes.epdc-kpi-server.uri>
-                <gateway.routes.epdc-custom-server.uri>lb://epdc-custom-server</gateway.routes.epdc-custom-server.uri>
-
-                <!-- redis配置 -->
-                <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>172.16.1.238</spring.redis.host>
-                <spring.redis.port>6379</spring.redis.port>
-                <spring.redis.password>Elink833066</spring.redis.password>
-
-                <!-- nacos -->
-                <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>172.16.1.238:8848</nacos.server-addr>
-
-                <spring.zipkin.base-url>http://localhost:9411</spring.zipkin.base-url>
-            </properties>
-        </profile>
-
-        <profile>
-            <id>prod_shibei_aliyun</id>
-            <properties>
-                <server.port>9094</server.port>
-                <docker.tag>prod</docker.tag>
-
-                <!-- gateway routes -->
-                <gateway.routes.epdc-auth-server.uri>lb://epdc-auth-server</gateway.routes.epdc-auth-server.uri>
-                <gateway.routes.epdc-admin-server.uri>lb://epdc-admin-server</gateway.routes.epdc-admin-server.uri>
-                <gateway.routes.epdc-activiti-server.uri>lb://epdc-activiti-server
-                </gateway.routes.epdc-activiti-server.uri>
-                <gateway.routes.epdc-api-server.uri>lb://epdc-api-server</gateway.routes.epdc-api-server.uri>
-                <gateway.routes.epdc-app-server.uri>lb://epdc-app-server</gateway.routes.epdc-app-server.uri>
-                <gateway.routes.epdc-heart-server.uri>lb://epdc-heart-server</gateway.routes.epdc-heart-server.uri>
-                <gateway.routes.epdc-job-server.uri>lb://epdc-job-server</gateway.routes.epdc-job-server.uri>
-                <gateway.routes.epdc-message-server.uri>lb://epdc-message-server
-                </gateway.routes.epdc-message-server.uri>
-                <gateway.routes.epdc-news-server.uri>lb://epdc-news-server</gateway.routes.epdc-news-server.uri>
-                <gateway.routes.epdc-oss-server.uri>lb://epdc-oss-server</gateway.routes.epdc-oss-server.uri>
-                <gateway.routes.epdc-events-server.uri>lb://epdc-events-server</gateway.routes.epdc-events-server.uri>
-                <gateway.routes.epdc-services-server.uri>lb://epdc-services-server
-                </gateway.routes.epdc-services-server.uri>
-                <gateway.routes.epdc-user-server.uri>lb://epdc-user-server</gateway.routes.epdc-user-server.uri>
-                <gateway.routes.epdc-demo-server.uri>lb://epdc-demo-server</gateway.routes.epdc-demo-server.uri>
-                <gateway.routes.epdc-group-server.uri>lb://epdc-group-server</gateway.routes.epdc-group-server.uri>
-                <gateway.routes.epdc-websocket-server.uri>lb://epdc-websocket-server
-                </gateway.routes.epdc-websocket-server.uri>
-                <gateway.routes.epdc-kpi-server.uri>lb://epdc-kpi-server</gateway.routes.epdc-kpi-server.uri>
-                <gateway.routes.epdc-custom-server.uri>lb://epdc-custom-server</gateway.routes.epdc-custom-server.uri>
+                <gateway.routes.epdc-analysis-server.uri>lb://epdc-analysis-server
+                </gateway.routes.epdc-analysis-server.uri>
 
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
@@ -304,50 +249,8 @@
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
                 <nacos.server-addr>172.16.0.52:8848</nacos.server-addr>
-
-                <spring.zipkin.base-url>http://localhost:9411</spring.zipkin.base-url>
-            </properties>
-        </profile>
-
-        <profile>
-            <id>prod_jinshui</id>
-            <properties>
-                <server.port>9104</server.port>
-                <docker.tag>prod</docker.tag>
-
-                <!-- gateway routes -->
-                <gateway.routes.epdc-auth-server.uri>lb://epdc-auth-server</gateway.routes.epdc-auth-server.uri>
-                <gateway.routes.epdc-admin-server.uri>lb://epdc-admin-server</gateway.routes.epdc-admin-server.uri>
-                <gateway.routes.epdc-activiti-server.uri>lb://epdc-activiti-server
-                </gateway.routes.epdc-activiti-server.uri>
-                <gateway.routes.epdc-api-server.uri>lb://epdc-api-server</gateway.routes.epdc-api-server.uri>
-                <gateway.routes.epdc-app-server.uri>lb://epdc-app-server</gateway.routes.epdc-app-server.uri>
-                <gateway.routes.epdc-heart-server.uri>lb://epdc-heart-server</gateway.routes.epdc-heart-server.uri>
-                <gateway.routes.epdc-job-server.uri>lb://epdc-job-server</gateway.routes.epdc-job-server.uri>
-                <gateway.routes.epdc-message-server.uri>lb://epdc-message-server
-                </gateway.routes.epdc-message-server.uri>
-                <gateway.routes.epdc-news-server.uri>lb://epdc-news-server</gateway.routes.epdc-news-server.uri>
-                <gateway.routes.epdc-oss-server.uri>lb://epdc-oss-server</gateway.routes.epdc-oss-server.uri>
-                <gateway.routes.epdc-events-server.uri>lb://epdc-events-server</gateway.routes.epdc-events-server.uri>
-                <gateway.routes.epdc-services-server.uri>lb://epdc-services-server
-                </gateway.routes.epdc-services-server.uri>
-                <gateway.routes.epdc-user-server.uri>lb://epdc-user-server</gateway.routes.epdc-user-server.uri>
-                <gateway.routes.epdc-demo-server.uri>lb://epdc-demo-server</gateway.routes.epdc-demo-server.uri>
-                <gateway.routes.epdc-group-server.uri>lb://epdc-group-server</gateway.routes.epdc-group-server.uri>
-                <gateway.routes.epdc-websocket-server.uri>lb://epdc-websocket-server
-                </gateway.routes.epdc-websocket-server.uri>
-                <gateway.routes.epdc-kpi-server.uri>lb://epdc-kpi-server</gateway.routes.epdc-kpi-server.uri>
-                <gateway.routes.epdc-custom-server.uri>lb://epdc-custom-server</gateway.routes.epdc-custom-server.uri>
-
-                <!-- redis配置 -->
-                <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>172.19.0.11</spring.redis.host>
-                <spring.redis.port>6379</spring.redis.port>
-                <spring.redis.password>epdc!redis@master1405</spring.redis.password>
-
-                <!-- nacos -->
-                <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>172.20.0.4:80</nacos.server-addr>
+                <nacos.ip></nacos.ip>
+                <nacos.namespace></nacos.namespace>
 
                 <spring.zipkin.base-url>http://localhost:9411</spring.zipkin.base-url>
             </properties>

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/** #工作日志接口

src/main/resources/logback-spring.xml

@@ -144,10 +144,10 @@
 
     <!-- 生产环境 -->
     <springProfile name="prod">
-        <logger name="org.springframework.web" level="ERROR"/>
-        <logger name="org.springboot.sample" level="ERROR"/>
-        <logger name="com.elink.esua.epdc" level="ERROR"/>
-        <root level="ERROR">
+        <logger name="org.springframework.web" level="INFO"/>
+        <logger name="org.springboot.sample" level="INFO"/>
+        <logger name="com.elink.esua.epdc" level="INFO"/>
+        <root level="INFO">
             <appender-ref ref="CONSOLE"/>
             <appender-ref ref="DEBUG_FILE"/>
             <appender-ref ref="INFO_FILE"/>
@@ -156,4 +156,4 @@
         </root>
     </springProfile>
 
-</configuration>
+</configuration>