|
@@ -1,22 +1,9 @@
|
|
<?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="645e93b8-0ad6-4d6f-a066-61732e27367b" name="Default" comment="后台代码">
|
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_3.xml" afterDir="false" />
|
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_io_commons_io_2_2.xml" afterDir="false" />
|
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_net_commons_net_3_6.xml" afterDir="false" />
|
|
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_15.xml" afterDir="false" />
|
|
|
|
- <change afterPath="$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/constant/Constant.java" afterDir="false" />
|
|
|
|
- <change afterPath="$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/util/MD5Util.java" afterDir="false" />
|
|
|
|
- <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
|
|
|
|
|
|
+ <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$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
- <change beforePath="$PROJECT_DIR$/model/cloud-model/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/model/cloud-model/pom.xml" afterDir="false" />
|
|
|
|
- <change beforePath="$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/CloudModelApplication.java" beforeDir="false" afterPath="$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/CloudModelApplication.java" afterDir="false" />
|
|
|
|
- <change beforePath="$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/controller/SysUserController.java" beforeDir="false" afterPath="$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/controller/SysUserController.java" afterDir="false" />
|
|
|
|
- <change beforePath="$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/service/SysUserService.java" beforeDir="false" afterPath="$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/service/SysUserService.java" 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" />
|
|
<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" />
|
|
- <change beforePath="$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/util/CodeGenerator.java" beforeDir="false" afterPath="$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/util/CodeGenerator.java" afterDir="false" />
|
|
|
|
- <change beforePath="$PROJECT_DIR$/model/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/model/pom.xml" afterDir="false" />
|
|
|
|
</list>
|
|
</list>
|
|
<ignored path="$PROJECT_DIR$/model/cloud-model/target/" />
|
|
<ignored path="$PROJECT_DIR$/model/cloud-model/target/" />
|
|
<ignored path="$PROJECT_DIR$/model/target/" />
|
|
<ignored path="$PROJECT_DIR$/model/target/" />
|
|
@@ -35,8 +22,8 @@
|
|
<file leaf-file-name="SysUserController.java" pinned="false" current-in-tab="false">
|
|
<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">
|
|
<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">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="240">
|
|
|
|
- <caret line="29" column="17" lean-forward="true" selection-start-line="29" selection-start-column="17" selection-end-line="29" selection-end-column="17" />
|
|
|
|
|
|
+ <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>
|
|
<folding>
|
|
<element signature="imports" expanded="true" />
|
|
<element signature="imports" expanded="true" />
|
|
</folding>
|
|
</folding>
|
|
@@ -47,7 +34,7 @@
|
|
<file leaf-file-name="SysUserService.java" pinned="false" current-in-tab="false">
|
|
<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">
|
|
<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">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="360">
|
|
|
|
|
|
+ <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" />
|
|
<caret line="19" column="21" selection-start-line="19" selection-start-column="16" selection-end-line="19" selection-end-column="21" />
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
@@ -56,8 +43,17 @@
|
|
<file leaf-file-name="SysUserServiceImpl.java" pinned="false" current-in-tab="true">
|
|
<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">
|
|
<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">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="278">
|
|
|
|
- <caret line="39" column="68" selection-start-line="39" selection-start-column="68" selection-end-line="39" selection-end-column="68" />
|
|
|
|
|
|
+ <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>
|
|
|
|
+ </provider>
|
|
|
|
+ </entry>
|
|
|
|
+ </file>
|
|
|
|
+ <file leaf-file-name="QueryWrapper.class" pinned="false" current-in-tab="false">
|
|
|
|
+ <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="196">
|
|
|
|
+ <caret line="24" column="11" selection-start-line="24" selection-start-column="11" selection-end-line="24" selection-end-column="11" />
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
@@ -65,8 +61,8 @@
|
|
<file leaf-file-name="Constant.java" pinned="false" current-in-tab="false">
|
|
<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">
|
|
<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">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="360">
|
|
|
|
- <caret line="13" column="47" lean-forward="true" selection-start-line="13" selection-start-column="47" selection-end-line="13" selection-end-column="47" />
|
|
|
|
|
|
+ <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>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
@@ -74,7 +70,7 @@
|
|
<file leaf-file-name="CodeGenerator.java" pinned="false" current-in-tab="false">
|
|
<file leaf-file-name="CodeGenerator.java" pinned="false" current-in-tab="false">
|
|
<entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/util/CodeGenerator.java">
|
|
<entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/util/CodeGenerator.java">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="360">
|
|
|
|
|
|
+ <state relative-caret-position="5640">
|
|
<caret line="202" column="72" selection-start-line="202" selection-start-column="72" selection-end-line="202" selection-end-column="72" />
|
|
<caret line="202" column="72" selection-start-line="202" selection-start-column="72" selection-end-line="202" selection-end-column="72" />
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
@@ -83,7 +79,7 @@
|
|
<file leaf-file-name="StrategyConfig.java" pinned="false" current-in-tab="false">
|
|
<file leaf-file-name="StrategyConfig.java" pinned="false" current-in-tab="false">
|
|
<entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-generator/3.1.2/mybatis-plus-generator-3.1.2-sources.jar!/com/baomidou/mybatisplus/generator/config/StrategyConfig.java">
|
|
<entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-generator/3.1.2/mybatis-plus-generator-3.1.2-sources.jar!/com/baomidou/mybatisplus/generator/config/StrategyConfig.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="3030">
|
|
<caret line="128" column="37" selection-start-line="128" selection-start-column="20" selection-end-line="128" selection-end-column="37" />
|
|
<caret line="128" column="37" selection-start-line="128" selection-start-column="20" selection-end-line="128" selection-end-column="37" />
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
@@ -92,7 +88,7 @@
|
|
<file leaf-file-name="NamingStrategy.java" pinned="false" current-in-tab="false">
|
|
<file leaf-file-name="NamingStrategy.java" pinned="false" current-in-tab="false">
|
|
<entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-generator/3.1.2/mybatis-plus-generator-3.1.2-sources.jar!/com/baomidou/mybatisplus/generator/config/rules/NamingStrategy.java">
|
|
<entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-generator/3.1.2/mybatis-plus-generator-3.1.2-sources.jar!/com/baomidou/mybatisplus/generator/config/rules/NamingStrategy.java">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="226">
|
|
|
|
|
|
+ <state relative-caret-position="570">
|
|
<caret line="37" column="22" selection-start-line="37" selection-start-column="4" selection-end-line="37" selection-end-column="22" />
|
|
<caret line="37" column="22" selection-start-line="37" selection-start-column="4" selection-end-line="37" selection-end-column="22" />
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
@@ -101,8 +97,8 @@
|
|
<file leaf-file-name="GlobalConfig.java" pinned="false" current-in-tab="false">
|
|
<file leaf-file-name="GlobalConfig.java" pinned="false" current-in-tab="false">
|
|
<entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-generator/3.1.2/mybatis-plus-generator-3.1.2-sources.jar!/com/baomidou/mybatisplus/generator/config/GlobalConfig.java">
|
|
<entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-generator/3.1.2/mybatis-plus-generator-3.1.2-sources.jar!/com/baomidou/mybatisplus/generator/config/GlobalConfig.java">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="1102">
|
|
|
|
- <caret line="100" column="20" lean-forward="true" selection-start-line="100" selection-start-column="20" selection-end-line="100" selection-end-column="20" />
|
|
|
|
|
|
+ <state relative-caret-position="2460">
|
|
|
|
+ <caret line="100" column="20" selection-start-line="100" selection-start-column="20" selection-end-line="100" selection-end-column="20" />
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
@@ -110,21 +106,12 @@
|
|
<file leaf-file-name="DateType.java" pinned="false" current-in-tab="false">
|
|
<file leaf-file-name="DateType.java" pinned="false" current-in-tab="false">
|
|
<entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-generator/3.1.2/mybatis-plus-generator-3.1.2-sources.jar!/com/baomidou/mybatisplus/generator/config/rules/DateType.java">
|
|
<entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-generator/3.1.2/mybatis-plus-generator-3.1.2-sources.jar!/com/baomidou/mybatisplus/generator/config/rules/DateType.java">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="438">
|
|
|
|
|
|
+ <state relative-caret-position="660">
|
|
<caret line="36" column="4" selection-start-line="36" selection-start-column="4" selection-end-line="36" selection-end-column="4" />
|
|
<caret line="36" column="4" selection-start-line="36" selection-start-column="4" selection-end-line="36" selection-end-column="4" />
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
</file>
|
|
</file>
|
|
- <file leaf-file-name="DictionaryDataController.java" pinned="false" current-in-tab="false">
|
|
|
|
- <entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/controller/DictionaryDataController.java">
|
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
|
- <state relative-caret-position="210">
|
|
|
|
- <caret line="9" column="9" lean-forward="true" selection-start-line="9" selection-start-column="9" selection-end-line="9" selection-end-column="9" />
|
|
|
|
- </state>
|
|
|
|
- </provider>
|
|
|
|
- </entry>
|
|
|
|
- </file>
|
|
|
|
</leaf>
|
|
</leaf>
|
|
</component>
|
|
</component>
|
|
<component name="FileTemplateManagerImpl">
|
|
<component name="FileTemplateManagerImpl">
|
|
@@ -218,7 +205,6 @@
|
|
<foldersAlwaysOnTop value="true" />
|
|
<foldersAlwaysOnTop value="true" />
|
|
</navigator>
|
|
</navigator>
|
|
<panes>
|
|
<panes>
|
|
- <pane id="AndroidView" />
|
|
|
|
<pane id="ProjectPane">
|
|
<pane id="ProjectPane">
|
|
<subPane>
|
|
<subPane>
|
|
<expand>
|
|
<expand>
|
|
@@ -318,8 +304,9 @@
|
|
<select />
|
|
<select />
|
|
</subPane>
|
|
</subPane>
|
|
</pane>
|
|
</pane>
|
|
- <pane id="Scope" />
|
|
|
|
<pane id="PackagesPane" />
|
|
<pane id="PackagesPane" />
|
|
|
|
+ <pane id="Scope" />
|
|
|
|
+ <pane id="AndroidView" />
|
|
</panes>
|
|
</panes>
|
|
</component>
|
|
</component>
|
|
<component name="PropertiesComponent">
|
|
<component name="PropertiesComponent">
|
|
@@ -329,7 +316,7 @@
|
|
<property name="RequestMappingsPanelWidth1" value="75" />
|
|
<property name="RequestMappingsPanelWidth1" value="75" />
|
|
<property name="WebServerToolWindowFactoryState" value="false" />
|
|
<property name="WebServerToolWindowFactoryState" value="false" />
|
|
<property name="aspect.path.notification.shown" value="true" />
|
|
<property name="aspect.path.notification.shown" value="true" />
|
|
- <property name="last_opened_file_path" value="D:/cloudcard2" />
|
|
|
|
|
|
+ <property name="last_opened_file_path" value="$PROJECT_DIR$" />
|
|
<property name="settings.editor.selected.configurable" value="reference.projectsettings.compiler.annotationProcessors" />
|
|
<property name="settings.editor.selected.configurable" value="reference.projectsettings.compiler.annotationProcessors" />
|
|
</component>
|
|
</component>
|
|
<component name="RecentsManager">
|
|
<component name="RecentsManager">
|
|
@@ -454,7 +441,8 @@
|
|
<workItem from="1564024527494" duration="2727000" />
|
|
<workItem from="1564024527494" duration="2727000" />
|
|
<workItem from="1564043721591" duration="4169000" />
|
|
<workItem from="1564043721591" duration="4169000" />
|
|
<workItem from="1564060637670" duration="152000" />
|
|
<workItem from="1564060637670" duration="152000" />
|
|
- <workItem from="1564060843983" duration="5509000" />
|
|
|
|
|
|
+ <workItem from="1564060843983" duration="5575000" />
|
|
|
|
+ <workItem from="1564103473387" duration="587000" />
|
|
</task>
|
|
</task>
|
|
<task id="LOCAL-00001" summary="云塑网前端代码">
|
|
<task id="LOCAL-00001" summary="云塑网前端代码">
|
|
<created>1563771143548</created>
|
|
<created>1563771143548</created>
|
|
@@ -491,11 +479,18 @@
|
|
<option name="project" value="LOCAL" />
|
|
<option name="project" value="LOCAL" />
|
|
<updated>1564044412804</updated>
|
|
<updated>1564044412804</updated>
|
|
</task>
|
|
</task>
|
|
- <option name="localTasksCounter" value="6" />
|
|
|
|
|
|
+ <task id="LOCAL-00006" summary="系统管理员登录">
|
|
|
|
+ <created>1564068028514</created>
|
|
|
|
+ <option name="number" value="00006" />
|
|
|
|
+ <option name="presentableId" value="LOCAL-00006" />
|
|
|
|
+ <option name="project" value="LOCAL" />
|
|
|
|
+ <updated>1564068028514</updated>
|
|
|
|
+ </task>
|
|
|
|
+ <option name="localTasksCounter" value="7" />
|
|
<servers />
|
|
<servers />
|
|
</component>
|
|
</component>
|
|
<component name="TimeTrackingManager">
|
|
<component name="TimeTrackingManager">
|
|
- <option name="totallyTimeSpent" value="16413000" />
|
|
|
|
|
|
+ <option name="totallyTimeSpent" value="17066000" />
|
|
</component>
|
|
</component>
|
|
<component name="ToolWindowManager">
|
|
<component name="ToolWindowManager">
|
|
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
|
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
|
@@ -505,7 +500,7 @@
|
|
<window_info anchor="bottom" id="FindBugs-IDEA" order="7" />
|
|
<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.5010672" side_tool="true" weight="0.5863192" />
|
|
<window_info anchor="bottom" id="JRebel Console" order="7" side_tool="true" />
|
|
<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.2230523" />
|
|
|
|
|
|
+ <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" />
|
|
<window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
|
|
<window_info anchor="bottom" id="JRebel Executor" order="7" />
|
|
<window_info anchor="bottom" id="JRebel Executor" order="7" />
|
|
<window_info id="Capture Tool" order="2" />
|
|
<window_info id="Capture Tool" order="2" />
|
|
@@ -516,28 +511,28 @@
|
|
<window_info id="UI Designer" order="2" />
|
|
<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="Debug" order="3" sideWeight="0.49893278" weight="0.4256243" />
|
|
<window_info anchor="bottom" id="TODO" order="6" />
|
|
<window_info anchor="bottom" id="TODO" order="6" />
|
|
- <window_info anchor="bottom" id="Messages" order="7" />
|
|
|
|
<window_info anchor="right" id="Palette	" order="3" />
|
|
<window_info anchor="right" id="Palette	" order="3" />
|
|
<window_info id="Image Layers" order="2" />
|
|
<window_info id="Image Layers" order="2" />
|
|
<window_info anchor="bottom" id="Java Enterprise" order="7" />
|
|
<window_info anchor="bottom" id="Java Enterprise" order="7" />
|
|
<window_info anchor="right" id="Capture Analysis" order="3" />
|
|
<window_info anchor="right" id="Capture Analysis" order="3" />
|
|
- <window_info anchor="bottom" id="Version Control" order="7" weight="0.32899022" />
|
|
|
|
- <window_info anchor="bottom" id="Run" order="2" sideWeight="0.4994664" visible="true" weight="0.32899022" />
|
|
|
|
|
|
+ <window_info active="true" anchor="bottom" id="Version Control" order="7" visible="true" 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="Spring" order="7" />
|
|
<window_info anchor="bottom" id="Terminal" order="7" />
|
|
<window_info anchor="bottom" id="Terminal" order="7" />
|
|
- <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.28815368" />
|
|
|
|
- <window_info anchor="bottom" id="Problems" />
|
|
|
|
|
|
+ <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.2913554" />
|
|
|
|
+ <window_info anchor="bottom" id="Problems" order="8" />
|
|
<window_info anchor="right" id="Bean Validation" order="4" />
|
|
<window_info anchor="right" id="Bean Validation" order="4" />
|
|
<window_info id="Web" order="2" side_tool="true" />
|
|
<window_info id="Web" order="2" side_tool="true" />
|
|
<window_info id="JRebel" order="2" side_tool="true" />
|
|
<window_info id="JRebel" order="2" side_tool="true" />
|
|
- <window_info anchor="bottom" id="Find" order="1" />
|
|
|
|
<window_info anchor="right" id="Theme Preview" order="3" />
|
|
<window_info anchor="right" id="Theme Preview" order="3" />
|
|
<window_info id="Favorites" order="2" side_tool="true" />
|
|
<window_info id="Favorites" order="2" side_tool="true" />
|
|
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
|
|
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
|
|
- <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
|
|
|
|
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
|
|
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
|
|
- <window_info anchor="bottom" id="Message" order="0" />
|
|
|
|
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" 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" />
|
|
</layout>
|
|
</layout>
|
|
</component>
|
|
</component>
|
|
<component name="TypeScriptGeneratedFilesManager">
|
|
<component name="TypeScriptGeneratedFilesManager">
|
|
@@ -549,9 +544,83 @@
|
|
<component name="VcsManagerConfiguration">
|
|
<component name="VcsManagerConfiguration">
|
|
<MESSAGE value="云塑网前端代码" />
|
|
<MESSAGE value="云塑网前端代码" />
|
|
<MESSAGE value="后台代码" />
|
|
<MESSAGE value="后台代码" />
|
|
- <option name="LAST_COMMIT_MESSAGE" value="后台代码" />
|
|
|
|
|
|
+ <MESSAGE value="系统管理员登录" />
|
|
|
|
+ <option name="LAST_COMMIT_MESSAGE" value="系统管理员登录" />
|
|
</component>
|
|
</component>
|
|
<component name="editorHistoryManager">
|
|
<component name="editorHistoryManager">
|
|
|
|
+ <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" lean-forward="true" selection-start-line="29" selection-start-column="17" selection-end-line="29" selection-end-column="17" />
|
|
|
|
+ <folding>
|
|
|
|
+ <element signature="imports" expanded="true" />
|
|
|
|
+ </folding>
|
|
|
|
+ </state>
|
|
|
|
+ </provider>
|
|
|
|
+ </entry>
|
|
|
|
+ <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>
|
|
|
|
+ </provider>
|
|
|
|
+ </entry>
|
|
|
|
+ <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" lean-forward="true" selection-start-line="13" selection-start-column="47" selection-end-line="13" selection-end-column="47" />
|
|
|
|
+ </state>
|
|
|
|
+ </provider>
|
|
|
|
+ </entry>
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/util/CodeGenerator.java">
|
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
|
+ <state relative-caret-position="5640">
|
|
|
|
+ <caret line="202" column="72" selection-start-line="202" selection-start-column="72" selection-end-line="202" selection-end-column="72" />
|
|
|
|
+ </state>
|
|
|
|
+ </provider>
|
|
|
|
+ </entry>
|
|
|
|
+ <entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-generator/3.1.2/mybatis-plus-generator-3.1.2-sources.jar!/com/baomidou/mybatisplus/generator/config/StrategyConfig.java">
|
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
|
+ <state relative-caret-position="3840">
|
|
|
|
+ <caret line="128" column="37" selection-start-line="128" selection-start-column="20" selection-end-line="128" selection-end-column="37" />
|
|
|
|
+ </state>
|
|
|
|
+ </provider>
|
|
|
|
+ </entry>
|
|
|
|
+ <entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-generator/3.1.2/mybatis-plus-generator-3.1.2-sources.jar!/com/baomidou/mybatisplus/generator/config/rules/NamingStrategy.java">
|
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
|
+ <state relative-caret-position="570">
|
|
|
|
+ <caret line="37" column="22" selection-start-line="37" selection-start-column="4" selection-end-line="37" selection-end-column="22" />
|
|
|
|
+ </state>
|
|
|
|
+ </provider>
|
|
|
|
+ </entry>
|
|
|
|
+ <entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-generator/3.1.2/mybatis-plus-generator-3.1.2-sources.jar!/com/baomidou/mybatisplus/generator/config/GlobalConfig.java">
|
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
|
+ <state relative-caret-position="2460">
|
|
|
|
+ <caret line="100" column="20" lean-forward="true" selection-start-line="100" selection-start-column="20" selection-end-line="100" selection-end-column="20" />
|
|
|
|
+ </state>
|
|
|
|
+ </provider>
|
|
|
|
+ </entry>
|
|
|
|
+ <entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-generator/3.1.2/mybatis-plus-generator-3.1.2-sources.jar!/com/baomidou/mybatisplus/generator/config/rules/DateType.java">
|
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
|
+ <state relative-caret-position="660">
|
|
|
|
+ <caret line="36" column="4" selection-start-line="36" selection-start-column="4" selection-end-line="36" selection-end-column="4" />
|
|
|
|
+ </state>
|
|
|
|
+ </provider>
|
|
|
|
+ </entry>
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/controller/DictionaryDataController.java">
|
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
|
+ <state relative-caret-position="210">
|
|
|
|
+ <caret line="9" column="9" lean-forward="true" selection-start-line="9" selection-start-column="9" selection-end-line="9" selection-end-column="9" />
|
|
|
|
+ </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="840">
|
|
|
|
+ <caret line="39" column="68" selection-start-line="39" selection-start-column="68" selection-end-line="39" selection-end-column="68" />
|
|
|
|
+ </state>
|
|
|
|
+ </provider>
|
|
|
|
+ </entry>
|
|
<entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/controller/SysUserController.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">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="690">
|
|
<state relative-caret-position="690">
|
|
@@ -684,9 +753,6 @@
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="270">
|
|
<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" />
|
|
<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>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
@@ -745,63 +811,57 @@
|
|
<entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/controller/DictionaryDataController.java">
|
|
<entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/controller/DictionaryDataController.java">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="210">
|
|
<state relative-caret-position="210">
|
|
- <caret line="9" column="9" lean-forward="true" selection-start-line="9" selection-start-column="9" selection-end-line="9" selection-end-column="9" />
|
|
|
|
|
|
+ <caret line="9" column="9" selection-start-line="9" selection-start-column="9" selection-end-line="9" selection-end-column="9" />
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
<entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-generator/3.1.2/mybatis-plus-generator-3.1.2-sources.jar!/com/baomidou/mybatisplus/generator/config/rules/DateType.java">
|
|
<entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-generator/3.1.2/mybatis-plus-generator-3.1.2-sources.jar!/com/baomidou/mybatisplus/generator/config/rules/DateType.java">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="438">
|
|
|
|
|
|
+ <state relative-caret-position="660">
|
|
<caret line="36" column="4" selection-start-line="36" selection-start-column="4" selection-end-line="36" selection-end-column="4" />
|
|
<caret line="36" column="4" selection-start-line="36" selection-start-column="4" selection-end-line="36" selection-end-column="4" />
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
<entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-generator/3.1.2/mybatis-plus-generator-3.1.2-sources.jar!/com/baomidou/mybatisplus/generator/config/GlobalConfig.java">
|
|
<entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-generator/3.1.2/mybatis-plus-generator-3.1.2-sources.jar!/com/baomidou/mybatisplus/generator/config/GlobalConfig.java">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="1102">
|
|
|
|
- <caret line="100" column="20" lean-forward="true" selection-start-line="100" selection-start-column="20" selection-end-line="100" selection-end-column="20" />
|
|
|
|
|
|
+ <state relative-caret-position="2460">
|
|
|
|
+ <caret line="100" column="20" selection-start-line="100" selection-start-column="20" selection-end-line="100" selection-end-column="20" />
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
<entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/util/CodeGenerator.java">
|
|
<entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/util/CodeGenerator.java">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="360">
|
|
|
|
|
|
+ <state relative-caret-position="5640">
|
|
<caret line="202" column="72" selection-start-line="202" selection-start-column="72" selection-end-line="202" selection-end-column="72" />
|
|
<caret line="202" column="72" selection-start-line="202" selection-start-column="72" selection-end-line="202" selection-end-column="72" />
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
<entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-generator/3.1.2/mybatis-plus-generator-3.1.2-sources.jar!/com/baomidou/mybatisplus/generator/config/rules/NamingStrategy.java">
|
|
<entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-generator/3.1.2/mybatis-plus-generator-3.1.2-sources.jar!/com/baomidou/mybatisplus/generator/config/rules/NamingStrategy.java">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="226">
|
|
|
|
|
|
+ <state relative-caret-position="570">
|
|
<caret line="37" column="22" selection-start-line="37" selection-start-column="4" selection-end-line="37" selection-end-column="22" />
|
|
<caret line="37" column="22" selection-start-line="37" selection-start-column="4" selection-end-line="37" selection-end-column="22" />
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
<entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-generator/3.1.2/mybatis-plus-generator-3.1.2-sources.jar!/com/baomidou/mybatisplus/generator/config/StrategyConfig.java">
|
|
<entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-generator/3.1.2/mybatis-plus-generator-3.1.2-sources.jar!/com/baomidou/mybatisplus/generator/config/StrategyConfig.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="3030">
|
|
<caret line="128" column="37" selection-start-line="128" selection-start-column="20" selection-end-line="128" selection-end-column="37" />
|
|
<caret line="128" column="37" selection-start-line="128" selection-start-column="20" selection-end-line="128" selection-end-column="37" />
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
- <entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/constant/ConstantUtil.java">
|
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
|
- <state relative-caret-position="240">
|
|
|
|
- <caret line="8" column="13" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" />
|
|
|
|
- </state>
|
|
|
|
- </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/service/SysUserService.java">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="360">
|
|
|
|
|
|
+ <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" />
|
|
<caret line="19" column="21" selection-start-line="19" selection-start-column="16" selection-end-line="19" selection-end-column="21" />
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
<entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/controller/SysUserController.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">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="240">
|
|
|
|
- <caret line="29" column="17" lean-forward="true" selection-start-line="29" selection-start-column="17" selection-end-line="29" selection-end-column="17" />
|
|
|
|
|
|
+ <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>
|
|
<folding>
|
|
<element signature="imports" expanded="true" />
|
|
<element signature="imports" expanded="true" />
|
|
</folding>
|
|
</folding>
|
|
@@ -810,15 +870,22 @@
|
|
</entry>
|
|
</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/constant/Constant.java">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="360">
|
|
|
|
- <caret line="13" column="47" lean-forward="true" selection-start-line="13" selection-start-column="47" selection-end-line="13" selection-end-column="47" />
|
|
|
|
|
|
+ <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>
|
|
|
|
+ </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">
|
|
|
|
+ <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>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
<entry file="file://$PROJECT_DIR$/model/cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/SysUserServiceImpl.java">
|
|
<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">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="278">
|
|
|
|
- <caret line="39" column="68" selection-start-line="39" selection-start-column="68" selection-end-line="39" selection-end-column="68" />
|
|
|
|
|
|
+ <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>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|