|
|
@@ -5,7 +5,9 @@
|
|
|
</component>
|
|
|
<component name="ChangeListManager">
|
|
|
<list default="true" id="cb7b6a84-9179-4588-9374-31a70f785e65" name="Default Changelist" comment="">
|
|
|
- <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartIdentityController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartIdentityController.java" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/vo/ApplysVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/vo/ApplysVo.java" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartApplyServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartApplyServiceImpl.java" afterDir="false" />
|
|
|
<change beforePath="$PROJECT_DIR$/target/mybatis_plus-0.0.1-SNAPSHOT.jar.original" beforeDir="false" afterPath="$PROJECT_DIR$/target/mybatis_plus-0.0.1-SNAPSHOT.jar.original" afterDir="false" />
|
|
|
</list>
|
|
|
<ignored path="$PROJECT_DIR$/target/" />
|
|
|
@@ -44,11 +46,11 @@
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
- <file pinned="false" current-in-tab="true">
|
|
|
+ <file pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="235">
|
|
|
- <caret line="1807" column="36" selection-start-line="1807" selection-start-column="36" selection-end-line="1807" selection-end-column="36" />
|
|
|
+ <state relative-caret-position="58">
|
|
|
+ <caret line="1846" column="45" selection-start-line="1846" selection-start-column="45" selection-end-line="1846" selection-end-column="45" />
|
|
|
<folding>
|
|
|
<element signature="method#importZipUsers#0;class#SmartUserController#0" />
|
|
|
<element signature="e#44515#49821#1" />
|
|
|
@@ -73,6 +75,24 @@
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
+ <file pinned="false" current-in-tab="true">
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartIdentityController.java">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="430">
|
|
|
+ <caret line="189" column="62" selection-start-line="189" selection-start-column="62" selection-end-line="189" selection-end-column="62" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ </file>
|
|
|
+ <file pinned="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/vo/ApplysVo.java">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="920">
|
|
|
+ <caret line="40" column="27" selection-start-line="40" selection-start-column="27" selection-end-line="40" selection-end-column="27" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ </file>
|
|
|
<file pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/SmartUserService.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
@@ -110,24 +130,6 @@
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/WechatScanLoginController.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="306">
|
|
|
- <caret line="426" column="59" selection-start-line="426" selection-start-column="59" selection-end-line="426" selection-end-column="59" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- <file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/template/common/utils/JWTUtil.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="421">
|
|
|
- <caret line="50" column="111" selection-start-line="50" selection-start-column="111" selection-end-line="50" selection-end-column="111" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- <file pinned="false" current-in-tab="false">
|
|
|
<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="300">
|
|
|
@@ -147,9 +149,6 @@
|
|
|
</component>
|
|
|
<component name="FindInProjectRecents">
|
|
|
<findStrings>
|
|
|
- <find>querySmartUserPages</find>
|
|
|
- <find>/"</find>
|
|
|
- <find>result</find>
|
|
|
<find>tree</find>
|
|
|
<find>父级</find>
|
|
|
<find>warningDepartmentTree</find>
|
|
|
@@ -168,7 +167,6 @@
|
|
|
<find>queryAffiliateUserById</find>
|
|
|
<find>QueryParentDepartments</find>
|
|
|
<find>insertSmartApply</find>
|
|
|
- <find>queryIdentityApplyById</find>
|
|
|
<find>querySmartSecordPage</find>
|
|
|
<find>.join</find>
|
|
|
<find>jsonObject.put("token"</find>
|
|
|
@@ -176,6 +174,10 @@
|
|
|
<find>vertify</find>
|
|
|
<find>queryPageSmartUser</find>
|
|
|
<find>affiliates</find>
|
|
|
+ <find>queryIdentityApplyById</find>
|
|
|
+ <find>applys</find>
|
|
|
+ <find>"小程序</find>
|
|
|
+ <find>queryAppletApplys</find>
|
|
|
<find>deleteSmartApplyById</find>
|
|
|
</findStrings>
|
|
|
<replaceStrings>
|
|
|
@@ -205,11 +207,8 @@
|
|
|
<option value="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartUser.java" />
|
|
|
<option value="$PROJECT_DIR$/src/main/java/com/template/model/vo/IdentityApplyVo.java" />
|
|
|
<option value="$PROJECT_DIR$/src/main/java/com/template/services/SmartApplyService.java" />
|
|
|
- <option value="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartApplyServiceImpl.java" />
|
|
|
<option value="$PROJECT_DIR$/src/main/java/com/template/api/SmartIdentityControllerAPI.java" />
|
|
|
<option value="$PROJECT_DIR$/src/main/java/com/template/api/SmartApplyControllerAPI.java" />
|
|
|
- <option value="$PROJECT_DIR$/src/main/java/com/template/model/vo/ApplysVo.java" />
|
|
|
- <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartIdentityController.java" />
|
|
|
<option value="$PROJECT_DIR$/src/main/java/com/template/model/vo/UserVo.java" />
|
|
|
<option value="$PROJECT_DIR$/src/main/java/com/template/model/vo/WechatUserVo.java" />
|
|
|
<option value="$PROJECT_DIR$/src/main/java/com/template/api/WechatScanLoginControllerAPI.java" />
|
|
|
@@ -251,6 +250,9 @@
|
|
|
<option value="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartUserServiceImpl.java" />
|
|
|
<option value="$PROJECT_DIR$/src/main/java/com/template/model/request/bindStudentRequest.java" />
|
|
|
<option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java" />
|
|
|
+ <option value="$PROJECT_DIR$/src/main/java/com/template/model/vo/ApplysVo.java" />
|
|
|
+ <option value="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartApplyServiceImpl.java" />
|
|
|
+ <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartIdentityController.java" />
|
|
|
</list>
|
|
|
</option>
|
|
|
</component>
|
|
|
@@ -281,7 +283,7 @@
|
|
|
<component name="MavenRunner">
|
|
|
<option name="skipTests" value="true" />
|
|
|
</component>
|
|
|
- <component name="ProjectFrameBounds">
|
|
|
+ <component name="ProjectFrameBounds" extendedState="6">
|
|
|
<option name="x" value="-7" />
|
|
|
<option name="width" value="958" />
|
|
|
<option name="height" value="1039" />
|
|
|
@@ -630,12 +632,12 @@
|
|
|
<workItem from="1705388695984" duration="51258000" />
|
|
|
<workItem from="1705885614332" duration="695000" />
|
|
|
<workItem from="1705886328968" duration="31068000" />
|
|
|
- <workItem from="1705992981607" duration="18485000" />
|
|
|
+ <workItem from="1705992981607" duration="21524000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
- <option name="totallyTimeSpent" value="464511000" />
|
|
|
+ <option name="totallyTimeSpent" value="467550000" />
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
<frame x="-8" y="-8" width="1936" height="1048" extended-state="6" />
|
|
|
@@ -649,11 +651,11 @@
|
|
|
<window_info id="Designer" order="5" />
|
|
|
<window_info id="Web" order="6" side_tool="true" />
|
|
|
<window_info id="Structure" order="7" side_tool="true" weight="0.25" />
|
|
|
- <window_info content_ui="combo" id="Project" order="8" visible="true" weight="0.12633263" />
|
|
|
+ <window_info content_ui="combo" id="Project" order="8" weight="0.25906184" />
|
|
|
<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.30276242" />
|
|
|
- <window_info active="true" anchor="bottom" id="Debug" order="3" visible="true" weight="0.18599562" />
|
|
|
+ <window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.30196938" />
|
|
|
+ <window_info anchor="bottom" id="Debug" order="3" weight="0.18599562" />
|
|
|
<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" />
|
|
|
@@ -667,7 +669,7 @@
|
|
|
<window_info anchor="bottom" id="Version Control" order="14" />
|
|
|
<window_info anchor="bottom" id="JRebel Executor" order="15" />
|
|
|
<window_info anchor="bottom" id="JRebel Console" order="16" side_tool="true" />
|
|
|
- <window_info anchor="right" id="Maven" order="0" weight="0.7026726" />
|
|
|
+ <window_info anchor="right" id="Maven" order="0" weight="0.8184855" />
|
|
|
<window_info anchor="right" id="Palette" order="1" />
|
|
|
<window_info anchor="right" id="Capture Analysis" order="2" />
|
|
|
<window_info anchor="right" id="Database" order="3" weight="0.32942432" />
|
|
|
@@ -807,20 +809,6 @@
|
|
|
<option name="FILTER_TARGETS" value="false" />
|
|
|
</component>
|
|
|
<component name="editorHistoryManager">
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/template/config/CosConfig.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="150">
|
|
|
- <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
|
|
|
- </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/model/enumModel/eExamineStatu.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="230">
|
|
|
@@ -969,13 +957,6 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartApply.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="208">
|
|
|
- <caret line="61" column="12" lean-forward="true" selection-start-line="61" selection-start-column="12" selection-end-line="61" selection-end-column="12" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/src/main/resources/mapper/template/SmartScoreMapper.xml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="552">
|
|
|
@@ -1035,13 +1016,6 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartIdentityController.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="295">
|
|
|
- <caret line="103" column="67" selection-start-line="103" selection-start-column="28" selection-end-line="103" selection-end-column="67" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/template/common/utils/AesUtils.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="295">
|
|
|
@@ -1163,8 +1137,8 @@
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="235">
|
|
|
- <caret line="1807" column="36" selection-start-line="1807" selection-start-column="36" selection-end-line="1807" selection-end-column="36" />
|
|
|
+ <state relative-caret-position="58">
|
|
|
+ <caret line="1846" column="45" selection-start-line="1846" selection-start-column="45" selection-end-line="1846" selection-end-column="45" />
|
|
|
<folding>
|
|
|
<element signature="method#importZipUsers#0;class#SmartUserController#0" />
|
|
|
<element signature="e#44515#49821#1" />
|
|
|
@@ -1188,6 +1162,34 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/vo/ApplysVo.java">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="920">
|
|
|
+ <caret line="40" column="27" selection-start-line="40" selection-start-column="27" selection-end-line="40" selection-end-column="27" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartApply.java">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="-142">
|
|
|
+ <caret line="30" column="13" selection-start-line="30" selection-start-column="13" selection-end-line="30" selection-end-column="13" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartApplyServiceImpl.java">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="26">
|
|
|
+ <caret line="69" column="5" lean-forward="true" selection-start-line="69" selection-start-column="5" selection-end-line="69" selection-end-column="5" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartIdentityController.java">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="430">
|
|
|
+ <caret line="189" column="62" selection-start-line="189" selection-start-column="62" selection-end-line="189" selection-end-column="62" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
</component>
|
|
|
<component name="masterDetails">
|
|
|
<states>
|