From 2cd20e57d0d30211bc2c80ce9ee5a0a38a5bdc94 Mon Sep 17 00:00:00 2001
From: "453530270@qq.com" <aa123456>
Date: Wed, 6 Mar 2024 15:40:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           | 180 +++++-------------
 bctask/pom.xml                                |   3 +-
 .../bc/mm/mis/task/BcTaskApplication.java     |  14 +-
 3 files changed, 53 insertions(+), 144 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 9dc8da8..d171706 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,8 +2,8 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="48484101-7a18-4278-bdb7-e43b4204d542" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/bctask/src/main/resources/application.properties" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/bctask/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/bctask/pom.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/bctask/src/main/java/bc/mm/mis/task/BcTaskApplication.java" beforeDir="false" afterPath="$PROJECT_DIR$/bctask/src/main/java/bc/mm/mis/task/BcTaskApplication.java" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
@@ -25,11 +25,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/bctask/pom.xml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="368">
-              <caret line="16" column="8" selection-start-line="16" selection-start-column="8" selection-end-line="16" selection-end-column="8" />
+            <state relative-caret-position="396">
+              <caret line="24" column="41" selection-start-line="24" selection-start-column="41" selection-end-line="24" selection-end-column="41" />
             </state>
           </provider>
         </entry>
@@ -37,8 +37,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/bctask/src/main/java/bc/mm/mis/task/BcTaskApplication.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="220">
-              <caret line="10" column="22" selection-start-line="10" selection-start-column="22" selection-end-line="10" selection-end-column="22" />
+            <state relative-caret-position="348">
+              <caret line="24" column="13" selection-start-line="24" selection-start-column="13" selection-end-line="24" selection-end-column="13" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -46,15 +46,6 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/bctask/src/main/resources/application.properties">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="22">
-              <caret line="1" column="16" selection-start-line="1" selection-start-column="16" selection-end-line="1" selection-end-column="16" />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -88,9 +79,9 @@
         <option value="$PROJECT_DIR$/bccommon/src/main/java/bc/mm/mis/common/exception/AccessException.java" />
         <option value="$PROJECT_DIR$/bccommon/src/main/java/bc/mm/mis/common/utils/AjaxResult.java" />
         <option value="$PROJECT_DIR$/bccommon/pom.xml" />
-        <option value="$PROJECT_DIR$/bctask/pom.xml" />
-        <option value="$PROJECT_DIR$/bctask/src/main/java/bc/mm/mis/task/BcTaskApplication.java" />
         <option value="$PROJECT_DIR$/bctask/src/main/resources/application.properties" />
+        <option value="$PROJECT_DIR$/bctask/src/main/java/bc/mm/mis/task/BcTaskApplication.java" />
+        <option value="$PROJECT_DIR$/bctask/pom.xml" />
       </list>
     </option>
   </component>
@@ -121,92 +112,6 @@
               <item name="BCoins Plat Manger Information System" type="b2602c69:ProjectViewProjectNode" />
               <item name="bcjava" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="BCoins Plat Manger Information System" type="b2602c69:ProjectViewProjectNode" />
