解决一些类的变更

mooctest-site-server/pom.xml

@@ -387,7 +387,16 @@
             <version>1.6.5</version>
             <scope>test</scope>
         </dependency>
-
+        <dependency>
+            <groupId>org.json</groupId>
+            <artifactId>json</artifactId>
+            <version>20160810</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.interceptor</groupId>
+            <artifactId>javax.interceptor-api</artifactId>
+            <version>1.2.2</version>
+        </dependency>
 
     </dependencies>
 

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/Application.java

@@ -1,9 +1,9 @@
 package cn.iselab.mooctest.site;
 
 import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.MessageSourceAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.batch.BatchAutoConfiguration;
+import org.springframework.boot.autoconfigure.context.MessageSourceAutoConfiguration;
 import org.springframework.boot.autoconfigure.dao.PersistenceExceptionTranslationAutoConfiguration;
 import org.springframework.boot.autoconfigure.data.elasticsearch.ElasticsearchRepositoriesAutoConfiguration;
 import org.springframework.boot.autoconfigure.data.mongo.MongoRepositoriesAutoConfiguration;
@@ -21,26 +21,14 @@ import org.springframework.boot.autoconfigure.jersey.JerseyAutoConfiguration;
 import org.springframework.boot.autoconfigure.jms.JmsAutoConfiguration;
 import org.springframework.boot.autoconfigure.jms.JndiConnectionFactoryAutoConfiguration;
 import org.springframework.boot.autoconfigure.jms.activemq.ActiveMQAutoConfiguration;
-import org.springframework.boot.autoconfigure.jms.hornetq.HornetQAutoConfiguration;
 import org.springframework.boot.autoconfigure.jmx.JmxAutoConfiguration;
 import org.springframework.boot.autoconfigure.liquibase.LiquibaseAutoConfiguration;
 import org.springframework.boot.autoconfigure.mail.MailSenderAutoConfiguration;
-import org.springframework.boot.autoconfigure.mobile.DeviceDelegatingViewResolverAutoConfiguration;
-import org.springframework.boot.autoconfigure.mobile.DeviceResolverAutoConfiguration;
-import org.springframework.boot.autoconfigure.mobile.SitePreferenceAutoConfiguration;
 import org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration;
 import org.springframework.boot.autoconfigure.mustache.MustacheAutoConfiguration;
-import org.springframework.boot.autoconfigure.reactor.ReactorAutoConfiguration;
-import org.springframework.boot.autoconfigure.security.FallbackWebSecurityAutoConfiguration;
-import org.springframework.boot.autoconfigure.security.SecurityAutoConfiguration;
-import org.springframework.boot.autoconfigure.social.FacebookAutoConfiguration;
-import org.springframework.boot.autoconfigure.social.LinkedInAutoConfiguration;
-import org.springframework.boot.autoconfigure.social.SocialWebAutoConfiguration;
-import org.springframework.boot.autoconfigure.social.TwitterAutoConfiguration;
+import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
 import org.springframework.boot.autoconfigure.solr.SolrAutoConfiguration;
 import org.springframework.boot.autoconfigure.thymeleaf.ThymeleafAutoConfiguration;
-import org.springframework.boot.autoconfigure.velocity.VelocityAutoConfiguration;
-import org.springframework.boot.autoconfigure.websocket.WebSocketAutoConfiguration;
 import org.springframework.boot.web.servlet.ServletComponentScan;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.scheduling.annotation.EnableAsync;
