Jelajahi Sumber

Merge remote-tracking branch 'origin/master-v2' into master-v2

yumeng 4 tahun lalu
induk
melakukan
a8bff18dc2

+ 18 - 31
jeecg-boot-module-system/src/main/java/org/jeecg/JeecgApplication.java

@@ -1,12 +1,10 @@
 package org.jeecg;
 
 import cn.com.ctop.common.module.utils.SpringUtils;
-import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.catalina.Context;
 import org.apache.tomcat.util.scan.StandardJarScanner;
 import org.jeecg.common.constant.AccountReportConstants;
-import org.jeecg.modules.system.util.ExtMappingJackson2HttpMessageConverter;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory;
@@ -16,8 +14,8 @@ import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.springframework.core.env.Environment;
-import org.springframework.web.client.RestTemplate;
 import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 
@@ -46,32 +44,21 @@ public class JeecgApplication {
                 "----------------------------------------------------------");
     }
 
-//    @Bean
-//    RestTemplate restTemplate(){
-//        RestTemplate restTemplate = new RestTemplate();
-//        restTemplate.getMessageConverters().add(new ExtMappingJackson2HttpMessageConverter());
-//        return restTemplate;
-//    }
-
-//    @Bean
-//    public PaginationInterceptor paginationInterceptor() {
-//        return new PaginationInterceptor();
-//    }
-//    //加载数据字典
-//    @Bean
-//    public void instanceFiledDic(){
-//        AccountReportConstants.getInstance().init();
-//    }
-//    /**
-//     * tomcat-embed-jasper引用后提示jar找不到的问题
-//     */
-//    @Bean
-//    public TomcatServletWebServerFactory tomcatFactory() {
-//        return new TomcatServletWebServerFactory() {
-//            @Override
-//            protected void postProcessContext(Context context) {
-//                ((StandardJarScanner) context.getJarScanner()).setScanManifest(false);
-//            }
-//        };
-//    }
+    //加载数据字典
+    @Bean
+    public void instanceFiledDic(){
+        AccountReportConstants.getInstance().init();
+    }
+    /**
+     * tomcat-embed-jasper引用后提示jar找不到的问题
+     */
+    @Bean
+    public TomcatServletWebServerFactory tomcatFactory() {
+        return new TomcatServletWebServerFactory() {
+            @Override
+            protected void postProcessContext(Context context) {
+                ((StandardJarScanner) context.getJarScanner()).setScanManifest(false);
+            }
+        };
+    }
 }