-              <item name="bcjava" type="462c0819:PsiDirectoryNode" />
-              <item name="bcapi" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="BCoins Plat Manger Information System" type="b2602c69:ProjectViewProjectNode" />
-              <item name="bcjava" type="462c0819:PsiDirectoryNode" />
-              <item name="bcapi" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="BCoins Plat Manger Information System" type="b2602c69:ProjectViewProjectNode" />
-              <item name="bcjava" type="462c0819:PsiDirectoryNode" />
-              <item name="bcapi" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="BCoins Plat Manger Information System" type="b2602c69:ProjectViewProjectNode" />
-              <item name="bcjava" type="462c0819:PsiDirectoryNode" />
-              <item name="bcapi" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="BCoins Plat Manger Information System" type="b2602c69:ProjectViewProjectNode" />
-              <item name="bcjava" type="462c0819:PsiDirectoryNode" />
-              <item name="bcapi" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="api" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="BCoins Plat Manger Information System" type="b2602c69:ProjectViewProjectNode" />
-              <item name="bcjava" type="462c0819:PsiDirectoryNode" />
-              <item name="bcapi" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="resources" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="BCoins Plat Manger Information System" type="b2602c69:ProjectViewProjectNode" />
-              <item name="bcjava" type="462c0819:PsiDirectoryNode" />
-              <item name="bctask" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="BCoins Plat Manger Information System" type="b2602c69:ProjectViewProjectNode" />
-              <item name="bcjava" type="462c0819:PsiDirectoryNode" />
-              <item name="bctask" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="BCoins Plat Manger Information System" type="b2602c69:ProjectViewProjectNode" />
-              <item name="bcjava" type="462c0819:PsiDirectoryNode" />
-              <item name="bctask" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="BCoins Plat Manger Information System" type="b2602c69:ProjectViewProjectNode" />
-              <item name="bcjava" type="462c0819:PsiDirectoryNode" />
-              <item name="bctask" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="BCoins Plat Manger Information System" type="b2602c69:ProjectViewProjectNode" />
-              <item name="bcjava" type="462c0819:PsiDirectoryNode" />
-              <item name="bctask" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="task" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="BCoins Plat Manger Information System" type="b2602c69:ProjectViewProjectNode" />
-              <item name="bcjava" type="462c0819:PsiDirectoryNode" />
-              <item name="bctask" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="resources" type="462c0819:PsiDirectoryNode" />
-            </path>
           </expand>
           <select />
         </subPane>
@@ -293,7 +198,7 @@
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
       <updated>1709705326078</updated>
-      <workItem from="1709705327787" duration="4905000" />
+      <workItem from="1709705327787" duration="5291000" />
     </task>
     <task id="LOCAL-00001" summary="补充springboot 结构">
       <created>1709706040716</created>
@@ -330,11 +235,18 @@
       <option name="project" value="LOCAL" />
       <updated>1709709995828</updated>
     </task>
-    <option name="localTasksCounter" value="6" />
+    <task id="LOCAL-00006" summary="调整定时组件">
+      <created>1709710449365</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1709710449365</updated>
+    </task>
+    <option name="localTasksCounter" value="7" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="4905000" />
+    <option name="totallyTimeSpent" value="5291000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="1912" y="-7" width="1936" height="1056" extended-state="6" />
@@ -352,7 +264,7 @@
       <window_info anchor="bottom" id="Spring" />
       <window_info anchor="bottom" id="Terminal" />
       <window_info anchor="bottom" id="Event Log" side_tool="true" />
-      <window_info anchor="bottom" id="Messages" weight="0.329718" />
+      <window_info anchor="bottom" id="Messages" visible="true" weight="0.329718" />
       <window_info anchor="bottom" id="Java Enterprise" />
       <window_info anchor="bottom" id="Database Changes" />
       <window_info anchor="bottom" id="Version Control" />
@@ -384,7 +296,8 @@
     <MESSAGE value="添加api端web环境" />
     <MESSAGE value="通用组件" />
     <MESSAGE value="定时任务组件" />
-    <option name="LAST_COMMIT_MESSAGE" value="定时任务组件" />
+    <MESSAGE value="调整定时组件" />
+    <option name="LAST_COMMIT_MESSAGE" value="调整定时组件" />
   </component>
   <component name="editorHistoryManager">
     <entry file="file://$PROJECT_DIR$/bcws/pom.xml">
