Commit ddb46ff0 by “zcwang”

modify: 排除日志依赖冲突

parent bccdfdbd
...@@ -238,6 +238,12 @@ ...@@ -238,6 +238,12 @@
<groupId>com.netease.mail</groupId> <groupId>com.netease.mail</groupId>
<artifactId>yx-openid-login</artifactId> <artifactId>yx-openid-login</artifactId>
<version>1.0.1-SNAPSHOT</version> <version>1.0.1-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<!--其他严选中间件依赖包按需添加--> <!--其他严选中间件依赖包按需添加-->
...@@ -365,6 +371,12 @@ ...@@ -365,6 +371,12 @@
<groupId>com.netease.yanxuan.flowx</groupId> <groupId>com.netease.yanxuan.flowx</groupId>
<artifactId>yanxuan-flowx-sdk</artifactId> <artifactId>yanxuan-flowx-sdk</artifactId>
<version>1.3</version> <version>1.3</version>
<exclusions>
<exclusion>
<artifactId>logback-classic</artifactId>
<groupId>ch.qos.logback</groupId>
</exclusion>
</exclusions>
</dependency> </dependency>
</dependencies> </dependencies>
......
package com.netease.mail.yanxuan.change.web.config; package com.netease.mail.yanxuan.change.web.config;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
...@@ -11,8 +10,8 @@ import org.springframework.web.servlet.ModelAndView; ...@@ -11,8 +10,8 @@ import org.springframework.web.servlet.ModelAndView;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.netease.mail.yanxuan.change.common.bean.AjaxResult; import com.netease.mail.yanxuan.change.common.bean.AjaxResult;
import com.netease.mail.yanxuan.change.common.bean.ResponseCodeEnum;
import com.netease.mail.yanxuan.change.common.bean.RequestLocalBean; import com.netease.mail.yanxuan.change.common.bean.RequestLocalBean;
import com.netease.mail.yanxuan.change.common.bean.ResponseCodeEnum;
import com.netease.mail.yanxuan.change.common.util.ResponseUtil; import com.netease.mail.yanxuan.change.common.util.ResponseUtil;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
...@@ -27,8 +26,8 @@ import lombok.extern.slf4j.Slf4j; ...@@ -27,8 +26,8 @@ import lombok.extern.slf4j.Slf4j;
public class LoginInterceptor implements HandlerInterceptor { public class LoginInterceptor implements HandlerInterceptor {
@Override @Override
public boolean preHandle(HttpServletRequest request, HttpServletResponse response, public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler)
Object handler) throws Exception { throws Exception {
String yxUid = RequestLocalBean.getUid(); String yxUid = RequestLocalBean.getUid();
if (yxUid == null) { if (yxUid == null) {
String text = JSON.toJSONString(AjaxResult.of(ResponseCodeEnum.SC_UNAUTHORIZED.getCode(), "not-login")); String text = JSON.toJSONString(AjaxResult.of(ResponseCodeEnum.SC_UNAUTHORIZED.getCode(), "not-login"));
...@@ -49,8 +48,8 @@ public class LoginInterceptor implements HandlerInterceptor { ...@@ -49,8 +48,8 @@ public class LoginInterceptor implements HandlerInterceptor {
} }
@Override @Override
public void afterCompletion(HttpServletRequest request, HttpServletResponse response, public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex)
Object handler, Exception ex) throws Exception { throws Exception {
log.info("afterCompletion"); log.info("afterCompletion");
} }
} }
...@@ -25,7 +25,6 @@ import lombok.extern.slf4j.Slf4j; ...@@ -25,7 +25,6 @@ import lombok.extern.slf4j.Slf4j;
@Slf4j @Slf4j
public class UserInterceptor implements HandlerInterceptor { public class UserInterceptor implements HandlerInterceptor {
@Value("${product:product}") @Value("${product:product}")
String product; String product;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment