Merge branch 'Task-842_remove_hard_code' of wy/zdqy_ibps into matser

build/dev-jenkins-8081.properties

@@ -1,7 +1,7 @@
-maven.profile=ibps-8081
+maven.profile=jyxt-nexus
 ##maven\u6839\u76ee\u5f55
-maven.home=/usr/local/maven3
+maven.home=/usr/share/maven
 ##maven\u4ed3\u5e93\u5730\u5740
-maven.repo=/opt/jenkins/Repository
+maven.repo=/root/.m2/repository
 ##maven\u4f7f\u7528\u7684settings.xml\u6587\u4ef6
-maven.settings=/opt/jenkins/settings.xml
+maven.settings=/root/.m2/settings.xml

ibps-basic-root/modules/basic-response/src/main/java/com/lc/ibps/cloud/Listener/LoggingListener.java

@@ -0,0 +1,71 @@
+package com.lc.ibps.cloud.Listener;
+
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.boot.context.event.ApplicationPreparedEvent;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationListener;
+import org.springframework.core.env.AbstractEnvironment;
+import org.springframework.core.env.EnumerablePropertySource;
+import org.springframework.core.env.Environment;
+import org.springframework.core.env.MutablePropertySources;
+import org.springframework.core.env.PropertySource;
+import org.springframework.stereotype.Component;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.StreamSupport;
+
+@Component
+public class LoggingListener implements ApplicationListener<ApplicationPreparedEvent> {
+    private final List<String> SENSITIVE_PROPERTIES = Arrays.asList("password", "credential", "token");
+    private static Logger log = LoggerFactory.getLogger(LoggingListener.class);
+    @Override
+    public void onApplicationEvent(final ApplicationPreparedEvent event) {
+        logProperties(event.getApplicationContext());
+    }
+
+    public void logProperties(ApplicationContext applicationContext) {
+        final Environment env = applicationContext.getEnvironment();
+        StringBuilder stringBuilder = new StringBuilder();
+        stringBuilder.append("\n====== Log all properties ======\n")
+                .append("Active profiles: ")
+                .append(Arrays.toString(env.getActiveProfiles()))
+                .append("\n");
+
+        if (env instanceof AbstractEnvironment) {
+            final MutablePropertySources sources = ((AbstractEnvironment) env).getPropertySources();
+            StreamSupport.stream(sources.spliterator(), false)
+                    .filter(ps -> ps instanceof EnumerablePropertySource)
+                    .map(this::castToEnumerablePropertySource)
+                    .map(EnumerablePropertySource::getPropertyNames)
+                    .flatMap(Arrays::stream)
+                    .forEach(prop -> appendProperty(env, prop, stringBuilder));
+        } else {
+            stringBuilder.append("Unable to read properties");
+        }
+        log.error(stringBuilder.toString());
+    }
+
+    private EnumerablePropertySource<?> castToEnumerablePropertySource(final PropertySource<?> propertySource) {
+        return (EnumerablePropertySource<?>) propertySource;
+    }
+
+    private void appendProperty(final Environment env, final String prop, final StringBuilder stringBuilder) {
+        boolean isASensitiveProperty = SENSITIVE_PROPERTIES.stream()
+                .anyMatch(prop::contains);
+        try {
+            final String value;
+            if (isASensitiveProperty) {
+                value = StringUtils.abbreviate(env.getProperty(prop), 4);
+            } else {
+                value = env.getProperty(prop);
+            }
+            stringBuilder.append(String.format("%s: %s\n", prop, value));
+        } catch (Exception ex) {
+            stringBuilder.append(String.format("%s: %s\n", prop, ex.getMessage()));
+        }
+
+    }
+}

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
   #-默认登录用户密码

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);

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);