From eb75877ea644961a7dfcb36483de1d4277bacb64 Mon Sep 17 00:00:00 2001
From: lijiahangmax <ljh1553488six@139.com>
Date: Tue, 26 Mar 2024 23:56:26 +0800
Subject: [PATCH] =?UTF-8?q?:construction:=20=E5=AE=9A=E6=97=B6=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../orion-ops-spring-boot-starter-desensitize/pom.xml       | 1 +
 .../orion-ops-spring-boot-starter-job/pom.xml               | 6 ++++++
 .../job/config/OrionSchedulerAutoConfiguration.java         | 2 --
 .../orion-ops-spring-boot-starter-web/pom.xml               | 2 ++
 orion-ops-launch/src/main/resources/application-dev.yaml    | 2 --
 orion-ops-launch/src/main/resources/application-prod.yaml   | 2 --
 orion-ops-launch/src/main/resources/application.yaml        | 4 ++++
 7 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-desensitize/pom.xml b/orion-ops-framework/orion-ops-spring-boot-starter-desensitize/pom.xml
index d4223a2d..8d97d64e 100644
--- a/orion-ops-framework/orion-ops-spring-boot-starter-desensitize/pom.xml
+++ b/orion-ops-framework/orion-ops-spring-boot-starter-desensitize/pom.xml
@@ -22,6 +22,7 @@
             <artifactId>orion-ops-framework-common</artifactId>
         </dependency>
 
+        <!-- web -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-job/pom.xml b/orion-ops-framework/orion-ops-spring-boot-starter-job/pom.xml
index f00fa016..c2eb65e7 100644
--- a/orion-ops-framework/orion-ops-spring-boot-starter-job/pom.xml
+++ b/orion-ops-framework/orion-ops-spring-boot-starter-job/pom.xml
@@ -26,6 +26,12 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter</artifactId>
         </dependency>
+
+        <!-- quartz -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-quartz</artifactId>
+        </dependency>
     </dependencies>
 
 </project>
\ No newline at end of file
diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-job/src/main/java/com/orion/ops/framework/job/config/OrionSchedulerAutoConfiguration.java b/orion-ops-framework/orion-ops-spring-boot-starter-job/src/main/java/com/orion/ops/framework/job/config/OrionSchedulerAutoConfiguration.java
index 16135c20..037cc0e2 100644
--- a/orion-ops-framework/orion-ops-spring-boot-starter-job/src/main/java/com/orion/ops/framework/job/config/OrionSchedulerAutoConfiguration.java
+++ b/orion-ops-framework/orion-ops-spring-boot-starter-job/src/main/java/com/orion/ops/framework/job/config/OrionSchedulerAutoConfiguration.java
@@ -10,8 +10,6 @@ import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
 
 /**
  * 调度器配置
- * <p>
- * TODO 后面业务扩展需要加上quartz的配置
  *
  * @author Jiahang Li
  * @version 1.0.0
diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-web/pom.xml b/orion-ops-framework/orion-ops-spring-boot-starter-web/pom.xml
index 25687cfd..3da3a9f2 100644
--- a/orion-ops-framework/orion-ops-spring-boot-starter-web/pom.xml
+++ b/orion-ops-framework/orion-ops-spring-boot-starter-web/pom.xml
@@ -22,11 +22,13 @@
             <artifactId>orion-ops-framework-common</artifactId>
         </dependency>
 
+        <!-- web -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
 
+        <!-- jdbc -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-jdbc</artifactId>
diff --git a/orion-ops-launch/src/main/resources/application-dev.yaml b/orion-ops-launch/src/main/resources/application-dev.yaml
index 71800445..0faecfed 100644
--- a/orion-ops-launch/src/main/resources/application-dev.yaml
+++ b/orion-ops-launch/src/main/resources/application-dev.yaml
@@ -10,9 +10,7 @@ spring:
   redis:
     host: 127.0.0.1
     port: 6379
-    database: 0
     password: lijiahang
-    timeout: 3000
 
 mybatis-plus:
   configuration:
diff --git a/orion-ops-launch/src/main/resources/application-prod.yaml b/orion-ops-launch/src/main/resources/application-prod.yaml
index 00859bdc..d68980ed 100644
--- a/orion-ops-launch/src/main/resources/application-prod.yaml
+++ b/orion-ops-launch/src/main/resources/application-prod.yaml
@@ -20,9 +20,7 @@ spring:
   redis:
     host: ${REDIS_HOST:127.0.0.1}
     port: ${REDIS_PORT:6379}
-    database: 0
     password: ${REDIS_PASSWORD:Data@123456}
-    timeout: 3000
 
 springdoc:
   api-docs:
diff --git a/orion-ops-launch/src/main/resources/application.yaml b/orion-ops-launch/src/main/resources/application.yaml
index aa9139bc..5f7905c8 100644
--- a/orion-ops-launch/src/main/resources/application.yaml
+++ b/orion-ops-launch/src/main/resources/application.yaml
@@ -53,6 +53,10 @@ spring:
         wall:
           config:
             multi-statement-allow: true
+  redis:
+    database: 0
+    connect-timeout: 3000
+    timeout: 3000
   cache:
     type: REDIS
     redis: