客户表

b97e9d42 · manxiaoqiang · 0589fce8 · b97e9d42 · b97e9d42
Commit b97e9d42 authored Mar 26, 2018 by manxiaoqiang
Show whitespace changes
Inline Side-by-side

Showing with 69 additions and 39 deletions

workspace.xml .idea/workspace.xml +68 -38

applicationContext-schedule.xml src/main/resources/spring/applicationContext-schedule.xml +1 -1

No files found.
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,7 +3,7 @@
  <component name="ChangeListManager">
    <list default="true" id="e2e217e2-2dd6-4c6f-ad19-b1cba46bc7ad" name="Default" comment="">
      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/tkio/task/AccountTask.java" afterPath="$PROJECT_DIR$/src/main/java/tkio/task/AccountTask.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/spring/applicationContext-schedule.xml" afterPath="$PROJECT_DIR$/src/main/resources/spring/applicationContext-schedule.xml" />
    </list>
    <ignored path="$PROJECT_DIR$/target/" />
    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -24,11 +24,11 @@
  <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
  <component name="FileEditorManager">
    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="applicationContext-schedule.xml" pinned="false" current-in-tab="false">
+      <file leaf-file-name="applicationContext-schedule.xml" pinned="false" current-in-tab="true">
        <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-schedule.xml">
          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="115">
-              <caret line="12" column="25" lean-forward="true" selection-start-line="12" selection-start-column="25" selection-end-line="12" selection-end-column="25" />
+            <state relative-caret-position="161">
+              <caret line="14" column="70" lean-forward="false" selection-start-line="14" selection-start-column="70" selection-end-line="14" selection-end-column="70" />
              <folding />
            </state>
          </provider>
@@ -39,7 +39,11 @@
          <provider selected="true" editor-type-id="text-editor">
            <state relative-caret-position="504">
              <caret line="63" column="0" lean-forward="false" selection-start-line="63" selection-start-column="0" selection-end-line="63" selection-end-column="0" />
-              <folding />
+              <folding>
+                <element signature="imports" expanded="false" />
+                <element signature="e#1316#1317#0" expanded="false" />
+                <element signature="e#1356#1357#0" expanded="false" />
+              </folding>
            </state>
          </provider>
        </entry>
@@ -54,11 +58,11 @@
          </provider>
        </entry>
      </file>
-      <file leaf-file-name="AccountTask.java" pinned="false" current-in-tab="true">
+      <file leaf-file-name="AccountTask.java" pinned="false" current-in-tab="false">
        <entry file="file://$PROJECT_DIR$/src/main/java/tkio/task/AccountTask.java">
          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="674">
-              <caret line="110" column="71" lean-forward="false" selection-start-line="110" selection-start-column="58" selection-end-line="110" selection-end-column="71" />
+            <state relative-caret-position="69">
+              <caret line="48" column="0" lean-forward="true" selection-start-line="48" selection-start-column="0" selection-end-line="48" selection-end-column="0" />
              <folding />
            </state>
          </provider>
@@ -102,7 +106,11 @@
          <provider selected="true" editor-type-id="text-editor">
            <state relative-caret-position="414">
              <caret line="30" column="55" lean-forward="false" selection-start-line="30" selection-start-column="55" selection-end-line="30" selection-end-column="55" />
-              <folding />
+              <folding>
+                <element signature="imports" expanded="false" />
+                <element signature="e#1474#1475#0" expanded="false" />
+                <element signature="e#1551#1552#0" expanded="false" />
+              </folding>
            </state>
          </provider>
        </entry>
@@ -112,7 +120,9 @@
          <provider selected="true" editor-type-id="text-editor">
            <state relative-caret-position="184">
              <caret line="11" column="22" lean-forward="false" selection-start-line="11" selection-start-column="22" selection-end-line="11" selection-end-column="22" />
-              <folding />
+              <folding>
+                <element signature="imports" expanded="false" />
+              </folding>
            </state>
          </provider>
        </entry>
@@ -122,7 +132,11 @@
          <provider selected="true" editor-type-id="text-editor">
            <state relative-caret-position="2691">
              <caret line="144" column="73" lean-forward="false" selection-start-line="144" selection-start-column="73" selection-end-line="144" selection-end-column="73" />
-              <folding />
+              <folding>
+                <element signature="imports" expanded="false" />
+                <element signature="e#7549#7550#0" expanded="false" />
+                <element signature="e#7605#7606#0" expanded="false" />
+              </folding>
            </state>
          </provider>
        </entry>
@@ -231,9 +245,9 @@
        <option value="$PROJECT_DIR$/src/main/java/common/controller/ContractController.java" />
        <option value="$PROJECT_DIR$/src/main/java/common/repository/UserRepository.java" />
        <option value="$PROJECT_DIR$/src/main/java/util/NewUserLogThread.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/applicationContext-schedule.xml" />
        <option value="$PROJECT_DIR$/src/main/java/common/task/SyncAppDataTask.java" />
        <option value="$PROJECT_DIR$/src/main/java/tkio/task/AccountTask.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/spring/applicationContext-schedule.xml" />
      </list>
    </option>
  </component>
@@ -1142,14 +1156,7 @@
      <workItem from="1517447750893" duration="11115000" />
      <workItem from="1517533917524" duration="7763000" />
      <workItem from="1517902340876" duration="6159000" />
