...
|
...
|
@@ -66,12 +66,26 @@ |
|
|
<file leaf-file-name="UserBaseController.php" pinned="false" current-in-tab="true">
|
|
|
<entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/UserBaseController.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="357">
|
|
|
<caret line="25" column="59" selection-start-line="25" selection-start-column="59" selection-end-line="25" selection-end-column="59" />
|
|
|
<state relative-caret-position="315">
|
|
|
<caret line="23" column="40" lean-forward="true" selection-start-line="23" selection-start-column="40" selection-end-line="23" selection-end-column="40" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file leaf-file-name="helper.php" pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/simplewind/thinkphp/helper.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="549">
|
|
|
<caret line="293" column="13" selection-start-line="293" selection-start-column="13" selection-end-line="293" selection-end-column="13" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file leaf-file-name="BaseController.php" pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/BaseController.php">
|
|
|
<provider selected="true" editor-type-id="text-editor" />
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file leaf-file-name="LoginController.php" pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/app/user/controller/LoginController.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
...
|
...
|
@@ -83,14 +97,9 @@ |
|
|
</file>
|
|
|
<file leaf-file-name="HomeBaseController.php" pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/HomeBaseController.php">
|
|
|
<provider selected="true" editor-type-id="text-editor" />
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file leaf-file-name="pay_success.html" pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/public/themes/simpleboot3/portal/index/pay_success.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="420">
|
|
|
<caret line="20" column="34" lean-forward="true" selection-start-line="20" selection-start-column="34" selection-end-line="20" selection-end-column="34" />
|
|
|
<caret line="37" lean-forward="true" selection-start-line="37" selection-end-line="37" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
...
|
...
|
@@ -208,6 +217,24 @@ |
|
|
<item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="public" type="462c0819:PsiDirectoryNode" />
|
|
|
</path>
|
|
|
<path>
|
|
|
<item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
|
|
|
<item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="simplewind" type="462c0819:PsiDirectoryNode" />
|
|
|
</path>
|
|
|
<path>
|
|
|
<item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
|
|
|
<item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="simplewind" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="cmf" type="462c0819:PsiDirectoryNode" />
|
|
|
</path>
|
|
|
<path>
|
|
|
<item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
|
|
|
<item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="simplewind" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="cmf" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="controller" type="462c0819:PsiDirectoryNode" />
|
|
|
</path>
|
|
|
</expand>
|
|
|
<select />
|
|
|
</subPane>
|
...
|
...
|
@@ -261,7 +288,7 @@ |
|
|
<workItem from="1535514127808" duration="727000" />
|
|
|
<workItem from="1535532970259" duration="2527000" />
|
|
|
<workItem from="1535546044129" duration="20814000" />
|
|
|
<workItem from="1535633001243" duration="5034000" />
|
|
|
<workItem from="1535633001243" duration="5571000" />
|
|
|
</task>
|
|
|
<task id="LOCAL-00001" summary="修复预约后不能再预约的问题">
|
|
|
<created>1535458170068</created>
|
...
|
...
|
@@ -571,11 +598,25 @@ |
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1535638014265</updated>
|
|
|
</task>
|
|
|
<option name="localTasksCounter" value="45" />
|
|
|
<task id="LOCAL-00045" summary="登录处理">
|
|
|
<created>1535638593262</created>
|
|
|
<option name="number" value="00045" />
|
|
|
<option name="presentableId" value="LOCAL-00045" />
|
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1535638593262</updated>
|
|
|
</task>
|
|
|
<task id="LOCAL-00046" summary="登录处理">
|
|
|
<created>1535638797137</created>
|
|
|
<option name="number" value="00046" />
|
|
|
<option name="presentableId" value="LOCAL-00046" />
|
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1535638797137</updated>
|
|
|
</task>
|
|
|
<option name="localTasksCounter" value="47" />
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
<option name="totallyTimeSpent" value="59486000" />
|
|
|
<option name="totallyTimeSpent" value="60023000" />
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
...
|
...
|
@@ -622,9 +663,6 @@ |
|
|
<option name="LAST_COMMIT_MESSAGE" value="登录处理" />
|
|
|
</component>
|
|
|
<component name="editorHistoryManager">
|
|
|
<entry file="file://$PROJECT_DIR$/api/command.php">
|
|
|
<provider selected="true" editor-type-id="text-editor" />
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/api/wxapp/controller/UserController.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="228">
|
...
|
...
|
@@ -869,9 +907,6 @@ |
|
|
<entry file="file://$PROJECT_DIR$/app/user/controller/CommentController.php">
|
|
|
<provider selected="true" editor-type-id="text-editor" />
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/HomeBaseController.php">
|
|
|
<provider selected="true" editor-type-id="text-editor" />
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/app/user/controller/YuyueController.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="660">
|
...
|
...
|
@@ -898,6 +933,13 @@ |
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/HomeBaseController.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="420">
|
|
|
<caret line="37" lean-forward="true" selection-start-line="37" selection-end-line="37" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/app/user/controller/LoginController.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="468">
|
...
|
...
|
@@ -905,17 +947,20 @@ |
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/BaseController.php">
|
|
|
<provider selected="true" editor-type-id="text-editor" />
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/simplewind/thinkphp/helper.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="297">
|
|
|
<caret line="503" column="13" selection-start-line="503" selection-start-column="13" selection-end-line="503" selection-end-column="13" />
|
|
|
<state relative-caret-position="549">
|
|
|
<caret line="293" column="13" selection-start-line="293" selection-start-column="13" selection-end-line="293" selection-end-column="13" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/UserBaseController.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="357">
|
|
|
<caret line="25" column="59" selection-start-line="25" selection-start-column="59" selection-end-line="25" selection-end-column="59" />
|
|
|
<state relative-caret-position="315">
|
|
|
<caret line="23" column="40" lean-forward="true" selection-start-line="23" selection-start-column="40" selection-end-line="23" selection-end-column="40" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
...
|
...
|
|