From 2ad4ff5be5b4aa336ba5ba42d0a19f2fb008bda8 Mon Sep 17 00:00:00 2001
From: lvleigang <957075182@qq.com>
Date: Tue, 9 Jul 2024 15:30:27 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=B7=BB=E5=8A=A0=E4=B8=8D?=
 =?UTF-8?q?=E5=8A=A0=E5=9C=A8=E6=95=B0=E6=8D=AE=E5=BA=93=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application.yml        |  2 ++
 .../datasource/DataSourceUtilProperties.java  |  2 +-
 .../frame/web/init/MyApplicationListener.java |  7 ++++-
 .../web/listener/InitCommandLineRunner.java   | 31 ++++++++++---------
 4 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/buildpackage/src/main/resources/application.yml b/buildpackage/src/main/resources/application.yml
index 1f564c28..19b59c47 100644
--- a/buildpackage/src/main/resources/application.yml
+++ b/buildpackage/src/main/resources/application.yml
@@ -122,3 +122,5 @@ jeecg :
     minio_name: ??
     minio_pass: ??
     bucketName: ??
+data:
+  use: true
\ No newline at end of file
diff --git a/common/src/main/java/com/hzya/frame/datasource/DataSourceUtilProperties.java b/common/src/main/java/com/hzya/frame/datasource/DataSourceUtilProperties.java
index b034c049..36a5c0df 100644
--- a/common/src/main/java/com/hzya/frame/datasource/DataSourceUtilProperties.java
+++ b/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"; // 达梦数据库的驱动类
 
diff --git a/webapp/src/main/java/com/hzya/frame/web/init/MyApplicationListener.java b/webapp/src/main/java/com/hzya/frame/web/init/MyApplicationListener.java
index a24e46a8..566736e8 100644
--- a/webapp/src/main/java/com/hzya/frame/web/init/MyApplicationListener.java
+++ b/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、启用
diff --git a/webapp/src/main/java/com/hzya/frame/webapp/web/listener/InitCommandLineRunner.java b/webapp/src/main/java/com/hzya/frame/webapp/web/listener/InitCommandLineRunner.java
index 81fc5f3a..18f92505 100644
--- a/webapp/src/main/java/com/hzya/frame/webapp/web/listener/InitCommandLineRunner.java
+++ b/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,25 +37,27 @@ 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) {
-        logger.info("初始化ApplicationCache Map start <<<<<<<<<<<<<<<<<<<<<<<<");
-        applicationCache.reloadData("1");
-        applicationCache.reloadData("2");
-        applicationCache.reloadData("3");
-        applicationCache.reloadData("4");
-
-        interfaceCache.reloadData("1");
-        interfaceCache.reloadData("2");
-        interfaceCache.reloadData("3");
-        interfaceCache.reloadData("4");
-        interfaceCache.reloadData("5");
-        interfaceCache.reloadData("6");
-        logger.info("初始化ApplicationCache Map END <<<<<<<<<<<<<<<<<<<<<<<<");
+        if(dataUse){
+            logger.info("初始化ApplicationCache Map start <<<<<<<<<<<<<<<<<<<<<<<<");
+            applicationCache.reloadData("1");
+            applicationCache.reloadData("2");
+            applicationCache.reloadData("3");
+            applicationCache.reloadData("4");
 
+            interfaceCache.reloadData("1");
+            interfaceCache.reloadData("2");
+            interfaceCache.reloadData("3");
+            interfaceCache.reloadData("4");
+            interfaceCache.reloadData("5");
+            interfaceCache.reloadData("6");
+            logger.info("初始化ApplicationCache Map END <<<<<<<<<<<<<<<<<<<<<<<<");
+        }
         String path = InitCommandLineRunner.class.getClassLoader().getResource("").getPath();
         ;
         logger.info("cfgHomeClassURL:" + path);