Skip to content

M
manager
Commit baed88fe by manxiaoqiang
Options

Merge remote-tracking branch 'origin/master'

parents 1446ab32 6977b318
Showing with 426 additions and 247 deletions
.idea/workspace.xml
...@@ -2,7 +2,16 @@ ...@@ -2,7 +2,16 @@
<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="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/common/controller/AppController.class" afterPath="$PROJECT_DIR$/target/classes/common/controller/AppController.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/common/model/UserLog.class" afterPath="$PROJECT_DIR$/target/classes/common/model/UserLog.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/common/repository/UserLogRepository.class" afterPath="$PROJECT_DIR$/target/classes/common/repository/UserLogRepository.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/util/UserLogThread.class" afterPath="$PROJECT_DIR$/target/classes/util/UserLogThread.class" />
<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/model/UserLog.java" afterPath="$PROJECT_DIR$/src/main/java/common/model/UserLog.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/common/repository/UserLogRepository.java" afterPath="$PROJECT_DIR$/src/main/java/common/repository/UserLogRepository.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/util/UserLogThread.java" afterPath="$PROJECT_DIR$/src/main/java/util/UserLogThread.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/util/UserLogThread.java" afterPath="$PROJECT_DIR$/src/main/java/util/UserLogThread.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$/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" />
</list> </list>
<ignored path="$PROJECT_DIR$/target/" /> <ignored path="$PROJECT_DIR$/target/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
...@@ -18,11 +27,11 @@ ...@@ -18,11 +27,11 @@
<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="UserLogThread.java" pinned="false" current-in-tab="true"> <file leaf-file-name="UserLogThread.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/util/UserLogThread.java"> <entry file="file://$PROJECT_DIR$/src/main/java/util/UserLogThread.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="339"> <state relative-caret-position="117">
<caret line="34" column="17" lean-forward="false" selection-start-line="34" selection-start-column="17" selection-end-line="34" selection-end-column="17" /> <caret line="60" column="32" lean-forward="false" selection-start-line="60" selection-start-column="18" selection-end-line="60" selection-end-column="32" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
</folding> </folding>
...@@ -30,23 +39,69 @@ ...@@ -30,23 +39,69 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="AppController.java" pinned="false" current-in-tab="false"> <file leaf-file-name="UserLog.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/common/controller/AppController.java"> <entry file="file://$PROJECT_DIR$/src/main/java/common/model/UserLog.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="96"> <state relative-caret-position="117">
<caret line="37" column="19" lean-forward="false" selection-start-line="37" selection-start-column="19" selection-end-line="37" selection-end-column="19" /> <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="true" /> <element signature="imports" expanded="true" />
<element signature="e#554#555#0" expanded="true" />
<element signature="e#579#580#0" expanded="true" />
<element signature="e#617#618#0" expanded="true" />
<element signature="e#645#646#0" expanded="true" />
<element signature="e#687#688#0" expanded="true" />
<element signature="e#721#722#0" expanded="true" />
<element signature="e#779#780#0" expanded="true" />
<element signature="e#825#826#0" expanded="true" />
<element signature="e#868#869#0" expanded="true" />
<element signature="e#903#904#0" expanded="true" />
<element signature="e#963#964#0" expanded="true" />
<element signature="e#1011#1012#0" expanded="true" />
<element signature="e#1053#1054#0" expanded="true" />
<element signature="e#1087#1088#0" expanded="true" />
<element signature="e#1145#1146#0" expanded="true" />
<element signature="e#1191#1192#0" expanded="true" />
<element signature="e#1224#1225#0" expanded="true" />
<element signature="e#1249#1250#0" expanded="true" />
<element signature="e#1289#1290#0" expanded="true" />
<element signature="e#1317#1318#0" expanded="true" />
<element signature="e#1365#1366#0" expanded="true" />
<element signature="e#1405#1406#0" expanded="true" />
<element signature="e#1475#1476#0" expanded="true" />
<element signature="e#1533#1534#0" expanded="true" />
<element signature="e#1577#1578#0" expanded="true" />
<element signature="e#1613#1614#0" expanded="true" />
<element signature="e#1675#1676#0" expanded="true" />
<element signature="e#1725#1726#0" expanded="true" />
<element signature="e#1767#1768#0" expanded="true" />
<element signature="e#1801#1802#0" expanded="true" />
<element signature="e#1859#1860#0" expanded="true" />
<element signature="e#1905#1906#0" expanded="true" />
<element signature="e#1944#1945#0" expanded="true" />
<element signature="e#1975#1976#0" expanded="true" />
<element signature="e#2027#2028#0" expanded="true" />
<element signature="e#2067#2068#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="IPAddrUtil.java" pinned="false" current-in-tab="false"> <file leaf-file-name="CityRepository.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/util/IPAddrUtil.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="286"> <state relative-caret-position="198">
<caret line="13" column="23" lean-forward="true" selection-start-line="13" selection-start-column="23" selection-end-line="13" selection-end-column="23" /> <caret line="13" column="60" lean-forward="true" selection-start-line="13" selection-start-column="60" selection-end-line="13" selection-end-column="60" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="UserLogRepository.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/UserLogRepository.java">
<provider selected="true" editor-type-id="text-editor">
<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" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
</folding> </folding>
...@@ -54,111 +109,74 @@ ...@@ -54,111 +109,74 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="IP.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/util/IP.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="0"> <state relative-caret-position="198">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <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 />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="UserLog.java" pinned="false" current-in-tab="false"> <file leaf-file-name="UserLogService.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/common/model/UserLog.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="-88"> <state relative-caret-position="177">
<caret line="107" column="5" lean-forward="false" selection-start-line="107" selection-start-column="5" selection-end-line="107" selection-end-column="5" /> <caret line="13" column="29" lean-forward="false" selection-start-line="13" selection-start-column="18" selection-end-line="13" selection-end-column="29" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
<element signature="e#552#553#0" expanded="true" />
<element signature="e#577#578#0" expanded="true" />
<element signature="e#615#616#0" expanded="true" />
<element signature="e#643#644#0" expanded="true" />
<element signature="e#683#684#0" expanded="true" />
<element signature="e#717#718#0" expanded="true" />
<element signature="e#773#774#0" expanded="true" />
<element signature="e#819#820#0" expanded="true" />
<element signature="e#862#863#0" expanded="true" />
<element signature="e#897#898#0" expanded="true" />
<element signature="e#957#958#0" expanded="true" />
<element signature="e#1005#1006#0" expanded="true" />
<element signature="e#1047#1048#0" expanded="true" />
<element signature="e#1081#1082#0" expanded="true" />
<element signature="e#1139#1140#0" expanded="true" />
<element signature="e#1185#1186#0" expanded="true" />
<element signature="e#1218#1219#0" expanded="true" />
<element signature="e#1243#1244#0" expanded="true" />
<element signature="e#1283#1284#0" expanded="true" />
<element signature="e#1311#1312#0" expanded="true" />
<element signature="e#1359#1360#0" expanded="true" />
<element signature="e#1399#1400#0" expanded="true" />
<element signature="e#1469#1470#0" expanded="true" />
<element signature="e#1527#1528#0" expanded="true" />
<element signature="e#1571#1572#0" expanded="true" />
<element signature="e#1607#1608#0" expanded="true" />
<element signature="e#1669#1670#0" expanded="true" />
<element signature="e#1719#1720#0" expanded="true" />
<element signature="e#1761#1762#0" expanded="true" />
<element signature="e#1795#1796#0" expanded="true" />
<element signature="e#1853#1854#0" expanded="true" />
<element signature="e#1899#1900#0" expanded="true" />
<element signature="e#1969#1970#0" expanded="true" />
<element signature="e#2021#2022#0" expanded="true" />
<element signature="e#2061#2062#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="UserRepository.java" pinned="false" current-in-tab="false"> <file leaf-file-name="UserLogServiceImpl.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/UserRepository.java"> <entry file="file://$PROJECT_DIR$/src/main/java/common/service/impl/UserLogServiceImpl.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="265">
<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="31" column="50" lean-forward="false" selection-start-line="31" selection-start-column="33" selection-end-line="31" selection-end-column="50" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="UserLogRepository.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/UserLogRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="176">
<caret line="8" column="17" lean-forward="false" selection-start-line="8" selection-start-column="17" selection-end-line="8" selection-end-column="17" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
<element signature="e#870#871#0" expanded="true" />
<element signature="e#948#949#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="RoleEnum.java" pinned="false" current-in-tab="false"> <file leaf-file-name="UserController.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/dic/RoleEnum.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="132"> <state relative-caret-position="53">
<caret line="6" column="12" lean-forward="false" selection-start-line="6" selection-start-column="12" selection-end-line="6" selection-end-column="12" /> <caret line="20" column="13" lean-forward="false" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="RoleTypeEnum.java" pinned="false" current-in-tab="false"> <file leaf-file-name="UserLogController.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/dic/RoleTypeEnum.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="132"> <state relative-caret-position="221">
<caret line="6" column="12" lean-forward="false" selection-start-line="6" selection-start-column="12" selection-end-line="6" selection-end-column="12" /> <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="e#913#914#0" expanded="true" />
<element signature="e#998#999#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="OperateObjectTypeEnum.java" pinned="false" current-in-tab="false"> <file leaf-file-name="AppController.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/java/dic/OperateObjectTypeEnum.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="463"> <state relative-caret-position="119">
<caret line="28" column="1" lean-forward="true" selection-start-line="28" selection-start-column="1" selection-end-line="28" selection-end-column="1" /> <caret line="37" column="19" lean-forward="false" selection-start-line="37" selection-start-column="19" selection-end-line="37" selection-end-column="19" />
<folding /> <folding>
<element signature="imports" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -168,8 +186,8 @@ ...@@ -168,8 +186,8 @@
<component name="FileTemplateManagerImpl"> <component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES"> <option name="RECENT_TEMPLATES">
<list> <list>
<option value="Class" />
<option value="Interface" /> <option value="Interface" />
<option value="Class" />
</list> </list>
</option> </option>
</component> </component>
...@@ -212,12 +230,15 @@ ...@@ -212,12 +230,15 @@
<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/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/common/repository/UserLogRepository.java" />
<option value="$PROJECT_DIR$/src/main/java/util/IP.java" /> <option value="$PROJECT_DIR$/src/main/java/util/IP.java" />
<option value="$PROJECT_DIR$/src/main/java/util/IPAddrUtil.java" /> <option value="$PROJECT_DIR$/src/main/java/util/IPAddrUtil.java" />
<option value="$PROJECT_DIR$/src/main/java/common/model/UserLog.java" />
<option value="$PROJECT_DIR$/src/main/java/common/controller/AppController.java" /> <option value="$PROJECT_DIR$/src/main/java/common/controller/AppController.java" />
<option value="$PROJECT_DIR$/src/main/java/common/model/UserLog.java" />
<option value="$PROJECT_DIR$/src/main/java/util/UserLogThread.java" /> <option value="$PROJECT_DIR$/src/main/java/util/UserLogThread.java" />
<option value="$PROJECT_DIR$/src/main/java/common/service/UserLogService.java" />
<option value="$PROJECT_DIR$/src/main/java/common/service/impl/UserLogServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/common/repository/UserLogRepository.java" />
<option value="$PROJECT_DIR$/src/main/java/common/controller/UserLogController.java" />
</list> </list>
</option> </option>
</component> </component>
...@@ -307,6 +328,68 @@ ...@@ -307,6 +328,68 @@
<option name="myItemId" value="common" /> <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>
<option name="myItemId" value="service" />
<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="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" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="impl" />
<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="common" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="repository" />
<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="common" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="model" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</PATH_ELEMENT>
</PATH> </PATH>
<PATH> <PATH>
<PATH_ELEMENT> <PATH_ELEMENT>
...@@ -326,6 +409,20 @@ ...@@ -326,6 +409,20 @@
<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>
<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="common" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</PATH_ELEMENT>
</PATH>
</subPane> </subPane>
</pane> </pane>
<pane id="ProjectPane"> <pane id="ProjectPane">
...@@ -940,12 +1037,12 @@ ...@@ -940,12 +1037,12 @@
<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" />
<workItem from="1514344618155" duration="15778000" /> <workItem from="1514344618155" duration="20292000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="30093000" /> <option name="totallyTimeSpent" value="34607000" />
</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" />
...@@ -1002,48 +1099,6 @@ ...@@ -1002,48 +1099,6 @@
<option name="FILTER_TARGETS" value="false" /> <option name="FILTER_TARGETS" value="false" />
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/AuthRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="110">
<caret line="11" column="65" lean-forward="false" selection-start-line="11" selection-start-column="40" selection-end-line="11" selection-end-column="65" />
<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/common/model/City.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="176">
<caret line="10" column="17" lean-forward="true" 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/resources/applicationContext.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3938">
<caret line="179" column="42" lean-forward="false" selection-start-line="179" selection-start-column="36" selection-end-line="179" selection-end-column="42" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/applicationContext-schedule.xml"> <entry file="file://$PROJECT_DIR$/src/main/resources/applicationContext-schedule.xml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="528"> <state relative-caret-position="528">
...@@ -1174,14 +1229,6 @@ ...@@ -1174,14 +1229,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/service/UserService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="154">
<caret line="10" column="17" lean-forward="false" selection-start-line="10" selection-start-column="17" selection-end-line="10" selection-end-column="17" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/controller/LoginController.java"> <entry file="file://$PROJECT_DIR$/src/main/java/common/controller/LoginController.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="176"> <state relative-caret-position="176">
...@@ -1206,14 +1253,6 @@ ...@@ -1206,14 +1253,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/controller/UserController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="53">
<caret line="20" column="13" lean-forward="false" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pom.xml"> <entry file="file://$PROJECT_DIR$/pom.xml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-3916"> <state relative-caret-position="-3916">
...@@ -1265,14 +1304,6 @@ ...@@ -1265,14 +1304,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/AppInfoRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198">
<caret line="11" column="1" lean-forward="false" selection-start-line="11" selection-start-column="1" selection-end-line="11" selection-end-column="1" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/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">
...@@ -1283,14 +1314,6 @@ ...@@ -1283,14 +1314,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/service/AppService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="286">
<caret line="16" column="28" lean-forward="false" selection-start-line="16" selection-start-column="28" selection-end-line="16" selection-end-column="28" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/AppCategoryRepository.java"> <entry file="file://$PROJECT_DIR$/src/main/java/common/repository/AppCategoryRepository.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">
...@@ -1299,29 +1322,6 @@ ...@@ -1299,29 +1322,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/CityRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="220">
<caret line="14" column="29" lean-forward="false" selection-start-line="14" selection-start-column="29" selection-end-line="14" selection-end-column="29" />
<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="88">
<caret line="64" column="49" lean-forward="false" selection-start-line="64" selection-start-column="35" selection-end-line="64" selection-end-column="49" />
<folding>
<element signature="imports" expanded="false" />
<element signature="e#1323#1335#0" expanded="false" />
<element signature="e#1707#1708#0" expanded="false" />
<element signature="e#1778#1779#0" expanded="false" />
<element signature="e#1834#1835#0" expanded="false" />
<element signature="e#1883#1884#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/applicationContext-schedule.xml"> <entry file="file://$PROJECT_DIR$/src/main/resources/applicationContext-schedule.xml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="236"> <state relative-caret-position="236">
...@@ -1389,16 +1389,6 @@ ...@@ -1389,16 +1389,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/UserLogRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="176">
<caret line="8" column="17" lean-forward="false" selection-start-line="8" selection-start-column="17" selection-end-line="8" selection-end-column="17" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/util/IP.java"> <entry file="file://$PROJECT_DIR$/src/main/java/util/IP.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0"> <state relative-caret-position="0">
...@@ -1412,6 +1402,48 @@ ...@@ -1412,6 +1402,48 @@
<state relative-caret-position="286"> <state relative-caret-position="286">
<caret line="13" column="23" lean-forward="true" selection-start-line="13" selection-start-column="23" selection-end-line="13" selection-end-column="23" /> <caret line="13" column="23" lean-forward="true" selection-start-line="13" selection-start-column="23" selection-end-line="13" selection-end-column="23" />
<folding> <folding>
<element signature="imports" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/dic/OperateObjectTypeEnum.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="463">
<caret line="28" column="1" lean-forward="true" selection-start-line="28" selection-start-column="1" selection-end-line="28" selection-end-column="1" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/service/UserService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="154">
<caret line="10" column="17" lean-forward="false" selection-start-line="10" selection-start-column="17" selection-end-line="10" selection-end-column="17" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/service/AppService.java">
<provider selected="true" editor-type-id="text-editor">
<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" />
<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>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/util/UserLogThread.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="117">
<caret line="60" column="32" lean-forward="false" selection-start-line="60" selection-start-column="18" selection-end-line="60" selection-end-column="32" />
<folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
</folding> </folding>
</state> </state>
...@@ -1419,71 +1451,130 @@ ...@@ -1419,71 +1451,130 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/model/UserLog.java"> <entry file="file://$PROJECT_DIR$/src/main/java/common/model/UserLog.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-88"> <state relative-caret-position="117">
<caret line="107" column="5" lean-forward="false" selection-start-line="107" selection-start-column="5" selection-end-line="107" selection-end-column="5" /> <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="true" /> <element signature="imports" expanded="true" />
<element signature="e#552#553#0" expanded="true" /> <element signature="e#554#555#0" expanded="true" />
<element signature="e#577#578#0" expanded="true" /> <element signature="e#579#580#0" expanded="true" />
<element signature="e#615#616#0" expanded="true" /> <element signature="e#617#618#0" expanded="true" />
<element signature="e#643#644#0" expanded="true" /> <element signature="e#645#646#0" expanded="true" />
<element signature="e#683#684#0" expanded="true" /> <element signature="e#687#688#0" expanded="true" />
<element signature="e#717#718#0" expanded="true" /> <element signature="e#721#722#0" expanded="true" />
<element signature="e#773#774#0" expanded="true" /> <element signature="e#779#780#0" expanded="true" />
<element signature="e#819#820#0" expanded="true" /> <element signature="e#825#826#0" expanded="true" />
<element signature="e#862#863#0" expanded="true" /> <element signature="e#868#869#0" expanded="true" />
<element signature="e#897#898#0" expanded="true" /> <element signature="e#903#904#0" expanded="true" />
<element signature="e#957#958#0" expanded="true" /> <element signature="e#963#964#0" expanded="true" />
<element signature="e#1005#1006#0" expanded="true" /> <element signature="e#1011#1012#0" expanded="true" />
<element signature="e#1047#1048#0" expanded="true" /> <element signature="e#1053#1054#0" expanded="true" />
<element signature="e#1081#1082#0" expanded="true" /> <element signature="e#1087#1088#0" expanded="true" />
<element signature="e#1139#1140#0" expanded="true" /> <element signature="e#1145#1146#0" expanded="true" />
<element signature="e#1185#1186#0" expanded="true" /> <element signature="e#1191#1192#0" expanded="true" />
<element signature="e#1218#1219#0" expanded="true" /> <element signature="e#1224#1225#0" expanded="true" />
<element signature="e#1243#1244#0" expanded="true" /> <element signature="e#1249#1250#0" expanded="true" />
<element signature="e#1283#1284#0" expanded="true" /> <element signature="e#1289#1290#0" expanded="true" />
<element signature="e#1311#1312#0" expanded="true" /> <element signature="e#1317#1318#0" expanded="true" />
<element signature="e#1359#1360#0" expanded="true" /> <element signature="e#1365#1366#0" expanded="true" />
<element signature="e#1399#1400#0" expanded="true" /> <element signature="e#1405#1406#0" expanded="true" />
<element signature="e#1469#1470#0" expanded="true" /> <element signature="e#1475#1476#0" expanded="true" />
<element signature="e#1527#1528#0" expanded="true" /> <element signature="e#1533#1534#0" expanded="true" />
<element signature="e#1571#1572#0" expanded="true" /> <element signature="e#1577#1578#0" expanded="true" />
<element signature="e#1607#1608#0" expanded="true" /> <element signature="e#1613#1614#0" expanded="true" />
<element signature="e#1669#1670#0" expanded="true" /> <element signature="e#1675#1676#0" expanded="true" />
<element signature="e#1719#1720#0" expanded="true" /> <element signature="e#1725#1726#0" expanded="true" />
<element signature="e#1761#1762#0" expanded="true" /> <element signature="e#1767#1768#0" expanded="true" />
<element signature="e#1795#1796#0" expanded="true" /> <element signature="e#1801#1802#0" expanded="true" />
<element signature="e#1853#1854#0" expanded="true" /> <element signature="e#1859#1860#0" expanded="true" />
<element signature="e#1899#1900#0" expanded="true" /> <element signature="e#1905#1906#0" expanded="true" />
<element signature="e#1969#1970#0" expanded="true" /> <element signature="e#1944#1945#0" expanded="true" />
<element signature="e#2021#2022#0" expanded="true" /> <element signature="e#1975#1976#0" expanded="true" />
<element signature="e#2061#2062#0" expanded="true" /> <element signature="e#2027#2028#0" expanded="true" />
<element signature="e#2067#2068#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/controller/AppController.java"> <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/javax/persistence/hibernate-jpa-2.0-api/1.0.1.Final/hibernate-jpa-2.0-api-1.0.1.Final.jar!/javax/persistence/criteria/CriteriaBuilder.class">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="96"> <state relative-caret-position="128">
<caret line="37" column="19" lean-forward="false" selection-start-line="37" selection-start-column="19" selection-end-line="37" selection-end-column="19" /> <caret line="110" column="48" lean-forward="false" selection-start-line="110" selection-start-column="48" selection-end-line="110" selection-end-column="48" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/CityRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198">
<caret line="13" column="60" lean-forward="true" selection-start-line="13" selection-start-column="60" selection-end-line="13" selection-end-column="60" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/service/UserLogService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="177">
<caret line="13" column="29" lean-forward="false" selection-start-line="13" selection-start-column="18" selection-end-line="13" selection-end-column="29" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/dic/OperateObjectTypeEnum.java"> <entry file="file://$PROJECT_DIR$/src/main/java/common/service/impl/UserLogServiceImpl.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="463"> <state relative-caret-position="265">
<caret line="28" column="1" lean-forward="true" selection-start-line="28" selection-start-column="1" selection-end-line="28" selection-end-column="1" /> <caret line="31" column="50" lean-forward="false" selection-start-line="31" selection-start-column="33" selection-end-line="31" selection-end-column="50" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#870#871#0" expanded="true" />
<element signature="e#948#949#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/controller/UserController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="53">
<caret line="20" column="13" lean-forward="false" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
<folding /> <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/repository/AppInfoRepository.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="339"> <state relative-caret-position="198">
<caret line="34" column="17" lean-forward="false" selection-start-line="34" selection-start-column="17" selection-end-line="34" selection-end-column="17" /> <caret line="11" column="1" lean-forward="false" selection-start-line="11" selection-start-column="1" selection-end-line="11" selection-end-column="1" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/UserLogRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="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" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/controller/UserLogController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="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>
<entry file="file://$PROJECT_DIR$/src/main/java/common/controller/AppController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="119">
<caret line="37" column="19" lean-forward="false" selection-start-line="37" selection-start-column="19" selection-end-line="37" selection-end-column="19" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
</folding> </folding>
......
src/main/java/common/controller/UserLogController.java 0 → 100644
package common.controller;
import common.model.UserLog;
import common.service.UserLogService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import util.ResultModel;
import java.util.List;
/**
* Created by zxy on 2017/12/27.
*/
@Controller
@RequestMapping(value = "userlog")
public class UserLogController
{
@Autowired UserLogService userLogService;
///api/userlog/list?startDate=2017-12-26&endDate=2017-12-27
@RequestMapping(value = "list", method = RequestMethod.GET)
@ResponseBody
public ResultModel findByDS(@RequestParam String startDate, @RequestParam String endDate) {
return ResultModel.OK(userLogService.findUserLog(startDate, endDate));
}
}
src/main/java/common/model/UserLog.java
...@@ -13,7 +13,7 @@ import java.util.Date; ...@@ -13,7 +13,7 @@ import java.util.Date;
public class UserLog public class UserLog
{ {
private Long id; private Long id;
private Date operateTime; private String operateTime;
private String operaAccount; private String operaAccount;
private String accountName; private String accountName;
private String ip; private String ip;
...@@ -34,12 +34,12 @@ public class UserLog ...@@ -34,12 +34,12 @@ public class UserLog
this.id = id; this.id = id;
} }
public Date getOperateTime() public String getOperateTime()
{ {
return operateTime; return operateTime;
} }
public void setOperateTime(Date operateTime) public void setOperateTime(String operateTime)
{ {
this.operateTime = operateTime; this.operateTime = operateTime;
} }
......
src/main/java/common/repository/UserLogRepository.java
...@@ -2,10 +2,15 @@ package common.repository; ...@@ -2,10 +2,15 @@ package common.repository;
import common.model.UserLog; import common.model.UserLog;
import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import java.util.List;
/** /**
* Created by zxy on 2017/12/27. * Created by zxy on 2017/12/27.
*/ */
public interface UserLogRepository extends JpaRepository<UserLog, Long> public interface UserLogRepository extends JpaRepository<UserLog, Long>
{ {
@Query(value = "select * from user_log where substr(operate_time, 1, 10)>=?1 and substr(operate_time, 1, 10)<=?2", nativeQuery = true)
List<UserLog> findByOperateTime(String startDate, String endDate);
} }
src/main/java/common/service/UserLogService.java 0 → 100644
package common.service;
import common.model.UserLog;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import java.util.List;
/**
* Created by zxy on 2017/12/27.
*/
public interface UserLogService
{
List<UserLog> findUserLog(String startDate, String endDate);
}
src/main/java/common/service/impl/UserLogServiceImpl.java 0 → 100644
package common.service.impl;
import common.model.UserLog;
import common.repository.UserLogRepository;
import common.service.UserLogService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.data.jpa.domain.Specification;
import org.springframework.stereotype.Service;
import util.StringUtil;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
import java.util.ArrayList;
import java.util.List;
/**
* Created by zxy on 2017/12/27.
*/
@Service
public class UserLogServiceImpl implements UserLogService
{
@Autowired UserLogRepository userLogRepository;
@Override
public List<UserLog> findUserLog(String startDate, String endDate)
{
return userLogRepository.findByOperateTime(startDate, endDate);
}
}
src/main/java/util/UserLogThread.java
...@@ -3,15 +3,12 @@ package util; ...@@ -3,15 +3,12 @@ package util;
import common.context.AppUtils; import common.context.AppUtils;
import common.model.UserLog; import common.model.UserLog;
import common.repository.UserLogRepository; import common.repository.UserLogRepository;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.util.Date; import java.util.Date;
import java.util.List;
/** /**
* Created by zxy on 2017/12/15. * Created by zxy on 2017/12/15.
...@@ -61,7 +58,7 @@ public class UserLogThread ...@@ -61,7 +58,7 @@ public class UserLogThread
audit.setAccountName(this.accountName); audit.setAccountName(this.accountName);
audit.setOperateObjectType(this.operateObjectType); audit.setOperateObjectType(this.operateObjectType);
audit.setOperateObject(this.operateObject); audit.setOperateObject(this.operateObject);
audit.setOperateTime(new Date()); audit.setOperateTime(DateUtil.format(new Date(), DateUtil.C_TIME_PATTON_DEFAULT));
audit.setOperateType(this.operateType); audit.setOperateType(this.operateType);
if (this.request != null) { if (this.request != null) {
......
target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
...@@ -69,6 +69,7 @@ common\repository\UserRepository.class ...@@ -69,6 +69,7 @@ common\repository\UserRepository.class
util\ResultModel.class util\ResultModel.class
dic\RoleEnum.class dic\RoleEnum.class
util\CipherUtil.class util\CipherUtil.class
common\controller\UserLogController.class
tkio\model\App.class tkio\model\App.class
security\resolvers\LoginUserMethodArgumentsResolver.class security\resolvers\LoginUserMethodArgumentsResolver.class
tkio\service\TkioAccountService.class tkio\service\TkioAccountService.class
...@@ -82,12 +83,14 @@ common\controller\AppController.class ...@@ -82,12 +83,14 @@ common\controller\AppController.class
common\service\MenuService.class common\service\MenuService.class
common\repository\AppCategoryRepository.class common\repository\AppCategoryRepository.class
tkio\repository\AppRepository.class tkio\repository\AppRepository.class
common\service\impl\UserLogServiceImpl.class
dmp\repository\TagCrawlerAppsWandoujiaRepository.class dmp\repository\TagCrawlerAppsWandoujiaRepository.class
security\RedisLoginStatusManagerImpl.class security\RedisLoginStatusManagerImpl.class
tkio\model\AccountRestrict4Web.class tkio\model\AccountRestrict4Web.class
dic\OperateObjectTypeEnum.class dic\OperateObjectTypeEnum.class
common\service\UserService.class common\service\UserService.class
common\service\AppService.class common\service\AppService.class
common\service\UserLogService.class
tkio\service\impl\AccountFlowRestrictServiceImpl.class tkio\service\impl\AccountFlowRestrictServiceImpl.class
common\repository\CityRepository.class common\repository\CityRepository.class
common\model\Code.class common\model\Code.class
......
target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
...@@ -5,6 +5,7 @@ E:\IDEA_workspace\manager\src\main\java\common\repository\CodeRepository.java ...@@ -5,6 +5,7 @@ E:\IDEA_workspace\manager\src\main\java\common\repository\CodeRepository.java
E:\IDEA_workspace\manager\src\main\java\util\Constant.java E:\IDEA_workspace\manager\src\main\java\util\Constant.java
E:\IDEA_workspace\manager\src\main\java\common\controller\UserController.java E:\IDEA_workspace\manager\src\main\java\common\controller\UserController.java
E:\IDEA_workspace\manager\src\main\java\util\ResultStatus.java E:\IDEA_workspace\manager\src\main\java\util\ResultStatus.java
E:\IDEA_workspace\manager\src\main\java\common\service\impl\UserLogServiceImpl.java
E:\IDEA_workspace\manager\src\main\java\security\RedisLoginStatusManagerImpl.java E:\IDEA_workspace\manager\src\main\java\security\RedisLoginStatusManagerImpl.java
E:\IDEA_workspace\manager\src\main\java\tkio\service\AccountFlowRestrictService.java E:\IDEA_workspace\manager\src\main\java\tkio\service\AccountFlowRestrictService.java
E:\IDEA_workspace\manager\src\main\java\common\service\impl\UserServiceImpl.java E:\IDEA_workspace\manager\src\main\java\common\service\impl\UserServiceImpl.java
...@@ -29,6 +30,7 @@ E:\IDEA_workspace\manager\src\main\java\util\HttpClientUtil.java ...@@ -29,6 +30,7 @@ E:\IDEA_workspace\manager\src\main\java\util\HttpClientUtil.java
E:\IDEA_workspace\manager\src\main\java\util\UserLogThread.java E:\IDEA_workspace\manager\src\main\java\util\UserLogThread.java
E:\IDEA_workspace\manager\src\main\java\tkio\model\Auth.java E:\IDEA_workspace\manager\src\main\java\tkio\model\Auth.java
E:\IDEA_workspace\manager\src\main\java\dmp\model\TagCrawlerAppsWandoujia.java E:\IDEA_workspace\manager\src\main\java\dmp\model\TagCrawlerAppsWandoujia.java
E:\IDEA_workspace\manager\src\main\java\common\controller\UserLogController.java
E:\IDEA_workspace\manager\src\main\java\common\model\Code.java E:\IDEA_workspace\manager\src\main\java\common\model\Code.java
E:\IDEA_workspace\manager\src\main\java\exception\GlobalExceptionAdvice.java E:\IDEA_workspace\manager\src\main\java\exception\GlobalExceptionAdvice.java
E:\IDEA_workspace\manager\src\main\java\security\annotation\CurrentAccount.java E:\IDEA_workspace\manager\src\main\java\security\annotation\CurrentAccount.java
...@@ -60,6 +62,7 @@ E:\IDEA_workspace\manager\src\main\java\util\StringUtil.java ...@@ -60,6 +62,7 @@ E:\IDEA_workspace\manager\src\main\java\util\StringUtil.java
E:\IDEA_workspace\manager\src\main\java\security\cors\CorsFilter.java E:\IDEA_workspace\manager\src\main\java\security\cors\CorsFilter.java
E:\IDEA_workspace\manager\src\main\java\util\DateUtil.java E:\IDEA_workspace\manager\src\main\java\util\DateUtil.java
E:\IDEA_workspace\manager\src\main\java\common\controller\AppController.java E:\IDEA_workspace\manager\src\main\java\common\controller\AppController.java
E:\IDEA_workspace\manager\src\main\java\common\service\UserLogService.java
E:\IDEA_workspace\manager\src\main\java\common\model\Auth.java E:\IDEA_workspace\manager\src\main\java\common\model\Auth.java
E:\IDEA_workspace\manager\src\main\java\common\repository\UserLogRepository.java E:\IDEA_workspace\manager\src\main\java\common\repository\UserLogRepository.java
E:\IDEA_workspace\manager\src\main\java\security\resolvers\LoginUserMethodArgumentsResolver.java E:\IDEA_workspace\manager\src\main\java\security\resolvers\LoginUserMethodArgumentsResolver.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