Skip to content

M
manager
Commit e1809804 by zhangxiaoyan
Options

compile

parent f9e3e894
Showing with 9 additions and 43 deletions
.idea/workspace.xml
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<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="NEW" beforePath="" afterPath="$PROJECT_DIR$/.gitignore" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/common/model/Role.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/common/repository/RoleRepository.java" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/uiDesigner.xml" afterPath="" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/common/controller/LoginController.class" afterPath="$PROJECT_DIR$/target/classes/common/controller/LoginController.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/common/model/RoleType.class" afterPath="$PROJECT_DIR$/target/classes/common/model/RoleType.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/common/model/User.class" afterPath="$PROJECT_DIR$/target/classes/common/model/User.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/common/repository/AuthRepository.class" afterPath="$PROJECT_DIR$/target/classes/common/repository/AuthRepository.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/common/repository/RoleTypeRepository.class" afterPath="$PROJECT_DIR$/target/classes/common/repository/RoleTypeRepository.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/common/repository/UserRepository.class" afterPath="$PROJECT_DIR$/target/classes/common/repository/UserRepository.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$/.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$/manage.iml" afterPath="$PROJECT_DIR$/manage.iml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/common/controller/LoginController.java" afterPath="$PROJECT_DIR$/src/main/java/common/controller/LoginController.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/common/controller/UserController.java" afterPath="$PROJECT_DIR$/src/main/java/common/controller/UserController.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/common/model/RoleType.java" afterPath="$PROJECT_DIR$/src/main/java/common/model/RoleType.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/common/model/User.java" afterPath="$PROJECT_DIR$/src/main/java/common/model/User.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/common/repository/AuthRepository.java" afterPath="$PROJECT_DIR$/src/main/java/common/repository/AuthRepository.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/common/repository/RoleTypeRepository.java" afterPath="$PROJECT_DIR$/src/main/java/common/repository/RoleTypeRepository.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/common/repository/UserRepository.java" afterPath="$PROJECT_DIR$/src/main/java/common/repository/UserRepository.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/common/service/UserService.java" afterPath="$PROJECT_DIR$/src/main/java/common/service/UserService.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/common/service/impl/UserServiceImpl.java" afterPath="$PROJECT_DIR$/src/main/java/common/service/impl/UserServiceImpl.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/applicationContext-schedule.xml" afterPath="$PROJECT_DIR$/src/main/resources/applicationContext-schedule.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/applicationContext-schedule.xml" afterPath="$PROJECT_DIR$/target/classes/applicationContext-schedule.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/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" />
</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/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
...@@ -1021,16 +992,16 @@ ...@@ -1021,16 +992,16 @@
<updated>1514260912987</updated> <updated>1514260912987</updated>
<workItem from="1514260914510" duration="14315000" /> <workItem from="1514260914510" duration="14315000" />
<workItem from="1514344618155" duration="26138000" /> <workItem from="1514344618155" duration="26138000" />
<workItem from="1514532893566" duration="15926000" /> <workItem from="1514532893566" duration="15979000" />
</task> </task>
<option name="localTasksCounter" value="3" /> <option name="localTasksCounter" value="3" />
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="56379000" /> <option name="totallyTimeSpent" value="56432000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="-8" y="-8" width="1382" height="744" extended-state="7" /> <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
<editor active="false" /> <editor active="false" />
<layout> <layout>
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <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" />
...@@ -1051,12 +1022,12 @@ ...@@ -1051,12 +1022,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" />
<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="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" 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.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" />
<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="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="CheckStyle" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3289689" sideWeight="0.5" order="5" 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.3289689" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="true" 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="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" />
......
target/classes/applicationContext-schedule.xml
...@@ -12,11 +12,7 @@ ...@@ -12,11 +12,7 @@
<bean id="tkioAccountTask" class="tkio.task.AccountTask"></bean> <bean id="tkioAccountTask" class="tkio.task.AccountTask"></bean>
<task:scheduled-tasks> <task:scheduled-tasks>
<!--//定时同步短链数据(每5分钟执行一次)--> <!--//定时同步短链数据(每5分钟执行一次)-->
<<<<<<< HEAD
<task:scheduled ref="tkioAccountTask" method="task" cron="0 40 14 * * ?"/>
=======
<task:scheduled ref="tkioAccountTask" method="task" cron="0 11 17 * * ?"/> <task:scheduled ref="tkioAccountTask" method="task" cron="0 11 17 * * ?"/>
>>>>>>> 3003a6c49ac09d661bb616e5a363bb2109e68fb6
</task:scheduled-tasks> </task:scheduled-tasks>
<bean id="tkioNoticeTask" class="tkio.task.NoticeTask"></bean> <bean id="tkioNoticeTask" class="tkio.task.NoticeTask"></bean>
......
target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
...@@ -35,11 +35,8 @@ tkio\repository\IsNotifiedRepository.class ...@@ -35,11 +35,8 @@ 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
<<<<<<< HEAD
common\service\impl\OpenApiServiceImpl.class
=======
common\repository\RoleRepository.class common\repository\RoleRepository.class
>>>>>>> 3003a6c49ac09d661bb616e5a363bb2109e68fb6 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
......
target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
...@@ -2,6 +2,7 @@ E:\IDEA_workspace\manager\src\main\java\tkio\repository\SalesManLeaderRepository ...@@ -2,6 +2,7 @@ E:\IDEA_workspace\manager\src\main\java\tkio\repository\SalesManLeaderRepository
E:\IDEA_workspace\manager\src\main\java\tkio\service\TkioAccountService.java E:\IDEA_workspace\manager\src\main\java\tkio\service\TkioAccountService.java
E:\IDEA_workspace\manager\src\main\java\security\interceptor\AuthorizationInterceptor.java E:\IDEA_workspace\manager\src\main\java\security\interceptor\AuthorizationInterceptor.java
E:\IDEA_workspace\manager\src\main\java\common\repository\CodeRepository.java E:\IDEA_workspace\manager\src\main\java\common\repository\CodeRepository.java
E:\IDEA_workspace\manager\src\main\java\common\repository\RoleRepository.java
E:\IDEA_workspace\manager\src\main\java\track\repository\TrackAppRepository.java E:\IDEA_workspace\manager\src\main\java\track\repository\TrackAppRepository.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
...@@ -80,6 +81,7 @@ E:\IDEA_workspace\manager\src\main\java\common\service\MenuService.java ...@@ -80,6 +81,7 @@ 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\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\common\model\Role.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
......
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