...
|
...
|
@@ -3,7 +3,7 @@ |
|
|
<component name="ChangeListManager">
|
|
|
<list default="true" id="03b59864-5835-4588-bfae-54004809f199" name="Default" comment="">
|
|
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
|
<change beforePath="$PROJECT_DIR$/app/user/controller/ProfileController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/user/controller/ProfileController.php" afterDir="false" />
|
|
|
<change beforePath="$PROJECT_DIR$/public/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/public/index.php" afterDir="false" />
|
|
|
</list>
|
|
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
|
<option name="TRACKING_ENABLED" value="true" />
|
...
|
...
|
@@ -102,11 +102,29 @@ |
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file leaf-file-name="ProfileController.php" pinned="false" current-in-tab="true">
|
|
|
<file leaf-file-name="ProfileController.php" pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/app/user/controller/ProfileController.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="693">
|
|
|
<caret line="47" column="46" selection-start-line="47" selection-start-column="46" selection-end-line="47" selection-end-column="46" />
|
|
|
<state relative-caret-position="525">
|
|
|
<caret line="45" column="15" selection-start-line="45" selection-start-column="15" selection-end-line="47" selection-end-column="46" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file leaf-file-name="student.html" pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/user/student.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="567">
|
|
|
<caret line="43" column="29" lean-forward="true" selection-start-line="43" selection-start-column="29" selection-end-line="43" selection-end-column="29" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file leaf-file-name="common.php" pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/simplewind/cmf/common.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="775">
|
|
|
<caret line="2102" column="17" selection-start-line="2102" selection-start-column="17" selection-end-line="2102" selection-end-column="17" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
...
|
...
|
@@ -125,11 +143,11 @@ |
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file leaf-file-name="index.php" pinned="false" current-in-tab="false">
|
|
|
<file leaf-file-name="index.php" pinned="false" current-in-tab="true">
|
|
|
<entry file="file://$PROJECT_DIR$/public/index.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="252">
|
|
|
<caret line="18" column="38" selection-start-line="18" selection-start-column="38" selection-end-line="18" selection-end-column="38" />
|
|
|
<state relative-caret-position="126">
|
|
|
<caret line="12" column="21" selection-start-line="12" selection-start-column="21" selection-end-line="12" selection-end-column="21" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
...
|
...
|
@@ -152,6 +170,7 @@ |
|
|
<find>imageUrlPrefix</find>
|
|
|
<find>$otherid</find>
|
|
|
<find>commente1</find>
|
|
|
<find>id_xueshi</find>
|
|
|
</findStrings>
|
|
|
<dirStrings>
|
|
|
<dir>$PROJECT_DIR$/../07-08-voyager/your-project-name</dir>
|
...
|
...
|
@@ -164,7 +183,6 @@ |
|
|
<component name="IdeDocumentHistory">
|
|
|
<option name="CHANGED_PATHS">
|
|
|
<list>
|
|
|
<option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/style.css" />
|
|
|
<option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/xinwen_acticle.htm" />
|
|
|
<option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/hezuo_jiuda.htm" />
|
|
|
<option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/hezuo_huigu.htm" />
|
...
|
...
|
@@ -208,13 +226,14 @@ |
|
|
<option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/PublicController.php" />
|
|
|
<option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController [8].php" />
|
|
|
<option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/PublicController [2].php" />
|
|
|
<option value="$PROJECT_DIR$/public/index.php" />
|
|
|
<option value="$PROJECT_DIR$/app/user/controller/YuyueController.php" />
|
|
|
<option value="$PROJECT_DIR$/app/user/controller/CommentController.php" />
|
|
|
<option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/common.php" />
|
|
|
<option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController [4].php" />
|
|
|
<option value="$USER_HOME$/Desktop/开发资料/temp/22.html" />
|
|
|
<option value="$PROJECT_DIR$/app/user/controller/ProfileController.php" />
|
|
|
<option value="$PROJECT_DIR$/simplewind/cmf/common.php" />
|
|
|
<option value="$PROJECT_DIR$/public/index.php" />
|
|
|
</list>
|
|
|
</option>
|
|
|
</component>
|
...
|
...
|
@@ -286,6 +305,11 @@ |
|
|
<path>
|
|
|
<item name="dm161xueche" type="b2602c69:ProjectViewProjectNode" />
|
|
|
<item name="dm161xueche" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="public" type="462c0819:PsiDirectoryNode" />
|
|
|
</path>
|
|
|
<path>
|
|
|
<item name="dm161xueche" type="b2602c69:ProjectViewProjectNode" />
|
|
|
<item name="dm161xueche" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="simplewind" type="462c0819:PsiDirectoryNode" />
|
|
|
</path>
|
|
|
<path>
|
...
|
...
|
@@ -352,21 +376,7 @@ |
|
|
<workItem from="1536326693570" duration="30018000" />
|
|
|
<workItem from="1536496471879" duration="16852000" />
|
|
|
<workItem from="1536677895835" duration="7811000" />
|
|
|
<workItem from="1536940132237" duration="2280000" />
|
|
|
</task>
|
|
|
<task id="LOCAL-00016" summary="ceshi wode jiaolian">
|
|
|
<created>1535546965523</created>
|
|
|
<option name="number" value="00016" />
|
|
|
<option name="presentableId" value="LOCAL-00016" />
|
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1535546965523</updated>
|
|
|
</task>
|
|
|
<task id="LOCAL-00017" summary="ceshi wode jiaolian">
|
|
|
<created>1535547118071</created>
|
|
|
<option name="number" value="00017" />
|
|
|
<option name="presentableId" value="LOCAL-00017" />
|
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1535547118071</updated>
|
|
|
<workItem from="1536940132237" duration="3578000" />
|
|
|
</task>
|
|
|
<task id="LOCAL-00018" summary="ceshi wode jiaolian">
|
|
|
<created>1535548842017</created>
|
...
|
...
|
@@ -697,11 +707,25 @@ |
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1536679162719</updated>
|
|
|
</task>
|
|
|
<option name="localTasksCounter" value="65" />
|
|
|
<task id="LOCAL-00065" summary="统计学时问题修复">
|
|
|
<created>1536976333614</created>
|
|
|
<option name="number" value="00065" />
|
|
|
<option name="presentableId" value="LOCAL-00065" />
|
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1536976333615</updated>
|
|
|
</task>
|
|
|
<task id="LOCAL-00066" summary="统计学时问题修复">
|
|
|
<created>1536977008226</created>
|
|
|
<option name="number" value="00066" />
|
|
|
<option name="presentableId" value="LOCAL-00066" />
|
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1536977008226</updated>
|
|
|
</task>
|
|
|
<option name="localTasksCounter" value="67" />
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
<option name="totallyTimeSpent" value="141862000" />
|
|
|
<option name="totallyTimeSpent" value="143160000" />
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
<frame x="1912" y="-152" width="1936" height="1056" extended-state="6" />
|
...
|
...
|
@@ -768,7 +792,8 @@ |
|
|
<MESSAGE value="我的订单详情标题" />
|
|
|
<MESSAGE value="登录处理" />
|
|
|
<MESSAGE value="预约时间错误" />
|
|
|
<option name="LAST_COMMIT_MESSAGE" value="预约时间错误" />
|
|
|
<MESSAGE value="统计学时问题修复" />
|
|
|
<option name="LAST_COMMIT_MESSAGE" value="统计学时问题修复" />
|
|
|
</component>
|
|
|
<component name="XDebuggerManager">
|
|
|
<breakpoint-manager>
|
...
|
...
|
@@ -776,7 +801,6 @@ |
|
|
</breakpoint-manager>
|
|
|
</component>
|
|
|
<component name="editorHistoryManager">
|
|
|
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/kemu.html" />
|
|
|
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/data_edit [2].html" />
|
|
|
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/data_edit.html" />
|
|
|
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/data_addpic.html" />
|
...
|
...
|
@@ -829,13 +853,6 @@ |
|
|
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/HomeBaseController.php" />
|
|
|
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController [10].php" />
|
|
|
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/PublicController [2].php" />
|
|
|
<entry file="file://$PROJECT_DIR$/public/index.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="252">
|
|
|
<caret line="18" column="38" selection-start-line="18" selection-start-column="38" selection-end-line="18" selection-end-column="38" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/app/user/controller/YuyueController.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="468">
|
...
|
...
|
@@ -898,13 +915,6 @@ |
|
|
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/common.php">
|
|
|
<provider selected="true" editor-type-id="text-editor" />
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/simplewind/cmf/common.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="-40608">
|
|
|
<caret line="41" column="32" lean-forward="true" selection-start-line="41" selection-start-column="32" selection-end-line="41" selection-end-column="32" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/app/user/controller/CommentController.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="2314">
|
...
|
...
|
@@ -931,10 +941,31 @@ |
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/user/student.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="567">
|
|
|
<caret line="43" column="29" lean-forward="true" selection-start-line="43" selection-start-column="29" selection-end-line="43" selection-end-column="29" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/app/user/controller/ProfileController.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="693">
|
|
|
<caret line="47" column="46" selection-start-line="47" selection-start-column="46" selection-end-line="47" selection-end-column="46" />
|
|
|
<state relative-caret-position="525">
|
|
|
<caret line="45" column="15" selection-start-line="45" selection-start-column="15" selection-end-line="47" selection-end-column="46" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/simplewind/cmf/common.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="775">
|
|
|
<caret line="2102" column="17" selection-start-line="2102" selection-start-column="17" selection-end-line="2102" selection-end-column="17" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/public/index.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="126">
|
|
|
<caret line="12" column="21" selection-start-line="12" selection-start-column="21" selection-end-line="12" selection-end-column="21" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
...
|
...
|
|