From 7b8954a410228c692e308c24ef05b72acd73a27e Mon Sep 17 00:00:00 2001
From: manxiaoqiang <manxiaoqiang@reyun.com>
Date: Thu, 12 Apr 2018 17:04:56 +0800
Subject: [PATCH] 二版

---
 .idea/workspace.xml                                           | 551 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 pom.xml                                                       |   4 ++++
 src/main/java/common/model/Contract.java                      |  19 +++++++++++++++++++
 src/main/java/common/model/PressMoney.java                    |  96 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/main/java/common/repository/PressMoneyRepository.java     |  17 +++++++++++++++++
 src/main/java/common/service/impl/ContractServiceImpl.java    |  10 ++++++++--
 src/main/java/dic/ContractTypeEnum.java                       |  28 ++++++++++++++++++++++++++++
 src/main/java/tkio/controller/TkioAccountController.java      |  18 ++++++++++++++++++
 src/main/java/tkio/service/TkioAccountService.java            |   6 ++++++
 src/main/java/tkio/service/impl/TkioAccountServiceImpl.java   |  22 ++++++++++++++++++++++
 src/main/java/track/controller/TrackAccountController.java    |  18 ++++++++++++++++++
 src/main/java/track/service/TrackAccountService.java          |   7 +++++++
 src/main/java/track/service/impl/TrackAccountServiceImpl.java |  22 ++++++++++++++++++++++
 src/main/resources/persistence.properties                     |   6 +++++-
 src/main/resources/spring/applicationContext.xml              |  45 +++++++++++++++++++++++++++++++++++++++++++++
 15 files changed, 585 insertions(+), 284 deletions(-)
 create mode 100644 src/main/java/common/model/PressMoney.java
 create mode 100644 src/main/java/common/repository/PressMoneyRepository.java
 create mode 100644 src/main/java/dic/ContractTypeEnum.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 878d508..8125b73 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,8 +2,21 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="e2e217e2-2dd6-4c6f-ad19-b1cba46bc7ad" name="Default" comment="">
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/common/model/PressMoney.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/common/repository/PressMoneyRepository.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/dic/ContractTypeEnum.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/spring/applicationContext-schedule.xml" afterPath="$PROJECT_DIR$/src/main/resources/spring/applicationContext-schedule.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pom.xml" afterPath="$PROJECT_DIR$/pom.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/common/model/Contract.java" afterPath="$PROJECT_DIR$/src/main/java/common/model/Contract.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java" afterPath="$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.java" afterPath="$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/tkio/service/TkioAccountService.java" afterPath="$PROJECT_DIR$/src/main/java/tkio/service/TkioAccountService.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java" afterPath="$PROJECT_DIR$/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/track/controller/TrackAccountController.java" afterPath="$PROJECT_DIR$/src/main/java/track/controller/TrackAccountController.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/track/service/TrackAccountService.java" afterPath="$PROJECT_DIR$/src/main/java/track/service/TrackAccountService.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/track/service/impl/TrackAccountServiceImpl.java" afterPath="$PROJECT_DIR$/src/main/java/track/service/impl/TrackAccountServiceImpl.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/persistence.properties" afterPath="$PROJECT_DIR$/src/main/resources/persistence.properties" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" afterPath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" />
     </list>
     <ignored path="$PROJECT_DIR$/target/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -24,115 +37,72 @@
   <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="true">
-        <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-schedule.xml">
+      <file leaf-file-name="AuthorizationInterceptor.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/security/interceptor/AuthorizationInterceptor.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="184">
-              <caret line="14" column="72" lean-forward="false" selection-start-line="14" selection-start-column="72" selection-end-line="14" selection-end-column="72" />
+            <state relative-caret-position="713">
+              <caret line="56" column="57" lean-forward="false" selection-start-line="56" selection-start-column="57" selection-end-line="56" selection-end-column="57" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="logback.xml" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/resources/logback/product/logback.xml">
+      <file leaf-file-name="ContractController.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/common/controller/ContractController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-646">
-              <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+            <state relative-caret-position="2507">
+              <caret line="144" column="5" lean-forward="true" selection-start-line="144" selection-start-column="5" selection-end-line="144" selection-end-column="5" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="ContractSendEmailThread.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/common/task/ContractSendEmailThread.java">
+      <file leaf-file-name="TkioAccountServiceImpl.java" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java">
           <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>
-                <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>
-      </file>
-      <file leaf-file-name="SyncAppDataTask.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/common/task/SyncAppDataTask.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="276">
-              <caret line="174" column="13" lean-forward="false" selection-start-line="174" selection-start-column="13" selection-end-line="174" selection-end-column="13" />
+            <state relative-caret-position="125">
+              <caret line="311" column="0" lean-forward="true" selection-start-line="311" selection-start-column="0" selection-end-line="311" selection-end-column="0" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="AccountTask.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/tkio/task/AccountTask.java">
+      <file leaf-file-name="IoAccountController.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/userio/contraller/IoAccountController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="183">
-              <caret line="46" column="16" lean-forward="true" selection-start-line="46" selection-start-column="16" selection-end-line="46" selection-end-column="16" />
+            <state relative-caret-position="421">
+              <caret line="115" column="52" lean-forward="true" selection-start-line="115" selection-start-column="52" selection-end-line="115" selection-end-column="52" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="AccountFlowRestrictService.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/AccountFlowRestrictService.java">
+      <file leaf-file-name="ContractService.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/common/service/ContractService.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="230">
-              <caret line="12" column="24" lean-forward="false" selection-start-line="12" selection-start-column="24" selection-end-line="12" selection-end-column="24" />
+            <state relative-caret-position="183">
+              <caret line="25" column="13" lean-forward="false" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="AccountFlowRestrictServiceImpl.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/impl/AccountFlowRestrictServiceImpl.java">
+      <file leaf-file-name="ContractServiceImpl.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="102">
-              <caret line="32" column="0" lean-forward="false" selection-start-line="32" selection-start-column="0" selection-end-line="33" selection-end-column="56" />
+            <state relative-caret-position="5980">
+              <caret line="282" column="35" lean-forward="true" selection-start-line="282" selection-start-column="35" selection-end-line="282" selection-end-column="35" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="Account4Web.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/common/model/Account4Web.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="194">
-              <caret line="111" column="16" lean-forward="false" selection-start-line="111" selection-start-column="16" selection-end-line="111" selection-end-column="16" />
-              <folding>
-                <element signature="e#2336#2337#0" expanded="true" />
-                <element signature="e#2364#2365#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="TkioAccountController.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.java">
-          <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>
-                <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>
-      </file>
       <file leaf-file-name="TkioAccountService.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/TkioAccountService.java">
           <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>
