|
@@ -3,14 +3,6 @@
|
|
<component name="ChangeListManager">
|
|
<component name="ChangeListManager">
|
|
<list default="true" id="f5deea9c-9428-4e1b-a432-6064341c1bb8" name="Default Changelist" comment="">
|
|
<list default="true" id="f5deea9c-9428-4e1b-a432-6064341c1bb8" name="Default Changelist" 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$/dorm-manager-wx/pages/student/menu/menu.js" beforeDir="false" afterPath="$PROJECT_DIR$/dorm-manager-wx/pages/student/menu/menu.js" afterDir="false" />
|
|
|
|
- <change beforePath="$PROJECT_DIR$/dorm-manager-wx/pages/student/proposal/proposal.js" beforeDir="false" afterPath="$PROJECT_DIR$/dorm-manager-wx/pages/student/proposal/proposal.js" afterDir="false" />
|
|
|
|
- <change beforePath="$PROJECT_DIR$/dorm-manager-wx/pages/student/proposalDetails/proposalDetails.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/dorm-manager-wx/pages/student/proposalDetails/proposalDetails.wxml" afterDir="false" />
|
|
|
|
- <change beforePath="$PROJECT_DIR$/dorm-manager-wx/pages/test/test.js" beforeDir="false" afterPath="$PROJECT_DIR$/dorm-manager-wx/pages/test/test.js" afterDir="false" />
|
|
|
|
- <change beforePath="$PROJECT_DIR$/dorm-manager-wx/pages/test/test.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/dorm-manager-wx/pages/test/test.wxml" afterDir="false" />
|
|
|
|
- <change beforePath="$PROJECT_DIR$/dorm-manager-wx/pages/test/test.wxss" beforeDir="false" afterPath="$PROJECT_DIR$/dorm-manager-wx/pages/test/test.wxss" afterDir="false" />
|
|
|
|
- <change beforePath="$PROJECT_DIR$/dorm-manager-wx/pages/user/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/dorm-manager-wx/pages/user/index.js" afterDir="false" />
|
|
|
|
- <change beforePath="$PROJECT_DIR$/dorm-manager-wx/project.config.json" beforeDir="false" afterPath="$PROJECT_DIR$/dorm-manager-wx/project.config.json" afterDir="false" />
|
|
|
|
</list>
|
|
</list>
|
|
<ignored path="$PROJECT_DIR$/out/" />
|
|
<ignored path="$PROJECT_DIR$/out/" />
|
|
<ignored path="$PROJECT_DIR$/dorm-manager-db/target/" />
|
|
<ignored path="$PROJECT_DIR$/dorm-manager-db/target/" />
|
|
@@ -18,6 +10,7 @@
|
|
<ignored path="$PROJECT_DIR$/dorm-manager-wx-api/target/" />
|
|
<ignored path="$PROJECT_DIR$/dorm-manager-wx-api/target/" />
|
|
<ignored path="$PROJECT_DIR$/target/" />
|
|
<ignored path="$PROJECT_DIR$/target/" />
|
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
|
|
+ <option name="TRACKING_ENABLED" value="true" />
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
|
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
|
@@ -27,13 +20,7 @@
|
|
<option name="isMigrated" value="true" />
|
|
<option name="isMigrated" value="true" />
|
|
</component>
|
|
</component>
|
|
<component name="FileEditorManager">
|
|
<component name="FileEditorManager">
|
|
- <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
|
|
|
- <file pinned="false" current-in-tab="true">
|
|
|
|
- <entry file="file://$PROJECT_DIR$/dorm-manager-wx/utils/api.js">
|
|
|
|
- <provider selected="true" editor-type-id="text-editor" />
|
|
|
|
- </entry>
|
|
|
|
- </file>
|
|
|
|
- </leaf>
|
|
|
|
|
|
+ <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
|
|
</component>
|
|
</component>
|
|
<component name="FindInProjectRecents">
|
|
<component name="FindInProjectRecents">
|
|
<findStrings>
|
|
<findStrings>
|
|
@@ -57,6 +44,18 @@
|
|
</list>
|
|
</list>
|
|
</option>
|
|
</option>
|
|
</component>
|
|
</component>
|
|
|
|
+ <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
|
|
|
|
+ <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
|
|
|
|
+ <component name="JsGulpfileManager">
|
|
|
|
+ <detection-done>true</detection-done>
|
|
|
|
+ <sorting>DEFINITION_ORDER</sorting>
|
|
|
|
+ </component>
|
|
|
|
+ <component name="MavenProjectNavigator">
|
|
|
|
+ <treeState>
|
|
|
|
+ <expand />
|
|
|
|
+ <select />
|
|
|
|
+ </treeState>
|
|
|
|
+ </component>
|
|
<component name="ProjectFrameBounds" extendedState="6">
|
|
<component name="ProjectFrameBounds" extendedState="6">
|
|
<option name="x" value="417" />
|
|
<option name="x" value="417" />
|
|
<option name="y" value="71" />
|
|
<option name="y" value="71" />
|
|
@@ -76,22 +75,12 @@
|
|
<item name="dorm-manager" type="b2602c69:ProjectViewProjectNode" />
|
|
<item name="dorm-manager" type="b2602c69:ProjectViewProjectNode" />
|
|
<item name="dorm-manager" type="462c0819:PsiDirectoryNode" />
|
|
<item name="dorm-manager" type="462c0819:PsiDirectoryNode" />
|
|
</path>
|
|
</path>
|
|
- <path>
|
|
|
|
- <item name="dorm-manager" type="b2602c69:ProjectViewProjectNode" />
|
|
|
|
- <item name="dorm-manager" type="462c0819:PsiDirectoryNode" />
|
|
|
|
- <item name="dorm-manager-wx" type="462c0819:PsiDirectoryNode" />
|
|
|
|
- </path>
|
|
|
|
- <path>
|
|
|
|
- <item name="dorm-manager" type="b2602c69:ProjectViewProjectNode" />
|
|
|
|
- <item name="dorm-manager" type="462c0819:PsiDirectoryNode" />
|
|
|
|
- <item name="dorm-manager-wx" type="462c0819:PsiDirectoryNode" />
|
|
|
|
- <item name="utils" type="462c0819:PsiDirectoryNode" />
|
|
|
|
- </path>
|
|
|
|
</expand>
|
|
</expand>
|
|
<select />
|
|
<select />
|
|
</subPane>
|
|
</subPane>
|
|
</pane>
|
|
</pane>
|
|
<pane id="Scope" />
|
|
<pane id="Scope" />
|
|
|
|
+ <pane id="AndroidView" />
|
|
</panes>
|
|
</panes>
|
|
</component>
|
|
</component>
|
|
<component name="PropertiesComponent">
|
|
<component name="PropertiesComponent">
|
|
@@ -129,17 +118,15 @@
|
|
<configuration name="AdminApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
|
|
<configuration name="AdminApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
|
|
<module name="dorm-manager-admin-api" />
|
|
<module name="dorm-manager-admin-api" />
|
|
<option name="SPRING_BOOT_MAIN_CLASS" value="com.dgtis.dorm.manager.admin.AdminApplication" />
|
|
<option name="SPRING_BOOT_MAIN_CLASS" value="com.dgtis.dorm.manager.admin.AdminApplication" />
|
|
- <method v="2">
|
|
|
|
- <option name="Make" enabled="true" />
|
|
|
|
- </method>
|
|
|
|
</configuration>
|
|
</configuration>
|
|
<configuration name="WxApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
|
|
<configuration name="WxApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
|
|
<module name="dorm-manager-wx-api" />
|
|
<module name="dorm-manager-wx-api" />
|
|
<option name="SPRING_BOOT_MAIN_CLASS" value="com.dgtis.dorm.manager.wx.WxApplication" />
|
|
<option name="SPRING_BOOT_MAIN_CLASS" value="com.dgtis.dorm.manager.wx.WxApplication" />
|
|
- <method v="2">
|
|
|
|
- <option name="Make" enabled="true" />
|
|
|
|
- </method>
|
|
|
|
</configuration>
|
|
</configuration>
|
|
|
|
+ <list>
|
|
|
|
+ <item itemvalue="Spring Boot.AdminApplication" />
|
|
|
|
+ <item itemvalue="Spring Boot.WxApplication" />
|
|
|
|
+ </list>
|
|
</component>
|
|
</component>
|
|
<component name="SvnConfiguration">
|
|
<component name="SvnConfiguration">
|
|
<configuration />
|
|
<configuration />
|
|
@@ -169,6 +156,7 @@
|
|
<workItem from="1574839358293" duration="1295000" />
|
|
<workItem from="1574839358293" duration="1295000" />
|
|
<workItem from="1574932561099" duration="1219000" />
|
|
<workItem from="1574932561099" duration="1219000" />
|
|
<workItem from="1575257478262" duration="239000" />
|
|
<workItem from="1575257478262" duration="239000" />
|
|
|
|
+ <workItem from="1624501166333" duration="312000" />
|
|
</task>
|
|
</task>
|
|
<task id="LOCAL-00001" summary="更新代码10-28">
|
|
<task id="LOCAL-00001" summary="更新代码10-28">
|
|
<created>1572234111796</created>
|
|
<created>1572234111796</created>
|
|
@@ -230,7 +218,7 @@
|
|
<servers />
|
|
<servers />
|
|
</component>
|
|
</component>
|
|
<component name="TimeTrackingManager">
|
|
<component name="TimeTrackingManager">
|
|
- <option name="totallyTimeSpent" value="23921000" />
|
|
|
|
|
|
+ <option name="totallyTimeSpent" value="24233000" />
|
|
</component>
|
|
</component>
|
|
<component name="TodoView">
|
|
<component name="TodoView">
|
|
<todo-panel id="selected-file">
|
|
<todo-panel id="selected-file">
|
|
@@ -244,43 +232,45 @@
|
|
<component name="ToolWindowManager">
|
|
<component name="ToolWindowManager">
|
|
<frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
|
|
<frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
|
|
<layout>
|
|
<layout>
|
|
- <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.22087745" />
|
|
|
|
- <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" />
|
|
|
|
- <window_info id="Image Layers" order="4" />
|
|
|
|
|
|
+ <window_info anchor="right" id="Palette" order="4" />
|
|
|
|
+ <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" weight="0.3295082" />
|
|
|
|
+ <window_info anchor="right" id="Maven Projects" visible="true" weight="0.329296" />
|
|
|
|
+ <window_info anchor="bottom" id="Database Changes" order="12" />
|
|
<window_info id="Capture Tool" order="5" />
|
|
<window_info id="Capture Tool" order="5" />
|
|
|
|
+ <window_info id="Designer" order="2" />
|
|
|
|
+ <window_info anchor="bottom" id="Docker" order="9" show_stripe_button="false" />
|
|
|
|
+ <window_info anchor="right" id="Database" order="6" />
|
|
|
|
+ <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
|
|
|
|
+ <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
|
|
<window_info id="UI Designer" order="6" />
|
|
<window_info id="UI Designer" order="6" />
|
|
- <window_info id="Favorites" order="7" side_tool="true" />
|
|
|
|
- <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" />
|
|
|
|
- <window_info anchor="bottom" id="Run" order="2" weight="0.704918" />
|
|
|
|
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
|
|
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
|
|
- <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" sideWeight="0.49924356" weight="0.3295082" />
|
|
<window_info anchor="bottom" id="TODO" order="6" sideWeight="0.49924356" weight="0.3295082" />
|
|
|
|
+ <window_info anchor="right" id="Palette	" order="7" />
|
|
|
|
+ <window_info id="Image Layers" order="4" />
|
|
|
|
+ <window_info anchor="bottom" id="Java Enterprise" order="11" weight="0.3295082" />
|
|
|
|
+ <window_info anchor="right" id="Capture Analysis" order="5" />
|
|
|
|
+ <window_info anchor="bottom" id="Version Control" order="13" sideWeight="0.49092284" weight="0.4264463" />
|
|
|
|
+ <window_info anchor="right" id="leetcode" side_tool="true" />
|
|
|
|
+ <window_info anchor="bottom" id="Run" order="2" weight="0.704918" />
|
|
<window_info anchor="bottom" id="Spring" order="7" />
|
|
<window_info anchor="bottom" id="Spring" order="7" />
|
|
<window_info anchor="bottom" id="Terminal" order="8" weight="0.3295082" />
|
|
<window_info anchor="bottom" id="Terminal" order="8" weight="0.3295082" />
|
|
- <window_info anchor="bottom" id="Docker" order="9" show_stripe_button="false" />
|
|
|
|
- <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" weight="0.3295082" />
|
|
|
|
- <window_info anchor="bottom" id="Java Enterprise" order="11" weight="0.3295082" />
|
|
|
|
- <window_info anchor="bottom" id="Database Changes" order="12" />
|
|
|
|
- <window_info active="true" anchor="bottom" id="Version Control" order="13" sideWeight="0.49092284" visible="true" weight="0.42786884" />
|
|
|
|
- <window_info anchor="bottom" id="JRebel Console" order="14" sideWeight="0.50907713" side_tool="true" visible="true" weight="0.42786884" />
|
|
|
|
|
|
+ <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22407266" />
|
|
|
|
+ <window_info anchor="right" id="Bean Validation" order="9" />
|
|
|
|
+ <window_info id="Web" order="8" side_tool="true" />
|
|
|
|
+ <window_info anchor="right" id="Theme Preview" order="8" />
|
|
|
|
+ <window_info id="Favorites" order="7" side_tool="true" />
|
|
<window_info anchor="bottom" id="JRebel Executor" order="15" />
|
|
<window_info anchor="bottom" id="JRebel Executor" order="15" />
|
|
|
|
+ <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
|
|
|
|
+ <window_info anchor="right" id="JRebel Setup Guide" order="10" weight="0.32980332" />
|
|
|
|
+ <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
|
|
|
|
+ <window_info anchor="right" id="Maven" order="3" />
|
|
|
|
+ <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
|
|
|
|
+ <window_info id="JRebel" order="3" side_tool="true" />
|
|
<window_info anchor="bottom" id="Messages" order="16" />
|
|
<window_info anchor="bottom" id="Messages" order="16" />
|
|
|
|
+ <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="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" />
|
|
|
|
- <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" />
|
|
|
|
- <window_info anchor="right" id="Palette	" order="7" />
|
|
|
|
- <window_info anchor="right" id="Theme Preview" order="8" />
|
|
|
|
- <window_info anchor="right" id="Bean Validation" order="9" />
|
|
|
|
- <window_info anchor="right" id="JRebel Setup Guide" order="10" weight="0.32980332" />
|
|
|
|
|
|
+ <window_info anchor="bottom" id="Message" order="0" />
|
|
|
|
+ <window_info anchor="bottom" id="JRebel Console" order="14" sideWeight="0.50907713" side_tool="true" visible="true" weight="0.42786884" />
|
|
</layout>
|
|
</layout>
|
|
</component>
|
|
</component>
|
|
<component name="TypeScriptGeneratedFilesManager">
|
|
<component name="TypeScriptGeneratedFilesManager">
|
|
@@ -311,20 +301,9 @@
|
|
</entry>
|
|
</entry>
|
|
</map>
|
|
</map>
|
|
</option>
|
|
</option>
|
|
- <option name="RECENT_FILTERS">
|
|
|
|
- <map>
|
|
|
|
- <entry key="Branch">
|
|
|
|
- <value>
|
|
|
|
- <list />
|
|
|
|
- </value>
|
|
|
|
- </entry>
|
|
|
|
- <entry key="User">
|
|
|
|
- <value>
|
|
|
|
- <list />
|
|
|
|
- </value>
|
|
|
|
- </entry>
|
|
|
|
- </map>
|
|
|
|
- </option>
|
|
|
|
|
|
+ </component>
|
|
|
|
+ <component name="VcsContentAnnotationSettings">
|
|
|
|
+ <option name="myLimit" value="2678400000" />
|
|
</component>
|
|
</component>
|
|
<component name="VcsManagerConfiguration">
|
|
<component name="VcsManagerConfiguration">
|
|
<MESSAGE value="更新代码10-28" />
|
|
<MESSAGE value="更新代码10-28" />
|
|
@@ -332,12 +311,6 @@
|
|
<option name="LAST_COMMIT_MESSAGE" value="整合学生端和教师端" />
|
|
<option name="LAST_COMMIT_MESSAGE" value="整合学生端和教师端" />
|
|
</component>
|
|
</component>
|
|
<component name="editorHistoryManager">
|
|
<component name="editorHistoryManager">
|
|
- <entry file="file://$PROJECT_DIR$/dorm-manager-wx-api/src/main/resources/application-dev.properties">
|
|
|
|
- <provider selected="true" editor-type-id="text-editor" />
|
|
|
|
- </entry>
|
|
|
|
- <entry file="file://$PROJECT_DIR$/dorm-manager-wx-api/src/main/resources/application.properties">
|
|
|
|
- <provider selected="true" editor-type-id="text-editor" />
|
|
|
|
- </entry>
|
|
|
|
<entry file="file://$PROJECT_DIR$/dorm-manager-wx-api/src/main/java/com/dgtis/dorm/manager/wx/web/NewsController.java">
|
|
<entry file="file://$PROJECT_DIR$/dorm-manager-wx-api/src/main/java/com/dgtis/dorm/manager/wx/web/NewsController.java">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="-3534">
|
|
<state relative-caret-position="-3534">
|
|
@@ -383,8 +356,5 @@
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
- <entry file="file://$PROJECT_DIR$/dorm-manager-wx/utils/api.js">
|
|
|
|
- <provider selected="true" editor-type-id="text-editor" />
|
|
|
|
- </entry>
|
|
|
|
</component>
|
|
</component>
|
|
</project>
|
|
</project>
|