Bläddra i källkod

[task-842] 关闭zuul校验token 功能,去除ip相关代码

Li Yuan 2 år sedan
förälder
incheckning
24ebb7a469

+ 1 - 0
ibps-basic-root/modules/basic-response/src/main/resources/config/application-dev-base.yml

@@ -115,6 +115,7 @@ authorization:
     enable: ${AUTHORIZATION_ENABLE:true}
     log-api-invoke:
       enable: false
+    access-token-filter-enable: false
   #-默认登录用户
   #default-username: admin
   #-默认登录用户密码

+ 1 - 27
ibps-basis-root/modules/basis-zuul/src/main/java/com/lc/ibps/cloud/gateway/filter/AccessTokenFilter.java

@@ -46,28 +46,8 @@ public class AccessTokenFilter extends ZuulFilter {
 	@Override
 	public Object run() {
 		RequestContext ctx = RequestContext.getCurrentContext();
-
-
 		HttpServletRequest request = ctx.getRequest();
 
-
-		//如果是润乾服务器签章报表调用则直接返回true
-		if (
-				"172.18.157.44".equals(RequestUtil.getIpAddr(request))||
-						"localhost".equals(RequestUtil.getIpAddr(request))||
-						"120.77.249.241".equals(RequestUtil.getIpAddr(request))
-						//||
-						//"120.77.249.241".equals(RequestUtil.getIpAddr(request))
-		){
-			ctx.setSendZuulResponse(true);
-			ctx.setResponseStatusCode(200);
-			ctx.set("isSuccess", true);
-			return null;
-		}
-		System.out.println("--------------------------------------");
-		System.out.println("ip:"+RequestUtil.getIpAddr(request));
-		System.out.println("--------------------------------------");
-
 		if(logger.isDebugEnabled()){
 			//logger.debug(localeMessageSource.getMessage("access.token.filter.run.msg"));
 			logger.debug("Running AccessTokenFilter.");
@@ -88,13 +68,7 @@ public class AccessTokenFilter extends ZuulFilter {
 
 		if(!authorizationConfig.isEnable()
 				|| !authorizationConfig.isAccessTokenFilterEnable() 
-				|| authorizationConfig.isIgnoreUrl(uri)
-				||"120.77.249.241".equals(RequestUtil.getIpAddr(request))||
-		"localhost".equals(RequestUtil.getIpAddr(request))||
-				"172.18.157.44".equals(RequestUtil.getIpAddr(request))
-//				||
-//				"120.77.249.241".equals(RequestUtil.getIpAddr(request))
-				) {
+				|| authorizationConfig.isIgnoreUrl(uri)) {
 			ctx.setSendZuulResponse(true);
 			ctx.setResponseStatusCode(200);
 			ctx.set("isSuccess", true);

+ 0 - 14
ibps-oauth-root/modules/oauth-client2/src/main/java/com/lc/ibps/cloud/oauth/client/filter/AccessTokenValidatorFilter.java

@@ -57,20 +57,6 @@ public class AccessTokenValidatorFilter extends AbstractFilter implements Ordere
 		httpRequest.setCharacterEncoding(StringPool.UTF_8);
 		httpResponse.setCharacterEncoding(StringPool.UTF_8);
 		String uri = httpRequest.getRequestURI();
-		if (
-				"172.18.157.44".equals(RequestUtil.getIpAddr(httpRequest))||
-		"localhost".equals(RequestUtil.getIpAddr(httpRequest))||
-				"172.18.157.46".equals(RequestUtil.getIpAddr(httpRequest))
-//						||
-//		"120.77.249.241".equals(RequestUtil.getIpAddr(httpRequest))
-		){
-			logger.trace("requestURI {} is ignore.", uri);
-			System.out.println(getClass().getPackage()+"特定ip放行");
-			chain.doFilter(request, response);
-			return ;
-		}
-
-
 		// 地址忽略
 		if(!authorizationConfig.isValidatorFilterEnable() || authorizationConfig.isIgnoreUrl(uri)){
 			logger.trace("requestURI {} is ignore.", uri);