JimuReport和JimuBI大屏，升级到1.9.3版本

jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/JeecgSystemApplication.java

@@ -11,14 +11,14 @@ import org.springframework.core.env.Environment;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
 * 单体启动类
-* 报错提醒: 未集成mongo报错，可以打开启动类上面的注释 exclude={MongoAutoConfiguration.class}
 */
 @Slf4j
 @SpringBootApplication
-//@EnableAutoConfiguration(exclude={MongoAutoConfiguration.class})
 public class JeecgSystemApplication extends SpringBootServletInitializer {
 
     @Override
@@ -27,7 +27,13 @@ public class JeecgSystemApplication extends SpringBootServletInitializer {
     }
 
     public static void main(String[] args) throws UnknownHostException {
-        ConfigurableApplicationContext application = SpringApplication.run(JeecgSystemApplication.class, args);
+        SpringApplication app = new SpringApplication(JeecgSystemApplication.class);
+        Map<String, Object> defaultProperties = new HashMap<>();
+        defaultProperties.put("management.health.elasticsearch.enabled", false);
+        app.setDefaultProperties(defaultProperties);
+        log.info("[JEECG] Elasticsearch Health Check Enabled: false" );
+        
+        ConfigurableApplicationContext application = app.run(args);;
         Environment env = application.getEnvironment();
         String ip = InetAddress.getLocalHost().getHostAddress();
         String port = env.getProperty("server.port");

jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoAutoConfiguration.java

@@ -0,0 +1,61 @@
+//
+// Source code recreated from a .class file by IntelliJ IDEA
+// (powered by Fernflower decompiler)
+//
+
+package org.springframework.boot.autoconfigure.mongo;
+
+import com.mongodb.MongoClientSettings;
+import com.mongodb.client.MongoClient;
+import java.util.List;
+import java.util.stream.Collectors;
+import org.springframework.beans.factory.ObjectProvider;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.autoconfigure.mongo.MongoClientSettingsBuilderCustomizer;
+import org.springframework.boot.autoconfigure.mongo.MongoProperties;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+import org.springframework.core.env.Environment;
+
+@Primary
+@AutoConfiguration
+@ConditionalOnClass({MongoClient.class})
+@ConditionalOnProperty(name = "spring.data.mongodb.uri", havingValue = "", matchIfMissing = false)
+@EnableConfigurationProperties({MongoProperties.class})
+@ConditionalOnMissingBean(
+    type = {"org.springframework.data.mongodb.MongoDatabaseFactory"}
+)
+public class MongoAutoConfiguration {
+    public MongoAutoConfiguration() {
+    }
+
+    @Bean
+    @ConditionalOnMissingBean({MongoClient.class})
+    public MongoClient mongo(ObjectProvider<MongoClientSettingsBuilderCustomizer> builderCustomizers, MongoClientSettings settings) {
+        return (MongoClient)(new MongoClientFactory((List)builderCustomizers.orderedStream().collect(Collectors.toList()))).createMongoClient(settings);
+    }
+
+    @Configuration(
+        proxyBeanMethods = false
+    )
+    @ConditionalOnMissingBean({MongoClientSettings.class})
+    static class MongoClientSettingsConfiguration {
+        MongoClientSettingsConfiguration() {
+        }
+
+        @Bean
+        MongoClientSettings mongoClientSettings() {
+            return MongoClientSettings.builder().build();
+        }
+
+        @Bean
+        MongoPropertiesClientSettingsBuilderCustomizer mongoPropertiesCustomizer(MongoProperties properties, Environment environment) {
+            return new MongoPropertiesClientSettingsBuilderCustomizer(properties, environment);
+        }
+    }
+}

jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/flyway/sql/mysql/V3.7.22__jimureport_upgrade1.9.3.sql

@@ -0,0 +1,3 @@
+-- 升级积木BI到最新版
+UPDATE onl_drag_comp SET status='0' WHERE parent_id = '0';
+update onl_drag_page set type =0 where iz_template = '1';