-                <element signature="imports" expanded="false" />
-              </folding>
+            <state relative-caret-position="194">
+              <caret line="38" column="31" lean-forward="false" selection-start-line="38" selection-start-column="31" selection-end-line="38" selection-end-column="31" />
+              <folding />
             </state>
           </provider>
         </entry>
@@ -193,21 +163,13 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/common/service/UserService.java" />
-        <option value="$PROJECT_DIR$/src/main/java/common/repository/AuthRepository.java" />
-        <option value="$PROJECT_DIR$/src/main/java/common/service/impl/UserServiceImpl.java" />
-        <option value="$PROJECT_DIR$/src/main/java/common/repository/ContractChangeRepository.java" />
-        <option value="$PROJECT_DIR$/src/main/java/common/model/Account4Web.java" />
-        <option value="$PROJECT_DIR$/src/main/java/common/model/ContractMoney.java" />
         <option value="$PROJECT_DIR$/src/main/java/common/model/TrackAccount4Web.java" />
-        <option value="$PROJECT_DIR$/src/main/java/track/service/TrackAccountService.java" />
         <option value="$PROJECT_DIR$/src/main/java/common/repository/TrackAccount4WebRepository.java" />
         <option value="$PROJECT_DIR$/src/main/java/common/repository/BackVisitRepository.java" />
         <option value="$PROJECT_DIR$/src/main/java/util/DateUtil.java" />
         <option value="$PROJECT_DIR$/src/main/java/tkio/service/AccountService.java" />
         <option value="$PROJECT_DIR$/src/main/java/tkio/repository/SalesManLeaderRepository.java" />
         <option value="$PROJECT_DIR$/src/main/java/common/model/Reminder.java" />
-        <option value="$PROJECT_DIR$/src/main/java/tkio/service/TkioAccountService.java" />
         <option value="$PROJECT_DIR$/src/main/java/common/repository/ReminderLevelRepository.java" />
         <option value="$PROJECT_DIR$/src/main/java/common/model/ReminderLevel.java" />
         <option value="$PROJECT_DIR$/src/main/java/track/model/MeasuresTrackNew.java" />
@@ -218,14 +180,10 @@
         <option value="$PROJECT_DIR$/src/main/java/track/service/impl/TrackAccountFlowRestrictServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/tkio/repository/AccountRepository.java" />
         <option value="$PROJECT_DIR$/src/main/java/common/task/ReportCallable.java" />
-        <option value="$PROJECT_DIR$/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java" />
-        <option value="$PROJECT_DIR$/src/main/java/track/service/impl/TrackAccountServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/common/model/ContractChange.java" />
         <option value="$PROJECT_DIR$/src/main/java/util/UserLogThread.java" />
         <option value="$PROJECT_DIR$/src/main/java/common/model/UserLog.java" />
-        <option value="$PROJECT_DIR$/src/main/java/track/controller/TrackAccountController.java" />
         <option value="$PROJECT_DIR$/src/main/java/common/controller/UserController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.java" />
         <option value="$PROJECT_DIR$/src/main/java/common/task/ContractTask.java" />
         <option value="$PROJECT_DIR$/src/main/java/common/repository/ContractRepository.java" />
         <option value="$PROJECT_DIR$/src/main/java/common/task/ContractSendEmailThread.java" />
@@ -236,7 +194,6 @@
         <option value="$PROJECT_DIR$/src/main/java/common/repository/UserLogRepository.java" />
         <option value="$PROJECT_DIR$/src/main/java/common/service/impl/UserLogServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/tkio/service/impl/AccountServiceImpl.java" />
-        <option value="$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/util/ResultStatus.java" />
         <option value="$PROJECT_DIR$/src/main/java/common/controller/ContractController.java" />
         <option value="$PROJECT_DIR$/src/main/java/common/repository/UserRepository.java" />
@@ -244,6 +201,19 @@
         <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" />
+        <option value="$PROJECT_DIR$/src/main/resources/persistence.properties" />
+        <option value="$PROJECT_DIR$/pom.xml" />
+        <option value="$PROJECT_DIR$/src/main/java/tkio/service/TkioAccountService.java" />
+        <option value="$PROJECT_DIR$/src/main/java/common/model/PressMoney.java" />
+        <option value="$PROJECT_DIR$/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/track/controller/TrackAccountController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/track/service/TrackAccountService.java" />
+        <option value="$PROJECT_DIR$/src/main/java/track/service/impl/TrackAccountServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/java/dic/ContractTypeEnum.java" />
+        <option value="$PROJECT_DIR$/src/main/java/common/model/Contract.java" />
+        <option value="$PROJECT_DIR$/src/main/java/userio/contraller/IoAccountController.java" />
       </list>
     </option>
   </component>
@@ -338,6 +308,8 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="Scratches" />
+      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -459,10 +431,6 @@
               <option name="myItemId" value="logback" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="product" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
           </PATH>
           <PATH>
             <PATH_ELEMENT>
@@ -482,11 +450,7 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="resources" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="logback" />
+              <option name="myItemId" value="java" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
@@ -512,7 +476,7 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="util" />
+              <option name="myItemId" value="userio" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
@@ -537,6 +501,14 @@
               <option name="myItemId" value="java" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="userio" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="contraller" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
           </PATH>
           <PATH>
             <PATH_ELEMENT>
