From 77e446b686eb6eeed14ca7f6d62112c300b78f9f Mon Sep 17 00:00:00 2001
From: rongchao <rongchao@elink-cn.com>
Date: Tue, 18 Feb 2020 22:47:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9demo=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller => }/feign/ResourceFeignClient.java |  4 ++--
 .../fallback/ResourceFeignClientFallback.java      |  4 ++--
 .../com/elink/esua/epdc/filter/AuthFilter.java     |  2 +-
 .../epdc/filter/CpAuthGatewayFilterFactory.java    |  4 ++--
 src/main/resources/application.yml                 | 14 ++++++++++----
 src/main/resources/logback-spring.xml              | 10 +++++-----
 6 files changed, 22 insertions(+), 16 deletions(-)
 rename src/main/java/com/elink/esua/epdc/{modules/controller => }/feign/ResourceFeignClient.java (92%)
 rename src/main/java/com/elink/esua/epdc/{modules/controller => }/feign/fallback/ResourceFeignClientFallback.java (86%)

diff --git a/src/main/java/com/elink/esua/epdc/modules/controller/feign/ResourceFeignClient.java b/src/main/java/com/elink/esua/epdc/feign/ResourceFeignClient.java
similarity index 92%
rename from src/main/java/com/elink/esua/epdc/modules/controller/feign/ResourceFeignClient.java
rename to src/main/java/com/elink/esua/epdc/feign/ResourceFeignClient.java
index 9e98534..b52b556 100644
--- a/src/main/java/com/elink/esua/epdc/modules/controller/feign/ResourceFeignClient.java
+++ b/src/main/java/com/elink/esua/epdc/feign/ResourceFeignClient.java
@@ -6,10 +6,10 @@
  * 版权所有，侵权必究！
  */
 
-package com.elink.esua.epdc.modules.controller.feign;
+package com.elink.esua.epdc.feign;
 
 import com.elink.esua.epdc.common.token.dto.TokenDto;
-import com.elink.esua.epdc.modules.controller.feign.fallback.ResourceFeignClientFallback;
+import com.elink.esua.epdc.feign.fallback.ResourceFeignClientFallback;
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
 import com.elink.esua.epdc.commons.tools.utils.Result;
diff --git a/src/main/java/com/elink/esua/epdc/modules/controller/feign/fallback/ResourceFeignClientFallback.java b/src/main/java/com/elink/esua/epdc/feign/fallback/ResourceFeignClientFallback.java
similarity index 86%
rename from src/main/java/com/elink/esua/epdc/modules/controller/feign/fallback/ResourceFeignClientFallback.java
rename to src/main/java/com/elink/esua/epdc/feign/fallback/ResourceFeignClientFallback.java
index 646a1d5..987d2ff 100644
--- a/src/main/java/com/elink/esua/epdc/modules/controller/feign/fallback/ResourceFeignClientFallback.java
+++ b/src/main/java/com/elink/esua/epdc/feign/fallback/ResourceFeignClientFallback.java
@@ -6,12 +6,12 @@
  * 版权所有，侵权必究！
  */
 
-package com.elink.esua.epdc.modules.controller.feign.fallback;
+package com.elink.esua.epdc.feign.fallback;
 
 import com.elink.esua.epdc.common.token.dto.TokenDto;
 import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.modules.controller.feign.ResourceFeignClient;
