正在显示
2 个修改的文件
包含
59 行增加
和
29 行删除
@@ -2,7 +2,8 @@ | @@ -2,7 +2,8 @@ | ||
2 | <project version="4"> | 2 | <project version="4"> |
3 | <component name="ChangeListManager"> | 3 | <component name="ChangeListManager"> |
4 | <list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment=""> | 4 | <list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment=""> |
5 | - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/User.php" afterPath="$PROJECT_DIR$/application/api/controller/User.php" /> | 5 | + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/application/extra/verify.php" /> |
6 | + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> | ||
6 | </list> | 7 | </list> |
7 | <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> | 8 | <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> |
8 | <option name="TRACKING_ENABLED" value="true" /> | 9 | <option name="TRACKING_ENABLED" value="true" /> |
@@ -16,13 +17,12 @@ | @@ -16,13 +17,12 @@ | ||
16 | <file leaf-file-name="User.php" pinned="false" current-in-tab="true"> | 17 | <file leaf-file-name="User.php" pinned="false" current-in-tab="true"> |
17 | <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> | 18 | <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> |
18 | <provider selected="true" editor-type-id="text-editor"> | 19 | <provider selected="true" editor-type-id="text-editor"> |
19 | - <state relative-caret-position="612"> | ||
20 | - <caret line="106" column="21" lean-forward="true" selection-start-line="106" selection-start-column="21" selection-end-line="106" selection-end-column="21" /> | 20 | + <state relative-caret-position="294"> |
21 | + <caret line="49" column="44" lean-forward="true" selection-start-line="49" selection-start-column="44" selection-end-line="49" selection-end-column="44" /> | ||
21 | <folding> | 22 | <folding> |
22 | <element signature="e#38#68#0#PHP" expanded="true" /> | 23 | <element signature="e#38#68#0#PHP" expanded="true" /> |
23 | <element signature="e#391#463#0#PHP" expanded="false" /> | 24 | <element signature="e#391#463#0#PHP" expanded="false" /> |
24 | <element signature="e#469#1207#0#PHP" expanded="false" /> | 25 | <element signature="e#469#1207#0#PHP" expanded="false" /> |
25 | - <element signature="e#1212#2875#0#PHP" expanded="false" /> | ||
26 | </folding> | 26 | </folding> |
27 | </state> | 27 | </state> |
28 | </provider> | 28 | </provider> |
@@ -76,6 +76,7 @@ | @@ -76,6 +76,7 @@ | ||
76 | <option value="$PROJECT_DIR$/.gitignore" /> | 76 | <option value="$PROJECT_DIR$/.gitignore" /> |
77 | <option value="$PROJECT_DIR$/public/.gitignore" /> | 77 | <option value="$PROJECT_DIR$/public/.gitignore" /> |
78 | <option value="$PROJECT_DIR$/application/api/controller/User.php" /> | 78 | <option value="$PROJECT_DIR$/application/api/controller/User.php" /> |
79 | + <option value="$PROJECT_DIR$/application/extra/verify.php" /> | ||
79 | </list> | 80 | </list> |
80 | </option> | 81 | </option> |
81 | </component> | 82 | </component> |
@@ -93,9 +94,9 @@ | @@ -93,9 +94,9 @@ | ||
93 | <sorting>DEFINITION_ORDER</sorting> | 94 | <sorting>DEFINITION_ORDER</sorting> |
94 | </component> | 95 | </component> |
95 | <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> | 96 | <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> |
96 | - <component name="ProjectFrameBounds"> | ||
97 | - <option name="x" value="283" /> | ||
98 | - <option name="y" value="38" /> | 97 | + <component name="ProjectFrameBounds" extendedState="1"> |
98 | + <option name="x" value="57" /> | ||
99 | + <option name="y" value="102" /> | ||
99 | <option name="width" value="1940" /> | 100 | <option name="width" value="1940" /> |
100 | <option name="height" value="1074" /> | 101 | <option name="height" value="1074" /> |
101 | </component> | 102 | </component> |
@@ -126,7 +127,26 @@ | @@ -126,7 +127,26 @@ | ||
126 | <path> | 127 | <path> |
127 | <item name="areial" type="b2602c69:ProjectViewProjectNode" /> | 128 | <item name="areial" type="b2602c69:ProjectViewProjectNode" /> |
128 | <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" /> | 129 | <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" /> |
129 | - <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" /> | 130 | + <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" /> |
131 | + </path> | ||
132 | + <path> | ||
133 | + <item name="areial" type="b2602c69:ProjectViewProjectNode" /> | ||
134 | + <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
135 | + <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
136 | + <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
137 | + </path> | ||
138 | + <path> | ||
139 | + <item name="areial" type="b2602c69:ProjectViewProjectNode" /> | ||
140 | + <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
141 | + <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
142 | + <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
143 | + <item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
144 | + </path> | ||
145 | + <path> | ||
146 | + <item name="areial" type="b2602c69:ProjectViewProjectNode" /> | ||
147 | + <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
148 | + <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
149 | + <item name="extra" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
130 | </path> | 150 | </path> |
131 | </expand> | 151 | </expand> |
132 | <select /> | 152 | <select /> |
@@ -171,15 +191,15 @@ | @@ -171,15 +191,15 @@ | ||
171 | <workItem from="1574062081278" duration="18239000" /> | 191 | <workItem from="1574062081278" duration="18239000" /> |
172 | <workItem from="1574122453532" duration="15780000" /> | 192 | <workItem from="1574122453532" duration="15780000" /> |
173 | <workItem from="1574141466352" duration="745000" /> | 193 | <workItem from="1574141466352" duration="745000" /> |
174 | - <workItem from="1574143209694" duration="768000" /> | 194 | + <workItem from="1574143209694" duration="1269000" /> |
175 | </task> | 195 | </task> |
176 | <servers /> | 196 | <servers /> |
177 | </component> | 197 | </component> |
178 | <component name="TimeTrackingManager"> | 198 | <component name="TimeTrackingManager"> |
179 | - <option name="totallyTimeSpent" value="45461000" /> | 199 | + <option name="totallyTimeSpent" value="45962000" /> |
180 | </component> | 200 | </component> |
181 | <component name="ToolWindowManager"> | 201 | <component name="ToolWindowManager"> |
182 | - <frame x="283" y="38" width="1940" height="1074" extended-state="0" /> | 202 | + <frame x="57" y="102" width="1940" height="1074" extended-state="1" /> |
183 | <editor active="true" /> | 203 | <editor active="true" /> |
184 | <layout> | 204 | <layout> |
185 | <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.14893617" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" /> | 205 | <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.14893617" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" /> |
@@ -233,13 +253,6 @@ | @@ -233,13 +253,6 @@ | ||
233 | <watches-manager /> | 253 | <watches-manager /> |
234 | </component> | 254 | </component> |
235 | <component name="editorHistoryManager"> | 255 | <component name="editorHistoryManager"> |
236 | - <entry file="file://$PROJECT_DIR$/public/assets/js/backend/wonderful.js"> | ||
237 | - <provider selected="true" editor-type-id="text-editor"> | ||
238 | - <state relative-caret-position="500"> | ||
239 | - <caret line="29" column="61" lean-forward="false" selection-start-line="29" selection-start-column="61" selection-end-line="29" selection-end-column="61" /> | ||
240 | - </state> | ||
241 | - </provider> | ||
242 | - </entry> | ||
243 | <entry file="file://$PROJECT_DIR$/application/admin/view/wonderful/add.html"> | 256 | <entry file="file://$PROJECT_DIR$/application/admin/view/wonderful/add.html"> |
244 | <provider selected="true" editor-type-id="text-editor"> | 257 | <provider selected="true" editor-type-id="text-editor"> |
245 | <state relative-caret-position="925"> | 258 | <state relative-caret-position="925"> |
@@ -479,14 +492,6 @@ | @@ -479,14 +492,6 @@ | ||
479 | </provider> | 492 | </provider> |
480 | </entry> | 493 | </entry> |
481 | <entry file="file://$PROJECT_DIR$/application/api/controller/Validate.php" /> | 494 | <entry file="file://$PROJECT_DIR$/application/api/controller/Validate.php" /> |
482 | - <entry file="file://$PROJECT_DIR$/thinkphp/helper.php"> | ||
483 | - <provider selected="true" editor-type-id="text-editor"> | ||
484 | - <state relative-caret-position="312"> | ||
485 | - <caret line="102" column="13" lean-forward="false" selection-start-line="102" selection-start-column="13" selection-end-line="102" selection-end-column="13" /> | ||
486 | - <folding /> | ||
487 | - </state> | ||
488 | - </provider> | ||
489 | - </entry> | ||
490 | <entry file="file://$PROJECT_DIR$/application/api/config.php"> | 495 | <entry file="file://$PROJECT_DIR$/application/api/config.php"> |
491 | <provider selected="true" editor-type-id="text-editor"> | 496 | <provider selected="true" editor-type-id="text-editor"> |
492 | <state relative-caret-position="0"> | 497 | <state relative-caret-position="0"> |
@@ -498,6 +503,7 @@ | @@ -498,6 +503,7 @@ | ||
498 | <provider selected="true" editor-type-id="text-editor"> | 503 | <provider selected="true" editor-type-id="text-editor"> |
499 | <state relative-caret-position="0"> | 504 | <state relative-caret-position="0"> |
500 | <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> | 505 | <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> |
506 | + <folding /> | ||
501 | </state> | 507 | </state> |
502 | </provider> | 508 | </provider> |
503 | </entry> | 509 | </entry> |
@@ -505,6 +511,7 @@ | @@ -505,6 +511,7 @@ | ||
505 | <provider selected="true" editor-type-id="text-editor"> | 511 | <provider selected="true" editor-type-id="text-editor"> |
506 | <state relative-caret-position="-6011"> | 512 | <state relative-caret-position="-6011"> |
507 | <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> | 513 | <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> |
514 | + <folding /> | ||
508 | </state> | 515 | </state> |
509 | </provider> | 516 | </provider> |
510 | </entry> | 517 | </entry> |
@@ -534,6 +541,7 @@ | @@ -534,6 +541,7 @@ | ||
534 | <provider selected="true" editor-type-id="text-editor"> | 541 | <provider selected="true" editor-type-id="text-editor"> |
535 | <state relative-caret-position="450"> | 542 | <state relative-caret-position="450"> |
536 | <caret line="26" column="60" lean-forward="false" selection-start-line="26" selection-start-column="60" selection-end-line="26" selection-end-column="60" /> | 543 | <caret line="26" column="60" lean-forward="false" selection-start-line="26" selection-start-column="60" selection-end-line="26" selection-end-column="60" /> |
544 | + <folding /> | ||
537 | </state> | 545 | </state> |
538 | </provider> | 546 | </provider> |
539 | </entry> | 547 | </entry> |
@@ -577,15 +585,30 @@ | @@ -577,15 +585,30 @@ | ||
577 | </state> | 585 | </state> |
578 | </provider> | 586 | </provider> |
579 | </entry> | 587 | </entry> |
588 | + <entry file="file://$PROJECT_DIR$/thinkphp/helper.php"> | ||
589 | + <provider selected="true" editor-type-id="text-editor"> | ||
590 | + <state relative-caret-position="3"> | ||
591 | + <caret line="99" column="38" lean-forward="true" selection-start-line="99" selection-start-column="38" selection-end-line="99" selection-end-column="38" /> | ||
592 | + <folding /> | ||
593 | + </state> | ||
594 | + </provider> | ||
595 | + </entry> | ||
596 | + <entry file="file://$PROJECT_DIR$/application/extra/verify.php"> | ||
597 | + <provider selected="true" editor-type-id="text-editor"> | ||
598 | + <state relative-caret-position="100"> | ||
599 | + <caret line="4" column="53" lean-forward="false" selection-start-line="4" selection-start-column="53" selection-end-line="4" selection-end-column="53" /> | ||
600 | + <folding /> | ||
601 | + </state> | ||
602 | + </provider> | ||
603 | + </entry> | ||
580 | <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> | 604 | <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> |
581 | <provider selected="true" editor-type-id="text-editor"> | 605 | <provider selected="true" editor-type-id="text-editor"> |
582 | - <state relative-caret-position="612"> | ||
583 | - <caret line="106" column="21" lean-forward="true" selection-start-line="106" selection-start-column="21" selection-end-line="106" selection-end-column="21" /> | 606 | + <state relative-caret-position="294"> |
607 | + <caret line="49" column="44" lean-forward="true" selection-start-line="49" selection-start-column="44" selection-end-line="49" selection-end-column="44" /> | ||
584 | <folding> | 608 | <folding> |
585 | <element signature="e#38#68#0#PHP" expanded="true" /> | 609 | <element signature="e#38#68#0#PHP" expanded="true" /> |
586 | <element signature="e#391#463#0#PHP" expanded="false" /> | 610 | <element signature="e#391#463#0#PHP" expanded="false" /> |
587 | <element signature="e#469#1207#0#PHP" expanded="false" /> | 611 | <element signature="e#469#1207#0#PHP" expanded="false" /> |
588 | - <element signature="e#1212#2875#0#PHP" expanded="false" /> | ||
589 | </folding> | 612 | </folding> |
590 | </state> | 613 | </state> |
591 | </provider> | 614 | </provider> |
-
请 注册 或 登录 后发表评论