@@ -563,10 +535,6 @@
               <option name="myItemId" value="tkio" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="task" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
           </PATH>
           <PATH>
             <PATH_ELEMENT>
@@ -593,6 +561,10 @@
               <option name="myItemId" value="tkio" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="model" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
           </PATH>
           <PATH>
             <PATH_ELEMENT>
@@ -653,8 +625,6 @@
         </subPane>
       </pane>
       <pane id="Scope" />
-      <pane id="PackagesPane" />
-      <pane id="Scratches" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -672,18 +642,19 @@
     <property name="settings.editor.selected.configurable" value="preferences.lookFeel" />
   </component>
   <component name="RecentsManager">
-    <key name="CopyFile.RECENT_KEYS">
-      <recent name="E:\newgit\manager\src\main\resources" />
+    <key name="MoveFile.RECENT_KEYS">
+      <recent name="$PROJECT_DIR$/src/main/resources/spring" />
     </key>
     <key name="CopyClassDialog.RECENTS_KEY">
+      <recent name="userio.contraller" />
+      <recent name="dic" />
       <recent name="common.task" />
       <recent name="util" />
       <recent name="track.repository" />
-      <recent name="track.service.impl" />
-      <recent name="track.service" />
     </key>
-    <key name="MoveFile.RECENT_KEYS">
-      <recent name="$PROJECT_DIR$/src/main/resources/spring" />
+    <key name="CopyFile.RECENT_KEYS">
+      <recent name="E:\newgit\manager\src\main\resources\spring" />
+      <recent name="E:\newgit\manager\src\main\resources" />
     </key>
   </component>
   <component name="RunManager" selected="Maven.manager">
@@ -1501,7 +1472,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="347858000" />
+    <option name="totallyTimeSpent" value="363594000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
@@ -1520,15 +1491,16 @@
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4942717" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3289689" sideWeight="0.5" order="18" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3289689" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Palette&#9;" 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="3" side_tool="false" content_ui="tabs" />
       <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Analysis" 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="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.5155483" sideWeight="0.49546143" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.42553192" sideWeight="0.49016643" order="9" side_tool="false" content_ui="tabs" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.5155483" sideWeight="0.49546143" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3289689" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.5581015" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24810892" sideWeight="0.5" order="8" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25189108" sideWeight="0.5" order="8" side_tool="false" content_ui="combo" />
       <window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32980332" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
       <window_info id="Theme Preview" 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="7" side_tool="false" content_ui="tabs" />
@@ -1542,7 +1514,6 @@
       <window_info id="Memory View" 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="4" side_tool="false" content_ui="tabs" />
       <window_info id="Get Gist" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="15" side_tool="false" content_ui="tabs" />
       <window_info id="SonarQube" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3289689" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="CheckStyle" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Gradle View" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="17" side_tool="false" content_ui="tabs" />
@@ -1578,12 +1549,12 @@
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Analysis" 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="5" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.5155483" sideWeight="0.49546143" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.42553192" sideWeight="0.49016643" order="9" side_tool="false" content_ui="tabs" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.5155483" sideWeight="0.49546143" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3289689" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.5581015" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="CheckStyle" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24810892" sideWeight="0.5" order="8" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25189108" sideWeight="0.5" order="8" side_tool="false" content_ui="combo" />
       <window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32980332" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
       <window_info id="Gradle View" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="17" side_tool="false" content_ui="tabs" />
@@ -1654,101 +1625,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/common/service/impl/AppServiceImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="63" column="52" lean-forward="true" selection-start-line="63" selection-start-column="52" selection-end-line="63" selection-end-column="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/tkio/repository/AccountRepository.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="321">
-          <caret line="31" column="73" lean-forward="false" selection-start-line="31" selection-start-column="73" selection-end-line="31" selection-end-column="73" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/common/task/ReportCallable.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="183">
-          <caret line="162" column="13" lean-forward="true" selection-start-line="162" selection-start-column="13" selection-end-line="162" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/common/controller/LoginController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1493">
-          <caret line="100" column="17" lean-forward="true" selection-start-line="100" selection-start-column="17" selection-end-line="100" selection-end-column="17" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/tkio/repository/SalesManLeaderRepository.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="368">
-          <caret line="21" column="40" lean-forward="false" selection-start-line="21" selection-start-column="25" selection-end-line="21" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/track/service/TrackAccountService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="13" column="21" lean-forward="false" selection-start-line="13" selection-start-column="21" selection-end-line="13" selection-end-column="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/track/service/impl/TrackAccountServiceImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="309">
-          <caret line="119" column="9" lean-forward="false" selection-start-line="119" selection-start-column="9" selection-end-line="119" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/util/ResultModel.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="283">
-          <caret line="55" column="44" lean-forward="true" selection-start-line="55" selection-start-column="44" selection-end-line="55" selection-end-column="44" />
-          <folding>
-            <element signature="e#1195#1196#0" expanded="false" />
-            <element signature="e#1240#1241#0" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/commons-io/commons-io/2.4/commons-io-2.4.jar!/org/apache/commons/io/IOUtils.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="130" column="25" lean-forward="false" selection-start-line="130" selection-start-column="25" selection-end-line="130" selection-end-column="25" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/common/model/ContractChange.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="46">
-          <caret line="33" column="34" lean-forward="false" selection-start-line="33" selection-start-column="34" selection-end-line="33" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.3.4.RELEASE/spring-web-4.3.4.RELEASE.jar!/org/springframework/http/ResponseEntity.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="35" column="32" lean-forward="false" selection-start-line="35" selection-start-column="28" selection-end-line="35" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/common/controller/UserController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="122">
-          <caret line="140" column="47" lean-forward="true" selection-start-line="140" selection-start-column="47" selection-end-line="140" selection-end-column="47" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/common/model/ContractMoney.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="276">
-          <caret line="15" column="27" lean-forward="false" selection-start-line="15" selection-start-column="20" selection-end-line="15" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/impl/SendEmailServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="148">
@@ -1770,13 +1646,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/track/controller/TrackAccountController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-46">
-          <caret line="73" column="197" lean-forward="false" selection-start-line="73" selection-start-column="197" selection-end-line="73" selection-end-column="197" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/common/repository/ContractRepository.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="642">
@@ -1851,7 +1720,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="621">
           <caret line="27" column="25" lean-forward="false" selection-start-line="27" selection-start-column="25" selection-end-line="27" selection-end-column="30" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1884,14 +1752,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="329">
