|
|
@@ -2,14 +2,16 @@
|
|
|
<project version="4">
|
|
|
<component name="ChangeListManager">
|
|
|
<list default="true" id="1da94ed8-6954-4dbc-8f54-8617863a9948" name="Default Changelist" comment="">
|
|
|
+ <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/config/WxOpenidConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/config/WxOpenidConfig.java" afterDir="false" />
|
|
|
<change beforePath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java" 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/resources/application-prod.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application-prod.yml" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.yml" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/target/classes/META-INF/spring-configuration-metadata.json" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/META-INF/spring-configuration-metadata.json" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/target/classes/application-dev.yml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/application-dev.yml" afterDir="false" />
|
|
|
<change beforePath="$PROJECT_DIR$/target/classes/application-prod.yml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/application-prod.yml" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/target/classes/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/application.yml" afterDir="false" />
|
|
|
<change beforePath="$PROJECT_DIR$/target/repair_system-0.0.1-SNAPSHOT.jar.original" beforeDir="false" afterPath="$PROJECT_DIR$/target/repair_system-0.0.1-SNAPSHOT.jar.original" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/target/surefire-reports/TEST-com.repair.MybatisPlusApplicationTests.xml" beforeDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/target/surefire-reports/TEST-com.repair.WrapperTest.xml" beforeDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/target/surefire-reports/com.repair.MybatisPlusApplicationTests.txt" beforeDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/target/surefire-reports/com.repair.WrapperTest.txt" beforeDir="false" />
|
|
|
</list>
|
|
|
<ignored path="$PROJECT_DIR$/classes/" />
|
|
|
<ignored path="$PROJECT_DIR$/target/" />
|
|
|
@@ -19,13 +21,35 @@
|
|
|
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
|
|
<option name="LAST_RESOLUTION" value="IGNORE" />
|
|
|
</component>
|
|
|
+ <component name="DefaultGradleProjectSettings">
|
|
|
+ <option name="testRunner" value="GRADLE" />
|
|
|
+ <option name="delegatedBuild" value="true" />
|
|
|
+ </component>
|
|
|
<component name="FileEditorManager">
|
|
|
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
|
|
<file pinned="false" current-in-tab="true">
|
|
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="237">
|
|
|
- <caret line="337" column="115" selection-start-line="337" selection-start-column="115" selection-end-line="337" selection-end-column="115" />
|
|
|
+ <state relative-caret-position="476">
|
|
|
+ <caret line="266" column="39" selection-start-line="266" selection-start-column="33" selection-end-line="266" selection-end-column="39" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ </file>
|
|
|
+ <file pinned="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/config/WxOpenidConfig.java">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="672">
|
|
|
+ <caret line="44" column="28" selection-start-line="44" selection-start-column="19" selection-end-line="44" selection-end-column="28" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ </file>
|
|
|
+ <file pinned="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/enumModel/eRecordStatu.java">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="184">
|
|
|
+ <caret line="8" column="12" selection-start-line="8" selection-start-column="12" selection-end-line="8" selection-end-column="12" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
@@ -33,7 +57,7 @@
|
|
|
<file pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairUserMapper.xml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="5681">
|
|
|
+ <state relative-caret-position="502">
|
|
|
<caret line="247" column="153" selection-start-line="247" selection-start-column="133" selection-end-line="247" selection-end-column="153" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
@@ -49,9 +73,27 @@
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file pinned="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/resources/application-dev.yml">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="571">
|
|
|
+ <caret line="73" column="103" selection-start-line="73" selection-start-column="103" selection-end-line="73" selection-end-column="103" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ </file>
|
|
|
+ <file pinned="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/resources/application.yml">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="594">
|
|
|
+ <caret line="70" column="103" selection-start-line="70" selection-start-column="103" selection-end-line="70" selection-end-column="103" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ </file>
|
|
|
+ <file pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairUserServiceImpl.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="4715">
|
|
|
+ <state relative-caret-position="815">
|
|
|
<caret line="220" selection-start-line="220" selection-end-line="220" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
@@ -60,8 +102,17 @@
|
|
|
<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="322">
|
|
|
- <caret line="14" column="29" selection-start-line="14" selection-start-column="29" selection-end-line="14" selection-end-column="29" />
|
|
|
+ <state relative-caret-position="562">
|
|
|
+ <caret line="73" column="2" selection-start-line="73" selection-start-column="2" selection-end-line="73" selection-end-column="103" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ </file>
|
|
|
+ <file pinned="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairPayRecordController.java">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="187">
|
|
|
+ <caret line="328" column="19" selection-start-line="328" selection-start-column="19" selection-end-line="328" selection-end-column="19" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
@@ -77,6 +128,8 @@
|
|
|
<find>article_id or parent_id</find>
|
|
|
<find>autoDispatchUser</find>
|
|
|
<find>提交报修</find>
|
|
|
+ <find>chtech.ncjti.edu.cn/testingServer</find>
|
|
|
+ <find>System.out.println</find>
|
|
|
</findStrings>
|
|
|
</component>
|
|
|
<component name="Git.Settings">
|
|
|
@@ -87,6 +140,9 @@
|
|
|
<list>
|
|
|
<option value="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairUserMapper.xml" />
|
|
|
<option value="$PROJECT_DIR$/src/main/resources/application-prod.yml" />
|
|
|
+ <option value="$PROJECT_DIR$/src/main/resources/application-dev.yml" />
|
|
|
+ <option value="$PROJECT_DIR$/src/main/resources/application.yml" />
|
|
|
+ <option value="$PROJECT_DIR$/src/main/java/com/repair/config/WxOpenidConfig.java" />
|
|
|
<option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java" />
|
|
|
</list>
|
|
|
</option>
|
|
|
@@ -120,8 +176,8 @@
|
|
|
<option name="skipTests" value="true" />
|
|
|
</component>
|
|
|
<component name="ProjectFrameBounds" extendedState="7">
|
|
|
- <option name="x" value="-7" />
|
|
|
- <option name="width" value="958" />
|
|
|
+ <option name="x" value="953" />
|
|
|
+ <option name="width" value="974" />
|
|
|
<option name="height" value="1039" />
|
|
|
</component>
|
|
|
<component name="ProjectView">
|
|
|
@@ -130,6 +186,7 @@
|
|
|
</navigator>
|
|
|
<panes>
|
|
|
<pane id="Scope" />
|
|
|
+ <pane id="PackagesPane" />
|
|
|
<pane id="ProjectPane">
|
|
|
<subPane>
|
|
|
<expand>
|
|
|
@@ -188,6 +245,25 @@
|
|
|
<item name="main" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="java" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="repair" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="model" type="462c0819:PsiDirectoryNode" />
|
|
|
+ </path>
|
|
|
+ <path>
|
|
|
+ <item name="repair_system" type="b2602c69:ProjectViewProjectNode" />
|
|
|
+ <item name="repair_backend" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="src" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="main" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="java" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="repair" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="model" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="enumModel" type="462c0819:PsiDirectoryNode" />
|
|
|
+ </path>
|
|
|
+ <path>
|
|
|
+ <item name="repair_system" type="b2602c69:ProjectViewProjectNode" />
|
|
|
+ <item name="repair_backend" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="src" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="main" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="java" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="repair" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="services" type="462c0819:PsiDirectoryNode" />
|
|
|
</path>
|
|
|
<path>
|
|
|
@@ -219,7 +295,6 @@
|
|
|
<select />
|
|
|
</subPane>
|
|
|
</pane>
|
|
|
- <pane id="PackagesPane" />
|
|
|
</panes>
|
|
|
</component>
|
|
|
<component name="PropertiesComponent">
|
|
|
@@ -271,17 +346,18 @@
|
|
|
<workItem from="1699930740107" duration="3326000" />
|
|
|
<workItem from="1699937034046" duration="4324000" />
|
|
|
<workItem from="1699945990060" duration="1243000" />
|
|
|
+ <workItem from="1700008732972" duration="4198000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
- <option name="totallyTimeSpent" value="8893000" />
|
|
|
+ <option name="totallyTimeSpent" value="13091000" />
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
<frame x="-8" y="-8" width="1936" height="1048" extended-state="7" />
|
|
|
<editor active="true" />
|
|
|
<layout>
|
|
|
- <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.08742005" />
|
|
|
+ <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.13326226" />
|
|
|
<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" />
|
|
|
@@ -293,7 +369,7 @@
|
|
|
<window_info anchor="bottom" id="Message" order="0" />
|
|
|
<window_info anchor="bottom" id="Find" order="1" />
|
|
|
<window_info anchor="bottom" id="Run" order="2" weight="0.32932165" />
|
|
|
- <window_info anchor="bottom" id="Debug" order="3" weight="0.64972377" />
|
|
|
+ <window_info anchor="bottom" id="Debug" order="3" weight="0.6301969" />
|
|
|
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
|
|
|
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
|
|
|
<window_info anchor="bottom" id="TODO" order="6" />
|
|
|
@@ -310,7 +386,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.24945295" />
|
|
|
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
|
|
|
- <window_info anchor="right" id="Maven" order="3" weight="0.7866521" />
|
|
|
+ <window_info anchor="right" id="Maven" order="3" weight="0.8260394" />
|
|
|
<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" />
|
|
|
@@ -332,6 +408,12 @@
|
|
|
<properties />
|
|
|
<option name="timeStamp" value="4" />
|
|
|
</line-breakpoint>
|
|
|
+ <line-breakpoint enabled="true" type="java-line">
|
|
|
+ <url>file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairPayRecordController.java</url>
|
|
|
+ <line>317</line>
|
|
|
+ <properties />
|
|
|
+ <option name="timeStamp" value="5" />
|
|
|
+ </line-breakpoint>
|
|
|
</breakpoints>
|
|
|
</breakpoint-manager>
|
|
|
</component>
|
|
|
@@ -340,47 +422,83 @@
|
|
|
<option name="FILTER_TARGETS" value="false" />
|
|
|
</component>
|
|
|
<component name="editorHistoryManager">
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/resources/application.yml">
|
|
|
+ <entry file="file://$PROJECT_DIR$/../../../fsdownload/nohup.out">
|
|
|
<provider selected="true" editor-type-id="text-editor" />
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/resources/application-dev.yml">
|
|
|
- <provider selected="true" editor-type-id="text-editor" />
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairPayRecordController.java">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="187">
|
|
|
+ <caret line="328" column="19" selection-start-line="328" selection-start-column="19" selection-end-line="328" selection-end-column="19" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/request/WxPayRequest.java">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="184">
|
|
|
+ <caret line="12" column="13" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/enumModel/eRecordStatu.java">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="184">
|
|
|
+ <caret line="8" column="12" selection-start-line="8" selection-start-column="12" selection-end-line="8" selection-end-column="12" />
|
|
|
+ </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="594">
|
|
|
+ <caret line="70" column="103" selection-start-line="70" selection-start-column="103" selection-end-line="70" selection-end-column="103" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairUserMapper.xml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="5681">
|
|
|
+ <state relative-caret-position="502">
|
|
|
<caret line="247" column="153" selection-start-line="247" selection-start-column="133" selection-end-line="247" selection-end-column="153" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairUserMapper.java">
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/config/WxOpenidConfig.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="276">
|
|
|
- <caret line="19" column="11" selection-start-line="19" selection-start-column="11" selection-end-line="19" selection-end-column="11" />
|
|
|
+ <state relative-caret-position="672">
|
|
|
+ <caret line="44" column="28" selection-start-line="44" selection-start-column="19" selection-end-line="44" selection-end-column="28" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairUserServiceImpl.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="4715">
|
|
|
+ <state relative-caret-position="815">
|
|
|
<caret line="220" selection-start-line="220" selection-end-line="220" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairUserMapper.java">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="276">
|
|
|
+ <caret line="19" column="11" selection-start-line="19" selection-start-column="11" selection-end-line="19" selection-end-column="11" />
|
|
|
+ </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="322">
|
|
|
- <caret line="14" column="29" selection-start-line="14" selection-start-column="29" selection-end-line="14" selection-end-column="29" />
|
|
|
+ <state relative-caret-position="562">
|
|
|
+ <caret line="73" column="2" selection-start-line="73" selection-start-column="2" selection-end-line="73" selection-end-column="103" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/../../../fsdownload/nohup.out">
|
|
|
- <provider selected="true" editor-type-id="text-editor" />
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/resources/application-dev.yml">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="571">
|
|
|
+ <caret line="73" column="103" selection-start-line="73" selection-start-column="103" selection-end-line="73" selection-end-column="103" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="237">
|
|
|
- <caret line="337" column="115" selection-start-line="337" selection-start-column="115" selection-end-line="337" selection-end-column="115" />
|
|
|
+ <state relative-caret-position="476">
|
|
|
+ <caret line="266" column="39" selection-start-line="266" selection-start-column="33" selection-end-line="266" selection-end-column="39" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|