|
@@ -1,10 +1,7 @@
|
|
|
<?xml version="1.0" encoding="UTF-8"?>
|
|
|
<project version="4">
|
|
|
<component name="ChangeListManager">
|
|
|
- <list default="true" id="645e93b8-0ad6-4d6f-a066-61732e27367b" name="Default" comment="">
|
|
|
- <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/SysUserServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/SysUserServiceImpl.java" afterDir="false" />
|
|
|
- </list>
|
|
|
+ <list default="true" id="645e93b8-0ad6-4d6f-a066-61732e27367b" name="Default" comment="" />
|
|
|
<ignored path="$PROJECT_DIR$/model/cloud-model/target/" />
|
|
|
<ignored path="$PROJECT_DIR$/model/target/" />
|
|
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
@@ -22,8 +19,8 @@
|
|
|
<file leaf-file-name="SysUserController.java" pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/controller/SysUserController.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="570">
|
|
|
- <caret line="29" column="17" selection-start-line="29" selection-start-column="17" selection-end-line="29" selection-end-column="17" />
|
|
|
+ <state relative-caret-position="270">
|
|
|
+ <caret line="35" column="19" lean-forward="true" selection-start-line="35" selection-start-column="19" selection-end-line="35" selection-end-column="19" />
|
|
|
<folding>
|
|
|
<element signature="imports" expanded="true" />
|
|
|
</folding>
|
|
@@ -34,8 +31,8 @@
|
|
|
<file leaf-file-name="SysUserService.java" pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/service/SysUserService.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="420">
|
|
|
- <caret line="19" column="21" selection-start-line="19" selection-start-column="16" selection-end-line="19" selection-end-column="21" />
|
|
|
+ <state relative-caret-position="300">
|
|
|
+ <caret line="17" column="23" selection-start-line="17" selection-start-column="23" selection-end-line="17" selection-end-column="23" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
@@ -43,8 +40,8 @@
|
|
|
<file leaf-file-name="SysUserServiceImpl.java" pinned="false" current-in-tab="true">
|
|
|
<entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/SysUserServiceImpl.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="219">
|
|
|
- <caret line="43" column="75" lean-forward="true" selection-start-line="43" selection-start-column="75" selection-end-line="43" selection-end-column="75" />
|
|
|
+ <state relative-caret-position="127">
|
|
|
+ <caret line="28" lean-forward="true" selection-start-line="28" selection-end-line="28" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
@@ -61,8 +58,8 @@
|
|
|
<file leaf-file-name="Constant.java" pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/constant/Constant.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="390">
|
|
|
- <caret line="13" column="47" selection-start-line="13" selection-start-column="47" selection-end-line="13" selection-end-column="47" />
|
|
|
+ <state relative-caret-position="270">
|
|
|
+ <caret line="9" column="54" selection-start-line="9" selection-start-column="43" selection-end-line="9" selection-end-column="54" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
@@ -138,9 +135,9 @@
|
|
|
<option value="$PROJECT_DIR$/model/pom.xml" />
|
|
|
<option value="$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/util/CodeGenerator.java" />
|
|
|
<option value="$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/constant/ConstantUtil.java" />
|
|
|
- <option value="$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/service/SysUserService.java" />
|
|
|
<option value="$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/controller/SysUserController.java" />
|
|
|
<option value="$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/constant/Constant.java" />
|
|
|
+ <option value="$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/service/SysUserService.java" />
|
|
|
<option value="$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/SysUserServiceImpl.java" />
|
|
|
</list>
|
|
|
</option>
|
|
@@ -442,7 +439,7 @@
|
|
|
<workItem from="1564043721591" duration="4169000" />
|
|
|
<workItem from="1564060637670" duration="152000" />
|
|
|
<workItem from="1564060843983" duration="5575000" />
|
|
|
- <workItem from="1564103473387" duration="587000" />
|
|
|
+ <workItem from="1564103473387" duration="1094000" />
|
|
|
</task>
|
|
|
<task id="LOCAL-00001" summary="云塑网前端代码">
|
|
|
<created>1563771143548</created>
|
|
@@ -486,11 +483,18 @@
|
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1564068028514</updated>
|
|
|
</task>
|
|
|
- <option name="localTasksCounter" value="7" />
|
|
|
+ <task id="LOCAL-00007" summary="系统管理员登录">
|
|
|
+ <created>1564104089216</created>
|
|
|
+ <option name="number" value="00007" />
|
|
|
+ <option name="presentableId" value="LOCAL-00007" />
|
|
|
+ <option name="project" value="LOCAL" />
|
|
|
+ <updated>1564104089216</updated>
|
|
|
+ </task>
|
|
|
+ <option name="localTasksCounter" value="8" />
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
- <option name="totallyTimeSpent" value="17066000" />
|
|
|
+ <option name="totallyTimeSpent" value="17573000" />
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
|
@@ -498,7 +502,7 @@
|
|
|
<layout>
|
|
|
<window_info anchor="right" id="Palette" order="3" />
|
|
|
<window_info anchor="bottom" id="FindBugs-IDEA" order="7" />
|
|
|
- <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.5010672" side_tool="true" weight="0.5863192" />
|
|
|
+ <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.50053364" side_tool="true" visible="true" weight="0.32899022" />
|
|
|
<window_info anchor="bottom" id="JRebel Console" order="7" side_tool="true" />
|
|
|
<window_info anchor="right" id="Maven Projects" order="3" visible="true" weight="0.1072572" />
|
|
|
<window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
|
|
@@ -511,11 +515,12 @@
|
|
|
<window_info id="UI Designer" order="2" />
|
|
|
<window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49893278" weight="0.4256243" />
|
|
|
<window_info anchor="bottom" id="TODO" order="6" />
|
|
|
+ <window_info active="true" anchor="bottom" id="Messages" order="7" sideWeight="0.4994664" visible="true" weight="0.32899022" />
|
|
|
<window_info anchor="right" id="Palette	" order="3" />
|
|
|
<window_info id="Image Layers" order="2" />
|
|
|
<window_info anchor="bottom" id="Java Enterprise" order="7" />
|
|
|
<window_info anchor="right" id="Capture Analysis" order="3" />
|
|
|
- <window_info active="true" anchor="bottom" id="Version Control" order="7" visible="true" weight="0.32899022" />
|
|
|
+ <window_info anchor="bottom" id="Version Control" order="7" sideWeight="0.49893278" weight="0.32899022" />
|
|
|
<window_info anchor="bottom" id="Run" order="2" sideWeight="0.4994664" weight="0.32899022" />
|
|
|
<window_info anchor="bottom" id="Spring" order="7" />
|
|
|
<window_info anchor="bottom" id="Terminal" order="7" />
|
|
@@ -529,7 +534,6 @@
|
|
|
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
|
|
|
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
|
|
|
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
|
|
|
- <window_info anchor="bottom" id="Messages" order="7" />
|
|
|
<window_info anchor="bottom" id="Find" order="1" />
|
|
|
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
|
|
|
<window_info anchor="bottom" id="Message" order="0" />
|
|
@@ -753,6 +757,9 @@
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="270">
|
|
|
<caret line="9" column="31" selection-start-line="9" selection-start-column="31" selection-end-line="9" selection-end-column="31" />
|
|
|
+ <folding>
|
|
|
+ <element signature="imports" expanded="true" />
|
|
|
+ </folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
@@ -851,41 +858,41 @@
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/constant/ConstantUtil.java" />
|
|
|
- <entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/service/SysUserService.java">
|
|
|
+ <entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/constant/Constant.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="420">
|
|
|
- <caret line="19" column="21" selection-start-line="19" selection-start-column="16" selection-end-line="19" selection-end-column="21" />
|
|
|
+ <state relative-caret-position="270">
|
|
|
+ <caret line="9" column="54" selection-start-line="9" selection-start-column="43" selection-end-line="9" selection-end-column="54" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/controller/SysUserController.java">
|
|
|
+ <entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-core/3.1.2/mybatis-plus-core-3.1.2.jar!/com/baomidou/mybatisplus/core/conditions/query/QueryWrapper.class">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="570">
|
|
|
- <caret line="29" column="17" selection-start-line="29" selection-start-column="17" selection-end-line="29" selection-end-column="17" />
|
|
|
- <folding>
|
|
|
- <element signature="imports" expanded="true" />
|
|
|
- </folding>
|
|
|
+ <state relative-caret-position="196">
|
|
|
+ <caret line="24" column="11" selection-start-line="24" selection-start-column="11" selection-end-line="24" selection-end-column="11" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/constant/Constant.java">
|
|
|
+ <entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/controller/SysUserController.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="390">
|
|
|
- <caret line="13" column="47" selection-start-line="13" selection-start-column="47" selection-end-line="13" selection-end-column="47" />
|
|
|
+ <state relative-caret-position="270">
|
|
|
+ <caret line="35" column="19" lean-forward="true" selection-start-line="35" selection-start-column="19" selection-end-line="35" selection-end-column="19" />
|
|
|
+ <folding>
|
|
|
+ <element signature="imports" expanded="true" />
|
|
|
+ </folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-core/3.1.2/mybatis-plus-core-3.1.2.jar!/com/baomidou/mybatisplus/core/conditions/query/QueryWrapper.class">
|
|
|
+ <entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/service/SysUserService.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="196">
|
|
|
- <caret line="24" column="11" selection-start-line="24" selection-start-column="11" selection-end-line="24" selection-end-column="11" />
|
|
|
+ <state relative-caret-position="300">
|
|
|
+ <caret line="17" column="23" selection-start-line="17" selection-start-column="23" selection-end-line="17" selection-end-column="23" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/SysUserServiceImpl.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="219">
|
|
|
- <caret line="43" column="75" lean-forward="true" selection-start-line="43" selection-start-column="75" selection-end-line="43" selection-end-column="75" />
|
|
|
+ <state relative-caret-position="127">
|
|
|
+ <caret line="28" lean-forward="true" selection-start-line="28" selection-end-line="28" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|