-          <caret line="162" column="49" lean-forward="true" selection-start-line="162" selection-start-column="49" selection-end-line="162" selection-end-column="49" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/common/repository/UserLogRepository.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="276">
@@ -1922,128 +1782,257 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/common/task/ContractSendEmailThread.java">
+      <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>
+            <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>
+    <entry file="file://$PROJECT_DIR$/src/main/java/common/task/SyncAppDataTask.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1160">
-          <caret line="296" column="47" lean-forward="false" selection-start-line="296" selection-start-column="39" selection-end-line="296" selection-end-column="47" />
+        <state relative-caret-position="276">
+          <caret line="174" column="13" lean-forward="false" selection-start-line="174" selection-start-column="13" selection-end-line="174" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/common/service/ContractService.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/common/model/Account4Web.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="214">
-          <caret line="35" column="13" lean-forward="false" selection-start-line="35" selection-start-column="13" selection-end-line="35" selection-end-column="13" />
+        <state relative-caret-position="194">
+          <caret line="111" column="16" lean-forward="false" selection-start-line="111" selection-start-column="16" selection-end-line="111" selection-end-column="16" />
+          <folding>
+            <element signature="e#2336#2337#0" expanded="false" />
+            <element signature="e#2364#2365#0" expanded="false" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/common/controller/ContractController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/AccountFlowRestrictService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="536">
-          <caret line="214" column="41" lean-forward="true" selection-start-line="214" selection-start-column="41" selection-end-line="214" selection-end-column="41" />
+        <state relative-caret-position="230">
+          <caret line="12" column="24" lean-forward="false" selection-start-line="12" selection-start-column="24" selection-end-line="12" selection-end-column="24" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/impl/AccountFlowRestrictServiceImpl.java">
       <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>
-            <element signature="imports" expanded="false" />
-            <element signature="e#7549#7550#0" expanded="false" />
-            <element signature="e#7605#7606#0" expanded="false" />
-          </folding>
+        <state relative-caret-position="102">
+          <caret line="32" column="0" lean-forward="false" selection-start-line="32" selection-start-column="0" selection-end-line="33" selection-end-column="56" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/resources/logback/product/logback.xml">
       <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>
-            <element signature="imports" expanded="false" />
-            <element signature="e#1474#1475#0" expanded="false" />
-            <element signature="e#1551#1552#0" expanded="false" />
-          </folding>
+        <state relative-caret-position="-646">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/TkioAccountService.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/tkio/task/AccountTask.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="183">
+          <caret line="46" column="16" lean-forward="true" selection-start-line="46" selection-start-column="16" selection-end-line="46" selection-end-column="16" />
+          <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="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>
-            <element signature="imports" expanded="false" />
-          </folding>
+          <caret line="14" column="72" lean-forward="false" selection-start-line="14" selection-start-column="72" selection-end-line="14" selection-end-column="72" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/common/task/ContractSendEmailThread.java">
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
       <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" />
+        <state relative-caret-position="-2185">
+          <caret line="10" column="0" lean-forward="false" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/persistence.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="575">
+          <caret line="25" column="37" lean-forward="false" selection-start-line="25" selection-start-column="37" selection-end-line="25" selection-end-column="37" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pom.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="2951">
+          <caret line="756" column="24" lean-forward="true" selection-start-line="756" selection-start-column="24" selection-end-line="756" selection-end-column="24" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/common/repository/PressMoneyRepository.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="184">
+          <caret line="14" column="33" lean-forward="false" selection-start-line="14" selection-start-column="21" selection-end-line="14" selection-end-column="33" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/common/model/PressMoney.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="148">
+          <caret line="48" column="33" lean-forward="false" selection-start-line="48" selection-start-column="33" selection-end-line="48" selection-end-column="33" />
           <folding>