@@ -52,16 +40,11 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 @SpringBootApplication(exclude = {
         ActiveMQAutoConfiguration.class,
         BatchAutoConfiguration.class,
-        DeviceDelegatingViewResolverAutoConfiguration.class,
-        DeviceResolverAutoConfiguration.class,
         ElasticsearchRepositoriesAutoConfiguration.class,
-        FacebookAutoConfiguration.class,
-        FallbackWebSecurityAutoConfiguration.class,
         FlywayAutoConfiguration.class,
         FreeMarkerAutoConfiguration.class,
         GroovyTemplateAutoConfiguration.class,
         GsonAutoConfiguration.class,
-        HornetQAutoConfiguration.class,
         HypermediaAutoConfiguration.class,
         IntegrationAutoConfiguration.class,
         JerseyAutoConfiguration.class,
@@ -69,7 +52,6 @@ import org.springframework.scheduling.annotation.EnableScheduling;
         JmxAutoConfiguration.class,
         JndiConnectionFactoryAutoConfiguration.class,
         JndiDataSourceAutoConfiguration.class,
-        LinkedInAutoConfiguration.class,
         LiquibaseAutoConfiguration.class,
         MailSenderAutoConfiguration.class,
         MessageSourceAutoConfiguration.class,
@@ -77,17 +59,11 @@ import org.springframework.scheduling.annotation.EnableScheduling;
         MongoRepositoriesAutoConfiguration.class,
         MustacheAutoConfiguration.class,
         PersistenceExceptionTranslationAutoConfiguration.class,
-        ReactorAutoConfiguration.class,
         RepositoryRestMvcAutoConfiguration.class,
         SecurityAutoConfiguration.class,
-        SitePreferenceAutoConfiguration.class,
-        SocialWebAutoConfiguration.class,
         SolrAutoConfiguration.class,
         SolrRepositoriesAutoConfiguration.class,
         ThymeleafAutoConfiguration.class,
-        TwitterAutoConfiguration.class,
-        VelocityAutoConfiguration.class,
-        WebSocketAutoConfiguration.class,
         XADataSourceAutoConfiguration.class
 })
 @ServletComponentScan
@@ -98,7 +74,6 @@ public class Application {
     public static void main(String[] args) {
         SpringApplication application = new SpringApplication(Application.class);
         // To disabled web environment, change `true` to `false`
-        application.setWebEnvironment(true);
         application.run(args);
     }
 }

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/configure/FileUploadConfiguration.java

@@ -1,8 +1,9 @@
 package cn.iselab.mooctest.site.configure;
 
-import org.springframework.boot.context.embedded.MultipartConfigFactory;
+import org.springframework.boot.web.servlet.MultipartConfigFactory;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.util.unit.DataSize;
 
 import javax.servlet.MultipartConfigElement;
 
@@ -19,9 +20,9 @@ public class FileUploadConfiguration {
     public MultipartConfigElement multipartConfigElement() {
         MultipartConfigFactory factory = new MultipartConfigFactory();
         //单个文件最大
-        factory.setMaxFileSize("100MB"); //KB,MB
+        factory.setMaxFileSize(DataSize.ofMegabytes(100)); //KB,MB
         /// 设置总上传数据总大小
-        factory.setMaxRequestSize("500MB");
+        factory.setMaxRequestSize(DataSize.ofMegabytes(500));
         return factory.createMultipartConfig();
     }
 }

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/configure/RequestLoggerAutoConfiguration.java

@@ -5,8 +5,8 @@ import cn.iselab.mooctest.site.web.filter.RequestLoggingFilter;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
-import org.springframework.boot.context.embedded.FilterRegistrationBean;
 import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -24,9 +24,6 @@ public class RequestLoggerAutoConfiguration {
             name = {"requestLoger.enabled"},
             matchIfMissing = true
     )
-    @ConfigurationProperties(
-            prefix = "requestLogger"
-    )
     public RequestLogger requestLogger() {
         return new RequestLogger();
     }

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/logger/RequestLogger.java

@@ -5,7 +5,7 @@ import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.web.HttpEncodingProperties;
+import org.springframework.boot.autoconfigure.web.servlet.HttpEncodingAutoConfiguration;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -27,7 +27,7 @@ public class RequestLogger {
     private Set<String> ignoredAttributes = new HashSet();
     private Set<String> ignoredParameters = new HashSet();
     @Autowired
-    private HttpEncodingProperties httpEncodingProperties;
+    private HttpEncodingAutoConfiguration httpEncodingAutoConfiguration;
 
     public RequestLogger() {
     }
@@ -160,7 +160,8 @@ public class RequestLogger {
                 key = request.getParameter(paramName);
 
                 try {
-                    key = new String(key.getBytes(this.httpEncodingProperties.getCharset()), this.httpEncodingProperties.getCharset());
+                    key = new String(key.getBytes(this.httpEncodingAutoConfiguration.characterEncodingFilter().getEncoding()),
+                            this.httpEncodingAutoConfiguration.characterEncodingFilter().getEncoding());
                     append(builder, "", paramName, key, "");
                 } catch (Exception e) {
                     this.LOG.error("", e);