Skip to content

M
manager
Commit aa4b2b57 by zhangxiaoyan
Options

conflict

parents 323fc3f8 c2a8bc47
Showing with 2406 additions and 1423 deletions
.idea/workspace.xml
......@@ -2,6 +2,7 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="e2e217e2-2dd6-4c6f-ad19-b1cba46bc7ad" name="Default" comment="">
<<<<<<< HEAD
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/common/controller/UserLogController.class" afterPath="$PROJECT_DIR$/target/classes/common/controller/UserLogController.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/common/repository/AppInfoRepository.class" afterPath="$PROJECT_DIR$/target/classes/common/repository/AppInfoRepository.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/tkio/task/SyncAppDataTask.class" afterPath="$PROJECT_DIR$/target/classes/tkio/task/SyncAppDataTask.class" />
......@@ -10,7 +11,14 @@
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/tkio/task/SyncAppDataTask.java" afterPath="$PROJECT_DIR$/src/main/java/tkio/task/SyncAppDataTask.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/applicationContext-schedule.xml" afterPath="$PROJECT_DIR$/src/main/resources/applicationContext-schedule.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/applicationContext-schedule.xml" afterPath="$PROJECT_DIR$/target/classes/applicationContext-schedule.xml" />
=======
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/common/controller/UserLogController.java" afterPath="$PROJECT_DIR$/src/main/java/common/controller/UserLogController.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/track/controller/TrackAccountController.java" afterPath="$PROJECT_DIR$/src/main/java/track/controller/TrackAccountController.java" />
>>>>>>> c2a8bc47b172bee7e416b12aa93f6e17f5341751
</list>
<list id="933e480d-1136-4c92-9651-6e74b37fc51c" name="Failed commit: Default" comment="track客户管理" />
<ignored path="$PROJECT_DIR$/target/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
......@@ -28,13 +36,22 @@
<file leaf-file-name="SyncAppDataTask.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/task/SyncAppDataTask.java">
<provider selected="true" editor-type-id="text-editor">
<<<<<<< HEAD
<state relative-caret-position="109">
<caret line="127" column="20" lean-forward="false" selection-start-line="127" selection-start-column="13" selection-end-line="127" selection-end-column="20" />
<folding />
=======
<state relative-caret-position="401">
<caret line="39" column="11" lean-forward="false" selection-start-line="39" selection-start-column="11" selection-end-line="39" selection-end-column="11" />
<folding>
<element signature="imports" expanded="true" />
</folding>
>>>>>>> c2a8bc47b172bee7e416b12aa93f6e17f5341751
</state>
</provider>
</entry>
</file>
<<<<<<< HEAD
<file leaf-file-name="Constant.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/util/Constant.java">
<provider selected="true" editor-type-id="text-editor">
......@@ -102,11 +119,19 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="126">
<caret line="19" column="72" lean-forward="true" selection-start-line="19" selection-start-column="72" selection-end-line="19" selection-end-column="72" />
=======
<file leaf-file-name="NoticeTask.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/task/NoticeTask.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="115">
<caret line="5" column="25" lean-forward="false" selection-start-line="5" selection-start-column="25" selection-end-line="5" selection-end-column="25" />
>>>>>>> c2a8bc47b172bee7e416b12aa93f6e17f5341751
<folding />
</state>
</provider>
</entry>
</file>
<<<<<<< HEAD
<file leaf-file-name="UserLogController.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/common/controller/UserLogController.java">
<provider selected="true" editor-type-id="text-editor">
......@@ -133,6 +158,8 @@
</provider>
</entry>
</file>
=======
>>>>>>> c2a8bc47b172bee7e416b12aa93f6e17f5341751
</leaf>
</component>
<component name="FileTemplateManagerImpl">
......@@ -176,21 +203,28 @@
<option value="$PROJECT_DIR$/src/main/java/common/service/AppService.java" />
<option value="$PROJECT_DIR$/src/main/java/common/service/impl/AppServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/resources/applicationContext.xml" />
<option value="$PROJECT_DIR$/src/main/java/security/interceptor/AuthorizationInterceptor.java" />
<option value="$PROJECT_DIR$/src/main/java/dic/OperateSatusEnum.java" />
<option value="$PROJECT_DIR$/src/main/java/dic/OperateObjectTypeEnum.java" />
<option value="$PROJECT_DIR$/src/main/java/util/IP.java" />
<option value="$PROJECT_DIR$/src/main/java/util/IPAddrUtil.java" />
<option value="$PROJECT_DIR$/src/main/java/common/controller/AppController.java" />
<option value="$PROJECT_DIR$/src/main/java/common/model/UserLog.java" />
<option value="$PROJECT_DIR$/src/main/java/util/UserLogThread.java" />
<option value="$PROJECT_DIR$/src/main/java/common/service/UserLogService.java" />
<option value="$PROJECT_DIR$/src/main/java/common/service/impl/UserLogServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/common/repository/UserLogRepository.java" />
<option value="$PROJECT_DIR$/src/main/java/util/UserLogThread.java" />
<option value="$PROJECT_DIR$/src/main/java/security/interceptor/AuthorizationInterceptor.java" />
<option value="$PROJECT_DIR$/src/main/java/track/service/impl/TrackAccountServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/common/controller/UserLogController.java" />
<<<<<<< HEAD
<option value="$PROJECT_DIR$/src/main/java/tkio/task/SyncAppDataTask.java" />
<option value="$PROJECT_DIR$/src/main/java/common/repository/AppInfoRepository.java" />
<option value="$PROJECT_DIR$/src/main/resources/applicationContext-schedule.xml" />
=======
<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/tkio/task/NoticeTask.java" />
>>>>>>> c2a8bc47b172bee7e416b12aa93f6e17f5341751
</list>
</option>
</component>
......@@ -227,42 +261,47 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="PackagesPane">
<pane id="ProjectPane">
<subPane>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="manager" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="manage" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
<option name="myItemId" value="manager" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="manager" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="manage" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
<option name="myItemId" value="manager" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="util" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
<option name="myItemId" value="web" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="WEB-INF" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="manager" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="manage" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
<option name="myItemId" value="manager" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<<<<<<< HEAD
<option name="myItemId" value="tkio" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</PATH_ELEMENT>
......@@ -311,66 +350,92 @@
<PATH_ELEMENT>
<option name="myItemId" value="dic" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
=======
<option name="myItemId" value="src" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="main" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="webapp" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
>>>>>>> c2a8bc47b172bee7e416b12aa93f6e17f5341751
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="manager" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="manage" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
<option name="myItemId" value="manager" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="common" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
<option name="myItemId" value="src" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="service" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
<option name="myItemId" value="main" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="webapp" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="WEB-INF" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="manager" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="manage" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
<option name="myItemId" value="manager" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="common" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
<option name="myItemId" value="src" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="service" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
<option name="myItemId" value="main" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="impl" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
<option name="myItemId" value="resources" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="manager" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="manage" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
<option name="myItemId" value="manager" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="common" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
<option name="myItemId" value="src" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="repository" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
<option name="myItemId" value="main" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
</subPane>
</pane>
<pane id="Scope" />
<pane id="Scratches" />
<pane id="PackagesPane">
<subPane>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="manager" />
......@@ -380,14 +445,6 @@
<option name="myItemId" value="manage" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="common" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="model" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
......@@ -399,11 +456,7 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="common" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="controller" />
<option name="myItemId" value="util" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</PATH_ELEMENT>
</PATH>
......@@ -417,134 +470,94 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="common" />
<option name="myItemId" value="track" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</PATH_ELEMENT>
</PATH>
</subPane>
</pane>
<pane id="ProjectPane">
<subPane>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="manager" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="manager" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="manager" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="manager" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
<option name="myItemId" value="manage" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="web" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
<option name="myItemId" value="track" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="WEB-INF" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
<option name="myItemId" value="controller" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="manager" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="manager" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="src" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
<option name="myItemId" value="manage" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="main" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
<option name="myItemId" value="tkio" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="webapp" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
<option name="myItemId" value="task" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="manager" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="manager" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="src" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="main" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="webapp" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
<option name="myItemId" value="manage" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="WEB-INF" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
<option name="myItemId" value="tkio" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="manager" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="manager" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="src" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
<option name="myItemId" value="manage" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="main" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
<option name="myItemId" value="tkio" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="resources" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
<option name="myItemId" value="controller" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="manager" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="manager" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="src" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
<option name="myItemId" value="manage" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="main" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
<option name="myItemId" value="common" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</PATH_ELEMENT>
</PATH>
</subPane>
</pane>
<pane id="Scratches" />
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
......@@ -669,65 +682,6 @@
<envs />
<method />
</configuration>
<configuration default="true" type="ArquillianJUnit" factoryName="" nameIsGenerated="true">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
<module name="" />
<option name="arquillianRunConfiguration">
<value>
<option name="containerStateName" value="" />
</value>
</option>
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
<option name="PACKAGE_NAME" />
<option name="MAIN_CLASS_NAME" />
<option name="METHOD_NAME" />
<option name="TEST_OBJECT" value="class" />
<option name="VM_PARAMETERS" />
<option name="PARAMETERS" />
<option name="WORKING_DIRECTORY" />
<option name="ENV_VARIABLES" />
<option name="PASS_PARENT_ENVS" value="true" />
<option name="TEST_SEARCH_SCOPE">
<value defaultName="singleModule" />
</option>
<envs />
<patterns />
<method />
</configuration>
<configuration default="true" type="ArquillianTestNG" factoryName="">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
<module name="" />
<option name="arquillianRunConfiguration">
<value>
<option name="containerStateName" value="" />
</value>
</option>
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
<option name="SUITE_NAME" />
<option name="PACKAGE_NAME" />
<option name="MAIN_CLASS_NAME" />
<option name="METHOD_NAME" />
<option name="GROUP_NAME" />
<option name="TEST_OBJECT" value="CLASS" />
<option name="VM_PARAMETERS" />
<option name="PARAMETERS" />
<option name="WORKING_DIRECTORY" />
<option name="OUTPUT_DIRECTORY" />
<option name="ANNOTATION_TYPE" />
<option name="ENV_VARIABLES" />
<option name="PASS_PARENT_ENVS" value="true" />
<option name="TEST_SEARCH_SCOPE">
<value defaultName="singleModule" />
</option>
<option name="USE_DEFAULT_REPORTERS" value="false" />
<option name="PROPERTIES_FILE" />
<envs />
<properties />
<listeners />
<method />
</configuration>
<configuration default="true" type="Cold Fusion runner description" factoryName="Cold Fusion" custom_browser="" web_path="">
<method />
</configuration>
......@@ -1035,12 +989,45 @@
<option name="presentableId" value="Default" />
<updated>1514260912987</updated>
<workItem from="1514260914510" duration="14315000" />
<<<<<<< HEAD
<workItem from="1514344618155" duration="26138000" />
=======
<workItem from="1514344618155" duration="20292000" />
<workItem from="1514369893852" duration="5421000" />
</task>
<task id="LOCAL-00001" summary="解决报错">
<created>1514370085995</created>
<option name="number" value="00001" />
<option name="presentableId" value="LOCAL-00001" />
<option name="project" value="LOCAL" />
<updated>1514370085995</updated>
</task>
<task id="LOCAL-00002" summary="track客户管理">
<created>1514373074713</created>
<option name="number" value="00002" />
<option name="presentableId" value="LOCAL-00002" />
<option name="project" value="LOCAL" />
<updated>1514373074713</updated>
>>>>>>> c2a8bc47b172bee7e416b12aa93f6e17f5341751
</task>
<option name="localTasksCounter" value="3" />
<servers />
</component>
<component name="TimeTrackingManager">
<<<<<<< HEAD
<option name="totallyTimeSpent" value="40453000" />
=======
<option name="totallyTimeSpent" value="40028000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
<is-autoscroll-to-source value="true" />
</todo-panel>
<todo-panel id="all">
<are-packages-shown value="true" />
<is-autoscroll-to-source value="true" />
</todo-panel>
>>>>>>> c2a8bc47b172bee7e416b12aa93f6e17f5341751
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
......@@ -1057,39 +1044,112 @@
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
<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.4" 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.33" sideWeight="0.5" order="13" 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.44517186" 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="13" 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="4" side_tool="false" content_ui="tabs" />
<<<<<<< HEAD
<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.33" sideWeight="0.5" 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="true" show_stripe_button="true" weight="0.2569558" sideWeight="0.5" order="9" 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.4222586" sideWeight="0.5" 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.3289689" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
>>>>>>> c2a8bc47b172bee7e416b12aa93f6e17f5341751
<window_info id="Spring" 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="3" 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="Terminal" 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="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.25340393" sideWeight="0.5" order="7" 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.25718608" sideWeight="0.5" order="7" 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.33" sideWeight="0.5" order="5" 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="Find" 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="8" side_tool="false" 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="6" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" 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="5" side_tool="true" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
<window_info id="Message" 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="7" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="10" side_tool="false" content_ui="combo" />
<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="12" 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" />
</layout>
<layout-to-restore>
<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="7" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
<window_info id="Nl-Palette" 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="6" side_tool="false" content_ui="tabs" />
<window_info id="Message" 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="7" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" 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="6" side_tool="true" content_ui="tabs" />
<window_info id="Maven Projects" 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="0" side_tool="false" content_ui="tabs" />
<window_info id="Properties" 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="1" side_tool="false" content_ui="tabs" />
<window_info id="Capture Tool" 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="0" side_tool="false" content_ui="tabs" />
<window_info id="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="1" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="10" side_tool="false" content_ui="combo" />
<window_info id="Database" 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="2" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
<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.44517186" 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="13" 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="4" 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="12" 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.3502455" sideWeight="0.5" 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.3289689" sideWeight="0.5" 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.33" 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.33" 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.25718608" sideWeight="0.5" order="7" 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.33" sideWeight="0.5" order="5" 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="Find" 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="8" side_tool="false" content_ui="tabs" />
</layout>
<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="6" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" 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="5" side_tool="true" content_ui="tabs" />
</layout-to-restore>
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="processedProjectFiles" value="true" />
</component>
<component name="Vcs.Log.Tabs.Properties">
<option name="TAB_STATES">
<map>
<entry key="MAIN">
<value>
<State>
<option name="RECENTLY_FILTERED_USER_GROUPS">
<collection />
</option>
<option name="RECENTLY_FILTERED_BRANCH_GROUPS">
<collection />
</option>
</State>
</value>
</entry>
</map>
</option>
</component>
<component name="VcsContentAnnotationSettings">
<option name="myLimit" value="2678400000" />
</component>
<component name="VcsManagerConfiguration">
<MESSAGE value="解决报错" />
<MESSAGE value="track客户管理" />
<option name="LAST_COMMIT_MESSAGE" value="track客户管理" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager />
<breakpoint-manager>
<breakpoints>
<line-breakpoint enabled="true" type="java-line">
<url>file://$USER_HOME$/AppData/Local/Temp/tmp_1_UserLogController.class</url>
<properties />
<option name="timeStamp" value="1" />
</line-breakpoint>
</breakpoints>
<option name="time" value="2" />
</breakpoint-manager>
<watches-manager />
</component>
<component name="antWorkspaceConfiguration">
......@@ -1097,6 +1157,7 @@
<option name="FILTER_TARGETS" value="false" />
</component>
<component name="editorHistoryManager">
<<<<<<< HEAD
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/model/App.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="264">
......@@ -1185,6 +1246,8 @@
</state>
</provider>
</entry>
=======
>>>>>>> c2a8bc47b172bee7e416b12aa93f6e17f5341751
<entry file="file://$PROJECT_DIR$/src/main/java/dmp/model/TagCrawlerAppsWandoujia.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="484">
......@@ -1215,7 +1278,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="436">
<caret line="32" column="5" lean-forward="true" selection-start-line="27" selection-start-column="4" selection-end-line="32" selection-end-column="5" />
<folding />
</state>
</provider>
</entry>
......@@ -1223,7 +1285,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="176">
<caret line="17" column="39" lean-forward="false" selection-start-line="17" selection-start-column="29" selection-end-line="17" selection-end-column="39" />
<folding />
</state>
</provider>
</entry>
......@@ -1282,9 +1343,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198">
<caret line="12" column="17" lean-forward="false" selection-start-line="12" selection-start-column="17" selection-end-line="12" selection-end-column="17" />
<folding>
<marker date="1514361442488" expanded="false" signature="35:176" ph="..." />
</folding>
</state>
</provider>
</entry>
......@@ -1296,6 +1354,7 @@
</state>
</provider>
</entry>
<<<<<<< HEAD
<entry file="file://$PROJECT_DIR$/src/main/java/security/interceptor/AuthorizationInterceptor.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="265">
......@@ -1304,6 +1363,21 @@
<element signature="e#1229#1230#0" expanded="false" />
<element signature="e#1285#1286#0" expanded="false" />
</folding>
=======
<entry file="file://$PROJECT_DIR$/src/main/resources/applicationContext-schedule.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="236">
<caret line="24" column="7" lean-forward="false" selection-start-line="24" selection-start-column="7" selection-end-line="24" selection-end-column="7" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/task/SyncAppDataTask.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1320">
<caret line="111" column="49" lean-forward="false" selection-start-line="111" selection-start-column="49" selection-end-line="111" selection-end-column="49" />
<folding />
>>>>>>> c2a8bc47b172bee7e416b12aa93f6e17f5341751
</state>
</provider>
</entry>
......@@ -1331,14 +1405,7 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/dic/OperateSatusEnum.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="88">
<caret line="4" column="12" lean-forward="false" selection-start-line="4" selection-start-column="12" selection-end-line="4" selection-end-column="12" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/dic/OperateSatusEnum.java" />
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/UserRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="110">
......@@ -1365,19 +1432,10 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/dic/OperateObjectTypeEnum.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="463">
<caret line="28" column="1" lean-forward="true" selection-start-line="28" selection-start-column="1" selection-end-line="28" selection-end-column="1" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/service/UserService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="154">
<caret line="10" column="17" lean-forward="false" selection-start-line="10" selection-start-column="17" selection-end-line="10" selection-end-column="17" />
<folding />
</state>
</provider>
</entry>
......@@ -1397,88 +1455,176 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/util/UserLogThread.java">
<entry file="file://$PROJECT_DIR$/src/main/java/common/model/UserLog.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="117">
<caret line="60" column="32" lean-forward="false" selection-start-line="60" selection-start-column="18" selection-end-line="60" selection-end-column="32" />
<state relative-caret-position="345">
<caret line="15" column="30" lean-forward="false" selection-start-line="15" selection-start-column="19" selection-end-line="15" selection-end-column="30" />
<folding>
<element signature="imports" expanded="false" />
<<<<<<< HEAD
=======
<element signature="e#554#555#0" expanded="false" />
<element signature="e#579#580#0" expanded="false" />
<element signature="e#617#618#0" expanded="false" />
<element signature="e#645#646#0" expanded="false" />
<element signature="e#687#688#0" expanded="false" />
<element signature="e#721#722#0" expanded="false" />
<element signature="e#779#780#0" expanded="false" />
<element signature="e#825#826#0" expanded="false" />
<element signature="e#868#869#0" expanded="false" />
<element signature="e#903#904#0" expanded="false" />
<element signature="e#963#964#0" expanded="false" />
<element signature="e#1011#1012#0" expanded="false" />
<element signature="e#1053#1054#0" expanded="false" />
<element signature="e#1087#1088#0" expanded="false" />
<element signature="e#1145#1146#0" expanded="false" />
<element signature="e#1191#1192#0" expanded="false" />
<element signature="e#1224#1225#0" expanded="false" />
<element signature="e#1249#1250#0" expanded="false" />
<element signature="e#1289#1290#0" expanded="false" />
<element signature="e#1317#1318#0" expanded="false" />
<element signature="e#1365#1366#0" expanded="false" />
<element signature="e#1405#1406#0" expanded="false" />
<element signature="e#1475#1476#0" expanded="false" />
<element signature="e#1533#1534#0" expanded="false" />
<element signature="e#1577#1578#0" expanded="false" />
<element signature="e#1613#1614#0" expanded="false" />
<element signature="e#1675#1676#0" expanded="false" />
<element signature="e#1725#1726#0" expanded="false" />
<element signature="e#1767#1768#0" expanded="false" />
<element signature="e#1801#1802#0" expanded="false" />
<element signature="e#1859#1860#0" expanded="false" />
<element signature="e#1905#1906#0" expanded="false" />
<element signature="e#1944#1945#0" expanded="false" />
<element signature="e#1975#1976#0" expanded="false" />
<element signature="e#2027#2028#0" expanded="false" />
<element signature="e#2067#2068#0" expanded="false" />
>>>>>>> c2a8bc47b172bee7e416b12aa93f6e17f5341751
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/model/UserLog.java">
<entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/javax/persistence/hibernate-jpa-2.0-api/1.0.1.Final/hibernate-jpa-2.0-api-1.0.1.Final.jar!/javax/persistence/criteria/CriteriaBuilder.class">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="117">
<caret line="15" column="30" lean-forward="false" selection-start-line="15" selection-start-column="19" selection-end-line="15" selection-end-column="30" />
<state relative-caret-position="128">
<caret line="110" column="48" lean-forward="false" selection-start-line="110" selection-start-column="48" selection-end-line="110" selection-end-column="48" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/CityRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="207">
<caret line="13" column="60" lean-forward="false" selection-start-line="13" selection-start-column="60" selection-end-line="13" selection-end-column="60" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/AppInfoRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="207">
<caret line="11" column="1" lean-forward="false" selection-start-line="11" selection-start-column="1" selection-end-line="11" selection-end-column="1" />
<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="322">
<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>
<element signature="imports" expanded="true" />
<element signature="e#554#555#0" expanded="true" />
<element signature="e#579#580#0" expanded="true" />
<element signature="e#617#618#0" expanded="true" />
<element signature="e#645#646#0" expanded="true" />
<element signature="e#687#688#0" expanded="true" />
<element signature="e#721#722#0" expanded="true" />
<element signature="e#779#780#0" expanded="true" />
<element signature="e#825#826#0" expanded="true" />
<element signature="e#868#869#0" expanded="true" />
<element signature="e#903#904#0" expanded="true" />
<element signature="e#963#964#0" expanded="true" />
<element signature="e#1011#1012#0" expanded="true" />
<element signature="e#1053#1054#0" expanded="true" />
<element signature="e#1087#1088#0" expanded="true" />
<element signature="e#1145#1146#0" expanded="true" />
<element signature="e#1191#1192#0" expanded="true" />
<element signature="e#1224#1225#0" expanded="true" />
<element signature="e#1249#1250#0" expanded="true" />
<element signature="e#1289#1290#0" expanded="true" />
<element signature="e#1317#1318#0" expanded="true" />
<element signature="e#1365#1366#0" expanded="true" />
<element signature="e#1405#1406#0" expanded="true" />
<element signature="e#1475#1476#0" expanded="true" />
<element signature="e#1533#1534#0" expanded="true" />
<element signature="e#1577#1578#0" expanded="true" />
<element signature="e#1613#1614#0" expanded="true" />
<element signature="e#1675#1676#0" expanded="true" />
<element signature="e#1725#1726#0" expanded="true" />
<element signature="e#1767#1768#0" expanded="true" />
<element signature="e#1801#1802#0" expanded="true" />
<element signature="e#1859#1860#0" expanded="true" />
<element signature="e#1905#1906#0" expanded="true" />
<element signature="e#1944#1945#0" expanded="true" />
<element signature="e#1975#1976#0" expanded="true" />
<element signature="e#2027#2028#0" expanded="true" />
<element signature="e#2067#2068#0" expanded="true" />
<element signature="imports" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/javax/persistence/hibernate-jpa-2.0-api/1.0.1.Final/hibernate-jpa-2.0-api-1.0.1.Final.jar!/javax/persistence/criteria/CriteriaBuilder.class">
<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="128">
<caret line="110" column="48" lean-forward="false" selection-start-line="110" selection-start-column="48" selection-end-line="110" selection-end-column="48" />
<state relative-caret-position="-920">
<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>
<<<<<<< HEAD
=======
<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="-4715">
<caret line="32" column="13" lean-forward="false" selection-start-line="32" selection-start-column="13" selection-end-line="32" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
>>>>>>> c2a8bc47b172bee7e416b12aa93f6e17f5341751
<entry file="file://$PROJECT_DIR$/src/main/java/common/service/UserLogService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="177">
<caret line="13" column="29" lean-forward="false" selection-start-line="13" selection-start-column="18" selection-end-line="13" selection-end-column="29" />
<state relative-caret-position="299">
<caret line="13" column="18" lean-forward="false" selection-start-line="13" selection-start-column="18" selection-end-line="13" selection-end-column="18" />
<folding>
<element signature="imports" expanded="true" />
<element signature="imports" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/service/impl/UserLogServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="265">
<caret line="31" column="50" lean-forward="false" selection-start-line="31" selection-start-column="33" selection-end-line="31" selection-end-column="50" />
<state relative-caret-position="306">
<caret line="29" column="25" lean-forward="false" selection-start-line="29" selection-start-column="25" selection-end-line="29" selection-end-column="25" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#870#871#0" expanded="true" />
<element signature="e#948#949#0" expanded="true" />
<element signature="imports" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/security/resolvers/LoginUserMethodArgumentsResolver.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="329">
<caret line="38" column="0" lean-forward="false" selection-start-line="38" selection-start-column="0" selection-end-line="38" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/dic/OperateObjectTypeEnum.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="76">
<caret line="9" column="22" lean-forward="false" selection-start-line="9" selection-start-column="14" selection-end-line="9" selection-end-column="22" />
<folding>
<element signature="e#364#365#0" expanded="true" />
<element signature="e#390#391#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/controller/AppController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="283">
<caret line="14" column="12" lean-forward="false" selection-start-line="14" selection-start-column="12" selection-end-line="14" selection-end-column="12" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/security/interceptor/AuthorizationInterceptor.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="483">
<caret line="63" column="21" lean-forward="false" selection-start-line="63" selection-start-column="21" selection-end-line="63" selection-end-column="21" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/track/model/App.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="345">
<caret line="19" column="24" lean-forward="false" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="24" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/track/repository/TrackAppRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="366">
<caret line="17" column="37" lean-forward="false" selection-start-line="17" selection-start-column="33" selection-end-line="17" selection-end-column="37" />
<folding>
<element signature="imports" expanded="false" />
</folding>
</state>
</provider>
......@@ -1515,48 +1661,120 @@
</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="53">
<state relative-caret-position="-414">
<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>
<<<<<<< HEAD
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/CityRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198">
<caret line="13" column="60" lean-forward="false" selection-start-line="13" selection-start-column="60" selection-end-line="13" selection-end-column="60" />
=======
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/task/AccountTask.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="950">
<caret line="87" column="34" lean-forward="false" selection-start-line="87" selection-start-column="30" selection-end-line="87" selection-end-column="34" />
>>>>>>> c2a8bc47b172bee7e416b12aa93f6e17f5341751
<folding />
</state>
</provider>
</entry>
<<<<<<< HEAD
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/AuthRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="110">
<caret line="11" column="65" lean-forward="false" selection-start-line="11" selection-start-column="40" selection-end-line="11" selection-end-column="65" />
=======
<entry file="file://$PROJECT_DIR$/src/main/java/track/repository/TrackAccountRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="253">
<caret line="18" column="18" lean-forward="false" selection-start-line="18" selection-start-column="18" selection-end-line="18" selection-end-column="18" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/BackVisitRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="253">
<caret line="17" column="20" lean-forward="false" selection-start-line="17" selection-start-column="20" selection-end-line="17" selection-end-column="20" />
<folding />
</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="1172">
<caret line="188" column="54" lean-forward="true" selection-start-line="188" selection-start-column="54" selection-end-line="188" selection-end-column="54" />
<folding />
</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="352">
<caret line="30" column="20" lean-forward="false" selection-start-line="30" selection-start-column="20" selection-end-line="30" selection-end-column="20" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/controller/UserLogController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="345">
<caret line="21" column="45" lean-forward="true" selection-start-line="21" selection-start-column="45" selection-end-line="21" selection-end-column="45" />
<folding>
<element signature="imports" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/util/UserLogThread.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="401">
<caret line="39" column="11" lean-forward="false" selection-start-line="39" selection-start-column="11" selection-end-line="39" selection-end-column="11" />
>>>>>>> c2a8bc47b172bee7e416b12aa93f6e17f5341751
<folding>
<element signature="imports" expanded="false" />
</folding>
</state>
</provider>
</entry>
<<<<<<< HEAD
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/BackVisitRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="154">
<caret line="16" column="28" lean-forward="false" selection-start-line="16" selection-start-column="27" selection-end-line="16" selection-end-column="28" />
<folding />
=======
<entry file="file://$PROJECT_DIR$/src/main/java/track/controller/TrackAccountController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="345">
<caret line="66" column="73" lean-forward="false" selection-start-line="66" selection-start-column="73" selection-end-line="66" selection-end-column="73" />
<folding>
<element signature="imports" expanded="true" />
</folding>
>>>>>>> c2a8bc47b172bee7e416b12aa93f6e17f5341751
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/controller/AppController.java">
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.java">
<provider selected="true" editor-type-id="text-editor">
<<<<<<< HEAD
<state relative-caret-position="-21">
<caret line="30" column="58" lean-forward="false" selection-start-line="30" selection-start-column="53" selection-end-line="30" selection-end-column="58" />
=======
<state relative-caret-position="366">
<caret line="67" column="73" lean-forward="false" selection-start-line="67" selection-start-column="73" selection-end-line="67" selection-end-column="73" />
>>>>>>> c2a8bc47b172bee7e416b12aa93f6e17f5341751
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<<<<<<< HEAD
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/AppInfoRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198">
......@@ -1577,6 +1795,12 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="109">
<caret line="127" column="20" lean-forward="false" selection-start-line="127" selection-start-column="13" selection-end-line="127" selection-end-column="20" />
=======
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/task/NoticeTask.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="115">
<caret line="5" column="25" lean-forward="false" selection-start-line="5" selection-start-column="25" selection-end-line="5" selection-end-column="25" />
>>>>>>> c2a8bc47b172bee7e416b12aa93f6e17f5341751
<folding />
</state>
</provider>
......
manage.iml
......@@ -80,7 +80,7 @@
<orderEntry type="module-library">
<library name="Maven: com.alibaba:jconsole:1.8.0">
<CLASSES>
<root url="jar://D:/java/jdk1.8.0_91/lib/jconsole.jar!/" />
<root url="jar://E:/Java/jdk1.8.0_65/lib/jconsole.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
......@@ -89,7 +89,7 @@
<orderEntry type="module-library">
<library name="Maven: com.alibaba:tools:1.8.0">
<CLASSES>
<root url="jar://D:/java/jdk1.8.0_91/lib/tools.jar!/" />
<root url="jar://E:/Java/jdk1.8.0_65/lib/tools.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
......
src/main/java/common/controller/UserLogController.java
......@@ -16,7 +16,7 @@ import java.util.List;
* Created by zxy on 2017/12/27.
*/
@Controller
@RequestMapping(value = "userlog")
@RequestMapping(value = "system/userlog")
public class UserLogController
{
@Autowired UserLogService userLogService;
......
src/main/java/common/model/Account4Web.java
......@@ -8,20 +8,24 @@ import java.util.Date;
@Entity
public class Account4Web {
private Long id;
private Long accountId;
private String email;
private String company;
private Date createDate;
private String status;
private String packageType;
private String pastDate;
private String track;
private String io;
private BigInteger track;
private BigInteger io;
private BigInteger trackLimit;
private BigInteger ioLimit;
private Integer backTime;
private String user;
private String tell;
private Long money;
private Boolean ioStatus;
private Boolean trackStatus;
private Boolean remStatus;
@Id
@GeneratedValue
......@@ -33,6 +37,14 @@ public class Account4Web {
this.id = id;
}
public Long getAccountId() {
return accountId;
}
public void setAccountId(Long accountId) {
this.accountId = accountId;
}
public String getEmail() {
return email;
}
......@@ -81,22 +93,38 @@ public class Account4Web {
this.pastDate = pastDate;
}
public String getTrack() {
public BigInteger getTrack() {
return track;
}
public void setTrack(String track) {
public void setTrack(BigInteger track) {
this.track = track;
}
public String getIo() {
public BigInteger getIo() {
return io;
}
public void setIo(String io) {
public void setIo(BigInteger io) {
this.io = io;
}
public BigInteger getTrackLimit() {
return trackLimit;
}
public void setTrackLimit(BigInteger trackLimit) {
this.trackLimit = trackLimit;
}
public BigInteger getIoLimit() {
return ioLimit;
}
public void setIoLimit(BigInteger ioLimit) {
this.ioLimit = ioLimit;
}
public Integer getBackTime() {
return backTime;
}
......@@ -144,4 +172,35 @@ public class Account4Web {
public void setTrackStatus(Boolean trackStatus) {
this.trackStatus = trackStatus;
}
public Boolean getRemStatus() {
return remStatus;
}
public void setRemStatus(Boolean remStatus) {
this.remStatus = remStatus;
}
@Override
public String toString() {
return "Account4Web{" +
"id=" + id +
", email='" + email + '\'' +
", company='" + company + '\'' +
", createDate=" + createDate +
", status='" + status + '\'' +
", packageType='" + packageType + '\'' +
", pastDate='" + pastDate + '\'' +
", track=" + track +
", io=" + io +
", trackLimit=" + trackLimit +
", ioLimit=" + ioLimit +
", backTime=" + backTime +
", user='" + user + '\'' +
", tell='" + tell + '\'' +
", money=" + money +
", ioStatus=" + ioStatus +
", trackStatus=" + trackStatus +
'}';
}
}
src/main/java/common/model/Reminder.java
......@@ -15,6 +15,7 @@ public class Reminder {
private String email;
private String platform;
private Boolean remindStatus;
private String closeDesc;
private Long user;
private String userName;
private Date modifyTime;
......@@ -93,4 +94,28 @@ public class Reminder {
public void setUserName(String userName) {
this.userName = userName;
}
public String getCloseDesc() {
return closeDesc;
}
public void setCloseDesc(String closeDesc) {
this.closeDesc = closeDesc;
}
@Override
public String toString() {
return "Reminder{" +
"id=" + id +
", accountId=" + accountId +
", email='" + email + '\'' +
", platform='" + platform + '\'' +
", remindStatus=" + remindStatus +
", closeDesc='" + closeDesc + '\'' +
", user=" + user +
", userName='" + userName + '\'' +
", modifyTime=" + modifyTime +
", ds='" + ds + '\'' +
'}';
}
}
src/main/java/common/model/TrackAccount4Web.java 0 → 100644
package common.model;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import java.math.BigInteger;
import java.util.Date;
@Entity
public class TrackAccount4Web {
private Long id;
private Long accountId;
private String email;
private String company;
private Date createDate;
private String status;
private String packageType;
private String pastDate;
private BigInteger track;
private BigInteger io;
private BigInteger trackLimit;
private BigInteger ioLimit;
private Integer backTime;
private String user;
private String tell;
private Long money;
private Boolean ioStatus;
private Boolean trackStatus;
private Boolean remStatus;
@Id
@GeneratedValue
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public Long getAccountId() {
return accountId;
}
public void setAccountId(Long accountId) {
this.accountId = accountId;
}
public String getEmail() {
return email;
}
public void setEmail(String email) {
this.email = email;
}
public String getCompany() {
return company;
}
public void setCompany(String company) {
this.company = company;
}
public Date getCreateDate() {
return createDate;
}
public void setCreateDate(Date createDate) {
this.createDate = createDate;
}
public String getStatus() {
return status;
}
public void setStatus(String status) {
this.status = status;
}
public String getPackageType() {
return packageType;
}
public void setPackageType(String packageType) {
this.packageType = packageType;
}
public String getPastDate() {
return pastDate;
}
public void setPastDate(String pastDate) {
this.pastDate = pastDate;
}
public BigInteger getTrack() {
return track;
}
public void setTrack(BigInteger track) {
this.track = track;
}
public BigInteger getIo() {
return io;
}
public void setIo(BigInteger io) {
this.io = io;
}
public BigInteger getTrackLimit() {
return trackLimit;
}
public void setTrackLimit(BigInteger trackLimit) {
this.trackLimit = trackLimit;
}
public BigInteger getIoLimit() {
return ioLimit;
}
public void setIoLimit(BigInteger ioLimit) {
this.ioLimit = ioLimit;
}
public Integer getBackTime() {
return backTime;
}
public void setBackTime(Integer backTime) {
this.backTime = backTime;
}
public String getUser() {
return user;
}
public void setUser(String user) {
this.user = user;
}
public String getTell() {
return tell;
}
public void setTell(String tell) {
this.tell = tell;
}
public Long getMoney() {
return money;
}
public void setMoney(Long money) {
this.money = money;
}
public Boolean getIoStatus() {
return ioStatus;
}
public void setIoStatus(Boolean ioStatus) {
this.ioStatus = ioStatus;
}
public Boolean getTrackStatus() {
return trackStatus;
}
public void setTrackStatus(Boolean trackStatus) {
this.trackStatus = trackStatus;
}
public Boolean getRemStatus() {
return remStatus;
}
public void setRemStatus(Boolean remStatus) {
this.remStatus = remStatus;
}
@Override
public String toString() {
return "Account4Web{" +
"id=" + id +
", email='" + email + '\'' +
", company='" + company + '\'' +
", createDate=" + createDate +
", status='" + status + '\'' +
", packageType='" + packageType + '\'' +
", pastDate='" + pastDate + '\'' +
", track=" + track +
", io=" + io +
", trackLimit=" + trackLimit +
", ioLimit=" + ioLimit +
", backTime=" + backTime +
", user='" + user + '\'' +
", tell='" + tell + '\'' +
", money=" + money +
", ioStatus=" + ioStatus +
", trackStatus=" + trackStatus +
'}';
}
}
src/main/java/common/repository/BackVisitRepository.java
package common.repository;
import common.model.Auth;
import common.model.BackVisit;
import common.model.KeyValue;
import common.model.Reminder;
import common.model.*;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.transaction.annotation.Transactional;
......@@ -17,6 +14,9 @@ public interface BackVisitRepository extends JpaRepository<BackVisit, Long> {
@Query(value = "SELECT * from back_visit", nativeQuery = true)
List<BackVisit> findAllCount();
@Query(value = "select * from back_visit where account_id = ?1 and ds > ?2 and ds < ?3 and platform = ?4", nativeQuery = true)
@Query(value = "select * from back_visit where account_id = ?1 and ds >= ?2 and ds <= ?3 and platform = ?4", nativeQuery = true)
List<BackVisit> findAll(Long accountId, String startDate, String endDate, String platform);
@Query(value = "select * from back_visit where platform = ?1", nativeQuery = true)
List<BackVisit> findAllByPlatform(String platform);
}
src/main/java/common/repository/PaymentRepository.java
......@@ -12,6 +12,9 @@ import java.util.List;
@Transactional
public interface PaymentRepository extends JpaRepository<Payment, Long> {
@Query(value = "select * from payment where account_id = ?1 and ds > ?2 and ds < ?3 and platform = ?4", nativeQuery = true)
@Query(value = "select * from payment where account_id = ?1 and ds >= ?2 and ds <= ?3 and platform = ?4", nativeQuery = true)
List<Payment> findAll(Long accountId, String startDate, String endDate, String platform);
@Query(value = "select * from payment where platform = ?1", nativeQuery = true)
List<Payment> findAllByPlatform(String platform);
}
src/main/java/common/repository/ReminderRepository.java
......@@ -12,6 +12,9 @@ import java.util.List;
@Transactional
public interface ReminderRepository extends JpaRepository<Reminder, Long> {
@Query(value = "select * from reminder where account_id = ?1 and ds > ?2 and ds < ?3 and platform = ?4", nativeQuery = true)
@Query(value = "select * from reminder where account_id = ?1 and ds >= ?2 and ds <= ?3 and platform = ?4", nativeQuery = true)
List<Reminder> findAll(Long accountId, String startDate, String endDate, String platform);
@Query(value = "SELECT * from reminder where id in (select max(id) from reminder where platform = ?1 group by account_id )", nativeQuery = true)
List<Reminder> findAllDistinct(String platform);
}
src/main/java/common/repository/TrackAccount4WebRepository.java 0 → 100644
package common.repository;
import common.model.Account4Web;
import common.model.TrackAccount4Web;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.transaction.annotation.Transactional;
import javax.sound.midi.Track;
import java.util.List;
@Transactional
public interface TrackAccount4WebRepository extends JpaRepository<TrackAccount4Web, Long> {
@Query(value = "SELECT * from account4web where email in ?1", nativeQuery = true)
List<Account4Web> findByEmails(List<String> emails);
}
src/main/java/security/interceptor/AuthorizationInterceptor.java
......@@ -39,7 +39,7 @@ public class AuthorizationInterceptor extends HandlerInterceptorAdapter {
public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) {
//放开登录
/*if (request.getRequestURL().indexOf("login/login") != -1){
if (request.getRequestURL().indexOf("login/login") != -1){
return true;
}
//从header中得到token
......@@ -61,8 +61,7 @@ public class AuthorizationInterceptor extends HandlerInterceptorAdapter {
}
return true;
}
return false;*/
return true;
return false;
}
private String getCookieToken(Cookie[] cookies, String name){
......
src/main/java/tkio/controller/TkioAccountController.java
......@@ -5,18 +5,22 @@ import common.model.Payment;
import common.model.Reminder;
import common.model.User;
import common.service.UserService;
import dic.OperateObjectTypeEnum;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
import security.annotation.CurrentAccount;
import tkio.service.TkioAccountService;
import util.ResultModel;
import util.UserLogThread;
import javax.servlet.http.HttpServletRequest;
/**
* Created by mxq on 2017/12/21.
*/
@Controller
@RequestMapping("marketing/accountmng/tkio")
@RequestMapping("tkio/marketing/accountmng")
public class TkioAccountController {
@Autowired
......@@ -29,35 +33,40 @@ public class TkioAccountController {
return ResultModel.OK(tkioAccountService.findAll(loginAccount));
}
//关闭到期提醒
@RequestMapping(value = "/forbiden", method = RequestMethod.PUT)
@ResponseBody
public ResultModel forbiden(@CurrentAccount User loginAccount, @RequestBody Reminder resource) {
public ResultModel forbiden(@CurrentAccount User loginAccount, @RequestBody Reminder resource, HttpServletRequest request) {
UserLogThread userlog = new UserLogThread(loginAccount.getEmail(), loginAccount.getName(), OperateObjectTypeEnum.CUSTOMER.getKey(), resource.getEmail(), "关闭到期提醒", request);
userlog.start();
return ResultModel.OK(tkioAccountService.forbiden(loginAccount, resource));
}
//开启到期提醒
@RequestMapping(value = "/enable", method = RequestMethod.PUT)
@ResponseBody
public ResultModel enable(@CurrentAccount User loginAccount, @RequestBody Reminder resource) {
public ResultModel enable(@CurrentAccount User loginAccount, @RequestBody Reminder resource, HttpServletRequest request) {
UserLogThread userlog = new UserLogThread(loginAccount.getEmail(), loginAccount.getName(), OperateObjectTypeEnum.CUSTOMER.getKey(), resource.getEmail(), "开启到期提醒", request);
userlog.start();
return ResultModel.OK(tkioAccountService.enable(loginAccount, resource));
}
//缴费
@RequestMapping(value = "/pay", method = RequestMethod.PUT)
@ResponseBody
public ResultModel pay(@CurrentAccount User loginAccount, @RequestBody Payment resource) {
public ResultModel pay(@CurrentAccount User loginAccount, @RequestBody Payment resource, HttpServletRequest request) {
UserLogThread userlog = new UserLogThread(loginAccount.getEmail(), loginAccount.getName(), OperateObjectTypeEnum.CUSTOMER.getKey(), resource.getEmail(), "缴费", request);
userlog.start();
return ResultModel.OK(tkioAccountService.pay(loginAccount, resource));
}
//回访
@RequestMapping(value = "/visit", method = RequestMethod.PUT)
@ResponseBody
public ResultModel visit(@CurrentAccount User loginAccount, @RequestBody BackVisit resource) {
public ResultModel visit(@CurrentAccount User loginAccount, @RequestBody BackVisit resource, HttpServletRequest request) {
UserLogThread userlog = new UserLogThread(loginAccount.getEmail(), loginAccount.getName(), OperateObjectTypeEnum.CUSTOMER.getKey(), resource.getEmail(), "回访", request);
userlog.start();
return ResultModel.OK( tkioAccountService.visit(loginAccount, resource));
}
//功能使用查询
......
src/main/java/tkio/repository/AppRepository.java
......@@ -13,7 +13,7 @@ public interface AppRepository extends JpaRepository<App, Long> {
@Query(value = "select * from app where account in (select id from account where parent = ?1 or id = ?1) and del_flag is not true", nativeQuery = true)
List<App> listAppByRootAccount(Long account);
@Query(value = "select count(*) from app where account in ?1 and create_time > ?2 and create_time < ?3", nativeQuery = true)
@Query(value = "select count(*) from app where account in ?1 and create_time >= ?2 and create_time <= ?3", nativeQuery = true)
BigInteger countByAccount(List<Long> accountId, String startDate, String endDate);
@Query(value = "select appkey from app where account in ?1", nativeQuery = true)
......
src/main/java/tkio/service/impl/TkioAccountServiceImpl.java
......@@ -88,6 +88,13 @@ public class TkioAccountServiceImpl implements TkioAccountService {
}
}
}
List<Reminder> reminderList = reminderRepository.findAllDistinct("tkio");
Map<Long, Boolean> reMap = new HashMap<>();
if(ValidateUtil.isValid(reminderList)){
for(Reminder re : reminderList){
reMap.put(re.getAccountId(), re.getRemindStatus());
}
}
if(ValidateUtil.isValid(account4WebList)){
Map<String, Integer> backTimeMap = getBackTime();
Map<String, Long> payMap = getPayment();
......@@ -102,6 +109,11 @@ public class TkioAccountServiceImpl implements TkioAccountService {
} else{
aw.setMoney(0L);
}
if(reMap.containsKey(aw.getAccountId())){
aw.setRemStatus(reMap.get(aw.getAccountId()));
} else{
aw.setRemStatus(true);
}
result.add(aw);
}
}
......@@ -132,6 +144,7 @@ public class TkioAccountServiceImpl implements TkioAccountService {
public Payment pay(User user, Payment resource) {
resource.setUser(user.getId());
resource.setPayDate(new Date());
resource.setPlatform("tkio");
resource.setDs(DateUtil.getBeforeDays(0));
return paymentRepository.save(resource);
}
......@@ -140,6 +153,7 @@ public class TkioAccountServiceImpl implements TkioAccountService {
public BackVisit visit(User user, BackVisit resource) {
resource.setUser(user.getId());
resource.setVisitDate(new Date());
resource.setPlatform("tkio");
resource.setDs(DateUtil.getBeforeDays(0));
return backVisitRepository.save(resource);
}
......@@ -274,7 +288,7 @@ public class TkioAccountServiceImpl implements TkioAccountService {
public Map<String, Integer> getBackTime(){
Map<String, Integer> map = new HashMap<>();
List<BackVisit> all = backVisitRepository.findAll();
List<BackVisit> all = backVisitRepository.findAllByPlatform("tkio");
if (ValidateUtil.isValid(all)){
for(BackVisit bv : all){
if(map.containsKey(bv.getEmail())){
......@@ -289,7 +303,7 @@ public class TkioAccountServiceImpl implements TkioAccountService {
public Map<String, Long> getPayment(){
Map<String, Long> map = new HashMap<>();
List<Payment> all = paymentRepository.findAll();
List<Payment> all = paymentRepository.findAllByPlatform("tkio");
if (ValidateUtil.isValid(all)){
for(Payment pa : all){
if(map.containsKey(pa.getEmail())){
......
src/main/java/tkio/task/AccountTask.java
......@@ -49,21 +49,24 @@ public class AccountTask {
for(Account ac : accountValidList){
AccountRestrict4Web restrict4Web = accountFlowRestrictService.findRestrictByAccount(ac.getId());
Account4Web account4Web = new Account4Web();
account4Web.setAccountId(ac.getId());
account4Web.setEmail(ac.getEmail());
account4Web.setCompany(ac.getCompany());
account4Web.setCreateDate(ac.getCreateTime());
account4Web.setCreateDate(ac.getPubDate());
account4Web.setStatus(null == restrict4Web.getIOFlowNotified() ? "已激活" : (restrict4Web.getIOFlowNotified() ? "已激活" : "流量用尽"));
account4Web.setPackageType(restrict4Web.getPackageName());
account4Web.setPastDate(ac.getPastDate());
if (ac.getPricelevel().equals(7L) || ac.getPricelevel().equals(8L) || ac.getPricelevel().equals(5L)){
account4Web.setIo(restrict4Web.getThisMonthIOFlow().toString());
account4Web.setTrack(restrict4Web.getTrackTotalFlow().toString());
if (ac.getPricelevel().equals(7L) || ac.getPricelevel().equals(8L) || ac.getPricelevel().equals(5L) || ac.getPricelevel().equals(6L)){
account4Web.setIo(restrict4Web.getThisMonthIOFlow());
account4Web.setTrack(restrict4Web.getTrackTotalFlow());
}else{
account4Web.setIo(restrict4Web.getThisMonthIOFlow() + "/" + restrict4Web.getIOLimit());
account4Web.setTrack(restrict4Web.getTrackTotalFlow() + "/" + restrict4Web.getTrackLimit());
account4Web.setIo(restrict4Web.getThisMonthIOFlow());
account4Web.setTrack(restrict4Web.getTrackTotalFlow());
account4Web.setIoLimit(restrict4Web.getIOLimit());
account4Web.setTrackLimit(restrict4Web.getTrackLimit());
account4Web.setIoStatus(restrict4Web.getAllowBehavior());
account4Web.setTrackStatus(restrict4Web.getTrackFlowNotified());
}
account4Web.setIoStatus(restrict4Web.getAllowBehavior());
account4Web.setTrackStatus(restrict4Web.getTrackFlowNotified());
account4Web.setUser(ac.getName());
account4Web.setTell(ac.getPhone());
list.add(account4Web);
......@@ -79,14 +82,13 @@ public class AccountTask {
if(ValidateUtil.isValid(pastAccountList)){
for(Account ac : pastAccountList){
Account4Web account4Web = new Account4Web();
account4Web.setAccountId(ac.getId());
account4Web.setEmail(ac.getEmail());
account4Web.setCompany(ac.getCompany());
account4Web.setCreateDate(ac.getCreateTime());
account4Web.setCreateDate(ac.getPubDate());
account4Web.setStatus("已过期");
account4Web.setPackageType(map.get(ac.getPricelevel()));
account4Web.setPastDate(ac.getPastDate());
account4Web.setIo("----");
account4Web.setTrack("----");
account4Web.setIoStatus(false);
account4Web.setTrackStatus(false);
account4Web.setUser(ac.getName());
......
src/main/java/track/controller/TrackAccountController.java 0 → 100644
package track.controller;
import common.model.BackVisit;
import common.model.Payment;
import common.model.Reminder;
import common.model.User;
import dic.OperateObjectTypeEnum;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
import security.annotation.CurrentAccount;
import tkio.service.TkioAccountService;
import track.service.TrackAccountService;
import util.ResultModel;
import util.UserLogThread;
import javax.servlet.http.HttpServletRequest;
/**
* Created by mxq on 2017/12/21.
*/
@Controller
@RequestMapping("track/marketing/accountmng")
public class TrackAccountController {
@Autowired
TrackAccountService tkioAccountService;
//客户列表
@RequestMapping(value = "/findAll", method = RequestMethod.GET)
@ResponseBody
public ResultModel find(@CurrentAccount User loginAccount) {
return ResultModel.OK(tkioAccountService.findAll(loginAccount));
}
//关闭到期提醒
@RequestMapping(value = "/forbiden", method = RequestMethod.PUT)
@ResponseBody
public ResultModel forbiden(@CurrentAccount User loginAccount, @RequestBody Reminder resource, HttpServletRequest request) {
UserLogThread userlog = new UserLogThread(loginAccount.getEmail(), loginAccount.getName(), OperateObjectTypeEnum.CUSTOMER.getKey(), resource.getEmail(), "关闭到期提醒", request);
userlog.start();
return ResultModel.OK(tkioAccountService.forbiden(loginAccount, resource));
}
//开启到期提醒
@RequestMapping(value = "/enable", method = RequestMethod.PUT)
@ResponseBody
public ResultModel enable(@CurrentAccount User loginAccount, @RequestBody Reminder resource, HttpServletRequest request) {
UserLogThread userlog = new UserLogThread(loginAccount.getEmail(), loginAccount.getName(), OperateObjectTypeEnum.CUSTOMER.getKey(), resource.getEmail(), "开启到期提醒", request);
userlog.start();
return ResultModel.OK(tkioAccountService.enable(loginAccount, resource));
}
//缴费
@RequestMapping(value = "/pay", method = RequestMethod.PUT)
@ResponseBody
public ResultModel pay(@CurrentAccount User loginAccount, @RequestBody Payment resource, HttpServletRequest request) {
UserLogThread userlog = new UserLogThread(loginAccount.getEmail(), loginAccount.getName(), OperateObjectTypeEnum.CUSTOMER.getKey(), resource.getEmail(), "缴费", request);
userlog.start();
return ResultModel.OK(tkioAccountService.pay(loginAccount, resource));
}
//回访
@RequestMapping(value = "/visit", method = RequestMethod.PUT)
@ResponseBody
public ResultModel visit(@CurrentAccount User loginAccount, @RequestBody BackVisit resource, HttpServletRequest request) {
UserLogThread userlog = new UserLogThread(loginAccount.getEmail(), loginAccount.getName(), OperateObjectTypeEnum.CUSTOMER.getKey(), resource.getEmail(), "回访", request);
userlog.start();
return ResultModel.OK( tkioAccountService.visit(loginAccount, resource));
}
//功能使用查询
@RequestMapping(value = "/find/function/{accountId}", method = RequestMethod.GET)
@ResponseBody
public ResultModel updateName(@CurrentAccount User loginAccount, @RequestParam String startDate,
@RequestParam String endDate, @PathVariable Long accountId) {
return ResultModel.OK(tkioAccountService.findFunTimes(accountId,startDate,endDate));
}
//到期提醒查询
@RequestMapping(value = "/find/reminder/{accountId}", method = RequestMethod.GET)
@ResponseBody
public ResultModel findRed(@CurrentAccount User loginAccount, @RequestParam String startDate,
@RequestParam String endDate, @PathVariable Long accountId) {
return ResultModel.OK(tkioAccountService.findRed(accountId,startDate,endDate));
}
//回访查询
@RequestMapping(value = "/find/visit/{accountId}", method = RequestMethod.GET)
@ResponseBody
public ResultModel findVisit(@CurrentAccount User loginAccount, @RequestParam String startDate,
@RequestParam String endDate, @PathVariable Long accountId) {
return ResultModel.OK(tkioAccountService.findVisit(accountId,startDate,endDate));
}
//缴费查询
@RequestMapping(value = "/find/pay/{accountId}", method = RequestMethod.GET)
@ResponseBody
public ResultModel findPay(@CurrentAccount User loginAccount, @RequestParam String startDate,
@RequestParam String endDate, @PathVariable Long accountId) {
return ResultModel.OK(tkioAccountService.findPay(accountId,startDate,endDate));
}
}
src/main/java/track/model/Account.java 0 → 100644
package track.model;
import javax.persistence.*;
import java.util.Date;
import java.util.List;
import java.util.Map;
@Entity
public class Account {
private Long id;
private String email;
private String password;
private String company;
private String name;
private String phone;
private String qq;
private boolean isSuperUser;
private boolean isActive=true;
private Long parent = (long) 0;
private Date pubDate = new Date();
private String isSpecialAccount;
private int status;
private Integer type; //帐户类型: SA(1)
private Long roleid;
private List<String> authPermissions;
private List<Map<String, String>> ChannelPermissions;
private List<Map<String, String>> campaignPermissions;
private String pastDate;
private String remark;
@Transient
public List<String> getAuthPermissions() {
return authPermissions;
}
public void setAuthPermissions(List<String> authPermissions) {
this.authPermissions = authPermissions;
}
@Transient
public List<Map<String, String>> getCampaignPermissions() {
return campaignPermissions;
}
public void setCampaignPermissions(List<Map<String, String>> campaignPermissions) {
this.campaignPermissions = campaignPermissions;
}
@Transient
public List<Map<String, String>> getChannelPermissions() {
return ChannelPermissions;
}
public void setChannelPermissions(
List<Map<String, String>> channelPermissions) {
ChannelPermissions = channelPermissions;
}
public Account() {
super();
}
public Account(String email, String password, String company, String name,
String phone, String qq, boolean isSuperUser, boolean isActive) {
super();
this.email = email;
this.password = password;
this.company = company;
this.name = name;
this.phone = phone;
this.qq = qq;
this.isSuperUser = isSuperUser;
this.isActive = isActive;
}
public String getCompany() {
return company;
}
public String getEmail() {
return email;
}
@Id
@GeneratedValue
public Long getId() {
return id;
}
public boolean getIsSuperUser() {
return isSuperUser;
}
public String getName() {
return name;
}
public String getPassword() {
return password;
}
public String getPhone() {
return phone;
}
public Date getPubDate() {
return pubDate;
}
public String getQq() {
return qq;
}
public boolean isActive() {
return isActive;
}
public void setActive(boolean isActive) {
this.isActive = isActive;
}
public void setCompany(String company) {
this.company = company;
}
public void setEmail(String email) {
this.email = email;
}
public void setId(Long id) {
this.id = id;
}
public void setIsSuperUser(boolean isSuperUser) {
this.isSuperUser = isSuperUser;
}
public void setName(String name) {
this.name = name;
}
public void setPassword(String password) {
this.password = password;
}
public void setPhone(String phone) {
this.phone = phone;
}
public void setPubDate(Date pubDate) {
this.pubDate = pubDate;
}
public void setQq(String qq) {
this.qq = qq;
}
public void setSuperUser(boolean isSuperUser) {
this.isSuperUser = isSuperUser;
}
public Long getParent() {
return parent;
}
public void setParent(Long parent) {
this.parent = parent;
}
public String getIsSpecialAccount() {
return isSpecialAccount;
}
public void setIsSpecialAccount(String isSpecialAccount) {
this.isSpecialAccount = isSpecialAccount;
}
public int getStatus() {
return status;
}
public void setStatus(int status) {
this.status = status;
}
public Long getRoleid() {
return roleid;
}
public void setRoleid(Long roleid) {
this.roleid = roleid;
}
public String getPastDate() {
return pastDate;
}
public void setPastDate(String pastDate) {
this.pastDate = pastDate;
}
@Column(length=28)
public String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
public Integer getType() {
return type;
}
public void setType(Integer type) {
this.type = type;
}
@Override
public String toString() {
return "Account{" +
"authPermissions=" + authPermissions +
", campaignPermissions=" + campaignPermissions +
", ChannelPermissions=" + ChannelPermissions +
", company='" + company + '\'' +
", email='" + email + '\'' +
", id=" + id +
", isActive=" + isActive +
", isSpecialAccount='" + isSpecialAccount + '\'' +
", isSuperUser=" + isSuperUser +
", name='" + name + '\'' +
", parent=" + parent +
", password='" + password + '\'' +
", pastDate='" + pastDate + '\'' +
", phone='" + phone + '\'' +
", pubDate=" + pubDate +
", qq='" + qq + '\'' +
", remark='" + remark + '\'' +
", roleid=" + roleid +
", status=" + status +
", type=" + type +
'}';
}
}
src/main/java/track/model/App.java 0 → 100644
package track.model;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.validation.constraints.NotNull;
import java.util.Date;
@Entity
public class App {
private Long id;
@NotNull
private String name;
private String platform;
private String appGenre;
private String gameGenre;
private String appkey;
private String url;
private Long account;
private boolean sync;
private boolean isActive;
private Long origiApp;
private String bundleid;
private String token;
private String installtoken;
private boolean regedbutton;
private Date pubDate = new Date();
public App() {
super();
}
public App(String name, String platform, String appGenre, String gameGenre) {
this.name = name;
this.platform = platform;
this.appGenre = appGenre;
this.gameGenre = gameGenre;
}
public App(String name, String platform, String appGenre, String gameGenre,
Long account) {
this.name = name;
this.platform = platform;
this.appGenre = appGenre;
this.gameGenre = gameGenre;
this.account = account;
}
public boolean isActive() {
return isActive;
}
public void setActive(boolean isActive) {
this.isActive = isActive;
}
public Long getAccount() {
return account;
}
public String getAppGenre() {
return appGenre;
}
public String getAppkey() {
return appkey;
}
public String getGameGenre() {
return gameGenre;
}
@Id
@GeneratedValue
public Long getId() {
return id;
}
public String getName() {
return name;
}
public String getPlatform() {
return platform;
}
public Date getPubDate() {
return pubDate;
}
public String getUrl() {
return url;
}
public boolean isSync() {
return sync;
}
public void setAccount(Long account) {
this.account = account;
}
public void setAppGenre(String appGenre) {
this.appGenre = appGenre;
}
public void setAppkey(String appkey) {
this.appkey = appkey;
}
public void setGameGenre(String gameGenre) {
this.gameGenre = gameGenre;
}
public void setId(Long id) {
this.id = id;
}
public void setName(String name) {
this.name = name;
}
public void setPlatform(String platform) {
this.platform = platform;
}
public void setPubDate(Date pubDate) {
this.pubDate = pubDate;
}
public void setSync(boolean sync) {
this.sync = sync;
}
public void setUrl(String url) {
this.url = url;
}
public Long getOrigiApp() {
return origiApp;
}
public void setOrigiApp(Long origiApp) {
this.origiApp = origiApp;
}
public String getBundleid() {
return bundleid;
}
public void setBundleid(String bundleid) {
this.bundleid = bundleid;
}
public String getToken() {
return token;
}
public void setToken(String token) {
this.token = token;
}
public boolean isRegedbutton() {
return regedbutton;
}
public void setRegedbutton(boolean regedbutton) {
this.regedbutton = regedbutton;
}
public String getInstalltoken() {
return installtoken;
}
public void setInstalltoken(String installtoken) {
this.installtoken = installtoken;
}
@Override
public String toString() {
return "App{" +
"id=" + id +
", name='" + name + '\'' +
", platform='" + platform + '\'' +
", appGenre='" + appGenre + '\'' +
", gameGenre='" + gameGenre + '\'' +
", appkey='" + appkey + '\'' +
", url='" + url + '\'' +
", account=" + account +
", sync=" + sync +
", isActive=" + isActive +
", origiApp=" + origiApp +
", bundleid='" + bundleid + '\'' +
", token='" + token + '\'' +
", installtoken='" + installtoken + '\'' +
", regedbutton=" + regedbutton +
", pubDate=" + pubDate +
'}';
}
}
src/main/java/track/model/Campaign.java 0 → 100644
package track.model;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import java.util.Date;
@Entity
public class Campaign {
private Long id;
private Long app;
private String os;
private String type;
private Long channel;
private String channelid;
private String name;
private String campaignGroup;
private String callback;
private String url;
private String surl;
private Date pubDate = new Date();
private Integer addParam;
private String campaignpackid;
private String specialKeys;
//创建账号，或子账号或母账号
private Long account;
private String advertiserid;
private String bundleid;
private boolean awssuccess = false;
public Campaign() {
super();
}
public String getChannelid() {
return channelid;
}
public void setChannelid(String channelid) {
this.channelid = channelid;
}
public Long getApp() {
return app;
}
public String getCallback() {
return callback;
}
/* public Long getCampaignGroup() {
return campaignGroup;
}*/
public Long getChannel() {
return channel;
}
@Id
@GeneratedValue
public Long getId() {
return id;
}
public String getName() {
return name;
}
public Date getPubDate() {
return pubDate;
}
public String getSurl() {
return surl;
}
public String getType() {
return type;
}
public String getUrl() {
return url;
}
public void setApp(Long app) {
this.app = app;
}
public void setCallback(String callback) {
this.callback = callback;
}
/* public void setCampaignGroup(Long campaignGroup) {
this.campaignGroup = campaignGroup;
}*/
public void setChannel(Long channel) {
this.channel = channel;
}
public void setId(Long id) {
this.id = id;
}
public void setName(String name) {
this.name = name;
}
public void setPubDate(Date pubDate) {
this.pubDate = pubDate;
}
public void setSurl(String surl) {
this.surl = surl;
}
public void setType(String type) {
this.type = type;
}
public void setUrl(String url) {
this.url = url;
}
public String getSpecialKeys() {
return specialKeys;
}
public void setSpecialKeys(String specialKeys) {
this.specialKeys = specialKeys;
}
public Integer getAddParam() {
return addParam;
}
public void setAddParam(Integer addParam) {
this.addParam = addParam;
}
public Long getAccount() {
return account;
}
public void setAccount(Long account) {
this.account = account;
}
public String getOs() {
return os;
}
public void setOs(String os) {
this.os = os;
}
public boolean isAwssuccess() {
return awssuccess;
}
public void setAwssuccess(boolean awssuccess) {
this.awssuccess = awssuccess;
}
public String getCampaignpackid() {
return campaignpackid;
}
public void setCampaignpackid(String campaignpackid) {
this.campaignpackid = campaignpackid;
}
public String getAdvertiserid() {
return advertiserid;
}
public void setAdvertiserid(String advertiserid) {
this.advertiserid = advertiserid;
}
public String getBundleid() {
return bundleid;
}
public void setBundleid(String bundleid) {
this.bundleid = bundleid;
}
public String getCampaignGroup() {
return campaignGroup;
}
public void setCampaignGroup(String campaignGroup) {
this.campaignGroup = campaignGroup;
}
@Override
public String toString() {
return "Campaign{" +
"id=" + id +
", app=" + app +
", os='" + os + '\'' +
", type='" + type + '\'' +
", channel=" + channel +
", channelid='" + channelid + '\'' +
", name='" + name + '\'' +
", campaignGroup=" + campaignGroup +
", callback='" + callback + '\'' +
", url='" + url + '\'' +
", surl='" + surl + '\'' +
", pubDate=" + pubDate +
", addParam=" + addParam +
", campaignpackid='" + campaignpackid + '\'' +
", specialKeys='" + specialKeys + '\'' +
", account=" + account +
", advertiserid='" + advertiserid + '\'' +
", bundleid='" + bundleid + '\'' +
", awssuccess=" + awssuccess +
'}';
}
}
src/main/java/track/model/Channel.java 0 → 100644
package track.model;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import java.util.Date;
@Entity
public class Channel {
private Long id;
private String name;
private Long account;
private String category;
private String url;
private Date pubDate=new Date();
private String type;
private String uniqueName;
private String firstchar;
private boolean ishttps=false;
private String os;
private String trackurl = "http://uri6.com/$surl";
private String androidparam;
private String iosparam;
private boolean istrackurlspecial=false;
private Integer orderindex;
private boolean isintegrate = false;
//0 正常渠道 1 被合并渠道，不再显示
private Boolean hidden = false;
public Channel() {
super();
}
public Channel(String name, String category, String url) {
super();
this.name = name;
this.category = category;
this.url = url;
}
public Long getAccount() {
return account;
}
public String getCategory() {
return category;
}
@Id
@GeneratedValue
public Long getId() {
return id;
}
public String getName() {
return name;
}
public Date getPubDate() {
return pubDate;
}
public String getUrl() {
return url;
}
public void setAccount(Long account) {
this.account = account;
}
public void setCategory(String category) {
this.category = category;
}
public void setId(Long id) {
this.id = id;
}
public void setName(String name) {
this.name = name;
}
public void setPubDate(Date pubDate) {
this.pubDate = pubDate;
}
public void setUrl(String url) {
this.url = url;
}
public String getType() {
return type;
}
public void setType(String type) {
this.type = type;
}
public String getUniqueName() {
return uniqueName;
}
public void setUniqueName(String uniqueName) {
this.uniqueName = uniqueName;
}
public String getFirstchar() {
return firstchar;
}
public void setFirstchar(String firstchar) {
this.firstchar = firstchar;
}
public boolean isIshttps() {
return ishttps;
}
public void setIshttps(boolean ishttps) {
this.ishttps = ishttps;
}
public String getOs() {
return os;
}
public void setOs(String os) {
this.os = os;
}
public String getTrackurl() {
return trackurl;
}
public void setTrackurl(String trackurl) {
this.trackurl = trackurl;
}
public String getAndroidparam() {
return androidparam;
}
public void setAndroidparam(String androidparam) {
this.androidparam = androidparam;
}
public String getIosparam() {
return iosparam;
}
public void setIosparam(String iosparam) {
this.iosparam = iosparam;
}
public boolean isIstrackurlspecial() {
return istrackurlspecial;
}
public void setIstrackurlspecial(boolean istrackurlspecial) {
this.istrackurlspecial = istrackurlspecial;
}
public boolean isIsintegrate() {
return isintegrate;
}
public Integer getOrderindex()
{
return orderindex;
}
public void setOrderindex(Integer orderindex)
{
this.orderindex = orderindex;
}
public void setIsintegrate(boolean isintegrate) {
this.isintegrate = isintegrate;
}
public Boolean getHidden() {
return hidden;
}
public void setHidden(Boolean hidden) {
this.hidden = hidden;
}
}
src/main/java/track/repository/TrackAccountRepository.java 0 → 100644
package track.repository;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.transaction.annotation.Transactional;
import track.model.Account;
import java.math.BigInteger;
import java.util.List;
@Transactional
public interface TrackAccountRepository extends JpaRepository<Account, Long> {
@Query(value = "select * from account c where is_super_user=true and past_date is not null", nativeQuery = true)
List<Account> findAllParent();
@Query(value = "select * from account c where parent = ?1", nativeQuery = true)
List<Account> findByParent(Long account);
@Query(value = "select count(*) from account where parent = ?1 and pub_date > ?2 and pub_date < ?3", nativeQuery = true)
BigInteger countByRootParent(Long accountId, String startDate, String endDate);
}
src/main/java/track/repository/TrackAppRepository.java 0 → 100644
package track.repository;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import track.model.Account;
import track.model.App;
import java.math.BigInteger;
import java.util.List;
public interface TrackAppRepository extends JpaRepository<App, Long> {
List<App> findByAccount(Long account);
@Query(value = "select count(*) from app where account in ?1 and pub_date >= ?2 and pub_date <= ?3", nativeQuery = true)
BigInteger countByAccount(List<Long> accountId, String startDate, String endDate);
@Query(value = "select * from app where account in ?1 ", nativeQuery = true)
List<App> findByAccount(List<Long> accountId);
}
src/main/java/track/repository/TrackCampaignRepository.java 0 → 100644
package track.repository;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.transaction.annotation.Transactional;
import track.model.Campaign;
import java.math.BigInteger;
import java.util.List;
import java.util.Set;
public interface TrackCampaignRepository
extends JpaRepository<Campaign, Long>
{
@Query(value = "select count(*) from campaign where app in ?1 and pub_date >= ?2 and pub_date <= ?3", nativeQuery = true)
BigInteger countByAccount(List<Long> appids, String startDate, String endDate);
}
src/main/java/track/repository/TrackChannelRepository.java 0 → 100644
package track.repository;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import track.model.Channel;
import java.math.BigInteger;
import java.util.List;
import java.util.Set;
public interface TrackChannelRepository extends JpaRepository<Channel, Long> {
List<Channel> findByAccount(Long account);
@Query(value = "select count(*) from channel where account in ?1 and pub_date > ?2 and pub_date < ?3", nativeQuery = true)
BigInteger countByAccount(List<Long> accountId, String startDate, String endDate);
}
src/main/java/track/service/TrackAccountService.java 0 → 100644
package track.service;
import common.model.*;
import java.util.List;
import java.util.Map;
/**
* Created by mxq on 2017/12/27.
*/
public interface TrackAccountService {
List<TrackAccount4Web> findAll(User user);
//到期提醒关闭
Reminder forbiden(User user, Reminder resource);
//到期提醒开启
Reminder enable(User user, Reminder resource);
//缴费
Payment pay(User user, Payment resource);
//回访
BackVisit visit(User user, BackVisit resource);
//查询功能使用情况
Map<String, Integer> findFunTimes(Long account, String startDate, String endDate);
List<Reminder> findRed(Long account, String startDate, String endDate);
List<BackVisit> findVisit(Long account, String startDate, String endDate);
List<Payment> findPay(Long account, String startDate, String endDate);
}
src/main/java/track/service/impl/TrackAccountServiceImpl.java 0 → 100644
package track.service.impl;
import common.model.*;
import common.repository.*;
import dic.RoleEnum;
import dic.RoleTypeEnum;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import track.model.Account;
import track.model.App;
import track.repository.TrackAccountRepository;
import track.repository.TrackAppRepository;
import track.repository.TrackCampaignRepository;
import track.repository.TrackChannelRepository;
import track.service.TrackAccountService;
import util.Constant;
import util.DateUtil;
import util.HttpClientUtil;
import util.ValidateUtil;
import java.math.BigInteger;
import java.util.*;
/**
* Created by mxq on 2017/12/27.
*/
@Service
public class TrackAccountServiceImpl implements TrackAccountService{
@Autowired
TrackAccount4WebRepository trackAccount4WebRepository;
@Autowired
TrackAccountRepository accountRepository;
@Autowired
BackVisitRepository backVisitRepository;
@Autowired
PaymentRepository paymentRepository;
@Autowired
ReminderRepository reminderRepository;
@Autowired
TrackCampaignRepository campaignRepository;
@Autowired
TrackChannelRepository channelRepository;
@Autowired
TrackAppRepository appRepository;
@Autowired
UserRepository userRepository;
@Override
public List<TrackAccount4Web> findAll(User user) {
List<TrackAccount4Web> result = new ArrayList<>();
List<TrackAccount4Web> account4WebList = null;
if(user.getRole().equals(RoleEnum.MANAGER.getKey())){
account4WebList = trackAccount4WebRepository.findAll();
}
List<Reminder> reminderList = reminderRepository.findAllDistinct("track");
Map<Long, Boolean> reMap = new HashMap<>();
if(ValidateUtil.isValid(reminderList)){
for(Reminder re : reminderList){
reMap.put(re.getAccountId(), re.getRemindStatus());
}
}
if(ValidateUtil.isValid(account4WebList)){
Map<String, Integer> backTimeMap = getBackTime();
Map<String, Long> payMap = getPayment();
for(TrackAccount4Web aw : account4WebList){
if(backTimeMap.containsKey(aw.getEmail())){
aw.setBackTime(backTimeMap.get(aw.getEmail()));
} else{
aw.setBackTime(0);
}
if(payMap.containsKey(aw.getEmail())){
aw.setMoney(payMap.get(aw.getEmail()));
} else{
aw.setMoney(0L);
}
if(reMap.containsKey(aw.getAccountId())){
aw.setRemStatus(reMap.get(aw.getAccountId()));
} else{
aw.setRemStatus(true);
}
result.add(aw);
}
}
return result;
}
@Override
public Reminder forbiden(User user, Reminder resource) {
resource.setUser(user.getId());
resource.setModifyTime(new Date());
resource.setPlatform("track");
resource.setRemindStatus(false);
resource.setDs(DateUtil.getBeforeDays(0));
return reminderRepository.save(resource);
}
@Override
public Reminder enable(User user, Reminder resource) {
resource.setUser(user.getId());
resource.setModifyTime(new Date());
resource.setPlatform("track");
resource.setRemindStatus(true);
resource.setDs(DateUtil.getBeforeDays(0));
return reminderRepository.save(resource);
}
@Override
public Payment pay(User user, Payment resource) {
resource.setUser(user.getId());
resource.setPayDate(new Date());
resource.setPlatform("track");
resource.setDs(DateUtil.getBeforeDays(0));
return paymentRepository.save(resource);
}
@Override
public BackVisit visit(User user, BackVisit resource) {
resource.setUser(user.getId());
resource.setVisitDate(new Date());
resource.setPlatform("track");
resource.setDs(DateUtil.getBeforeDays(0));
return backVisitRepository.save(resource);
}
@Override
public Map<String, Integer> findFunTimes(Long account, String startDate, String endDate) {
Map<String, Integer> result = new HashMap<>();
List<Account> accountList = accountRepository.findByParent(account);
List<Long> idList = new ArrayList<>();
idList.add(account);
for(Account ac : accountList){
idList.add(ac.getId());
}
List<App> appList = appRepository.findByAccount(idList);
List<Long> appidList = new ArrayList<>();
if(ValidateUtil.isValid(appList)){
for(App app : appList){
appidList.add(app.getId());
}
}
BigInteger numAccount = accountRepository.countByRootParent(account, startDate, endDate);
BigInteger numApp = appRepository.countByAccount(idList, startDate, endDate);
BigInteger numCampaign = campaignRepository.countByAccount(idList, startDate, endDate);
BigInteger numChannel = channelRepository.countByAccount(idList, startDate, endDate);
result.put("numAccount", numAccount.intValue());
result.put("numApp", numApp.intValue());
result.put("numCampaign", numCampaign.intValue());
result.put("numChannel", numChannel.intValue());
result.put("event_sum", null);
result.put("click_sum", null);
return result;
}
@Override
public List<Reminder> findRed(Long account, String startDate, String endDate) {
List<Reminder> result = new ArrayList<>();
List<User> userList = userRepository.findAll();
Map<Long, String> userMap = new HashMap<>();
for(User u : userList){
userMap.put(u.getId(), u.getName());
}
List<Reminder> list = reminderRepository.findAll(account, startDate, endDate, "track");
if (ValidateUtil.isValid(list)) {
for(Reminder re : list){
re.setUserName(userMap.get(re.getUser()));
result.add(re);
}
}
return result;
}
@Override
public List<BackVisit> findVisit(Long account, String startDate, String endDate) {
List<BackVisit> result = new ArrayList<>();
List<User> userList = userRepository.findAll();
Map<Long, String> userMap = new HashMap<>();
for(User u : userList){
userMap.put(u.getId(), u.getName());
}
List<BackVisit> list = backVisitRepository.findAll(account, startDate, endDate, "track");
if (ValidateUtil.isValid(list)) {
for(BackVisit re : list){
re.setUserName(userMap.get(re.getUser()));
result.add(re);
}
}
return result;
}
@Override
public List<Payment> findPay(Long account, String startDate, String endDate) {
List<Payment> result = new ArrayList<>();
List<User> userList = userRepository.findAll();
Map<Long, String> userMap = new HashMap<>();
for(User u : userList){
userMap.put(u.getId(), u.getName());
}
List<Payment> list = paymentRepository.findAll(account, startDate, endDate, "track");
if (ValidateUtil.isValid(list)) {
for(Payment re : list){
re.setUserName(userMap.get(re.getUser()));
result.add(re);
}
}
return result;
}
public Map<String, Integer> getBackTime(){
Map<String, Integer> map = new HashMap<>();
List<BackVisit> all = backVisitRepository.findAllByPlatform("track");
if (ValidateUtil.isValid(all)){
for(BackVisit bv : all){
if(map.containsKey(bv.getEmail())){
map.put(bv.getEmail(), map.get(bv.getEmail()) + 1);
} else{
map.put(bv.getEmail(), 1);
}
}
}
return map;
}
public Map<String, Long> getPayment(){
Map<String, Long> map = new HashMap<>();
List<Payment> all = paymentRepository.findAllByPlatform("track");
if (ValidateUtil.isValid(all)){
for(Payment pa : all){
if(map.containsKey(pa.getEmail())){
map.put(pa.getEmail(), map.get(pa.getEmail()) + pa.getMoney());
} else{
map.put(pa.getEmail(), pa.getMoney());
}
}
}
return map;
}
}
src/main/java/track/task/AccountTask.java 0 → 100644
package track.task;
import common.model.Account4Web;
import common.model.TrackAccount4Web;
import common.repository.TrackAccount4WebRepository;
import org.jsoup.helper.DataUtil;
import org.springframework.beans.factory.annotation.Autowired;
import track.model.Account;
import track.repository.TrackAccountRepository;
import util.DateUtil;
import util.ValidateUtil;
import java.util.ArrayList;
import java.util.List;
/**
* Created by mxq on 2017/12/25.
*/
public class AccountTask {
@Autowired
TrackAccountRepository trackAccountRepository;
@Autowired
TrackAccount4WebRepository trackAccount4WebRepository;
public void task(){
trackAccount4WebRepository.deleteAll();
List<TrackAccount4Web> list = new ArrayList<>();
List<Account> accountList = trackAccountRepository.findAllParent();
String today = DateUtil.getBeforeDays(0);
if(ValidateUtil.isValid(accountList)){
for(Account ac : accountList){
TrackAccount4Web account4Web = new TrackAccount4Web();
account4Web.setAccountId(ac.getId());
account4Web.setEmail(ac.getEmail());
account4Web.setCompany(ac.getCompany());
account4Web.setCreateDate(ac.getPubDate());
if(today.compareTo(ac.getPastDate()) > 0){
account4Web.setStatus("已过期");
}else{
account4Web.setStatus("已激活");
}
account4Web.setPastDate(ac.getPastDate());
account4Web.setUser(ac.getName());
account4Web.setTell(ac.getPhone());
list.add(account4Web);
}
}
if(ValidateUtil.isValid(list)){
trackAccount4WebRepository.save(list);
}
}
}
src/main/java/util/UserLogThread.java
package util;
import common.context.AppUtils;
import common.context.*;
import common.model.UserLog;
import common.repository.UserLogRepository;
import org.slf4j.Logger;
......
src/main/resources/applicationContext-schedule.xml
......@@ -14,7 +14,15 @@
<task:scheduled-tasks>
<!--//定时同步短链数据(每5分钟执行一次)-->
<task:scheduled ref="tkioAccountTask" method="task" cron="0 26 10 * * ?"/>
<task:scheduled ref="tkioAccountTask" method="task" cron="0 21 15 * * ?"/>
</task:scheduled-tasks>
<bean id="trackAccountTask" class="track.task.AccountTask"></bean>
<task:scheduled-tasks>
<!--//定时同步短链数据(每5分钟执行一次)-->
<task:scheduled ref="trackAccountTask" method="task" cron="0 32 16 * * ?"/>
</task:scheduled-tasks>
<bean id="SyncAppDataTask" class="tkio.task.SyncAppDataTask"></bean>
......
target/classes/applicationContext.xml deleted 100644 → 0
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:context="http://www.springframework.org/schema/context"
xmlns:jdbc="http://www.springframework.org/schema/jdbc" xmlns:jee="http://www.springframework.org/schema/jee"
xmlns:tx="http://www.springframework.org/schema/tx" xmlns:jpa="http://www.springframework.org/schema/data/jpa"
xmlns:task="http://www.springframework.org/schema/task" xmlns:p="http://www.springframework.org/schema/p"
xmlns:aop="http://www.springframework.org/schema/aop"
xsi:schemaLocation="http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task.xsd
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc.xsd
http://www.springframework.org/schema/jee http://www.springframework.org/schema/jee/spring-jee.xsd
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd
http://www.springframework.org/schema/data/jpa http://www.springframework.org/schema/data/jpa/spring-jpa.xsd http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd"
default-lazy-init="true">
<description>Spring公共配置</description>
<aop:aspectj-autoproxy proxy-target-class="true"/>
<context:component-scan base-package="tkio" />
<context:component-scan base-package="track" />
<context:component-scan base-package="common" />
<context:component-scan base-package="dmp" />
<context:component-scan base-package="security" />
<context:property-placeholder location="classpath:persistence.properties"/>
<context:property-placeholder location="classpath:redis.properties" />
<!--Redis配置-->
<bean id="poolConfig" class="redis.clients.jedis.JedisPoolConfig">
<property name="maxIdle" value="300" />
<property name="maxTotal" value="600" />
<property name="maxWaitMillis" value="1000"></property>
<property name="testOnBorrow" value="true" />
</bean>
<bean id="connectionFactory" class="org.springframework.data.redis.connection.jedis.JedisConnectionFactory" p:hostName="192.168.2.57" p:port="6379" p:poolConfig-ref="poolConfig"/>
<bean id="redisTemplate" class="org.springframework.data.redis.core.StringRedisTemplate">
<property name="connectionFactory" ref="connectionFactory" />
</bean>
<!--//Redis配置 -->
<bean id="parentDataSource" class="com.alibaba.druid.pool.DruidDataSource" destroy-method="close">
<property name="driverClassName" value="${dataSource.driverClassName}"/>
<!-- 配置初始化大小、最小、最大 -->
<property name="initialSize" value="1"/>
<property name="minIdle" value="1"/>
<property name="maxActive" value="20"/>
<!-- 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒 -->
<property name="timeBetweenEvictionRunsMillis" value="60000"/>
<!-- 配置一个连接在池中最小生存的时间，单位是毫秒 -->
<property name="minEvictableIdleTimeMillis" value="300000"/>
</bean>
<bean id="dataSource" parent="parentDataSource">
<property name="url" value="${default.dataSource.url}"/>
<property name="username" value="${default.dataSource.username}"/>
<property name="password" value="${default.dataSource.password}"/>
</bean>
<bean id="officeDataSource" parent="parentDataSource">
<property name="url" value="jdbc:mysql://192.168.2.57:3306/office?characterEncoding=utf-8"/>
<property name="username" value="root"/>
<property name="password" value="reyun123"/>
</bean>
<bean id="tkioDataSource" parent="parentDataSource">
<property name="url" value="jdbc:mysql://192.168.2.57:3306/trackingio?characterEncoding=utf-8"/>
<property name="username" value="root"/>
<property name="password" value="reyun123"/>
</bean>
<bean id="trackDataSource" parent="parentDataSource">
<property name="url" value="jdbc:mysql://192.168.2.57:3306/track?characterEncoding=utf-8"/>
<property name="username" value="root"/>
<property name="password" value="reyun123"/>
</bean>
<bean id="dmpDataSource" parent="parentDataSource">
<property name="url" value="jdbc:mysql://192.168.2.57:3306/manager?characterEncoding=utf-8"/>
<property name="username" value="root"/>
<property name="password" value="reyun123"/>
</bean>
<!-- JPA实体管理工厂的配置 -->
<bean id="entityManagerFactory" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
<property name="dataSource" ref="dataSource"/>
<property name="packagesToScan" value="common.model">
</property>
<property name="persistenceUnitName" value="defaultUnit" />
<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>
<bean id="officeEntityManagerFactory" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
<property name="dataSource" ref="officeDataSource"/>
<property name="packagesToScan" value="office.model"></property>
<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>
<bean id="tkioEntityManagerFactory" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
<property name="dataSource" ref="tkioDataSource"/>
<property name="packagesToScan" value="tkio.model"></property>
<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>
<bean id="trackEntityManagerFactory" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
<property name="dataSource" ref="trackDataSource"/>
<property name="packagesToScan" value="track.model"></property>
<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>
<bean id="dmpEntityManagerFactory" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
<property name="dataSource" ref="dmpDataSource"/>
<property name="packagesToScan" value="dmp.model"></property>
<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"/>
</bean>
<!-- Jpa 事务配置 -->
<bean id="transactionManager" class="org.springframework.orm.jpa.JpaTransactionManager">
<property name="entityManagerFactory" ref="entityManagerFactory"/>
</bean>
<bean id="officeTransactionManager" class="org.springframework.orm.jpa.JpaTransactionManager">
<property name="entityManagerFactory" ref="officeEntityManagerFactory"/>
</bean>
<bean id="tkioTransactionManager" class="org.springframework.orm.jpa.JpaTransactionManager">
<property name="entityManagerFactory" ref="tkioEntityManagerFactory"/>
</bean>
<bean id="trackTransactionManager" class="org.springframework.orm.jpa.JpaTransactionManager">
<property name="entityManagerFactory" ref="trackEntityManagerFactory"/>
</bean>
<bean id="dmpTransactionManager" class="org.springframework.orm.jpa.JpaTransactionManager">
<property name="entityManagerFactory" ref="dmpEntityManagerFactory"/>
</bean>
<!-- Spring Data Jpa配置 -->
<jpa:repositories base-package="common.repository"
repository-impl-postfix="Impl" transaction-manager-ref="transactionManager"
entity-manager-factory-ref="entityManagerFactory"/>
<jpa:repositories base-package="office.repository"
repository-impl-postfix="Impl" transaction-manager-ref="officeTransactionManager"
entity-manager-factory-ref="officeEntityManagerFactory"/>
<jpa:repositories base-package="tkio.repository"
repository-impl-postfix="Impl" transaction-manager-ref="tkioTransactionManager"
entity-manager-factory-ref="tkioEntityManagerFactory"/>
<jpa:repositories base-package="track.repository"
repository-impl-postfix="Impl" transaction-manager-ref="trackTransactionManager"
entity-manager-factory-ref="trackEntityManagerFactory"/>
<jpa:repositories base-package="dmp.repository"
repository-impl-postfix="Impl" transaction-manager-ref="dmpTransactionManager"
entity-manager-factory-ref="dmpEntityManagerFactory"/>
<!-- 使用annotation定义事务 -->
<tx:annotation-driven transaction-manager="transactionManager" proxy-target-class="true"/>
<tx:annotation-driven transaction-manager="officeTransactionManager" proxy-target-class="true"/>
<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:advice id="txAdvice" transaction-manager="transactionManager">
<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>
<tx:advice id="officeTxAdvice" transaction-manager="officeTransactionManager">
<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>
<tx:advice id="tkioTxAdvice" transaction-manager="tkioTransactionManager">
<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>
<tx:advice id="trackTxAdvice" transaction-manager="trackTransactionManager">
<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>
<tx:advice id="dmpTxAdvice" transaction-manager="dmpTransactionManager">
<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.*.*(..))"/>
<aop:advisor advice-ref="txAdvice" pointcut-ref="txPointcut"/>
</aop:config>
<aop:config expose-proxy="true">
<aop:pointcut id="officetxPointcut" expression="execution(* office.service.*.*(..))"/>
<aop:advisor advice-ref="officeTxAdvice" pointcut-ref="officetxPointcut"/>
</aop:config>
<aop:config expose-proxy="true">
<aop:pointcut id="tkiotxPointcut" expression="execution(* tkio.service.*.*(..))"/>
<aop:advisor advice-ref="tkioTxAdvice" pointcut-ref="tkiotxPointcut"/>
</aop:config>
<aop:config expose-proxy="true">
<aop:pointcut id="tracktxPointcut" expression="execution(* track.service.*.*(..))"/>
<aop:advisor advice-ref="trackTxAdvice" pointcut-ref="tracktxPointcut"/>
</aop:config>
<!-- SpringMVC上传文件时，需要配置MultipartResolver处理器 -->
<bean id="multipartResolver" class="org.springframework.web.multipart.commons.CommonsMultipartResolver">
<property name="defaultEncoding" value="UTF-8"/>
<!-- 指定所上传文件的总大小不能超过2000KB。注意maxUploadSize属性的限制不是针对单个文件，而是所有文件的容量之和 -->
<property name="maxUploadSize" value="2000000"/>
</bean>
<bean id="appUtils" class="common.context.AppUtils" lazy-init="false" />
</beans>
target/classes/common.properties deleted 100644 → 0
report.url=http://ec2-54-222-233-230.cn-north-1.compute.amazonaws.com.cn:9010
awsneed=${awsneed}
profile.table=${profile.table}
event.table=${event.table}
usergroup.table=${usergroup.table}
iscache=${iscache}
target/classes/logback.xml deleted 100644 → 0
<?xml version="1.0" encoding="UTF-8"?>
<configuration scan="true">
<appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
<Encoding>UTF-8</Encoding>
<layout class="ch.qos.logback.classic.PatternLayout">
<Pattern>%-20(%d{HH:mm:ss.SSS} [%thread][line:%L]) %-5level %logger{80} %M - %msg%n</Pattern>
</layout>
</appender>
<logger name="org.springframework" level="warn"/>
<logger name="org.springframework.remoting" level="warn"/>
<logger name="org.springframework.scheduling.quartz" level="warn"/>
<logger name="org.springframework.data.jpa" level="warn"/>
<logger name="ch.qos.logback" level="warn"/>
<logger name="org.hibernate" level="warn"/>
<root level="info">
<appender-ref ref="stdout" />
</root>
</configuration>
\ No newline at end of file
target/classes/logback/dev/logback.xml deleted 100644 → 0
<?xml version="1.0" encoding="UTF-8"?>
<configuration scan="true">
<appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
<Encoding>UTF-8</Encoding>
<layout class="ch.qos.logback.classic.PatternLayout">
<Pattern>%-20(%d{HH:mm:ss.SSS} [%thread][line:%L]) %-5level %logger{80} %M - %msg%n</Pattern>
</layout>
</appender>
<logger name="org.springframework" level="warn"/>
<logger name="org.springframework.remoting" level="warn"/>
<logger name="org.springframework.scheduling.quartz" level="warn"/>
<logger name="org.springframework.data.jpa" level="warn"/>
<logger name="ch.qos.logback" level="warn"/>
<logger name="org.hibernate" level="warn"/>
<root level="info">
<appender-ref ref="stdout" />
</root>
</configuration>
\ No newline at end of file
target/classes/logback/product/logback.xml deleted 100644 → 0
<?xml version="1.0" encoding="UTF-8"?>
<configuration scan="true">
<appender name="infoFile" class="ch.qos.logback.core.rolling.RollingFileAppender">
<Encoding>UTF-8</Encoding>
<file>/data/logs/trackingio.com/trackingio.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<FileNamePattern>/data/logs/trackingio.com/trackingio.%d{yyyy-MM-dd}.log.zip</FileNamePattern>
<maxHistory>30</maxHistory>
</rollingPolicy>
<layout class="ch.qos.logback.classic.PatternLayout">
<pattern>%-20(%d{HH:mm:ss.SSS} [%thread][line:%L]) %-5level %logger{80} - %msg%n</pattern>
</layout>
</appender>
<logger name="org.springframework">
<level value="warn" />
</logger>
<logger name="org.hibernate">
<level value="warn" />
</logger>
<logger name="org.apache.phoenix">
<level value="warn" />
</logger>
<logger name="org.apache.zookeeper">
<level value="warn" />
</logger>
<logger name="org.apache.hadoop">
<level value="warn" />
</logger>
<logger name="org.elasticsearch.plugins">
<level value="warn" />
</logger>
<root level="info">
<appender-ref ref="infoFile" />
<appender-ref ref="cat" />
</root>
</configuration>
\ No newline at end of file
target/classes/mail.properties deleted 100644 → 0
mail.host=smtp.exmail.qq.com
mail.username=service1@reyun.com
mail.password=XSW29ijn
mail.content_type=text/plain;charset\=GBK
mail.list=zhangliang
mail.valid_time=3
\ No newline at end of file
target/classes/persistence.properties deleted 100644 → 0
dataSource.driverClassName=com.mysql.jdbc.Driver
default.dataSource.url=jdbc:mysql://192.168.2.57:3306/manager?characterEncoding=utf-8
default.dataSource.username=root
default.dataSource.password=reyun123
office.url=jdbc:mysql://192.168.2.57:3306/office?characterEncoding=utf-8
office.username=root
office.password=reyun123
tkio.url=jdbc:mysql://192.168.2.57:3306/trackingio?characterEncoding=utf-8
tkio.username=root
tkio.password=reyun123
track.url=jdbc:mysql://192.168.2.57:3306/track?characterEncoding=utf-8
track.username=root
track.password=reyun123
dmp.url=jdbc:mysql://192.168.2.57:3306/manager?characterEncoding=utf-8
dmp.username=root
dmp.password=reyun123
\ No newline at end of file
target/classes/redis.properties deleted 100644 → 0
# Redis common settings
redis.key.validtime=120
redis.ip.requesttimes=5
redis.ip.unknown.requesttimes=5
redis.maxIdle=300
redis.testOnBorrow=true
# token
redis.surl.host=192.168.2.57
redis.surl.port=6379
# event
redis.event.host=192.168.2.57
redis.event.port=6379
redis.event.database=0
target/classes/rest-servlet.xml deleted 100644 → 0
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mvc="http://www.springframework.org/schema/mvc"
xmlns:context="http://www.springframework.org/schema/context" xmlns:aop="http://www.springframework.org/schema/aop"
xsi:schemaLocation="http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.1.xsd
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd">
<context:component-scan base-package="exception" />
<context:component-scan base-package="common.controller" />
<context:component-scan base-package="track.controller" />
<context:component-scan base-package="tkio.controller" />
<mvc:annotation-driven>
<mvc:argument-resolvers>
<bean class="security.resolvers.LoginUserMethodArgumentsResolver"></bean>
</mvc:argument-resolvers>
<mvc:message-converters register-defaults="true">
<bean class="org.springframework.http.converter.StringHttpMessageConverter">
<constructor-arg value="UTF-8" />
</bean>
<bean class="org.springframework.http.converter.json.MappingJackson2HttpMessageConverter">
<property name="supportedMediaTypes">
<list>
<value>text/html;charset=UTF-8</value>
<value>application/json;charset=UTF-8</value>
</list>
</property>
</bean>
</mvc:message-converters>
</mvc:annotation-driven>
<mvc:interceptors>
<mvc:interceptor>
<mvc:mapping path="/**" />
<bean class="security.interceptor.AuthorizationInterceptor" />
</mvc:interceptor>
</mvc:interceptors>
</beans>
\ No newline at end of file
target/classes/webdefault.xml deleted 100644 → 0
<?xml version="1.0" encoding="UTF-8"?>
<web-app
xmlns="http://xmlns.jcp.org/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
metadata-complete="false"
version="3.1">
<!-- ===================================================================== -->
<!-- This file contains the default descriptor for web applications. -->
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<!-- The intent of this descriptor is to include jetty specific or common -->
<!-- configuration for all webapps. If a context has a webdefault.xml -->
<!-- descriptor, it is applied before the contexts own web.xml file -->
<!-- -->
<!-- A context may be assigned a default descriptor by: -->
<!-- + Calling WebApplicationContext.setDefaultsDescriptor -->
<!-- + Passed an arg to addWebApplications -->
<!-- -->
<!-- This file is used both as the resource within the jetty.jar (which is -->
<!-- used as the default if no explicit defaults descriptor is set) and it -->
<!-- is copied to the etc directory of the Jetty distro and explicitly -->
<!-- by the jetty.xml file. -->
<!-- -->
<!-- ===================================================================== -->
<description>
Default web.xml file.
This file is applied to a Web application before it's own WEB_INF/web.xml file
</description>
<!-- ==================================================================== -->
<!-- Removes static references to beans from javax.el.BeanELResolver to -->
<!-- ensure webapp classloader can be released on undeploy -->
<!-- ==================================================================== -->
<listener>
<listener-class>org.eclipse.jetty.servlet.listener.ELContextCleaner</listener-class>
</listener>
<!-- ==================================================================== -->
<!-- Removes static cache of Methods from java.beans.Introspector to -->
<!-- ensure webapp classloader can be released on undeploy -->
<!-- ==================================================================== -->
<listener>
<listener-class>org.eclipse.jetty.servlet.listener.IntrospectorCleaner</listener-class>
</listener>
<!-- ==================================================================== -->
<!-- Context params to control Session Cookies -->
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<!--
UNCOMMENT TO ACTIVATE
<context-param>
<param-name>org.eclipse.jetty.servlet.SessionDomain</param-name>
<param-value>127.0.0.1</param-value>
</context-param>
<context-param>
<param-name>org.eclipse.jetty.servlet.SessionPath</param-name>
<param-value>/</param-value>
</context-param>
<context-param>
<param-name>org.eclipse.jetty.servlet.MaxAge</param-name>
<param-value>-1</param-value>
</context-param>
-->
<!-- ==================================================================== -->
<!-- The default servlet. -->
<!-- This servlet, normally mapped to /, provides the handling for static -->
<!-- content, OPTIONS and TRACE methods for the context. -->
<!-- The following initParameters are supported: -->
<!--
* acceptRanges If true, range requests and responses are
* supported
*
* dirAllowed If true, directory listings are returned if no
* welcome file is found. Else 403 Forbidden.
*
* welcomeServlets If true, attempt to dispatch to welcome files
* that are servlets, but only after no matching static
* resources could be found. If false, then a welcome
* file must exist on disk. If "exact", then exact
* servlet matches are supported without an existing file.
* Default is true.
*
* This must be false if you want directory listings,
* but have index.jsp in your welcome file list.
*
* redirectWelcome If true, welcome files are redirected rather than
* forwarded to.
*
* gzip If set to true, then static content will be served as
* gzip content encoded if a matching resource is
* found ending with ".gz"
*
* resourceBase Set to replace the context resource base
*
* resourceCache If set, this is a context attribute name, which the servlet
* will use to look for a shared ResourceCache instance.
*
* relativeResourceBase
* Set with a pathname relative to the base of the
* servlet context root. Useful for only serving static content out
* of only specific subdirectories.
*
* pathInfoOnly If true, only the path info will be applied to the resourceBase
*
* stylesheet Set with the location of an optional stylesheet that will be used
* to decorate the directory listing html.
*
* aliases If True, aliases of resources are allowed (eg. symbolic
* links and caps variations). May bypass security constraints.
*
* etags If True, weak etags will be generated and handled.
*
* maxCacheSize The maximum total size of the cache or 0 for no cache.
* maxCachedFileSize The maximum size of a file to cache
* maxCachedFiles The maximum number of files to cache
*
* useFileMappedBuffer
* If set to true, it will use mapped file buffer to serve static content
* when using NIO connector. Setting this value to false means that
* a direct buffer will be used instead of a mapped file buffer.
* By default, this is set to true.
*
* cacheControl If set, all static content will have this value set as the cache-control
* header.
*
-->
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<servlet>
<servlet-name>default</servlet-name>
<servlet-class>org.eclipse.jetty.servlet.DefaultServlet</servlet-class>
<init-param>
<param-name>aliases</param-name>
<param-value>false</param-value>
</init-param>
<init-param>
<param-name>acceptRanges</param-name>
<param-value>true</param-value>
</init-param>
<init-param>
<param-name>dirAllowed</param-name>
<param-value>true</param-value>
</init-param>
<init-param>
<param-name>welcomeServlets</param-name>
<param-value>false</param-value>
</init-param>
<init-param>
<param-name>redirectWelcome</param-name>
<param-value>false</param-value>
</init-param>
<init-param>
<param-name>maxCacheSize</param-name>
<param-value>256000000</param-value>
</init-param>
<init-param>
<param-name>maxCachedFileSize</param-name>
<param-value>200000000</param-value>
</init-param>
<init-param>
<param-name>maxCachedFiles</param-name>
<param-value>2048</param-value>
</init-param>
<init-param>
<param-name>gzip</param-name>
<param-value>false</param-value>
</init-param>
<init-param>
<param-name>etags</param-name>
<param-value>false</param-value>
</init-param>
<init-param>
<param-name>useFileMappedBuffer</param-name>
<param-value>false</param-value>
</init-param>
<!--
<init-param>
<param-name>resourceCache</param-name>
<param-value>resourceCache</param-value>
</init-param>
-->
<!--
<init-param>
<param-name>cacheControl</param-name>
<param-value>max-age=3600,public</param-value>
</init-param>
-->
<load-on-startup>0</load-on-startup>
</servlet>
<servlet-mapping>
<servlet-name>default</servlet-name>
<url-pattern>/</url-pattern>
</servlet-mapping>
<!-- ==================================================================== -->
<!-- JSP Servlet -->
<!-- This is the jasper JSP servlet from the jakarta project -->
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<!-- The JSP page compiler and execution servlet, which is the mechanism -->
<!-- used by Glassfish to support JSP pages. Traditionally, this servlet -->
<!-- is mapped to URL patterh "*.jsp". This servlet supports the -->
<!-- following initialization parameters (default values are in square -->
<!-- brackets): -->
<!-- -->
<!-- checkInterval If development is false and reloading is true, -->
<!-- background compiles are enabled. checkInterval -->
<!-- is the time in seconds between checks to see -->
<!-- if a JSP page needs to be recompiled. [300] -->
<!-- -->
<!-- compiler Which compiler Ant should use to compile JSP -->
<!-- pages. See the Ant documenation for more -->
<!-- information. [javac] -->
<!-- -->
<!-- classdebuginfo Should the class file be compiled with -->
<!-- debugging information? [true] -->
<!-- -->
<!-- classpath What class path should I use while compiling -->
<!-- generated servlets? [Created dynamically -->
<!-- based on the current web application] -->
<!-- Set to ? to make the container explicitly set -->
<!-- this parameter. -->
<!-- -->
<!-- development Is Jasper used in development mode (will check -->
<!-- for JSP modification on every access)? [true] -->
<!-- -->
<!-- enablePooling Determines whether tag handler pooling is -->
<!-- enabled [true] -->
<!-- -->
<!-- fork Tell Ant to fork compiles of JSP pages so that -->
<!-- a separate JVM is used for JSP page compiles -->
<!-- from the one Tomcat is running in. [true] -->
<!-- -->
<!-- ieClassId The class-id value to be sent to Internet -->
<!-- Explorer when using <jsp:plugin> tags. -->
<!-- [clsid:8AD9C840-044E-11D1-B3E9-00805F499D93] -->
<!-- -->
<!-- javaEncoding Java file encoding to use for generating java -->
<!-- source files. [UTF-8] -->
<!-- -->
<!-- keepgenerated Should we keep the generated Java source code -->
<!-- for each page instead of deleting it? [true] -->
<!-- -->
<!-- logVerbosityLevel The level of detailed messages to be produced -->
<!-- by this servlet. Increasing levels cause the -->
<!-- generation of more messages. Valid values are -->
<!-- FATAL, ERROR, WARNING, INFORMATION, and DEBUG. -->
<!-- [WARNING] -->
<!-- -->
<!-- mappedfile Should we generate static content with one -->
<!-- print statement per input line, to ease -->
<!-- debugging? [false] -->
<!-- -->
<!-- -->
<!-- reloading Should Jasper check for modified JSPs? [true] -->
<!-- -->
<!-- suppressSmap Should the generation of SMAP info for JSR45 -->
<!-- debugging be suppressed? [false] -->
<!-- -->
<!-- dumpSmap Should the SMAP info for JSR45 debugging be -->
<!-- dumped to a file? [false] -->
<!-- False if suppressSmap is true -->
<!-- -->
<!-- scratchdir What scratch directory should we use when -->
<!-- compiling JSP pages? [default work directory -->
<!-- for the current web application] -->
<!-- -->
<!-- tagpoolMaxSize The maximum tag handler pool size [5] -->
<!-- -->
<!-- xpoweredBy Determines whether X-Powered-By response -->
<!-- header is added by generated servlet [false] -->
<!-- -->
<!-- If you wish to use Jikes to compile JSP pages: -->
<!-- Set the init parameter "compiler" to "jikes". Define -->
<!-- the property "-Dbuild.compiler.emacs=true" when starting Jetty -->
<!-- to cause Jikes to emit error messages in a format compatible with -->
<!-- Jasper. -->
<!-- If you get an error reporting that jikes can't use UTF-8 encoding, -->
<!-- try setting the init parameter "javaEncoding" to "ISO-8859-1". -->
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<servlet id="jsp">
<servlet-name>jsp</servlet-name>
<servlet-class>org.apache.jasper.servlet.JspServlet</servlet-class>
<init-param>
<param-name>logVerbosityLevel</param-name>
<param-value>DEBUG</param-value>
</init-param>
<init-param>
<param-name>fork</param-name>
<param-value>false</param-value>
</init-param>
<init-param>
<param-name>xpoweredBy</param-name>
<param-value>false</param-value>
</init-param>
<init-param>
<param-name>compilerTargetVM</param-name>
<param-value>1.7</param-value>
</init-param>
<init-param>
<param-name>compilerSourceVM</param-name>
<param-value>1.7</param-value>
</init-param>
<!--
<init-param>
<param-name>classpath</param-name>
<param-value>?</param-value>
</init-param>
-->
<load-on-startup>0</load-on-startup>
</servlet>
<servlet-mapping>
<servlet-name>jsp</servlet-name>
<url-pattern>*.jsp</url-pattern>
<url-pattern>*.jspf</url-pattern>
<url-pattern>*.jspx</url-pattern>
<url-pattern>*.xsp</url-pattern>
<url-pattern>*.JSP</url-pattern>
<url-pattern>*.JSPF</url-pattern>
<url-pattern>*.JSPX</url-pattern>
<url-pattern>*.XSP</url-pattern>
</servlet-mapping>
<!-- ==================================================================== -->
<session-config>
<session-timeout>30</session-timeout>
</session-config>
<!-- ==================================================================== -->
<!-- Default MIME mappings -->
<!-- The default MIME mappings are provided by the mime.properties -->
<!-- resource in the org.eclipse.jetty.server.jar file. Additional or modified -->
<!-- mappings may be specified here -->
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<!-- UNCOMMENT TO ACTIVATE
<mime-mapping>
<extension>mysuffix</extension>
<mime-type>mymime/type</mime-type>
</mime-mapping>
-->
<!-- ==================================================================== -->
<welcome-file-list>
<welcome-file>index.html</welcome-file>
<welcome-file>index.htm</welcome-file>
<welcome-file>index.jsp</welcome-file>
</welcome-file-list>
<!-- ==================================================================== -->
<locale-encoding-mapping-list>
<locale-encoding-mapping>
<locale>ar</locale>
<encoding>ISO-8859-6</encoding>
</locale-encoding-mapping>
<locale-encoding-mapping>
<locale>be</locale>
<encoding>ISO-8859-5</encoding>
</locale-encoding-mapping>
<locale-encoding-mapping>
<locale>bg</locale>
<encoding>ISO-8859-5</encoding>
</locale-encoding-mapping>
<locale-encoding-mapping>
<locale>ca</locale>
<encoding>ISO-8859-1</encoding>
</locale-encoding-mapping>
<locale-encoding-mapping>
<locale>cs</locale>
<encoding>ISO-8859-2</encoding>
</locale-encoding-mapping>
<locale-encoding-mapping>
<locale>da</locale>
<encoding>ISO-8859-1</encoding>
</locale-encoding-mapping>
<locale-encoding-mapping>
<locale>de</locale>
<encoding>ISO-8859-1</encoding>
</locale-encoding-mapping>
<locale-encoding-mapping>
<locale>el</locale>
<encoding>ISO-8859-7</encoding>
</locale-encoding-mapping>
<locale-encoding-mapping>
<locale>en</locale>
<encoding>ISO-8859-1</encoding>
</locale-encoding-mapping>
<locale-encoding-mapping>
<locale>es</locale>
<encoding>ISO-8859-1</encoding>
</locale-encoding-mapping>
<locale-encoding-mapping>
<locale>et</locale>
<encoding>ISO-8859-1</encoding>
</locale-encoding-mapping>
<locale-encoding-mapping>
<locale>fi</locale>
<encoding>ISO-8859-1</encoding>
</locale-encoding-mapping>
<locale-encoding-mapping>
<locale>fr</locale>
<encoding>ISO-8859-1</encoding>
</locale-encoding-mapping>
<locale-encoding-mapping>
<locale>hr</locale>
<encoding>ISO-8859-2</encoding>
</locale-encoding-mapping>
<locale-encoding-mapping>
<locale>hu</locale>
<encoding>ISO-8859-2</encoding>
</locale-encoding-mapping>
<locale-encoding-mapping>
<locale>is</locale>
<encoding>ISO-8859-1</encoding>
</locale-encoding-mapping>
<locale-encoding-mapping>
<locale>it</locale>
<encoding>ISO-8859-1</encoding>
</locale-encoding-mapping>
<locale-encoding-mapping>
<locale>iw</locale>
<encoding>ISO-8859-8</encoding>
</locale-encoding-mapping>
<locale-encoding-mapping>
<locale>ja</locale>
<encoding>Shift_JIS</encoding>
</locale-encoding-mapping>
<locale-encoding-mapping>
<locale>ko</locale>
<encoding>EUC-KR</encoding>
</locale-encoding-mapping>
<locale-encoding-mapping>
<locale>lt</locale>
<encoding>ISO-8859-2</encoding>
</locale-encoding-mapping>
<locale-encoding-mapping>
<locale>lv</locale>
<encoding>ISO-8859-2</encoding>
</locale-encoding-mapping>
<locale-encoding-mapping>
<locale>mk</locale>
<encoding>ISO-8859-5</encoding>
</locale-encoding-mapping>
<locale-encoding-mapping>
<locale>nl</locale>
<encoding>ISO-8859-1</encoding>
</locale-encoding-mapping>
<locale-encoding-mapping>
<locale>no</locale>
<encoding>ISO-8859-1</encoding>
</locale-encoding-mapping>
<locale-encoding-mapping>
<locale>pl</locale>
<encoding>ISO-8859-2</encoding>
</locale-encoding-mapping>
<locale-encoding-mapping>
<locale>pt</locale>
<encoding>ISO-8859-1</encoding>
</locale-encoding-mapping>
<locale-encoding-mapping>
<locale>ro</locale>
<encoding>ISO-8859-2</encoding>
</locale-encoding-mapping>
<locale-encoding-mapping>
<locale>ru</locale>
<encoding>ISO-8859-5</encoding>
</locale-encoding-mapping>
<locale-encoding-mapping>
<locale>sh</locale>
<encoding>ISO-8859-5</encoding>
</locale-encoding-mapping>
<locale-encoding-mapping>
<locale>sk</locale>
<encoding>ISO-8859-2</encoding>
</locale-encoding-mapping>
<locale-encoding-mapping>
<locale>sl</locale>
<encoding>ISO-8859-2</encoding>
</locale-encoding-mapping>
<locale-encoding-mapping>
<locale>sq</locale>
<encoding>ISO-8859-2</encoding>
</locale-encoding-mapping>
<locale-encoding-mapping>
<locale>sr</locale>
<encoding>ISO-8859-5</encoding>
</locale-encoding-mapping>
<locale-encoding-mapping>
<locale>sv</locale>
<encoding>ISO-8859-1</encoding>
</locale-encoding-mapping>
<locale-encoding-mapping>
<locale>tr</locale>
<encoding>ISO-8859-9</encoding>
</locale-encoding-mapping>
<locale-encoding-mapping>
<locale>uk</locale>
<encoding>ISO-8859-5</encoding>
</locale-encoding-mapping>
<locale-encoding-mapping>
<locale>zh</locale>
<encoding>GB2312</encoding>
</locale-encoding-mapping>
<locale-encoding-mapping>
<locale>zh_TW</locale>
<encoding>Big5</encoding>
</locale-encoding-mapping>
</locale-encoding-mapping-list>
<security-constraint>
<web-resource-collection>
<web-resource-name>Disable TRACE</web-resource-name>
<url-pattern>/</url-pattern>
<http-method>TRACE</http-method>
</web-resource-collection>
<auth-constraint/>
</security-constraint>
<security-constraint>
<web-resource-collection>
<web-resource-name>Enable everything but TRACE</web-resource-name>
<url-pattern>/</url-pattern>
<http-method-omission>TRACE</http-method-omission>
</web-resource-collection>
</security-constraint>
</web-app>
target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
......@@ -2,6 +2,7 @@ common\model\BackVisit.class
security\TokenManager.class
tkio\controller\TkioAccountController.class
tkio\model\UserLog.class
track\controller\TrackAccountController.class
dmp\model\TagCrawlerAppsWandoujia.class
util\ValidateUtil.class
tkio\repository\CampaignRepository.class
......@@ -9,16 +10,19 @@ util\HttpClientUtil.class
common\model\Auth.class
tkio\repository\AccountRepository.class
common\model\Menu.class
track\repository\TrackAppRepository.class
exception\GlobalExceptionAdvice.class
tkio\model\Campaign.class
security\RedisTokenManager.class
tkio\model\Account.class
security\AbstractTokenManager.class
track\repository\TrackAccountRepository.class
common\model\UserLog.class
security\exception\MethodNotSupportException.class
tkio\repository\SalesManLeaderRepository.class
tkio\model\RoleAuth.class
common\service\impl\AppServiceImpl$1.class
track\model\Account.class
common\controller\UserController.class
exception\TipException.class
common\context\AppUtils.class
......@@ -26,6 +30,7 @@ util\RedisUtilNew.class
tkio\task\SyncAppDataTask.class
common\model\User.class
tkio\repository\IsNotifiedRepository.class
track\repository\TrackChannelRepository.class
tkio\service\impl\TkioAccountServiceImpl.class
util\DateUtil.class
common\model\AppCategory.class
......@@ -49,8 +54,11 @@ common\model\City.class
common\service\impl\AppServiceImpl.class
common\repository\ReminderRepository.class
util\StringUtil.class
track\model\Channel.class
track\model\Campaign.class
security\interceptor\AuthorizationInterceptor.class
security\annotation\CurrentAccount.class
track\model\App.class
common\model\AppInfo.class
common\service\impl\UserServiceImpl.class
util\IP.class
......@@ -59,6 +67,7 @@ tkio\model\RoleAuthDetail.class
util\CharacterUtils.class
tkio\repository\PackageTypeRepository.class
util\Constant.class
common\repository\TrackAccount4WebRepository.class
common\repository\BackVisitRepository.class
common\repository\RoleTypeRepository.class
tkio\service\AccountFlowRestrictService.class
......@@ -66,6 +75,7 @@ util\UserLogThread.class
tkio\model\DataAuth.class
common\model\KeyValue.class
common\repository\UserRepository.class
track\repository\TrackCampaignRepository.class
util\ResultModel.class
dic\RoleEnum.class
util\CipherUtil.class
......@@ -73,6 +83,7 @@ common\controller\UserLogController.class
tkio\model\App.class
security\resolvers\LoginUserMethodArgumentsResolver.class
tkio\service\TkioAccountService.class
common\model\TrackAccount4Web.class
common\model\RoleType.class
tkio\task\AccountTask.class
security\annotation\Authorization.class
......@@ -84,10 +95,12 @@ common\service\MenuService.class
common\repository\AppCategoryRepository.class
tkio\repository\AppRepository.class
common\service\impl\UserLogServiceImpl.class
track\service\impl\TrackAccountServiceImpl.class
dmp\repository\TagCrawlerAppsWandoujiaRepository.class
security\RedisLoginStatusManagerImpl.class
tkio\model\AccountRestrict4Web.class
dic\OperateObjectTypeEnum.class
track\service\TrackAccountService.class
common\service\UserService.class
common\service\AppService.class
common\service\UserLogService.class
......@@ -102,4 +115,5 @@ common\model\Email.class
security\cors\CorsFilter.class
util\ResultStatus.class
tkio\model\IsNotified.class
track\task\AccountTask.class
tkio\model\Auth.class
target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
E:\IDEA_workspace\manager\src\main\java\tkio\repository\SalesManLeaderRepository.java
E:\IDEA_workspace\manager\src\main\java\tkio\service\TkioAccountService.java
E:\IDEA_workspace\manager\src\main\java\security\interceptor\AuthorizationInterceptor.java
E:\IDEA_workspace\manager\src\main\java\common\repository\CodeRepository.java
E:\IDEA_workspace\manager\src\main\java\util\Constant.java
E:\IDEA_workspace\manager\src\main\java\common\controller\UserController.java
E:\IDEA_workspace\manager\src\main\java\util\ResultStatus.java
E:\IDEA_workspace\manager\src\main\java\common\service\impl\UserLogServiceImpl.java
E:\IDEA_workspace\manager\src\main\java\security\RedisLoginStatusManagerImpl.java
E:\IDEA_workspace\manager\src\main\java\tkio\service\AccountFlowRestrictService.java
E:\IDEA_workspace\manager\src\main\java\common\service\impl\UserServiceImpl.java
E:\IDEA_workspace\manager\src\main\java\security\RedisTokenManager.java
E:\IDEA_workspace\manager\src\main\java\common\repository\UserRepository.java
E:\IDEA_workspace\manager\src\main\java\common\model\Email.java
E:\IDEA_workspace\manager\src\main\java\tkio\task\AccountTask.java
E:\IDEA_workspace\manager\src\main\java\tkio\model\Campaign.java
E:\IDEA_workspace\manager\src\main\java\common\service\AppService.java
E:\IDEA_workspace\manager\src\main\java\util\ValidateUtil.java
E:\IDEA_workspace\manager\src\main\java\common\service\impl\MenuServiceImpl.java
E:\IDEA_workspace\manager\src\main\java\common\controller\LoginController.java
E:\IDEA_workspace\manager\src\main\java\common\model\AppCategory.java
E:\IDEA_workspace\manager\src\main\java\common\repository\BackVisitRepository.java
E:\IDEA_workspace\manager\src\main\java\tkio\model\RoleAuthDetail.java
E:\IDEA_workspace\manager\src\main\java\tkio\model\SalesManLeader.java
E:\IDEA_workspace\manager\src\main\java\tkio\model\PackageType.java
E:\IDEA_workspace\manager\src\main\java\tkio\task\SyncAppDataTask.java
E:\IDEA_workspace\manager\src\main\java\security\exception\MethodNotSupportException.java
E:\IDEA_workspace\manager\src\main\java\util\IPAddrUtil.java
E:\IDEA_workspace\manager\src\main\java\util\HttpClientUtil.java
E:\IDEA_workspace\manager\src\main\java\util\UserLogThread.java
E:\IDEA_workspace\manager\src\main\java\tkio\model\Auth.java
E:\IDEA_workspace\manager\src\main\java\dmp\model\TagCrawlerAppsWandoujia.java
E:\IDEA_workspace\manager\src\main\java\common\controller\UserLogController.java
E:\IDEA_workspace\manager\src\main\java\common\model\Code.java
E:\IDEA_workspace\manager\src\main\java\exception\GlobalExceptionAdvice.java
E:\IDEA_workspace\manager\src\main\java\security\annotation\CurrentAccount.java
E:\IDEA_workspace\manager\src\main\java\tkio\model\UserLog.java
E:\IDEA_workspace\manager\src\main\java\common\model\User.java
E:\IDEA_workspace\manager\src\main\java\common\model\RoleType.java
E:\IDEA_workspace\manager\src\main\java\exception\TipException.java
E:\IDEA_workspace\manager\src\main\java\util\ResultModel.java
E:\IDEA_workspace\manager\src\main\java\dic\RoleEnum.java
E:\IDEA_workspace\manager\src\main\java\common\model\Account4Web.java
E:\IDEA_workspace\manager\src\main\java\common\repository\CityRepository.java
E:\IDEA_workspace\manager\src\main\java\tkio\repository\AppRepository.java
E:\IDEA_workspace\manager\src\main\java\util\MailUtils.java
E:\IDEA_workspace\manager\src\main\java\common\model\Reminder.java
E:\IDEA_workspace\manager\src\main\java\tkio\repository\IsNotifiedRepository.java
E:\IDEA_workspace\manager\src\main\java\tkio\repository\PackageTypeRepository.java
E:\IDEA_workspace\manager\src\main\java\tkio\model\IsNotified.java
E:\IDEA_workspace\manager\src\main\java\common\repository\AuthRepository.java
E:\IDEA_workspace\manager\src\main\java\common\repository\PaymentRepository.java
E:\IDEA_workspace\manager\src\main\java\common\model\UserLog.java
E:\IDEA_workspace\manager\src\main\java\tkio\repository\CampaignRepository.java
E:\IDEA_workspace\manager\src\main\java\tkio\repository\ChannelRepository.java
E:\IDEA_workspace\manager\src\main\java\util\CipherUtil.java
E:\IDEA_workspace\manager\src\main\java\security\TokenManager.java
E:\IDEA_workspace\manager\src\main\java\tkio\model\Account.java
E:\IDEA_workspace\manager\src\main\java\tkio\model\RoleAuth.java
E:\IDEA_workspace\manager\src\main\java\common\service\MenuService.java
E:\IDEA_workspace\manager\src\main\java\util\StringUtil.java
E:\IDEA_workspace\manager\src\main\java\security\cors\CorsFilter.java
E:\IDEA_workspace\manager\src\main\java\util\DateUtil.java
E:\IDEA_workspace\manager\src\main\java\common\controller\AppController.java
E:\IDEA_workspace\manager\src\main\java\common\service\UserLogService.java
E:\IDEA_workspace\manager\src\main\java\common\model\Auth.java
E:\IDEA_workspace\manager\src\main\java\common\repository\UserLogRepository.java
E:\IDEA_workspace\manager\src\main\java\security\resolvers\LoginUserMethodArgumentsResolver.java
E:\IDEA_workspace\manager\src\main\java\common\model\Menu.java
E:\IDEA_workspace\manager\src\main\java\common\repository\RoleTypeRepository.java
E:\IDEA_workspace\manager\src\main\java\common\model\Payment.java
E:\IDEA_workspace\manager\src\main\java\common\repository\MenuRepository.java
E:\IDEA_workspace\manager\src\main\java\common\repository\AppInfoRepository.java
E:\IDEA_workspace\manager\src\main\java\common\service\UserService.java
E:\IDEA_workspace\manager\src\main\java\tkio\service\impl\TkioAccountServiceImpl.java
E:\IDEA_workspace\manager\src\main\java\tkio\model\AccountRestrict4Web.java
E:\IDEA_workspace\manager\src\main\java\tkio\repository\AccountRepository.java
E:\IDEA_workspace\manager\src\main\java\util\IP.java
E:\IDEA_workspace\manager\src\main\java\common\context\AppUtils.java
E:\IDEA_workspace\manager\src\main\java\common\controller\MenuController.java
E:\IDEA_workspace\manager\src\main\java\tkio\controller\TkioAccountController.java
E:\IDEA_workspace\manager\src\main\java\common\repository\ReminderRepository.java
E:\IDEA_workspace\manager\src\main\java\exception\NotFoundException.java
E:\IDEA_workspace\manager\src\main\java\tkio\model\DataAuth.java
E:\IDEA_workspace\manager\src\main\java\security\RedisLoginStatusManager.java
E:\IDEA_workspace\manager\src\main\java\util\CharacterUtils.java
E:\IDEA_workspace\manager\src\main\java\common\model\City.java
E:\IDEA_workspace\manager\src\main\java\tkio\model\Channel.java
E:\IDEA_workspace\manager\src\main\java\common\model\KeyValue.java
E:\IDEA_workspace\manager\src\main\java\tkio\model\App.java
E:\IDEA_workspace\manager\src\main\java\common\repository\AppCategoryRepository.java
E:\IDEA_workspace\manager\src\main\java\dmp\repository\TagCrawlerAppsWandoujiaRepository.java
E:\IDEA_workspace\manager\src\main\java\dic\OperateObjectTypeEnum.java
E:\IDEA_workspace\manager\src\main\java\dic\RoleTypeEnum.java
E:\IDEA_workspace\manager\src\main\java\tkio\service\impl\AccountFlowRestrictServiceImpl.java
E:\IDEA_workspace\manager\src\main\java\common\model\BackVisit.java
E:\IDEA_workspace\manager\src\main\java\common\service\impl\AppServiceImpl.java
E:\IDEA_workspace\manager\src\main\java\util\RedisUtilNew.java
E:\IDEA_workspace\manager\src\main\java\common\model\AppInfo.java
E:\IDEA_workspace\manager\src\main\java\exception\TransferCurrentAccountException.java
E:\IDEA_workspace\manager\src\main\java\security\AbstractTokenManager.java
E:\IDEA_workspace\manager\src\main\java\common\repository\Account4WebRepository.java
E:\IDEA_workspace\manager\src\main\java\security\annotation\Authorization.java
E:\newgit\manager\src\main\java\tkio\repository\CampaignRepository.java
E:\newgit\manager\src\main\java\tkio\task\AccountTask.java
E:\newgit\manager\src\main\java\util\StringUtil.java
E:\newgit\manager\src\main\java\track\repository\TrackAppRepository.java
E:\newgit\manager\src\main\java\common\service\UserService.java
E:\newgit\manager\src\main\java\dmp\repository\TagCrawlerAppsWandoujiaRepository.java
E:\newgit\manager\src\main\java\common\controller\AppController.java
E:\newgit\manager\src\main\java\tkio\model\Account.java
E:\newgit\manager\src\main\java\common\service\impl\UserServiceImpl.java
E:\newgit\manager\src\main\java\tkio\repository\ChannelRepository.java
E:\newgit\manager\src\main\java\common\model\Account4Web.java
E:\newgit\manager\src\main\java\tkio\repository\AppRepository.java
E:\newgit\manager\src\main\java\util\Constant.java
E:\newgit\manager\src\main\java\tkio\service\impl\AccountFlowRestrictServiceImpl.java
E:\newgit\manager\src\main\java\tkio\controller\TkioAccountController.java
E:\newgit\manager\src\main\java\tkio\model\Campaign.java
E:\newgit\manager\src\main\java\common\model\Auth.java
E:\newgit\manager\src\main\java\common\model\KeyValue.java
E:\newgit\manager\src\main\java\util\ResultModel.java
E:\newgit\manager\src\main\java\track\service\impl\TrackAccountServiceImpl.java
E:\newgit\manager\src\main\java\security\interceptor\AuthorizationInterceptor.java
E:\newgit\manager\src\main\java\exception\NotFoundException.java
E:\newgit\manager\src\main\java\dmp\model\TagCrawlerAppsWandoujia.java
E:\newgit\manager\src\main\java\tkio\service\impl\TkioAccountServiceImpl.java
E:\newgit\manager\src\main\java\security\cors\CorsFilter.java
E:\newgit\manager\src\main\java\common\repository\AppCategoryRepository.java
E:\newgit\manager\src\main\java\dic\RoleEnum.java
E:\newgit\manager\src\main\java\util\CipherUtil.java
E:\newgit\manager\src\main\java\common\model\UserLog.java
E:\newgit\manager\src\main\java\util\ValidateUtil.java
E:\newgit\manager\src\main\java\security\AbstractTokenManager.java
E:\newgit\manager\src\main\java\util\CharacterUtils.java
E:\newgit\manager\src\main\java\common\repository\Account4WebRepository.java
E:\newgit\manager\src\main\java\track\model\Account.java
E:\newgit\manager\src\main\java\tkio\repository\PackageTypeRepository.java
E:\newgit\manager\src\main\java\common\service\UserLogService.java
E:\newgit\manager\src\main\java\common\repository\MenuRepository.java
E:\newgit\manager\src\main\java\common\repository\TrackAccount4WebRepository.java
E:\newgit\manager\src\main\java\track\model\Campaign.java
E:\newgit\manager\src\main\java\common\repository\CityRepository.java
E:\newgit\manager\src\main\java\tkio\model\UserLog.java
E:\newgit\manager\src\main\java\track\repository\TrackAccountRepository.java
E:\newgit\manager\src\main\java\tkio\repository\IsNotifiedRepository.java
E:\newgit\manager\src\main\java\common\controller\UserLogController.java
E:\newgit\manager\src\main\java\security\RedisLoginStatusManager.java
E:\newgit\manager\src\main\java\util\IPAddrUtil.java
E:\newgit\manager\src\main\java\common\model\AppInfo.java
E:\newgit\manager\src\main\java\common\repository\AuthRepository.java
E:\newgit\manager\src\main\java\common\controller\LoginController.java
E:\newgit\manager\src\main\java\dic\RoleTypeEnum.java
E:\newgit\manager\src\main\java\common\model\Menu.java
E:\newgit\manager\src\main\java\common\service\AppService.java
E:\newgit\manager\src\main\java\common\service\MenuService.java
E:\newgit\manager\src\main\java\common\repository\PaymentRepository.java
E:\newgit\manager\src\main\java\common\controller\UserController.java
E:\newgit\manager\src\main\java\tkio\model\RoleAuth.java
E:\newgit\manager\src\main\java\tkio\model\RoleAuthDetail.java
E:\newgit\manager\src\main\java\tkio\task\SyncAppDataTask.java
E:\newgit\manager\src\main\java\common\service\impl\UserLogServiceImpl.java
E:\newgit\manager\src\main\java\security\RedisLoginStatusManagerImpl.java
E:\newgit\manager\src\main\java\common\model\Code.java
E:\newgit\manager\src\main\java\track\controller\TrackAccountController.java
E:\newgit\manager\src\main\java\common\model\Payment.java
E:\newgit\manager\src\main\java\util\MailUtils.java
E:\newgit\manager\src\main\java\tkio\model\DataAuth.java
E:\newgit\manager\src\main\java\common\model\User.java
E:\newgit\manager\src\main\java\track\task\AccountTask.java
E:\newgit\manager\src\main\java\common\model\Email.java
E:\newgit\manager\src\main\java\common\repository\ReminderRepository.java
E:\newgit\manager\src\main\java\common\model\RoleType.java
E:\newgit\manager\src\main\java\exception\TipException.java
E:\newgit\manager\src\main\java\track\repository\TrackChannelRepository.java
E:\newgit\manager\src\main\java\tkio\model\App.java
E:\newgit\manager\src\main\java\track\model\Channel.java
E:\newgit\manager\src\main\java\common\repository\RoleTypeRepository.java
E:\newgit\manager\src\main\java\track\repository\TrackCampaignRepository.java
E:\newgit\manager\src\main\java\security\TokenManager.java
E:\newgit\manager\src\main\java\common\repository\CodeRepository.java
E:\newgit\manager\src\main\java\dic\OperateObjectTypeEnum.java
E:\newgit\manager\src\main\java\util\HttpClientUtil.java
E:\newgit\manager\src\main\java\tkio\model\Auth.java
E:\newgit\manager\src\main\java\common\repository\AppInfoRepository.java
E:\newgit\manager\src\main\java\track\model\App.java
E:\newgit\manager\src\main\java\util\RedisUtilNew.java
E:\newgit\manager\src\main\java\common\repository\UserLogRepository.java
E:\newgit\manager\src\main\java\util\DateUtil.java
E:\newgit\manager\src\main\java\security\exception\MethodNotSupportException.java
E:\newgit\manager\src\main\java\tkio\repository\AccountRepository.java
E:\newgit\manager\src\main\java\util\UserLogThread.java
E:\newgit\manager\src\main\java\common\model\TrackAccount4Web.java
E:\newgit\manager\src\main\java\tkio\model\Channel.java
E:\newgit\manager\src\main\java\util\ResultStatus.java
E:\newgit\manager\src\main\java\tkio\model\PackageType.java
E:\newgit\manager\src\main\java\security\resolvers\LoginUserMethodArgumentsResolver.java
E:\newgit\manager\src\main\java\common\controller\MenuController.java
E:\newgit\manager\src\main\java\common\context\AppUtils.java
E:\newgit\manager\src\main\java\common\service\impl\AppServiceImpl.java
E:\newgit\manager\src\main\java\tkio\model\AccountRestrict4Web.java
E:\newgit\manager\src\main\java\track\service\TrackAccountService.java
E:\newgit\manager\src\main\java\security\annotation\CurrentAccount.java
E:\newgit\manager\src\main\java\common\service\impl\MenuServiceImpl.java
E:\newgit\manager\src\main\java\exception\TransferCurrentAccountException.java
E:\newgit\manager\src\main\java\tkio\service\AccountFlowRestrictService.java
E:\newgit\manager\src\main\java\common\model\BackVisit.java
E:\newgit\manager\src\main\java\common\repository\BackVisitRepository.java
E:\newgit\manager\src\main\java\tkio\service\TkioAccountService.java
E:\newgit\manager\src\main\java\security\annotation\Authorization.java
E:\newgit\manager\src\main\java\exception\GlobalExceptionAdvice.java
E:\newgit\manager\src\main\java\security\RedisTokenManager.java
E:\newgit\manager\src\main\java\common\repository\UserRepository.java
E:\newgit\manager\src\main\java\tkio\model\SalesManLeader.java
E:\newgit\manager\src\main\java\common\model\City.java
E:\newgit\manager\src\main\java\common\model\AppCategory.java
E:\newgit\manager\src\main\java\common\model\Reminder.java
E:\newgit\manager\src\main\java\tkio\repository\SalesManLeaderRepository.java
E:\newgit\manager\src\main\java\tkio\model\IsNotified.java
E:\newgit\manager\src\main\java\util\IP.java
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment