Merge branch 'dev'

王言钊
2 parents 8bea6e86 7275c1fc
Showing 2 changed files with 28 additions and 2 deletions
src/main/java/com/cnlive/shenhe/ShenheApplication.java
src/main/resources/application.properties
 package com.cnlive.shenhe;
+import org.apache.catalina.connector.Connector;
 import org.jasig.cas.client.authentication.AuthenticationFilter;
 import org.jasig.cas.client.session.SingleSignOutFilter;
 import org.jasig.cas.client.util.AssertionThreadLocalFilter;
@@ -11,7 +12,10 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.ApplicationRunner;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.web.embedded.tomcat.TomcatConnectorCustomizer;
+import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
+import org.springframework.boot.web.servlet.server.ConfigurableServletWebServerFactory;
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -51,6 +55,26 @@ public class ShenheApplication extends SpringBootServletInitializer {
     @Value("${SERVICE_LOGINOUT}")
     private String SERVICE_LOGINOUT;
+
+    /**
+     * 解决异常信息：
+     *  java.lang.IllegalArgumentException:
+     *      Invalid character found in the request target. The valid characters are defined in RFC 7230 and RFC 3986
+     * @return
+     */
+    @Bean
+    public ConfigurableServletWebServerFactory webServerFactory() {
+        TomcatServletWebServerFactory factory = new TomcatServletWebServerFactory();
+        factory.addConnectorCustomizers(new TomcatConnectorCustomizer() {
+            @Override
+            public void customize(Connector connector) {
+                connector.setProperty("relaxedQueryChars", "|{}[]/`\\<>");
+                connector.setProperty("relaxedPathChars", "|{}[]/`\\<>");
+            }
+        });
+        return factory;
+    }
+
     public static void main(String[] args) {
         SpringApplicationBuilder builder = new SpringApplicationBuilder(ShenheApplication.class);
         builder.headless(true).run(args);
@@ -6,8 +6,10 @@ spring.thymeleaf.encoding=UTF-8
 spring.thymeleaf.servlet.content-type=text/html
 spring.thymeleaf.cache=false
-server.tomcat.max-http-post-size=-1
-server.max-http-header-size=10240
+# \u5F02\u5E38\u4E00\uFF1AInvalid character found in method name. HTTP method names must be token
+#\u539F\u56E0\uFF1A \u4EA7\u751F\u8FD9\u4E2A\u95EE\u9898\u7684\u539F\u56E0\u662F\u9875\u9762\u8868\u5355\u63D0\u4EA4\u4E86\u5927\u91CF\u7684\u6570\u636E\uFF0C\u800C\u8FD9\u4E9B\u6570\u636E\u91CF\u53EF\u80FD\u8D85\u8FC7\u4E86Tomcat \u5B9A\u4E49\u7684Header\u5934\u5185\u5BB9\uFF0C\u53EA\u8981\u8BBE\u7F6E\u4E00\u4E0BTomcat\u7684maxHttpHeaderSize
+server.tomcat.max-http-post-size=10240000
+server.max-http-header-size=10240000
 server.tomcat.protocol_header=x-forwarded-proto
 server.use-forward-headers=true