-            <element signature="imports" expanded="false" />
-            <element signature="e#1316#1317#0" expanded="false" />
-            <element signature="e#1356#1357#0" expanded="false" />
+            <element signature="imports" expanded="true" />
+            <element signature="e#983#984#0" expanded="true" />
+            <element signature="e#1033#1034#0" expanded="true" />
+            <element signature="e#1077#1078#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/common/task/SyncAppDataTask.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/common/model/Payment.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="276">
-          <caret line="174" column="13" lean-forward="false" selection-start-line="174" selection-start-column="13" selection-end-line="174" selection-end-column="13" />
+          <caret line="21" column="4" lean-forward="false" selection-start-line="21" selection-start-column="4" selection-end-line="21" selection-end-column="28" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/common/model/Account4Web.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="111" column="16" lean-forward="false" selection-start-line="111" selection-start-column="16" selection-end-line="111" selection-end-column="16" />
-          <folding>
-            <element signature="e#2336#2337#0" expanded="true" />
-            <element signature="e#2364#2365#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="136">
+          <caret line="66" column="0" lean-forward="false" selection-start-line="66" selection-start-column="0" selection-end-line="82" selection-end-column="5" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/AccountFlowRestrictService.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/track/service/TrackAccountService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="230">
-          <caret line="12" column="24" lean-forward="false" selection-start-line="12" selection-start-column="24" selection-end-line="12" selection-end-column="24" />
+        <state relative-caret-position="-24">
+          <caret line="11" column="27" lean-forward="false" selection-start-line="11" selection-start-column="27" selection-end-line="11" selection-end-column="27" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/impl/AccountFlowRestrictServiceImpl.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/track/controller/TrackAccountController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="102">
-          <caret line="32" column="0" lean-forward="false" selection-start-line="32" selection-start-column="0" selection-end-line="33" selection-end-column="56" />
+        <state relative-caret-position="67">
+          <caret line="57" column="53" lean-forward="true" selection-start-line="57" selection-start-column="53" selection-end-line="57" selection-end-column="53" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/logback/product/logback.xml">
+    <entry file="file://$PROJECT_DIR$/src/main/java/track/service/impl/TrackAccountServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-646">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+        <state relative-caret-position="-1726">
+          <caret line="63" column="46" lean-forward="true" selection-start-line="63" selection-start-column="46" selection-end-line="63" selection-end-column="46" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/tkio/task/AccountTask.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/security/interceptor/AuthorizationInterceptor.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="713">
+          <caret line="56" column="57" lean-forward="false" selection-start-line="56" selection-start-column="57" selection-end-line="56" selection-end-column="57" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/common/service/ContractService.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="183">
-          <caret line="46" column="16" lean-forward="true" selection-start-line="46" selection-start-column="16" selection-end-line="46" selection-end-column="16" />
+          <caret line="25" column="13" lean-forward="false" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-schedule.xml">
+    <entry file="file://$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="5980">
+          <caret line="282" column="35" lean-forward="true" selection-start-line="282" selection-start-column="35" selection-end-line="282" selection-end-column="35" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/dic/ContractTypeEnum.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="184">
-          <caret line="14" column="72" lean-forward="false" selection-start-line="14" selection-start-column="72" selection-end-line="14" selection-end-column="72" />
+          <caret line="8" column="26" lean-forward="true" selection-start-line="8" selection-start-column="26" selection-end-line="8" selection-end-column="26" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/common/model/Contract.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1150">
+          <caret line="101" column="35" lean-forward="true" selection-start-line="101" selection-start-column="35" selection-end-line="101" selection-end-column="35" />
+          <folding>
+            <element signature="e#2207#2208#0" expanded="true" />
+            <element signature="e#2242#2243#0" expanded="true" />
+            <element signature="e#4637#4638#0" expanded="true" />
+            <element signature="e#4664#4665#0" expanded="true" />
+            <element signature="e#4702#4703#0" expanded="true" />
+            <element signature="e#4734#4735#0" expanded="true" />
+            <element signature="e#4783#4784#0" expanded="true" />
+            <element signature="e#4815#4816#0" expanded="true" />
+            <element signature="e#4863#4864#0" expanded="true" />
+            <element signature="e#4905#4906#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/common/controller/ContractController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="2507">
+          <caret line="144" column="5" lean-forward="true" selection-start-line="144" selection-start-column="5" selection-end-line="144" selection-end-column="5" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/tkio/model/Account.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="4334">
+          <caret line="424" column="16" lean-forward="false" selection-start-line="424" selection-start-column="16" selection-end-line="424" selection-end-column="16" />
+          <folding>
+            <element signature="e#8799#8800#0" expanded="false" />
+            <element signature="e#8830#8831#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/tkio/model/Auth.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="115">
+          <caret line="10" column="14" lean-forward="false" selection-start-line="10" selection-start-column="14" selection-end-line="10" selection-end-column="14" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/userio/contraller/IoAccountController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="421">
+          <caret line="115" column="52" lean-forward="true" selection-start-line="115" selection-start-column="52" selection-end-line="115" selection-end-column="52" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/TkioAccountService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="194">
+          <caret line="38" column="31" lean-forward="false" selection-start-line="38" selection-start-column="31" selection-end-line="38" selection-end-column="31" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="125">
+          <caret line="311" column="0" lean-forward="true" selection-start-line="311" selection-start-column="0" selection-end-line="311" selection-end-column="0" />
           <folding />
         </state>
       </provider>
diff --git a/pom.xml b/pom.xml
index b1badc2..058103e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,6 +57,10 @@
         <dmp.username>root</dmp.username>
         <dmp.password>reyun123</dmp.password>
 
+        <io.url>jdbc:mysql://192.168.2.57:3306/userio?characterEncoding=utf-8</io.url>
+        <io.username>root</io.username>
+        <io.password>reyun123</io.password>
+
         <mail.host>smtp.exmail.qq.com</mail.host>
         <mail.username>manager@reyun.com</mail.username>
         <mail.password>Reyun123</mail.password>
