upgrade AppBootstrap

examcloud-core-questions-starter/pom.xml

@@ -80,6 +80,22 @@
                     </execution>
                 </executions>
             </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                    <skipTests>true</skipTests>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 

examcloud-core-questions-starter/src/main/java/cn/com/qmth/examcloud/core/questions/starter/Application.java

@@ -3,23 +3,18 @@ package cn.com.qmth.examcloud.core.questions.starter;
 import cn.com.qmth.examcloud.commons.logging.ExamCloudLog;
 import cn.com.qmth.examcloud.commons.logging.ExamCloudLogFactory;
 import cn.com.qmth.examcloud.commons.logging.SLF4JImpl;
-import cn.com.qmth.examcloud.web.boot.ExamCloudApp;
-import cn.com.qmth.examcloud.web.redis.RedisClient;
-import cn.com.qmth.examcloud.core.questions.base.GridFSUtil;
-import cn.com.qmth.examcloud.web.redis.RedisClientImpl;
+import cn.com.qmth.examcloud.web.bootstrap.AppBootstrap;
 import cn.com.qmth.examcloud.web.support.CustomResponseErrorHandler;
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.PropertyAccessor;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.slf4j.MDC;
-import org.springframework.beans.factory.annotation.Autowired;
 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.boot.autoconfigure.web.servlet.MultipartAutoConfiguration;
 import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
-import org.springframework.cloud.netflix.feign.EnableFeignClients;
+import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
@@ -35,10 +30,10 @@ import org.springframework.web.multipart.commons.CommonsMultipartResolver;
 /**
  * 项目入口主程序
  */
-@ComponentScan(basePackages = {"com.qmth.commons", "cn.com.qmth"})
+@ComponentScan(basePackages = {"cn.com.qmth"})
 @EntityScan(basePackages = {"com.qmth.commons", "cn.com.qmth"})
-//@EnableJpaRepositories(basePackages = { "com.qmth.commons", "cn.com.qmth" }, repositoryBaseClass = BaseQueryDaoImpl.class)
-@EnableJpaRepositories(basePackages = {"com.qmth.commons", "cn.com.qmth"})
+//@EnableJpaRepositories(basePackages = {"cn.com.qmth"}, repositoryBaseClass = BaseQueryDaoImpl.class)
+@EnableJpaRepositories(basePackages = {"cn.com.qmth"})
 @EnableMongoRepositories("cn.com.qmth.examcloud.core.questions.dao")
 @SpringBootApplication
 @EnableEurekaClient
@@ -46,8 +41,6 @@ import org.springframework.web.multipart.commons.CommonsMultipartResolver;
 @EnableAutoConfiguration(exclude = {MultipartAutoConfiguration.class})
 public class Application {
     private static final ExamCloudLog LOG = ExamCloudLogFactory.getLog(Application.class);
-    @Autowired
-    private GridFSUtil gridFSUtil;
 
     public static void main(String[] args) {
         if (LOG instanceof SLF4JImpl) {
@@ -55,18 +48,18 @@ public class Application {
         }
 
         //SpringApplication.run(Application.class, args);
-        ExamCloudApp.run(Application.class, "questions", args);
+        AppBootstrap.run(Application.class, args);
     }
 
-    @Bean
-    @LoadBalanced
+    //@Bean
+    //@LoadBalanced
     public RestTemplate restTemplate() {
         RestTemplate restTemplate = new RestTemplate();
         restTemplate.setErrorHandler(new CustomResponseErrorHandler());
         return restTemplate;
     }
 
-    @Bean
+    //@Bean
     public RedisTemplate<String, Object> redisTemplate(RedisConnectionFactory redisConnectionFactory) {
         RedisTemplate<String, Object> redisTemplate = new RedisTemplate<>();
         redisTemplate.setConnectionFactory(redisConnectionFactory);
@@ -81,11 +74,11 @@ public class Application {
         return redisTemplate;
     }
 
-    @Bean
+    /*@Bean
     @Autowired
     public RedisClient redisClient(RedisTemplate<String, Object> redisTemplate) {
         return new RedisClientImpl(redisTemplate);
-    }
+    }*/
 
     @Bean(name = "multipartResolver")
     public MultipartResolver multipartResolver() {

examcloud-core-questions-starter/src/main/java/cn/com/qmth/examcloud/core/questions/starter/config/AppSelfInspection.java

@@ -1,38 +0,0 @@
-package cn.com.qmth.examcloud.core.questions.starter.config;
-
-import cn.com.qmth.examcloud.web.support.RemoteProcedureCallTester;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.ApplicationArguments;
-import org.springframework.boot.ApplicationRunner;
-import org.springframework.core.annotation.Order;
-import org.springframework.stereotype.Component;
-
-/**
- * 应用自检
- *
- * @author WANGWEI
- * @date 2018年6月21日
- * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
- */
-@Component
-@Order(1)
-public class AppSelfInspection implements ApplicationRunner {
-
-	@Autowired
-	private RemoteProcedureCallTester remoteCallTester;
-
-	/**
-	 * 自检
-	 *
-	 * @author WANGWEI
-	 */
-	private void inspect() {
-		remoteCallTester.testRestTemplate("EC-CORE-BASIC", "EC-CORE-EXAMWORK");
-	}
-
-	@Override
-	public void run(ApplicationArguments args) throws Exception {
-		inspect();
-	}
-
-}

examcloud-core-questions-starter/src/main/java/cn/com/qmth/examcloud/core/questions/starter/config/DefaultWebMvcConfigurerAdapter.java

@@ -49,7 +49,6 @@ public class DefaultWebMvcConfigurerAdapter extends WebMvcConfigurerAdapter {
 		registry.addInterceptor(new FirstInterceptor()).addPathPatterns("/**");
 
 		SpringCloudInterceptor springCloudInterceptor = new SpringCloudInterceptor();
-		springCloudInterceptor.setRedisClient(redisClient);
 		registry.addInterceptor(springCloudInterceptor).addPathPatterns("/**");
 
 		RequestPermissionInterceptor requestPermissionInterceptor = getRequestPermissionInterceptor();