Skip to content

M
manager
Commit 8cb1d4e7 by zhangxiaoyan
Options

get scraw data from s3

parent 6e758498
Showing with 1045 additions and 654 deletions
.idea/misc.xml
...@@ -3,5 +3,12 @@ ...@@ -3,5 +3,12 @@
<component name="FrameworkDetectionExcludesConfiguration"> <component name="FrameworkDetectionExcludesConfiguration">
<file type="web" url="file://$PROJECT_DIR$" /> <file type="web" url="file://$PROJECT_DIR$" />
</component> </component>
<component name="MavenProjectsManager">
<option name="originalFiles">
<list>
<option value="$PROJECT_DIR$/pom.xml" />
</list>
</option>
</component>
<component name="ProjectRootManager" version="2" project-jdk-name="1.8" project-jdk-type="JavaSDK" /> <component name="ProjectRootManager" version="2" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
</project> </project>
\ No newline at end of file
.idea/workspace.xml
...@@ -2,21 +2,28 @@ ...@@ -2,21 +2,28 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="e2e217e2-2dd6-4c6f-ad19-b1cba46bc7ad" name="Default" comment=""> <list default="true" id="e2e217e2-2dd6-4c6f-ad19-b1cba46bc7ad" name="Default" comment="">
<<<<<<< HEAD <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/tkio/task/SyncAppDataTask.java" afterPath="" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/common/controller/UserLogController.class" afterPath="$PROJECT_DIR$/target/classes/common/controller/UserLogController.class" /> <change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/tkio/task/SyncAppDataTask.class" afterPath="" />
<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/common/controller/UserController.class" afterPath="$PROJECT_DIR$/target/classes/common/controller/UserController.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/tkio/task/SyncAppDataTask.class" afterPath="$PROJECT_DIR$/target/classes/tkio/task/SyncAppDataTask.class" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/common/model/Account4Web.class" afterPath="$PROJECT_DIR$/target/classes/common/model/Account4Web.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/common/model/AppInfo.class" afterPath="$PROJECT_DIR$/target/classes/common/model/AppInfo.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/common/repository/Account4WebRepository.class" afterPath="$PROJECT_DIR$/target/classes/common/repository/Account4WebRepository.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/common/service/UserService.class" afterPath="$PROJECT_DIR$/target/classes/common/service/UserService.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/common/service/impl/UserServiceImpl.class" afterPath="$PROJECT_DIR$/target/classes/common/service/impl/UserServiceImpl.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/common/task/ReportCallable.class" afterPath="$PROJECT_DIR$/target/classes/common/task/ReportCallable.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/security/interceptor/AuthorizationInterceptor.class" afterPath="$PROJECT_DIR$/target/classes/security/interceptor/AuthorizationInterceptor.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/tkio/task/AccountTask.class" afterPath="$PROJECT_DIR$/target/classes/tkio/task/AccountTask.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/misc.xml" afterPath="$PROJECT_DIR$/.idea/misc.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.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/repository/AppInfoRepository.java" afterPath="$PROJECT_DIR$/src/main/java/common/repository/AppInfoRepository.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pom.xml" afterPath="$PROJECT_DIR$/pom.xml" />
<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/java/common/task/ReportCallable.java" afterPath="$PROJECT_DIR$/src/main/java/common/task/ReportCallable.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$/src/main/resources/applicationContext-schedule.xml" afterPath="$PROJECT_DIR$/src/main/resources/applicationContext-schedule.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/applicationContext.xml" afterPath="$PROJECT_DIR$/src/main/resources/applicationContext.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$/target/classes/applicationContext-schedule.xml" afterPath="$PROJECT_DIR$/target/classes/applicationContext-schedule.xml" />
======= <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/applicationContext.xml" afterPath="$PROJECT_DIR$/target/classes/applicationContext.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/common.properties" afterPath="$PROJECT_DIR$/target/classes/common.properties" />
<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$/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterPath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" />
<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$/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterPath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" />
<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>
<list id="933e480d-1136-4c92-9651-6e74b37fc51c" name="Failed commit: Default" comment="track客户管理" /> <list id="933e480d-1136-4c92-9651-6e74b37fc51c" name="Failed commit: Default" comment="track客户管理" />
<ignored path="$PROJECT_DIR$/target/" /> <ignored path="$PROJECT_DIR$/target/" />
...@@ -33,133 +40,68 @@ ...@@ -33,133 +40,68 @@
<component name="ExecutionTargetManager" SELECTED_TARGET="default_target" /> <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="SyncAppDataTask.java" pinned="false" current-in-tab="true"> <file leaf-file-name="AppServiceImpl.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/task/SyncAppDataTask.java"> <entry file="file://$PROJECT_DIR$/src/main/java/common/service/impl/AppServiceImpl.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<<<<<<< HEAD <state relative-caret-position="-1715">
<state relative-caret-position="109"> <caret line="62" column="52" lean-forward="false" selection-start-line="62" selection-start-column="52" selection-end-line="62" selection-end-column="52" />
<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 /> <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> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<<<<<<< HEAD <file leaf-file-name="applicationContext-schedule.xml" pinned="false" current-in-tab="false">
<file leaf-file-name="Constant.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/main/resources/applicationContext-schedule.xml">
<entry file="file://$PROJECT_DIR$/src/main/java/util/Constant.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-220"> <state relative-caret-position="83">
<caret line="8" column="13" lean-forward="false" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" /> <caret line="36" column="70" lean-forward="false" selection-start-line="36" selection-start-column="54" selection-end-line="36" selection-end-column="70" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="CityRepository.java" pinned="false" current-in-tab="false"> <file leaf-file-name="AppInfoRepository.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/CityRepository.java"> <entry file="file://$PROJECT_DIR$/src/main/java/common/repository/AppInfoRepository.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198"> <state relative-caret-position="176">
<caret line="13" column="60" lean-forward="false" selection-start-line="13" selection-start-column="60" selection-end-line="13" selection-end-column="60" /> <caret line="14" column="1" lean-forward="false" selection-start-line="14" selection-start-column="1" selection-end-line="14" selection-end-column="1" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="AuthRepository.java" pinned="false" current-in-tab="false"> <file leaf-file-name="SyncAppDataTask.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/AuthRepository.java"> <entry file="file://$PROJECT_DIR$/src/main/java/common/task/SyncAppDataTask.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="110"> <state relative-caret-position="154">
<caret line="11" column="65" lean-forward="false" selection-start-line="11" selection-start-column="40" selection-end-line="11" selection-end-column="65" /> <caret line="280" column="4" lean-forward="false" selection-start-line="280" selection-start-column="4" selection-end-line="280" selection-end-column="4" />
<folding> <folding>
<element signature="imports" expanded="false" /> <element signature="imports" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="BackVisitRepository.java" pinned="false" current-in-tab="false"> <file leaf-file-name="applicationContext.xml" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/BackVisitRepository.java"> <entry file="file://$PROJECT_DIR$/src/main/resources/applicationContext.xml">
<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 />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="AppInfoRepository.java" pinned="false" current-in-tab="false">
<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">
<caret line="14" column="114" lean-forward="false" selection-start-line="14" selection-start-column="114" selection-end-line="14" selection-end-column="114" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="UserController.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/common/controller/UserController.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="53"> <state relative-caret-position="112">
<caret line="20" column="13" lean-forward="false" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" /> <caret line="165" column="60" lean-forward="false" selection-start-line="165" selection-start-column="60" selection-end-line="165" selection-end-column="60" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="applicationContext-schedule.xml" pinned="false" current-in-tab="false"> <file leaf-file-name="TkioAccountServiceImpl.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/resources/applicationContext-schedule.xml"> <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="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"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="115"> <state relative-caret-position="149">
<caret line="5" column="25" lean-forward="false" selection-start-line="5" selection-start-column="25" selection-end-line="5" selection-end-column="25" /> <caret line="203" column="57" lean-forward="true" selection-start-line="203" selection-start-column="57" selection-end-line="203" selection-end-column="57" />
>>>>>>> c2a8bc47b172bee7e416b12aa93f6e17f5341751
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </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">
<state relative-caret-position="221">
<caret line="23" column="10" lean-forward="false" selection-start-line="23" selection-start-column="10" selection-end-line="23" selection-end-column="10" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#913#914#0" expanded="true" />
<element signature="e#998#999#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="AppController.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/common/controller/AppController.java">
<provider selected="true" editor-type-id="text-editor">
<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" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
=======
>>>>>>> c2a8bc47b172bee7e416b12aa93f6e17f5341751
</leaf> </leaf>
</component> </component>
<component name="FileTemplateManagerImpl"> <component name="FileTemplateManagerImpl">
...@@ -173,6 +115,8 @@ ...@@ -173,6 +115,8 @@
<component name="FindInProjectRecents"> <component name="FindInProjectRecents">
<findStrings> <findStrings>
<find>`</find> <find>`</find>
<find>URI_REPORT_BY_SQL</find>
<find>show_sql</find>
</findStrings> </findStrings>
<replaceStrings> <replaceStrings>
<replace /> <replace />
...@@ -189,7 +133,6 @@ ...@@ -189,7 +133,6 @@
<component name="IdeDocumentHistory"> <component name="IdeDocumentHistory">
<option name="CHANGED_PATHS"> <option name="CHANGED_PATHS">
<list> <list>
<option value="$PROJECT_DIR$/pom.xml" />
<option value="$PROJECT_DIR$/src/main/resources/persistence.properties" /> <option value="$PROJECT_DIR$/src/main/resources/persistence.properties" />
<option value="$PROJECT_DIR$/src/main/java/dmp/repository/TagCrawlerAppsWandoujiaRepository.java" /> <option value="$PROJECT_DIR$/src/main/java/dmp/repository/TagCrawlerAppsWandoujiaRepository.java" />
<option value="$PROJECT_DIR$/src/main/java/common/model/AppCategory.java" /> <option value="$PROJECT_DIR$/src/main/java/common/model/AppCategory.java" />
...@@ -202,7 +145,6 @@ ...@@ -202,7 +145,6 @@
<option value="$PROJECT_DIR$/src/main/java/common/repository/AppCategoryRepository.java" /> <option value="$PROJECT_DIR$/src/main/java/common/repository/AppCategoryRepository.java" />
<option value="$PROJECT_DIR$/src/main/java/common/service/AppService.java" /> <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/java/common/service/impl/AppServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/resources/applicationContext.xml" />
<option value="$PROJECT_DIR$/src/main/java/dic/OperateSatusEnum.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/dic/OperateObjectTypeEnum.java" />
<option value="$PROJECT_DIR$/src/main/java/util/IP.java" /> <option value="$PROJECT_DIR$/src/main/java/util/IP.java" />
...@@ -216,15 +158,19 @@ ...@@ -216,15 +158,19 @@
<option value="$PROJECT_DIR$/src/main/java/security/interceptor/AuthorizationInterceptor.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/track/service/impl/TrackAccountServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/common/controller/UserLogController.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/tkio/task/SyncAppDataTask.java" />
<option value="$PROJECT_DIR$/src/main/java/common/repository/AppInfoRepository.java" /> <option value="$PROJECT_DIR$/src/main/java/common/repository/AppInfoRepository.java" />
<option value="$PROJECT_DIR$/src/main/java/common/service/IOpenApiService.java" />
<option value="$PROJECT_DIR$/src/main/java/util/AwsS3Util.java" />
<option value="$PROJECT_DIR$/src/main/java/common/service/impl/OpenApiServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/common/task/SyncAppDataNewTask.java" />
<option value="$PROJECT_DIR$/src/main/java/common/model/AppDevNum.java" />
<option value="$PROJECT_DIR$/src/main/java/common/repository/AppDevNumRepository.java" />
<option value="$PROJECT_DIR$/src/main/java/common/task/ReportCallable.java" />
<option value="$PROJECT_DIR$/pom.xml" />
<option value="$PROJECT_DIR$/src/main/resources/applicationContext.xml" />
<option value="$PROJECT_DIR$/src/main/resources/applicationContext-schedule.xml" /> <option value="$PROJECT_DIR$/src/main/resources/applicationContext-schedule.xml" />
======= <option value="$PROJECT_DIR$/src/main/java/common/task/SyncAppDataTask.java" />
<option value="$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.java" />
<option value="$PROJECT_DIR$/src/main/java/track/controller/TrackAccountController.java" />
<option value="$PROJECT_DIR$/src/main/java/tkio/task/NoticeTask.java" />
>>>>>>> c2a8bc47b172bee7e416b12aa93f6e17f5341751
</list> </list>
</option> </option>
</component> </component>
...@@ -235,7 +181,42 @@ ...@@ -235,7 +181,42 @@
<sorting>DEFINITION_ORDER</sorting> <sorting>DEFINITION_ORDER</sorting>
</component> </component>
<component name="MavenProjectNavigator"> <component name="MavenProjectNavigator">
<treeState /> <treeState>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="" />
<option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$RootNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="myweb Maven Webapp" />
<option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$ProjectNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="" />
<option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$RootNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="myweb Maven Webapp" />
<option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$ProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="Lifecycle" />
<option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$LifecycleNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="" />
<option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$RootNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="Profiles" />
<option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$ProfilesNode" />
</PATH_ELEMENT>
</PATH>
</treeState>
</component> </component>
<component name="ProjectFrameBounds"> <component name="ProjectFrameBounds">
<option name="x" value="-8" /> <option name="x" value="-8" />
...@@ -247,7 +228,7 @@ ...@@ -247,7 +228,7 @@
<ConfirmationsSetting value="1" id="Add" /> <ConfirmationsSetting value="1" id="Add" />
</component> </component>
<component name="ProjectView"> <component name="ProjectView">
<navigator currentView="PackagesPane" proportions="" version="1"> <navigator currentView="ProjectPane" proportions="" version="1">
<flattenPackages /> <flattenPackages />
<showMembers /> <showMembers />
<showModules /> <showModules />
...@@ -261,6 +242,8 @@ ...@@ -261,6 +242,8 @@
<foldersAlwaysOnTop value="true" /> <foldersAlwaysOnTop value="true" />
</navigator> </navigator>
<panes> <panes>
<pane id="Scratches" />
<pane id="Scope" />
<pane id="ProjectPane"> <pane id="ProjectPane">
<subPane> <subPane>
<PATH> <PATH>
...@@ -301,56 +284,6 @@ ...@@ -301,56 +284,6 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
<PATH_ELEMENT> <PATH_ELEMENT>
<<<<<<< HEAD
<option name="myItemId" value="tkio" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<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.PackageViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="manage" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<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.PackageViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="manage" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="dmp" />
<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.PackageViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="manage" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
</PATH_ELEMENT>
<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="myItemId" value="src" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
...@@ -361,7 +294,6 @@ ...@@ -361,7 +294,6 @@
<PATH_ELEMENT> <PATH_ELEMENT>
<option name="myItemId" value="webapp" /> <option name="myItemId" value="webapp" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
>>>>>>> c2a8bc47b172bee7e416b12aa93f6e17f5341751
</PATH_ELEMENT> </PATH_ELEMENT>
</PATH> </PATH>
<PATH> <PATH>
...@@ -432,8 +364,6 @@ ...@@ -432,8 +364,6 @@
</PATH> </PATH>
</subPane> </subPane>
</pane> </pane>
<pane id="Scope" />
<pane id="Scratches" />
<pane id="PackagesPane"> <pane id="PackagesPane">
<subPane> <subPane>
<PATH> <PATH>
...@@ -470,7 +400,7 @@ ...@@ -470,7 +400,7 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
<PATH_ELEMENT> <PATH_ELEMENT>
<option name="myItemId" value="track" /> <option name="myItemId" value="dmp" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
</PATH> </PATH>
...@@ -484,11 +414,11 @@ ...@@ -484,11 +414,11 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
<PATH_ELEMENT> <PATH_ELEMENT>
<option name="myItemId" value="track" /> <option name="myItemId" value="dmp" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
<PATH_ELEMENT> <PATH_ELEMENT>
<option name="myItemId" value="controller" /> <option name="myItemId" value="model" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
</PATH> </PATH>
...@@ -502,7 +432,7 @@ ...@@ -502,7 +432,7 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
<PATH_ELEMENT> <PATH_ELEMENT>
<option name="myItemId" value="tkio" /> <option name="myItemId" value="common" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
<PATH_ELEMENT> <PATH_ELEMENT>
...@@ -520,7 +450,11 @@ ...@@ -520,7 +450,11 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
<PATH_ELEMENT> <PATH_ELEMENT>
<option name="myItemId" value="tkio" /> <option name="myItemId" value="common" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="service" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
</PATH> </PATH>
...@@ -534,11 +468,15 @@ ...@@ -534,11 +468,15 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
<PATH_ELEMENT> <PATH_ELEMENT>
<option name="myItemId" value="tkio" /> <option name="myItemId" value="common" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="service" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
<PATH_ELEMENT> <PATH_ELEMENT>
<option name="myItemId" value="controller" /> <option name="myItemId" value="impl" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
</PATH> </PATH>
...@@ -568,12 +506,15 @@ ...@@ -568,12 +506,15 @@
<property name="js.eslint.eslintPackage" value="" /> <property name="js.eslint.eslintPackage" value="" />
<property name="js-jscs-nodeInterpreter" value="C:\Program Files\nodejs\node.exe" /> <property name="js-jscs-nodeInterpreter" value="C:\Program Files\nodejs\node.exe" />
<property name="last_directory_selection" value="$PROJECT_DIR$/src/main/java" /> <property name="last_directory_selection" value="$PROJECT_DIR$/src/main/java" />
<property name="SearchEverywhereHistoryKey" value="bysql&#9;PSI&#9;JAVA://tkio.service.impl.TkioAccountServiceImpl#URI_REPORT_BY_SQL" />
</component> </component>
<component name="RecentsManager"> <component name="RecentsManager">
<key name="CopyClassDialog.RECENTS_KEY"> <key name="CopyClassDialog.RECENTS_KEY">
<recent name="common.repository" />
<recent name="common.model" />
<recent name="common.task" />
<recent name="util" /> <recent name="util" />
<recent name="dic" /> <recent name="dic" />
<recent name="common.context" />
</key> </key>
</component> </component>
<component name="RunManager" selected="Maven.manager"> <component name="RunManager" selected="Maven.manager">
...@@ -597,6 +538,26 @@ ...@@ -597,6 +538,26 @@
<envs /> <envs />
<method /> <method />
</configuration> </configuration>
<configuration default="false" name="AwsS3Util" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
<pattern>
<option name="PATTERN" value="util.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<option name="MAIN_CLASS_NAME" value="util.AwsS3Util" />
<option name="VM_PARAMETERS" />
<option name="PROGRAM_PARAMETERS" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
<option name="ENABLE_SWING_INSPECTOR" value="false" />
<option name="ENV_VARIABLES" />
<option name="PASS_PARENT_ENVS" value="true" />
<module name="manage" />
<envs />
<method />
</configuration>
<configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin"> <configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
<module name="" /> <module name="" />
<option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" /> <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
...@@ -682,6 +643,65 @@ ...@@ -682,6 +643,65 @@
<envs /> <envs />
<method /> <method />
</configuration> </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=""> <configuration default="true" type="Cold Fusion runner description" factoryName="Cold Fusion" custom_browser="" web_path="">
<method /> <method />
</configuration> </configuration>
...@@ -968,19 +988,24 @@ ...@@ -968,19 +988,24 @@
</MavenSettings> </MavenSettings>
<method /> <method />
</configuration> </configuration>
<list size="2"> <list size="3">
<item index="0" class="java.lang.String" itemvalue="Maven.manager" /> <item index="0" class="java.lang.String" itemvalue="Maven.manager" />
<item index="1" class="java.lang.String" itemvalue="Application.SyncAppDataTask" /> <item index="1" class="java.lang.String" itemvalue="Application.SyncAppDataTask" />
<item index="2" class="java.lang.String" itemvalue="Application.AwsS3Util" />
</list> </list>
<recent_temporary> <recent_temporary>
<list size="1"> <list size="2">
<item index="0" class="java.lang.String" itemvalue="Application.SyncAppDataTask" /> <item index="0" class="java.lang.String" itemvalue="Application.AwsS3Util" />
<item index="1" class="java.lang.String" itemvalue="Application.SyncAppDataTask" />
</list> </list>
</recent_temporary> </recent_temporary>
</component> </component>
<component name="ShelveChangesManager" show_recycled="false"> <component name="ShelveChangesManager" show_recycled="false">
<option name="remove_strategy" value="false" /> <option name="remove_strategy" value="false" />
</component> </component>
<component name="SvnConfiguration">
<configuration />
</component>
<component name="TaskManager"> <component name="TaskManager">
<task active="true" id="Default" summary="Default task"> <task active="true" id="Default" summary="Default task">
<changelist id="e2e217e2-2dd6-4c6f-ad19-b1cba46bc7ad" name="Default" comment="" /> <changelist id="e2e217e2-2dd6-4c6f-ad19-b1cba46bc7ad" name="Default" comment="" />
...@@ -989,45 +1014,14 @@ ...@@ -989,45 +1014,14 @@
<option name="presentableId" value="Default" /> <option name="presentableId" value="Default" />
<updated>1514260912987</updated> <updated>1514260912987</updated>
<workItem from="1514260914510" duration="14315000" /> <workItem from="1514260914510" duration="14315000" />
<<<<<<< HEAD
<workItem from="1514344618155" duration="26138000" /> <workItem from="1514344618155" duration="26138000" />
======= <workItem from="1514532893566" duration="15679000" />
<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> </task>
<option name="localTasksCounter" value="3" /> <option name="localTasksCounter" value="3" />
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<<<<<<< HEAD <option name="totallyTimeSpent" value="56132000" />
<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>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="-8" y="-8" width="1382" height="744" extended-state="6" /> <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
...@@ -1051,16 +1045,12 @@ ...@@ -1051,16 +1045,12 @@
<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="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="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="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="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.36497545" 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.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" /> <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="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="Terminal" 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="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.26096824" 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="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="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="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" />
...@@ -1071,44 +1061,7 @@ ...@@ -1071,44 +1061,7 @@
<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="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="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="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>
<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" />
<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>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
<option name="processedProjectFiles" value="true" /> <option name="processedProjectFiles" value="true" />
...@@ -1157,188 +1110,6 @@ ...@@ -1157,188 +1110,6 @@
<option name="FILTER_TARGETS" value="false" /> <option name="FILTER_TARGETS" value="false" />
</component> </component>
<component name="editorHistoryManager"> <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">
<caret line="109" column="4" lean-forward="false" selection-start-line="109" selection-start-column="4" selection-end-line="109" selection-end-column="7" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/persistence.properties">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="10" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/repository/AccountRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="110">
<caret line="13" column="34" lean-forward="false" selection-start-line="13" selection-start-column="17" selection-end-line="13" selection-end-column="34" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/util/StringUtil.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-572">
<caret line="9" column="13" lean-forward="false" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/model/AppCategory.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="123">
<caret line="38" column="17" lean-forward="false" selection-start-line="38" selection-start-column="11" selection-end-line="38" selection-end-column="17" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/context/AppUtils.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-5">
<caret line="9" column="3" lean-forward="true" selection-start-line="9" selection-start-column="3" selection-end-line="9" selection-end-column="3" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/model/City.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="176">
<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>
<element signature="imports" expanded="false" />
<element signature="e#309#310#0" expanded="false" />
<element signature="e#334#335#0" expanded="false" />
<element signature="e#372#373#0" expanded="false" />
<element signature="e#400#401#0" expanded="false" />
<element signature="e#435#436#0" expanded="false" />
<element signature="e#462#463#0" expanded="false" />
<element signature="e#506#507#0" expanded="false" />
<element signature="e#538#539#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/util/DateUtil.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="16258">
<caret line="762" column="26" lean-forward="false" selection-start-line="762" selection-start-column="26" selection-end-line="762" selection-end-column="26" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/CodeRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="154">
<caret line="14" column="4" lean-forward="false" selection-start-line="14" selection-start-column="4" selection-end-line="14" selection-end-column="118" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/task/AccountTask.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="815">
<caret line="87" column="34" lean-forward="false" selection-start-line="87" selection-start-column="30" selection-end-line="87" selection-end-column="34" />
<folding />
</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">
<caret line="22" column="31" lean-forward="false" selection-start-line="22" selection-start-column="19" selection-end-line="22" selection-end-column="31" />
<folding>
<element signature="imports" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/dmp/repository/TagCrawlerAppsWandoujiaRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="220">
<caret line="14" column="57" lean-forward="false" selection-start-line="14" selection-start-column="57" selection-end-line="14" selection-end-column="57" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/controller/LoginController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="176">
<caret line="21" column="13" lean-forward="false" selection-start-line="21" selection-start-column="13" selection-end-line="21" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/controller/MenuController.java">
<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" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/service/impl/MenuServiceImpl.java">
<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" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pom.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-3916">
<caret line="59" column="49" lean-forward="true" selection-start-line="59" selection-start-column="49" selection-end-line="59" selection-end-column="49" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/rest-servlet.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="64">
<caret line="35" column="70" lean-forward="false" selection-start-line="35" selection-start-column="46" selection-end-line="35" selection-end-column="70" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-792">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/web/WEB-INF/web.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="110">
<caret line="5" column="10" lean-forward="true" selection-start-line="5" selection-start-column="10" selection-end-line="5" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/util/ResultModel.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1034">
<caret line="47" column="30" lean-forward="false" selection-start-line="47" selection-start-column="30" selection-end-line="47" selection-end-column="30" />
<folding>
<element signature="e#969#970#0" expanded="false" />
<element signature="e#1038#1039#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/model/AppInfo.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="242">
<caret line="103" column="32" lean-forward="false" selection-start-line="103" selection-start-column="32" selection-end-line="103" selection-end-column="32" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/Account4WebRepository.java"> <entry file="file://$PROJECT_DIR$/src/main/java/common/repository/Account4WebRepository.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198"> <state relative-caret-position="198">
...@@ -1350,41 +1121,13 @@ ...@@ -1350,41 +1121,13 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198"> <state relative-caret-position="198">
<caret line="13" column="5" lean-forward="false" selection-start-line="13" selection-start-column="5" selection-end-line="14" selection-end-column="48" /> <caret line="13" column="5" lean-forward="false" selection-start-line="13" selection-start-column="5" selection-end-line="14" selection-end-column="48" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<<<<<<< HEAD
<entry file="file://$PROJECT_DIR$/src/main/java/security/interceptor/AuthorizationInterceptor.java"> <entry file="file://$PROJECT_DIR$/src/main/java/security/interceptor/AuthorizationInterceptor.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="265"> <state relative-caret-position="265">
<caret line="51" column="81" lean-forward="true" selection-start-line="51" selection-start-column="81" selection-end-line="51" selection-end-column="81" /> <caret line="51" column="81" lean-forward="true" selection-start-line="51" selection-start-column="81" selection-end-line="51" selection-end-column="81" />
<folding>
<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>
<entry file="file://$PROJECT_DIR$/src/main/resources/applicationContext.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="46">
<caret line="202" column="35" lean-forward="false" selection-start-line="202" selection-start-column="34" selection-end-line="202" selection-end-column="35" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -1410,7 +1153,6 @@ ...@@ -1410,7 +1153,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="110"> <state relative-caret-position="110">
<caret line="11" column="53" lean-forward="false" selection-start-line="11" selection-start-column="32" selection-end-line="11" selection-end-column="53" /> <caret line="11" column="53" lean-forward="false" selection-start-line="11" selection-start-column="32" selection-end-line="11" selection-end-column="53" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -1443,15 +1185,6 @@ ...@@ -1443,15 +1185,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198"> <state relative-caret-position="198">
<caret line="12" column="68" lean-forward="false" selection-start-line="12" selection-start-column="42" selection-end-line="12" selection-end-column="68" /> <caret line="12" column="68" lean-forward="false" selection-start-line="12" selection-start-column="42" selection-end-line="12" selection-end-column="68" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/service/impl/AppServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="176">
<caret line="86" column="5" lean-forward="true" selection-start-line="59" selection-start-column="4" selection-end-line="86" selection-end-column="5" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -1461,45 +1194,6 @@ ...@@ -1461,45 +1194,6 @@
<caret line="15" column="30" lean-forward="false" selection-start-line="15" selection-start-column="19" selection-end-line="15" selection-end-column="30" /> <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> <folding>
<element signature="imports" expanded="false" /> <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> </folding>
</state> </state>
</provider> </provider>
...@@ -1515,7 +1209,9 @@ ...@@ -1515,7 +1209,9 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="207"> <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" /> <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 /> <folding>
<element signature="imports" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -1523,7 +1219,9 @@ ...@@ -1523,7 +1219,9 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="207"> <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" /> <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 /> <folding>
<element signature="imports" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -1531,9 +1229,6 @@ ...@@ -1531,9 +1229,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="322"> <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" /> <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="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -1545,24 +1240,10 @@ ...@@ -1545,24 +1240,10 @@
</state> </state>
</provider> </provider>
</entry> </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"> <entry file="file://$PROJECT_DIR$/src/main/java/common/service/UserLogService.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="299"> <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" /> <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="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -1570,9 +1251,6 @@ ...@@ -1570,9 +1251,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="306"> <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" /> <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="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -1580,7 +1258,6 @@ ...@@ -1580,7 +1258,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="329"> <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" /> <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> </state>
</provider> </provider>
</entry> </entry>
...@@ -1588,18 +1265,16 @@ ...@@ -1588,18 +1265,16 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="76"> <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" /> <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> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/controller/AppController.java"> <entry file="file://$PROJECT_DIR$/src/main/java/common/controller/AppController.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="283"> <state relative-caret-position="660">
<caret line="14" column="12" lean-forward="false" selection-start-line="14" selection-start-column="12" selection-end-line="14" selection-end-column="12" /> <caret line="30" column="1" lean-forward="false" selection-start-line="30" selection-start-column="1" selection-end-line="30" selection-end-column="1" />
<folding /> <folding>
<element signature="imports" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -1615,7 +1290,6 @@ ...@@ -1615,7 +1290,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="345"> <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" /> <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> </state>
</provider> </provider>
</entry> </entry>
...@@ -1623,9 +1297,6 @@ ...@@ -1623,9 +1297,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="366"> <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" /> <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> </state>
</provider> </provider>
</entry> </entry>
...@@ -1633,177 +1304,218 @@ ...@@ -1633,177 +1304,218 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="183"> <state relative-caret-position="183">
<caret line="14" column="70" lean-forward="true" selection-start-line="14" selection-start-column="70" selection-end-line="14" selection-end-column="70" /> <caret line="14" column="70" lean-forward="true" selection-start-line="14" selection-start-column="70" selection-end-line="14" selection-end-column="70" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/controller/UserLogController.java"> <entry file="file://$PROJECT_DIR$/src/main/java/common/controller/UserLogController.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="221"> <state relative-caret-position="286">
<caret line="23" column="10" lean-forward="false" selection-start-line="23" selection-start-column="10" selection-end-line="23" selection-end-column="10" /> <caret line="23" column="10" lean-forward="false" selection-start-line="23" selection-start-column="10" selection-end-line="23" selection-end-column="10" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="false" />
<element signature="e#913#914#0" expanded="true" />
<element signature="e#998#999#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/util/Constant.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-220">
<caret line="8" column="13" lean-forward="false" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/controller/UserController.java"> <entry file="file://$PROJECT_DIR$/src/main/java/common/controller/UserController.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-414"> <state relative-caret-position="154">
<caret line="20" column="13" lean-forward="false" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" /> <caret line="20" column="11" lean-forward="false" selection-start-line="20" selection-start-column="11" selection-end-line="20" selection-end-column="11" />
<folding /> <folding>
<element signature="imports" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<<<<<<< HEAD
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/CityRepository.java"> <entry file="file://$PROJECT_DIR$/src/main/java/common/repository/CityRepository.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198"> <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" /> <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>
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/task/AccountTask.java"> <element signature="imports" expanded="false" />
<provider selected="true" editor-type-id="text-editor"> </folding>
<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> </state>
</provider> </provider>
</entry> </entry>
<<<<<<< HEAD
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/AuthRepository.java"> <entry file="file://$PROJECT_DIR$/src/main/java/common/repository/AuthRepository.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="110"> <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" /> <caret line="11" column="65" lean-forward="false" selection-start-line="11" selection-start-column="40" selection-end-line="11" selection-end-column="65" />
======= <folding>
<entry file="file://$PROJECT_DIR$/src/main/java/track/repository/TrackAccountRepository.java"> <element signature="imports" expanded="false" />
<provider selected="true" editor-type-id="text-editor"> </folding>
<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> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/BackVisitRepository.java"> <entry file="file://$PROJECT_DIR$/src/main/java/common/repository/BackVisitRepository.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="253"> <state relative-caret-position="220">
<caret line="17" column="20" lean-forward="false" selection-start-line="17" selection-start-column="20" selection-end-line="17" selection-end-column="20" /> <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 /> <folding>
<element signature="imports" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/track/service/impl/TrackAccountServiceImpl.java"> <entry file="file://$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1172"> <state relative-caret-position="-21">
<caret line="188" column="54" lean-forward="true" selection-start-line="188" selection-start-column="54" selection-end-line="188" selection-end-column="54" /> <caret line="30" column="58" lean-forward="false" selection-start-line="30" selection-start-column="53" selection-end-line="30" selection-end-column="58" />
<folding /> <folding>
<element signature="imports" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/track/service/TrackAccountService.java"> <entry file="file://$PROJECT_DIR$/src/main/java/tkio/task/SyncAppDataTask.java" />
<entry file="file://$PROJECT_DIR$/src/main/java/dmp/model/OtPkgDevStats.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="352"> <state relative-caret-position="6">
<caret line="30" column="20" lean-forward="false" selection-start-line="30" selection-start-column="20" selection-end-line="30" selection-end-column="20" /> <caret line="11" column="26" lean-forward="false" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="26" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/controller/UserLogController.java"> <entry file="file://$PROJECT_DIR$/src/main/java/util/AwsS3Util.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="345"> <state relative-caret-position="545">
<caret line="21" column="45" lean-forward="true" selection-start-line="21" selection-start-column="45" selection-end-line="21" selection-end-column="45" /> <caret line="127" column="25" lean-forward="true" selection-start-line="127" selection-start-column="25" selection-end-line="127" selection-end-column="25" />
<folding> <folding>
<element signature="imports" expanded="false" /> <element signature="e#4453#4454#0" expanded="false" />
<element signature="e#4538#4539#0" expanded="false" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/util/UserLogThread.java"> <entry file="file://$PROJECT_DIR$/src/main/java/common/service/IOpenApiService.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="401"> <state relative-caret-position="264">
<caret line="39" column="11" lean-forward="false" selection-start-line="39" selection-start-column="11" selection-end-line="39" selection-end-column="11" /> <caret line="12" column="8" lean-forward="false" selection-start-line="12" selection-start-column="8" selection-end-line="12" selection-end-column="8" />
>>>>>>> c2a8bc47b172bee7e416b12aa93f6e17f5341751 <folding />
<folding>
<element signature="imports" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<<<<<<< HEAD <entry file="file://$PROJECT_DIR$/src/main/java/dmp/repository/TagCrawlerAppsWandoujiaRepository.java">
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/BackVisitRepository.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="154"> <state relative-caret-position="220">
<caret line="16" column="28" lean-forward="false" selection-start-line="16" selection-start-column="27" selection-end-line="16" selection-end-column="28" /> <caret line="14" column="17" lean-forward="false" selection-start-line="14" selection-start-column="17" selection-end-line="14" selection-end-column="17" />
<folding /> <folding />
======= </state>
<entry file="file://$PROJECT_DIR$/src/main/java/track/controller/TrackAccountController.java"> </provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/dmp/model/TagCrawlerAppsWandoujia.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="345"> <state relative-caret-position="308">
<caret line="66" column="73" lean-forward="false" selection-start-line="66" selection-start-column="73" selection-end-line="66" selection-end-column="73" /> <caret line="45" column="0" lean-forward="false" selection-start-line="45" selection-start-column="0" selection-end-line="45" selection-end-column="0" />
<folding> <folding />
<element signature="imports" expanded="true" />
</folding>
>>>>>>> c2a8bc47b172bee7e416b12aa93f6e17f5341751
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.java"> <entry file="file://$PROJECT_DIR$/src/main/java/common/task/SyncAppDataNewTask.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<<<<<<< HEAD <state relative-caret-position="2581">
<state relative-caret-position="-21"> <caret line="163" column="19" lean-forward="false" selection-start-line="163" selection-start-column="12" selection-end-line="163" selection-end-column="19" />
<caret line="30" column="58" lean-forward="false" selection-start-line="30" selection-start-column="53" selection-end-line="30" selection-end-column="58" /> <folding />
======= </state>
<state relative-caret-position="366"> </provider>
<caret line="67" column="73" lean-forward="false" selection-start-line="67" selection-start-column="73" selection-end-line="67" selection-end-column="73" /> </entry>
>>>>>>> c2a8bc47b172bee7e416b12aa93f6e17f5341751 <entry file="file://$PROJECT_DIR$/src/main/java/common/model/AppDevNum.java">
<folding> <provider selected="true" editor-type-id="text-editor">
<element signature="imports" expanded="true" /> <state relative-caret-position="150">
</folding> <caret line="173" column="18" lean-forward="false" selection-start-line="173" selection-start-column="18" selection-end-line="173" selection-end-column="18" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/AppDevNumRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="176">
<caret line="14" column="82" lean-forward="false" selection-start-line="14" selection-start-column="82" selection-end-line="14" selection-end-column="82" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<<<<<<< HEAD
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/AppInfoRepository.java"> <entry file="file://$PROJECT_DIR$/src/main/java/common/repository/AppInfoRepository.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="176">
<caret line="14" column="1" lean-forward="false" selection-start-line="14" selection-start-column="1" selection-end-line="14" selection-end-column="1" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/task/ReportCallable.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198"> <state relative-caret-position="198">
<caret line="14" column="114" lean-forward="false" selection-start-line="14" selection-start-column="114" selection-end-line="14" selection-end-column="114" /> <caret line="155" column="16" lean-forward="false" selection-start-line="155" selection-start-column="16" selection-end-line="155" selection-end-column="16" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/applicationContext-schedule.xml"> <entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="126"> <state relative-caret-position="149">
<caret line="19" column="72" lean-forward="true" selection-start-line="19" selection-start-column="72" selection-end-line="19" selection-end-column="72" /> <caret line="203" column="57" lean-forward="true" selection-start-line="203" selection-start-column="57" selection-end-line="203" selection-end-column="57" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/task/SyncAppDataTask.java"> <entry file="file://$PROJECT_DIR$/pom.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="242">
<caret line="65" column="44" lean-forward="true" selection-start-line="65" selection-start-column="44" selection-end-line="65" selection-end-column="44" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/util/Constant.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="194">
<caret line="22" column="67" lean-forward="false" selection-start-line="22" selection-start-column="61" selection-end-line="22" selection-end-column="67" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/service/impl/OpenApiServiceImpl.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="109"> <state relative-caret-position="220">
<caret line="127" column="20" lean-forward="false" selection-start-line="127" selection-start-column="13" selection-end-line="127" selection-end-column="20" /> <caret line="42" column="42" lean-forward="false" selection-start-line="42" selection-start-column="40" selection-end-line="42" selection-end-column="42" />
======= <folding />
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/task/NoticeTask.java"> </state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/service/impl/AppServiceImpl.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="115"> <state relative-caret-position="-1715">
<caret line="5" column="25" lean-forward="false" selection-start-line="5" selection-start-column="25" selection-end-line="5" selection-end-column="25" /> <caret line="62" column="52" lean-forward="false" selection-start-line="62" selection-start-column="52" selection-end-line="62" selection-end-column="52" />
>>>>>>> c2a8bc47b172bee7e416b12aa93f6e17f5341751
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/applicationContext.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="112">
<caret line="165" column="60" lean-forward="false" selection-start-line="165" selection-start-column="60" selection-end-line="165" selection-end-column="60" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/applicationContext-schedule.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="83">
<caret line="36" column="70" lean-forward="false" selection-start-line="36" selection-start-column="54" selection-end-line="36" selection-end-column="70" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/task/SyncAppDataTask.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="154">
<caret line="280" column="4" lean-forward="false" selection-start-line="280" selection-start-column="4" selection-end-line="280" selection-end-column="4" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</component> </component>
</project> </project>
\ No newline at end of file
pom.xml
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
<!-- 单位是分钟--> <!-- 单位是分钟-->
<mail.valid_time>3</mail.valid_time> <mail.valid_time>3</mail.valid_time>
<report.url>http://localhost:8082</report.url> <report.url>http://ec2-54-222-233-230.cn-north-1.compute.amazonaws.com.cn:9010</report.url>
<!--Redis setting--> <!--Redis setting-->
<redis.key.validtime>120</redis.key.validtime> <redis.key.validtime>120</redis.key.validtime>
<redis.ip.requesttimes>5</redis.ip.requesttimes> <redis.ip.requesttimes>5</redis.ip.requesttimes>
......
src/main/java/common/service/IOpenApiService.java 0 → 100644
package common.service;
import java.util.List;
/**
* description:
*
* @author nolan
* @date 13/09/2017
*/
public interface IOpenApiService
{
void listInfo4AppData(String ds);
}
src/main/java/common/service/impl/OpenApiServiceImpl.java 0 → 100644
package common.service.impl;
import com.google.common.base.Splitter;
import com.google.common.collect.Lists;
import common.service.IOpenApiService;
import dmp.model.OtPkgDevStats;
import dmp.repository.OtPkgDevStatsRepository;
import org.anarres.lzo.LzoAlgorithm;
import org.anarres.lzo.LzoDecompressor;
import org.anarres.lzo.LzoInputStream;
import org.anarres.lzo.LzoLibrary;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import util.AwsS3Util;
import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
/**
* description:
*
* @author nolan
* @date 13/09/2017
*/
@Service
public class OpenApiServiceImpl
implements IOpenApiService
{
private static Logger logger = LoggerFactory.getLogger(OpenApiServiceImpl.class);
@Autowired OtPkgDevStatsRepository otPkgDevStatsRepository;
@Override
public void listInfo4AppData(String ds)
{
String skey = "export/pkg_dev_stats/ds=" + ds + "/";
final AwsS3Util s3Util = AwsS3Util.getInstance();
List itemList = AwsS3Util.getInstance().getS3Keys("reyunbpu", skey);
if (itemList == null || itemList.size() == 0) {
return;
}
for (int i = 0; i < itemList.size(); i++) {
String s3key = String.valueOf(itemList.get(i));
readS3File(s3Util, s3key);
}
}
private void readS3File(AwsS3Util s3Util, String s3key)
{
InputStream inputStream = null;
BufferedReader br = null;
try {
final byte[] fileBytes = s3Util.downloadBytesFromS3("reyunbpu", s3key);
inputStream = new ByteArrayInputStream(fileBytes);
if (s3key.endsWith(".lzo_deflate")) {
LzoAlgorithm algorithm = LzoAlgorithm.LZO1X;
LzoDecompressor deCompressor = LzoLibrary.getInstance().newDecompressor(algorithm, null);
LzoInputStream stream = new LzoInputStream(inputStream, deCompressor);
br = new BufferedReader(new InputStreamReader(stream));
}
else {
br = new BufferedReader(new InputStreamReader(inputStream));
}
String line = null;
List<OtPkgDevStats> resultList = new ArrayList<>();
while ((line = br.readLine()) != null) {
// System.out.println(line);
Object[] array = Splitter.on("\t").trimResults().splitToList(line).toArray();
if (array.length == 3) {
OtPkgDevStats opds = new OtPkgDevStats();
opds.setPkgname(array[0].toString());
opds.setDevNum(Long.valueOf(array[1].toString()));
opds.setDs(array[2].toString());
resultList.add(opds);
if (resultList.size() >= 2000) {
System.out.println(resultList);
otPkgDevStatsRepository.save(resultList);
resultList = new ArrayList<>();
}
}
}
}
catch (Exception e) {
logger.error("读取s3文件错误", e);
}
finally {
try {
if (br != null) {
br.close();
}
if (inputStream != null) {
inputStream.close();
}
}
catch (IOException e) {
e.printStackTrace();
}
}
}
}
src/main/java/common/task/ReportCallable.java
...@@ -147,6 +147,7 @@ public class ReportCallable ...@@ -147,6 +147,7 @@ public class ReportCallable
data_sb.append(" and ").append("ds<='").append(startDate).append("'"); data_sb.append(" and ").append("ds<='").append(startDate).append("'");
} }
String result = ""; String result = "";
String newResult = "";
if (isTotal) { if (isTotal) {
result = String.format("select count(1) as totalcount from ("+sql+") t", app_sb.length()>0?" where ":"", result = String.format("select count(1) as totalcount from ("+sql+") t", app_sb.length()>0?" where ":"",
app_sb.length()>0?app_sb.substring(5):"", app_sb.length()>0?app_sb.substring(5):"",
......
src/main/java/tkio/task/SyncAppDataTask.java → src/main/java/common/task/SyncAppDataTask.java
package tkio.task; package common.task;
import com.google.common.base.Splitter;
import common.model.AppCategory; import common.model.AppCategory;
import common.model.AppInfo; import common.model.AppInfo;
import common.repository.AppCategoryRepository; import common.repository.AppCategoryRepository;
import common.repository.AppInfoRepository; import common.repository.AppInfoRepository;
import common.repository.CityRepository; import common.repository.CityRepository;
import dmp.model.OtPkgDevStats;
import dmp.model.TagCrawlerAppsWandoujia; import dmp.model.TagCrawlerAppsWandoujia;
import dmp.repository.OtPkgDevStatsRepository;
import dmp.repository.TagCrawlerAppsWandoujiaRepository; import dmp.repository.TagCrawlerAppsWandoujiaRepository;
import net.sf.json.JSONArray; import net.sf.json.JSONArray;
import net.sf.json.JSONObject; import net.sf.json.JSONObject;
import org.anarres.lzo.LzoAlgorithm;
import org.anarres.lzo.LzoDecompressor;
import org.anarres.lzo.LzoInputStream;
import org.anarres.lzo.LzoLibrary;
import org.apache.commons.collections.map.HashedMap; import org.apache.commons.collections.map.HashedMap;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import util.AwsS3Util;
import util.Constant; import util.Constant;
import util.DateUtil; import util.DateUtil;
import util.HttpClientUtil; import util.HttpClientUtil;
import util.StringUtil; import util.StringUtil;
import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
...@@ -26,14 +41,16 @@ import java.util.Map; ...@@ -26,14 +41,16 @@ import java.util.Map;
*/ */
public class SyncAppDataTask public class SyncAppDataTask
{ {
private static Logger logger = LoggerFactory.getLogger(SyncAppDataTask.class);
@Autowired TagCrawlerAppsWandoujiaRepository tagRepository; @Autowired TagCrawlerAppsWandoujiaRepository tagRepository;
@Autowired AppInfoRepository appInfoRepository; @Autowired AppInfoRepository appInfoRepository;
@Autowired AppCategoryRepository appCategoryRepository; @Autowired AppCategoryRepository appCategoryRepository;
@Autowired CityRepository cityRepository; @Autowired CityRepository cityRepository;
@Autowired OtPkgDevStatsRepository otPkgDevStatsRepository;
public void syncAppData() /*public void syncAppData()
{ {
System.out.println(DateUtil.getBeforeDays(1)); System.out.println(DateUtil.getBeforeDays(1));
List<TagCrawlerAppsWandoujia> list = tagRepository.findAllByDs("2017-12-15"); List<TagCrawlerAppsWandoujia> list = tagRepository.findAllByDs("2017-12-15");
...@@ -130,6 +147,135 @@ public class SyncAppDataTask ...@@ -130,6 +147,135 @@ public class SyncAppDataTask
} }
appInfoRepository.save(newInfos); appInfoRepository.save(newInfos);
appCategoryRepository.save(newCategorys); appCategoryRepository.save(newCategorys);
}*/
public void syncAppDeviceNum() {
String ds = DateUtil.getBeforeDays(1);
ds = "2017-12-21";
String skey = "export/pkg_dev_stats/ds=" + ds + "/";
final AwsS3Util s3Util = AwsS3Util.getInstance();
List itemList = AwsS3Util.getInstance().getS3Keys("reyunbpu", skey);
if (itemList == null || itemList.size() == 0) {
return;
}
for (int i = 0; i < itemList.size(); i++) {
String s3key = String.valueOf(itemList.get(i));
readS3File(s3Util, s3key, "deviceNum");
}
}
public void syncAppInfo() {
appInfoRepository.deleteAll();
String skey = "export/crawler_data/";
final AwsS3Util s3Util = AwsS3Util.getInstance();
List itemList = AwsS3Util.getInstance().getS3Keys("reyunbpu", skey);
if (itemList == null || itemList.size() == 0) {
return;
}
for (int i = 0; i < itemList.size(); i++) {
String s3key = String.valueOf(itemList.get(i));
readS3File(s3Util, s3key, "appInfo");
}
}
private void readS3File(AwsS3Util s3Util, String s3key, String getContent)
{
List<AppCategory> newCategorys = new ArrayList<>();
List<String> citys = new ArrayList<>();
List<AppCategory> appCategories = new ArrayList<>();
Map<String, List<String>> map = new HashMap<>();
List<String> ry_pkgNameList = new ArrayList<>();
if (getContent.equals("appInfo")) {
citys = cityRepository.findCitys();
appCategories = appCategoryRepository.findAll();
for (AppCategory appCategory : appCategories) {
List<String> innerList = map.get(appCategory.getLevel());
if (innerList == null) {
innerList = new ArrayList<>();
}
innerList.add(appCategory.getName());
map.put(appCategory.getLevel(), innerList);
}
ry_pkgNameList = findReyunPkgList();
}
InputStream inputStream = null;
BufferedReader br = null;
try {
final byte[] fileBytes = s3Util.downloadBytesFromS3("reyunbpu", s3key);
inputStream = new ByteArrayInputStream(fileBytes);
if (s3key.endsWith(".lzo_deflate")) {
LzoAlgorithm algorithm = LzoAlgorithm.LZO1X;
LzoDecompressor deCompressor = LzoLibrary.getInstance().newDecompressor(algorithm, null);
LzoInputStream stream = new LzoInputStream(inputStream, deCompressor);
br = new BufferedReader(new InputStreamReader(stream));
}
else {
br = new BufferedReader(new InputStreamReader(inputStream));
}
String line = null;
List<OtPkgDevStats> resultList = new ArrayList<>();
List<AppInfo> appResultList = new ArrayList<>();
while ((line = br.readLine()) != null) {
// System.out.println(line);
Object[] array = Splitter.on("\t").trimResults().splitToList(line).toArray();
if (array.length == 3) {
OtPkgDevStats opds = new OtPkgDevStats();
opds.setPkgname(array[0].toString());
opds.setDevNum(Long.valueOf(array[1].toString()));
opds.setDs(array[2].toString());
resultList.add(opds);
if (resultList.size() >= 2000) {
System.out.println(resultList);
otPkgDevStatsRepository.save(resultList);
resultList = new ArrayList<>();
}
} else if (array.length == 19) {
AppInfo appInfo = generateAppInfo(array, ry_pkgNameList, map, newCategorys, citys);
appResultList.add(appInfo);
if (appResultList.size() >= 2000) {
System.out.println(appResultList);
appInfoRepository.save(appResultList);
appResultList = new ArrayList<>();
}
}
}
if (resultList.size() > 0) {
otPkgDevStatsRepository.save(resultList);
}
if (appResultList.size() > 0) {
appInfoRepository.save(appResultList);
}
System.out.println(newCategorys);
if (newCategorys.size() > 0) {
appCategoryRepository.save(newCategorys);
}
}
catch (Exception e) {
logger.error("读取s3文件错误", e);
}
finally {
try {
if (br != null) {
br.close();
}
if (inputStream != null) {
inputStream.close();
}
}
catch (IOException e) {
e.printStackTrace();
}
}
} }
public List<String> findReyunPkgList() { public List<String> findReyunPkgList() {
...@@ -152,9 +298,72 @@ public class SyncAppDataTask ...@@ -152,9 +298,72 @@ public class SyncAppDataTask
return pkgName; return pkgName;
} }
public static void main(String[] args) public AppInfo generateAppInfo(Object[] array, List<String> ry_pkgNameList, Map<String, List<String>> map, List<AppCategory> newCategorys, List<String> citys) {
AppInfo appInfo = new AppInfo();
appInfo.setName(array[4].toString());
appInfo.setCompany(array[9].toString());
//豌豆荚爬取的都是安卓的
appInfo.setOs("Android");
appInfo.setPkgName(array[6].toString());
//判断这批app中是否有热云已有的
if (ry_pkgNameList.contains(array[6].toString())) {
appInfo.setReyun(1);
}
appInfo.setLogoUrl(array[7].toString());
String types = array[12].toString();
//类别按照_分割，第一个是一级类别，第二个是二级类别，第三个是三级类别，剩下到组合起来放到其他类别中
//同时将爬取的数据中的类别字典取出来
if (!StringUtil.isEmpty(types)) {
String[] typeArray = types.split("_");
String otherCase = "";
for (int i=0; i<typeArray.length; i++) {
if (map.containsKey(String.valueOf(i+1)) && !map.get(String.valueOf(i+1)).contains(typeArray[i])) {
List<String> mapValue = map.get(String.valueOf(i+1));
AppCategory newCate = new AppCategory();
newCate.setName(typeArray[i]);
newCate.setLevel(String.valueOf(i+1));
newCategorys.add(newCate);
mapValue.add(typeArray[i]);
map.put(String.valueOf(i+1), mapValue);
} else if (!map.containsKey(String.valueOf(i+1))) {
AppCategory newCate = new AppCategory();
newCate.setName(typeArray[i]);
newCate.setLevel(String.valueOf(i+1));
newCategorys.add(newCate);
List<String> mapValue = new ArrayList<>();
mapValue.add(typeArray[i]);
map.put(String.valueOf(i+1), mapValue);
}
if (i == 0) {
appInfo.setFirstCate(typeArray[i]);
}
if (i == 1) {
appInfo.setSecondCate(typeArray[i]);
}
if (i == 2) {
appInfo.setThirdCate(typeArray[i]);
}
if (i > 2) {
otherCase += "_" + typeArray[i];
}
}
if (otherCase.length() > 0) {
appInfo.setOtherCate(otherCase.substring(1));
}
}
//看公司名字中是含有城市列表中的某个，记录app的公司所在地
for (String city : citys) {
if (array[9].toString().indexOf(city) > -1) {
appInfo.setLocation(city);
break;
}
}
return appInfo;
}
/*public static void main(String[] args)
{ {
SyncAppDataTask task = new SyncAppDataTask(); SyncAppDataTask task = new SyncAppDataTask();
task.syncAppData(); task.syncAppData();
} }*/
} }
src/main/java/util/AwsS3Util.java 0 → 100644
package util;
import com.amazonaws.ClientConfiguration;
import com.amazonaws.auth.AWSCredentials;
import com.amazonaws.auth.BasicAWSCredentials;
import com.amazonaws.regions.Regions;
import com.amazonaws.services.s3.AmazonS3;
import com.amazonaws.services.s3.AmazonS3Client;
import com.amazonaws.services.s3.model.ListObjectsRequest;
import com.amazonaws.services.s3.model.ObjectListing;
import com.amazonaws.services.s3.model.ObjectMetadata;
import com.amazonaws.services.s3.model.S3Object;
import com.amazonaws.services.s3.model.S3ObjectSummary;
import com.google.common.collect.Lists;
import common.service.impl.OpenApiServiceImpl;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.BufferedInputStream;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.List;
public class AwsS3Util
{
private static final Logger logger = LoggerFactory.getLogger(AwsS3Util.class);
private static AwsS3Util awsS3Util = new AwsS3Util();
private AmazonS3 s3;
private AwsS3Util() {
String accessKey = "AKIAPSKINGJFIZHEFNWQ";
String secretKey = "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";
if ((accessKey != null) && (secretKey != null)) {
AWSCredentials credentials = new BasicAWSCredentials(accessKey, secretKey);
ClientConfiguration config = new ClientConfiguration();
String proxyHost = System.getProperty("http.proxyHost");
String proxyPort = System.getProperty("http.proxyPort");
if (proxyHost != null && proxyPort != null) {
config.setProxyHost(proxyHost);
config.setProxyPort(Integer.valueOf(proxyPort));
}
if (s3 == null)
s3 = new AmazonS3Client(credentials, config);
s3.setRegion(com.amazonaws.regions.Region.getRegion(Regions.CN_NORTH_1));
}
}
public static AwsS3Util getInstance() {
return awsS3Util;
}
public AmazonS3 getAmazonS3() {
return s3;
}
public List<String> getS3Keys(String bucket, String prefix) {
List<String> rtnList = Lists.newArrayList();
ObjectListing objectListing = s3.listObjects(new ListObjectsRequest()
.withBucketName(bucket)
.withPrefix(prefix));
for (S3ObjectSummary objectSummary : objectListing.getObjectSummaries()) {
rtnList.add(objectSummary.getKey());
}
return rtnList;
}
public long uploadStreamToS3(String bucket, String s3key, InputStream in, String contentType, long contentLength)
throws IOException {
ObjectMetadata md = new ObjectMetadata();
if (contentType != null)
md.setContentType(contentType);
md.setContentLength(contentLength);
AwsS3Util.getInstance().getAmazonS3().putObject(bucket, s3key, in, md);
return contentLength;
}
public long uploadStringToS3(String s3bucket, String s3key, String str)
throws IOException {
final byte[] bytes = str.getBytes("UTF-8");
BufferedInputStream bis = new BufferedInputStream(new ByteArrayInputStream(bytes));
try {
return uploadStreamToS3(s3bucket, s3key, bis, "text/plain; charset=UTF-8", bytes.length);
} finally {
IOUtil.close(bis);
}
}
public String downloadStringFromS3(String bucket, String s3key) throws IOException {
return new String(downloadBytesFromS3(bucket, s3key), "UTF-8");
}
public byte[] downloadBytesFromS3(String bucket, String s3key) throws IOException {
InputStream is = null;
ByteArrayOutputStream bos = null;
try {
is = downloadStreamFromS3(bucket, s3key);
bos = new ByteArrayOutputStream();
IOUtil.copy(is, bos);
return bos.toByteArray();
} finally {
if (bos != null)
IOUtil.close(bos);
if (is != null)
IOUtil.close(is);
}
}
public InputStream downloadStreamFromS3(String bucket, String s3key) {
return getS3Object(bucket, s3key).getObjectContent();
}
public void deleteS3Object(String bucket, String s3key) {
AwsS3Util.getInstance().getAmazonS3().deleteObject(bucket, s3key);
}
private S3Object getS3Object(String bucket, String s3key) {
return AwsS3Util.getInstance().getAmazonS3().getObject(bucket, s3key);
}
public static void main(String[] args) {
OpenApiServiceImpl openApiService = new OpenApiServiceImpl();
openApiService.listInfo4AppData("2017-12-21");
}
}
\ No newline at end of file
src/main/java/util/IOUtil.java 0 → 100644
package util;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.OutputStream;
import java.io.Reader;
import java.io.Serializable;
import java.io.StringWriter;
import java.io.Writer;
/**
* Created by sunhao on 17/5/9.
* IO工具类
*/
public class IOUtil
{
public static void close(OutputStream os) {
if (os != null) {
try {
os.close();
} catch (Exception ignored) {
}
}
}
public static void close(InputStream is) {
if (is != null) {
try {
is.close();
} catch (Exception ignored) {
}
}
}
public static void close(Writer os) {
if (os != null) {
try {
os.close();
} catch (Exception ignored) {
}
}
}
public static void close(Reader is) {
if (is != null) {
try {
is.close();
} catch (Exception ignored) {
}
}
}
public static void deleteAllFiles(File directory) {
File[] files = directory.listFiles();
for (File file : files) {
if (!file.delete()) {
// System.out.println("Cannot delete " + file);
}
}
}
public static String readString(InputStream input, String encoding)
throws IOException {
InputStreamReader ir = (encoding == null ? new InputStreamReader(input) : new InputStreamReader(input, encoding));
StringWriter sw = new StringWriter();
try {
copy(ir, sw);
return sw.toString();
} finally {
close(sw);
}
}
public static long copy(InputStream in, OutputStream out)
throws IOException {
byte[] buffer = new byte[1024 * 4];
int len;
long count = 0;
while ((len = in.read(buffer)) >= 0) {
out.write(buffer, 0, len);
count += len;
}
return count;
}
public static long copy(Reader in, Writer out)
throws IOException {
char[] buffer = new char[1024 * 4];
int len;
long count = 0;
while ((len = in.read(buffer)) >= 0) {
out.write(buffer, 0, len);
count += len;
}
return count;
}
public static long copy(File src, File dest)
throws IOException {
FileInputStream fis = new FileInputStream(src);
FileOutputStream fos = new FileOutputStream(dest);
try {
return copy(fis, fos);
} finally {
close(fis);
close(fos);
}
}
public static byte[] objToBytes(Serializable obj)
throws IOException {
ByteArrayOutputStream bos = new ByteArrayOutputStream();
ObjectOutputStream oo = new ObjectOutputStream(bos);
try {
oo.writeObject(obj);
return bos.toByteArray();
} finally {
close(oo);
close(bos);
}
}
public static Object objFromBytes(byte[] bytes)
throws IOException, ClassNotFoundException {
ByteArrayInputStream bis = new ByteArrayInputStream(bytes);
ObjectInputStream oi = new ObjectInputStream(bis);
try {
return oi.readObject();
} finally {
close(oi);
close(bis);
}
}
public static void objToStream(OutputStream os, Serializable obj)
throws IOException {
ObjectOutputStream oo = new ObjectOutputStream(os);
try {
oo.writeObject(obj);
} finally {
close(oo);
}
}
public static Object objFromStream(InputStream is)
throws IOException, ClassNotFoundException {
ObjectInputStream oi = new ObjectInputStream(is);
try {
return oi.readObject();
} finally {
close(oi);
}
}
public static void saveObject(File file, Serializable obj)
throws IOException {
objToStream(new BufferedOutputStream(new FileOutputStream(file)), obj);
}
public static Object loadObject(File file)
throws IOException, ClassNotFoundException {
return objFromStream(new BufferedInputStream(new FileInputStream(file)));
}
}
src/main/resources/applicationContext-schedule.xml
...@@ -28,11 +28,14 @@ ...@@ -28,11 +28,14 @@
<task:scheduled ref="trackAccountTask" method="task" cron="0 32 16 * * ?"/> <task:scheduled ref="trackAccountTask" method="task" cron="0 32 16 * * ?"/>
</task:scheduled-tasks> </task:scheduled-tasks>
<bean id="SyncAppDataTask" class="tkio.task.SyncAppDataTask"></bean> <bean id="SyncAppDataTask" class="common.task.SyncAppDataTask"></bean>
<task:scheduled-tasks> <task:scheduled-tasks>
<!--//定时同步短链数据(每5分钟执行一次)--> <!--//定时同步短链数据(每5分钟执行一次)-->
<task:scheduled ref="SyncAppDataTask" method="syncAppData" cron="0 38 20 * * ?"/> <task:scheduled ref="SyncAppDataTask" method="syncAppInfo" cron="0 54 20 * * ?"/>
<task:scheduled ref="SyncAppDataTask" method="syncAppDeviceNum" cron="0 09 21 * * ?"/>
</task:scheduled-tasks> </task:scheduled-tasks>
</beans> </beans>
src/main/resources/applicationContext.xml
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
<property name="jpaProperties"> <property name="jpaProperties">
<props> <props>
<prop key="hibernate.ejb.naming_strategy">org.hibernate.cfg.ImprovedNamingStrategy</prop> <prop key="hibernate.ejb.naming_strategy">org.hibernate.cfg.ImprovedNamingStrategy</prop>
<prop key="hibernate.show_sql">true</prop> <prop key="hibernate.show_sql">false</prop>
<prop key="hibernate.hbm2ddl.auto">update</prop><!-- none --> <prop key="hibernate.hbm2ddl.auto">update</prop><!-- none -->
<prop key="hibernate.connection.CharSet">utf8</prop> <prop key="hibernate.connection.CharSet">utf8</prop>
......
target/classes/applicationContext-schedule.xml
...@@ -10,11 +10,14 @@ ...@@ -10,11 +10,14 @@
<description>调度配置</description> <description>调度配置</description>
<bean id="tkioAccountTask" class="tkio.task.AccountTask"></bean> <bean id="tkioAccountTask" class="tkio.task.AccountTask"></bean>
<task:scheduled-tasks> <task:scheduled-tasks>
<!--//定时同步短链数据(每5分钟执行一次)--> <!--//定时同步短链数据(每5分钟执行一次)-->
<task:scheduled ref="tkioAccountTask" method="task" cron="0 21 15 * * ?"/> <task:scheduled ref="tkioAccountTask" method="task" cron="0 40 14 * * ?"/>
</task:scheduled-tasks>
<bean id="tkioNoticeTask" class="tkio.task.NoticeTask"></bean>
<task:scheduled-tasks>
<task:scheduled ref="tkioNoticeTask" method="task" cron="0 33 16 * * ?"/>
</task:scheduled-tasks> </task:scheduled-tasks>
<bean id="trackAccountTask" class="track.task.AccountTask"></bean> <bean id="trackAccountTask" class="track.task.AccountTask"></bean>
...@@ -25,11 +28,14 @@ ...@@ -25,11 +28,14 @@
<task:scheduled ref="trackAccountTask" method="task" cron="0 32 16 * * ?"/> <task:scheduled ref="trackAccountTask" method="task" cron="0 32 16 * * ?"/>
</task:scheduled-tasks> </task:scheduled-tasks>
<bean id="SyncAppDataTask" class="tkio.task.SyncAppDataTask"></bean> <bean id="SyncAppDataTask" class="common.task.SyncAppDataTask"></bean>
<task:scheduled-tasks> <task:scheduled-tasks>
<!--//定时同步短链数据(每5分钟执行一次)--> <!--//定时同步短链数据(每5分钟执行一次)-->
<task:scheduled ref="SyncAppDataTask" method="syncAppData" cron="0 38 20 * * ?"/> <task:scheduled ref="SyncAppDataTask" method="syncAppInfo" cron="0 54 20 * * ?"/>
<task:scheduled ref="SyncAppDataTask" method="syncAppDeviceNum" cron="0 09 21 * * ?"/>
</task:scheduled-tasks> </task:scheduled-tasks>
</beans> </beans>
target/classes/applicationContext.xml
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
<property name="jpaProperties"> <property name="jpaProperties">
<props> <props>
<prop key="hibernate.ejb.naming_strategy">org.hibernate.cfg.ImprovedNamingStrategy</prop> <prop key="hibernate.ejb.naming_strategy">org.hibernate.cfg.ImprovedNamingStrategy</prop>
<prop key="hibernate.show_sql">true</prop> <prop key="hibernate.show_sql">false</prop>
<prop key="hibernate.hbm2ddl.auto">update</prop><!-- none --> <prop key="hibernate.hbm2ddl.auto">update</prop><!-- none -->
<prop key="hibernate.connection.CharSet">utf8</prop> <prop key="hibernate.connection.CharSet">utf8</prop>
......
target/classes/common.properties
report.url=http://localhost:8082 report.url=http://ec2-54-222-233-230.cn-north-1.compute.amazonaws.com.cn:9010
awsneed=${awsneed} awsneed=${awsneed}
profile.table=${profile.table} profile.table=${profile.table}
event.table=${event.table} event.table=${event.table}
......
target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
...@@ -29,19 +29,21 @@ common\controller\UserController.class ...@@ -29,19 +29,21 @@ common\controller\UserController.class
exception\TipException.class exception\TipException.class
common\context\AppUtils.class common\context\AppUtils.class
util\RedisUtilNew.class util\RedisUtilNew.class
tkio\task\SyncAppDataTask.class
common\model\User.class common\model\User.class
tkio\repository\IsNotifiedRepository.class tkio\repository\IsNotifiedRepository.class
track\repository\TrackChannelRepository.class track\repository\TrackChannelRepository.class
tkio\service\impl\TkioAccountServiceImpl.class tkio\service\impl\TkioAccountServiceImpl.class
util\DateUtil.class util\DateUtil.class
common\service\impl\OpenApiServiceImpl.class
common\model\AppCategory.class common\model\AppCategory.class
tkio\repository\ChannelRepository.class tkio\repository\ChannelRepository.class
security\RedisLoginStatusManager.class security\RedisLoginStatusManager.class
util\IOUtil.class
common\model\Notice.class common\model\Notice.class
dic\RoleTypeEnum.class dic\RoleTypeEnum.class
common\repository\AppInfoRepository.class common\repository\AppInfoRepository.class
tkio\model\Channel.class tkio\model\Channel.class
common\task\SyncAppDataTask.class
common\service\impl\MenuServiceImpl.class common\service\impl\MenuServiceImpl.class
common\repository\UserLogRepository.class common\repository\UserLogRepository.class
common\model\Account4Web.class common\model\Account4Web.class
...@@ -60,6 +62,7 @@ common\repository\ReminderRepository.class ...@@ -60,6 +62,7 @@ common\repository\ReminderRepository.class
common\controller\NoticeController.class common\controller\NoticeController.class
util\StringUtil.class util\StringUtil.class
track\model\Channel.class track\model\Channel.class
util\AwsS3Util.class
track\model\Campaign.class track\model\Campaign.class
security\interceptor\AuthorizationInterceptor.class security\interceptor\AuthorizationInterceptor.class
security\annotation\CurrentAccount.class security\annotation\CurrentAccount.class
...@@ -95,6 +98,7 @@ common\service\NoticeService.class ...@@ -95,6 +98,7 @@ common\service\NoticeService.class
common\model\RoleType.class common\model\RoleType.class
tkio\task\AccountTask.class tkio\task\AccountTask.class
security\annotation\Authorization.class security\annotation\Authorization.class
common\service\IOpenApiService.class
util\IP$1.class util\IP$1.class
tkio\task\NoticeTask.class tkio\task\NoticeTask.class
common\repository\CodeRepository.class common\repository\CodeRepository.class
......
target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
...@@ -28,7 +28,8 @@ E:\IDEA_workspace\manager\src\main\java\tkio\model\RoleAuthDetail.java ...@@ -28,7 +28,8 @@ 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\SalesManLeader.java
E:\IDEA_workspace\manager\src\main\java\tkio\model\PackageType.java E:\IDEA_workspace\manager\src\main\java\tkio\model\PackageType.java
E:\IDEA_workspace\manager\src\main\java\track\controller\TrackAccountController.java E:\IDEA_workspace\manager\src\main\java\track\controller\TrackAccountController.java
E:\IDEA_workspace\manager\src\main\java\tkio\task\SyncAppDataTask.java E:\IDEA_workspace\manager\src\main\java\common\controller\NoticeController.java
E:\IDEA_workspace\manager\src\main\java\common\service\impl\NoticeServiceImpl.java
E:\IDEA_workspace\manager\src\main\java\security\exception\MethodNotSupportException.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\IPAddrUtil.java
E:\IDEA_workspace\manager\src\main\java\util\HttpClientUtil.java E:\IDEA_workspace\manager\src\main\java\util\HttpClientUtil.java
...@@ -48,6 +49,7 @@ E:\IDEA_workspace\manager\src\main\java\track\model\Campaign.java ...@@ -48,6 +49,7 @@ E:\IDEA_workspace\manager\src\main\java\track\model\Campaign.java
E:\IDEA_workspace\manager\src\main\java\track\repository\TrackChannelRepository.java E:\IDEA_workspace\manager\src\main\java\track\repository\TrackChannelRepository.java
E:\IDEA_workspace\manager\src\main\java\common\model\RoleType.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\exception\TipException.java
E:\IDEA_workspace\manager\src\main\java\common\task\SyncAppDataTask.java
E:\IDEA_workspace\manager\src\main\java\common\repository\TrackAccount4WebRepository.java E:\IDEA_workspace\manager\src\main\java\common\repository\TrackAccount4WebRepository.java
E:\IDEA_workspace\manager\src\main\java\util\ResultModel.java E:\IDEA_workspace\manager\src\main\java\util\ResultModel.java
E:\IDEA_workspace\manager\src\main\java\track\model\Account.java E:\IDEA_workspace\manager\src\main\java\track\model\Account.java
...@@ -66,14 +68,17 @@ E:\IDEA_workspace\manager\src\main\java\common\repository\PaymentRepository.java ...@@ -66,14 +68,17 @@ 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\common\model\UserLog.java
E:\IDEA_workspace\manager\src\main\java\util\DBUtil.java E:\IDEA_workspace\manager\src\main\java\util\DBUtil.java
E:\IDEA_workspace\manager\src\main\java\track\model\Channel.java E:\IDEA_workspace\manager\src\main\java\track\model\Channel.java
E:\IDEA_workspace\manager\src\main\java\common\model\Notice.java
E:\IDEA_workspace\manager\src\main\java\tkio\repository\CampaignRepository.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\tkio\repository\ChannelRepository.java
E:\IDEA_workspace\manager\src\main\java\util\CipherUtil.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\security\TokenManager.java
E:\IDEA_workspace\manager\src\main\java\common\repository\NoticeRepository.java
E:\IDEA_workspace\manager\src\main\java\tkio\model\Account.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\tkio\model\RoleAuth.java
E:\IDEA_workspace\manager\src\main\java\common\service\MenuService.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\util\StringUtil.java
E:\IDEA_workspace\manager\src\main\java\common\service\NoticeService.java
E:\IDEA_workspace\manager\src\main\java\track\repository\TrackAccountRepository.java E:\IDEA_workspace\manager\src\main\java\track\repository\TrackAccountRepository.java
E:\IDEA_workspace\manager\src\main\java\security\cors\CorsFilter.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\util\DateUtil.java
...@@ -85,8 +90,10 @@ E:\IDEA_workspace\manager\src\main\java\security\resolvers\LoginUserMethodArgume ...@@ -85,8 +90,10 @@ E:\IDEA_workspace\manager\src\main\java\security\resolvers\LoginUserMethodArgume
E:\IDEA_workspace\manager\src\main\java\common\model\Menu.java E:\IDEA_workspace\manager\src\main\java\common\model\Menu.java
E:\IDEA_workspace\manager\src\main\java\common\model\TrackAccount4Web.java E:\IDEA_workspace\manager\src\main\java\common\model\TrackAccount4Web.java
E:\IDEA_workspace\manager\src\main\java\common\repository\RoleTypeRepository.java E:\IDEA_workspace\manager\src\main\java\common\repository\RoleTypeRepository.java
E:\IDEA_workspace\manager\src\main\java\tkio\task\NoticeTask.java
E:\IDEA_workspace\manager\src\main\java\common\model\Payment.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\MenuRepository.java
E:\IDEA_workspace\manager\src\main\java\common\service\impl\OpenApiServiceImpl.java
E:\IDEA_workspace\manager\src\main\java\common\repository\AppInfoRepository.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\common\service\UserService.java
E:\IDEA_workspace\manager\src\main\java\tkio\service\impl\TkioAccountServiceImpl.java E:\IDEA_workspace\manager\src\main\java\tkio\service\impl\TkioAccountServiceImpl.java
...@@ -100,6 +107,7 @@ E:\IDEA_workspace\manager\src\main\java\common\repository\ReminderRepository.jav ...@@ -100,6 +107,7 @@ E:\IDEA_workspace\manager\src\main\java\common\repository\ReminderRepository.jav
E:\IDEA_workspace\manager\src\main\java\exception\NotFoundException.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\tkio\model\DataAuth.java
E:\IDEA_workspace\manager\src\main\java\security\RedisLoginStatusManager.java E:\IDEA_workspace\manager\src\main\java\security\RedisLoginStatusManager.java
E:\IDEA_workspace\manager\src\main\java\common\service\IOpenApiService.java
E:\IDEA_workspace\manager\src\main\java\util\CharacterUtils.java E:\IDEA_workspace\manager\src\main\java\util\CharacterUtils.java
E:\IDEA_workspace\manager\src\main\java\track\service\TrackAccountService.java E:\IDEA_workspace\manager\src\main\java\track\service\TrackAccountService.java
E:\IDEA_workspace\manager\src\main\java\common\model\City.java E:\IDEA_workspace\manager\src\main\java\common\model\City.java
...@@ -108,9 +116,11 @@ E:\IDEA_workspace\manager\src\main\java\common\model\KeyValue.java ...@@ -108,9 +116,11 @@ 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\tkio\model\App.java
E:\IDEA_workspace\manager\src\main\java\common\repository\AppCategoryRepository.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\dmp\repository\TagCrawlerAppsWandoujiaRepository.java
E:\IDEA_workspace\manager\src\main\java\util\IOUtil.java
E:\IDEA_workspace\manager\src\main\java\dic\OperateObjectTypeEnum.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\dic\RoleTypeEnum.java
E:\IDEA_workspace\manager\src\main\java\tkio\service\impl\AccountFlowRestrictServiceImpl.java E:\IDEA_workspace\manager\src\main\java\tkio\service\impl\AccountFlowRestrictServiceImpl.java
E:\IDEA_workspace\manager\src\main\java\util\AwsS3Util.java
E:\IDEA_workspace\manager\src\main\java\common\model\BackVisit.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\common\service\impl\AppServiceImpl.java
E:\IDEA_workspace\manager\src\main\java\util\RedisUtilNew.java E:\IDEA_workspace\manager\src\main\java\util\RedisUtilNew.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