wangwei 7 роки тому
батько
коміт
b42f2dc217

+ 1 - 2
examcloud-task-api-provider/src/main/java/cn/com/qmth/examcloud/task/api/controller/ExamStudentImportController.java

@@ -104,8 +104,7 @@ public class ExamStudentImportController extends ControllerSupport {
 	public Page<ExamStudentImportEntity> getExamStudentImportList(@PathVariable Integer curPage,
 			@PathVariable Integer pageSize) {
 
-		Pageable pageable = new PageRequest(curPage - 1, pageSize, Sort.Direction.DESC,
-				"updateTime");
+		Pageable pageable = new PageRequest(curPage, pageSize, Sort.Direction.DESC, "updateTime");
 		Page<ExamStudentImportEntity> list = examStudentImportRepo.findAll(pageable);
 
 		return list;

+ 15 - 3
examcloud-task-starter/src/main/java/cn/com/qmth/examcloud/task/starter/TaskApp.java

@@ -6,6 +6,7 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
+import org.springframework.boot.autoconfigure.web.MultipartAutoConfiguration;
 import org.springframework.cloud.client.loadbalancer.LoadBalanced;
 import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
 import org.springframework.context.annotation.Bean;
@@ -18,6 +19,8 @@ import org.springframework.data.redis.serializer.StringRedisSerializer;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.quartz.SchedulerFactoryBean;
 import org.springframework.web.client.RestTemplate;
+import org.springframework.web.multipart.MultipartResolver;
+import org.springframework.web.multipart.commons.CommonsMultipartResolver;
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.PropertyAccessor;
@@ -38,7 +41,7 @@ import cn.com.qmth.examcloud.task.starter.config.JobsStartup;
 @EnableJpaAuditing
 @EnableEurekaClient
 @EnableScheduling
-@EnableAutoConfiguration
+@EnableAutoConfiguration(exclude = {MultipartAutoConfiguration.class})
 public class TaskApp {
 
 	private static final ExamCloudLog LOG = ExamCloudLogFactory.getLog(TaskApp.class);
@@ -51,8 +54,7 @@ public class TaskApp {
 		SpringApplication application = new SpringApplication(TaskApp.class);
 		application.run(args);
 
-		JobsStartup jobsStartup = SpringContextHolder
-				.getBean(JobsStartup.class);
+		JobsStartup jobsStartup = SpringContextHolder.getBean(JobsStartup.class);
 		jobsStartup.start();
 	}
 
@@ -92,4 +94,14 @@ public class TaskApp {
 		return new SchedulerFactoryBean();
 	}
 
+	@Bean(name = "multipartResolver")
+	public MultipartResolver multipartResolver() {
+		CommonsMultipartResolver resolver = new CommonsMultipartResolver();
+		resolver.setDefaultEncoding("UTF-8");
+		resolver.setResolveLazily(true);
+		resolver.setMaxInMemorySize(2);
+		resolver.setMaxUploadSize(200 * 1024 * 1024);
+		return resolver;
+	}
+
 }

+ 0 - 3
examcloud-task-starter/src/main/resources/application.properties

@@ -8,9 +8,6 @@ $rmp.cloud.task=/api/cloud/task/
 spring.datasource.validation-query=SELECT 1 FROM DUAL
 spring.datasource.test-on-borrow=true
 
-spring.http.multipart.max-file-size=50Mb
-spring.http.multipart.max-request-size=50Mb
-
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
 spring.jackson.time-zone=GMT+8