|
|
@@ -2,8 +2,8 @@
|
|
|
<project version="4">
|
|
|
<component name="ChangeListManager">
|
|
|
<list default="true" id="33456f28-da03-4d10-99dd-fd9bd193cf84" name="Default Changelist" comment="">
|
|
|
- <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/src/main/resources/application-dev.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application-dev.yml" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/src/main/java/com/template/common/exception/EmsExceptionHandler.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/common/exception/EmsExceptionHandler.java" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/LoginController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/LoginController.java" afterDir="false" />
|
|
|
</list>
|
|
|
<ignored path="$PROJECT_DIR$/out/" />
|
|
|
<ignored path="$PROJECT_DIR$/target/" />
|
|
|
@@ -19,46 +19,40 @@
|
|
|
<component name="FileEditorManager">
|
|
|
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
|
|
<file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/resources/application.yml">
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/template/common/exception/EmsExceptionHandler.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="46">
|
|
|
- <caret line="2" column="2" selection-start-line="2" selection-start-column="2" selection-end-line="3" selection-end-column="27" />
|
|
|
+ <state relative-caret-position="253">
|
|
|
+ <caret line="39" column="70" selection-start-line="39" selection-start-column="70" selection-end-line="39" selection-end-column="70" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/resources/application-dev.yml">
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/template/MybatisPlusApplication.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="23">
|
|
|
- <caret line="4" selection-start-line="4" selection-end-line="4" />
|
|
|
+ <state relative-caret-position="161">
|
|
|
+ <caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file pinned="false" current-in-tab="true">
|
|
|
- <entry file="file://$PROJECT_DIR$/pom.xml">
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/LoginController.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="230">
|
|
|
- <caret line="10" column="25" selection-start-line="10" selection-start-column="17" selection-end-line="10" selection-end-column="25" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- <file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/resources/application-prod.yml">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="92">
|
|
|
- <caret line="4" selection-start-line="4" selection-end-line="4" />
|
|
|
+ <state relative-caret-position="274">
|
|
|
+ <caret line="42" column="45" selection-start-line="42" selection-start-column="45" selection-end-line="42" selection-end-column="45" />
|
|
|
+ <folding>
|
|
|
+ <element signature="imports" expanded="true" />
|
|
|
+ </folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/template/common/result/ResponseStatusEnum.java">
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/template/common/exception/EmsException.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="299">
|
|
|
- <caret line="13" column="17" selection-start-line="11" selection-start-column="4" selection-end-line="13" selection-end-column="17" />
|
|
|
+ <state relative-caret-position="161">
|
|
|
+ <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
@@ -182,18 +176,18 @@
|
|
|
<option value="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmsCodeServiceImpl.java" />
|
|
|
<option value="$PROJECT_DIR$/src/main/java/common/utils/paramUtils.java" />
|
|
|
<option value="$PROJECT_DIR$/src/main/java/com/template/model/pojo/RepairAdmin.java" />
|
|
|
- <option value="$PROJECT_DIR$/src/main/java/com/template/controller/LoginController.java" />
|
|
|
<option value="$PROJECT_DIR$/src/main/java/common/result/ResponseStatusEnum.java" />
|
|
|
<option value="$PROJECT_DIR$/src/main/java/com/template/core/JwtAuthenticationInterceptor.java" />
|
|
|
<option value="$PROJECT_DIR$/src/main/java/com/template/AutoCode.java" />
|
|
|
<option value="$PROJECT_DIR$/src/main/java/com/template/handler/MyMetaObjectHandler.java" />
|
|
|
<option value="$PROJECT_DIR$/src/main/java/com/template/common/result/Code.java" />
|
|
|
<option value="$PROJECT_DIR$/src/main/java/com/template/model/vo/SystemMenuTreeVo.java" />
|
|
|
- <option value="$PROJECT_DIR$/src/main/java/com/template/common/exception/EmsExceptionHandler.java" />
|
|
|
<option value="$PROJECT_DIR$/src/main/resources/application.yml" />
|
|
|
<option value="$PROJECT_DIR$/src/main/resources/application-prod.yml" />
|
|
|
<option value="$PROJECT_DIR$/src/main/resources/application-dev.yml" />
|
|
|
<option value="$PROJECT_DIR$/pom.xml" />
|
|
|
+ <option value="$PROJECT_DIR$/src/main/java/com/template/common/exception/EmsExceptionHandler.java" />
|
|
|
+ <option value="$PROJECT_DIR$/src/main/java/com/template/controller/LoginController.java" />
|
|
|
</list>
|
|
|
</option>
|
|
|
</component>
|
|
|
@@ -235,6 +229,7 @@
|
|
|
<foldersAlwaysOnTop value="true" />
|
|
|
</navigator>
|
|
|
<panes>
|
|
|
+ <pane id="Scope" />
|
|
|
<pane id="ProjectPane">
|
|
|
<subPane>
|
|
|
<expand>
|
|
|
@@ -437,18 +432,18 @@
|
|
|
<select />
|
|
|
</subPane>
|
|
|
</pane>
|
|
|
- <pane id="Scope" />
|
|
|
<pane id="PackagesPane" />
|
|
|
</panes>
|
|
|
</component>
|
|
|
<component name="PropertiesComponent">
|
|
|
+ <property name="ExpandSpringBootJavaOptionsPanel" value="true" />
|
|
|
<property name="RequestMappingsPanelOrder0" value="0" />
|
|
|
<property name="RequestMappingsPanelOrder1" value="1" />
|
|
|
<property name="RequestMappingsPanelWidth0" value="75" />
|
|
|
<property name="RequestMappingsPanelWidth1" value="75" />
|
|
|
<property name="WebServerToolWindowFactoryState" value="false" />
|
|
|
<property name="aspect.path.notification.shown" value="true" />
|
|
|
- <property name="last_opened_file_path" value="$PROJECT_DIR$/../../报修系统/BackRepairSystem" />
|
|
|
+ <property name="last_opened_file_path" value="$PROJECT_DIR$" />
|
|
|
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
|
|
|
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
|
|
|
<property name="settings.editor.selected.configurable" value="File.Encoding" />
|
|
|
@@ -483,7 +478,7 @@
|
|
|
</option>
|
|
|
</component>
|
|
|
<component name="RunManager" selected="Spring Boot.MybatisPlusApplication">
|
|
|
- <configuration name="AutoCode" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
|
|
|
+ <configuration name="AutoCode" type="Application" factoryName="Application" nameIsGenerated="true">
|
|
|
<option name="MAIN_CLASS_NAME" value="com.template.AutoCode" />
|
|
|
<module name="template_code" />
|
|
|
<extension name="coverage">
|
|
|
@@ -497,17 +492,17 @@
|
|
|
</method>
|
|
|
</configuration>
|
|
|
<configuration name="MybatisPlusApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
|
|
|
- <module name="template_code" />
|
|
|
+ <module name="Back-endDevelopmentFramework" />
|
|
|
<option name="SPRING_BOOT_MAIN_CLASS" value="com.template.MybatisPlusApplication" />
|
|
|
+ <option name="ALTERNATIVE_JRE_PATH" />
|
|
|
<method v="2">
|
|
|
<option name="Make" enabled="true" />
|
|
|
</method>
|
|
|
</configuration>
|
|
|
- <recent_temporary>
|
|
|
- <list>
|
|
|
- <item itemvalue="Application.AutoCode" />
|
|
|
- </list>
|
|
|
- </recent_temporary>
|
|
|
+ <list>
|
|
|
+ <item itemvalue="Application.AutoCode" />
|
|
|
+ <item itemvalue="Spring Boot.MybatisPlusApplication" />
|
|
|
+ </list>
|
|
|
</component>
|
|
|
<component name="SvnConfiguration">
|
|
|
<configuration />
|
|
|
@@ -525,12 +520,13 @@
|
|
|
<workItem from="1688609508818" duration="438000" />
|
|
|
<workItem from="1688609969175" duration="58000" />
|
|
|
<workItem from="1688610441881" duration="151000" />
|
|
|
- <workItem from="1688610829222" duration="96000" />
|
|
|
+ <workItem from="1688610829222" duration="217000" />
|
|
|
+ <workItem from="1688611334908" duration="135000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
- <option name="totallyTimeSpent" value="29356000" />
|
|
|
+ <option name="totallyTimeSpent" value="29612000" />
|
|
|
</component>
|
|
|
<component name="TodoView">
|
|
|
<todo-panel id="selected-file">
|
|
|
@@ -542,10 +538,10 @@
|
|
|
</todo-panel>
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
- <frame x="953" y="0" width="974" height="1039" extended-state="0" />
|
|
|
+ <frame x="-8" y="-8" width="1936" height="1048" extended-state="6" />
|
|
|
<editor active="true" />
|
|
|
<layout>
|
|
|
- <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.4354486" />
|
|
|
+ <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.21428572" />
|
|
|
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
|
|
|
<window_info id="Designer" order="2" />
|
|
|
<window_info id="JRebel" order="3" side_tool="true" />
|
|
|
@@ -556,7 +552,7 @@
|
|
|
<window_info id="Web" order="8" side_tool="true" />
|
|
|
<window_info anchor="bottom" id="Message" order="0" />
|
|
|
<window_info anchor="bottom" id="Find" order="1" weight="0.32932165" />
|
|
|
- <window_info anchor="bottom" id="Run" order="2" weight="0.49723756" />
|
|
|
+ <window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.49234137" />
|
|
|
<window_info anchor="bottom" id="Debug" order="3" weight="0.44310722" />
|
|
|
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
|
|
|
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
|
|
|
@@ -574,7 +570,7 @@
|
|
|
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
|
|
|
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
|
|
|
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
|
|
|
- <window_info anchor="right" id="Maven" order="3" weight="0.5822368" />
|
|
|
+ <window_info anchor="right" id="Maven" order="3" weight="0.55032825" />
|
|
|
<window_info anchor="right" id="Palette" order="4" />
|
|
|
<window_info anchor="right" id="Capture Analysis" order="5" />
|
|
|
<window_info anchor="right" id="Database" order="6" />
|
|
|
@@ -631,13 +627,13 @@
|
|
|
<breakpoints>
|
|
|
<line-breakpoint enabled="true" type="java-line">
|
|
|
<url>file://$PROJECT_DIR$/src/main/java/com/template/controller/LoginController.java</url>
|
|
|
- <line>41</line>
|
|
|
+ <line>43</line>
|
|
|
<properties />
|
|
|
<option name="timeStamp" value="16" />
|
|
|
</line-breakpoint>
|
|
|
<line-breakpoint enabled="true" type="java-line">
|
|
|
<url>file://$PROJECT_DIR$/src/main/java/com/template/controller/LoginController.java</url>
|
|
|
- <line>54</line>
|
|
|
+ <line>56</line>
|
|
|
<properties />
|
|
|
<option name="timeStamp" value="17" />
|
|
|
</line-breakpoint>
|
|
|
@@ -649,13 +645,6 @@
|
|
|
<option name="FILTER_TARGETS" value="false" />
|
|
|
</component>
|
|
|
<component name="editorHistoryManager">
|
|
|
- <entry file="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis/3.4.6/mybatis-3.4.6-sources.jar!/org/apache/ibatis/session/Configuration.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="596">
|
|
|
- <caret line="559" selection-start-line="559" selection-end-line="559" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/template/config/MyBatisPlusConfig.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="236">
|
|
|
@@ -736,13 +725,6 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/template/common/exception/EmsException.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="161">
|
|
|
- <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/impl/SmsCodeServiceImpl.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="654">
|
|
|
@@ -822,16 +804,6 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/LoginController.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="884">
|
|
|
- <caret line="101" column="42" selection-start-line="101" selection-start-column="35" selection-end-line="101" selection-end-column="42" />
|
|
|
- <folding>
|
|
|
- <element signature="imports" expanded="true" />
|
|
|
- </folding>
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/template/common/utils/ValidateCode.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="115">
|
|
|
@@ -954,13 +926,6 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/template/common/exception/EmsExceptionHandler.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="483">
|
|
|
- <caret line="40" column="5" selection-start-line="40" selection-start-column="5" selection-end-line="40" selection-end-column="5" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/src/main/resources/application.yml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="46">
|
|
|
@@ -968,17 +933,24 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/resources/application-prod.yml">
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/resources/application-dev.yml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="92">
|
|
|
<caret line="4" selection-start-line="4" selection-end-line="4" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/template/common/result/ResponseStatusEnum.java">
|
|
|
+ <entry file="file://$PROJECT_DIR$/pom.xml">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="230">
|
|
|
+ <caret line="10" column="25" selection-start-line="10" selection-start-column="17" selection-end-line="10" selection-end-column="25" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/resources/application-prod.yml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="299">
|
|
|
- <caret line="13" column="17" selection-start-line="11" selection-start-column="4" selection-end-line="13" selection-end-column="17" />
|
|
|
+ <state relative-caret-position="92">
|
|
|
+ <caret line="4" selection-start-line="4" selection-end-line="4" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
@@ -1020,17 +992,41 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/resources/application-dev.yml">
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/template/common/exception/EmsException.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="23">
|
|
|
- <caret line="4" selection-start-line="4" selection-end-line="4" />
|
|
|
+ <state relative-caret-position="161">
|
|
|
+ <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/pom.xml">
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/template/MybatisPlusApplication.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="230">
|
|
|
- <caret line="10" column="25" selection-start-line="10" selection-start-column="17" selection-end-line="10" selection-end-column="25" />
|
|
|
+ <state relative-caret-position="161">
|
|
|
+ <caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/template/common/exception/EmsExceptionHandler.java">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="253">
|
|
|
+ <caret line="39" column="70" selection-start-line="39" selection-start-column="70" selection-end-line="39" selection-end-column="70" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/template/common/result/ResponseStatusEnum.java">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="137">
|
|
|
+ <caret line="22" column="4" selection-start-line="22" selection-start-column="4" selection-end-line="22" selection-end-column="4" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/LoginController.java">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="274">
|
|
|
+ <caret line="42" column="45" selection-start-line="42" selection-start-column="45" selection-end-line="42" selection-end-column="45" />
|
|
|
+ <folding>
|
|
|
+ <element signature="imports" expanded="true" />
|
|
|
+ </folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|