Merge branch 'dev' of http://hzya.ufyct.com:9015/root/kangarooDataCenterV3 into dev

buildpackage/src/main/resources/application.yml

@@ -122,3 +122,5 @@ jeecg :
     minio_name: ??
     minio_pass: ??
     bucketName: ??
+data:
+  use: true

common/src/main/java/com/hzya/frame/datasource/DataSourceUtilProperties.java

@@ -12,7 +12,7 @@ public class DataSourceUtilProperties {
     public static final String MYSQLDRIVER_6 = "com.mysql.jdbc.Driver"; // mysql数据库的驱动类
     public static final String MYSQLDRIVER = "com.mysql.jdbc.Driver"; // mysql数据库的驱动类
     public static final String ORACLEDRIVER = "oracle.jdbc.OracleDriver"; // oracles数据库的驱动类
-    public static final String SQL2005DRIVER = "net.sourceforge.jtds.jdbc.Driver"; // sqlserver数据库的驱动类
+    public static final String SQL2005DRIVER = "com.microsoft.sqlserver.jdbc.SQLServerDriver"; // sqlserver数据库的驱动类
     public static final String SQL2000DRIVER = "net.sourceforge.jtds.jdbc.Driver"; // sqlserver数据库的驱动类
     public static final String dm = "dm.jdbc.driver.DmDriver"; // 达梦数据库的驱动类
 

pom.xml

@@ -275,6 +275,11 @@
             <version>${lombok.version}</version>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>com.microsoft.sqlserver</groupId>
+            <artifactId>mssql-jdbc</artifactId>
+            <version>6.4.0.jre8</version>
+        </dependency>
         <!--sqlserver-->
         <!--        <dependency>-->
         <!--            <groupId>com.microsoft.sqlserver</groupId>-->

webapp/src/main/java/com/hzya/frame/web/init/MyApplicationListener.java

@@ -10,6 +10,7 @@ import com.hzya.frame.sysnew.integtationTaskLiving.entity.IntegrationTaskLivingE
 import com.hzya.frame.web.quartz.QuartzJobFactoryUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.context.event.ApplicationReadyEvent;
 import org.springframework.context.ApplicationListener;
 import org.springframework.core.annotation.Order;
@@ -34,13 +35,17 @@ public class MyApplicationListener implements ApplicationListener<ApplicationRea
     private IIntegrationTaskLivingDao iIntegrationTaskLivingDao;
     @Resource
     private IIntegrationTaskCacheableService iIntegrationTaskCacheableService;
-
+    @Value("${data.use}")
+    private boolean dataUse;
     @Override
     public void onApplicationEvent(ApplicationReadyEvent applicationReadyEvent) {
         initTask();
     }
 
     private void initTask() {
+        if(!dataUse){
+            return;
+        }
         //查询所有任务，添加到任务执行计划中
         IntegrationTaskEntity queryEntity = new IntegrationTaskEntity();
         //任务状态1、启用

webapp/src/main/java/com/hzya/frame/webapp/web/listener/InitCommandLineRunner.java

@@ -10,6 +10,7 @@ import com.hzya.frame.web.action.ApplicationContextUtil;
 import org.apache.commons.io.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.context.event.ApplicationReadyEvent;
 import org.springframework.context.ApplicationListener;
 import org.springframework.stereotype.Component;
@@ -36,11 +37,13 @@ public class InitCommandLineRunner implements ApplicationListener<ApplicationRea
     Logger logger = LoggerFactory.getLogger(InitCommandLineRunner.class);
     @Resource
     private ApplicationCache applicationCache;
-
+    @Value("${data.use}")
+    private boolean dataUse;
     @Resource
     private InterfaceCache interfaceCache;
     @Override
     public void onApplicationEvent(ApplicationReadyEvent event) {
+        if(dataUse){
             logger.info("初始化ApplicationCache Map start <<<<<<<<<<<<<<<<<<<<<<<<");
             applicationCache.reloadData("1");
             applicationCache.reloadData("2");
@@ -54,7 +57,7 @@ public class InitCommandLineRunner implements ApplicationListener<ApplicationRea
             interfaceCache.reloadData("5");
             interfaceCache.reloadData("6");
             logger.info("初始化ApplicationCache Map END <<<<<<<<<<<<<<<<<<<<<<<<");
-
+        }
         String path = InitCommandLineRunner.class.getClassLoader().getResource("").getPath();
         ;
         logger.info("cfgHomeClassURL:" + path);