diff --git a/src/main/java/common/model/Contract.java b/src/main/java/common/model/Contract.java
index e52434e..883f499 100644
--- a/src/main/java/common/model/Contract.java
+++ b/src/main/java/common/model/Contract.java
@@ -32,6 +32,8 @@ public class Contract {
     private Long payMoney;
     private Long invoice;
     private String createName;
+    private Long type;
+    private Long priceName;
 
     private Long modifyAccount;
     private Long createAccount;
@@ -225,6 +227,23 @@ public class Contract {
         this.invoice = invoice;
     }
 
+    public Long getType() {
+        return type;
+    }
+
+    public void setType(Long type) {
+        this.type = type;
+    }
+
+    @Transient
+    public Long getPriceName() {
+        return priceName;
+    }
+
+    public void setPriceName(Long priceName) {
+        this.priceName = priceName;
+    }
+
     @Transient
     public String getSaleName() {
         return saleName;
diff --git a/src/main/java/common/model/PressMoney.java b/src/main/java/common/model/PressMoney.java
new file mode 100644
index 0000000..51e7e4e
--- /dev/null
+++ b/src/main/java/common/model/PressMoney.java
@@ -0,0 +1,96 @@
+package common.model;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import java.util.Date;
+
+/**
+ * Created by mxq on 2018/4/11.
+ */
+@Entity
+public class PressMoney {
+    private Long id;
+    private Long accountId;
+    private String email;
+    private Boolean pressStatus;
+    private Date modifyTime;
+    private String platform;
+    private Long user;
+    private String userName;
+    private String ds;
+
+    @Id
+    @GeneratedValue
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public Boolean getPressStatus() {
+        return pressStatus;
+    }
+
+    public void setPressStatus(Boolean pressStatus) {
+        this.pressStatus = pressStatus;
+    }
+
+    public Date getModifyTime() {
+        return modifyTime;
+    }
+
+    public void setModifyTime(Date modifyTime) {
+        this.modifyTime = modifyTime;
+    }
+
+    public String getPlatform() {
+        return platform;
+    }
+
+    public void setPlatform(String platform) {
+        this.platform = platform;
+    }
+
+    public Long getAccountId() {
+        return accountId;
+    }
+
+    public void setAccountId(Long accountId) {
+        this.accountId = accountId;
+    }
+
+    public Long getUser() {
+        return user;
+    }
+
+    public void setUser(Long user) {
+        this.user = user;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getDs() {
+        return ds;
+    }
+
+    public void setDs(String ds) {
+        this.ds = ds;
+    }
+}
diff --git a/src/main/java/common/repository/PressMoneyRepository.java b/src/main/java/common/repository/PressMoneyRepository.java
new file mode 100644
index 0000000..1752603
--- /dev/null
+++ b/src/main/java/common/repository/PressMoneyRepository.java
@@ -0,0 +1,17 @@
+package common.repository;
+
+import common.model.BackVisit;
+import common.model.PressMoney;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+@Transactional
+public interface PressMoneyRepository extends JpaRepository<PressMoney, Long> {
+
+    @Query(value = "SELECT * from press_money where platform = ?1 and press_status is true", nativeQuery = true)
+    List<PressMoney> findAllPress(String platform);
+
+}
diff --git a/src/main/java/common/service/impl/ContractServiceImpl.java b/src/main/java/common/service/impl/ContractServiceImpl.java
index 66076ac..9bf6d9d 100644
--- a/src/main/java/common/service/impl/ContractServiceImpl.java
+++ b/src/main/java/common/service/impl/ContractServiceImpl.java
@@ -83,8 +83,14 @@ public class ContractServiceImpl implements ContractService{
 
     @Override
     public Double getRebat(String product, Integer level, Long money) {
-        PriceLevelMoney levelMoney = priceLevelMoneyRepository.getOne(product, level);
-        return money * 1.0  / levelMoney.getMoney();
+        Double rebat = 1d;
+        try{
+            PriceLevelMoney levelMoney = priceLevelMoneyRepository.getOne(product, level);
+            rebat = money * 1.0  / levelMoney.getMoney();
+        } catch (Exception e){
+            e.printStackTrace();
+        }
+        return rebat;
     }
 
     @Override
diff --git a/src/main/java/dic/ContractTypeEnum.java b/src/main/java/dic/ContractTypeEnum.java
new file mode 100644
index 0000000..b20fe25
--- /dev/null
+++ b/src/main/java/dic/ContractTypeEnum.java
@@ -0,0 +1,28 @@
+package dic;
+
+/**
+ * Created by mxq on 18/4/12.
+ * desc:合同类型
+ */
+public enum ContractTypeEnum {
+
+    MAIN("main","产品基础套餐"),
+    INCREMENT("increment","增值服务套餐");
+
+    private String key;
+    private String value;
+
+    ContractTypeEnum(String key, String value) {
+        this.key = key;
+        this.value = value;
+    }
+
+    public String getKey() {
+        return key;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+}
diff --git a/src/main/java/tkio/controller/TkioAccountController.java b/src/main/java/tkio/controller/TkioAccountController.java
index 5e3948d..5ca65e1 100644
--- a/src/main/java/tkio/controller/TkioAccountController.java
+++ b/src/main/java/tkio/controller/TkioAccountController.java
@@ -64,6 +64,24 @@ public class TkioAccountController {
         return ResultModel.OK(tkioAccountService.enable(loginAccount, resource));
     }
 
+    //关闭缴费提醒
+    @RequestMapping(value = "/forbidenpress", method = RequestMethod.PUT)
+    @ResponseBody
+    public ResultModel forbidenPress(@CurrentAccount User loginAccount, @RequestBody PressMoney resource, HttpServletRequest request) {
+        UserLogThread userlog = new UserLogThread(loginAccount.getEmail(), loginAccount.getName(), OperateObjectTypeEnum.CUSTOMER.getKey(), resource.getEmail(), "关闭异常状态跟进", request,loginAccount.getRole());
+        userlog.start();
+        return ResultModel.OK(tkioAccountService.forbidenPress(loginAccount, resource));
+    }
+
+    //开启缴费提醒
+    @RequestMapping(value = "/enablepress", method = RequestMethod.PUT)
+    @ResponseBody
+    public ResultModel enablePress(@CurrentAccount User loginAccount, @RequestBody PressMoney resource, HttpServletRequest request) {
+        UserLogThread userlog = new UserLogThread(loginAccount.getEmail(), loginAccount.getName(), OperateObjectTypeEnum.CUSTOMER.getKey(), resource.getEmail(), "开启异常状态跟进", request,loginAccount.getRole());
+        userlog.start();
+        return ResultModel.OK(tkioAccountService.enablePress(loginAccount, resource));
+    }
+
     //缴费
     @RequestMapping(value = "/pay", method = RequestMethod.PUT)
     @ResponseBody
diff --git a/src/main/java/tkio/service/TkioAccountService.java b/src/main/java/tkio/service/TkioAccountService.java
index f47b3b5..144ece2 100644
--- a/src/main/java/tkio/service/TkioAccountService.java
+++ b/src/main/java/tkio/service/TkioAccountService.java
@@ -20,6 +20,12 @@ public interface TkioAccountService {
     //到期提醒开启
     Reminder enable(User user, Reminder resource);
 
+    //催款提醒关闭
+    PressMoney forbidenPress(User user, PressMoney resource);
+
+    //催款提醒开启
+    PressMoney enablePress(User user, PressMoney resource);
+
     //缴费
     Payment pay(User user, Payment resource);
 
diff --git a/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java b/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java
index 6eab4ab..3c3eb9d 100644
--- a/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java
+++ b/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java
@@ -72,6 +72,8 @@ public class TkioAccountServiceImpl implements TkioAccountService {
     UserService userService;
     @Autowired
     ReminderLevelRepository reminderLevelRepository;
+    @Autowired
+    PressMoneyRepository pressMoneyRepository;
 
     @Override
     public List<Account4Web> findAll(User user) {
@@ -224,6 +226,26 @@ public class TkioAccountServiceImpl implements TkioAccountService {
     }
 
     @Override
+    public PressMoney forbidenPress(User user, PressMoney resource) {
+        resource.setUser(user.getId());
+        resource.setModifyTime(new Date());
+        resource.setPlatform("tkio");
+        resource.setPressStatus(false);
+        resource.setDs(DateUtil.getBeforeDays(0));
+        return pressMoneyRepository.save(resource);
+    }
+
+    @Override
+    public PressMoney enablePress(User user, PressMoney resource) {
+        resource.setUser(user.getId());
+        resource.setModifyTime(new Date());
+        resource.setPlatform("tkio");
+        resource.setPressStatus(true);
+        resource.setDs(DateUtil.getBeforeDays(0));
+        return pressMoneyRepository.save(resource);
+    }
+
+    @Override
     public Payment pay(User user, Payment resource) {
         resource.setUser(user.getId());
         resource.setPayDate(new Date());
diff --git a/src/main/java/track/controller/TrackAccountController.java b/src/main/java/track/controller/TrackAccountController.java
index 8005602..3ffbbc7 100644
--- a/src/main/java/track/controller/TrackAccountController.java
+++ b/src/main/java/track/controller/TrackAccountController.java
@@ -58,6 +58,24 @@ public class TrackAccountController {
         return ResultModel.OK(tkioAccountService.enable(loginAccount, resource));
     }
 
+    //关闭缴费提醒
+    @RequestMapping(value = "/forbidenpress", method = RequestMethod.PUT)
+    @ResponseBody
+    public ResultModel forbidenPress(@CurrentAccount User loginAccount, @RequestBody PressMoney resource, HttpServletRequest request) {
+        UserLogThread userlog = new UserLogThread(loginAccount.getEmail(), loginAccount.getName(), OperateObjectTypeEnum.CUSTOMER.getKey(), resource.getEmail(), "关闭异常状态跟进", request,loginAccount.getRole());
+        userlog.start();
+        return ResultModel.OK(tkioAccountService.forbidenPress(loginAccount, resource));
+    }
+
+    //开启缴费提醒
+    @RequestMapping(value = "/enablepress", method = RequestMethod.PUT)
+    @ResponseBody
+    public ResultModel enablePress(@CurrentAccount User loginAccount, @RequestBody PressMoney resource, HttpServletRequest request) {
+        UserLogThread userlog = new UserLogThread(loginAccount.getEmail(), loginAccount.getName(), OperateObjectTypeEnum.CUSTOMER.getKey(), resource.getEmail(), "开启异常状态跟进", request,loginAccount.getRole());
+        userlog.start();
+        return ResultModel.OK(tkioAccountService.enablePress(loginAccount, resource));
+    }
+
     //缴费
     @RequestMapping(value = "/pay", method = RequestMethod.PUT)
     @ResponseBody
diff --git a/src/main/java/track/service/TrackAccountService.java b/src/main/java/track/service/TrackAccountService.java
index 5377a1c..576288a 100644
--- a/src/main/java/track/service/TrackAccountService.java
+++ b/src/main/java/track/service/TrackAccountService.java
@@ -19,6 +19,13 @@ public interface TrackAccountService {
     //到期提醒开启
     Reminder enable(User user, Reminder resource);
 
+    //催款提醒关闭
+    PressMoney forbidenPress(User user, PressMoney resource);
+
+    //催款提醒开启
+    PressMoney enablePress(User user, PressMoney resource);
+
+
     //缴费
     Payment pay(User user, Payment resource);
 
diff --git a/src/main/java/track/service/impl/TrackAccountServiceImpl.java b/src/main/java/track/service/impl/TrackAccountServiceImpl.java
index 7cd302d..61b9377 100644
--- a/src/main/java/track/service/impl/TrackAccountServiceImpl.java
+++ b/src/main/java/track/service/impl/TrackAccountServiceImpl.java
@@ -60,6 +60,8 @@ public class TrackAccountServiceImpl implements TrackAccountService{
     ContractChangeRepository contractChangeRepository;
     @Autowired
     PackageTypeRepository packageTypeRepository;
+    @Autowired
+    PressMoneyRepository pressMoneyRepository;
 
     @Override
     public List<TrackAccount4Web> findAll(User user) {
@@ -163,6 +165,26 @@ public class TrackAccountServiceImpl implements TrackAccountService{
     }
 
     @Override
+    public PressMoney forbidenPress(User user, PressMoney resource) {
+        resource.setUser(user.getId());
+        resource.setModifyTime(new Date());
+        resource.setPlatform("track");
+        resource.setPressStatus(false);
+        resource.setDs(DateUtil.getBeforeDays(0));
+        return pressMoneyRepository.save(resource);
+    }
+
+    @Override
+    public PressMoney enablePress(User user, PressMoney resource) {
+        resource.setUser(user.getId());
+        resource.setModifyTime(new Date());
+        resource.setPlatform("track");
+        resource.setPressStatus(true);
+        resource.setDs(DateUtil.getBeforeDays(0));
+        return pressMoneyRepository.save(resource);
+    }
+
+    @Override
     public Payment pay(User user, Payment resource) {
         resource.setUser(user.getId());
         resource.setPayDate(new Date());
diff --git a/src/main/resources/persistence.properties b/src/main/resources/persistence.properties
index cfecbcf..be0c68c 100644
--- a/src/main/resources/persistence.properties
+++ b/src/main/resources/persistence.properties
@@ -19,4 +19,8 @@ track.dataSource.password=${track.password}
 
 dmp.dataSource.url=${dmp.url}
 dmp.dataSource.username=${dmp.username}
-dmp.dataSource.password=${dmp.password}
\ No newline at end of file
+dmp.dataSource.password=${dmp.password}
+
+io.dataSource.url=${io.url}
+io.dataSource.username=${io.username}
+io.dataSource.password=${io.password}
\ No newline at end of file
diff --git a/src/main/resources/spring/applicationContext.xml b/src/main/resources/spring/applicationContext.xml
index 49508ea..188d075 100644
--- a/src/main/resources/spring/applicationContext.xml
+++ b/src/main/resources/spring/applicationContext.xml
@@ -18,6 +18,7 @@
 
 	<context:component-scan base-package="tkio" />
 	<context:component-scan base-package="track" />
+	<context:component-scan base-package="userio" />
 	<context:component-scan base-package="common" />
 	<context:component-scan base-package="office" />
 	<context:component-scan base-package="dmp" />
@@ -80,6 +81,11 @@
 		<property name="username" value="${dmp.dataSource.username}"/>
 		<property name="password" value="${dmp.dataSource.password}"/>
 	</bean>
+	<bean id="ioDataSource" parent="parentDataSource">
+		<property name="url" value="${io.dataSource.url}"/>
+		<property name="username" value="${io.dataSource.username}"/>
+		<property name="password" value="${io.dataSource.password}"/>
+	</bean>
 
 	<!-- JPA实体管理工厂的配置 -->
 	<bean id="entityManagerFactory" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
@@ -173,6 +179,25 @@
 			</props>
 		</property>
 	</bean>
+	<bean id="ioEntityManagerFactory" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
+		<property name="dataSource" ref="ioDataSource"/>
+		<property name="packagesToScan" value="userio.model"></property>
+		<property name="persistenceUnitName" value="ioUnit" />
+
+		<property name="jpaVendorAdapter" ref="hibernateJpaVendorAdapter"/>
+		<property name="jpaProperties">
+			<props>
+				<prop key="hibernate.ejb.naming_strategy">org.hibernate.cfg.ImprovedNamingStrategy</prop>
+				<prop key="hibernate.show_sql">false</prop>
+				<prop key="hibernate.hbm2ddl.auto">update</prop><!-- none -->
+
+				<prop key="hibernate.connection.CharSet">utf8</prop>
+				<prop key="hibernate.connection.characterEncoding">utf8</prop>
+				<prop key="hibernate.connection.useUnicode">true</prop>
+			</props>
+		</property>
+	</bean>
+
 	<!--指定实现JPA的适配器 -->
 	<bean id="hibernateJpaVendorAdapter" class="org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter">
 		<property name="databasePlatform" value="org.hibernate.dialect.MySQLDialect"/>
@@ -194,6 +219,9 @@
 	<bean id="dmpTransactionManager" class="org.springframework.orm.jpa.JpaTransactionManager">
 		<property name="entityManagerFactory" ref="dmpEntityManagerFactory"/>
 	</bean>
+	<bean id="ioTransactionManager" class="org.springframework.orm.jpa.JpaTransactionManager">
+		<property name="entityManagerFactory" ref="ioEntityManagerFactory"/>
+	</bean>
 
 	<!-- Spring Data Jpa配置 -->
 	<jpa:repositories base-package="common.repository"
@@ -211,6 +239,9 @@
 	<jpa:repositories base-package="dmp.repository"
 					  repository-impl-postfix="Impl" transaction-manager-ref="dmpTransactionManager"
 					  entity-manager-factory-ref="dmpEntityManagerFactory"/>
+	<jpa:repositories base-package="userio.repository"
+					  repository-impl-postfix="Impl" transaction-manager-ref="ioTransactionManager"
+					  entity-manager-factory-ref="ioEntityManagerFactory"/>
 
 
 	<!-- 使用annotation定义事务 -->
@@ -219,6 +250,7 @@
 	<tx:annotation-driven transaction-manager="tkioTransactionManager" proxy-target-class="true"/>
 	<tx:annotation-driven transaction-manager="trackTransactionManager" proxy-target-class="true"/>
 	<tx:annotation-driven transaction-manager="dmpTransactionManager" proxy-target-class="true"/>
+	<tx:annotation-driven transaction-manager="ioTransactionManager" proxy-target-class="true"/>
 
 	<tx:advice id="txAdvice" transaction-manager="transactionManager">
 		<tx:attributes>
@@ -266,6 +298,15 @@
 			<tx:method name="*" propagation="REQUIRED"/>
 		</tx:attributes>
 	</tx:advice>
+	<tx:advice id="ioTxAdvice" transaction-manager="ioTransactionManager">
+		<tx:attributes>
+			<tx:method name="report*" propagation="SUPPORTS" read-only="true"/>
+			<tx:method name="list*" propagation="SUPPORTS" read-only="true"/>
+			<tx:method name="query*" propagation="SUPPORTS" read-only="true"/>
+			<tx:method name="find*" propagation="SUPPORTS" read-only="true"/>
+			<tx:method name="*" propagation="REQUIRED"/>
+		</tx:attributes>
+	</tx:advice>
 
 	<aop:config expose-proxy="true">
 		<aop:pointcut id="txPointcut" expression="execution(* common.service.*.*(..))"/>
@@ -283,6 +324,10 @@
 		<aop:pointcut id="tracktxPointcut" expression="execution(* track.service.*.*(..))"/>
 		<aop:advisor advice-ref="trackTxAdvice" pointcut-ref="tracktxPointcut"/>
 	</aop:config>
+	<aop:config expose-proxy="true">
+		<aop:pointcut id="iotxPointcut" expression="execution(* userio.service.*.*(..))"/>
+		<aop:advisor advice-ref="ioTxAdvice" pointcut-ref="iotxPointcut"/>
+	</aop:config>
 
     <!-- SpringMVC上传文件时,需要配置MultipartResolver处理器 -->
     <bean id="multipartResolver" class="org.springframework.web.multipart.commons.CommonsMultipartResolver">
--
libgit2 0.27.1