Sfoglia il codice sorgente

upgrade AppBootstrap

deason 6 anni fa
parent
commit
07eb568fb0

+ 10 - 3
examcloud-core-print-starter/src/main/java/cn/com/qmth/examcloud/core/print/PrintApplication.java

@@ -10,11 +10,12 @@ package cn.com.qmth.examcloud.core.print;
 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.bootstrap.AppBootstrap;
 import org.slf4j.MDC;
+import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
-import org.springframework.boot.web.support.SpringBootServletInitializer;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
 import org.springframework.context.annotation.ComponentScan;
@@ -44,8 +45,14 @@ public class PrintApplication extends SpringBootServletInitializer {
         if (LOG instanceof SLF4JImpl) {
             MDC.put("TRACE_ID", Thread.currentThread().getName());
         }
+
+        String runtimeLevel = System.getProperty("log.commonLevel");
+        if (null == runtimeLevel) {
+            System.setProperty("log.commonLevel", "DEBUG");
+        }
+
         //SpringApplication.run(PrintApplication.class, args);
-        ExamCloudApp.run(PrintApplication.class, "print", args);
+        AppBootstrap.run(PrintApplication.class, args);
     }
 
     //@Bean(name = "multipartResolver")

+ 1 - 1
examcloud-core-print-starter/src/main/java/cn/com/qmth/examcloud/core/print/config/InterceptorConfig.java

@@ -43,7 +43,7 @@ public class InterceptorConfig extends WebMvcConfigurerAdapter {
         registry.addInterceptor(new FirstInterceptor()).addPathPatterns("/**");
         SpringCloudInterceptor springCloudInterceptor = new SpringCloudInterceptor();
         registry.addInterceptor(springCloudInterceptor).addPathPatterns("/**");
-        springCloudInterceptor.setRedisClient(redisClient);
+        //springCloudInterceptor.setRedisClient(redisClient);todo
 
         RequestPermissionInterceptor requestPermissionInterceptor = getRequestPermissionInterceptor();
         requestPermissionInterceptor.configure("security-exclusions.conf");

+ 5 - 8
examcloud-core-print-starter/src/main/java/cn/com/qmth/examcloud/core/print/config/RedisConfig.java

@@ -7,13 +7,10 @@
 
 package cn.com.qmth.examcloud.core.print.config;
 
-import cn.com.qmth.examcloud.web.redis.RedisClient;
-import cn.com.qmth.examcloud.web.redis.RedisClientImpl;
 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.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.client.loadbalancer.LoadBalanced;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -30,21 +27,21 @@ import org.springframework.web.client.RestTemplate;
 @Configuration
 public class RedisConfig {
 
-    @Bean
-    @LoadBalanced
+    //@Bean
+    //@LoadBalanced
     public RestTemplate restTemplate() {
         RestTemplate restTemplate = new RestTemplate();
         restTemplate.setErrorHandler(new CustomResponseErrorHandler());
         return restTemplate;
     }
 
-    @Bean
+    /*@Bean
     @Autowired
     public RedisClient redisClient(RedisTemplate<String, Object> redisTemplate) {
         return new RedisClientImpl(redisTemplate);
-    }
+    }*/
 
-    @Bean
+    //@Bean
     public RedisTemplate<String, Object> redisTemplate(RedisConnectionFactory redisConnectionFactory) {
         RedisTemplate<String, Object> redisTemplate = new RedisTemplate<>();
         redisTemplate.setConnectionFactory(redisConnectionFactory);