+import com.elink.esua.epdc.feign.ResourceFeignClient;
 import org.springframework.stereotype.Component;
 
 /**
diff --git a/src/main/java/com/elink/esua/epdc/filter/AuthFilter.java b/src/main/java/com/elink/esua/epdc/filter/AuthFilter.java
index 76a97bc..864cf6f 100644
--- a/src/main/java/com/elink/esua/epdc/filter/AuthFilter.java
+++ b/src/main/java/com/elink/esua/epdc/filter/AuthFilter.java
@@ -9,7 +9,7 @@
 package com.elink.esua.epdc.filter;
 
 import com.alibaba.fastjson.JSON;
-import com.elink.esua.epdc.modules.controller.feign.ResourceFeignClient;
+import com.elink.esua.epdc.feign.ResourceFeignClient;
 import com.elink.esua.epdc.commons.tools.constant.Constant;
 import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
 import com.elink.esua.epdc.commons.tools.utils.Result;
diff --git a/src/main/java/com/elink/esua/epdc/filter/CpAuthGatewayFilterFactory.java b/src/main/java/com/elink/esua/epdc/filter/CpAuthGatewayFilterFactory.java
index 578f42e..dbfe131 100644
--- a/src/main/java/com/elink/esua/epdc/filter/CpAuthGatewayFilterFactory.java
+++ b/src/main/java/com/elink/esua/epdc/filter/CpAuthGatewayFilterFactory.java
@@ -5,7 +5,7 @@ import com.alibaba.fastjson.JSON;
 import com.elink.esua.epdc.common.token.dto.TokenDto;
 import com.elink.esua.epdc.commons.tools.constant.Constant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.modules.controller.feign.ResourceFeignClient;
+import com.elink.esua.epdc.feign.ResourceFeignClient;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.gateway.filter.GatewayFilter;
@@ -48,7 +48,7 @@ public class CpAuthGatewayFilterFactory extends AbstractGatewayFilterFactory<CpA
     }
 
     public CpAuthGatewayFilterFactory() {
-        super(CpAuthGatewayFilterFactory.CpAuthConfig.class);
+        super(CpAuthConfig.class);
     }
 
     @Override
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index f09605f..45a2bcc 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -162,12 +162,12 @@ spring:
             - Path=${server.servlet.context-path}/custom/**
           filters:
             - StripPrefix=1
-        #积分管理
-        - id: epdc-points-server
-          uri: @gateway.routes.epdc-points-server.uri@
+        #数据分析模块
+        - id: epdc-analysis-server
+          uri: @gateway.routes.epdc-analysis-server.uri@
           order: 18
           predicates:
-            - Path=${server.servlet.context-path}/points/**
+            - Path=${server.servlet.context-path}/analysis/**
           filters:
             - StripPrefix=1
     nacos:
@@ -222,14 +222,19 @@ renren:
     - /activiti/service/**
     - /activiti/editor-app/**
     - /message/sms/sendCode #发送验证码
+    - /heart/**
     - /oss/file/download
     - /ws/**
+    - /custom/epidemicSentryPost/downloadQRCode/**
   workLoginUrls:
     - /api/work/user/getToken #工作端-获取token
     - /api/work/user/login #工作端-登录
+    - /api/analysis/user/getToken #数据分析端-获取token
+    - /api/analysis/user/login #数据分析端-登录
     - /api/work/*/swagger/**
   workUrls:
     - /api/work/** #工作端接口
+    - /api/analysis/** #数据端接口
 
 
 epdc:
@@ -249,3 +254,4 @@ epdc:
     - /api/app-user/user/ma/gridLeaderRegister # 小程序用户 网格长注册
     - /api/app-user/user/ma/v2/getToken # 小程序用户 注册或登录(版本v2)
     - /api/work/** #工作端接口不拦截
+    - /api/analysis/** #数据端接口不拦截
diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml
index 96e2a17..7cd7516 100644
--- a/src/main/resources/logback-spring.xml
+++ b/src/main/resources/logback-spring.xml
@@ -144,10 +144,10 @@
 
     <!-- 生产环境 -->
     <springProfile name="prod">
-        <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">
+        <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">
             <appender-ref ref="CONSOLE"/>
             <appender-ref ref="DEBUG_FILE"/>
             <appender-ref ref="INFO_FILE"/>
@@ -156,4 +156,4 @@
         </root>
     </springProfile>
 
-</configuration>
+</configuration>
\ No newline at end of file