@@ -421,13 +334,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/bcapi/pom.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="17" column="52" lean-forward="true" selection-start-line="17" selection-start-column="52" selection-end-line="17" selection-end-column="52" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/bcapi/src/main/resources/logback-spring.xml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="347">
@@ -449,16 +355,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/bcapi/src/main/java/bc/mm/mis/api/BcApiApplication.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="11" column="46" selection-start-line="11" selection-start-column="30" selection-end-line="11" selection-end-column="46" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/bccommon/pom.xml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="652">
@@ -497,27 +393,44 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/bctask/pom.xml">
+    <entry file="file://$PROJECT_DIR$/bctask/src/main/resources/application.properties">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="368">
-          <caret line="16" column="8" selection-start-line="16" selection-start-column="8" selection-end-line="16" selection-end-column="8" />
+        <state relative-caret-position="22">
+          <caret line="1" column="16" lean-forward="true" selection-start-line="1" selection-start-column="16" selection-end-line="1" selection-end-column="16" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/bctask/src/main/java/bc/mm/mis/task/BcTaskApplication.java">
+    <entry file="file://$PROJECT_DIR$/bcapi/pom.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="17" column="52" lean-forward="true" selection-start-line="17" selection-start-column="52" selection-end-line="17" selection-end-column="52" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/bcapi/src/main/java/bc/mm/mis/api/BcApiApplication.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="220">
-          <caret line="10" column="22" selection-start-line="10" selection-start-column="22" selection-end-line="10" selection-end-column="22" />
+          <caret line="12" column="5" lean-forward="true" selection-start-line="10" selection-start-column="4" selection-end-line="12" selection-end-column="5" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/bctask/src/main/resources/application.properties">
+    <entry file="file://$PROJECT_DIR$/bctask/src/main/java/bc/mm/mis/task/BcTaskApplication.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="22">
-          <caret line="1" column="16" selection-start-line="1" selection-start-column="16" selection-end-line="1" selection-end-column="16" />
+        <state relative-caret-position="348">
+          <caret line="24" column="13" selection-start-line="24" selection-start-column="13" selection-end-line="24" selection-end-column="13" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/bctask/pom.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="396">
+          <caret line="24" column="41" selection-start-line="24" selection-start-column="41" selection-end-line="24" selection-end-column="41" />
         </state>
       </provider>
     </entry>
@@ -577,7 +490,6 @@
             <option name="proportions">
               <list>
                 <option value="0.2" />
-                <option value="0.6" />
               </list>
             </option>
           </splitter-proportions>
diff --git a/bctask/pom.xml b/bctask/pom.xml
index 4d8744f..d5fc263 100644
--- a/bctask/pom.xml
+++ b/bctask/pom.xml
@@ -14,7 +14,7 @@
     <description>定时任务等</description>
 
     <properties>
-        
+
     </properties>
 
     <dependencies>
@@ -22,6 +22,7 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-quartz</artifactId>
+            <version>${springboot.version}</version>
         </dependency>
     </dependencies>
 
diff --git a/bctask/src/main/java/bc/mm/mis/task/BcTaskApplication.java b/bctask/src/main/java/bc/mm/mis/task/BcTaskApplication.java
index 7723b43..4318945 100644
--- a/bctask/src/main/java/bc/mm/mis/task/BcTaskApplication.java
+++ b/bctask/src/main/java/bc/mm/mis/task/BcTaskApplication.java
@@ -3,24 +3,20 @@ package bc.mm.mis.task;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.boot.CommandLineRunner;
-import org.springframework.boot.WebApplicationType;
+import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.context.annotation.ComponentScan;
 
 @SpringBootApplication
-@ComponentScan(value = {"bc.mm.mis.task"})
 public class BcTaskApplication implements CommandLineRunner {
     protected static final Log log = LogFactory.getLog(BcTaskApplication.class);
     /**
-     *
+     * springboot 常规启动
      * @param args
      */
-    public static void main(String[] args){
-        new SpringApplicationBuilder(BcTaskApplication.class)
-                .web(WebApplicationType.NONE)
-                .run(args);
+    public static void main(String[] args) {
+        SpringApplication.run(BcTaskApplication.class, args);
     }
+
     /**
      *  spring boot启动后，会进入该方法
      * @param args