-      <workItem from="1522052551509" duration="917000" />
-    </task>
-    <task id="LOCAL-00044" summary="定时任务 刷新tkio表数据">
-      <created>1516010127547</created>
-      <option name="number" value="00044" />
-      <option name="presentableId" value="LOCAL-00044" />
-      <option name="project" value="LOCAL" />
-      <updated>1516010127547</updated>
+      <workItem from="1522052551509" duration="3126000" />
    </task>
    <task id="LOCAL-00045" summary="定时任务 刷新tkio表数据">
      <created>1516010153653</created>
@@ -1487,14 +1494,21 @@
      <option name="project" value="LOCAL" />
      <updated>1521702947223</updated>
    </task>
-    <option name="localTasksCounter" value="93" />
+    <task id="LOCAL-00093" summary="客户表&#10;&#10;&#10;">
+      <created>1522053490663</created>
+      <option name="number" value="00093" />
+      <option name="presentableId" value="LOCAL-00093" />
+      <option name="project" value="LOCAL" />
+      <updated>1522053490664</updated>
+    </task>
+    <option name="localTasksCounter" value="94" />
    <servers />
  </component>
  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="344451000" />
+    <option name="totallyTimeSpent" value="346660000" />
  </component>
  <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1382" height="744" extended-state="0" />
+    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
    <editor active="true" />
    <layout>
      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
@@ -1623,7 +1637,8 @@
    <MESSAGE value="app排序" />
    <MESSAGE value="显示" />
    <MESSAGE value="Merge remote-tracking branch 'remotes/origin/feature_20180116_new'&#10;&#10;* remotes/origin/feature_20180116_new:&#10;  客户表-1&#10;  app排序&#10;&#10;# Conflicts:&#10;#&#9;.idea/workspace.xml&#10;" />
-    <option name="LAST_COMMIT_MESSAGE" value="Merge remote-tracking branch 'remotes/origin/feature_20180116_new'&#10;&#10;* remotes/origin/feature_20180116_new:&#10;  客户表-1&#10;  app排序&#10;&#10;# Conflicts:&#10;#&#9;.idea/workspace.xml&#10;" />
+    <MESSAGE value="客户表&#10;&#10;&#10;" />
+    <option name="LAST_COMMIT_MESSAGE" value="客户表&#10;&#10;&#10;" />
  </component>
  <component name="XDebuggerManager">
    <breakpoint-manager>
@@ -1876,6 +1891,7 @@
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="-161">
          <caret line="20" column="13" lean-forward="false" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
+          <folding />
        </state>
      </provider>
    </entry>
@@ -1942,7 +1958,11 @@
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="2691">
          <caret line="144" column="73" lean-forward="false" selection-start-line="144" selection-start-column="73" selection-end-line="144" selection-end-column="73" />
-          <folding />
+          <folding>
+            <element signature="imports" expanded="false" />
+            <element signature="e#7549#7550#0" expanded="false" />
+            <element signature="e#7605#7606#0" expanded="false" />
+          </folding>
        </state>
      </provider>
    </entry>
@@ -1950,7 +1970,11 @@
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="414">
          <caret line="30" column="55" lean-forward="false" selection-start-line="30" selection-start-column="55" selection-end-line="30" selection-end-column="55" />
-          <folding />
+          <folding>
+            <element signature="imports" expanded="false" />
+            <element signature="e#1474#1475#0" expanded="false" />
+            <element signature="e#1551#1552#0" expanded="false" />
+          </folding>
        </state>
      </provider>
    </entry>
@@ -1958,15 +1982,9 @@
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="184">
          <caret line="11" column="22" lean-forward="false" selection-start-line="11" selection-start-column="22" selection-end-line="11" selection-end-column="22" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-schedule.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="115">
-          <caret line="12" column="25" lean-forward="true" selection-start-line="12" selection-start-column="25" selection-end-line="12" selection-end-column="25" />
-          <folding />
+          <folding>
+            <element signature="imports" expanded="false" />
+          </folding>
        </state>
      </provider>
    </entry>
@@ -1974,7 +1992,11 @@
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="504">
          <caret line="63" column="0" lean-forward="false" selection-start-line="63" selection-start-column="0" selection-end-line="63" selection-end-column="0" />
-          <folding />
+          <folding>
+            <element signature="imports" expanded="false" />
+            <element signature="e#1316#1317#0" expanded="false" />
+            <element signature="e#1356#1357#0" expanded="false" />
+          </folding>
        </state>
      </provider>
    </entry>
@@ -2015,8 +2037,16 @@
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/java/tkio/task/AccountTask.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="674">
-          <caret line="110" column="71" lean-forward="false" selection-start-line="110" selection-start-column="58" selection-end-line="110" selection-end-column="71" />
+        <state relative-caret-position="69">
+          <caret line="48" column="0" lean-forward="true" selection-start-line="48" selection-start-column="0" selection-end-line="48" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-schedule.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="161">
+          <caret line="14" column="70" lean-forward="false" selection-start-line="14" selection-start-column="70" selection-end-line="14" selection-end-column="70" />
          <folding />
        </state>
      </provider>

--- a/src/main/resources/spring/applicationContext-schedule.xml
+++ b/src/main/resources/spring/applicationContext-schedule.xml
@@ -12,7 +12,7 @@
    <bean id="tkioAccountTask" class="tkio.task.AccountTask"></bean>
   <task:scheduled-tasks>
        <!--//定时同步短链数据(每5分钟执行一次)-->
-        <task:scheduled ref="tkioAccountTask" method="task" cron="0 13 7 * * ?"/>
+        <task:scheduled ref="tkioAccountTask" method="task" cron="0 20 18 * * ?"/>
    </task:scheduled-tasks>

    <bean id="tkioNoticeTask" class="tkio.task.NoticeTask"></bean>